GTG

Merge lp:~ekspiulo/gtg/dev into lp:~gtg/gtg/old-trunk

Proposed by Brian Kennedy
Status: Merged
Merge reported by: Bertrand Rousseau
Merged at revision: not available
Proposed branch: lp:~ekspiulo/gtg/dev
Merge into: lp:~gtg/gtg/old-trunk
Diff against target: None lines
To merge this branch: bzr merge lp:~ekspiulo/gtg/dev
Reviewer Review Type Date Requested Status
Bertrand Rousseau (community) Approve
Review via email: mp+6811@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Brian Kennedy (ekspiulo) wrote :

This branch implements a view menu item to hide the tool bar as requested in bug #326388.

Revision history for this message
Bertrand Rousseau (bertrand-rousseau) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2009-01-23 21:56:57 +0000
3+++ .bzrignore 2009-05-12 07:36:21 +0000
4@@ -28,3 +28,8 @@
5 tags.xml.bak.1
6 tags.xml.bak.2
7 tags.xml.bak.3
8+.pydevproject
9+.project
10+.settings
11+.bzrignore
12+
13
14=== modified file 'GTG/taskbrowser/browser.py'
15--- GTG/taskbrowser/browser.py 2009-05-11 07:54:13 +0000
16+++ GTG/taskbrowser/browser.py 2009-05-12 20:44:59 +0000
17@@ -47,6 +47,7 @@
18 WORKVIEW = False
19 SIDEBAR = False
20 CLOSED_PANE = False
21+TOOLBAR = True
22 QUICKADD_PANE = True
23
24 EXPERIMENTAL_NOTES = False
25@@ -154,6 +155,7 @@
26 "on_bg_color_toggled" : self.on_bg_color_toggled,
27 "on_quickadd_field_activate" : self.quickadd,
28 "on_quickadd_button_activate" : self.quickadd,
29+ "on_view_toolbar_toggled" : self.on_toolbar_toggled,
30 "on_view_quickadd_toggled" : self.toggle_quickadd,
31 "on_about_clicked" : self.on_about_clicked,
32 "on_about_close" : self.on_about_close,
33@@ -230,6 +232,7 @@
34 #The panes
35 self.sidebar = self.wTree.get_widget("sidebar")
36 self.closed_pane = self.wTree.get_widget("closed_pane")
37+ self.toolbar = self.wTree.get_widget("task_tb")
38 self.quickadd_pane = self.wTree.get_widget("quickadd_pane")
39
40 #The tid that will be deleted
41@@ -251,6 +254,7 @@
42 self.menu_view_workview.set_active(WORKVIEW)
43 self.wTree.get_widget("view_sidebar").set_active(SIDEBAR)
44 self.wTree.get_widget("view_closed").set_active(CLOSED_PANE)
45+ self.wTree.get_widget("view_toolbar").set_active(TOOLBAR)
46 self.wTree.get_widget("view_quickadd").set_active(QUICKADD_PANE)
47 self.priv["bg_color_enable"] = True
48
49@@ -331,6 +335,12 @@
50 if self.config["browser"].has_key("ctask_pane_height"):
51 ctask_pane_height = eval(self.config["browser"]["ctask_pane_height"])
52 self.wTree.get_widget("vpaned1").set_position(ctask_pane_height)
53+
54+ if self.config["browser"].has_key("toolbar"):
55+ toolbar = eval(self.config["browser"]["toolbar"])
56+ if not toolbar :
57+ self.toolbar.hide()
58+ self.wTree.get_widget("view_toolbar").set_active(False)
59
60 if self.config["browser"].has_key("quick_add"):
61 quickadd_pane = eval(self.config["browser"]["quick_add"])
62@@ -338,6 +348,7 @@
63 self.quickadd_pane.hide()
64 self.wTree.get_widget("view_quickadd").set_active(False)
65
66+
67 if self.config["browser"].has_key("bg_color_enable"):
68 bgcol_enable = eval(self.config["browser"]["bg_color_enable"])
69 self.priv["bg_color_enable"] = bgcol_enable
70@@ -394,6 +405,7 @@
71 # Get configuration values
72 tag_sidebar = self.sidebar.get_property("visible")
73 closed_pane = self.closed_pane.get_property("visible")
74+ toolbar = self.toolbar.get_property("visible")
75 quickadd_pane = self.quickadd_pane.get_property("visible")
76 #task_tv_sort_id = self.task_ts.get_sort_column_id()
77 sort_column = self.priv["tasklist"]["sort_column"]
78@@ -412,6 +424,7 @@
79 self.config["browser"]["tag_pane"] = tag_sidebar
80 self.config["browser"]["closed_task_pane"] = closed_pane
81 self.config["browser"]["ctask_pane_height"] = closed_pane_height
82+ self.config["browser"]["toolbar"] = toolbar
83 self.config["browser"]["quick_add"] = quickadd_pane
84 self.config["browser"]["bg_color_enable"] = self.priv["bg_color_enable"]
85 self.config["browser"]["collapsed_tasks"] = self.priv["collapsed_tid"]
86@@ -540,6 +553,12 @@
87 self.priv["bg_color_enable"] = False
88 self.do_refresh()
89
90+ def on_toolbar_toggled(self,widget) :
91+ if widget.get_active() :
92+ self.toolbar.show()
93+ else :
94+ self.toolbar.hide()
95+
96 def toggle_quickadd(self,widget) :
97 if widget.get_active() :
98 self.quickadd_pane.show()
99
100=== modified file 'GTG/taskbrowser/taskbrowser.glade'
101--- GTG/taskbrowser/taskbrowser.glade 2009-04-03 17:07:23 +0000
102+++ GTG/taskbrowser/taskbrowser.glade 2009-05-12 20:44:59 +0000
103@@ -114,6 +114,12 @@
104 <signal name="toggled" handler="on_view_closed_toggled"/>
105 </widget>
106 </child>
107+ <child><widget class="GtkCheckMenuItem" id="view_toolbar">
108+ <property name="visible">True</property>
109+ <property name="label" translatable="yes">T_oolbar</property>
110+ <property name="use_underline">True</property>
111+ <signal name="toggled" handler="on_view_toolbar_toggled" />
112+ </widget></child>
113 <child>
114 <widget class="GtkCheckMenuItem" id="view_quickadd">
115 <property name="visible">True</property>
116@@ -121,8 +127,7 @@
117 <property name="use_underline">True</property>
118 <signal name="toggled" handler="on_view_quickadd_toggled"/>
119 </widget>
120- </child>
121- </widget>
122+ </child></widget>
123 </child>
124 </widget>
125 </child>

Subscribers

People subscribed via source and target branches

to status/vote changes: