Index: ubuntu-mate-mate-menu-e4a6065685d3/mate_menu/plugins/system_management.py
===================================================================
--- ubuntu-mate-mate-menu-e4a6065685d3/mate_menu/plugins/system_management.py
+++ ubuntu-mate-mate-menu-e4a6065685d3/mate_menu/plugins/system_management.py 2017-01-09 14:13:48.716305102 +0300
@@ -119,7 +119,7 @@
self.iconsize = self.settings.get( "int","icon-size")
# Check toggles
- self.showPackageManager = self.settings.get( "bool", "show-package-manager")
+ self.showMCC = self.settings.get( "bool", "show-mageia-control-center")
self.showControlCenter = self.settings.get( "bool", "show-control-center")
self.showTerminal = self.settings.get( "bool", "show-terminal")
self.showLockScreen = self.settings.get( "bool", "show-lock-screen")
@@ -148,23 +148,14 @@
if os.path.exists(os.path.join(path, file)):
return True
- if ( self.showPackageManager == True ):
- if pathExists("synaptic-pkexec"):
- Button2 = easyButton("synaptic", self.iconsize, [_("Package Manager")], -1, -1 )
- Button2.connect( "clicked", self.ButtonClicked, "synaptic-pkexec" )
- elif pathExists("gnome-software"):
- Button2 = easyButton("org.gnome.Software", self.iconsize, [_("Package Manager")], -1, -1 )
- Button2.connect( "clicked", self.ButtonClicked, "gnome-software" )
- elif pathExists("software-center"):
- Button2 = easyButton("softwarecenter", self.iconsize, [_("Package Manager")], -1, -1 )
- Button2.connect( "clicked", self.ButtonClicked, "software-center" )
- elif pathExists("ubuntu-mate-welcome"):
- Button2 = easyButton("system-software-install", self.iconsize, [_("Package Manager")], -1, -1 )
- Button2.connect("clicked", self.ButtonClicked, "ubuntu-mate-welcome --software-only")
+ if ( self.showMCC == True ):
+ if pathExists("drakconf"):
+ Button2 = easyButton("drakconf", self.iconsize, [_("Mageia Control Center")], -1, -1 )
+ Button2.connect( "clicked", self.ButtonClicked, "drakconf" )
try:
Button2.show()
self.systemBtnHolder.pack_start( Button2, False, False, 0 )
- self.mateMenuWin.setTooltip( Button2, _("Install, remove and upgrade software packages") )
+ self.mateMenuWin.setTooltip( Button2, _("Control all aspects of your system") )
except UnboundLocalError:
pass
Index: ubuntu-mate-mate-menu-e4a6065685d3/data/mate-menu-config.glade
===================================================================
--- ubuntu-mate-mate-menu-e4a6065685d3/data/mate-menu-config.glade
+++ ubuntu-mate-mate-menu-e4a6065685d3/data/mate-menu-config.glade 2017-01-09 14:14:38.842060407 +0300
@@ -1679,8 +1679,8 @@
<property name="margin_bottom">10</property>
<property name="orientation">vertical</property>
<child>
- <object class="GtkCheckButton" id="packagemanagercheckbutton">
- <property name="label" translatable="yes">Package Manager</property>
+ <object class="GtkCheckButton" id="mcc_checkbutton">
+ <property name="label" translatable="yes">Mageia Control Center</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
Index: ubuntu-mate-mate-menu-e4a6065685d3/data/plugins/org.mate.mate-menu.plugins.system_management.gschema.xml
===================================================================
--- ubuntu-mate-mate-menu-e4a6065685d3/data/plugins/org.mate.mate-menu.plugins.system_management.gschema.xml
+++ ubuntu-mate-mate-menu-e4a6065685d3/data/plugins/org.mate.mate-menu.plugins.system_management.gschema.xml 2017-01-09 14:15:26.759738389 +0300
@@ -26,7 +26,7 @@
<description></description>
</key>
- <key type="b" name="show-package-manager">
+ <key type="b" name="show-mageia-control-center">
<default>true</default>
<summary></summary>
<description></description>
Index: ubuntu-mate-mate-menu-e4a6065685d3/lib/mate-menu-config.py
===================================================================
--- ubuntu-mate-mate-menu-e4a6065685d3/lib/mate-menu-config.py
+++ ubuntu-mate-mate-menu-e4a6065685d3/lib/mate-menu-config.py 2017-01-09 14:13:46.700234503 +0300
@@ -114,7 +114,7 @@
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("packagemanagercheckbutton").set_label(_("Package Manager"))
+ self.builder.get_object("mcc_checkbutton").set_label(_("Mageia Control Center"))
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"))
@@ -182,7 +182,7 @@
if (self.allowPlacesScrollbarToggle.get_active() == False):
self.placesHeightButton.set_sensitive(False)
self.allowPlacesScrollbarToggle.connect("toggled", self.togglePlacesHeightEnabled )
- self.packageManagerToggle = self.builder.get_object( "packagemanagercheckbutton" )
+ self.MCCToggle = self.builder.get_object( "mcc_checkbutton" )
self.controlCenterToggle = self.builder.get_object( "controlcentercheckbutton" )
self.terminalToggle = self.builder.get_object( "terminalcheckbutton" )
self.lockToggle = self.builder.get_object( "lockcheckbutton" )
@@ -244,7 +244,7 @@
self.bindGSettingsValueToWidget( self.settingsPlaces, "int", "height", self.placesHeightButton, "value-changed", self.placesHeightButton.set_value, self.placesHeightButton.get_value_as_int )
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-package-manager", self.packageManagerToggle, "toggled", self.packageManagerToggle.set_active, self.packageManagerToggle.get_active )
+ self.bindGSettingsValueToWidget( self.settingsSystem, "bool", "show-mageia-control-center", self.MCCToggle, "toggled", self.MCCToggle.set_active, self.MCCToggle.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 )
self.bindGSettingsValueToWidget( self.settingsSystem, "bool", "show-lock-screen", self.lockToggle, "toggled", self.lockToggle.set_active, self.lockToggle.get_active )
