Merge lp:~dazworrall/gwibber/public into lp:gwibber/1.2

[Darren Worrall]

[Darren Worrall (dazworrall)]

Adds a public timeline tab which can be toggled, and when hidden, public timeline messages are not refreshed. Public timeline support added to the Twitter, Friendfeed and identi.ca protocols in this release.

Of particular interest for review is the extra code in add_msg_tab, add_scrolled_parent and apply_ui_elements to support disabling notifications for messages on a particular tab (show_notifications), and hiding the correct elements if this tab is for toggling (can_toggle).

=== added file 'bin/gwibber'
--- bin/gwibber	1970-01-01 00:00:00 +0000
+++ bin/gwibber	2009-06-15 19:40:02 +0000
@@ -0,0 +1,79 @@
+#!/usr/bin/env python
+
+"""
+
+Gwibber Client
+SegPhault (Ryan Paul) - 05/29/2007
+
+"""
+
+import sys, logging, gtk, optparse
+from os.path import join, dirname, exists, realpath, abspath
+
+
+######################################################################
+# Options and configuration
+def parse_opts():
+    usage = "usage: %prog [options] <config-file>"
+
+    oparse = optparse.OptionParser(usage=usage)
+
+    oparse.add_option("-v", "--verbose", action="store_true",
+                      help="Verbose messages", default=False)
+    oparse.add_option("-d", "--debug", action="store_true",
+                      help="Debug messages", default=False)
+
+    opts, rest = oparse.parse_args()
+    return opts
+    
+opts = parse_opts()
+
+if opts.debug:
+    logging.root.setLevel(logging.DEBUG)
+elif opts.verbose:
+    logging.root.setLevel(logging.INFO)
+
+
+######################################################################
+# Setup path
+
+LAUNCH_DIR = abspath(sys.path[0])
+logging.debug("Launched from %s", LAUNCH_DIR)
+source_tree_gwibber = join(LAUNCH_DIR, "..", "gwibber")
+
+# If we were invoked from a Gwibber source directory add that as the
+# preferred module path ...
+if exists(join(source_tree_gwibber, "client.py")):
+    logging.info("Running from source tree; adjusting path")
+    sys.path.insert(0, realpath(dirname(source_tree_gwibber)))
+    try:
+        from gwibber.client import GwibberClient
+    finally:
+        del sys.path[0]
+else:
+    logging.debug("Assuming path is correct")
+    from gwibber.client import GwibberClient
+
+
+######################################################################
+# Go...
+
+import gconf, dbus, dbus.exceptions
+from gwibber.gintegration import DBUS_NAME, DBUS_PATH
+
+if gconf.Client().get_bool("/apps/gwibber/preferences/allow_multiple_instances"):
+  GwibberClient()
+  gtk.main()
+else:
+  try:
+      bus = dbus.SessionBus()
+      proxy = bus.get_object(DBUS_NAME, DBUS_PATH)
+      iface = dbus.Interface(proxy, DBUS_NAME)
+
+      logging.info("Found existing Gwibber interface: invoking...")
+      iface.external_invoke()
+
+  except dbus.exceptions.DBusException:
+      logging.info("No existing Gwibber session: starting...")
+      GwibberClient()
+      gtk.main()

