From 49ae14bf6df2e114977d98d3eaf160cf8f8262ea Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 8 Jul 2013 23:39:32 +0200 Subject: [PATCH] Heavy gtk2 cleaning --- .../Lubuntu-default/gtk-2.0/apps/banshee.rc | 23 ---- .../themes/Lubuntu-default/gtk-2.0/arrow.rc | 102 ------------------ .../gtk-2.0/{apps => assets}/chromium.rc | 0 .../gtk-2.0/{ => assets}/entry.rc | 0 .../gtk-2.0/{apps => assets}/ff.rc | 0 .../{apps => assets}/gnome-terminal.rc | 0 .../gtk-2.0/{ => assets}/lxpanel.rc | 0 .../gtk-2.0/{apps => assets}/nautilus.rc | 0 .../gtk-2.0/{ => assets}/notebook.rc | 0 .../gtk-2.0/{ => assets}/pcmanfm.rc | 0 .../gtk-2.0/{ => assets}/statusbar.rc | 0 .../gtk-2.0/{ => assets}/toolbar.rc | 0 .../gtk-2.0/{ => assets}/xfce4-notifyd.rc | 0 .../themes/Lubuntu-default/gtk-2.0/gtkrc | 26 +++-- .../arrow-down-active-combo.png | Bin .../{ => deprecated}/arrow-down-combo.png | Bin .../{ => deprecated}/arrow-down-ins-combo.png | Bin .../arrow-up-active-combo.png | Bin .../{ => deprecated}/arrow-up-combo.png | Bin .../{ => deprecated}/arrow-up-ins-combo.png | Bin .../images/{ => deprecated}/button-spin.png | Bin .../images/{ => deprecated}/c_box-active.png | Bin .../images/{ => deprecated}/c_box-ins.png | Bin .../gtk-2.0/images/{ => deprecated}/c_box.png | Bin 24 files changed, 12 insertions(+), 139 deletions(-) delete mode 100644 usr/share/themes/Lubuntu-default/gtk-2.0/apps/banshee.rc delete mode 100644 usr/share/themes/Lubuntu-default/gtk-2.0/arrow.rc rename usr/share/themes/Lubuntu-default/gtk-2.0/{apps => assets}/chromium.rc (100%) rename usr/share/themes/Lubuntu-default/gtk-2.0/{ => assets}/entry.rc (100%) rename usr/share/themes/Lubuntu-default/gtk-2.0/{apps => assets}/ff.rc (100%) rename usr/share/themes/Lubuntu-default/gtk-2.0/{apps => assets}/gnome-terminal.rc (100%) rename usr/share/themes/Lubuntu-default/gtk-2.0/{ => assets}/lxpanel.rc (100%) rename usr/share/themes/Lubuntu-default/gtk-2.0/{apps => assets}/nautilus.rc (100%) rename usr/share/themes/Lubuntu-default/gtk-2.0/{ => assets}/notebook.rc (100%) rename usr/share/themes/Lubuntu-default/gtk-2.0/{ => assets}/pcmanfm.rc (100%) rename usr/share/themes/Lubuntu-default/gtk-2.0/{ => assets}/statusbar.rc (100%) rename usr/share/themes/Lubuntu-default/gtk-2.0/{ => assets}/toolbar.rc (100%) rename usr/share/themes/Lubuntu-default/gtk-2.0/{ => assets}/xfce4-notifyd.rc (100%) rename usr/share/themes/Lubuntu-default/gtk-2.0/images/{ => deprecated}/arrow-down-active-combo.png (100%) rename usr/share/themes/Lubuntu-default/gtk-2.0/images/{ => deprecated}/arrow-down-combo.png (100%) rename usr/share/themes/Lubuntu-default/gtk-2.0/images/{ => deprecated}/arrow-down-ins-combo.png (100%) rename usr/share/themes/Lubuntu-default/gtk-2.0/images/{ => deprecated}/arrow-up-active-combo.png (100%) rename usr/share/themes/Lubuntu-default/gtk-2.0/images/{ => deprecated}/arrow-up-combo.png (100%) rename usr/share/themes/Lubuntu-default/gtk-2.0/images/{ => deprecated}/arrow-up-ins-combo.png (100%) rename usr/share/themes/Lubuntu-default/gtk-2.0/images/{ => deprecated}/button-spin.png (100%) rename usr/share/themes/Lubuntu-default/gtk-2.0/images/{ => deprecated}/c_box-active.png (100%) rename usr/share/themes/Lubuntu-default/gtk-2.0/images/{ => deprecated}/c_box-ins.png (100%) rename usr/share/themes/Lubuntu-default/gtk-2.0/images/{ => deprecated}/c_box.png (100%) diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/apps/banshee.rc b/usr/share/themes/Lubuntu-default/gtk-2.0/apps/banshee.rc deleted file mode 100644 index d49aaf7..0000000 --- a/usr/share/themes/Lubuntu-default/gtk-2.0/apps/banshee.rc +++ /dev/null @@ -1,23 +0,0 @@ -# ============================================================================== -# BANSHEE SPECIFIC SETTINGS -# ============================================================================== - -style "banshee_scrollbar" { - engine "murrine" { - roundness = 20 - } -} - -widget "__gtksharp_1*SeekSlider*" style "scale" -widget "__gtksharp_1*Player*croll*" style "banshee_scrollbar" - -widget_class "__gtksharp_1**" style "default" -widget_class "__gtksharp_1**" style "button" -#widget_class "__gtksharp_1**" style "scale" - - - - - - - diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/arrow.rc b/usr/share/themes/Lubuntu-default/gtk-2.0/arrow.rc deleted file mode 100644 index 19584ca..0000000 --- a/usr/share/themes/Lubuntu-default/gtk-2.0/arrow.rc +++ /dev/null @@ -1,102 +0,0 @@ -######################################################################## -# Arrow -######################################################################## - -style "arrow" { - # UP - engine "pixmap" { - image - { - function = ARROW - state = NORMAL - recolorable = TRUE - overlay_file = "images/arrow-up-combo.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = UP - } - image - { - function = ARROW - state = PRELIGHT - recolorable = TRUE - overlay_file = "images/arrow-up-combo.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = UP - } - image - { - function = ARROW - state = ACTIVE - recolorable = TRUE - overlay_file = "images/arrow-up-active-combo.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = UP - } - image - { - function = ARROW - state = INSENSITIVE - recolorable = TRUE - overlay_file = "images/arrow-up-ins-combo.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = UP - } - - # DOWN - image - { - function = ARROW - state = NORMAL - recolorable = TRUE - overlay_file = "images/arrow-down-combo.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = DOWN - } - image - { - function = ARROW - state = PRELIGHT - recolorable = TRUE - overlay_file = "images/arrow-down-combo.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = DOWN - } - image - { - function = ARROW - state = ACTIVE - recolorable = TRUE - overlay_file = "images/arrow-down-active-combo.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = DOWN - } - image - { - function = ARROW - state = INSENSITIVE - recolorable = TRUE - overlay_file = "images/arrow-down-ins-combo.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = DOWN - } - - image # used for dialog bg. in apps. like Inkscape - { - function = BOX - recolorable = TRUE - file = "images/null.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - } - } -} - -class "GtkArrow*" style "arrow" diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/apps/chromium.rc b/usr/share/themes/Lubuntu-default/gtk-2.0/assets/chromium.rc similarity index 100% rename from usr/share/themes/Lubuntu-default/gtk-2.0/apps/chromium.rc rename to usr/share/themes/Lubuntu-default/gtk-2.0/assets/chromium.rc diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/entry.rc b/usr/share/themes/Lubuntu-default/gtk-2.0/assets/entry.rc similarity index 100% rename from usr/share/themes/Lubuntu-default/gtk-2.0/entry.rc rename to usr/share/themes/Lubuntu-default/gtk-2.0/assets/entry.rc diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/apps/ff.rc b/usr/share/themes/Lubuntu-default/gtk-2.0/assets/ff.rc similarity index 100% rename from usr/share/themes/Lubuntu-default/gtk-2.0/apps/ff.rc rename to usr/share/themes/Lubuntu-default/gtk-2.0/assets/ff.rc diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/apps/gnome-terminal.rc b/usr/share/themes/Lubuntu-default/gtk-2.0/assets/gnome-terminal.rc similarity index 100% rename from usr/share/themes/Lubuntu-default/gtk-2.0/apps/gnome-terminal.rc rename to usr/share/themes/Lubuntu-default/gtk-2.0/assets/gnome-terminal.rc diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/lxpanel.rc b/usr/share/themes/Lubuntu-default/gtk-2.0/assets/lxpanel.rc similarity index 100% rename from usr/share/themes/Lubuntu-default/gtk-2.0/lxpanel.rc rename to usr/share/themes/Lubuntu-default/gtk-2.0/assets/lxpanel.rc diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/apps/nautilus.rc b/usr/share/themes/Lubuntu-default/gtk-2.0/assets/nautilus.rc similarity index 100% rename from usr/share/themes/Lubuntu-default/gtk-2.0/apps/nautilus.rc rename to usr/share/themes/Lubuntu-default/gtk-2.0/assets/nautilus.rc diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/notebook.rc b/usr/share/themes/Lubuntu-default/gtk-2.0/assets/notebook.rc similarity index 100% rename from usr/share/themes/Lubuntu-default/gtk-2.0/notebook.rc rename to usr/share/themes/Lubuntu-default/gtk-2.0/assets/notebook.rc diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/pcmanfm.rc b/usr/share/themes/Lubuntu-default/gtk-2.0/assets/pcmanfm.rc similarity index 100% rename from usr/share/themes/Lubuntu-default/gtk-2.0/pcmanfm.rc rename to usr/share/themes/Lubuntu-default/gtk-2.0/assets/pcmanfm.rc diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/statusbar.rc b/usr/share/themes/Lubuntu-default/gtk-2.0/assets/statusbar.rc similarity index 100% rename from usr/share/themes/Lubuntu-default/gtk-2.0/statusbar.rc rename to usr/share/themes/Lubuntu-default/gtk-2.0/assets/statusbar.rc diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/toolbar.rc b/usr/share/themes/Lubuntu-default/gtk-2.0/assets/toolbar.rc similarity index 100% rename from usr/share/themes/Lubuntu-default/gtk-2.0/toolbar.rc rename to usr/share/themes/Lubuntu-default/gtk-2.0/assets/toolbar.rc diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/xfce4-notifyd.rc b/usr/share/themes/Lubuntu-default/gtk-2.0/assets/xfce4-notifyd.rc similarity index 100% rename from usr/share/themes/Lubuntu-default/gtk-2.0/xfce4-notifyd.rc rename to usr/share/themes/Lubuntu-default/gtk-2.0/assets/xfce4-notifyd.rc diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/gtkrc b/usr/share/themes/Lubuntu-default/gtk-2.0/gtkrc index 4f22d36..c590a3d 100644 --- a/usr/share/themes/Lubuntu-default/gtk-2.0/gtkrc +++ b/usr/share/themes/Lubuntu-default/gtk-2.0/gtkrc @@ -36,7 +36,7 @@ style "default" { GtkScale::trough-border = 0 GtkScale::slider-width = 23 GtkScale::slider-length = 14 - GtkScale::trough-side-details = 1 + GtkScale::trough-side-details = 0 GtkScrollbar ::has-backward-stepper = 0 GtkScrollbar ::has-forward-stepper = 1 @@ -44,7 +44,7 @@ style "default" { GtkScrollbar ::slider-width = 9 GtkScrollbar ::trough-border = 3 GtkScrollbar ::activate-slider = FALSE - GtkScrollbar ::trough-side-details = FALSE + GtkScrollbar ::trough-side-details = 0 GtkScrollbar ::stepper-size = 1 GtkScrolledWindow ::scrollbar-spacing = 0 @@ -685,15 +685,13 @@ widget "*IdoEntryMenuItem*" style "wide" widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround" # Includes -include "apps/ff.rc" -include "apps/chromium.rc" -include "apps/gnome-terminal.rc" -include "apps/nautilus.rc" -include "lxpanel.rc" -include "arrow.rc" -#include "notebook.rc" ' This needs revision -include "entry.rc" -include "statusbar.rc" -include "toolbar.rc" -include "pcmanfm.rc" -include "xfce4-notifyd.rc" +include "assets/ff.rc" +include "assets/chromium.rc" +include "assets/gnome-terminal.rc" +include "assets/nautilus.rc" +include "assets/lxpanel.rc" +include "assets/entry.rc" +include "assets/statusbar.rc" +include "assets/toolbar.rc" +include "assets/pcmanfm.rc" +include "assets/xfce4-notifyd.rc" diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/images/arrow-down-active-combo.png b/usr/share/themes/Lubuntu-default/gtk-2.0/images/deprecated/arrow-down-active-combo.png similarity index 100% rename from usr/share/themes/Lubuntu-default/gtk-2.0/images/arrow-down-active-combo.png rename to usr/share/themes/Lubuntu-default/gtk-2.0/images/deprecated/arrow-down-active-combo.png diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/images/arrow-down-combo.png b/usr/share/themes/Lubuntu-default/gtk-2.0/images/deprecated/arrow-down-combo.png similarity index 100% rename from usr/share/themes/Lubuntu-default/gtk-2.0/images/arrow-down-combo.png rename to usr/share/themes/Lubuntu-default/gtk-2.0/images/deprecated/arrow-down-combo.png diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/images/arrow-down-ins-combo.png b/usr/share/themes/Lubuntu-default/gtk-2.0/images/deprecated/arrow-down-ins-combo.png similarity index 100% rename from usr/share/themes/Lubuntu-default/gtk-2.0/images/arrow-down-ins-combo.png rename to usr/share/themes/Lubuntu-default/gtk-2.0/images/deprecated/arrow-down-ins-combo.png diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/images/arrow-up-active-combo.png b/usr/share/themes/Lubuntu-default/gtk-2.0/images/deprecated/arrow-up-active-combo.png similarity index 100% rename from usr/share/themes/Lubuntu-default/gtk-2.0/images/arrow-up-active-combo.png rename to usr/share/themes/Lubuntu-default/gtk-2.0/images/deprecated/arrow-up-active-combo.png diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/images/arrow-up-combo.png b/usr/share/themes/Lubuntu-default/gtk-2.0/images/deprecated/arrow-up-combo.png similarity index 100% rename from usr/share/themes/Lubuntu-default/gtk-2.0/images/arrow-up-combo.png rename to usr/share/themes/Lubuntu-default/gtk-2.0/images/deprecated/arrow-up-combo.png diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/images/arrow-up-ins-combo.png b/usr/share/themes/Lubuntu-default/gtk-2.0/images/deprecated/arrow-up-ins-combo.png similarity index 100% rename from usr/share/themes/Lubuntu-default/gtk-2.0/images/arrow-up-ins-combo.png rename to usr/share/themes/Lubuntu-default/gtk-2.0/images/deprecated/arrow-up-ins-combo.png diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/images/button-spin.png b/usr/share/themes/Lubuntu-default/gtk-2.0/images/deprecated/button-spin.png similarity index 100% rename from usr/share/themes/Lubuntu-default/gtk-2.0/images/button-spin.png rename to usr/share/themes/Lubuntu-default/gtk-2.0/images/deprecated/button-spin.png diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/images/c_box-active.png b/usr/share/themes/Lubuntu-default/gtk-2.0/images/deprecated/c_box-active.png similarity index 100% rename from usr/share/themes/Lubuntu-default/gtk-2.0/images/c_box-active.png rename to usr/share/themes/Lubuntu-default/gtk-2.0/images/deprecated/c_box-active.png diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/images/c_box-ins.png b/usr/share/themes/Lubuntu-default/gtk-2.0/images/deprecated/c_box-ins.png similarity index 100% rename from usr/share/themes/Lubuntu-default/gtk-2.0/images/c_box-ins.png rename to usr/share/themes/Lubuntu-default/gtk-2.0/images/deprecated/c_box-ins.png diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/images/c_box.png b/usr/share/themes/Lubuntu-default/gtk-2.0/images/deprecated/c_box.png similarity index 100% rename from usr/share/themes/Lubuntu-default/gtk-2.0/images/c_box.png rename to usr/share/themes/Lubuntu-default/gtk-2.0/images/deprecated/c_box.png