Merge branch 'save_features'

keyraven · Jun 21, 2023 · 8041251 · 8041251
2 parents 0dd8a8e + dce485b
commit 8041251
Show file tree

Hide file tree

Showing 57 changed files with 1,277 additions and 1,024 deletions.
diff --git a/resources/buttons.json b/resources/buttons.json
@@ -270,6 +270,29 @@
                 "path": "resources/images/buttons/relationship_list_arrow_r_unavailable.png"
             }
         }
+    },
+    "#general_info_tab_button":
+    {
+        "prototype": "#image_button",
+		"images":
+        {
+            "normal_image":
+            {
+                "path": "resources/images/buttons/general_info.png"
+            },
+            "hovered_image":
+            {
+                "path": "resources/images/buttons/general_info_hover.png"
+            },
+			"selected_image":
+            {
+                "path": "resources/images/buttons/general_info_hover.png"
+            },
+            "disabled_image":
+            {
+                "path": "resources/images/buttons/general_info_selected.png"
+            }
+        }
     }
 }
 

diff --git a/resources/defaults.json b/resources/defaults.json
@@ -3,6 +3,7 @@
         "colours": {
             "normal_bg": "#655934",
             "hovered_bg": "#1E1809",
+            "dark_bg": "#2e2919",
             "disabled_bg": "#5C5850",
             "selected_bg": "#655934",
             "active_bg": "#655934",
@@ -29,5 +30,17 @@
             "border_width": "12",
             "shadow_width": "0"
         }
+    },
+    "#left_fac_button": {
+        "misc": {
+            "text_horiz_alignment_padding": "0",
+            "text_vert_alignment_padding": "0"
+        }
+    },
+    "#right_fac_button": {
+        "misc": {
+            "text_horiz_alignment_padding": "0",
+            "text_vert_alignment_padding": "0"
+        }
     }
 }
diff --git a/resources/images/buttons/general_info.png b/resources/images/buttons/general_info.png
diff --git a/resources/images/buttons/general_info_hover.png b/resources/images/buttons/general_info_hover.png
diff --git a/resources/images/buttons/general_info_selected.png b/resources/images/buttons/general_info_selected.png
diff --git a/resources/text_boxes.json b/resources/text_boxes.json
@@ -105,5 +105,47 @@
             "text_horiz_alignment": "center",
             "text_vert_alignment": "center"
     }
+  },
+  "#page_number": {
+    "colours": {
+            "dark_bg": "#00000000",
+            "normal_text": "#000000"
+        },
+    "font": {
+            "name": "notosans",
+            "regular_path": "resources/fonts/NotoSans-Medium.ttf",
+            "size": "15"
+        },
+    "misc": {
+            "border_width": "0",
+            "shadow_width": "0",
+            "padding": "0,0",
+            "text_horiz_alignment": "center",
+            "text_vert_alignment": "center"
+    }
+  },
+  "#facet_select_display": {
+    "colours": {
+            "dark_bg": "#00000000",
+            "active_bg": "#00000000",
+            "normal_text": "#000000",
+            "text_shadow": "#00000000",
+            "normal_border": "#776045",
+            "hovered_border": "#291B0F",
+            "disabled_border": "#706B64",
+            "selected_border": "#776045",
+            "active_border": "#776045"
+        },
+    "font": {
+            "name": "notosans",
+            "regular_path": "resources/fonts/NotoSans-Medium.ttf",
+            "size": "15"
+        },
+    "misc": {
+            "border_width": "0",
+            "shadow_width": "0",
+            "padding": "5,0",
+            "text_horiz_alignment": "center"
+    }
   }
 }
diff --git a/scripts/cat/appearance_utility.py b/scripts/cat/appearance_utility.py