Gtk2: Use generated assets

menubar-toolbar was using its own static png files instead of the ones
generated from assets.svg

Author: clefebvre

generate-themes.py

@@ -97,7 +97,7 @@ def y_colorize_directory (path, variation):
             files.append(os.path.join(theme, "gtk-2.0", "main.rc"))
             files.append(os.path.join(theme, "gtk-2.0", "panel.rc"))
             files.append(os.path.join(theme, "gtk-2.0", "apps.rc"))
-            files.append(os.path.join(theme, "gtk-2.0", "menubar-toolbar", "gtkrc"))
+            files.append(os.path.join(theme, "gtk-2.0", "menubar-toolbar.rc"))
             for file in files:
                 if os.path.exists(file):
                     for accent in Y_HEX_ACCENT1:

list-green-colors.py

@@ -61,13 +61,14 @@ def parse_dir(path):
     parse_dir("src/Mint-Y/cinnamon/light-assets")
 
     # GTK2
-    parse_dir("src/Mint-Y/gtk-2.0/menubar-toolbar")
     parse_file("src/Mint-Y/gtk-2.0/apps.rc")
     parse_file("src/Mint-Y/gtk-2.0/gtkrc")
     parse_file("src/Mint-Y/gtk-2.0/gtkrc-dark")
     parse_file("src/Mint-Y/gtk-2.0/gtkrc-darker")
     parse_file("src/Mint-Y/gtk-2.0/main.rc")
     parse_file("src/Mint-Y/gtk-2.0/panel.rc")
+    parse_file("src/Mint-Y/gtk-2.0/menubar-toolbar.rc")
+    parse_file("src/Mint-Y/gtk-2.0/menubar-toolbar-dark.rc")
     parse_file("src/Mint-Y/gtk-2.0/assets.svg")
     parse_file("src/Mint-Y/gtk-2.0/assets-dark.svg")
 

src/Mint-Y/build-themes.py

@@ -48,7 +48,6 @@
             version_folder = os.path.join(dest_folder, "gtk-2.0")
             os.system("mkdir -p %s" % version_folder)
             os.system("cp -R gtk-2.0/assets %s" % version_folder)
-            os.system("cp -R gtk-2.0/menubar-toolbar %s" % version_folder)
             os.system("cp gtk-2.0/*.rc %s" % version_folder)
             os.system("cp gtk-2.0/gtkrc %s" % version_folder)
             # Gtk3
@@ -97,9 +96,9 @@
             os.system("cp -R gtk-2.0/assets-dark %s" % version_folder)
             os.system("rm -rf %s" % os.path.join(version_folder, "assets"))
             os.system("mv %s %s" % (os.path.join(version_folder, "assets-dark"), os.path.join(version_folder, "assets")))
-            os.system("cp -R gtk-2.0/menubar-toolbar %s" % version_folder)
             os.system("cp gtk-2.0/*.rc %s" % version_folder)
             os.system("cp gtk-2.0/gtkrc-dark %s" % os.path.join(version_folder, "gtkrc"))
+            os.system("cp gtk-2.0/menubar-toolbar-dark.rc %s" % os.path.join(version_folder, "menubar-toolbar.rc"))
             # Gtk3
             version_folder = os.path.join(dest_folder, "gtk-3.0")
             os.system("mkdir -p %s" % version_folder)

src/Mint-Y/gtk-2.0/gtkrc

@@ -7,4 +7,4 @@ gtk-primary-button-warps-slider = 1
 include "main.rc"
 include "apps.rc"
 include "panel.rc"
-include "menubar-toolbar/menubar-toolbar.rc"
+include "menubar-toolbar.rc"

src/Mint-Y/gtk-2.0/gtkrc-dark

@@ -7,4 +7,4 @@ gtk-primary-button-warps-slider = 1
 include "main.rc"
 include "apps.rc"
 include "panel.rc"
-include "menubar-toolbar/menubar-toolbar-dark.rc"
+include "menubar-toolbar.rc"

src/Mint-Y/gtk-2.0/menubar-toolbar/menubar-toolbar-dark.rc src/Mint-Y/gtk-2.0/menubar-toolbar-dark.rc

@@ -14,7 +14,7 @@ style "menubar" {
 
     image {
       function = BOX
-      file  = "menubar-toolbar/menubar-dark.png"
+      file  = "assets/menubar.png"
       stretch  = TRUE
       border = { 1, 1, 1, 1 }
     }
@@ -54,7 +54,7 @@ style "menubar_item" {
     image {
       function = BOX
       state = PRELIGHT
-      file = "menubar-toolbar/menubar_button-dark.png"
+      file = "assets/menubar_button.png"
       border = { 2, 2, 2, 2 }
       stretch = TRUE
     }
@@ -94,31 +94,31 @@ style "toolbar_button" {
     image {
       function = BOX
       state = NORMAL
-      file = "menubar-toolbar/button.png"
+      file = "assets/button.png"
       border = { 4, 4, 4, 4 }
       stretch = TRUE
     }
 
     image {
       function = BOX
       state = PRELIGHT
-      file = "menubar-toolbar/button-hover.png"
+      file = "assets/button-hover.png"
       border = { 4, 4, 4, 4 }
       stretch = TRUE
     }
 
     image {
       function = BOX
       state = ACTIVE
-      file = "menubar-toolbar/button-active.png"
+      file = "assets/button-active.png"
       border = { 4, 4, 4, 4 }
       stretch = TRUE
     }
 
     image {
       function = BOX
       state = INSENSITIVE
-      file = "menubar-toolbar/button-insensitive.png"
+      file = "assets/button-insensitive.png"
       border = { 4, 4, 4, 4 }
       stretch = TRUE
     }
@@ -140,7 +140,7 @@ style "toolbar_entry" {
       detail = "entry"
       state = NORMAL
       shadow = IN
-      file = "menubar-toolbar/toolbar-entry-border-bg-dark.png"
+      file = "assets/toolbar-entry-border-bg.png"
       border = { 12, 12, 12, 12 }
       stretch = TRUE
     }
@@ -150,7 +150,7 @@ style "toolbar_entry" {
       detail = "entry"
       state = INSENSITIVE
       shadow = IN
-      file = "menubar-toolbar/toolbar-entry-border-disabled-bg-dark.png"
+      file = "assets/toolbar-entry-border-disabled-bg.png"
       border = { 12, 12, 12, 12 }
       stretch = TRUE
     }
@@ -159,7 +159,7 @@ style "toolbar_entry" {
       function = SHADOW
       detail = "entry"
       state = ACTIVE
-      file = "menubar-toolbar/toolbar-entry-border-active-bg-dark.png"
+      file = "assets/toolbar-entry-border-active-bg.png"
       border = { 12, 12, 12, 12 }
       stretch = TRUE
     }

src/Mint-Y/gtk-2.0/menubar-toolbar/menubar-toolbar.rc src/Mint-Y/gtk-2.0/menubar-toolbar.rc

@@ -14,7 +14,7 @@ style "menubar" {
 
     image {
       function = BOX
-      file  = "menubar-toolbar/menubar.png"
+      file  = "assets/menubar.png"
       stretch  = TRUE
       border = { 1, 1, 1, 1 }
     }
@@ -54,7 +54,7 @@ style "menubar_item" {
     image {
       function = BOX
       state = PRELIGHT
-      file = "menubar-toolbar/menubar_button.png"
+      file = "assets/menubar_button.png"
       border = { 2, 2, 2, 2 }
       stretch = TRUE
     }
@@ -85,7 +85,7 @@ style "toolbar_entry" {
       detail = "entry"
       state = NORMAL
       shadow = IN
-      file = "menubar-toolbar/toolbar-entry-border-bg.png"
+      file = "assets/toolbar-entry-border-bg.png"
       border = { 12, 12, 12, 12 }
       stretch = TRUE
     }
@@ -95,7 +95,7 @@ style "toolbar_entry" {
       detail = "entry"
       state = INSENSITIVE
       shadow = IN
-      file = "menubar-toolbar/toolbar-entry-border-disabled-bg.png"
+      file = "assets/toolbar-entry-border-disabled-bg.png"
       border = { 12, 12, 12, 12 }
       stretch = TRUE
     }
@@ -104,7 +104,7 @@ style "toolbar_entry" {
       function = SHADOW
       detail = "entry"
       state = ACTIVE
-      file = "menubar-toolbar/toolbar-entry-border-active-bg.png"
+      file = "assets/toolbar-entry-border-active-bg.png"
       border = { 12, 12, 12, 12 }
       stretch = TRUE
     }