← Back to team overview

gnome-zeitgeist team mailing list archive

[Merge] lp:~tinchester/gnome-activity-journal/radiotoolbuttons into lp:gnome-activity-journal

 

Tin Tvrtkovic has proposed merging lp:~tinchester/gnome-activity-journal/radiotoolbuttons into lp:gnome-activity-journal.

Requested reviews:
  GNOME Zeitgeist Team (gnome-zeitgeist)


Replace view mode buttons with radio buttons.

Comments/criticism welcome. :)
-- 
https://code.launchpad.net/~tinchester/gnome-activity-journal/radiotoolbuttons/+merge/43595
Your team GNOME Zeitgeist Team is requested to review the proposed merge of lp:~tinchester/gnome-activity-journal/radiotoolbuttons into lp:gnome-activity-journal.
=== modified file 'src/main.py'
--- src/main.py	2010-09-23 23:51:34 +0000
+++ src/main.py	2010-12-14 00:04:57 +0000
@@ -66,7 +66,9 @@
         self.append_page(viewstruct.view)
         self.pages.append(viewstruct.view)
         self.tool_buttons.append(viewstruct.button)
-        viewstruct.button.connect("clicked", self.view_button_clicked, len(self.pages)-1)
+        if(len(self.tool_buttons)) > 1:
+            viewstruct.button.set_group(self.tool_buttons[0])    
+        viewstruct.button.connect("toggled", self.view_button_toggled, len(self.pages)-1)
         viewstruct.view.show_all()
         return self.pages.index(viewstruct.view)
 
@@ -93,14 +95,13 @@
     def page(self):
         return self.get_current_page()
 
-    def view_button_clicked(self, button, i):
-        self.emit("view-button-clicked", button, i)
+    def view_button_toggled(self, button, i):
+        if not button.get_active():
+            return
+    	self.emit("view-button-clicked", button, i)
 
     def set_view_page(self, i):
         self.set_current_page(i)
-        for button in self.tool_buttons:
-            button.set_sensitive(True)
-        self.tool_buttons[i].set_sensitive(False)
 
     def _register_default_view(self, view):
         toolbutton = Toolbar.get_toolbutton(view.icon_path, view.dsc_text)

=== modified file 'src/supporting_widgets.py'
--- src/supporting_widgets.py	2010-12-04 18:23:52 +0000
+++ src/supporting_widgets.py	2010-12-14 00:04:57 +0000
@@ -940,7 +940,7 @@
         launch_command("nautilus-sendto", map(lambda obj: obj.uri, self.subjects))
 
 
-class ToolButton(gtk.ToolButton):
+class ToolButton(gtk.RadioToolButton):
     def __init__(self, *args, **kwargs):
         super(ToolButton, self).__init__(*args, **kwargs)