=== removed file 'bin/gwibber'
--- bin/gwibber	2009-03-28 16:23:57 +0000
+++ bin/gwibber	1970-01-01 00:00:00 +0000
@@ -1,79 +0,0 @@
-#!/usr/bin/env python
-
-"""
-
-Gwibber Client
-SegPhault (Ryan Paul) - 05/29/2007
-
-"""
-
-import sys, logging, gtk, optparse
-from os.path import join, dirname, exists, realpath, abspath
-
-
-######################################################################
-# Options and configuration
-def parse_opts():
-    usage = "usage: %prog [options] <config-file>"
-
-    oparse = optparse.OptionParser(usage=usage)
-
-    oparse.add_option("-v", "--verbose", action="store_true",
-                      help="Verbose messages", default=False)
-    oparse.add_option("-d", "--debug", action="store_true",
-                      help="Debug messages", default=False)
-
-    opts, rest = oparse.parse_args()
-    return opts
-    
-opts = parse_opts()
-
-if opts.debug:
-    logging.root.setLevel(logging.DEBUG)
-elif opts.verbose:
-    logging.root.setLevel(logging.INFO)
-
-
-######################################################################
-# Setup path
-
-LAUNCH_DIR = abspath(sys.path[0])
-logging.debug("Launched from %s", LAUNCH_DIR)
-source_tree_gwibber = join(LAUNCH_DIR, "..", "gwibber")
-
-# If we were invoked from a Gwibber source directory add that as the
-# preferred module path ...
-if exists(join(source_tree_gwibber, "client.py")):
-    logging.info("Running from source tree; adjusting path")
-    sys.path.insert(0, realpath(dirname(source_tree_gwibber)))
-    try:
-        from gwibber.client import GwibberClient
-    finally:
-        del sys.path[0]
-else:
-    logging.debug("Assuming path is correct")
-    from gwibber.client import GwibberClient
-
-
-######################################################################
-# Go...
-
-import gconf, dbus, dbus.exceptions
-from gwibber.gintegration import DBUS_NAME, DBUS_PATH
-
-if gconf.Client().get_bool("/apps/gwibber/preferences/allow_multiple_instances"):
-  GwibberClient()
-  gtk.main()
-else:
-  try:
-      bus = dbus.SessionBus()
-      proxy = bus.get_object(DBUS_NAME, DBUS_PATH)
-      iface = dbus.Interface(proxy, DBUS_NAME)
-
-      logging.info("Found existing Gwibber interface: invoking...")
-      iface.external_invoke()
-
-  except dbus.exceptions.DBusException:
-      logging.info("No existing Gwibber session: starting...")
-      GwibberClient()
-      gtk.main()

=== modified file 'gwibber/client.py'
--- gwibber/client.py	2009-05-31 22:07:24 +0000
+++ gwibber/client.py	2009-06-18 16:32:49 +0000
@@ -50,13 +50,15 @@
   "editor": N_("_Editor"),
   "statusbar": N_("_Statusbar"),
   "tray_icon": N_("Tray _Icon"),
+  "public_view": N_("_Public Timeline"),
 }
 
 CONFIGURABLE_ACCOUNT_ACTIONS = {
   # Translators: these are checkbox
   "receive": N_("_Receive Messages"),
   "send": N_("_Send Messages"),
-  "search": N_("Search _Messages")
+  "search": N_("Search _Messages"),
+  "public": N_("_Public Timeline")
   }
 
 DEFAULT_PREFERENCES = {
@@ -167,6 +169,7 @@
     self.tabs.set_scrollable(True)
     self.messages_view = self.add_msg_tab(self.client.receive, _("Messages"), show_icon = "go-home")
     self.add_msg_tab(self.client.responses, _("Replies"), show_icon = "mail-reply-all", add_indicator=True)
+    self.public_view = self.add_msg_tab(self.client.public_timeline, _("Public"), show_icon = "language-selector", add_indicator=True, can_toggle=True, show_notifications=False)
 
     saved_position = config.GCONF.get_list("%s/%s" % (config.GCONF_PREFERENCES_DIR, "saved_position"), config.gconf.VALUE_INT)
     if saved_position:
@@ -224,7 +227,7 @@
 
     self.statusbar = gtk.Statusbar()
     self.statusbar.pack_start(self.status_icon, False, False)
-
+    
     layout.pack_start(self.setup_menus(), False)
     layout.pack_start(vb, True, True)
     layout.pack_start(self.statusbar, False)
@@ -393,9 +396,12 @@
       if view:
         self.update([view.get_parent()])
 
-  def add_scrolled_parent(self, view, text, show_close=False, show_icon=None, make_active=False, save=None):
+  def add_scrolled_parent(self, view, text, show_close=False, show_icon=None, make_active=False, save=None, can_toggle=False, show_notifications=True):
     scroll = gtk.ScrolledWindow()
     scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+    scroll.show_notifications = show_notifications
+    # Tabs that can be toggled (like public timeline) should be excluded from the parent show_all() - they will maintain their own state
+    scroll.set_no_show_all(can_toggle)
     scroll.add(view)
     scroll.saved_query = save
     view.scroll = scroll
@@ -422,13 +428,13 @@
     btn.connect("clicked", self.on_tab_close, scroll)
     self.on_theme_change()
 
-  def add_msg_tab(self, data_handler, text, show_close=False, show_icon=None, make_active=False, save=None, add_indicator=False):
+  def add_msg_tab(self, data_handler, text, show_close=False, show_icon=None, make_active=False, save=None, add_indicator=False, can_toggle=False, show_notifications=True):
     view = gwui.MessageView(self.preferences["theme"], self)
     view.link_handler = self.on_link_clicked
     view.data_retrieval_handler = data_handler
     view.add_indicator = add_indicator
 
-    self.add_scrolled_parent(view, text, show_close, show_icon, make_active, save)
+    self.add_scrolled_parent(view, text, show_close, show_icon, make_active, save, can_toggle, show_notifications)
     return view
 
   def add_user_tab(self, data_handler, text, show_close=False, show_icon=None, make_active=False, save=None):
@@ -510,7 +516,13 @@
       if hasattr(self, i):
         getattr(self, i).set_property(
           "visible", self.preferences["show_%s" % i])
-
+        # If we have a parent, and if that parent has no_show_all=True, we're dealing with a tab which can be toggled, so set the visible property on the parent to hide it properly as required
+        if hasattr(getattr(self, i), "parent") and getattr(self, i).parent.props.no_show_all:
+            getattr(self, i).parent.set_property(
+              "visible", self.preferences["show_%s" % i])
+            # If the tab isn't visible clear messages, better to see no data than stale data upon reveal
+            if not getattr(self, i).parent.props.visible : getattr(self, i).execute_script("clearMessages()")
+      
     self.set_property("skip-taskbar-hint",
       self.preferences["hide_taskbar_entry"])
 
@@ -1117,7 +1129,7 @@
 
         for tab in self.target_tabs:
           view = tab.get_child()
-          if view:
+          if view and view.props.visible:
             view.message_store = [m for m in
               view.data_retrieval_handler() if not self.last_clear or m.time > self.last_clear
               and m.time <= mx.DateTime.gmt()]
@@ -1129,7 +1141,7 @@
               self.manage_indicator_items(view.message_store, tab_num=self.tabs.page_num(tab))
 
             gtk.gdk.threads_leave()
-            self.show_notification_bubbles(view.message_store)
+            if tab.show_notifications: self.show_notification_bubbles(view.message_store)
 
         self.statusbar.pop(0)
         self.statusbar.push(0, _("Last update: %s") % time.strftime("%X"))

=== modified file 'gwibber/configui.py'
--- gwibber/configui.py	2009-06-11 04:15:55 +0000
+++ gwibber/configui.py	2009-06-16 08:13:24 +0000
@@ -126,6 +126,7 @@
     col_receive = gtk.CellRendererToggle()
     col_send = gtk.CellRendererToggle()
     col_search = gtk.CellRendererToggle()
+    col_public = gtk.CellRendererToggle()
 
     def generate_account_name(acct):
       if hasattr(acct.get_protocol(), "account_name"):
@@ -143,12 +144,16 @@
       ["search", (col_search, {
         "active": lambda a: a["search_enabled"],
         "visible": lambda a: a.supports(microblog.can.SEARCH)}), _("Search")],
+      ["public", (col_public, {
+        "active": lambda a: a["public_enabled"],
+        "visible": lambda a: a.supports(microblog.can.PUBLIC)}), _("Public")],
       ["protocol", lambda a: a.get_protocol().PROTOCOL_INFO["name"], _("Protocol")],
     ])
 
     col_receive.connect("toggled", toggle_table_checkbox, "receive_enabled", data)
     col_send.connect("toggled", toggle_table_checkbox, "send_enabled", data)
     col_search.connect("toggled", toggle_table_checkbox, "search_enabled", data)
+    col_public.connect("toggled", toggle_table_checkbox, "public_enabled", data)
 
     for a in self.accounts: data += a
     

=== modified file 'gwibber/microblog/__init__.py'
--- gwibber/microblog/__init__.py	2009-05-27 05:41:04 +0000
+++ gwibber/microblog/__init__.py	2009-06-15 19:35:52 +0000
@@ -142,3 +142,10 @@
       # Translators: this message appears in the Errors dialog
       # Indicates with wich action the error happened       
       lambda c: c.group(query.lower().replace("!", "")), _("perform group query"), filter)
+    
+  def public_timeline(self, filter=list(PROTOCOLS.keys())):
+    return self.perform_operation(
+      lambda a: a["public_enabled"] and supports(a, can.PUBLIC),
+      # Translators: this message appears in the Errors dialog
+      # Indicates with wich action the error happened 
+      lambda c: c.public_timeline(), _("retrieve public timeline"), filter)

=== modified file 'gwibber/microblog/can.py'
--- gwibber/microblog/can.py	2009-05-27 07:39:19 +0000
+++ gwibber/microblog/can.py	2009-06-15 19:35:52 +0000
@@ -20,4 +20,5 @@
 READ = 12
 RETWEET = 13
 LIKE = 14
+PUBLIC = 15
 GEO_FRIEND_POSITIONS = 50

=== modified file 'gwibber/microblog/friendfeed.py'
--- gwibber/microblog/friendfeed.py	2009-05-30 01:15:23 +0000
+++ gwibber/microblog/friendfeed.py	2009-06-17 18:20:50 +0000
@@ -23,6 +23,7 @@
     "send_enabled",
     "search_enabled",
     "receive_count",
+    "public_enabled",
   ],
 
   "features": [
@@ -37,6 +38,7 @@
     can.DELETE,
     can.SEARCH_URL,
     can.USER_MESSAGES,
+    can.PUBLIC,
   ],
 }
 
@@ -135,6 +137,9 @@
     return self.account["receive_enabled"] and \
       self.account["username"] != None and \
       self.account["private:password"] != None
+      
+  def public_enabled(self):
+    return self.account["public_enabled"]
 
   def get_auth(self):
     return "Basic %s" % base64.encodestring(
@@ -148,6 +153,15 @@
     return simplejson.loads(self.connect(
       "https://friendfeed.com/api/feed/home?" +
       urllib.urlencode({"num": self.account["receive_count"] or "80"})))["entries"]
+      
+  def get_public_timeline(self):
+    return simplejson.loads(self.connect(
+      "http://friendfeed.com/api/feed/public" +'?'+
+      urllib.urlencode({"num": self.account["receive_count"] or "20"})))["entries"]
+
+  def public_timeline(self):
+      for data in self.get_public_timeline():
+          yield Message(self, data) 
 
   def get_user_messages(self, screen_name):
     try:

=== modified file 'gwibber/microblog/identica.py'
--- gwibber/microblog/identica.py	2009-05-27 07:39:19 +0000
+++ gwibber/microblog/identica.py	2009-06-17 18:20:50 +0000
@@ -21,6 +21,7 @@
     "send_enabled",
     "search_enabled",
     "receive_count",
+    "public_enabled",
   ],
 
   "features": [
@@ -37,6 +38,7 @@
     #can.THREAD,
     can.THREAD_REPLY,
     can.USER_MESSAGES,
+    can.PUBLIC,
   ],
 }
 
@@ -122,6 +124,9 @@
     return "Basic %s" % base64.encodestring(
       ("%s:%s" % (self.account["username"], self.account["private:password"]))).strip()
 
+  def public_enabled(self):
+    return self.account["public_enabled"]
+
   def connect(self, url, data = None):
     return urllib2.urlopen(urllib2.Request(
       url, data, {"Authorization": self.get_auth()})).read()
@@ -140,6 +145,15 @@
       profile = [simplejson.loads(self.connect(
         "https://identi.ca/api/users/show/"+ screen_name +".json"))]
       return profile
+  
+  def get_public_timeline(self):
+    return simplejson.loads(self.connect(
+      "https://identi.ca/api/statuses/public_timeline.json",
+      urllib.urlencode({"num": self.account["receive_count"] or "20"})))
+
+  def public_timeline(self):
+      for data in self.get_public_timeline():
+          yield Message(self, data) 
 
   def get_responses(self):
     return simplejson.loads(self.connect(

=== modified file 'gwibber/microblog/twitter.py'
--- gwibber/microblog/twitter.py	2009-05-27 07:39:19 +0000
+++ gwibber/microblog/twitter.py	2009-06-15 19:35:52 +0000
@@ -24,6 +24,7 @@
     "send_enabled",
     "search_enabled",
     "receive_count",
+    "public_enabled",
   ],
 
   "features": [
@@ -40,6 +41,7 @@
     can.THREAD_REPLY,
     can.SEARCH_URL,
     can.USER_MESSAGES,
+    can.PUBLIC,
   ],
 }
 
@@ -148,6 +150,11 @@
     return self.account["receive_enabled"] and \
       self.account["username"] != None and \
       self.account["private:password"] != None
+      
+  def public_enabled(self):
+    return self.account["public_enabled"] and \
+      self.account["username"] != None and \
+      self.account["private:password"] != None
 
   def get_auth(self):
     return "Basic %s" % base64.encodestring(
@@ -162,6 +169,15 @@
       "https://twitter.com/statuses/friends_timeline.json" +'?'+
       urllib.urlencode({"count": self.account["receive_count"] or "20"})))
 
+  def get_public_timeline(self):
+    return simplejson.loads(self.connect(
+      "https://twitter.com/statuses/public_timeline.json" +'?'+
+      urllib.urlencode({"count": self.account["receive_count"] or "20"})))
+
+  def public_timeline(self):
+      for data in self.get_public_timeline():
+          yield Message(self, data) 
+
   def get_user_messages(self, screen_name):
     try:
       return simplejson.loads(self.connect(
@@ -237,4 +253,3 @@
         urllib.urlencode({"status":message,
           "in_reply_to_status_id":target.id, "source": "gwibbernet"})))
     return Message(self, data)
-

=== modified file 'ui/preferences.glade'
--- ui/preferences.glade	2009-05-30 19:22:22 +0000
+++ ui/preferences.glade	2009-06-17 18:20:50 +0000
@@ -771,6 +771,19 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <child>
+                          <widget class="GtkCheckButton" id="twitter_public_enabled">
+                            <property name="label" translatable="yes" context="yes">_Public Timeline</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                          </widget>
+                          <packing>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
                       </widget>
                     </child>
                   </widget>
@@ -1538,6 +1551,19 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <child>
+                          <widget class="GtkCheckButton" id="friendfeed_public_enabled">
+                            <property name="label" translatable="yes">_Public Timeline</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                          </widget>
+                          <packing>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
                       </widget>
                     </child>
                   </widget>
@@ -2346,6 +2372,19 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <child>
+                          <widget class="GtkCheckButton" id="identica_public_enabled">
+                            <property name="label" translatable="yes">_Public Timeline</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                          </widget>
+                          <packing>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
                       </widget>
                     </child>
                   </widget>