From 74b16bfc753d4ae000ae4f58c39be7896e79e94c Mon Sep 17 00:00:00 2001 From: bionel Date: Tue, 4 Aug 2015 17:55:03 +0300 Subject: panel fixing stage 1, also code cleanup --- Kogaion-daylight/gtk-2.0/apps/panel.rc | 2 +- Kogaion-daylight/gtk-2.0/gtkrc | 27 +++++----- Kogaion-nighttime/gtk-2.0/apps/panel.rc | 90 +++++++++++++++++---------------- Kogaion-nighttime/gtk-2.0/gtkrc | 83 +++++++++++++++--------------- 4 files changed, 99 insertions(+), 103 deletions(-) diff --git a/Kogaion-daylight/gtk-2.0/apps/panel.rc b/Kogaion-daylight/gtk-2.0/apps/panel.rc index 34a6e19..2435e17 100755 --- a/Kogaion-daylight/gtk-2.0/apps/panel.rc +++ b/Kogaion-daylight/gtk-2.0/apps/panel.rc @@ -92,7 +92,7 @@ widget_class "*Notif*Brasero*" style "theme-panel" # XFCE panel theming. widget "*Xfce*Panel*" style "theme-panel" class "*Xfce*Panel*" style "theme-panel" -widget "*WnckPager*" style "workspace-switcher" +widget "*WnckPager*" style "workspace-switcher" # Fix gtk-entries in the panel #class "GtkEntry" style "test" diff --git a/Kogaion-daylight/gtk-2.0/gtkrc b/Kogaion-daylight/gtk-2.0/gtkrc index 28fa8b4..efc6de8 100755 --- a/Kogaion-daylight/gtk-2.0/gtkrc +++ b/Kogaion-daylight/gtk-2.0/gtkrc @@ -344,8 +344,8 @@ style "menubar_menuitem" { fg[INSENSITIVE] = mix(0.60, @fg_color, @window_active_color) # menu item disabled fg[PRELIGHT] = @selected_fg_color # menu item selected - bg[PRELIGHT] = shade (0.94, @selected_bg_color) - bg[SELECTED] = shade (1.05, @selected_bg_color) + bg[PRELIGHT] = shade (0.94, @selected_bg_color) + bg[SELECTED] = shade (1.05, @selected_bg_color) engine "murrine" { gradient_shades = {1.03, 1.00, 1.00, 1.00} @@ -778,7 +778,6 @@ style "checkradio-pixmap" { } } - style "separator" = "wide" { engine "murrine" { contrast = 0.4 @@ -805,7 +804,6 @@ widget "MozillaGtkWidget*GtkMenuBar" style "FireFox-MenuBar" #widget "MozillaGtkWidget*Toolbar*" style "theme-toolbar" #widget "MozillaGtkWidget*Statusbar*" style "ff-statusbar" - widget "MozillaGtkWidget*" style "ff-default" #### Firefox ### @@ -820,7 +818,6 @@ style "firefox-base-entry" { engine "murrine" { } - } # widget "MozillaGtkWidget*GtkFixed*GtkEntry*" style:highest "firefox-base-entry" @@ -858,26 +855,26 @@ widget_class "*" style "overlay_scrollbar" # General matching follows. The order is choosen so that the right styles override # each other. EG. progressbar needs to be more important than the menu match. -widget_class "*" style "button" -widget_class "**" style "button_label" +widget_class "*" style "button" +widget_class "**" style "button_label" -widget_class "*" style "notebook" +widget_class "*" style "notebook" widget_class "**" style "notebook" widget_class "**" style "notebook" widget_class "**" style "notebook" -widget_class "**" style "menubar" -widget_class "**" style "menu" -widget_class "**" style "menu_item_white" +widget_class "**" style "menubar" +widget_class "**" style "menu" +widget_class "**" style "menu_item_white" -widget_class "*.*" style "menubar_menuitem" +widget_class "*.*" style "menubar_menuitem" widget_class "*" style "toolbar" widget_class "*" style "toolbar" widget_class "*.*.*" style "toolbar_button" class "GtkSeparatorToolItem" style "toolbar_separator" -widget_class "**" style "separator_tool_item" -widget_class "**" style "separator_menu_item" +widget_class "**" style "separator_tool_item" +widget_class "**" style "separator_menu_item" widget_class "*.." style "frame_title" widget_class "*.*" style "treeview" @@ -985,7 +982,7 @@ widget "*swt*toolbar*" style "default" # fg[PRELIGHT] = @selected_fg_color # fg[ACTIVE] = @selected_fg_color # fg[SELECTED] = @selected_fg_color - +# # bg[NORMAL] = shade (1.00, @window_active_color) # bg[PRELIGHT] = shade (0.80, @window_active_color) # bg[ACTIVE] = shade (0.50, @window_active_color) diff --git a/Kogaion-nighttime/gtk-2.0/apps/panel.rc b/Kogaion-nighttime/gtk-2.0/apps/panel.rc index fd23793..2435e17 100755 --- a/Kogaion-nighttime/gtk-2.0/apps/panel.rc +++ b/Kogaion-nighttime/gtk-2.0/apps/panel.rc @@ -1,50 +1,52 @@ -style "theme-panel" = "murrine-dark" +style "theme-panel" { - xthickness = 0 - ythickness = 0 - - bg[NORMAL] = shade (0.7, @bg_color_dark) - bg[ACTIVE] = shade (0.5, @bg_color_dark) - bg[PRELIGHT] = shade (0.35, @bg_color_dark) - bg[SELECTED] = shade (0.5, @bg_color_dark) + xthickness = 2 + ythickness = 2 + + bg[NORMAL] = @window_active_color +# bg[ACTIVE] = "#00ff00" +# bg[PRELIGHT] = "#0000ff" +# bg[SELECTED] = "#ffff00" - fg[NORMAL] = shade (0.9, @base_color) - fg[PRELIGHT] = @base_color - fg[ACTIVE] = shade (0.9, @base_color) - fg[SELECTED] = shade (0.9, @base_color) + fg[NORMAL] = @fg_color + fg[PRELIGHT] = @fg_color +# fg[ACTIVE] = "#00ff00" +# fg[SELECTED] = "#ff0000" - text[NORMAL] = shade (0.9, @base_color) - text[PRELIGHT] = @base_color - text[ACTIVE] = shade (0.9, @base_color) - text[SELECTED] = shade (0.9, @base_color) + text[NORMAL] = @fg_color + text[PRELIGHT] = @text_color +# text[ACTIVE] = "#0000ff" +# text[SELECTED] = "#ffff00" engine "murrine" { - #border_shades = { 1.3, 0.9 } - contrast = 0.0 - roundness = 0 - glowstyle = 0 - glow_shade = 1.4 - glazestyle = 2 +# border_shades = { 1.3, 0.9 } +# contrast = 0.5 +# roundness = 0 +# glowstyle = 0 +# glow_shade = 1.4 +# glazestyle = 2 + reliefstyle = 0 + handlestyle = 0 #trough_border_shades = { 3.0, 2.5 } # improve visibility in panel-plugins using the progressbar (xfce4-timer-plugin) } } style "theme-panel-text" { - fg[NORMAL] = @base_color - fg[PRELIGHT] = "#ffffff" - fg[ACTIVE] = @base_color + fg[NORMAL] = @fg_color + fg[PRELIGHT] = @fg_color + fg[ACTIVE] = @base_color - text[NORMAL] = @base_color - text[PRELIGHT] = "#ffffff" + text[NORMAL] = @fg_color + text[PRELIGHT] = @fg_color text[ACTIVE] = @base_color } -style "panel-entry" = "murrine-dark" +style "panel-entry" { - fg[NORMAL] = @text_color + fg[NORMAL] = @text_color fg[PRELIGHT] = @text_color - fg[ACTIVE] = @text_color + fg[ACTIVE] = @text_color fg[SELECTED] = @text_color fg[INSENSITIVE] = @text_color @@ -64,7 +66,7 @@ style "theme-main-menu-text" = "theme-panel-text" style "workspace-switcher" = "theme-panel" { - bg[SELECTED] = shade (0.8, @selected_bg_color) + bg[SELECTED] = shade (1.4, @selected_bg_color) } widget "*PanelWidget*" style "theme-panel" @@ -90,12 +92,12 @@ widget_class "*Notif*Brasero*" style "theme-panel" # XFCE panel theming. widget "*Xfce*Panel*" style "theme-panel" class "*Xfce*Panel*" style "theme-panel" -widget "*WnckPager*" style "workspace-switcher" +widget "*WnckPager*" style "workspace-switcher" # Fix gtk-entries in the panel -class "GtkEntry" style "murrine-combo" -class "*SexyIconEntry*" style:highest "murrine-combo" # fixes dict-plugin -widget "*xfce4-verve-plugin*GtkEntry" style:highest "murrine-combo" # fixes verve-plugin +#class "GtkEntry" style "test" +#class "*SexyIconEntry*" style:highest "test" # fixes dict-plugin +#widget "*xfce4-verve-plugin*GtkEntry" style:highest "test" # fixes verve-plugin # Make sure panel text color doesn't change widget_class "*Panel*MenuBar*" style "theme-main-menu-text" @@ -104,14 +106,14 @@ widget "*.clock-applet-button.*" style "theme-panel-text" widget "*PanelApplet*" style "theme-panel-text" # dark menus -widget_class "**" style "murrine-dark" -widget_class "**" style "murrine-wide-dark" -widget_class "*.*." style "murrine-dark" -widget_class "*.*." style "panel-entry" -widget_class "*.*." style "murrine-scale-dark" -widget_class "**" style "murrine-menubar" -widget "*.gtk-combobox-popup-menu.*" style "murrine-wide-dark" +#widget_class "**" style "test" +#widget_class "**" style "test" +#widget_class "*.*." style "test" +#widget_class "*.*." style "panel-entry" +#widget_class "*.*." style "test" +#widget_class "**" style "test" +#widget "*.gtk-combobox-popup-menu.*" style "test" # dark bg and black text for gdm's panel -widget_class "*GdmGreeterPanel*" style "panel-entry" -widget "*GdmClockWidget*" style "murrine-dark" +#widget_class "*GdmGreeterPanel*" style "panel-entry" +#widget "*GdmClockWidget*" style "test" diff --git a/Kogaion-nighttime/gtk-2.0/gtkrc b/Kogaion-nighttime/gtk-2.0/gtkrc index 4f81c99..4d03ce6 100755 --- a/Kogaion-nighttime/gtk-2.0/gtkrc +++ b/Kogaion-nighttime/gtk-2.0/gtkrc @@ -170,7 +170,7 @@ style "default" { scrollbarstyle = 0 # 0 = nothing separatorstyle = 1 # 0 = Hard separators # 1 = Smooth separators - shadow_shades = {0.95, 1.0} + shadow_shades = {1.1, 1.0} sliderstyle = 0 # 0 = nothing added stepperstyle = 1 # 0 = standard # 1 = integrated stepper handles @@ -344,8 +344,8 @@ style "menubar_menuitem" { fg[INSENSITIVE] = mix(0.60, @fg_color, @window_active_color) # menu item disabled fg[PRELIGHT] = @selected_fg_color # menu item selected - bg[PRELIGHT] = shade (0.94, @selected_bg_color) - bg[SELECTED] = shade (1.2, @selected_bg_color) + bg[PRELIGHT] = shade (0.94, @selected_bg_color) + bg[SELECTED] = shade (1.2, @selected_bg_color) engine "murrine" { gradient_shades = {1.03, 1.00, 1.00, 1.00} @@ -567,7 +567,7 @@ style "treeview" { engine "murrine" { gradient_shades = {1.00, 1.04, 1.06, 1.10} - separatorstyle = 1 + separatorstyle = 0 contrast = 1.7 } } @@ -804,7 +804,6 @@ widget "MozillaGtkWidget*GtkMenuBar" style "FireFox-MenuBar" #widget "MozillaGtkWidget*Toolbar*" style "theme-toolbar" #widget "MozillaGtkWidget*Statusbar*" style "ff-statusbar" - widget "MozillaGtkWidget*" style "ff-default" #### Firefox ### @@ -819,7 +818,6 @@ style "firefox-base-entry" { engine "murrine" { } - } # widget "MozillaGtkWidget*GtkFixed*GtkEntry*" style:highest "firefox-base-entry" @@ -857,33 +855,33 @@ widget_class "*" style "overlay_scrollbar" # General matching follows. The order is choosen so that the right styles override # each other. EG. progressbar needs to be more important than the menu match. -widget_class "*" style "button" -widget_class "**" style "button_label" +widget_class "*" style "button" +widget_class "**" style "button_label" -widget_class "*" style "notebook" +widget_class "*" style "notebook" widget_class "**" style "notebook" widget_class "**" style "notebook" widget_class "**" style "notebook" -widget_class "**" style "menubar" -widget_class "**" style "menu" -widget_class "**" style "menu_item_white" +widget_class "**" style "menubar" +widget_class "**" style "menu" +widget_class "**" style "menu_item_white" -widget_class "*.*" style "menubar_menuitem" +widget_class "*.*" style "menubar_menuitem" widget_class "*" style "toolbar" widget_class "*" style "toolbar" -widget_class "*.*.*" style "toolbar_button" +widget_class "*.*.*" style "toolbar_button" class "GtkSeparatorToolItem" style "toolbar_separator" -widget_class "**" style "separator_tool_item" -widget_class "**" style "separator_menu_item" +widget_class "**" style "separator_tool_item" +widget_class "**" style "separator_menu_item" widget_class "*.." style "frame_title" -widget_class "*.*" style "treeview" +widget_class "*.*" style "treeview" -class "*GtkExpander*" style "expander" +class "*GtkExpander*" style "expander" -widget_class "*" style "progressbar" +widget_class "*" style "progressbar" # Treeview headers (and similar stock GTK+ widgets) widget_class "*.." style "treeview_header" @@ -894,9 +892,8 @@ widget_class "*.." style "treeview_header" # The window of the tooltip is called "gtk-tooltip" widget "gtk-tooltip*" style "tooltips" - -widget_class "**" style "checkradio-pixmap" -widget_class "**" style "checkradio-pixmap" +widget_class "**" style "checkradio-pixmap" +widget_class "**" style "checkradio-pixmap" widget_class "**" style:highest "checkradio_label" widget_class "**" style:highest "checkradio_label" @@ -980,26 +977,26 @@ widget "*swt*toolbar*" style "default" # --------------------------------- # Xfce panel theming # --------------------------------- -style "xfce-panel" { - fg[NORMAL] = @fg_color - fg[PRELIGHT] = @selected_fg_color - fg[ACTIVE] = @selected_fg_color - fg[SELECTED] = @selected_fg_color - - bg[NORMAL] = shade (1.00, @window_active_color) - bg[PRELIGHT] = shade (0.80, @window_active_color) - bg[ACTIVE] = shade (0.50, @window_active_color) - bg[SELECTED] = shade (1.20, @selected_bg_color) - engine "murrine" { - gradient_shades = {0.80, 0.85, 0.95, 1.00} - roundness = 2 - contrast = 0.2 - } - xthickness = 3 - ythickness = 3 -} -widget "*Xfce*Panel*" style "xfce-panel" -class "*Xfce*Panel*" style "xfce-panel" +#style "xfce-panel" { +# fg[NORMAL] = @fg_color +# fg[PRELIGHT] = @selected_fg_color +# fg[ACTIVE] = @selected_fg_color +# fg[SELECTED] = @selected_fg_color +# +# bg[NORMAL] = shade (1.00, @window_active_color) +# bg[PRELIGHT] = shade (0.80, @window_active_color) +# bg[ACTIVE] = shade (0.50, @window_active_color) +# bg[SELECTED] = shade (1.20, @selected_bg_color) +# engine "murrine" { +# gradient_shades = {0.80, 0.85, 0.95, 1.00} +# roundness = 2 +# contrast = 0.2 +# } +# xthickness = 3 +# ythickness = 3 +#} +#widget "*Xfce*Panel*" style "xfce-panel" +#class "*Xfce*Panel*" style "xfce-panel" style "xfdesktop-icon-view" { XfdesktopIconView::label-alpha = 0 @@ -1031,4 +1028,4 @@ widget_class "*XfdesktopIconView*" style "xfdesktop-icon-view" # widget "xfwm4-tabwin*" style "murrine-dark" include "apps/thunar.rc" # thunar especific include "apps/terminal.rc" - +include "apps/panel.rc" -- cgit v1.2.3