jbah.skp/mintmenu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Several theming and color fixes

Browse Source 
Restructured a bit how theming and coloring works. Now theme and color
changes work on the fly. No need to restart mintMenu anymore. Note that
changing theme no longer regenerates plugins, so it's faster.

Fixes issue #47
This commit is contained in:
hordepfo 2014-01-22 17:51:49 +00:00
parent 0aebbc46d2
commit 272eaeba3b
2 changed files with 54 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
usr/lib/linuxmint/mintMenu/mintMenu.py
View File

@ -99,8 +99,20 @@ class MainWindow( object ):
plugindir = os.path.join( os.path.expanduser( "~" ), ".linuxmint/mintMenu/plugins" ) plugindir = os.path.join( os.path.expanduser( "~" ), ".linuxmint/mintMenu/plugins" )
sys.path.append( plugindir ) sys.path.append( plugindir )
self.panelSettings = Gio.Settings.new("org.mate.panel")
self.panelSettings.connect( "changed::tooltips-enabled", self.toggleTooltipsEnabled )
self.settings.connect( "changed::plugins-list", self.RegenPlugins )
self.settings.connect( "changed::start-with-favorites", self.toggleStartWithFavorites )
self.settings.connect( "changed::tooltips-enabled", self.toggleTooltipsEnabled )
self.settings.connect( "changed::use-custom-color", self.toggleUseCustomColor )
self.settings.connect( "changed::custom-border-color", self.toggleCustomBorderColor )
self.settings.connect( "changed::custom-heading-color", self.toggleCustomHeadingColor )
self.settings.connect( "changed::custom-color", self.toggleCustomBackgroundColor )
self.settings.connect( "changed::border-width", self.toggleBorderWidth )
self.settings.connect( "changed::opacity", self.toggleOpacity )
self.getSetGSettingEntries() self.getSetGSettingEntries()
self.SetupMintMenuBorder()
self.SetupMintMenuOpacity() self.SetupMintMenuOpacity()
self.tooltips = Gtk.Tooltips() self.tooltips = Gtk.Tooltips()
@ -110,20 +122,7 @@ class MainWindow( object ):
self.tooltips.disable() self.tooltips.disable()
self.PopulatePlugins(); self.PopulatePlugins();
self.loadTheme()
self.settings.connect( "changed::plugins-list", self.RegenPlugins )
self.settings.connect( "changed::start-with-favorites", self.toggleStartWithFavorites )
globalsettings = Gio.Settings.new("org.mate.panel")
globalsettings.connect( "changed::tooltips-enabled", self.toggleTooltipsEnabled )
self.settings.connect( "changed::tooltips-enabled", self.toggleTooltipsEnabled )
self.settings.connect( "changed::use-custom-color", self.toggleUseCustomColor )
self.settings.connect( "changed::custom-border-color", self.toggleCustomBorderColor )
self.settings.connect( "changed::custom-heading-color", self.toggleCustomHeadingColor )
self.settings.connect( "changed::custom-color", self.toggleCustomBackgroundColor )
self.settings.connect( "changed::border-width", self.toggleBorderWidth )
self.settings.connect( "changed::opacity", self.toggleOpacity )
def on_window1_destroy (self, widget, data=None): def on_window1_destroy (self, widget, data=None):
Gtk.main_quit() Gtk.main_quit()
@ -159,9 +158,7 @@ class MainWindow( object ):
def toggleUseCustomColor( self, settings, key, args = None ): def toggleUseCustomColor( self, settings, key, args = None ):
self.usecustomcolor = settings.get_boolean(key) self.usecustomcolor = settings.get_boolean(key)
self.SetupMintMenuBorder() self.loadTheme()
self.SetPaneColors( self.panesToColor )
self.SetHeadingStyle( self.headingsToColor )
def toggleCustomBorderColor( self, settings, key, args = None ): def toggleCustomBorderColor( self, settings, key, args = None ):
self.custombordercolor = settings.get_string(key) self.custombordercolor = settings.get_string(key)
@ -189,14 +186,13 @@ class MainWindow( object ):
self.enableTooltips = self.settings.get_boolean( "tooltips-enabled" ) self.enableTooltips = self.settings.get_boolean( "tooltips-enabled" )
self.startWithFavorites = self.settings.get_boolean( "start-with-favorites" ) self.startWithFavorites = self.settings.get_boolean( "start-with-favorites" )
mate_settings = Gio.Settings.new("org.mate.panel") self.globalEnableTooltips = self.panelSettings.get_boolean( "tooltips-enabled" )
self.globalEnableTooltips = mate_settings.get_boolean( "tooltips-enabled" )
def SetupMintMenuBorder( self ): def SetupMintMenuBorder( self, defaultStyle = None ):
if self.usecustomcolor: if self.usecustomcolor:
self.window.modify_bg( Gtk.StateType.NORMAL, Gdk.color_parse( self.custombordercolor ) ) self.window.modify_bg( Gtk.StateType.NORMAL, Gdk.color_parse( self.custombordercolor ) )
# else: elif defaultStyle is not None:
# self.window.modify_bg( Gtk.StateType.NORMAL, self.window.rc_get_style().bg[ Gtk.StateType.SELECTED ] ) self.window.modify_bg( Gtk.StateType.NORMAL, defaultStyle.lookup_color('bg_color')[1] )
self.border.set_padding( self.borderwidth, self.borderwidth, self.borderwidth, self.borderwidth ) self.border.set_padding( self.borderwidth, self.borderwidth, self.borderwidth, self.borderwidth )
def SetupMintMenuOpacity( self ): def SetupMintMenuOpacity( self ):
@ -227,10 +223,9 @@ class MainWindow( object ):
PluginPane.show() PluginPane.show()
PaneLadder = Gtk.VBox( False, 0 ) PaneLadder = Gtk.VBox( False, 0 )
PluginPane.add( PaneLadder ) PluginPane.add( PaneLadder )
self.SetPaneColors( [ PluginPane ] )
ImageBox = Gtk.EventBox() ImageBox = Gtk.EventBox()
self.SetPaneColors( [ ImageBox ] )
ImageBox.show() ImageBox.show()
self.panesToColor.extend( [ PluginPane, ImageBox ] )
seperatorImage = GdkPixbuf.Pixbuf.new_from_file( self.dottedfile ) seperatorImage = GdkPixbuf.Pixbuf.new_from_file( self.dottedfile )
@ -284,9 +279,7 @@ class MainWindow( object ):
print u"Unable to load " + plugin + " plugin :-(" print u"Unable to load " + plugin + " plugin :-("
self.SetPaneColors( [MyPlugin.content_holder] ) self.panesToColor.append( MyPlugin.content_holder )
MyPlugin.content_holder.show() MyPlugin.content_holder.show()
VBox1 = Gtk.VBox( False, 0 ) VBox1 = Gtk.VBox( False, 0 )
@ -295,14 +288,14 @@ class MainWindow( object ):
Align1 = Gtk.Alignment.new( 0, 0, 0, 0 ) Align1 = Gtk.Alignment.new( 0, 0, 0, 0 )
Align1.set_padding( 10, 5, 10, 0 ) Align1.set_padding( 10, 5, 10, 0 )
Align1.add( Label1 ) Align1.add( Label1 )
self.SetHeadingStyle( [Label1] ) self.headingsToColor.append( Label1 )
Align1.show() Align1.show()
Label1.show() Label1.show()
if not hasattr( MyPlugin, 'sticky' ) or MyPlugin.sticky == True: if not hasattr( MyPlugin, 'sticky' ) or MyPlugin.sticky == True:
heading = Gtk.EventBox() heading = Gtk.EventBox()
Align1.set_padding( 0, 0, 10, 0 ) Align1.set_padding( 0, 0, 10, 0 )
self.SetPaneColors( [heading] ) heading.set_visible_window( False )
heading.set_size_request( MyPlugin.width, 30 ) heading.set_size_request( MyPlugin.width, 30 )
else: else:
heading = Gtk.HBox() heading = Gtk.HBox()
@ -331,7 +324,9 @@ class MainWindow( object ):
if hasattr( MyPlugin, 'height' ): if hasattr( MyPlugin, 'height' ):
MyPlugin.content_holder.set_size_request( -1, MyPlugin.height ) MyPlugin.content_holder.set_size_request( -1, MyPlugin.height )
if hasattr( MyPlugin, 'itemstocolor' ): if hasattr( MyPlugin, 'itemstocolor' ):
self.SetPaneColors( MyPlugin.itemstocolor ) self.panesToColor.extend( MyPlugin.itemstocolor )
if hasattr( MyPlugin, 'headingstocolor' ):
self.headingsToColor.extend( MyPlugin.headingstocolor )
except: except:
# create traceback # create traceback
info = sys.exc_info() info = sys.exc_info()
@ -349,9 +344,8 @@ class MainWindow( object ):
PluginPane = Gtk.EventBox() PluginPane = Gtk.EventBox()
PaneLadder = Gtk.VBox( False, 0 ) PaneLadder = Gtk.VBox( False, 0 )
PluginPane.add( PaneLadder ) PluginPane.add( PaneLadder )
self.SetPaneColors( [PluginPane] )
ImageBox = Gtk.EventBox() ImageBox = Gtk.EventBox()
self.SetPaneColors( [ImageBox] ) self.panesToColor.extend( [ PluginPane, ImageBox ] )
ImageBox.show() ImageBox.show()
PluginPane.show_all() PluginPane.show_all()
@ -373,22 +367,30 @@ class MainWindow( object ):
self.tooltips.disable() self.tooltips.disable()
#print u"Loading", (time.time() - start), "s" #print u"Loading", (time.time() - start), "s"
def SetPaneColors( self, items ): # A little hacky but works
for item in items: def getDefaultStyle( self ):
if item not in self.panesToColor: widget = Gtk.EventBox()
self.panesToColor.append( item ) widget.show()
return Gtk.rc_get_style(widget)
def loadTheme( self ):
defaultStyle = self.getDefaultStyle()
self.SetPaneColors( self.panesToColor, defaultStyle )
self.SetupMintMenuBorder( defaultStyle )
self.SetHeadingStyle( self.headingsToColor )
def SetPaneColors( self, items, defaultStyle = None ):
if self.usecustomcolor: if self.usecustomcolor:
for item in items: for item in items:
item.modify_bg( Gtk.StateType.NORMAL, Gdk.color_parse( self.customcolor ) ) item.modify_bg( Gtk.StateType.NORMAL, Gdk.color_parse( self.customcolor ) )
# else: # TODO: Changing background color isn't working for pixmaps! The following does not work:
# for item in items: item.get_style().bg_pixmap[Gtk.StateType.NORMAL] = None
# item.modify_bg( Gtk.StateType.NORMAL, self.paneholder.rc_get_style().bg[ Gtk.StateType.NORMAL ] ) elif defaultStyle is not None:
for item in items:
item.modify_bg( Gtk.StateType.NORMAL, defaultStyle.lookup_color('bg_color')[1] )
item.get_style().bg_pixmap[Gtk.StateType.NORMAL] = defaultStyle.bg_pixmap[Gtk.StateType.NORMAL]
def SetHeadingStyle( self, items ): def SetHeadingStyle( self, items ):
for item in items:
if item not in self.headingsToColor:
self.headingsToColor.append( item )
if self.usecustomcolor: if self.usecustomcolor:
color = self.customheadingcolor color = self.customheadingcolor
else: else:
@ -430,6 +432,7 @@ class MainWindow( object ):
self.getSetGSettingEntries() self.getSetGSettingEntries()
self.PopulatePlugins() self.PopulatePlugins()
self.loadTheme()
#print NAME+u" reloaded" #print NAME+u" reloaded"
@ -523,8 +526,8 @@ class MenuWin( object ):
self.settings.connect( "changed::hot-key", self.hotkeyChanged ) self.settings.connect( "changed::hot-key", self.hotkeyChanged )
self.loadSettings() self.loadSettings()
mate_settings = Gio.Settings.new("org.mate.interface") self.mate_settings = Gio.Settings.new("org.mate.interface")
mate_settings.connect( "changed::gtk-theme", self.changeTheme ) self.mate_settings.connect( "changed::gtk-theme", self.changeTheme )
self.createPanelButton() self.createPanelButton()
@ -619,12 +622,11 @@ class MenuWin( object ):
def changeTheme(self, *args): def changeTheme(self, *args):
self.reloadSettings() self.reloadSettings()
self.applyTheme() self.applyTheme()
self.mainwin.RegenPlugins() self.mainwin.loadTheme()
def applyTheme(self): def applyTheme(self):
style_settings = Gtk.Settings.get_default() style_settings = Gtk.Settings.get_default()
mate_settings = Gio.Settings.new("org.mate.interface") desktop_theme = self.mate_settings.get_string('gtk-theme')
desktop_theme = mate_settings.get_string('gtk-theme')
if self.theme_name == "default": if self.theme_name == "default":
style_settings.set_property("gtk-theme-name", desktop_theme) style_settings.set_property("gtk-theme-name", desktop_theme)
else: else:

2
usr/lib/linuxmint/mintMenu/plugins/applications.py
View File

@ -253,7 +253,7 @@ class pluginclass( object ):
self.builder.get_object("label7").set_text(_("All applications")) self.builder.get_object("label7").set_text(_("All applications"))
self.builder.get_object("label2").set_text(_("Applications")) self.builder.get_object("label2").set_text(_("Applications"))
self.mintMenuWin.SetHeadingStyle( [self.builder.get_object("label6"),self.builder.get_object("label2")] ) self.headingstocolor = [self.builder.get_object("label6"),self.builder.get_object("label2")]
self.numApps = 0 self.numApps = 0
# These properties are NECESSARY to maintain consistency # These properties are NECESSARY to maintain consistency