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

[Jonathan Lange]

[Jonathan Lange (jml)]

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

=== modified file 'CHANGELOG'
--- CHANGELOG	2009-07-12 22:03:53 +0000
+++ CHANGELOG	2009-07-13 02:40:58 +0000
@@ -1,6 +1,7 @@
     * New keyboard bindings for 'Mark as done' and 'Dismiss' actions
     * New keyboard bindings and accelerators by Jonathan Lange
     * DBus interface by Ryan Paul
+    * Remove the 'Delete' button from the toolbar by Jonathan Lange
 
 2009-07-04 Getting Things GNOME! 0.1.2
     * Available in 18 languages, with 12 languages being more than 99% translated

=== 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 @@
         self.newtask            = self.wTree.get_widget("new_task_b")
         self.newsubtask         = self.wTree.get_widget("new_subtask_b")
         self.dismissbutton      = self.wTree.get_widget("dismiss")
-        self.deletebutton      = self.wTree.get_widget("delete_b")
         self.about              = self.wTree.get_widget("aboutdialog1")
         self.edit_mi            = self.wTree.get_widget("edit_mi")
         
@@ -110,7 +109,6 @@
         self.dismissbutton.set_tooltip_text(GnomeConfig.MARK_DISMISS_TOOLTIP)
         self.newtask.set_tooltip_text(_("Create a new task"))
         self.newsubtask.set_tooltip_text(_("Create a new subtask"))
-        self.deletebutton.set_tooltip_text(GnomeConfig.DELETE_TOOLTIP)
   
         # Initialize "About" dialog
         gtk.about_dialog_set_url_hook(lambda dialog, url: openurl.openurl(url))

=== 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 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkToolButton" id="delete_b">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Delete</property>
-                <property name="icon_name">edit-delete</property>
-                <signal name="clicked" handler="on_delete_task"/>
-              </widget>
-              <packing>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
               <widget class="GtkSeparatorToolItem" id="toolbutton1">
                 <property name="visible">True</property>
               </widget>