From 3ea1fbb2a05ebee5398e85bb78067547c8f58978 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Wed, 11 Apr 2012 18:10:30 +0200 Subject: [PATCH] [magneto] launch Rigo instead of Sulfur if possible --- magneto/gfx/magneto/{sulfur.png => pm.png} | Bin magneto/src/magneto.py | 2 -- magneto/src/magneto/core/interfaces.py | 14 +++++++++++--- magneto/src/magneto/gtk/components.py | 4 ++-- magneto/src/magneto/gtk/magneto.glade | 2 +- magneto/src/magneto/kde/components.py | 8 +++----- 6 files changed, 17 insertions(+), 13 deletions(-) rename magneto/gfx/magneto/{sulfur.png => pm.png} (100%) diff --git a/magneto/gfx/magneto/sulfur.png b/magneto/gfx/magneto/pm.png similarity index 100% rename from magneto/gfx/magneto/sulfur.png rename to magneto/gfx/magneto/pm.png diff --git a/magneto/src/magneto.py b/magneto/src/magneto.py index 2d45408f6..9355a02dd 100755 --- a/magneto/src/magneto.py +++ b/magneto/src/magneto.py @@ -20,11 +20,9 @@ import time def _startup(): sys.path.insert(0, '/usr/lib/entropy/client') sys.path.insert(0, '/usr/lib/entropy/lib') - sys.path.insert(0, '/usr/lib/entropy/sulfur') sys.path.insert(0, '/usr/lib/entropy/magneto') sys.path.insert(0, '../../client') sys.path.insert(0, '../../lib') - sys.path.insert(0, '../../sulfur/src') sys.path.insert(0, '../') startup_delay = None diff --git a/magneto/src/magneto/core/interfaces.py b/magneto/src/magneto/core/interfaces.py index 4bfc879de..203c2c08d 100644 --- a/magneto/src/magneto/core/interfaces.py +++ b/magneto/src/magneto/core/interfaces.py @@ -24,6 +24,7 @@ from entropy.client.interfaces import Client from entropy.const import etpConst import entropy.tools from entropy.i18n import _, ngettext +from entropy.misc import ParallelTask # Magneto imports from magneto.core import config @@ -123,7 +124,7 @@ class MagnetoCore(MagnetoCoreUI): self.icons.add_file("busy", "applet-busy.png") self.icons.add_file("critical", "applet-critical.png") self.icons.add_file("disable", "applet-disable.png") - self.icons.add_file("sulfur", "sulfur.png") + self.icons.add_file("pm", "pm.png") self.icons.add_file("web", "applet-web.png") self.icons.add_file("configuration", "applet-configuration.png") self.applet_size = 22 @@ -347,7 +348,7 @@ class MagnetoCore(MagnetoCoreUI): def get_menu_image(self, name): if name == "update_now": - pix = self.icons.best_match("sulfur", 22) + pix = self.icons.best_match("pm", 22) elif name == "check_now": pix = self.icons.best_match("okay", 22) elif name in ["web_panel", "web_site"]: @@ -373,7 +374,14 @@ class MagnetoCore(MagnetoCoreUI): subprocess.call(['xdg-open', url]) def launch_package_manager(self, *data): - subprocess.call('sulfur &', shell = True) + if os.access("/usr/bin/rigo", os.X_OK | os.R_OK): + task = ParallelTask(subprocess.call, ["/usr/bin/rigo"]) + task.daemon = True + task.start() + elif os.access("/usr/bin/sulfur", os.X_OK | os.R_OK): + task = ParallelTask(subprocess.call, ["/usr/bin/sulfur"]) + task.daemon = True + task.start() def disable_applet(self): self.update_tooltip(_("Updates Notification Applet Disabled")) diff --git a/magneto/src/magneto/gtk/components.py b/magneto/src/magneto/gtk/components.py index 6a7b0ceff..5af4604a5 100644 --- a/magneto/src/magneto/gtk/components.py +++ b/magneto/src/magneto/gtk/components.py @@ -100,7 +100,7 @@ class AppletNoticeWindow(GladeWindow): self.xml.signal_autoconnect ( { - "on_launch_sulfur_clicked": self.on_sulfur, + "on_launch_pm_clicked": self.on_pm, "on_close_clicked": self.on_close, }) @@ -115,7 +115,7 @@ class AppletNoticeWindow(GladeWindow): def show(self): self.window.show() - def on_sulfur(self, button): + def on_pm(self, button): self.__controller.launch_package_manager() def on_close(self, *args): diff --git a/magneto/src/magneto/gtk/magneto.glade b/magneto/src/magneto/gtk/magneto.glade index ab6cfb344..d0a943586 100644 --- a/magneto/src/magneto/gtk/magneto.glade +++ b/magneto/src/magneto/gtk/magneto.glade @@ -70,7 +70,7 @@ True True False - + True diff --git a/magneto/src/magneto/kde/components.py b/magneto/src/magneto/kde/components.py index fb056fd52..67746c997 100644 --- a/magneto/src/magneto/kde/components.py +++ b/magneto/src/magneto/kde/components.py @@ -81,7 +81,7 @@ class AppletNoticeWindow(QWidget): self.__button_hbox = QHBoxLayout() self.__close_button = QPushButton(_("Close")) - self.__launch_pm_button = QPushButton(_("Launch Sulfur")) + self.__launch_pm_button = QPushButton(_("Launch Application Browser")) self.__button_hbox.addWidget(self.__launch_pm_button) self.__button_hbox.addWidget(self.__close_button) @@ -99,7 +99,7 @@ class AppletNoticeWindow(QWidget): self.setWindowIcon(self.__window_icon) self.connect(self.__close_button, SIGNAL("clicked()"), self.on_close) - self.connect(self.__launch_pm_button, SIGNAL("clicked()"), self.on_sulfur) + self.connect(self.__launch_pm_button, SIGNAL("clicked()"), self.on_pm) def closeEvent(self, event): """ @@ -109,7 +109,7 @@ class AppletNoticeWindow(QWidget): event.ignore() self.on_close() - def on_sulfur(self): + def on_pm(self): self.__controller.launch_package_manager() def on_close(self): @@ -119,5 +119,3 @@ class AppletNoticeWindow(QWidget): self.__list_model.setStringList(pkg_data) self.__critical_label.setText(critical_txt) self.__list_view.update() - -