File mintmenu_synaptics-to-yumex.patch of Package mintmenu
diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade mintmenu/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade
--- mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade 2014-04-27 11:01:56.444732000 +0200
+++ mintmenu/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade 2014-04-27 11:05:55.242081496 +0200
@@ -1906,21 +1906,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkCheckButton" id="softwaremanagercheckbutton">
- <property name="label" translatable="yes">Software Manager</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<object class="GtkCheckButton" id="packagemanagercheckbutton">
<property name="label" translatable="yes">Package Manager</property>
<property name="visible">True</property>
diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenuConfig.py mintmenu/usr/lib/linuxmint/mintMenu/mintMenuConfig.py
--- mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenuConfig.py 2014-04-27 11:01:56.445732000 +0200
+++ mintmenu/usr/lib/linuxmint/mintMenu/mintMenuConfig.py 2014-04-27 11:09:48.526374546 +0200
@@ -102,8 +102,7 @@ class mintMenuConfig( object ):
self.builder.get_object("allowscrollbarcheckbutton1").set_label(_("Allow Scrollbar"))
self.builder.get_object("systemHeightEntryLabel").set_text(_("Height:"))
self.builder.get_object("defaultItemsFrameLabel").set_text(_("Toggle Default Items:"))
- self.builder.get_object("softwaremanagercheckbutton").set_label(_("Software Manager"))
- self.builder.get_object("packagemanagercheckbutton").set_label(_("Package Manager"))
+ self.builder.get_object("packagemanagercheckbutton").set_label(_("Yumex Package Manager"))
self.builder.get_object("controlcentercheckbutton").set_label(_("Control Center"))
self.builder.get_object("terminalcheckbutton").set_label(_("Terminal"))
self.builder.get_object("lockcheckbutton").set_label(_("Lock Screen"))
@@ -171,7 +170,6 @@ class mintMenuConfig( object ):
if (self.allowPlacesScrollbarToggle.get_active() == False):
self.placesHeightButton.set_sensitive(False)
self.allowPlacesScrollbarToggle.connect("toggled", self.togglePlacesHeightEnabled )
- self.softwareManagerToggle = self.builder.get_object( "softwaremanagercheckbutton" )
self.packageManagerToggle = self.builder.get_object( "packagemanagercheckbutton" )
self.controlCenterToggle = self.builder.get_object( "controlcentercheckbutton" )
self.terminalToggle = self.builder.get_object( "terminalcheckbutton" )
@@ -182,10 +180,6 @@ class mintMenuConfig( object ):
self.systemHeightButton = self.builder.get_object( "systemHeightSpinButton" )
if (self.allowSystemScrollbarToggle.get_active() == False): self.systemHeightButton.set_sensitive(False)
self.allowSystemScrollbarToggle.connect("toggled", self.toggleSystemHeightEnabled )
- if os.path.exists("/usr/lib/linuxmint/mintInstall/icon.svg"):
- self.builder.get_object( "softwaremanagercheckbutton" ).show()
- else:
- self.builder.get_object( "softwaremanagercheckbutton" ).hide()
self.builder.get_object( "closeButton" ).connect("clicked", Gtk.main_quit )
@@ -240,7 +234,6 @@ class mintMenuConfig( object ):
self.bindGSettingsValueToWidget( self.settingsPlaces, "bool", "allow-scrollbar", self.allowPlacesScrollbarToggle, "toggled", self.allowPlacesScrollbarToggle.set_active, self.allowPlacesScrollbarToggle.get_active )
self.bindGSettingsValueToWidget( self.settingsPlaces, "bool", "show-gtk-bookmarks", self.showgtkbookmarksToggle, "toggled", self.showgtkbookmarksToggle.set_active, self.showgtkbookmarksToggle.get_active )
- self.bindGSettingsValueToWidget( self.settingsSystem, "bool", "show-software-manager", self.softwareManagerToggle, "toggled", self.softwareManagerToggle.set_active, self.softwareManagerToggle.get_active )
self.bindGSettingsValueToWidget( self.settingsSystem, "bool", "show-package-manager", self.packageManagerToggle, "toggled", self.packageManagerToggle.set_active, self.packageManagerToggle.get_active )
self.bindGSettingsValueToWidget( self.settingsSystem, "bool", "show-control-center", self.controlCenterToggle, "toggled", self.controlCenterToggle.set_active, self.controlCenterToggle.get_active )
self.bindGSettingsValueToWidget( self.settingsSystem, "bool", "show-terminal", self.terminalToggle, "toggled", self.terminalToggle.set_active, self.terminalToggle.get_active )
diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/system_management.py mintmenu/usr/lib/linuxmint/mintMenu/plugins/system_management.py
--- mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/system_management.py 2014-04-01 15:11:19.000000000 +0200
+++ mintmenu/usr/lib/linuxmint/mintMenu/plugins/system_management.py 2014-04-27 11:13:22.070473108 +0200
@@ -53,7 +53,6 @@ class pluginclass( object ):
self.settings.notifyAdd( "show-lock-screen", self.RegenPlugin )
self.settings.notifyAdd( "show-logout", self.RegenPlugin )
self.settings.notifyAdd( "show-package-manager", self.RegenPlugin )
- self.settings.notifyAdd( "show-software-manager", self.RegenPlugin )
self.settings.notifyAdd( "show-terminal", self.RegenPlugin )
self.settings.notifyAdd( "show-quit", self.RegenPlugin )
self.settings.notifyAdd( "allow-scrollbar", self.RegenPlugin )
@@ -106,7 +105,6 @@ class pluginclass( object ):
# Check toggles
- self.showSoftwareManager = self.settings.get( "bool", "show-software-manager")
self.showPackageManager = self.settings.get( "bool", "show-package-manager")
self.showControlCenter = self.settings.get( "bool", "show-control-center")
self.showTerminal = self.settings.get( "bool", "show-terminal")
@@ -131,17 +129,9 @@ class pluginclass( object ):
#Add standard items
def do_standard_items( self ):
- if ( self.showSoftwareManager == True ):
- if os.path.exists("/usr/lib/linuxmint/mintInstall/icon.svg"):
- Button1 = easyButton( "/usr/lib/linuxmint/mintInstall/icon.svg", self.iconsize, [_("Software Manager")], -1, -1 )
- Button1.connect( "clicked", self.ButtonClicked, "gksu mintinstall" )
- Button1.show()
- self.systemBtnHolder.pack_start( Button1, False, False, 0)
- self.mintMenuWin.setTooltip( Button1, _("Browse and install available software") )
-
if ( self.showPackageManager == True ):
- Button2 = easyButton( "applications-system", self.iconsize, [_("Package Manager")], -1, -1 )
- Button2.connect( "clicked", self.ButtonClicked, "gksu /usr/sbin/synaptic" )
+ Button2 = easyButton( "/usr/share/pixmaps/yumex/yumex-icon.png", self.iconsize, [_("Yumex Package Manager")], -1, -1 )
+ Button2.connect( "clicked", self.ButtonClicked, "/usr/bin/yumex" )
Button2.show()
self.systemBtnHolder.pack_start( Button2, False, False, 0 )
self.mintMenuWin.setTooltip( Button2, _("Install, remove and upgrade software packages") )
diff -upr mintmenu-orig/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml mintmenu/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml
--- mintmenu-orig/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml 2014-04-27 11:01:56.446732000 +0200
+++ mintmenu/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml 2014-04-27 11:14:08.983934762 +0200
@@ -341,12 +341,6 @@
<description></description>
</key>
- <key type="b" name="show-software-manager">
- <default>true</default>
- <summary></summary>
- <description></description>
- </key>
-
<key type="b" name="show-package-manager">
<default>true</default>
<summary></summary>
