diff --git a/common/gtk-2.0/assets/menubar_button.png b/common/gtk-2.0/assets/menubar_button.png index f6d3b89..70c8f86 100644 Binary files a/common/gtk-2.0/assets/menubar_button.png and b/common/gtk-2.0/assets/menubar_button.png differ diff --git a/common/gtk-2.0/menubar-toolbar/button-active.png b/common/gtk-2.0/menubar-toolbar/button-active.png index 29cd827..ad0dd36 100644 Binary files a/common/gtk-2.0/menubar-toolbar/button-active.png and b/common/gtk-2.0/menubar-toolbar/button-active.png differ diff --git a/common/gtk-2.0/menubar-toolbar/button-hover.png b/common/gtk-2.0/menubar-toolbar/button-hover.png index b8a6e0e..ec020de 100644 Binary files a/common/gtk-2.0/menubar-toolbar/button-hover.png and b/common/gtk-2.0/menubar-toolbar/button-hover.png differ diff --git a/common/gtk-2.0/menubar-toolbar/button-insensitive.png b/common/gtk-2.0/menubar-toolbar/button-insensitive.png index fc776f1..a96be6e 100644 Binary files a/common/gtk-2.0/menubar-toolbar/button-insensitive.png and b/common/gtk-2.0/menubar-toolbar/button-insensitive.png differ diff --git a/common/gtk-2.0/menubar-toolbar/button.png b/common/gtk-2.0/menubar-toolbar/button.png index 5105fda..102c97f 100644 Binary files a/common/gtk-2.0/menubar-toolbar/button.png and b/common/gtk-2.0/menubar-toolbar/button.png differ diff --git a/common/gtk-2.0/menubar-toolbar/menubar-dark.png b/common/gtk-2.0/menubar-toolbar/menubar-dark.png index 4a4222a..e69ee01 100644 Binary files a/common/gtk-2.0/menubar-toolbar/menubar-dark.png and b/common/gtk-2.0/menubar-toolbar/menubar-dark.png differ diff --git a/common/gtk-2.0/menubar-toolbar/menubar.png b/common/gtk-2.0/menubar-toolbar/menubar.png index ff49952..1a65249 100644 Binary files a/common/gtk-2.0/menubar-toolbar/menubar.png and b/common/gtk-2.0/menubar-toolbar/menubar.png differ diff --git a/common/gtk-2.0/menubar-toolbar/menubar_button-dark.png b/common/gtk-2.0/menubar-toolbar/menubar_button-dark.png index 717575a..70c8f86 100644 Binary files a/common/gtk-2.0/menubar-toolbar/menubar_button-dark.png and b/common/gtk-2.0/menubar-toolbar/menubar_button-dark.png differ diff --git a/common/gtk-2.0/menubar-toolbar/menubar_button.png b/common/gtk-2.0/menubar-toolbar/menubar_button.png index 717575a..70c8f86 100644 Binary files a/common/gtk-2.0/menubar-toolbar/menubar_button.png and b/common/gtk-2.0/menubar-toolbar/menubar_button.png differ diff --git a/common/gtk-2.0/render-assets.sh b/common/gtk-2.0/render-assets.sh index 43861c7..71114bf 100755 --- a/common/gtk-2.0/render-assets.sh +++ b/common/gtk-2.0/render-assets.sh @@ -5,10 +5,15 @@ OPTIPNG="/usr/bin/optipng" SRC_FILE="assets.svg" ASSETS_DIR="assets" + +DARK_SRC_FILE="assets-dark.svg" +DARK_ASSETS_DIR="assets-dark" + INDEX="assets.txt" for i in `cat $INDEX` -do +do + if [ -f $ASSETS_DIR/$i.png ]; then echo $ASSETS_DIR/$i.png exists. else @@ -19,5 +24,37 @@ else --export-png=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null \ && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png fi + +if [ -f $DARK_ASSETS_DIR/$i.png ]; then + echo $DARK_ASSETS_DIR/$i.png exists. +else + echo + echo Rendering $DARK_ASSETS_DIR/$i.png + $INKSCAPE --export-id=$i \ + --export-id-only \ + --export-png=$DARK_ASSETS_DIR/$i.png $DARK_SRC_FILE >/dev/null \ + && $OPTIPNG -o7 --quiet $DARK_ASSETS_DIR/$i.png +fi done + +cp $ASSETS_DIR/entry-toolbar.png menubar-toolbar/entry-toolbar.png +cp $ASSETS_DIR/entry-active-toolbar.png menubar-toolbar/entry-active-toolbar.png +cp $ASSETS_DIR/entry-disabled-toolbar.png menubar-toolbar/entry-disabled-toolbar.png + +cp $ASSETS_DIR/menubar.png menubar-toolbar/menubar.png +cp $ASSETS_DIR/menubar_button.png menubar-toolbar/menubar_button.png + + +cp $DARK_ASSETS_DIR/button.png menubar-toolbar/button.png +cp $DARK_ASSETS_DIR/button-hover.png menubar-toolbar/button-hover.png +cp $DARK_ASSETS_DIR/button-active.png menubar-toolbar/button-active.png +cp $DARK_ASSETS_DIR/button-insensitive.png menubar-toolbar/button-insensitive.png + +cp $DARK_ASSETS_DIR/entry-toolbar.png menubar-toolbar/entry-toolbar-dark.png +cp $DARK_ASSETS_DIR/entry-active-toolbar.png menubar-toolbar/entry-active-toolbar-dark.png +cp $DARK_ASSETS_DIR/entry-disabled-toolbar.png menubar-toolbar/entry-disabled-toolbar-dark.png + +cp $DARK_ASSETS_DIR/menubar.png menubar-toolbar/menubar-dark.png +cp $DARK_ASSETS_DIR/menubar_button.png menubar-toolbar/menubar_button-dark.png + exit 0 diff --git a/common/gtk-2.0/render-dark-assets.sh b/common/gtk-2.0/render-dark-assets.sh deleted file mode 100755 index fd2c80b..0000000 --- a/common/gtk-2.0/render-dark-assets.sh +++ /dev/null @@ -1,23 +0,0 @@ -#! /bin/bash - -INKSCAPE="/usr/bin/inkscape" -OPTIPNG="/usr/bin/optipng" - -SRC_FILE="assets-dark.svg" -ASSETS_DIR="assets-dark" -INDEX="assets.txt" - -for i in `cat $INDEX` -do -if [ -f $ASSETS_DIR/$i.png ]; then - echo $ASSETS_DIR/$i.png exists. -else - echo - echo Rendering $ASSETS_DIR/$i.png - $INKSCAPE --export-id=$i \ - --export-id-only \ - --export-png=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null \ - && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png -fi -done -exit 0