Merge lp:~ted/indicator-jenkins/gobject-introspection into lp:indicator-jenkins

[Ted Gould]

Switch the indicator over to using GObject Introspection and the newer version of AppIndicator. This removes GTK2 deps as well.

=== modified file 'graphics.py'
--- graphics.py	2012-02-26 03:58:35 +0000
+++ graphics.py	2012-03-02 15:31:21 +0000
@@ -15,14 +15,14 @@
 
 # Copyright 2012 Thomi Richards
 
-import gtk
+from gi.repository import Gtk
 import os
 import os.path
 import logging
 
 
 _pixbuf_cache = {}
-_icon_loader = gtk.IconTheme()
+_icon_loader = Gtk.IconTheme()
 
 def _make_key(name, size):
     return name + str(size)
@@ -41,7 +41,7 @@
     icon_path = os.path.join(os.path.dirname(__file__), 'images')
     if os.path.exists(icon_path):
         filename = os.path.join(icon_path, name + '.svg')
-        pb =  gtk.gdk.pixbuf_new_from_file_at_size(filename, size, size)
+        pb =  Gtk.Gdk.pixbuf_new_from_file_at_size(filename, size, size)
         _pixbuf_cache[key] = pb
         logging.debug("loading pixbuf %s with size %d from source directory", name, size)
         return pb
@@ -49,7 +49,7 @@
 
 
 def get_image_by_name(name, size):
-    img = gtk.Image()
+    img = Gtk.Image()
     img.set_from_pixbuf(load_pixbuf_by_name(name, size))
     return img
 
@@ -81,13 +81,13 @@
 def combine_two_images(left_pb, right_pb):
     """Combine two images side by side.
 
-    Both images must be the same height. Returns a gtk.gdk.Pixmap object
+    Both images must be the same height. Returns a Gtk.Gdk.Pixmap object
 
     """
-    if type(left_pb) is not gtk.gdk.Pixbuf:
-        raise TypeError("Left image must be a gtk.gdk.Pixbuf")
-    if type(right_pb) is not gtk.gdk.Pixbuf:
-        raise TypeError("Right image must be a gtk.gdk.Pixbuf")
+    if type(left_pb) is not Gtk.Gdk.Pixbuf:
+        raise TypeError("Left image must be a Gtk.Gdk.Pixbuf")
+    if type(right_pb) is not Gtk.Gdk.Pixbuf:
+        raise TypeError("Right image must be a Gtk.Gdk.Pixbuf")
 
     if left_pb.get_height() != right_pb.get_height():
         raise ValueError("Left and Right images must be the same height.")
@@ -96,7 +96,7 @@
         raise ValueError("Left and Right images must be the same width.")
 
     rwidth = left_pb.get_width() + right_pb.get_width()
