GTG

Merge lp:~jml/gtg/no-delete-on-toolbar-bug-398631 into lp:~gtg/gtg/old-trunk

  1. no-delete-on-toolbar-bug-398631
  2. Merge into old-trunk
Proposed by Jonathan Lange
Status: Merged
Merged at revision: not available
Proposed branch: lp:~jml/gtg/no-delete-on-toolbar-bug-398631
Merge into: lp:~gtg/gtg/old-trunk
Diff against target: None lines
To merge this branch: bzr merge lp:~jml/gtg/no-delete-on-toolbar-bug-398631
Reviewer Review Type Date Requested Status
Gtg developers Pending
Review via email: mp+8663@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jonathan Lange (jml) wrote :

This branch removes the 'Delete' button from the toolbar. I've made sure that actions can still be deleted.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CHANGELOG'
--- CHANGELOG 2009-07-12 22:03:53 +0000
+++ CHANGELOG 2009-07-13 02:40:58 +0000
@@ -1,6 +1,7 @@
1 * New keyboard bindings for 'Mark as done' and 'Dismiss' actions1 * New keyboard bindings for 'Mark as done' and 'Dismiss' actions
2 * New keyboard bindings and accelerators by Jonathan Lange2 * New keyboard bindings and accelerators by Jonathan Lange
3 * DBus interface by Ryan Paul3 * DBus interface by Ryan Paul
4 * Remove the 'Delete' button from the toolbar by Jonathan Lange
45
52009-07-04 Getting Things GNOME! 0.1.262009-07-04 Getting Things GNOME! 0.1.2
6 * Available in 18 languages, with 12 languages being more than 99% translated7 * Available in 18 languages, with 12 languages being more than 99% translated
78
=== modified file 'GTG/taskbrowser/browser.py'
--- GTG/taskbrowser/browser.py 2009-07-12 08:05:05 +0000
+++ GTG/taskbrowser/browser.py 2009-07-13 02:40:17 +0000
@@ -100,7 +100,6 @@
100 self.newtask = self.wTree.get_widget("new_task_b")100 self.newtask = self.wTree.get_widget("new_task_b")
101 self.newsubtask = self.wTree.get_widget("new_subtask_b")101 self.newsubtask = self.wTree.get_widget("new_subtask_b")
102 self.dismissbutton = self.wTree.get_widget("dismiss")102 self.dismissbutton = self.wTree.get_widget("dismiss")
103 self.deletebutton = self.wTree.get_widget("delete_b")
104 self.about = self.wTree.get_widget("aboutdialog1")103 self.about = self.wTree.get_widget("aboutdialog1")
105 self.edit_mi = self.wTree.get_widget("edit_mi")104 self.edit_mi = self.wTree.get_widget("edit_mi")
106 105
@@ -110,7 +109,6 @@
110 self.dismissbutton.set_tooltip_text(GnomeConfig.MARK_DISMISS_TOOLTIP)109 self.dismissbutton.set_tooltip_text(GnomeConfig.MARK_DISMISS_TOOLTIP)
111 self.newtask.set_tooltip_text(_("Create a new task"))110 self.newtask.set_tooltip_text(_("Create a new task"))
112 self.newsubtask.set_tooltip_text(_("Create a new subtask"))111 self.newsubtask.set_tooltip_text(_("Create a new subtask"))
113 self.deletebutton.set_tooltip_text(GnomeConfig.DELETE_TOOLTIP)
114 112
115 # Initialize "About" dialog113 # Initialize "About" dialog
116 gtk.about_dialog_set_url_hook(lambda dialog, url: openurl.openurl(url))114 gtk.about_dialog_set_url_hook(lambda dialog, url: openurl.openurl(url))
117115
=== modified file 'GTG/taskbrowser/taskbrowser.glade'
--- GTG/taskbrowser/taskbrowser.glade 2009-05-12 20:44:59 +0000
+++ GTG/taskbrowser/taskbrowser.glade 2009-07-13 02:40:17 +0000
@@ -355,17 +355,6 @@
355 </packing>355 </packing>
356 </child>356 </child>
357 <child>357 <child>
358 <widget class="GtkToolButton" id="delete_b">
359 <property name="visible">True</property>
360 <property name="label" translatable="yes">Delete</property>
361 <property name="icon_name">edit-delete</property>
362 <signal name="clicked" handler="on_delete_task"/>
363 </widget>
364 <packing>
365 <property name="homogeneous">True</property>
366 </packing>
367 </child>
368 <child>
369 <widget class="GtkSeparatorToolItem" id="toolbutton1">358 <widget class="GtkSeparatorToolItem" id="toolbutton1">
370 <property name="visible">True</property>359 <property name="visible">True</property>
371 </widget>360 </widget>

Subscribers

People subscribed via source and target branches

to status/vote changes: