diff --git a/SConstruct b/SConstruct index da68ac9..d8f986c 100644 --- a/SConstruct +++ b/SConstruct @@ -69,7 +69,7 @@ if env['PLATFORM'] == 'darwin' or env.GetPackageType() == 'rpm': vendor = 'Folding@home', url = 'https://foldingathome.org/', license = 'LICENSE.txt', - bug_url = 'https://foldingathome.org/bugs/', + bug_url = 'https://apps.foldingathome.org/bugs/', summary = 'Folding@home Control', description = \ 'Control and monitor local and remote Folding@home clients', diff --git a/fah/ClientConfig.py b/fah/ClientConfig.py index 1ec469d..14979af 100644 --- a/fah/ClientConfig.py +++ b/fah/ClientConfig.py @@ -252,7 +252,8 @@ class ClientConfig: # Update the UI self.update_work_unit_info(app) - + else: app.queue_tree.get_selection().unselect_all() + def select_queue_slot(self, app): # Get unit ID of selected queue entry diff --git a/fah/FAHControl.glade b/fah/FAHControl.glade index 80ee1fc..83d4ac6 100644 --- a/fah/FAHControl.glade +++ b/fah/FAHControl.glade @@ -1213,7 +1213,7 @@ Would you like to configure your identity now? False True none - https://foldingathome.org/newpasskey + https://apps.foldingathome.org/passkey/create False diff --git a/fah/FAHControl.py b/fah/FAHControl.py index d450444..437562b 100644 --- a/fah/FAHControl.py +++ b/fah/FAHControl.py @@ -127,7 +127,7 @@ class FAHControl(SingleAppServer): # Glade editor strips the '&'s on save. Even if you use '&' the # ampersands get striped when resaved. team_stats_links = [ - ['Folding@home', 'https://foldingathome.org/stats/team/%(team)s'], + ['Folding@home', 'https://stats.foldingathome.org/team/%(team)s'], ['Extreme Overclocking', 'http://folding.extremeoverclocking.com/' 'team_summary.php?t=%(team)s'], ['Kakao Stats', 'http://kakaostats.com/tsum.php?t=%(team)s'], @@ -136,7 +136,7 @@ class FAHControl(SingleAppServer): ['Custom', ''], ] donor_stats_links = [ - ['Folding@home', 'https://foldingathome.org/stats/donor/%(donor)s'], + ['Folding@home', 'https://stats.foldingathome.org/donor/%(donor)s'], ['Custom', ''], ] diff --git a/setup.py b/setup.py index 40f7fee..97ca917 100644 --- a/setup.py +++ b/setup.py @@ -90,9 +90,10 @@ else: try: version = open('version.txt').read().strip() -except: version = None + version.split('.') +except: version = '0.0.0' -if version is not None: +if not os.path.exists('fah/Version.py'): open('fah/Version.py', 'w').write('version = \'%s\'\n' % version) description = \ diff --git a/themes/Win7-Basic/gtk-2.0/gtkrc b/themes/Win7-Basic/gtk-2.0/gtkrc deleted file mode 100755 index 7ebf1c7..0000000 --- a/themes/Win7-Basic/gtk-2.0/gtkrc +++ /dev/null @@ -1,1912 +0,0 @@ -# Azur 0.4 -################Comment out if you don't need################################################ -include "icons/iconrc" -include "menubar-blue.rc" -include "panel.rc" -#gtk-menu-drop-shadow = 1 -#gtk-menu-shadow-delay = 0 -gtk-icon-sizes = "panel-menu=24,24:panel=24,24:gtk-button=16,16:gtk-large-toolbar=24,24" -#:gtk-large-toolbar=28,28:gtk-small-toolbar=24,24" -############################################################################################# - -style "default" -{ - GtkWidget::interior_focus = 7 - GtkWidget::focus_padding = 0 - GtkButton::default_border = { 1, 1, 1, 1 } - GtkButton::default_outside_border = { 2, 2, 2, 2 } - - GtkRange::trough_border = 1 - GtkRange::slider_width = 15 - GtkRange::stepper_size = 15 - - GtkVScale::slider_length = 11 - GtkVScale::slider_width = 21 - GtkHScale::slider_length = 11 - GtkHScale::slider_width = 21 - - GtkPaned::handle_size = 6 - GtkScrollbar::min_slider_length = 50 - GtkCheckButton::indicator_size = 12 - GtkCheckButton::indicator_spacing = 3 - GtkMenuBar::internal_padding = 1 - GtkOptionMenu::indicator_size = { 15, 8 } - GtkOptionMenu::indicator_spacing = { 8, 2, 0, 0 } -GtkStatusbar::shadow_type = GTK_SHADOW_NONE -GtkSpinButton::shadow_type = GTK_SHADOW_NONE - - - xthickness = 1 - ythickness = 1 - - - fg[NORMAL] = "#353535" - fg[ACTIVE] = "#353535" - fg[PRELIGHT] = "#000000" - fg[SELECTED] = "#000000" - fg[INSENSITIVE] = "#9B9B9B" - - bg[NORMAL] = "#ebebeb" - bg[ACTIVE] = "#ebebeb" - bg[PRELIGHT] = "#FFFFFF" - bg[SELECTED] = "#B2C3D0" - bg[INSENSITIVE] = "#ffffff" - - base[NORMAL] = "#ffffff" - base[ACTIVE] = "#5fb9ed" - base[PRELIGHT] = "#FFFFFF" - base[INSENSITIVE]= "#f4f4f4" - base[SELECTED] = "#5fb9ed" - - text[INSENSITIVE]= "#9B9B9B" - text[SELECTED] = "#ffffff" - text[ACTIVE] = "#ffffff" - text[PRELIGHT] = "#353535" - - - - engine "pixmap" - { - - - - image - { - function = HANDLE - recolorable = TRUE - overlay_file = "Handles/handle-v.png" - overlay_stretch = FALSE - orientation = HORIZONTAL - } - image - { - function = HANDLE - recolorable = TRUE - overlay_file = "Handles/handle-h.png" - overlay_stretch = FALSE - orientation = VERTICAL - } - -####################### SHADOWS ############################x - - image - { - function = SHADOW - shadow = IN - recolorable = FALSE - file = "Shadows/shadow-in.png" - border = { 3, 3, 2, 2 } - stretch = TRUE - } - image - { - function = SHADOW - shadow = OUT - recolorable = TRUE - file = "Shadows/shadow-out.png" - border = { 1, 1, 1, 1 } - stretch = TRUE - } - - - - image - { - function = SHADOW - shadow = ETCHED_IN - recolorable = TRUE - file = "Frame-Gap/frame1.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - } - image - { - function = SHADOW - shadow = ETCHED_OUT - recolorable = TRUE - file = "Shadows/shadow-none.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - } - image - { - function = SHADOW_GAP - recolorable = TRUE - file = "Frame-Gap/frame1.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - gap_start_file = "Frame-Gap/frame-gap-start.png" - gap_start_border = { 2, 0, 2, 0 } - gap_end_file = "Frame-Gap/frame-gap-end.png" - gap_end_border = { 0, 2, 2, 0 } - gap_side = TOP - } - image - { - function = VLINE - recolorable = TRUE - file = "Lines/line-v.png" - border = { 1, 1, 0, 0 } - stretch = TRUE - } - image - { - function = HLINE - recolorable = TRUE - file = "Lines/line-h.png" - border = { 0, 0, 1, 1 } - stretch = TRUE - } - - # focus - - image - { - function = FOCUS - recolorable = TRUE - file = "Others/focus.png" - border = { 6, 0, 6, 0 } - stretch = TRUE - } - - # arrows - - image - { - function = ARROW - recolorable = TRUE - overlay_file = "Arrows/arrow-up.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = UP - } - image - { - function = ARROW - recolorable = TRUE - overlay_file = "Arrows/arrow-down.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = DOWN - } - image - { - function = ARROW - recolorable = TRUE - overlay_file = "Arrows/arrow-left.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = LEFT - } - image - { - function = ARROW - recolorable = TRUE - overlay_file = "Arrows/arrow-right.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - arrow_direction = RIGHT - } - image - { - function = BOX - recolorable = TRUE - file = "Toolbar/toolbar.png" - border = { 3, 3, 3, 3 } - stretch = TRUE - } - } -} - -class "GtkWidget" style "default" - -#################### BUTTONS ####################### - -style "button" = "default" -{ - - - - engine "pixmap" - { - image - { - function = BOX - detail = "buttondefault" - recolorable = TRUE - file = "Buttons/button-default.png" - border = {4, 4, 4, 4} - stretch = TRUE - } - image - { - function = BOX - state = PRELIGHT - recolorable = TRUE - file = "Buttons/button-prelight.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - image - { - function = BOX - state = ACTIVE - file = "Buttons/button-pressed.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - image - { - function = BOX - state = INSENSITIVE - file = "Buttons/button-insensitive.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - image - { - function = BOX - file = "Buttons/button-normal.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - } -} - - -style "checkradiobutton" { - engine "pixmap" { - image - { - function = FLAT_BOX - recolorable = TRUE - file = "Check-Radio/highlight.png" - border = { 2, 5, 2, 5 } - stretch = TRUE - } - } -} - -class "GtkRadioButton" style "checkradiobutton" -class "GtkCheckButton" style "checkradiobutton" - - -style "optionmenu" = "default" -{ - engine "pixmap" - { - image - { - function = BOX - recolorable = TRUE - state = PRELIGHT - file = "Combo/combo-prelight.png" - border = { 5, 5, 5, 5} - stretch = TRUE - } - image - { - function = BOX - recolorable = TRUE - state = NORMAL - file = "Combo/combo-normal.png" - border = { 5, 5, 5, 5} - stretch = TRUE - } - - image - { - function = BOX - recolorable = TRUE - state = ACTIVE - file = "Combo/combo-prelight.png" - border = { 5, 5, 5, 5} - stretch = TRUE - } - image - { - function = BOX - recolorable = TRUE - state = INSENSITIVE - file = "Combo/combo-normal.png" - border = { 5, 5, 5, 5} - stretch = TRUE - } - image - { - function = TAB - state = INSENSITIVE - recolorable = TRUE - overlay_file = "Combo/combo-arrow-insens.png" - overlay_stretch = FALSE - } - image - { - function = TAB - recolorable = TRUE - state = NORMAL - overlay_file = "Combo/combo-arrow.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - } - image - { - function = TAB - recolorable = TRUE - state = PRELIGHT - overlay_file = "Combo/combo-arrow-prelight.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = FALSE - } - } -} - -widget_class "*Combo*" style "optionmenu" - -############################################################################### -###Check vagy mi.... ######## - -style "radiobutton" = "default" -{ - engine "pixmap" - { - #This is the image used to draw an unchecked box. - image - { - function = OPTION - recolorable = TRUE - state = NORMAL - shadow = OUT - overlay_file = "Check-Radio/option1.png" - overlay_stretch = FALSE - } - - image - { - function = OPTION - recolorable = TRUE - state = PRELIGHT - shadow = OUT - overlay_file = "Check-Radio/option1.png" - overlay_stretch = FALSE - } - - image - { - function = OPTION - recolorable = TRUE - state = ACTIVE - shadow = OUT - overlay_file = "Check-Radio/option1.png" - overlay_stretch = FALSE - } - - image - { - function = OPTION - recolorable = TRUE - state = INSENSITIVE - shadow = OUT - overlay_file = "Check-Radio/option1.png" - overlay_stretch = FALSE - } - - #This is the image used to draw a selected (checked) box. - image - { - function = OPTION - recolorable = TRUE - state = NORMAL - shadow = IN - overlay_file = "Check-Radio/option2.png" - overlay_stretch = FALSE - } - - image - { - function = OPTION - recolorable = TRUE - state = PRELIGHT - shadow = IN - overlay_file = "Check-Radio/option4.png" - overlay_stretch = FALSE - } - - image - { - function = OPTION - recolorable = TRUE - state = ACTIVE - shadow = IN - overlay_file = "Check-Radio/option4.png" - overlay_stretch = FALSE - } - - - image - { - function = OPTION - recolorable = TRUE - state = INSENSITIVE - shadow = IN - overlay_file = "Check-Radio/option1.png" - overlay_stretch = FALSE - } - - #Use this image to draw the highlight when a line with a check box - #is moused over. - image - { - function = FLAT_BOX - recolorable = TRUE - stretch = TRUE - file = "Check-Radio/checklight.png" - border = { 2, 2, 2, 2 } - } - - } -} - - - - - - - -################################################################################ - - - - - - - -################################################################################ -style "checkbutton" = "default" -{ - engine "pixmap" - { - #This is the image used to draw an unchecked box. - image - { - function = CHECK - recolorable = TRUE - state = NORMAL - shadow = OUT - overlay_file = "Check-Radio/check1.png" - overlay_stretch = FALSE - } - - image - { - function = CHECK - recolorable = TRUE - state = PRELIGHT - shadow = OUT - overlay_file = "Check-Radio/check1.png" - overlay_stretch = FALSE - } - - image - { - function = CHECK - recolorable = TRUE - state = ACTIVE - shadow = OUT - overlay_file = "Check-Radio/check1.png" - overlay_stretch = FALSE - } - - image - { - function = CHECK - recolorable = TRUE - state = INSENSITIVE - shadow = OUT - overlay_file = "Check-Radio/check1.png" - overlay_stretch = FALSE - } - - #This is the image used to draw a selected (checked) box. - image - { - function = CHECK - recolorable = TRUE - state = NORMAL - shadow = IN - overlay_file = "Check-Radio/check2.png" - overlay_stretch = FALSE - } - - image - { - function = CHECK - recolorable = TRUE - state = PRELIGHT - shadow = IN - overlay_file = "Check-Radio/check4.png" - overlay_stretch = FALSE - } - - image - { - function = CHECK - recolorable = TRUE - state = ACTIVE - shadow = IN - overlay_file = "Check-Radio/check4.png" - overlay_stretch = FALSE - } - - - image - { - function = CHECK - recolorable = TRUE - state = INSENSITIVE - shadow = IN - overlay_file = "Check-Radio/check1.png" - overlay_stretch = FALSE - } - - #Use this image to draw the highlight when a line with a check box - #is moused over. - image - { - function = FLAT_BOX - recolorable = TRUE - stretch = TRUE - file = "Check-Radio/checklight.png" - border = { 2, 2, 2, 2 } - } - - } -} - - -####################### ENTRY #####################xx - -style "entry" = "default" -{ - - xthickness = 3 - ythickness = 1 - - GtkWidget::interior_focus = 0 - #GtkEntry::shadow_type = GTK_SHADOW_NONE - engine "pixmap" - { - image - { - function = FOCUS - recolorable = TRUE - file = "Shadows/entry-shadow-in.png" - border = { 3,3,3,3 } - stretch = TRUE - } - image - { - function = BOX - recolorable = TRUE - shadow = IN - state = NORMAL - file = "Shadows/entry-shadow-in.png" - border = { 3,3,3,3 } - stretch = TRUE - } - -image - { - function = BOX - recolorable = TRUE - shadow = OUT - state = NORMAL - file = "Shadows/text-entry.png" - border = { 3,3,3,3 } - stretch = TRUE - } - - image - { - function = SHADOW - detail = "entry" - shadow = IN - recolorable = FALSE - file = "Shadows/text-entry.png" - border = { 3,3,3,3 } - stretch = TRUE - } - - } -} - -################x SPINBUTTONS ################ - -style "spinbutton" = "entry" -{ - - - engine "pixmap" - { - image - { - function = ARROW - } - -############################# UP ######################xx - image - { - function = BOX - state = NORMAL - detail = "spinbutton_up" - recolorable = TRUE - file = "Spin/spin.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - overlay_file = "Spin/spin-up.png" - overlay_stretch = FALSE - } - - image - { - function = BOX - state = PRELIGHT - detail = "spinbutton_up" - recolorable = TRUE - file = "Spin/spin.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - overlay_file = "Spin/spin-up-prelight.png" - overlay_stretch = FALSE - } - - image - { - function = BOX - state = INSENSITIVE - detail = "spinbutton_up" - recolorable = TRUE - file = "Spin/spin.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - overlay_file = "Spin/spin-up-disable.png" - overlay_stretch = FALSE - } - - image - { - function = BOX - state = ACTIVE - detail = "spinbutton_up" - recolorable = TRUE - file = "Spin/spin.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - overlay_file = "Spin/spin-up-prelight.png" - overlay_stretch = FALSE - } - - -###########################################x DOWN ######################## - image - { - function = BOX - state = NORMAL - detail = "spinbutton_down" - recolorable = TRUE - file = "Spin/spin.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - overlay_file = "Spin/spin-down.png" - overlay_stretch = FALSE - } - - image - { - function = BOX - state = PRELIGHT - detail = "spinbutton_down" - recolorable = TRUE - file = "Spin/spin.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - overlay_file = "Spin/spin-down-prelight.png" - overlay_stretch = FALSE - } - - image - { - function = BOX - state = INSENSITIVE - detail = "spinbutton_down" - recolorable = TRUE - file = "Spin/spin.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - overlay_file = "Spin/spin-down-disable.png" - overlay_stretch = FALSE - } - - image - { - function = BOX - state = ACTIVE - detail = "spinbutton_down" - recolorable = TRUE - file = "Spin/spin.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - overlay_file = "Spin/spin-down-prelight.png" - overlay_stretch = FALSE - } - - - - - - } -} - -############################# SCROLLBAR #################### - -style "scrollbar" = "default" -{ - engine "pixmap" - { - - image - { - function = BOX - recolorable = TRUE - detail = "trough" - file = "Scrollbars/trough-scrollbar-horiz.png" - border = { 19, 19, 2, 2 } - stretch = TRUE - orientation = HORIZONTAL - } - image - { - function = BOX - recolorable = TRUE - detail = "trough" - file = "Scrollbars/trough-scrollbar-vert.png" - border = { 2, 2, 19, 19 } - stretch = TRUE - orientation = VERTICAL - } - - -###########x SLIDERS ##################x - - image - { - function = SLIDER - recolorable = TRUE - state = NORMAL - file = "Scrollbars/slider-horiz.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - orientation = HORIZONTAL - overlay_file = "Scrollbars/scroll-thumb-horiz.png" - overlay_stretch = FALSE - orientation = HORIZONTAL - - - } - - image - { - function = SLIDER - recolorable = TRUE - state = ACTIVE - shadow = IN - file = "Scrollbars/slider-horiz.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - orientation = HORIZONTAL - overlay_file = "Scrollbars/scroll-thumb-horiz.png" - overlay_stretch = FALSE - orientation = HORIZONTAL - - } - - image - { - function = SLIDER - recolorable = TRUE - state = PRELIGHT - file = "Scrollbars/slider-horiz-prelight.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - orientation = HORIZONTAL - overlay_file = "Scrollbars/scroll-thumb-horiz.png" - overlay_stretch = FALSE - orientation = HORIZONTAL - - } - image - { - function = SLIDER - recolorable = TRUE - state = INSENSITIVE - file = "Scrollbars/slider-horiz-insens.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - orientation = HORIZONTAL - overlay_file = "Scrollbars/scroll-thumb-horiz.png" - overlay_stretch = FALSE - orientation = HORIZONTAL - - } - -#############x verticals################xx - - image - { - function = SLIDER - recolorable = TRUE - state = NORMAL - file = "Scrollbars/slider-vert.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - orientation = VERTICAL - overlay_file = "Scrollbars/scroll-thumb-vert.png" - overlay_stretch = FALSE - orientation = VERTICAL - - } - - image - { - function = SLIDER - recolorable = TRUE - state = ACTIVE - shadow = IN - file = "Scrollbars/slider-vert.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - orientation = VERTICAL - overlay_file = "Scrollbars/scroll-thumb-vert.png" - overlay_stretch = FALSE - orientation = VERTICAL - - } - - image - { - function = SLIDER - recolorable = TRUE - state = PRELIGHT - file = "Scrollbars/slider-vert-prelight.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - orientation = VERTICAL - overlay_file = "Scrollbars/scroll-thumb-vert.png" - overlay_stretch = FALSE - orientation = VERTICAL - - } - image - { - function = SLIDER - recolorable = TRUE - state = INSENSITIVE - file = "Scrollbars/slider-vert-insens.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - orientation = VERTICAL - overlay_file = "Scrollbars/scroll-thumb-vert.png" - overlay_stretch = FALSE - orientation = VERTICAL - - } - - -###########x END SLIDERS ##################x - -########### Steppers ###################### -#### UP ####### - image - { - function = STEPPER - recolorable = TRUE - state = NORMAL - file = "Scrollbars/stepper-up.png" - #border = { 12, 2, 2, 9 } - stretch = TRUE - arrow_direction = UP - } - image - { - function = STEPPER - recolorable = TRUE - state = PRELIGHT - file = "Scrollbars/stepper-up-prelight.png" - #border = { 12, 2, 2, 9 } - stretch = TRUE - arrow_direction = UP - } - image - { - function = STEPPER - recolorable = TRUE - state = ACTIVE - file = "Scrollbars/stepper-up-prelight.png" - #border = { 12, 2, 2, 9 } - stretch = TRUE - arrow_direction = UP - } - image - { - function = STEPPER - recolorable = TRUE - state = INSENSITIVE - file = "Scrollbars/stepper-up-insens.png" - #border = { 12, 2, 2, 9 } - stretch = TRUE - arrow_direction = UP - } - - ######### DOWN ############ - - - image - { - function = STEPPER - recolorable = TRUE - state = NORMAL - file = "Scrollbars/stepper-down.png" - #border = { 12, 2, 10, 2 } - stretch = TRUE - arrow_direction = DOWN - } - image - { - function = STEPPER - recolorable = TRUE - state = PRELIGHT - file = "Scrollbars/stepper-down-prelight.png" - #border = { 12, 2, 10, 2 } - stretch = TRUE - arrow_direction = DOWN - } - image - { - function = STEPPER - recolorable = TRUE - state = ACTIVE - file = "Scrollbars/stepper-down-prelight.png" - #border = { 12, 2, 10, 2 } - stretch = TRUE - arrow_direction = DOWN - } - image - { - function = STEPPER - recolorable = TRUE - state = INSENSITIVE - file = "Scrollbars/stepper-down-insens.png" - #border = { 12, 2, 10, 2 } - stretch = TRUE - arrow_direction = DOWN - } - -############ RIGHT ################ - - image - { - function = STEPPER - recolorable = TRUE - state = NORMAL - file = "Scrollbars/stepper-right.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = RIGHT - } - image - { - function = STEPPER - recolorable = TRUE - state = PRELIGHT - file = "Scrollbars/stepper-right-prelight.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = RIGHT - } - image - { - function = STEPPER - recolorable = TRUE - state = ACTIVE - file = "Scrollbars/stepper-right-prelight.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = RIGHT - } - image - { - function = STEPPER - recolorable = TRUE - state = INSENSITIVE - file = "Scrollbars/stepper-right-insens.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = RIGHT - } - -############### LEFT ################### - - - image - { - function = STEPPER - recolorable = TRUE - state = NORMAL - file = "Scrollbars/stepper-left.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = LEFT - } - image - { - function = STEPPER - recolorable = TRUE - state = PRELIGHT - file = "Scrollbars/stepper-left-prelight.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = LEFT - } - image - { - function = STEPPER - recolorable = TRUE - state = ACTIVE - file = "Scrollbars/stepper-left-prelight.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = LEFT - } - image - { - function = STEPPER - recolorable = TRUE - state = INSENSITIVE - file = "Scrollbars/stepper-left-insens.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = LEFT - } - - - - } -} - -##################### PROGRESSBAR ###################x - -style "progressbar" { - fg[PRELIGHT] = "#ffffff" - text[PRELIGHT] = "#ffffff" - xthickness = 1 - ythickness = 1 - engine "pixmap" - { - image - { - function = BOX - - detail = "trough" - file = "ProgressBar/trough-progressbar-horiz.png" - border = { 2, 2, 2, 2 } - stretch = TRUE -# orientation = HORIZONTAL - } - - image - { - function = BOX - - detail = "bar" - file = "ProgressBar/progressbar-horiz.png" - border = { 2, 2, 2, 2 } - stretch = TRUE -# orientation = HORIZONTAL - } - - - - - - - } -} - -############################# RANGE ####################### - -style "range" = "default" -{ - engine "pixmap" - { - image - { - function = BOX - recolorable = TRUE - detail = "trough" - file = "Range/trough-horizontal.png" - border = { 10, 10, 1, 19 } - stretch = TRUE - orientation = HORIZONTAL - } - image - { - function = BOX - recolorable = TRUE - detail = "trough" - file = "Range/trough-vertical.png" - border = { 0, 19, 10, 10 } - stretch = TRUE - orientation = VERTICAL - } -############### the sliders ############### - - image - { - function = SLIDER - recolorable = TRUE - state = NORMAL - file = "Range/null.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - overlay_file = "Range/slider-horiz.png" - overlay_stretch = FALSE - orientation = HORIZONTAL - } - image - { - function = SLIDER - recolorable = TRUE - state = PRELIGHT - file = "Range/null.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - overlay_file = "Range/slider-horiz-prelight.png" - overlay_stretch = FALSE - orientation = HORIZONTAL - } - image - { - function = SLIDER - recolorable = TRUE - state = INSENSITIVE - file = "Range/null.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - overlay_file = "Range/slider-horiz.png" - overlay_stretch = FALSE - orientation = HORIZONTAL - } - -######################### VERTICAL ########################### - - image - { - function = SLIDER - recolorable = TRUE - state = NORMAL - file = "Range/null.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - overlay_file = "Range/slider-vert.png" - overlay_stretch = FALSE - orientation = VERTICAL - } - image - { - function = SLIDER - recolorable = TRUE - state = PRELIGHT - file = "Range/null.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - overlay_file = "Range/slider-vert-prelight.png" - overlay_stretch = FALSE - orientation = VERTICAL - } - image - { - function = SLIDER - recolorable = TRUE - state = INSENSITIVE - file = "Range/null.png" - border = { 0, 0, 0, 0 } - stretch = TRUE - overlay_file = "Range/slider-vert.png" - overlay_stretch = FALSE - orientation = VERTICAL - } - } -} - - - - - - -################### TOOLBAR ########################### - - -style "toolbar" -{ - - engine "pixmap" - { - image - { - function = BOX - file = "Toolbar/toolbar.png" - border = { 4, 4, 4, 4} - stretch = TRUE - } - } -} -widget_class "*BonoboDockItem" style "toolbar" -class "*BonoboDockItem" style "toolbar" - -widget_class "*HandleBox" style "toolbar" -class "*HandleBox" style "toolbar" - -widget_class "*Toolbar" style "toolbar" -class "*Toolbar" style "toolbar" - - - -##################### TOOLBAR BUTTONS ############################### - - - - - -style "toolbuttons" = "default" -{ - - - - xthickness = 1 - ythickness = 1 - - GtkWidget::focus_padding = 2 - - engine "pixmap" { - -image - { - function = BOX - recolorable = TRUE - state = NORMAL - file = "Toolbar/toolbutton-normal.png" - border = { 5, 5, 5, 5 } - stretch = TRUE - } - -image - { - function = BOX - recolorable = TRUE - state = PRELIGHT - file = "Toolbar/toolbutton-prelight.png" - border = { 5, 5, 5, 5 } - stretch = TRUE - } - -image - { - function = BOX - recolorable = TRUE - state = ACTIVE - file = "Toolbar/toolbutton-pressed.png" - border = { 5, 5, 5, 5 } - stretch = TRUE - } -image - { - function = BOX - recolorable = TRUE - state = INSENSITIVE - file = "Toolbar/toolbutton-normal.png" - border = { 5, 5, 5, 5 } - stretch = TRUE - } - - } - -} -widget_class "*Tool*GtkToggleButton" style "toolbuttons" -widget_class "*Tool*GtkButton" style "toolbuttons" - - - - - - - - -############################# PANEL GRAPHICS ################################# - - - - - -############################# MENU ################################# - - - - - -style "menu" = "default" -{ -#bg_pixmap[NORMAL] = "Menu-Menubar/menu-overlay.png" -xthickness = 3 -ythickness = 1 - engine "pixmap" - { - image - { - function = BOX - recolorable = TRUE - detail = "menu" - file = "Menu-Menubar/menu.png" - border = { 34, 3, 3, 3 } - stretch = TRUE - } - } -} - - -########################### Menuitem ############################# -style "menuitem" = "default" -{ - xthickness = 1 - fg[PRELIGHT] = "#000000" - text[PRELIGHT] = "#000000" - - - engine "pixmap" - { - image - { - function = BOX - recolorable = TRUE - file = "Menu-Menubar/menuitem.png" - - border = { 10, 10, 10, 10 } - stretch = TRUE - } - image - { - function = ARROW - recolorable = TRUE - state = NORMAL - overlay_file = "Arrows/arrow-right-norm.png" - overlay_stretch = FALSE - arrow_direction = RIGHT - } - image - { - function = ARROW - recolorable = TRUE - state = PRELIGHT - overlay_file = "Arrows/arrow-right.png" - overlay_stretch = FALSE - arrow_direction = RIGHT - } - - } -} - - -style "tearoffmenuitem" = "menuitem" -{ - engine "pixmap" - { - image - { - function = ARROW - file = "Arrows/arrow-left.png" - stretch = TRUE - arrow_direction = LEFT - } -# image -# { -# function = HLINE -# file = "cuthere.png" -# border = { 0, 0, 0, 0 } -# stretch = TRUE -# } - } -} - - - - - - - - - - - - - - - -style "notebook" = "default" -{ - - xthickness = 2 - ythickness = 2 - engine "pixmap" - { - image - { - function = EXTENSION - recolorable = TRUE - state = ACTIVE - file = "Tabs/tab-bottom.png" - border = { 4,4,4,4} - stretch = TRUE - gap_side = TOP - } - image - { - function = EXTENSION - recolorable = TRUE - state = ACTIVE - file = "Tabs/tab-top.png" - border = { 4,4,4,4} - stretch = TRUE - gap_side = BOTTOM - } - image - { - function = EXTENSION - recolorable = TRUE - state = ACTIVE - file = "Tabs/tab-left.png" - border = { 4,4,4,4} - stretch = TRUE - gap_side = RIGHT - } - image - { - function = EXTENSION - recolorable = TRUE - state = ACTIVE - file = "Tabs/tab-right.png" - border = { 4,4,4,4} - stretch = TRUE - gap_side = LEFT - } - image - { - function = EXTENSION - recolorable = TRUE - - file = "Tabs/tab-top-active.png" - border = { 4,4,4,4} - stretch = TRUE - gap_side = BOTTOM - } - image - { - function = EXTENSION - recolorable = TRUE - - file = "Tabs/tab-bottom-active.png" - border = { 4,4,4,4} - stretch = TRUE - gap_side = TOP - } - image - { - function = EXTENSION - recolorable = TRUE - - file = "Tabs/tab-left-active.png" - border = { 4,4,4,4} - stretch = TRUE - gap_side = RIGHT - } - image - { - function = EXTENSION - recolorable = TRUE - - file = "Tabs/tab-right-active.png" - border = { 4,4,4,4} - stretch = TRUE - gap_side = LEFT - } -# -# How to draw boxes with a gap on one side (ie the page of a notebook) -# - image - { - function = BOX_GAP - recolorable = TRUE - file = "Tabs/notebook.png" - border = { 5, 5, 5, 5 } - stretch = TRUE - gap_file = "Others/null.png" - gap_border = { 0, 0, 0, 0 } - gap_start_file = "Others/null.png" - gap_start_border = { 0, 0, 0, 0 } - gap_end_file = "Others/null.png" - gap_end_border = { 0, 0, 0, 0 } - gap_side = TOP - } - image - { - function = BOX_GAP - recolorable = TRUE - file = "Tabs/notebook.png" - border = { 5, 5, 5, 5 } - stretch = TRUE - gap_file = "Others/null.png" - gap_border = { 10, 10,5, 5 } - gap_start_file = "Others/null.png" - gap_start_border = { 10, 10, 5, 5 } - gap_end_file = "Others/null.png" - gap_end_border = { 10, 10, 5, 5 } - gap_side = BOTTOM - } - image - { - function = BOX_GAP - recolorable = TRUE - file = "Tabs/notebook.png" - border = { 5, 5, 5, 5 } - stretch = TRUE - gap_file = "Others/null.png" - gap_border = { 0, 1, 0, 0 } - gap_start_file = "Others/null.png" - gap_start_border = { 0, 0, 2, 0 } - gap_end_file = "Others/null.png" - gap_end_border = { 0, 2, 1, 0 } - gap_side = LEFT - } - image - { - function = BOX_GAP - recolorable = TRUE - file = "Tabs/notebook.png" - border = { 5, 5, 5, 5 } - stretch = TRUE - gap_file = "Others/null.png" - gap_border = { 0, 0, 1, 0 } - gap_start_file = "Others/null.png" - gap_start_border = { 2, 0, 2, 0 } - gap_end_file = "Others/null.png" - gap_end_border = { 0, 0, 0, 2 } - gap_side = RIGHT - } -# -# How to draw the box of a notebook when it isnt attached to a tab -# - image - { - function = BOX - recolorable = TRUE - file = "Tabs/notebook.png" - border = { 6,6,6,6 } - stretch = TRUE - #gap_side = TOP - } - } -} - - - - - - - - - - - - - - - - -style "tooltips" = "default" -{ - bg[NORMAL] = "#fffcdb" -} - -##################### RULER ################## - -style "ruler" = "default" -{ - engine "pixmap" { - image - { - function = BOX - recolorable = TRUE - detail = "vruler" - file = "Others/ruler.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - } - image - { - function = BOX - recolorable = TRUE - detail = "hruler" - file = "Others/ruler.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - } - } -} - -################# HANDLES ###################x - - -style "handlebox" = "default" -{ - engine "pixmap" - { - image - { - #function = SHADOW - } - - image - { - function = HANDLE - recolorable = TRUE - overlay_file = "Handles/handle-v.png" - overlay_stretch = FALSE - orientation = VERTICAL - } - image - { - function = HANDLE - overlay_file = "Handles/handle-h.png" - overlay_stretch = FALSE - orientation = HORIZONTAL - } - } -} - - -style "flat" = "default" -{ - engine "pixmap" - { - image - { - function = SHADOW - } - } -} - - -style "layout" = "default" -{ - engine "pixmap" - { - image - { - function = SHADOW - detail = "entry" - shadow = IN - recolorable = FALSE - file = "Shadows/text.png" - border = { 1, 1, 1, 1 } - stretch = TRUE - } - image - { - function = BOX - detail = "button" - state = NORMAL - file = "Buttons/button-normal.png" - recolorable = TRUE - border = { 2, 3, 2, 3 } - stretch = TRUE - } - } -} - -##################### LISTHEADERS ###################x - -style "list-header" -{ - #Comment out the ythickness setting below for thicker column headers. - #ythickness = 0 - GtkTreeView::odd_row_color = "#f4f4f4" - GtkTreeView::even_row_color = "#f4f4f4" - -# fg[NORMAL] = "#ffffff" -# text[NORMAL] = "#ffffff" - - engine "pixmap" - { - - #This image is used to draw the headers of columns in list views when they are - #not selected. - image - { - function = BOX - recolorable = TRUE - - state = NORMAL - file = "ListHeaders/list_header.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - } - - #This image is used to draw the column headers in list views when they are - #clicked. - image - { - function = BOX - recolorable = TRUE - - state = PRELIGHT - file = "ListHeaders/list_header-prelight.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - } - - #Does this do anything? - image - { - function = BOX - recolorable = TRUE - - state = ACTIVE - file = "ListHeaders/list_header-pressed.png" - border = { 2, 2, 2, 2} - stretch = TRUE - } - - image - { - function = BOX - recolorable = TRUE - - state = SELECTED - file = "ListHeaders/list_header-prelight.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - } - image - { - function = BOX - recolorable = TRUE - - state = INSENSITIVE - file = "ListHeaders/list_header-insens.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - } - - - } - -} - -widget_class "*List" style "list-header" -widget_class "*GtkTree*" style "list-header" -widget_class "*GtkCList*" style "list-header" -#widget_class "*Tree*" style "list-header" - - -# This prevents Sodipodi from crashing while opening the -# Object-Style dialog. - - -style "unstyle" -{ - engine "" - { - } -} - -# recognizable pressed toggle buttons -# SPIcons seem to erase the background first. That's why I can't use -# the button style. - - -style "SPbutton" -{ - engine "pixmap" - { - image - { - function = BOX - shadow = IN - recolorable = TRUE - file = "Shadows/shadow-out.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - } - image - { - function = BOX - } - } -} - - -style "treecol" -{ - bg[NORMAL] = "#000000" -} - - -class "GtkButton" style "button" -class "GtkRadioButton" style "radiobutton" -class "GtkRadioMenuItem" style "radiobutton" -class "GtkCheckButton" style "checkbutton" -class "GtkCheckMenuItem" style "checkbutton" -class "GtkOptionMenu" style "optionmenu" -class "GtkCombo*" style "optionmenu" -class "*Font*" style "optionmenu" -class "GtkEntry" style "entry" -class "GtkOldEditable" style "entry" -class "GtkSpinButton" style "spinbutton" -class "GtkRuler" style "ruler" -class "GtkScrollbar" style "scrollbar" - -class "GtkProgressBar" style "progressbar" -class "GtkRange" style "range" -class "GtkMenu" style "menu" - -class "GtkMenuBar*" style "menubar" - - -widget_class "*MenuBar.*" style "menubar" - - - -#class "GtkImageMenuItem" style "menubar" - -class "GtkMenuItem" style "menuitem" -class "GtkTearoffMenuItem" style "menuitem" -class "GtkNotebook" style "notebook" -#class "GtkTextView" style "textview" -#class "GtkTreeView" style "treeview" -class "GtkToolbar" style "flat" -class "GtkHandleBox" style "handlebox" -class "GtkEventBox" style "flat" -class "GtkPaned" style "handlebox" -class "GtkLayout" style "layout" -class "SPButton" style "SPbutton" -widget "gtk-tooltips" style "tooltips" -# prevent Sodipodi from crashing -class "SPColorSlider" style "unstyle" diff --git a/themes/Win7-Basic/gtk-2.0/Arrows/arrow-down.png b/themes/Windows-Default/gtk-2.0/Arrows/arrow-down.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Arrows/arrow-down.png rename to themes/Windows-Default/gtk-2.0/Arrows/arrow-down.png diff --git a/themes/Win7-Basic/gtk-2.0/Arrows/arrow-left.png b/themes/Windows-Default/gtk-2.0/Arrows/arrow-left.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Arrows/arrow-left.png rename to themes/Windows-Default/gtk-2.0/Arrows/arrow-left.png diff --git a/themes/Win7-Basic/gtk-2.0/Arrows/arrow-right-norm.png b/themes/Windows-Default/gtk-2.0/Arrows/arrow-right-norm.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Arrows/arrow-right-norm.png rename to themes/Windows-Default/gtk-2.0/Arrows/arrow-right-norm.png diff --git a/themes/Win7-Basic/gtk-2.0/Arrows/arrow-right-prelight.png b/themes/Windows-Default/gtk-2.0/Arrows/arrow-right-prelight.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Arrows/arrow-right-prelight.png rename to themes/Windows-Default/gtk-2.0/Arrows/arrow-right-prelight.png diff --git a/themes/Win7-Basic/gtk-2.0/Arrows/arrow-right.png b/themes/Windows-Default/gtk-2.0/Arrows/arrow-right.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Arrows/arrow-right.png rename to themes/Windows-Default/gtk-2.0/Arrows/arrow-right.png diff --git a/themes/Win7-Basic/gtk-2.0/Arrows/arrow-up.png b/themes/Windows-Default/gtk-2.0/Arrows/arrow-up.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Arrows/arrow-up.png rename to themes/Windows-Default/gtk-2.0/Arrows/arrow-up.png diff --git a/themes/Win7-Basic/gtk-2.0/Buttons/button-default.png b/themes/Windows-Default/gtk-2.0/Buttons/button-default.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Buttons/button-default.png rename to themes/Windows-Default/gtk-2.0/Buttons/button-default.png diff --git a/themes/Win7-Basic/gtk-2.0/Buttons/button-insensitive.png b/themes/Windows-Default/gtk-2.0/Buttons/button-insensitive.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Buttons/button-insensitive.png rename to themes/Windows-Default/gtk-2.0/Buttons/button-insensitive.png diff --git a/themes/Win7-Basic/gtk-2.0/Buttons/button-normal.png b/themes/Windows-Default/gtk-2.0/Buttons/button-normal.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Buttons/button-normal.png rename to themes/Windows-Default/gtk-2.0/Buttons/button-normal.png diff --git a/themes/Win7-Basic/gtk-2.0/Buttons/button-prelight.png b/themes/Windows-Default/gtk-2.0/Buttons/button-prelight.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Buttons/button-prelight.png rename to themes/Windows-Default/gtk-2.0/Buttons/button-prelight.png diff --git a/themes/Win7-Basic/gtk-2.0/Buttons/button-pressed.png b/themes/Windows-Default/gtk-2.0/Buttons/button-pressed.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Buttons/button-pressed.png rename to themes/Windows-Default/gtk-2.0/Buttons/button-pressed.png diff --git a/themes/Win7-Basic/gtk-2.0/Check-Radio/check1.png b/themes/Windows-Default/gtk-2.0/Check-Radio/check1.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Check-Radio/check1.png rename to themes/Windows-Default/gtk-2.0/Check-Radio/check1.png diff --git a/themes/Win7-Basic/gtk-2.0/Check-Radio/check2.png b/themes/Windows-Default/gtk-2.0/Check-Radio/check2.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Check-Radio/check2.png rename to themes/Windows-Default/gtk-2.0/Check-Radio/check2.png diff --git a/themes/Win7-Basic/gtk-2.0/Check-Radio/check3.png b/themes/Windows-Default/gtk-2.0/Check-Radio/check3.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Check-Radio/check3.png rename to themes/Windows-Default/gtk-2.0/Check-Radio/check3.png diff --git a/themes/Win7-Basic/gtk-2.0/Check-Radio/check4.png b/themes/Windows-Default/gtk-2.0/Check-Radio/check4.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Check-Radio/check4.png rename to themes/Windows-Default/gtk-2.0/Check-Radio/check4.png diff --git a/themes/Win7-Basic/gtk-2.0/Check-Radio/checklight.png b/themes/Windows-Default/gtk-2.0/Check-Radio/checklight.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Check-Radio/checklight.png rename to themes/Windows-Default/gtk-2.0/Check-Radio/checklight.png diff --git a/themes/Win7-Basic/gtk-2.0/Check-Radio/highlight.png b/themes/Windows-Default/gtk-2.0/Check-Radio/highlight.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Check-Radio/highlight.png rename to themes/Windows-Default/gtk-2.0/Check-Radio/highlight.png diff --git a/themes/Win7-Basic/gtk-2.0/Check-Radio/option1.png b/themes/Windows-Default/gtk-2.0/Check-Radio/option1.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Check-Radio/option1.png rename to themes/Windows-Default/gtk-2.0/Check-Radio/option1.png diff --git a/themes/Win7-Basic/gtk-2.0/Check-Radio/option2.png b/themes/Windows-Default/gtk-2.0/Check-Radio/option2.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Check-Radio/option2.png rename to themes/Windows-Default/gtk-2.0/Check-Radio/option2.png diff --git a/themes/Win7-Basic/gtk-2.0/Check-Radio/option4.png b/themes/Windows-Default/gtk-2.0/Check-Radio/option4.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Check-Radio/option4.png rename to themes/Windows-Default/gtk-2.0/Check-Radio/option4.png diff --git a/themes/Win7-Basic/gtk-2.0/Combo/button-pressed.png b/themes/Windows-Default/gtk-2.0/Combo/button-pressed.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Combo/button-pressed.png rename to themes/Windows-Default/gtk-2.0/Combo/button-pressed.png diff --git a/themes/Win7-Basic/gtk-2.0/Combo/combo-active.png b/themes/Windows-Default/gtk-2.0/Combo/combo-active.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Combo/combo-active.png rename to themes/Windows-Default/gtk-2.0/Combo/combo-active.png diff --git a/themes/Win7-Basic/gtk-2.0/Combo/combo-arrow-insens.png b/themes/Windows-Default/gtk-2.0/Combo/combo-arrow-insens.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Combo/combo-arrow-insens.png rename to themes/Windows-Default/gtk-2.0/Combo/combo-arrow-insens.png diff --git a/themes/Win7-Basic/gtk-2.0/Combo/combo-arrow-prelight.png b/themes/Windows-Default/gtk-2.0/Combo/combo-arrow-prelight.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Combo/combo-arrow-prelight.png rename to themes/Windows-Default/gtk-2.0/Combo/combo-arrow-prelight.png diff --git a/themes/Win7-Basic/gtk-2.0/Combo/combo-arrow.png b/themes/Windows-Default/gtk-2.0/Combo/combo-arrow.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Combo/combo-arrow.png rename to themes/Windows-Default/gtk-2.0/Combo/combo-arrow.png diff --git a/themes/Win7-Basic/gtk-2.0/Combo/combo-inactive.png b/themes/Windows-Default/gtk-2.0/Combo/combo-inactive.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Combo/combo-inactive.png rename to themes/Windows-Default/gtk-2.0/Combo/combo-inactive.png diff --git a/themes/Win7-Basic/gtk-2.0/Combo/combo-normal.png b/themes/Windows-Default/gtk-2.0/Combo/combo-normal.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Combo/combo-normal.png rename to themes/Windows-Default/gtk-2.0/Combo/combo-normal.png diff --git a/themes/Win7-Basic/gtk-2.0/Combo/combo-prelight.png b/themes/Windows-Default/gtk-2.0/Combo/combo-prelight.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Combo/combo-prelight.png rename to themes/Windows-Default/gtk-2.0/Combo/combo-prelight.png diff --git a/themes/Win7-Basic/gtk-2.0/Frame-Gap/frame-gap-end.png b/themes/Windows-Default/gtk-2.0/Frame-Gap/frame-gap-end.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Frame-Gap/frame-gap-end.png rename to themes/Windows-Default/gtk-2.0/Frame-Gap/frame-gap-end.png diff --git a/themes/Win7-Basic/gtk-2.0/Frame-Gap/frame-gap-start.png b/themes/Windows-Default/gtk-2.0/Frame-Gap/frame-gap-start.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Frame-Gap/frame-gap-start.png rename to themes/Windows-Default/gtk-2.0/Frame-Gap/frame-gap-start.png diff --git a/themes/Win7-Basic/gtk-2.0/Frame-Gap/frame1.png b/themes/Windows-Default/gtk-2.0/Frame-Gap/frame1.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Frame-Gap/frame1.png rename to themes/Windows-Default/gtk-2.0/Frame-Gap/frame1.png diff --git a/themes/Win7-Basic/gtk-2.0/Frame-Gap/frame2.png b/themes/Windows-Default/gtk-2.0/Frame-Gap/frame2.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Frame-Gap/frame2.png rename to themes/Windows-Default/gtk-2.0/Frame-Gap/frame2.png diff --git a/themes/Win7-Basic/gtk-2.0/Handles/handle-h.png b/themes/Windows-Default/gtk-2.0/Handles/handle-h.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Handles/handle-h.png rename to themes/Windows-Default/gtk-2.0/Handles/handle-h.png diff --git a/themes/Win7-Basic/gtk-2.0/Handles/handle-v.png b/themes/Windows-Default/gtk-2.0/Handles/handle-v.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Handles/handle-v.png rename to themes/Windows-Default/gtk-2.0/Handles/handle-v.png diff --git a/themes/Win7-Basic/gtk-2.0/Lines/line-h.png b/themes/Windows-Default/gtk-2.0/Lines/line-h.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Lines/line-h.png rename to themes/Windows-Default/gtk-2.0/Lines/line-h.png diff --git a/themes/Win7-Basic/gtk-2.0/Lines/line-v.png b/themes/Windows-Default/gtk-2.0/Lines/line-v.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Lines/line-v.png rename to themes/Windows-Default/gtk-2.0/Lines/line-v.png diff --git a/themes/Win7-Basic/gtk-2.0/ListHeaders/list_header-insens.png b/themes/Windows-Default/gtk-2.0/ListHeaders/list_header-insens.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/ListHeaders/list_header-insens.png rename to themes/Windows-Default/gtk-2.0/ListHeaders/list_header-insens.png diff --git a/themes/Win7-Basic/gtk-2.0/ListHeaders/list_header-prelight.png b/themes/Windows-Default/gtk-2.0/ListHeaders/list_header-prelight.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/ListHeaders/list_header-prelight.png rename to themes/Windows-Default/gtk-2.0/ListHeaders/list_header-prelight.png diff --git a/themes/Win7-Basic/gtk-2.0/ListHeaders/list_header-pressed.png b/themes/Windows-Default/gtk-2.0/ListHeaders/list_header-pressed.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/ListHeaders/list_header-pressed.png rename to themes/Windows-Default/gtk-2.0/ListHeaders/list_header-pressed.png diff --git a/themes/Win7-Basic/gtk-2.0/ListHeaders/list_header.png b/themes/Windows-Default/gtk-2.0/ListHeaders/list_header.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/ListHeaders/list_header.png rename to themes/Windows-Default/gtk-2.0/ListHeaders/list_header.png diff --git a/themes/Win7-Basic/gtk-2.0/Menu-Menubar/menu.png b/themes/Windows-Default/gtk-2.0/Menu-Menubar/menu.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Menu-Menubar/menu.png rename to themes/Windows-Default/gtk-2.0/Menu-Menubar/menu.png diff --git a/themes/Win7-Basic/gtk-2.0/Menu-Menubar/menubar-blue.png b/themes/Windows-Default/gtk-2.0/Menu-Menubar/menubar-blue.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Menu-Menubar/menubar-blue.png rename to themes/Windows-Default/gtk-2.0/Menu-Menubar/menubar-blue.png diff --git a/themes/Win7-Basic/gtk-2.0/Menu-Menubar/menubar-inactive.png b/themes/Windows-Default/gtk-2.0/Menu-Menubar/menubar-inactive.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Menu-Menubar/menubar-inactive.png rename to themes/Windows-Default/gtk-2.0/Menu-Menubar/menubar-inactive.png diff --git a/themes/Win7-Basic/gtk-2.0/Menu-Menubar/menubar-item.png b/themes/Windows-Default/gtk-2.0/Menu-Menubar/menubar-item.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Menu-Menubar/menubar-item.png rename to themes/Windows-Default/gtk-2.0/Menu-Menubar/menubar-item.png diff --git a/themes/Win7-Basic/gtk-2.0/Menu-Menubar/menubar-light.png b/themes/Windows-Default/gtk-2.0/Menu-Menubar/menubar-light.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Menu-Menubar/menubar-light.png rename to themes/Windows-Default/gtk-2.0/Menu-Menubar/menubar-light.png diff --git a/themes/Win7-Basic/gtk-2.0/Menu-Menubar/menuitem.png b/themes/Windows-Default/gtk-2.0/Menu-Menubar/menuitem.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Menu-Menubar/menuitem.png rename to themes/Windows-Default/gtk-2.0/Menu-Menubar/menuitem.png diff --git a/themes/Win7-Basic/gtk-2.0/Menu-Menubar/menuline.png b/themes/Windows-Default/gtk-2.0/Menu-Menubar/menuline.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Menu-Menubar/menuline.png rename to themes/Windows-Default/gtk-2.0/Menu-Menubar/menuline.png diff --git a/themes/Win7-Basic/gtk-2.0/Others/focus.png b/themes/Windows-Default/gtk-2.0/Others/focus.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Others/focus.png rename to themes/Windows-Default/gtk-2.0/Others/focus.png diff --git a/themes/Win7-Basic/gtk-2.0/Others/null.png b/themes/Windows-Default/gtk-2.0/Others/null.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Others/null.png rename to themes/Windows-Default/gtk-2.0/Others/null.png diff --git a/themes/Win7-Basic/gtk-2.0/Others/ruler.png b/themes/Windows-Default/gtk-2.0/Others/ruler.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Others/ruler.png rename to themes/Windows-Default/gtk-2.0/Others/ruler.png diff --git a/themes/Win7-Basic/gtk-2.0/Panel/panel-bg.png b/themes/Windows-Default/gtk-2.0/Panel/panel-bg.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Panel/panel-bg.png rename to themes/Windows-Default/gtk-2.0/Panel/panel-bg.png diff --git a/themes/Win7-Basic/gtk-2.0/Panel/panelbutton1.png b/themes/Windows-Default/gtk-2.0/Panel/panelbutton1.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Panel/panelbutton1.png rename to themes/Windows-Default/gtk-2.0/Panel/panelbutton1.png diff --git a/themes/Win7-Basic/gtk-2.0/Panel/panelbutton2.png b/themes/Windows-Default/gtk-2.0/Panel/panelbutton2.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Panel/panelbutton2.png rename to themes/Windows-Default/gtk-2.0/Panel/panelbutton2.png diff --git a/themes/Win7-Basic/gtk-2.0/Panel/panelbutton3.png b/themes/Windows-Default/gtk-2.0/Panel/panelbutton3.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Panel/panelbutton3.png rename to themes/Windows-Default/gtk-2.0/Panel/panelbutton3.png diff --git a/themes/Win7-Basic/gtk-2.0/Panel/panelbutton4.png b/themes/Windows-Default/gtk-2.0/Panel/panelbutton4.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Panel/panelbutton4.png rename to themes/Windows-Default/gtk-2.0/Panel/panelbutton4.png diff --git a/themes/Win7-Basic/gtk-2.0/ProgressBar/progressbar-horiz.png b/themes/Windows-Default/gtk-2.0/ProgressBar/progressbar-horiz.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/ProgressBar/progressbar-horiz.png rename to themes/Windows-Default/gtk-2.0/ProgressBar/progressbar-horiz.png diff --git a/themes/Win7-Basic/gtk-2.0/ProgressBar/progressbar-vert.png b/themes/Windows-Default/gtk-2.0/ProgressBar/progressbar-vert.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/ProgressBar/progressbar-vert.png rename to themes/Windows-Default/gtk-2.0/ProgressBar/progressbar-vert.png diff --git a/themes/Win7-Basic/gtk-2.0/ProgressBar/trough-progressbar-horiz.png b/themes/Windows-Default/gtk-2.0/ProgressBar/trough-progressbar-horiz.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/ProgressBar/trough-progressbar-horiz.png rename to themes/Windows-Default/gtk-2.0/ProgressBar/trough-progressbar-horiz.png diff --git a/themes/Win7-Basic/gtk-2.0/ProgressBar/trough-progressbar-vert.png b/themes/Windows-Default/gtk-2.0/ProgressBar/trough-progressbar-vert.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/ProgressBar/trough-progressbar-vert.png rename to themes/Windows-Default/gtk-2.0/ProgressBar/trough-progressbar-vert.png diff --git a/themes/Win7-Basic/gtk-2.0/Range/null.png b/themes/Windows-Default/gtk-2.0/Range/null.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Range/null.png rename to themes/Windows-Default/gtk-2.0/Range/null.png diff --git a/themes/Win7-Basic/gtk-2.0/Range/slider-horiz-prelight.png b/themes/Windows-Default/gtk-2.0/Range/slider-horiz-prelight.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Range/slider-horiz-prelight.png rename to themes/Windows-Default/gtk-2.0/Range/slider-horiz-prelight.png diff --git a/themes/Win7-Basic/gtk-2.0/Range/slider-horiz.png b/themes/Windows-Default/gtk-2.0/Range/slider-horiz.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Range/slider-horiz.png rename to themes/Windows-Default/gtk-2.0/Range/slider-horiz.png diff --git a/themes/Win7-Basic/gtk-2.0/Range/slider-vert-prelight.png b/themes/Windows-Default/gtk-2.0/Range/slider-vert-prelight.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Range/slider-vert-prelight.png rename to themes/Windows-Default/gtk-2.0/Range/slider-vert-prelight.png diff --git a/themes/Win7-Basic/gtk-2.0/Range/slider-vert.png b/themes/Windows-Default/gtk-2.0/Range/slider-vert.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Range/slider-vert.png rename to themes/Windows-Default/gtk-2.0/Range/slider-vert.png diff --git a/themes/Win7-Basic/gtk-2.0/Range/trough-horizontal.png b/themes/Windows-Default/gtk-2.0/Range/trough-horizontal.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Range/trough-horizontal.png rename to themes/Windows-Default/gtk-2.0/Range/trough-horizontal.png diff --git a/themes/Win7-Basic/gtk-2.0/Range/trough-vertical.png b/themes/Windows-Default/gtk-2.0/Range/trough-vertical.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Range/trough-vertical.png rename to themes/Windows-Default/gtk-2.0/Range/trough-vertical.png diff --git a/themes/Win7-Basic/gtk-2.0/Scrollbars/scroll-thumb-horiz.png b/themes/Windows-Default/gtk-2.0/Scrollbars/scroll-thumb-horiz.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Scrollbars/scroll-thumb-horiz.png rename to themes/Windows-Default/gtk-2.0/Scrollbars/scroll-thumb-horiz.png diff --git a/themes/Win7-Basic/gtk-2.0/Scrollbars/scroll-thumb-vert.png b/themes/Windows-Default/gtk-2.0/Scrollbars/scroll-thumb-vert.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Scrollbars/scroll-thumb-vert.png rename to themes/Windows-Default/gtk-2.0/Scrollbars/scroll-thumb-vert.png diff --git a/themes/Win7-Basic/gtk-2.0/Scrollbars/slider-horiz-insens.png b/themes/Windows-Default/gtk-2.0/Scrollbars/slider-horiz-insens.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Scrollbars/slider-horiz-insens.png rename to themes/Windows-Default/gtk-2.0/Scrollbars/slider-horiz-insens.png diff --git a/themes/Win7-Basic/gtk-2.0/Scrollbars/slider-horiz-prelight.png b/themes/Windows-Default/gtk-2.0/Scrollbars/slider-horiz-prelight.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Scrollbars/slider-horiz-prelight.png rename to themes/Windows-Default/gtk-2.0/Scrollbars/slider-horiz-prelight.png diff --git a/themes/Win7-Basic/gtk-2.0/Scrollbars/slider-horiz.png b/themes/Windows-Default/gtk-2.0/Scrollbars/slider-horiz.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Scrollbars/slider-horiz.png rename to themes/Windows-Default/gtk-2.0/Scrollbars/slider-horiz.png diff --git a/themes/Win7-Basic/gtk-2.0/Scrollbars/slider-vert-insens.png b/themes/Windows-Default/gtk-2.0/Scrollbars/slider-vert-insens.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Scrollbars/slider-vert-insens.png rename to themes/Windows-Default/gtk-2.0/Scrollbars/slider-vert-insens.png diff --git a/themes/Win7-Basic/gtk-2.0/Scrollbars/slider-vert-prelight.png b/themes/Windows-Default/gtk-2.0/Scrollbars/slider-vert-prelight.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Scrollbars/slider-vert-prelight.png rename to themes/Windows-Default/gtk-2.0/Scrollbars/slider-vert-prelight.png diff --git a/themes/Win7-Basic/gtk-2.0/Scrollbars/slider-vert.png b/themes/Windows-Default/gtk-2.0/Scrollbars/slider-vert.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Scrollbars/slider-vert.png rename to themes/Windows-Default/gtk-2.0/Scrollbars/slider-vert.png diff --git a/themes/Win7-Basic/gtk-2.0/Scrollbars/stepper-down-insens.png b/themes/Windows-Default/gtk-2.0/Scrollbars/stepper-down-insens.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Scrollbars/stepper-down-insens.png rename to themes/Windows-Default/gtk-2.0/Scrollbars/stepper-down-insens.png diff --git a/themes/Win7-Basic/gtk-2.0/Scrollbars/stepper-down-prelight.png b/themes/Windows-Default/gtk-2.0/Scrollbars/stepper-down-prelight.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Scrollbars/stepper-down-prelight.png rename to themes/Windows-Default/gtk-2.0/Scrollbars/stepper-down-prelight.png diff --git a/themes/Win7-Basic/gtk-2.0/Scrollbars/stepper-down.png b/themes/Windows-Default/gtk-2.0/Scrollbars/stepper-down.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Scrollbars/stepper-down.png rename to themes/Windows-Default/gtk-2.0/Scrollbars/stepper-down.png diff --git a/themes/Win7-Basic/gtk-2.0/Scrollbars/stepper-left-insens.png b/themes/Windows-Default/gtk-2.0/Scrollbars/stepper-left-insens.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Scrollbars/stepper-left-insens.png rename to themes/Windows-Default/gtk-2.0/Scrollbars/stepper-left-insens.png diff --git a/themes/Win7-Basic/gtk-2.0/Scrollbars/stepper-left-prelight.png b/themes/Windows-Default/gtk-2.0/Scrollbars/stepper-left-prelight.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Scrollbars/stepper-left-prelight.png rename to themes/Windows-Default/gtk-2.0/Scrollbars/stepper-left-prelight.png diff --git a/themes/Win7-Basic/gtk-2.0/Scrollbars/stepper-left.png b/themes/Windows-Default/gtk-2.0/Scrollbars/stepper-left.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Scrollbars/stepper-left.png rename to themes/Windows-Default/gtk-2.0/Scrollbars/stepper-left.png diff --git a/themes/Win7-Basic/gtk-2.0/Scrollbars/stepper-right-insens.png b/themes/Windows-Default/gtk-2.0/Scrollbars/stepper-right-insens.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Scrollbars/stepper-right-insens.png rename to themes/Windows-Default/gtk-2.0/Scrollbars/stepper-right-insens.png diff --git a/themes/Win7-Basic/gtk-2.0/Scrollbars/stepper-right-prelight.png b/themes/Windows-Default/gtk-2.0/Scrollbars/stepper-right-prelight.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Scrollbars/stepper-right-prelight.png rename to themes/Windows-Default/gtk-2.0/Scrollbars/stepper-right-prelight.png diff --git a/themes/Win7-Basic/gtk-2.0/Scrollbars/stepper-right.png b/themes/Windows-Default/gtk-2.0/Scrollbars/stepper-right.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Scrollbars/stepper-right.png rename to themes/Windows-Default/gtk-2.0/Scrollbars/stepper-right.png diff --git a/themes/Win7-Basic/gtk-2.0/Scrollbars/stepper-up-insens.png b/themes/Windows-Default/gtk-2.0/Scrollbars/stepper-up-insens.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Scrollbars/stepper-up-insens.png rename to themes/Windows-Default/gtk-2.0/Scrollbars/stepper-up-insens.png diff --git a/themes/Win7-Basic/gtk-2.0/Scrollbars/stepper-up-prelight.png b/themes/Windows-Default/gtk-2.0/Scrollbars/stepper-up-prelight.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Scrollbars/stepper-up-prelight.png rename to themes/Windows-Default/gtk-2.0/Scrollbars/stepper-up-prelight.png diff --git a/themes/Win7-Basic/gtk-2.0/Scrollbars/stepper-up.png b/themes/Windows-Default/gtk-2.0/Scrollbars/stepper-up.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Scrollbars/stepper-up.png rename to themes/Windows-Default/gtk-2.0/Scrollbars/stepper-up.png diff --git a/themes/Win7-Basic/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png b/themes/Windows-Default/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png rename to themes/Windows-Default/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png diff --git a/themes/Win7-Basic/gtk-2.0/Scrollbars/trough-scrollbar-vert.png b/themes/Windows-Default/gtk-2.0/Scrollbars/trough-scrollbar-vert.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Scrollbars/trough-scrollbar-vert.png rename to themes/Windows-Default/gtk-2.0/Scrollbars/trough-scrollbar-vert.png diff --git a/themes/Win7-Basic/gtk-2.0/Shadows/entry-shadow-in.png b/themes/Windows-Default/gtk-2.0/Shadows/entry-shadow-in.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Shadows/entry-shadow-in.png rename to themes/Windows-Default/gtk-2.0/Shadows/entry-shadow-in.png diff --git a/themes/Win7-Basic/gtk-2.0/Shadows/shadow-etched-out.png b/themes/Windows-Default/gtk-2.0/Shadows/shadow-etched-out.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Shadows/shadow-etched-out.png rename to themes/Windows-Default/gtk-2.0/Shadows/shadow-etched-out.png diff --git a/themes/Win7-Basic/gtk-2.0/Shadows/shadow-in.png b/themes/Windows-Default/gtk-2.0/Shadows/shadow-in.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Shadows/shadow-in.png rename to themes/Windows-Default/gtk-2.0/Shadows/shadow-in.png diff --git a/themes/Win7-Basic/gtk-2.0/Shadows/shadow-none.png b/themes/Windows-Default/gtk-2.0/Shadows/shadow-none.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Shadows/shadow-none.png rename to themes/Windows-Default/gtk-2.0/Shadows/shadow-none.png diff --git a/themes/Win7-Basic/gtk-2.0/Shadows/shadow-out.png b/themes/Windows-Default/gtk-2.0/Shadows/shadow-out.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Shadows/shadow-out.png rename to themes/Windows-Default/gtk-2.0/Shadows/shadow-out.png diff --git a/themes/Win7-Basic/gtk-2.0/Shadows/text-entry.png b/themes/Windows-Default/gtk-2.0/Shadows/text-entry.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Shadows/text-entry.png rename to themes/Windows-Default/gtk-2.0/Shadows/text-entry.png diff --git a/themes/Win7-Basic/gtk-2.0/Shadows/text.png b/themes/Windows-Default/gtk-2.0/Shadows/text.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Shadows/text.png rename to themes/Windows-Default/gtk-2.0/Shadows/text.png diff --git a/themes/Win7-Basic/gtk-2.0/Spin/spin-down-disable.png b/themes/Windows-Default/gtk-2.0/Spin/spin-down-disable.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Spin/spin-down-disable.png rename to themes/Windows-Default/gtk-2.0/Spin/spin-down-disable.png diff --git a/themes/Win7-Basic/gtk-2.0/Spin/spin-down-prelight.png b/themes/Windows-Default/gtk-2.0/Spin/spin-down-prelight.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Spin/spin-down-prelight.png rename to themes/Windows-Default/gtk-2.0/Spin/spin-down-prelight.png diff --git a/themes/Win7-Basic/gtk-2.0/Spin/spin-down.png b/themes/Windows-Default/gtk-2.0/Spin/spin-down.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Spin/spin-down.png rename to themes/Windows-Default/gtk-2.0/Spin/spin-down.png diff --git a/themes/Win7-Basic/gtk-2.0/Spin/spin-up-disable.png b/themes/Windows-Default/gtk-2.0/Spin/spin-up-disable.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Spin/spin-up-disable.png rename to themes/Windows-Default/gtk-2.0/Spin/spin-up-disable.png diff --git a/themes/Win7-Basic/gtk-2.0/Spin/spin-up-prelight.png b/themes/Windows-Default/gtk-2.0/Spin/spin-up-prelight.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Spin/spin-up-prelight.png rename to themes/Windows-Default/gtk-2.0/Spin/spin-up-prelight.png diff --git a/themes/Win7-Basic/gtk-2.0/Spin/spin-up.png b/themes/Windows-Default/gtk-2.0/Spin/spin-up.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Spin/spin-up.png rename to themes/Windows-Default/gtk-2.0/Spin/spin-up.png diff --git a/themes/Win7-Basic/gtk-2.0/Spin/spin.png b/themes/Windows-Default/gtk-2.0/Spin/spin.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Spin/spin.png rename to themes/Windows-Default/gtk-2.0/Spin/spin.png diff --git a/themes/Win7-Basic/gtk-2.0/Tabs/notebook.png b/themes/Windows-Default/gtk-2.0/Tabs/notebook.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Tabs/notebook.png rename to themes/Windows-Default/gtk-2.0/Tabs/notebook.png diff --git a/themes/Win7-Basic/gtk-2.0/Tabs/null.png b/themes/Windows-Default/gtk-2.0/Tabs/null.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Tabs/null.png rename to themes/Windows-Default/gtk-2.0/Tabs/null.png diff --git a/themes/Win7-Basic/gtk-2.0/Tabs/tab-bottom-active.png b/themes/Windows-Default/gtk-2.0/Tabs/tab-bottom-active.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Tabs/tab-bottom-active.png rename to themes/Windows-Default/gtk-2.0/Tabs/tab-bottom-active.png diff --git a/themes/Win7-Basic/gtk-2.0/Tabs/tab-bottom.png b/themes/Windows-Default/gtk-2.0/Tabs/tab-bottom.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Tabs/tab-bottom.png rename to themes/Windows-Default/gtk-2.0/Tabs/tab-bottom.png diff --git a/themes/Win7-Basic/gtk-2.0/Tabs/tab-left-active.png b/themes/Windows-Default/gtk-2.0/Tabs/tab-left-active.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Tabs/tab-left-active.png rename to themes/Windows-Default/gtk-2.0/Tabs/tab-left-active.png diff --git a/themes/Win7-Basic/gtk-2.0/Tabs/tab-left.png b/themes/Windows-Default/gtk-2.0/Tabs/tab-left.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Tabs/tab-left.png rename to themes/Windows-Default/gtk-2.0/Tabs/tab-left.png diff --git a/themes/Win7-Basic/gtk-2.0/Tabs/tab-right-active.png b/themes/Windows-Default/gtk-2.0/Tabs/tab-right-active.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Tabs/tab-right-active.png rename to themes/Windows-Default/gtk-2.0/Tabs/tab-right-active.png diff --git a/themes/Win7-Basic/gtk-2.0/Tabs/tab-right.png b/themes/Windows-Default/gtk-2.0/Tabs/tab-right.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Tabs/tab-right.png rename to themes/Windows-Default/gtk-2.0/Tabs/tab-right.png diff --git a/themes/Win7-Basic/gtk-2.0/Tabs/tab-top-active.png b/themes/Windows-Default/gtk-2.0/Tabs/tab-top-active.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Tabs/tab-top-active.png rename to themes/Windows-Default/gtk-2.0/Tabs/tab-top-active.png diff --git a/themes/Win7-Basic/gtk-2.0/Tabs/tab-top.png b/themes/Windows-Default/gtk-2.0/Tabs/tab-top.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Tabs/tab-top.png rename to themes/Windows-Default/gtk-2.0/Tabs/tab-top.png diff --git a/themes/Win7-Basic/gtk-2.0/Toolbar/toolbar.png b/themes/Windows-Default/gtk-2.0/Toolbar/toolbar.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Toolbar/toolbar.png rename to themes/Windows-Default/gtk-2.0/Toolbar/toolbar.png diff --git a/themes/Win7-Basic/gtk-2.0/Toolbar/toolbutton-normal.png b/themes/Windows-Default/gtk-2.0/Toolbar/toolbutton-normal.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Toolbar/toolbutton-normal.png rename to themes/Windows-Default/gtk-2.0/Toolbar/toolbutton-normal.png diff --git a/themes/Win7-Basic/gtk-2.0/Toolbar/toolbutton-prelight.png b/themes/Windows-Default/gtk-2.0/Toolbar/toolbutton-prelight.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Toolbar/toolbutton-prelight.png rename to themes/Windows-Default/gtk-2.0/Toolbar/toolbutton-prelight.png diff --git a/themes/Win7-Basic/gtk-2.0/Toolbar/toolbutton-pressed.png b/themes/Windows-Default/gtk-2.0/Toolbar/toolbutton-pressed.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Toolbar/toolbutton-pressed.png rename to themes/Windows-Default/gtk-2.0/Toolbar/toolbutton-pressed.png diff --git a/themes/Win7-Basic/gtk-2.0/Toolbar/toolbutton-toggled.png b/themes/Windows-Default/gtk-2.0/Toolbar/toolbutton-toggled.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/Toolbar/toolbutton-toggled.png rename to themes/Windows-Default/gtk-2.0/Toolbar/toolbutton-toggled.png diff --git a/themes/Windows-Default/gtk-2.0/gtkrc b/themes/Windows-Default/gtk-2.0/gtkrc old mode 100644 new mode 100755 index 6e4e636..7ebf1c7 --- a/themes/Windows-Default/gtk-2.0/gtkrc +++ b/themes/Windows-Default/gtk-2.0/gtkrc @@ -1,273 +1,1912 @@ -# Clearlooks-Vista by Marius M. M. < devilx at gdesklets dot org> -# This theme is GPLed :) +# Azur 0.4 +################Comment out if you don't need################################################ +include "icons/iconrc" +include "menubar-blue.rc" +include "panel.rc" +#gtk-menu-drop-shadow = 1 +#gtk-menu-shadow-delay = 0 +gtk-icon-sizes = "panel-menu=24,24:panel=24,24:gtk-button=16,16:gtk-large-toolbar=24,24" +#:gtk-large-toolbar=28,28:gtk-small-toolbar=24,24" +############################################################################################# -gtk-icon-sizes = "panel-menu=16,16:panel=22,22" - -style "clearlooks-default" +style "default" { - GtkButton::default_border = { 0, 0, 0, 0 } - GtkButton::default_outside_border = { 0, 0, 0, 0 } - GtkRange::trough_border = 0 + GtkWidget::interior_focus = 7 + GtkWidget::focus_padding = 0 + GtkButton::default_border = { 1, 1, 1, 1 } + GtkButton::default_outside_border = { 2, 2, 2, 2 } + + GtkRange::trough_border = 1 + GtkRange::slider_width = 15 + GtkRange::stepper_size = 15 + + GtkVScale::slider_length = 11 + GtkVScale::slider_width = 21 + GtkHScale::slider_length = 11 + GtkHScale::slider_width = 21 - GtkWidget::focus_padding = 1 + GtkPaned::handle_size = 6 + GtkScrollbar::min_slider_length = 50 + GtkCheckButton::indicator_size = 12 + GtkCheckButton::indicator_spacing = 3 + GtkMenuBar::internal_padding = 1 + GtkOptionMenu::indicator_size = { 15, 8 } + GtkOptionMenu::indicator_spacing = { 8, 2, 0, 0 } +GtkStatusbar::shadow_type = GTK_SHADOW_NONE +GtkSpinButton::shadow_type = GTK_SHADOW_NONE - GtkPaned::handle_size = 6 - GtkRange::slider_width = 15 - GtkRange::stepper_size = 15 - GtkScrollbar::min_slider_length = 30 - GtkCheckButton::indicator_size = 12 - GtkMenuBar::internal-padding = 0 + xthickness = 1 + ythickness = 1 + - GtkTreeView::expander_size = 14 - GtkTreeView::odd_row_color = "#EBF5FF" - GtkExpander::expander_size = 16 - - xthickness = 1 - ythickness = 1 - - fg[NORMAL] = "#505050" - fg[ACTIVE] = "#505050" - fg[SELECTED] = "#ffffff" + fg[NORMAL] = "#353535" + fg[ACTIVE] = "#353535" + fg[PRELIGHT] = "#000000" + fg[SELECTED] = "#000000" fg[INSENSITIVE] = "#9B9B9B" - bg[NORMAL] = "#F5F5F5" - bg[ACTIVE] = "#f9f9f9" + bg[NORMAL] = "#ebebeb" + bg[ACTIVE] = "#ebebeb" bg[PRELIGHT] = "#FFFFFF" - bg[SELECTED] = "#095fb2" + bg[SELECTED] = "#B2C3D0" bg[INSENSITIVE] = "#ffffff" base[NORMAL] = "#ffffff" - base[ACTIVE] = "#095fb2" + base[ACTIVE] = "#5fb9ed" base[PRELIGHT] = "#FFFFFF" - base[INSENSITIVE]= "#ffffff" - base[SELECTED] = "#095fb2" + base[INSENSITIVE]= "#f4f4f4" + base[SELECTED] = "#5fb9ed" text[INSENSITIVE]= "#9B9B9B" text[SELECTED] = "#ffffff" text[ACTIVE] = "#ffffff" + text[PRELIGHT] = "#353535" - engine "clearlooks" + + + engine "pixmap" { - contrast = 1.1 - menubarstyle = 2 # 0 = flat, 1 = sunken, 2 = flat gradient - menuitemstyle = 1 # 0 = flat, 1 = 3d-ish (gradient), 2 = 3d-ish (button) - listviewitemstyle = 1 # 0 = flat, 1 = 3d-ish (gradient) - progressbarstyle = 1 # 0 = candy bar, 1 = flat + + + + image + { + function = HANDLE + recolorable = TRUE + overlay_file = "Handles/handle-v.png" + overlay_stretch = FALSE + orientation = HORIZONTAL + } + image + { + function = HANDLE + recolorable = TRUE + overlay_file = "Handles/handle-h.png" + overlay_stretch = FALSE + orientation = VERTICAL + } + +####################### SHADOWS ############################x + + image + { + function = SHADOW + shadow = IN + recolorable = FALSE + file = "Shadows/shadow-in.png" + border = { 3, 3, 2, 2 } + stretch = TRUE + } + image + { + function = SHADOW + shadow = OUT + recolorable = TRUE + file = "Shadows/shadow-out.png" + border = { 1, 1, 1, 1 } + stretch = TRUE + } + + + + image + { + function = SHADOW + shadow = ETCHED_IN + recolorable = TRUE + file = "Frame-Gap/frame1.png" + border = { 2, 2, 2, 2 } + stretch = TRUE + } + image + { + function = SHADOW + shadow = ETCHED_OUT + recolorable = TRUE + file = "Shadows/shadow-none.png" + border = { 2, 2, 2, 2 } + stretch = TRUE + } + image + { + function = SHADOW_GAP + recolorable = TRUE + file = "Frame-Gap/frame1.png" + border = { 2, 2, 2, 2 } + stretch = TRUE + gap_start_file = "Frame-Gap/frame-gap-start.png" + gap_start_border = { 2, 0, 2, 0 } + gap_end_file = "Frame-Gap/frame-gap-end.png" + gap_end_border = { 0, 2, 2, 0 } + gap_side = TOP + } + image + { + function = VLINE + recolorable = TRUE + file = "Lines/line-v.png" + border = { 1, 1, 0, 0 } + stretch = TRUE + } + image + { + function = HLINE + recolorable = TRUE + file = "Lines/line-h.png" + border = { 0, 0, 1, 1 } + stretch = TRUE + } + + # focus + + image + { + function = FOCUS + recolorable = TRUE + file = "Others/focus.png" + border = { 6, 0, 6, 0 } + stretch = TRUE + } + + # arrows + + image + { + function = ARROW + recolorable = TRUE + overlay_file = "Arrows/arrow-up.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = FALSE + arrow_direction = UP + } + image + { + function = ARROW + recolorable = TRUE + overlay_file = "Arrows/arrow-down.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = FALSE + arrow_direction = DOWN + } + image + { + function = ARROW + recolorable = TRUE + overlay_file = "Arrows/arrow-left.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = FALSE + arrow_direction = LEFT + } + image + { + function = ARROW + recolorable = TRUE + overlay_file = "Arrows/arrow-right.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = FALSE + arrow_direction = RIGHT + } + image + { + function = BOX + recolorable = TRUE + file = "Toolbar/toolbar.png" + border = { 3, 3, 3, 3 } + stretch = TRUE + } + } +} + +class "GtkWidget" style "default" + +#################### BUTTONS ####################### + +style "button" = "default" +{ + + + + engine "pixmap" + { + image + { + function = BOX + detail = "buttondefault" + recolorable = TRUE + file = "Buttons/button-default.png" + border = {4, 4, 4, 4} + stretch = TRUE + } + image + { + function = BOX + state = PRELIGHT + recolorable = TRUE + file = "Buttons/button-prelight.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + image + { + function = BOX + state = ACTIVE + file = "Buttons/button-pressed.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + image + { + function = BOX + state = INSENSITIVE + file = "Buttons/button-insensitive.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + image + { + function = BOX + file = "Buttons/button-normal.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } } } -style "clearlooks-progressbar" = "clearlooks-default" -{ - fg[PRELIGHT] = "#ffffff" - xthickness = 1 - ythickness = 1 - +style "checkradiobutton" { + engine "pixmap" { + image + { + function = FLAT_BOX + recolorable = TRUE + file = "Check-Radio/highlight.png" + border = { 2, 5, 2, 5 } + stretch = TRUE + } + } } -style "clearlooks-wide" = "clearlooks-default" +class "GtkRadioButton" style "checkradiobutton" +class "GtkCheckButton" style "checkradiobutton" + + +style "optionmenu" = "default" { - xthickness = 2 - ythickness = 2 + engine "pixmap" + { + image + { + function = BOX + recolorable = TRUE + state = PRELIGHT + file = "Combo/combo-prelight.png" + border = { 5, 5, 5, 5} + stretch = TRUE + } + image + { + function = BOX + recolorable = TRUE + state = NORMAL + file = "Combo/combo-normal.png" + border = { 5, 5, 5, 5} + stretch = TRUE + } + + image + { + function = BOX + recolorable = TRUE + state = ACTIVE + file = "Combo/combo-prelight.png" + border = { 5, 5, 5, 5} + stretch = TRUE + } + image + { + function = BOX + recolorable = TRUE + state = INSENSITIVE + file = "Combo/combo-normal.png" + border = { 5, 5, 5, 5} + stretch = TRUE + } + image + { + function = TAB + state = INSENSITIVE + recolorable = TRUE + overlay_file = "Combo/combo-arrow-insens.png" + overlay_stretch = FALSE + } + image + { + function = TAB + recolorable = TRUE + state = NORMAL + overlay_file = "Combo/combo-arrow.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = FALSE + } + image + { + function = TAB + recolorable = TRUE + state = PRELIGHT + overlay_file = "Combo/combo-arrow-prelight.png" + overlay_border = { 0, 0, 0, 0 } + overlay_stretch = FALSE + } + } } -style "clearlooks-button" = "clearlooks-default" +widget_class "*Combo*" style "optionmenu" + +############################################################################### +###Check vagy mi.... ######## + +style "radiobutton" = "default" { - xthickness = 3 - ythickness = 3 + engine "pixmap" + { + #This is the image used to draw an unchecked box. + image + { + function = OPTION + recolorable = TRUE + state = NORMAL + shadow = OUT + overlay_file = "Check-Radio/option1.png" + overlay_stretch = FALSE + } + + image + { + function = OPTION + recolorable = TRUE + state = PRELIGHT + shadow = OUT + overlay_file = "Check-Radio/option1.png" + overlay_stretch = FALSE + } + + image + { + function = OPTION + recolorable = TRUE + state = ACTIVE + shadow = OUT + overlay_file = "Check-Radio/option1.png" + overlay_stretch = FALSE + } + + image + { + function = OPTION + recolorable = TRUE + state = INSENSITIVE + shadow = OUT + overlay_file = "Check-Radio/option1.png" + overlay_stretch = FALSE + } + + #This is the image used to draw a selected (checked) box. + image + { + function = OPTION + recolorable = TRUE + state = NORMAL + shadow = IN + overlay_file = "Check-Radio/option2.png" + overlay_stretch = FALSE + } + + image + { + function = OPTION + recolorable = TRUE + state = PRELIGHT + shadow = IN + overlay_file = "Check-Radio/option4.png" + overlay_stretch = FALSE + } + + image + { + function = OPTION + recolorable = TRUE + state = ACTIVE + shadow = IN + overlay_file = "Check-Radio/option4.png" + overlay_stretch = FALSE + } + + + image + { + function = OPTION + recolorable = TRUE + state = INSENSITIVE + shadow = IN + overlay_file = "Check-Radio/option1.png" + overlay_stretch = FALSE + } + + #Use this image to draw the highlight when a line with a check box + #is moused over. + image + { + function = FLAT_BOX + recolorable = TRUE + stretch = TRUE + file = "Check-Radio/checklight.png" + border = { 2, 2, 2, 2 } + } + + } } -style "clearlooks-notebook" = "clearlooks-wide" + + + + + + +################################################################################ + + + + + + + +################################################################################ +style "checkbutton" = "default" { - bg[NORMAL] = "#FAFAFA" + engine "pixmap" + { + #This is the image used to draw an unchecked box. + image + { + function = CHECK + recolorable = TRUE + state = NORMAL + shadow = OUT + overlay_file = "Check-Radio/check1.png" + overlay_stretch = FALSE + } + + image + { + function = CHECK + recolorable = TRUE + state = PRELIGHT + shadow = OUT + overlay_file = "Check-Radio/check1.png" + overlay_stretch = FALSE + } + + image + { + function = CHECK + recolorable = TRUE + state = ACTIVE + shadow = OUT + overlay_file = "Check-Radio/check1.png" + overlay_stretch = FALSE + } + + image + { + function = CHECK + recolorable = TRUE + state = INSENSITIVE + shadow = OUT + overlay_file = "Check-Radio/check1.png" + overlay_stretch = FALSE + } + + #This is the image used to draw a selected (checked) box. + image + { + function = CHECK + recolorable = TRUE + state = NORMAL + shadow = IN + overlay_file = "Check-Radio/check2.png" + overlay_stretch = FALSE + } + + image + { + function = CHECK + recolorable = TRUE + state = PRELIGHT + shadow = IN + overlay_file = "Check-Radio/check4.png" + overlay_stretch = FALSE + } + + image + { + function = CHECK + recolorable = TRUE + state = ACTIVE + shadow = IN + overlay_file = "Check-Radio/check4.png" + overlay_stretch = FALSE + } + + + image + { + function = CHECK + recolorable = TRUE + state = INSENSITIVE + shadow = IN + overlay_file = "Check-Radio/check1.png" + overlay_stretch = FALSE + } + + #Use this image to draw the highlight when a line with a check box + #is moused over. + image + { + function = FLAT_BOX + recolorable = TRUE + stretch = TRUE + file = "Check-Radio/checklight.png" + border = { 2, 2, 2, 2 } + } + + } } -style "clearlooks-tasklist" = "clearlooks-default" + +####################### ENTRY #####################xx + +style "entry" = "default" { - xthickness = 5 - ythickness = 3 + + xthickness = 3 + ythickness = 1 + + GtkWidget::interior_focus = 0 + #GtkEntry::shadow_type = GTK_SHADOW_NONE + engine "pixmap" + { + image + { + function = FOCUS + recolorable = TRUE + file = "Shadows/entry-shadow-in.png" + border = { 3,3,3,3 } + stretch = TRUE + } + image + { + function = BOX + recolorable = TRUE + shadow = IN + state = NORMAL + file = "Shadows/entry-shadow-in.png" + border = { 3,3,3,3 } + stretch = TRUE + } + +image + { + function = BOX + recolorable = TRUE + shadow = OUT + state = NORMAL + file = "Shadows/text-entry.png" + border = { 3,3,3,3 } + stretch = TRUE + } + + image + { + function = SHADOW + detail = "entry" + shadow = IN + recolorable = FALSE + file = "Shadows/text-entry.png" + border = { 3,3,3,3 } + stretch = TRUE + } + + } } -style "clearlooks-menu" = "clearlooks-default" +################x SPINBUTTONS ################ + +style "spinbutton" = "entry" { - xthickness = 2 - ythickness = 1 + + + engine "pixmap" + { + image + { + function = ARROW + } + +############################# UP ######################xx + image + { + function = BOX + state = NORMAL + detail = "spinbutton_up" + recolorable = TRUE + file = "Spin/spin.png" + border = { 0, 0, 0, 0 } + stretch = TRUE + overlay_file = "Spin/spin-up.png" + overlay_stretch = FALSE + } + + image + { + function = BOX + state = PRELIGHT + detail = "spinbutton_up" + recolorable = TRUE + file = "Spin/spin.png" + border = { 0, 0, 0, 0 } + stretch = TRUE + overlay_file = "Spin/spin-up-prelight.png" + overlay_stretch = FALSE + } + + image + { + function = BOX + state = INSENSITIVE + detail = "spinbutton_up" + recolorable = TRUE + file = "Spin/spin.png" + border = { 0, 0, 0, 0 } + stretch = TRUE + overlay_file = "Spin/spin-up-disable.png" + overlay_stretch = FALSE + } + + image + { + function = BOX + state = ACTIVE + detail = "spinbutton_up" + recolorable = TRUE + file = "Spin/spin.png" + border = { 0, 0, 0, 0 } + stretch = TRUE + overlay_file = "Spin/spin-up-prelight.png" + overlay_stretch = FALSE + } + + +###########################################x DOWN ######################## + image + { + function = BOX + state = NORMAL + detail = "spinbutton_down" + recolorable = TRUE + file = "Spin/spin.png" + border = { 0, 0, 0, 0 } + stretch = TRUE + overlay_file = "Spin/spin-down.png" + overlay_stretch = FALSE + } + + image + { + function = BOX + state = PRELIGHT + detail = "spinbutton_down" + recolorable = TRUE + file = "Spin/spin.png" + border = { 0, 0, 0, 0 } + stretch = TRUE + overlay_file = "Spin/spin-down-prelight.png" + overlay_stretch = FALSE + } + + image + { + function = BOX + state = INSENSITIVE + detail = "spinbutton_down" + recolorable = TRUE + file = "Spin/spin.png" + border = { 0, 0, 0, 0 } + stretch = TRUE + overlay_file = "Spin/spin-down-disable.png" + overlay_stretch = FALSE + } + + image + { + function = BOX + state = ACTIVE + detail = "spinbutton_down" + recolorable = TRUE + file = "Spin/spin.png" + border = { 0, 0, 0, 0 } + stretch = TRUE + overlay_file = "Spin/spin-down-prelight.png" + overlay_stretch = FALSE + } + + + + + + } } -style "clearlooks-menubar" = "clearlooks-default" +############################# SCROLLBAR #################### + +style "scrollbar" = "default" { - xthickness = 2 - ythickness = 2 - bg[NORMAL] = "#449E20" - fg[NORMAL] = "#ffffff" - base[PRELIGHT] = "#63E62E" - base[SELECTED] = "#4DB224" + engine "pixmap" + { + + image + { + function = BOX + recolorable = TRUE + detail = "trough" + file = "Scrollbars/trough-scrollbar-horiz.png" + border = { 19, 19, 2, 2 } + stretch = TRUE + orientation = HORIZONTAL + } + image + { + function = BOX + recolorable = TRUE + detail = "trough" + file = "Scrollbars/trough-scrollbar-vert.png" + border = { 2, 2, 19, 19 } + stretch = TRUE + orientation = VERTICAL + } + + +###########x SLIDERS ##################x + + image + { + function = SLIDER + recolorable = TRUE + state = NORMAL + file = "Scrollbars/slider-horiz.png" + border = { 2, 2, 2, 2 } + stretch = TRUE + orientation = HORIZONTAL + overlay_file = "Scrollbars/scroll-thumb-horiz.png" + overlay_stretch = FALSE + orientation = HORIZONTAL + + + } + + image + { + function = SLIDER + recolorable = TRUE + state = ACTIVE + shadow = IN + file = "Scrollbars/slider-horiz.png" + border = { 2, 2, 2, 2 } + stretch = TRUE + orientation = HORIZONTAL + overlay_file = "Scrollbars/scroll-thumb-horiz.png" + overlay_stretch = FALSE + orientation = HORIZONTAL + + } + + image + { + function = SLIDER + recolorable = TRUE + state = PRELIGHT + file = "Scrollbars/slider-horiz-prelight.png" + border = { 2, 2, 2, 2 } + stretch = TRUE + orientation = HORIZONTAL + overlay_file = "Scrollbars/scroll-thumb-horiz.png" + overlay_stretch = FALSE + orientation = HORIZONTAL + + } + image + { + function = SLIDER + recolorable = TRUE + state = INSENSITIVE + file = "Scrollbars/slider-horiz-insens.png" + border = { 2, 2, 2, 2 } + stretch = TRUE + orientation = HORIZONTAL + overlay_file = "Scrollbars/scroll-thumb-horiz.png" + overlay_stretch = FALSE + orientation = HORIZONTAL + + } + +#############x verticals################xx + + image + { + function = SLIDER + recolorable = TRUE + state = NORMAL + file = "Scrollbars/slider-vert.png" + border = { 2, 2, 2, 2 } + stretch = TRUE + orientation = VERTICAL + overlay_file = "Scrollbars/scroll-thumb-vert.png" + overlay_stretch = FALSE + orientation = VERTICAL + + } + + image + { + function = SLIDER + recolorable = TRUE + state = ACTIVE + shadow = IN + file = "Scrollbars/slider-vert.png" + border = { 2, 2, 2, 2 } + stretch = TRUE + orientation = VERTICAL + overlay_file = "Scrollbars/scroll-thumb-vert.png" + overlay_stretch = FALSE + orientation = VERTICAL + + } + + image + { + function = SLIDER + recolorable = TRUE + state = PRELIGHT + file = "Scrollbars/slider-vert-prelight.png" + border = { 2, 2, 2, 2 } + stretch = TRUE + orientation = VERTICAL + overlay_file = "Scrollbars/scroll-thumb-vert.png" + overlay_stretch = FALSE + orientation = VERTICAL + + } + image + { + function = SLIDER + recolorable = TRUE + state = INSENSITIVE + file = "Scrollbars/slider-vert-insens.png" + border = { 2, 2, 2, 2 } + stretch = TRUE + orientation = VERTICAL + overlay_file = "Scrollbars/scroll-thumb-vert.png" + overlay_stretch = FALSE + orientation = VERTICAL + + } + + +###########x END SLIDERS ##################x + +########### Steppers ###################### +#### UP ####### + image + { + function = STEPPER + recolorable = TRUE + state = NORMAL + file = "Scrollbars/stepper-up.png" + #border = { 12, 2, 2, 9 } + stretch = TRUE + arrow_direction = UP + } + image + { + function = STEPPER + recolorable = TRUE + state = PRELIGHT + file = "Scrollbars/stepper-up-prelight.png" + #border = { 12, 2, 2, 9 } + stretch = TRUE + arrow_direction = UP + } + image + { + function = STEPPER + recolorable = TRUE + state = ACTIVE + file = "Scrollbars/stepper-up-prelight.png" + #border = { 12, 2, 2, 9 } + stretch = TRUE + arrow_direction = UP + } + image + { + function = STEPPER + recolorable = TRUE + state = INSENSITIVE + file = "Scrollbars/stepper-up-insens.png" + #border = { 12, 2, 2, 9 } + stretch = TRUE + arrow_direction = UP + } + + ######### DOWN ############ + + + image + { + function = STEPPER + recolorable = TRUE + state = NORMAL + file = "Scrollbars/stepper-down.png" + #border = { 12, 2, 10, 2 } + stretch = TRUE + arrow_direction = DOWN + } + image + { + function = STEPPER + recolorable = TRUE + state = PRELIGHT + file = "Scrollbars/stepper-down-prelight.png" + #border = { 12, 2, 10, 2 } + stretch = TRUE + arrow_direction = DOWN + } + image + { + function = STEPPER + recolorable = TRUE + state = ACTIVE + file = "Scrollbars/stepper-down-prelight.png" + #border = { 12, 2, 10, 2 } + stretch = TRUE + arrow_direction = DOWN + } + image + { + function = STEPPER + recolorable = TRUE + state = INSENSITIVE + file = "Scrollbars/stepper-down-insens.png" + #border = { 12, 2, 10, 2 } + stretch = TRUE + arrow_direction = DOWN + } + +############ RIGHT ################ + + image + { + function = STEPPER + recolorable = TRUE + state = NORMAL + file = "Scrollbars/stepper-right.png" + #border = { 2, 9, 2, 13 } + stretch = TRUE + arrow_direction = RIGHT + } + image + { + function = STEPPER + recolorable = TRUE + state = PRELIGHT + file = "Scrollbars/stepper-right-prelight.png" + #border = { 2, 9, 2, 13 } + stretch = TRUE + arrow_direction = RIGHT + } + image + { + function = STEPPER + recolorable = TRUE + state = ACTIVE + file = "Scrollbars/stepper-right-prelight.png" + #border = { 2, 9, 2, 13 } + stretch = TRUE + arrow_direction = RIGHT + } + image + { + function = STEPPER + recolorable = TRUE + state = INSENSITIVE + file = "Scrollbars/stepper-right-insens.png" + #border = { 2, 9, 2, 13 } + stretch = TRUE + arrow_direction = RIGHT + } + +############### LEFT ################### + + + image + { + function = STEPPER + recolorable = TRUE + state = NORMAL + file = "Scrollbars/stepper-left.png" + #border = { 2, 9, 2, 13 } + stretch = TRUE + arrow_direction = LEFT + } + image + { + function = STEPPER + recolorable = TRUE + state = PRELIGHT + file = "Scrollbars/stepper-left-prelight.png" + #border = { 2, 9, 2, 13 } + stretch = TRUE + arrow_direction = LEFT + } + image + { + function = STEPPER + recolorable = TRUE + state = ACTIVE + file = "Scrollbars/stepper-left-prelight.png" + #border = { 2, 9, 2, 13 } + stretch = TRUE + arrow_direction = LEFT + } + image + { + function = STEPPER + recolorable = TRUE + state = INSENSITIVE + file = "Scrollbars/stepper-left-insens.png" + #border = { 2, 9, 2, 13 } + stretch = TRUE + arrow_direction = LEFT + } + + + + } } -style "clearlooks-menu-item" = "clearlooks-default" -{ - xthickness = 2 - ythickness = 3 - fg[PRELIGHT] = "#ffffff" - text[PRELIGHT] = "#ffffff" +##################### PROGRESSBAR ###################x + +style "progressbar" { + fg[PRELIGHT] = "#ffffff" + text[PRELIGHT] = "#ffffff" + xthickness = 1 + ythickness = 1 + engine "pixmap" + { + image + { + function = BOX + + detail = "trough" + file = "ProgressBar/trough-progressbar-horiz.png" + border = { 2, 2, 2, 2 } + stretch = TRUE +# orientation = HORIZONTAL + } + + image + { + function = BOX + + detail = "bar" + file = "ProgressBar/progressbar-horiz.png" + border = { 2, 2, 2, 2 } + stretch = TRUE +# orientation = HORIZONTAL + } + + + + + + + } } -style "clearlooks-tree" = "clearlooks-default" -{ - xthickness = 2 - ythickness = 2 +############################# RANGE ####################### + +style "range" = "default" +{ + engine "pixmap" + { + image + { + function = BOX + recolorable = TRUE + detail = "trough" + file = "Range/trough-horizontal.png" + border = { 10, 10, 1, 19 } + stretch = TRUE + orientation = HORIZONTAL + } + image + { + function = BOX + recolorable = TRUE + detail = "trough" + file = "Range/trough-vertical.png" + border = { 0, 19, 10, 10 } + stretch = TRUE + orientation = VERTICAL + } +############### the sliders ############### + + image + { + function = SLIDER + recolorable = TRUE + state = NORMAL + file = "Range/null.png" + border = { 0, 0, 0, 0 } + stretch = TRUE + overlay_file = "Range/slider-horiz.png" + overlay_stretch = FALSE + orientation = HORIZONTAL + } + image + { + function = SLIDER + recolorable = TRUE + state = PRELIGHT + file = "Range/null.png" + border = { 0, 0, 0, 0 } + stretch = TRUE + overlay_file = "Range/slider-horiz-prelight.png" + overlay_stretch = FALSE + orientation = HORIZONTAL + } + image + { + function = SLIDER + recolorable = TRUE + state = INSENSITIVE + file = "Range/null.png" + border = { 0, 0, 0, 0 } + stretch = TRUE + overlay_file = "Range/slider-horiz.png" + overlay_stretch = FALSE + orientation = HORIZONTAL + } + +######################### VERTICAL ########################### + + image + { + function = SLIDER + recolorable = TRUE + state = NORMAL + file = "Range/null.png" + border = { 0, 0, 0, 0 } + stretch = TRUE + overlay_file = "Range/slider-vert.png" + overlay_stretch = FALSE + orientation = VERTICAL + } + image + { + function = SLIDER + recolorable = TRUE + state = PRELIGHT + file = "Range/null.png" + border = { 0, 0, 0, 0 } + stretch = TRUE + overlay_file = "Range/slider-vert-prelight.png" + overlay_stretch = FALSE + orientation = VERTICAL + } + image + { + function = SLIDER + recolorable = TRUE + state = INSENSITIVE + file = "Range/null.png" + border = { 0, 0, 0, 0 } + stretch = TRUE + overlay_file = "Range/slider-vert.png" + overlay_stretch = FALSE + orientation = VERTICAL + } + } } -style "clearlooks-frame-title" = "clearlooks-default" + + + + + +################### TOOLBAR ########################### + + +style "toolbar" { - fg[NORMAL] = "#505050" + + engine "pixmap" + { + image + { + function = BOX + file = "Toolbar/toolbar.png" + border = { 4, 4, 4, 4} + stretch = TRUE + } + } } +widget_class "*BonoboDockItem" style "toolbar" +class "*BonoboDockItem" style "toolbar" -style "clearlooks-panel" = "clearlooks-default" +widget_class "*HandleBox" style "toolbar" +class "*HandleBox" style "toolbar" + +widget_class "*Toolbar" style "toolbar" +class "*Toolbar" style "toolbar" + + + +##################### TOOLBAR BUTTONS ############################### + + + + + +style "toolbuttons" = "default" { - xthickness = 3 - ythickness = 3 -} -style "clearlooks-tooltips" = "clearlooks-default" -{ - xthickness = 4 - ythickness = 4 - bg[NORMAL] = { 1.0,1.0,0.75 } -} -style "clearlooks-combo" = "clearlooks-default" -{ - xthickness = 1 - ythickness = 2 -} + + xthickness = 1 + ythickness = 1 -style "metacity-frame" -{ - bg[SELECTED] = "#095fb2" - fg[SELECTED] = "#ffffff" -} - -style "panelbg" -{ - xthickness = 0 - ythickness = 0 - bg_pixmap[NORMAL] = "images/panelbg.png" - -} - -style "panelbuttons" -{ - xthickness = 2 - ythickness = 0 + GtkWidget::focus_padding = 2 engine "pixmap" { - image +image { - function = BOX + function = BOX recolorable = TRUE state = NORMAL - file = "images/panelbutton1.png" - border = { 4, 4, 4, 4 } - stretch = TRUE + file = "Toolbar/toolbutton-normal.png" + border = { 5, 5, 5, 5 } + stretch = TRUE } image { - function = BOX + function = BOX recolorable = TRUE state = PRELIGHT - file = "images/panelbutton2.png" - border = { 4, 4, 4, 4 } - stretch = TRUE + file = "Toolbar/toolbutton-prelight.png" + border = { 5, 5, 5, 5 } + stretch = TRUE } - image +image { - function = BOX - recolorable = TRUE - shadow = OUT - state = PRELIGHT - file = "images/panelbutton1.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - - image - { - function = BOX - recolorable = TRUE - shadow = IN - state = PRELIGHT - file = "images/panelbutton3.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - - image - { - function = BOX + function = BOX recolorable = TRUE state = ACTIVE - file = "images/panelbutton3.png" - border = { 4, 4, 4, 4 } - stretch = TRUE + file = "Toolbar/toolbutton-pressed.png" + border = { 5, 5, 5, 5 } + stretch = TRUE } image { - function = BOX + function = BOX recolorable = TRUE state = INSENSITIVE - file = "images/panelbutton2.png" - border = { 4, 4, 4, 4 } - stretch = TRUE + file = "Toolbar/toolbutton-normal.png" + border = { 5, 5, 5, 5 } + stretch = TRUE } } } +widget_class "*Tool*GtkToggleButton" style "toolbuttons" +widget_class "*Tool*GtkButton" style "toolbuttons" -class "GtkWidget" style "clearlooks-default" -class "GtkButton" style "clearlooks-button" -class "GtkCombo" style "clearlooks-button" -class "GtkRange" style "clearlooks-wide" -class "GtkFrame" style "clearlooks-wide" -class "GtkMenu" style "clearlooks-menu" -class "GtkEntry" style "clearlooks-button" -class "GtkMenuItem" style "clearlooks-menu-item" -class "GtkStatusbar" style "clearlooks-wide" -class "GtkNotebook" style "clearlooks-notebook" -class "GtkProgressBar" style "clearlooks-progressbar" -class "*MenuBar*" style "clearlooks-menubar" -class "GtkMenuBar*" style "clearlooks-menubar" -class "MetaFrames" style "metacity-frame" -class "*Panel*" style "panelbg" -class "*notif*" style "panelbg" -class "*Notif*" style "panelbg" -class "*Tray*" style "panelbg" -class "*tray*" style "panelbg" -widget_class "*MenuItem*" style "clearlooks-menu-item" -widget_class "*.GtkComboBox.GtkButton" style "clearlooks-combo" -widget_class "*.GtkCombo.GtkButton" style "clearlooks-combo" -widget_class "*.tooltips.*.GtkToggleButton" style "clearlooks-tasklist" -widget "gtk-tooltips" style "clearlooks-tooltips" -widget_class "*.GtkTreeView.GtkButton" style "clearlooks-tree" -widget_class "*.GtkCTree.GtkButton" style "clearlooks-tree" -widget_class "*.GtkList.GtkButton" style "clearlooks-tree" -widget_class "*.GtkCList.GtkButton" style "clearlooks-tree" -widget_class "*.GtkFrame.GtkLabel" style "clearlooks-frame-title" -widget_class "*.GtkNotebook.*.GtkEventBox" style "clearlooks-notebook" -widget_class "*.GtkNotebook.*.GtkViewport" style "clearlooks-notebook" -widget_class "*MenuBar*" style "clearlooks-menubar" +############################# PANEL GRAPHICS ################################# -widget_class "*Panel*GtkToggleButton" style "panelbuttons" -widget_class "*Panel*GtkButton" style "panelbuttons" + + + + +############################# MENU ################################# + + + + + +style "menu" = "default" +{ +#bg_pixmap[NORMAL] = "Menu-Menubar/menu-overlay.png" +xthickness = 3 +ythickness = 1 + engine "pixmap" + { + image + { + function = BOX + recolorable = TRUE + detail = "menu" + file = "Menu-Menubar/menu.png" + border = { 34, 3, 3, 3 } + stretch = TRUE + } + } +} + + +########################### Menuitem ############################# +style "menuitem" = "default" +{ + xthickness = 1 + fg[PRELIGHT] = "#000000" + text[PRELIGHT] = "#000000" + + + engine "pixmap" + { + image + { + function = BOX + recolorable = TRUE + file = "Menu-Menubar/menuitem.png" + + border = { 10, 10, 10, 10 } + stretch = TRUE + } + image + { + function = ARROW + recolorable = TRUE + state = NORMAL + overlay_file = "Arrows/arrow-right-norm.png" + overlay_stretch = FALSE + arrow_direction = RIGHT + } + image + { + function = ARROW + recolorable = TRUE + state = PRELIGHT + overlay_file = "Arrows/arrow-right.png" + overlay_stretch = FALSE + arrow_direction = RIGHT + } + + } +} + + +style "tearoffmenuitem" = "menuitem" +{ + engine "pixmap" + { + image + { + function = ARROW + file = "Arrows/arrow-left.png" + stretch = TRUE + arrow_direction = LEFT + } +# image +# { +# function = HLINE +# file = "cuthere.png" +# border = { 0, 0, 0, 0 } +# stretch = TRUE +# } + } +} + + + + + + + + + + + + + + + +style "notebook" = "default" +{ + + xthickness = 2 + ythickness = 2 + engine "pixmap" + { + image + { + function = EXTENSION + recolorable = TRUE + state = ACTIVE + file = "Tabs/tab-bottom.png" + border = { 4,4,4,4} + stretch = TRUE + gap_side = TOP + } + image + { + function = EXTENSION + recolorable = TRUE + state = ACTIVE + file = "Tabs/tab-top.png" + border = { 4,4,4,4} + stretch = TRUE + gap_side = BOTTOM + } + image + { + function = EXTENSION + recolorable = TRUE + state = ACTIVE + file = "Tabs/tab-left.png" + border = { 4,4,4,4} + stretch = TRUE + gap_side = RIGHT + } + image + { + function = EXTENSION + recolorable = TRUE + state = ACTIVE + file = "Tabs/tab-right.png" + border = { 4,4,4,4} + stretch = TRUE + gap_side = LEFT + } + image + { + function = EXTENSION + recolorable = TRUE + + file = "Tabs/tab-top-active.png" + border = { 4,4,4,4} + stretch = TRUE + gap_side = BOTTOM + } + image + { + function = EXTENSION + recolorable = TRUE + + file = "Tabs/tab-bottom-active.png" + border = { 4,4,4,4} + stretch = TRUE + gap_side = TOP + } + image + { + function = EXTENSION + recolorable = TRUE + + file = "Tabs/tab-left-active.png" + border = { 4,4,4,4} + stretch = TRUE + gap_side = RIGHT + } + image + { + function = EXTENSION + recolorable = TRUE + + file = "Tabs/tab-right-active.png" + border = { 4,4,4,4} + stretch = TRUE + gap_side = LEFT + } +# +# How to draw boxes with a gap on one side (ie the page of a notebook) +# + image + { + function = BOX_GAP + recolorable = TRUE + file = "Tabs/notebook.png" + border = { 5, 5, 5, 5 } + stretch = TRUE + gap_file = "Others/null.png" + gap_border = { 0, 0, 0, 0 } + gap_start_file = "Others/null.png" + gap_start_border = { 0, 0, 0, 0 } + gap_end_file = "Others/null.png" + gap_end_border = { 0, 0, 0, 0 } + gap_side = TOP + } + image + { + function = BOX_GAP + recolorable = TRUE + file = "Tabs/notebook.png" + border = { 5, 5, 5, 5 } + stretch = TRUE + gap_file = "Others/null.png" + gap_border = { 10, 10,5, 5 } + gap_start_file = "Others/null.png" + gap_start_border = { 10, 10, 5, 5 } + gap_end_file = "Others/null.png" + gap_end_border = { 10, 10, 5, 5 } + gap_side = BOTTOM + } + image + { + function = BOX_GAP + recolorable = TRUE + file = "Tabs/notebook.png" + border = { 5, 5, 5, 5 } + stretch = TRUE + gap_file = "Others/null.png" + gap_border = { 0, 1, 0, 0 } + gap_start_file = "Others/null.png" + gap_start_border = { 0, 0, 2, 0 } + gap_end_file = "Others/null.png" + gap_end_border = { 0, 2, 1, 0 } + gap_side = LEFT + } + image + { + function = BOX_GAP + recolorable = TRUE + file = "Tabs/notebook.png" + border = { 5, 5, 5, 5 } + stretch = TRUE + gap_file = "Others/null.png" + gap_border = { 0, 0, 1, 0 } + gap_start_file = "Others/null.png" + gap_start_border = { 2, 0, 2, 0 } + gap_end_file = "Others/null.png" + gap_end_border = { 0, 0, 0, 2 } + gap_side = RIGHT + } +# +# How to draw the box of a notebook when it isnt attached to a tab +# + image + { + function = BOX + recolorable = TRUE + file = "Tabs/notebook.png" + border = { 6,6,6,6 } + stretch = TRUE + #gap_side = TOP + } + } +} + + + + + + + + + + + + + + + + +style "tooltips" = "default" +{ + bg[NORMAL] = "#fffcdb" +} + +##################### RULER ################## + +style "ruler" = "default" +{ + engine "pixmap" { + image + { + function = BOX + recolorable = TRUE + detail = "vruler" + file = "Others/ruler.png" + border = { 2, 2, 2, 2 } + stretch = TRUE + } + image + { + function = BOX + recolorable = TRUE + detail = "hruler" + file = "Others/ruler.png" + border = { 2, 2, 2, 2 } + stretch = TRUE + } + } +} + +################# HANDLES ###################x + + +style "handlebox" = "default" +{ + engine "pixmap" + { + image + { + #function = SHADOW + } + + image + { + function = HANDLE + recolorable = TRUE + overlay_file = "Handles/handle-v.png" + overlay_stretch = FALSE + orientation = VERTICAL + } + image + { + function = HANDLE + overlay_file = "Handles/handle-h.png" + overlay_stretch = FALSE + orientation = HORIZONTAL + } + } +} + + +style "flat" = "default" +{ + engine "pixmap" + { + image + { + function = SHADOW + } + } +} + + +style "layout" = "default" +{ + engine "pixmap" + { + image + { + function = SHADOW + detail = "entry" + shadow = IN + recolorable = FALSE + file = "Shadows/text.png" + border = { 1, 1, 1, 1 } + stretch = TRUE + } + image + { + function = BOX + detail = "button" + state = NORMAL + file = "Buttons/button-normal.png" + recolorable = TRUE + border = { 2, 3, 2, 3 } + stretch = TRUE + } + } +} + +##################### LISTHEADERS ###################x + +style "list-header" +{ + #Comment out the ythickness setting below for thicker column headers. + #ythickness = 0 + GtkTreeView::odd_row_color = "#f4f4f4" + GtkTreeView::even_row_color = "#f4f4f4" + +# fg[NORMAL] = "#ffffff" +# text[NORMAL] = "#ffffff" + + engine "pixmap" + { + + #This image is used to draw the headers of columns in list views when they are + #not selected. + image + { + function = BOX + recolorable = TRUE + + state = NORMAL + file = "ListHeaders/list_header.png" + border = { 2, 2, 2, 2 } + stretch = TRUE + } + + #This image is used to draw the column headers in list views when they are + #clicked. + image + { + function = BOX + recolorable = TRUE + + state = PRELIGHT + file = "ListHeaders/list_header-prelight.png" + border = { 2, 2, 2, 2 } + stretch = TRUE + } + + #Does this do anything? + image + { + function = BOX + recolorable = TRUE + + state = ACTIVE + file = "ListHeaders/list_header-pressed.png" + border = { 2, 2, 2, 2} + stretch = TRUE + } + + image + { + function = BOX + recolorable = TRUE + + state = SELECTED + file = "ListHeaders/list_header-prelight.png" + border = { 2, 2, 2, 2 } + stretch = TRUE + } + image + { + function = BOX + recolorable = TRUE + + state = INSENSITIVE + file = "ListHeaders/list_header-insens.png" + border = { 2, 2, 2, 2 } + stretch = TRUE + } + + + } + +} + +widget_class "*List" style "list-header" +widget_class "*GtkTree*" style "list-header" +widget_class "*GtkCList*" style "list-header" +#widget_class "*Tree*" style "list-header" + + +# This prevents Sodipodi from crashing while opening the +# Object-Style dialog. + + +style "unstyle" +{ + engine "" + { + } +} + +# recognizable pressed toggle buttons +# SPIcons seem to erase the background first. That's why I can't use +# the button style. + + +style "SPbutton" +{ + engine "pixmap" + { + image + { + function = BOX + shadow = IN + recolorable = TRUE + file = "Shadows/shadow-out.png" + border = { 2, 2, 2, 2 } + stretch = TRUE + } + image + { + function = BOX + } + } +} + + +style "treecol" +{ + bg[NORMAL] = "#000000" +} + + +class "GtkButton" style "button" +class "GtkRadioButton" style "radiobutton" +class "GtkRadioMenuItem" style "radiobutton" +class "GtkCheckButton" style "checkbutton" +class "GtkCheckMenuItem" style "checkbutton" +class "GtkOptionMenu" style "optionmenu" +class "GtkCombo*" style "optionmenu" +class "*Font*" style "optionmenu" +class "GtkEntry" style "entry" +class "GtkOldEditable" style "entry" +class "GtkSpinButton" style "spinbutton" +class "GtkRuler" style "ruler" +class "GtkScrollbar" style "scrollbar" + +class "GtkProgressBar" style "progressbar" +class "GtkRange" style "range" +class "GtkMenu" style "menu" + +class "GtkMenuBar*" style "menubar" + + +widget_class "*MenuBar.*" style "menubar" + + + +#class "GtkImageMenuItem" style "menubar" + +class "GtkMenuItem" style "menuitem" +class "GtkTearoffMenuItem" style "menuitem" +class "GtkNotebook" style "notebook" +#class "GtkTextView" style "textview" +#class "GtkTreeView" style "treeview" +class "GtkToolbar" style "flat" +class "GtkHandleBox" style "handlebox" +class "GtkEventBox" style "flat" +class "GtkPaned" style "handlebox" +class "GtkLayout" style "layout" +class "SPButton" style "SPbutton" +widget "gtk-tooltips" style "tooltips" +# prevent Sodipodi from crashing +class "SPColorSlider" style "unstyle" diff --git a/themes/Win7-Basic/gtk-2.0/icons/gtk-go-back.png b/themes/Windows-Default/gtk-2.0/icons/gtk-go-back.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/icons/gtk-go-back.png rename to themes/Windows-Default/gtk-2.0/icons/gtk-go-back.png diff --git a/themes/Win7-Basic/gtk-2.0/icons/gtk-go-down.png b/themes/Windows-Default/gtk-2.0/icons/gtk-go-down.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/icons/gtk-go-down.png rename to themes/Windows-Default/gtk-2.0/icons/gtk-go-down.png diff --git a/themes/Win7-Basic/gtk-2.0/icons/gtk-go-forward.png b/themes/Windows-Default/gtk-2.0/icons/gtk-go-forward.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/icons/gtk-go-forward.png rename to themes/Windows-Default/gtk-2.0/icons/gtk-go-forward.png diff --git a/themes/Win7-Basic/gtk-2.0/icons/gtk-go-up.png b/themes/Windows-Default/gtk-2.0/icons/gtk-go-up.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/icons/gtk-go-up.png rename to themes/Windows-Default/gtk-2.0/icons/gtk-go-up.png diff --git a/themes/Win7-Basic/gtk-2.0/icons/gtk-home.png b/themes/Windows-Default/gtk-2.0/icons/gtk-home.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/icons/gtk-home.png rename to themes/Windows-Default/gtk-2.0/icons/gtk-home.png diff --git a/themes/Win7-Basic/gtk-2.0/icons/gtk-refresh.png b/themes/Windows-Default/gtk-2.0/icons/gtk-refresh.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/icons/gtk-refresh.png rename to themes/Windows-Default/gtk-2.0/icons/gtk-refresh.png diff --git a/themes/Win7-Basic/gtk-2.0/icons/gtk-stop.png b/themes/Windows-Default/gtk-2.0/icons/gtk-stop.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/icons/gtk-stop.png rename to themes/Windows-Default/gtk-2.0/icons/gtk-stop.png diff --git a/themes/Win7-Basic/gtk-2.0/icons/gtk-zoom-in.png b/themes/Windows-Default/gtk-2.0/icons/gtk-zoom-in.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/icons/gtk-zoom-in.png rename to themes/Windows-Default/gtk-2.0/icons/gtk-zoom-in.png diff --git a/themes/Win7-Basic/gtk-2.0/icons/gtk-zoom-out.png b/themes/Windows-Default/gtk-2.0/icons/gtk-zoom-out.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/icons/gtk-zoom-out.png rename to themes/Windows-Default/gtk-2.0/icons/gtk-zoom-out.png diff --git a/themes/Win7-Basic/gtk-2.0/icons/iconrc b/themes/Windows-Default/gtk-2.0/icons/iconrc similarity index 100% rename from themes/Win7-Basic/gtk-2.0/icons/iconrc rename to themes/Windows-Default/gtk-2.0/icons/iconrc diff --git a/themes/Win7-Basic/gtk-2.0/icons/logo.png b/themes/Windows-Default/gtk-2.0/icons/logo.png similarity index 100% rename from themes/Win7-Basic/gtk-2.0/icons/logo.png rename to themes/Windows-Default/gtk-2.0/icons/logo.png diff --git a/themes/Windows-Default/gtk-2.0/images/panelbg.png b/themes/Windows-Default/gtk-2.0/images/panelbg.png deleted file mode 100644 index ff9a257..0000000 Binary files a/themes/Windows-Default/gtk-2.0/images/panelbg.png and /dev/null differ diff --git a/themes/Windows-Default/gtk-2.0/images/panelbutton1.png b/themes/Windows-Default/gtk-2.0/images/panelbutton1.png deleted file mode 100644 index 02e5e3c..0000000 Binary files a/themes/Windows-Default/gtk-2.0/images/panelbutton1.png and /dev/null differ diff --git a/themes/Windows-Default/gtk-2.0/images/panelbutton2.png b/themes/Windows-Default/gtk-2.0/images/panelbutton2.png deleted file mode 100644 index f2746fb..0000000 Binary files a/themes/Windows-Default/gtk-2.0/images/panelbutton2.png and /dev/null differ diff --git a/themes/Windows-Default/gtk-2.0/images/panelbutton3.png b/themes/Windows-Default/gtk-2.0/images/panelbutton3.png deleted file mode 100644 index 55ac1c5..0000000 Binary files a/themes/Windows-Default/gtk-2.0/images/panelbutton3.png and /dev/null differ diff --git a/themes/Win7-Basic/gtk-2.0/menubar-blue.rc b/themes/Windows-Default/gtk-2.0/menubar-blue.rc similarity index 100% rename from themes/Win7-Basic/gtk-2.0/menubar-blue.rc rename to themes/Windows-Default/gtk-2.0/menubar-blue.rc diff --git a/themes/Win7-Basic/gtk-2.0/menubar-green.rc b/themes/Windows-Default/gtk-2.0/menubar-green.rc similarity index 100% rename from themes/Win7-Basic/gtk-2.0/menubar-green.rc rename to themes/Windows-Default/gtk-2.0/menubar-green.rc diff --git a/themes/Win7-Basic/gtk-2.0/menubar-light.rc b/themes/Windows-Default/gtk-2.0/menubar-light.rc similarity index 100% rename from themes/Win7-Basic/gtk-2.0/menubar-light.rc rename to themes/Windows-Default/gtk-2.0/menubar-light.rc diff --git a/themes/Win7-Basic/gtk-2.0/panel-light.rc b/themes/Windows-Default/gtk-2.0/panel-light.rc similarity index 100% rename from themes/Win7-Basic/gtk-2.0/panel-light.rc rename to themes/Windows-Default/gtk-2.0/panel-light.rc diff --git a/themes/Win7-Basic/gtk-2.0/panel.rc b/themes/Windows-Default/gtk-2.0/panel.rc similarity index 100% rename from themes/Win7-Basic/gtk-2.0/panel.rc rename to themes/Windows-Default/gtk-2.0/panel.rc diff --git a/themes/Win7-Basic/gtk-2.0/panelbuttons.rc b/themes/Windows-Default/gtk-2.0/panelbuttons.rc similarity index 100% rename from themes/Win7-Basic/gtk-2.0/panelbuttons.rc rename to themes/Windows-Default/gtk-2.0/panelbuttons.rc