expand theme to include shape

python/converter.py

 #!/usr/bin/env python3
 """Build dark mode settings from previously generated settings"""
 import settings_generated as g
+# spacing is based on pixel size
+
+_DEFAULT_TRACE_H_SPACING = 165
+_DEFAULT_TRACE_V_SPACING = 55
+_DEFAULT_GRAPH_H_SPACING = 165
+_DEFAULT_GRAPH_V_SPACING = 55
 
 SETTINGS_THEMES = [
     ("_NPS_THEME", "NPS theme", g._NPS_THEME),
@@ -12,11 +18,45 @@ SETTINGS_THEMES = [
     ("_HIGH_CONTRAST_THEME", "High contrast", g._HIGH_CONTRAST_THEME),
 ]
 
+def _change_graph_settings(settings):
+    settings["background_color_gradient"] = 100
+    settings["graph_node_color"] = "#eeeeee"
+    settings["graph_edge_color"] = "#eeeeee"
+    settings["graph_node_color_gradient"] = 100
+    settings["graph_node_use_border"] = True
+
+def _change_dark_graph_settings(settings):
+    settings["background_color_gradient"] = 100
+    settings["graph_node_color"] = "#6d6d6d"
+    settings["graph_edge_color"] = "#6d6d6d"
+    settings["graph_node_color_gradient"] = 100
+    settings["graph_node_use_border"] = True
+
+def _add_shape_settings(settings):
+   # background
+   settings["background_use_border"]=False
+   settings["background_use_shadow"]=False
+   # trace
+   settings["trace_hide_collapse_opacity"]= 127
+   settings["trace_node_width"]= 127
+   settings["trace_node_height"]= 20
+   settings["trace_node_h_spacing"]= _DEFAULT_TRACE_H_SPACING
+   settings["trace_node_v_spacing"]= _DEFAULT_TRACE_V_SPACING
+   settings["trace_edge_arrow_size"]=10
+   # graph
+   settings["graph_node_width"]= 78
+   settings["graph_node_height"]= 36
+   settings["graph_node_h_spacing"]= _DEFAULT_GRAPH_H_SPACING
+   settings["graph_node_v_spacing"]= _DEFAULT_GRAPH_V_SPACING
+   settings["graph_edge_arrow_size"]=7
+
 # notice
 print("# This content was auto-generated using converter.py\n")
 
 # light mode stays the same, white=#ffffff
 for varname, name, theme in SETTINGS_THEMES:
+    _change_graph_settings(theme)
+    _add_shape_settings(theme)
     print("# %s\n%s ="%(name, varname), theme, "\n")
 
 # dark mode, black=#000000
@@ -57,5 +97,8 @@ for varname, name, theme in SETTINGS_THEMES:
     if theme["code_editor_operator_color"] == "#202020":
         theme["code_editor_operator_color"] = "#d0d0d0"
 
+    _change_dark_graph_settings(theme)
+    _add_shape_settings(theme)
+
     print("# dark %s\n_DARK%s ="%(name, varname), theme, "\n")
 

python/graphs_manager.py

@@ -11,7 +11,8 @@ class GraphsManager(QObject):
 
     Data structures:
       * graphs (list<GraphItem>)
-      * schema_name
+      * schema_name - taken at time of run
+      * scope - taken at time of run
       * selected_graph_index (int)
 
     Signals:

python/settings_defaults.py

 import settings_generated as g
-# spacing is based on pixel size
-_DEFAULT_TRACE_H_SPACING = 165
-_DEFAULT_TRACE_V_SPACING = 55
-_DEFAULT_GRAPH_H_SPACING = 165
-_DEFAULT_GRAPH_V_SPACING = 55
-
-DEFAULT_SETTINGS = {
-           # background
-           "background_use_border":False,
-           "background_use_shadow":False,
-           # trace
-           "trace_hide_collapse_opacity": 127,
-           "trace_node_width": 127,
-           "trace_node_height": 20,
-           "trace_node_h_spacing": _DEFAULT_TRACE_H_SPACING,
-           "trace_node_v_spacing": _DEFAULT_TRACE_V_SPACING,
-           "trace_edge_arrow_size":10,
-           # graph
-           "graph_node_width": 127,
-           "graph_node_height": 20,
-           "graph_node_h_spacing": _DEFAULT_GRAPH_H_SPACING,
-           "graph_node_v_spacing": _DEFAULT_GRAPH_V_SPACING,
-           "graph_edge_arrow_size":10,
-           # reports, tables, bar charts, gantt charts, activity diagrams
-}
-
-DEFAULT_SETTINGS.update(g._NPS_THEME)
 
 SETTINGS_THEMES = {
            "NPS theme": g._NPS_THEME,
@@ -37,9 +10,6 @@ SETTINGS_THEMES = {
            "High contrast": g._HIGH_CONTRAST_THEME,
 }
 
-DARK_DEFAULT_SETTINGS = DEFAULT_SETTINGS.copy()
-DARK_DEFAULT_SETTINGS.update(g._DARK_NPS_THEME)
-
 DARK_SETTINGS_THEMES = {
            "NPS theme (dark)": g._DARK_NPS_THEME,
            "Firebird theme (dark)": g._DARK_FIREBIRD_THEME,
@@ -50,3 +20,6 @@ DARK_SETTINGS_THEMES = {
            "High contrast (dark)": g._DARK_HIGH_CONTRAST_THEME,
 }
 
+DEFAULT_SETTINGS = g._NPS_THEME.copy()
+DARK_DEFAULT_SETTINGS = g._DARK_NPS_THEME.copy()
+