-    result = gtk.gdk.Pixbuf(right_pb.get_colorspace(),
+    result = Gtk.Gdk.Pixbuf(right_pb.get_colorspace(),
                             right_pb.get_has_alpha(),
                             right_pb.get_bits_per_sample(),
                             rwidth,

=== modified file 'indicator-jenkins'
--- indicator-jenkins	2012-02-28 18:49:21 +0000
+++ indicator-jenkins	2012-03-02 15:31:21 +0000
@@ -16,9 +16,8 @@
 
 # Copyright 2012 Thomi Richards
 
-import gobject
-import gtk
-import appindicator
+from gi.repository import Gtk, GObject
+from gi.repository import AppIndicator3
 import logging
 logging.basicConfig(level=logging.DEBUG,
         format="%(asctime)s %(filename)s:%(lineno)d %(levelname)s %(message)s")
@@ -59,26 +58,27 @@
         else:
             icon_name = "gnome-system"
 
-        self.ind = appindicator.Indicator ("indicator-jenkins",
+        self.ind = AppIndicator3.Indicator.new ("indicator-jenkins",
                                         icon_name,
-                                        appindicator.CATEGORY_APPLICATION_STATUS)
-        self.ind.set_status(appindicator.STATUS_ACTIVE)
+                                        AppIndicator3.IndicatorCategory.APPLICATION_STATUS)
+        self.ind.set_status(AppIndicator3.IndicatorStatus.ACTIVE)
+        self.ind.set_title("Jenkins")
 
     def create_menu_entries(self):
         """Create the menu that is shown under the app indicator."""
-        self.menu = gtk.Menu()
+        self.menu = Gtk.Menu()
 
         self.create_jenkins_job_menu_entries()
-        self.menu.append(gtk.SeparatorMenuItem())
+        self.menu.append(Gtk.SeparatorMenuItem())
         self.create_settings_and_quit_menu_entries()
         #self.menu.popup(None, None, None, 2, 0)
 
     def create_settings_and_quit_menu_entries(self):
-        mi_settings = gtk.MenuItem("Settings")
+        mi_settings = Gtk.MenuItem("Settings")
         mi_settings.connect("activate", self.on_settings)
         self.menu.append(mi_settings)
 
-        mi_quit = gtk.MenuItem("Quit")
+        mi_quit = Gtk.MenuItem("Quit")
         mi_quit.connect("activate", self.on_quit)
         self.menu.append(mi_quit)
 
@@ -114,7 +114,7 @@
             menu_item.show()
         else:
             for pos, child in enumerate(self.menu.get_children()):
-                if type(child) is gtk.SeparatorMenuItem:
+                if type(child) is Gtk.SeparatorMenuItem:
                     # insert here, we've hit the end of the job list:
                     logging.debug("Inserting menu item '%s' at pos %d since next item is a separator.", menu_item.get_label(), pos)
                     self.menu.insert(menu_item, pos)
@@ -175,15 +175,15 @@
         get_server_monitor().stop()
         for name, model in self.server_models.iteritems():
             get_settings().update_settings_from_model(model)
-        gtk.main_quit()
+        Gtk.main_quit()
 
     def on_settings(self, sender):
         dialog = SettingsDialog(self.server_models['default'])
         response = dialog.run()
         dialog.destroy()
-        if response == gtk.RESPONSE_REJECT:
+        if response == Gtk.RESPONSE_REJECT:
             logging.debug("User rejected changes.")
-        elif response == gtk.RESPONSE_OK:
+        elif response == Gtk.RESPONSE_OK:
             logging.debug("User accepted changes.")
             save_settings()
 
@@ -193,7 +193,7 @@
         notifications.start()
         get_server_monitor() # TODO - this is here so the WP spins up early.
         ji = JenkinsIndicator()
-        gtk.main()
+        Gtk.main()
         notifications.stop()
     finally:
         save_settings()

=== modified file 'menu.py'
--- menu.py	2012-02-26 04:11:05 +0000
+++ menu.py	2012-03-02 15:31:21 +0000
@@ -16,7 +16,7 @@
 # Copyright 2012 Thomi Richards
 
 
-import gtk
+from gi.repository import Gtk
 import logging
 import webbrowser
 
@@ -24,7 +24,7 @@
 
 logger = logging.getLogger(__name__)
 
-class JenkinsJobMenuItem(gtk.ImageMenuItem):
+class JenkinsJobMenuItem(Gtk.ImageMenuItem):
     """A menu item that has an image to represent the job state.
 
     We wrap a JenkinsJobModel and subscribe to it's property change notifications
@@ -81,7 +81,7 @@
         #     img = combine_two_images(img, health_img)
 
         if img is not None:
-            i = gtk.Image()
+            i = Gtk.Image()
             i.set_from_pixbuf(img)
             self.set_image(i)
             self.set_always_show_image(True)

=== modified file 'model.py'
--- model.py	2012-02-29 20:24:40 +0000
+++ model.py	2012-03-02 15:31:21 +0000
@@ -15,8 +15,7 @@
 
 # Copyright 2012 Thomi Richards
 
-import gobject
-import gtk
+from gi.repository import GObject, Gtk, GLib
 import logging
 
 from server_monitor import get_server_monitor
@@ -24,24 +23,24 @@
 
 logger = logging.getLogger(__name__)
 
-class JenkinsServerModel(gobject.GObject):
+class JenkinsServerModel(GObject.GObject):
     """A model for a jenkins server."""
 
-    name = gobject.property(type=str)
-    url = gobject.property(type=str)
-    refresh_period = gobject.property(type=int, minimum=30, maximum=60*60)
+    name = GObject.property(type=str)
+    url = GObject.property(type=str)
+    refresh_period = GObject.property(type=int, minimum=30, maximum=60*60, default=5*60)
 
     __gsignals__ = {
-        'job_added':        (gobject.SIGNAL_RUN_LAST,
-                            gobject.TYPE_NONE, # signal return type
-                            (gobject.TYPE_PYOBJECT,)), # signal parameters
-        'job_removed':      (gobject.SIGNAL_RUN_LAST,
-                            gobject.TYPE_NONE,
-                            (gobject.TYPE_PYOBJECT,)),
+        'job_added':        (GObject.SIGNAL_RUN_LAST,
+                            GObject.TYPE_NONE, # signal return type
+                            (GObject.TYPE_PYOBJECT,)), # signal parameters
+        'job_removed':      (GObject.SIGNAL_RUN_LAST,
+                            GObject.TYPE_NONE,
+                            (GObject.TYPE_PYOBJECT,)),
     }
 
     def __init__(self, name, server_settings):
-        gobject.GObject.__init__(self)
+        GObject.GObject.__init__(self)
         self.name = name
         self.url = server_settings['url']
         self.refresh_period = server_settings['refresh_period'] * 1000
@@ -145,25 +144,25 @@
         logger.debug("Enableding polling for server monitor.")
         if not self.enabled:
             self.enabled = True
-            gtk.timeout_add(self.refresh_period, self._start_get_server_data)
+            GLib.timeout_add(self.refresh_period, self._start_get_server_data)
             self._start_get_server_data()
 
 
 
-class JenkinsJobModel(gobject.GObject):
+class JenkinsJobModel(GObject.GObject):
     """A model for a jenkins server job."""
 
-    name = gobject.property(type=str)
-    url = gobject.property(type=str)
-    build = gobject.property(type=int)
-    color = gobject.property(type=str)
-    description = gobject.property(type=str)
-    health_description = gobject.property(type=str)
-    health_score = gobject.property(type=int, minimum=0, maximum=100)
-    monitored = gobject.property(type=bool, default=False)
+    name = GObject.property(type=str)
+    url = GObject.property(type=str)
+    build = GObject.property(type=int)
+    color = GObject.property(type=str)
+    description = GObject.property(type=str)
+    health_description = GObject.property(type=str)
+    health_score = GObject.property(type=int, minimum=0, maximum=100)
+    monitored = GObject.property(type=bool, default=False)
 
     def __init__(self, name, url, color, monitored, server):
-        gobject.GObject.__init__(self)
+        GObject.GObject.__init__(self)
         self.name = name
         self.url = url
         self.set_job_color(color)
@@ -227,7 +226,7 @@
 
     def _enable_polling(self):
         logger.debug("Starting server data polling for job '%s'", self.name)
-        gtk.timeout_add(self._server_model.refresh_period, self.start_get_more_details)
+        GLib.timeout_add(self._server_model.refresh_period, self.start_get_more_details)
         self.start_get_more_details()
 
     def _on_monitored_changed(self, sender, prop):
@@ -237,5 +236,5 @@
     def __repr__(self):
         return "<%s '%s'>" % (self.__class__.__name__, self.name)
 
-gobject.type_register(JenkinsServerModel)
-gobject.type_register(JenkinsJobModel)
+GObject.type_register(JenkinsServerModel)
+GObject.type_register(JenkinsJobModel)

=== modified file 'notifications.py'
--- notifications.py	2012-02-26 05:09:30 +0000
+++ notifications.py	2012-03-02 15:31:21 +0000
@@ -15,7 +15,7 @@
 
 # Copyright 2012 Thomi Richards
 
-import pynotify
+from gi.repository import Notify
 import logging
 logger = logging.getLogger(__name__)
 
@@ -26,8 +26,7 @@
     )
 
 def start():
-    pynotify.init("indicator-jenkins")
-
+    Notify.init("indicator-jenkins")
 
 def send_job_update_notification(job, prop):
     """Send a desktop notification of a new build."""
@@ -38,11 +37,10 @@
         health_image = get_pixbuf_for_health_score(job.health_score, 48)
         state_image = load_pixbuf_by_name("status-" + job.color, 48)
         combined_image = combine_two_images(health_image, state_image)
-        n = pynotify.Notification(title, text)
+        n = Notify.Notification(summary=title, body=text)
         n.set_icon_from_pixbuf(combined_image)
         if not n.show():
             logger.warning("Notification show failed.")
 
-
 def stop():
-    pynotify.uninit()
+	Notify.uninit()

=== modified file 'server_monitor.py'
--- server_monitor.py	2012-02-24 08:25:05 +0000
+++ server_monitor.py	2012-03-02 15:31:21 +0000
@@ -15,7 +15,7 @@
 
 # Copyright 2012 Thomi Richards
 
-import gtk
+from gi.repository import Gtk, GLib
 import jenkins
 import logging
 from multiprocessing import Process, get_logger, Event
@@ -55,7 +55,7 @@
         self._callback_queue = []
         # TODO - if we MUST poll for data, instead of running it all the time,
         # only run it while there's an active request.
-        gtk.timeout_add(1000, self._poll_for_data)
+        GLib.timeout_add_seconds(1, self._poll_for_data)
 
     def start_get_server_data(self, server_url, callback):
         """Start getting server data from 'server_url'."""

=== modified file 'settings_ui.py'
--- settings_ui.py	2012-02-28 19:18:23 +0000
+++ settings_ui.py	2012-03-02 15:31:21 +0000
@@ -15,7 +15,7 @@
 
 # Copyright 2012 Thomi Richards
 
-import gtk
+from gi.repository import Gtk
 import os
 import os.path
 import logging
@@ -26,7 +26,7 @@
 class SettingsDialog(object):
     def __init__(self, jenkins_server_model):
         self.server_model = jenkins_server_model
-        self.builder = gtk.Builder()
+        self.builder = Gtk.Builder()
         ui_file_path = os.path.join(
             os.path.dirname(
                 os.path.realpath(__file__)
@@ -42,24 +42,24 @@
 
         self.url_entry.set_text(self.server_model.url)
 
-        cr = gtk.CellRendererPixbuf()
+        cr = Gtk.CellRendererPixbuf()
         cr.set_property("height", 24)
         cr.set_property("width", 24)
-        col1 = gtk.TreeViewColumn("State", cr, pixbuf=0)
+        col1 = Gtk.TreeViewColumn("State", cr, pixbuf=0)
         col1.set_resizable(False)
         col1.set_fixed_width(24)
         self.treeview.append_column(col1)
 
-        col2 = gtk.TreeViewColumn("Job Name", gtk.CellRendererText(), text=1)
+        col2 = Gtk.TreeViewColumn("Job Name", Gtk.CellRendererText(), text=1)
         col2.set_resizable(True)
         self.treeview.append_column(col2)
 
-        cr = gtk.CellRendererToggle()
+        cr = Gtk.CellRendererToggle()
         cr.set_property("height", 24)
         cr.set_property("width", 24)
         cr.set_property('activatable', True)
         cr.connect("toggled", self.job_toggled)
-        col3 = gtk.TreeViewColumn("Track Job", cr, active=2)
+        col3 = Gtk.TreeViewColumn("Track Job", cr, active=2)
         col3.set_resizable(False)
         self.treeview.append_column(col3)
 
@@ -112,7 +112,7 @@
         return self.dlg.destroy()
 
     def _on_response(self, dlg, response_id):
-        if response_id == gtk.RESPONSE_OK:
+        if response_id == Gtk.RESPONSE_OK:
             if self.server_model.url != self.url_entry.get_text():
                 self.server_model.url = self.url_entry.get_text()
             for item in self.job_model: