GNOME Activity Journal

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

  1. radiotoolbuttons
  2. Merge into trunk
Proposed by Tin Tvrtkovic
Status: Merged
Merged at revision: 1142
Proposed branch: lp:~tinchester/gnome-activity-journal/radiotoolbuttons
Merge into: lp:gnome-activity-journal
Diff against target: 45 lines (+8/-7)
2 files modified
src/main.py (+7/-6)
src/supporting_widgets.py (+1/-1)
To merge this branch: bzr merge lp:~tinchester/gnome-activity-journal/radiotoolbuttons
Reviewer Review Type Date Requested Status
Stefano Candori Approve
Review via email: mp+43595@code.launchpad.net

Description of the change

Replace view mode buttons with radio buttons.

Comments/criticism welcome. :)

To post a comment you must log in.
Revision history for this message
Stefano Candori (cando) wrote :

Works flawlessy...I've fixed the keyboard focus problem and merged your branch.
Thanks Tin!!!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/main.py'
2--- src/main.py 2010-09-23 23:51:34 +0000
3+++ src/main.py 2010-12-14 00:04:57 +0000
4@@ -66,7 +66,9 @@
5 self.append_page(viewstruct.view)
6 self.pages.append(viewstruct.view)
7 self.tool_buttons.append(viewstruct.button)
8- viewstruct.button.connect("clicked", self.view_button_clicked, len(self.pages)-1)
9+ if(len(self.tool_buttons)) > 1:
10+ viewstruct.button.set_group(self.tool_buttons[0])
11+ viewstruct.button.connect("toggled", self.view_button_toggled, len(self.pages)-1)
12 viewstruct.view.show_all()
13 return self.pages.index(viewstruct.view)
14
15@@ -93,14 +95,13 @@
16 def page(self):
17 return self.get_current_page()
18
19- def view_button_clicked(self, button, i):
20- self.emit("view-button-clicked", button, i)
21+ def view_button_toggled(self, button, i):
22+ if not button.get_active():
23+ return
24+ self.emit("view-button-clicked", button, i)
25
26 def set_view_page(self, i):
27 self.set_current_page(i)
28- for button in self.tool_buttons:
29- button.set_sensitive(True)
30- self.tool_buttons[i].set_sensitive(False)
31
32 def _register_default_view(self, view):
33 toolbutton = Toolbar.get_toolbutton(view.icon_path, view.dsc_text)
34
35=== modified file 'src/supporting_widgets.py'
36--- src/supporting_widgets.py 2010-12-04 18:23:52 +0000
37+++ src/supporting_widgets.py 2010-12-14 00:04:57 +0000
38@@ -940,7 +940,7 @@
39 launch_command("nautilus-sendto", map(lambda obj: obj.uri, self.subjects))
40
41
42-class ToolButton(gtk.ToolButton):
43+class ToolButton(gtk.RadioToolButton):
44 def __init__(self, *args, **kwargs):
45 super(ToolButton, self).__init__(*args, **kwargs)
46