migrate notification applet to Sulfur

entropy-notification-applet/Makefile

@@ -18,16 +18,16 @@ clean:
 	for d in $(SUBDIRS); do make -C $$d clean ; done
 
 install:
-	mkdir -p $(DESTDIR)/$(LIBDIR)/entropy/spritz/applet
-	mkdir -p $(DESTDIR)/usr/share/pixmaps/spritz/applet
+	mkdir -p $(DESTDIR)/$(LIBDIR)/entropy/sulfur/applet
+	mkdir -p $(DESTDIR)/usr/share/pixmaps/sulfur/applet
 	mkdir -p $(DESTDIR)/usr/share/applications
 	mkdir -p $(DESTDIR)/usr/share/autostart
 	mkdir -p $(DESTDIR)/etc/xdg/autostart
 	mkdir -p $(DESTDIR)/usr/bin
 	mkdir -p $(DESTDIR)/etc
-	install -m644 COPYING $(DESTDIR)/$(LIBDIR)/entropy/spritz/applet/.
+	install -m644 COPYING $(DESTDIR)/$(LIBDIR)/entropy/sulfur/applet/.
 	install -m755 $(MISCDIR)/etp-applet-gui $(DESTDIR)/usr/bin/.
-	install -m644 $(PIXDIR)/applet/*.png $(DESTDIR)/usr/share/pixmaps/spritz/applet/.
+	install -m644 $(PIXDIR)/applet/*.png $(DESTDIR)/usr/share/pixmaps/sulfur/applet/.
 	install -m644 $(PIXDIR)/entropy-applet.png $(DESTDIR)/usr/share/pixmaps/.
 	chmod +x $(DESTDIR)/usr/bin/etp-applet-gui
 	install -m644 $(MISCDIR)/*.desktop $(DESTDIR)/usr/share/applications/.

entropy-notification-applet/misc/etp-applet-gui

@@ -1,2 +1,2 @@
 #!/bin/bash
-python /usr/lib/entropy/spritz/applet/applet.py "$@"
+python /usr/lib/entropy/sulfur/applet/applet.py "$@"

entropy-notification-applet/src/Makefile

@@ -1,7 +1,7 @@
 PYTHON=python
 PACKAGE = $(shell basename `pwd`)
 PYFILES = $(wildcard *.py)
-PKGDIR = /$(LIBDIR)/entropy/spritz/applet
+PKGDIR = /$(LIBDIR)/entropy/sulfur/applet
 
 all: 
 	echo "Nothing to do"

entropy-notification-applet/src/applet.py

@@ -11,10 +11,10 @@ import sys, gtk
 #import signal
 sys.path.insert(0,'/usr/lib/entropy/client')
 sys.path.insert(0,'/usr/lib/entropy/libraries')
-sys.path.insert(0,'/usr/lib/entropy/spritz')
+sys.path.insert(0,'/usr/lib/entropy/sulfur')
 sys.path.insert(0,'../../client')
 sys.path.insert(0,'../../libraries')
-sys.path.insert(0,'../../spritz/src')
+sys.path.insert(0,'../../sulfur/src')
 sys.path.insert(0,'../')
 sys.argv.append('--no-pid-handling')
 

entropy-notification-applet/src/etp_applet.glade

@@ -68,7 +68,7 @@
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="response_id">0</property>
-                <signal name="clicked" handler="on_launch_spritz_clicked"/>
+                <signal name="clicked" handler="on_launch_sulfur_clicked"/>
                 <child>
                   <widget class="GtkAlignment" id="alignment1">
                     <property name="visible">True</property>

entropy-notification-applet/src/etp_applet.py

@@ -114,7 +114,7 @@ class EntropyApplet:
         self.last_alert = None
         self.tooltip_text = ""
         self.last_trigger_check_t = 0.0
-        gnome.program_init("spritz-updater", etpConst['entropyversion'])
+        gnome.program_init("entropy-notifier", etpConst['entropyversion'])
 
         self.session = gnome.ui.master_client()
         if self.session:
@@ -133,7 +133,7 @@ class EntropyApplet:
         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("spritz","spritz.png")
+        self.icons.add_file("sulfur","sulfur.png")
         self.icons.add_file("about","applet-about.png")
         self.icons.add_file("web","applet-web.png")
         self.icons.add_file("configuration","applet-configuration.png")
@@ -366,7 +366,7 @@ class EntropyApplet:
     def set_menu_image(self, widget, name):
         img = gtk.Image()
         if name == "update_now":
-            pix = self.icons.best_match("spritz",22)
+            pix = self.icons.best_match("sulfur",22)
         elif name == "about":
             pix = self.icons.best_match("about",22)
         elif name in ["web_panel","web_site"]:
@@ -436,11 +436,11 @@ class EntropyApplet:
             self.send_check_updates_signal()
 
     def launch_package_manager(self, *data):
-        def spawn_spritz():
-            os.execv('/usr/bin/spritz', ['spritz'])
+        def spawn_sulfur():
+            os.execv('/usr/bin/sulfur', ['sulfur'])
         pid = os.fork()
         if pid == 0:
-            spawn_spritz()
+            spawn_sulfur()
             os._exit(0)
 
     def show_alert(self, title, text, urgency = None):

entropy-notification-applet/src/etp_applet_components.py

@@ -39,7 +39,7 @@ class GladeWindow:
     def __init__(self, filename, window_name):
         self.filename = filename
         if not os.path.isfile(filename):
-            self.filename = "/usr/lib/entropy/spritz/applet/%s" % (filename,)
+            self.filename = "/usr/lib/entropy/sulfur/applet/%s" % (filename,)
         self.xml = gtk.glade.XML(self.filename, window_name, domain="entropy")
         self.window = self.xml.get_widget(window_name)
 
@@ -72,11 +72,11 @@ class AppletNoticeWindow(GladeWindow):
 
         self.xml.signal_autoconnect (
             {
-            "on_launch_spritz_clicked" : self.on_spritz,
+            "on_launch_sulfur_clicked" : self.on_sulfur,
             "on_close_clicked" : self.on_close,
             })
 
-    def on_spritz(self, button):
+    def on_sulfur(self, button):
         self.parent.launch_package_manager()
 
     def on_close(self, close_button):
@@ -289,7 +289,7 @@ class AppletIconPixbuf:
 
         if not self.images.has_key(name):
             self.images[name] = []
-        from spritz_setup import const
+        from sulfur.setup import const
         filepath = const.PIXMAPS_PATH + "/applet/" + filename
         if not os.path.isfile(filepath):
             filename = "../gfx/applet/" + filename