gtg team mailing list archive
-
gtg team
-
Mailing list archive
-
Message #03518
[Merge] lp:~nimit-svnit/gtg/bug into lp:gtg
Nimit Shah has proposed merging lp:~nimit-svnit/gtg/bug into lp:gtg.
Requested reviews:
Gtg developers (gtg)
For more details, see:
https://code.launchpad.net/~nimit-svnit/gtg/bug/+merge/105084
The revision 1109 solves the problem of quickadd bar entry.
I have stripped the entry of initial whitespaces as they will not be of any use anyways and will help check if the task simply has whitespaces
--
https://code.launchpad.net/~nimit-svnit/gtg/bug/+merge/105084
Your team Gtg developers is requested to review the proposed merge of lp:~nimit-svnit/gtg/bug into lp:gtg.
=== modified file 'GTG/core/task.py'
--- GTG/core/task.py 2012-04-22 11:56:25 +0000
+++ GTG/core/task.py 2012-05-08 16:35:23 +0000
@@ -242,23 +242,60 @@
self.last_modified = modified
def set_due_date(self, fulldate):
- self.due_date = Date(fulldate)
- self.sync()
+ #self.due_date = Date(fulldate)
+ #
+ if self.start_date == Date.no_date():
+ self.due_date = fulldate
+ self.modified()
+ subtasks = self.get_subtasks()
+ for sub in subtasks:
+ if sub.due_date > fulldate and sub.start_date < fulldate:
+ sub.set_due_date(fulldate)
+ sub.modified()
+ if self.start_date < fulldate:
+ self.due_date = fulldate
+ self.modified()
+ subtasks = self.get_subtasks()
+ for sub in subtasks:
+ if sub.due_date > fulldate and sub.start_date < fulldate:
+ sub.set_due_date(fulldate)
+ sub.modified()
def get_due_date(self):
""" Due date return the most urgent date of all parents """
zedate = self.due_date
+<<<<<<< TREE
for par in self.get_parents():
# compare with the parent's due date
pardate = self.req.get_task(par).get_due_date()
if pardate and zedate > pardate:
zedate = pardate
+=======
+ #for par in self.get_parents():
+ # #Here we compare with the parent's due date
+ # pardate = self.req.get_task(par).get_due_date()
+ # if pardate and zedate > pardate:
+ # zedate = pardate
+>>>>>>> MERGE-SOURCE
return zedate
def set_start_date(self, fulldate):
- self.start_date = Date(fulldate)
+ zedate=Date(fulldate)
+ if not self.get_parents():
+ self.start_date=zedate
+ for par in self.get_parents():
+ pardate=self.req.get_task(par).get_start_date()
+ if pardate and zedate > pardate:
+ self.start_date = zedate
+ elif not pardate:
+ self.start_date = zedate
+ subtasks = self.get_subtasks()
+ for sub in subtasks:
+ if sub.start_date < zedate:
+ sub.start_date = zedate
+ sub.sync()
self.sync()
def get_start_date(self):
=== modified file 'GTG/gtk/browser/browser.py'
--- GTG/gtk/browser/browser.py 2012-05-04 06:19:55 +0000
+++ GTG/gtk/browser/browser.py 2012-05-08 16:35:23 +0000
@@ -758,6 +758,7 @@
def on_quickadd_activate(self, widget):
""" Add a new task from quickadd toolbar """
text = unicode(self.quickadd_entry.get_text())
+ text=text.strip()
if text:
tags = self.get_selected_tags(nospecial=True)
#We will select quick-added task in browser.
@@ -998,11 +999,11 @@
tasks = [self.req.get_task(uid)
for uid in self.get_selected_tasks()
if uid is not None]
-
+
due_date = Date.parse(new_due_date)
-
+
for task in tasks:
- task.set_due_date(due_date)
+ task.set_due_date(new_due_date)
#FIXME: If the task dialog is displayed, refresh its due_date widget
def on_set_due_today(self, widget):
=== modified file 'GTG/gtk/browser/taskbrowser.glade'
--- GTG/gtk/browser/taskbrowser.glade 2012-04-22 12:57:54 +0000
+++ GTG/gtk/browser/taskbrowser.glade 2012-05-08 16:35:23 +0000
@@ -1,7 +1,55 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.16"/>
+<<<<<<< TREE
<!-- interface-naming-policy toplevel-contextual -->
+=======
+ <object class="GtkAboutDialog" id="about_dialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">About GTG!</property>
+ <property name="resizable">False</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <property name="program_name">Getting Things Gnome!</property>
+ <property name="copyright" translatable="yes">Copyrights© 2008, 2009 Lionel Dricot, Bertrand Rousseau</property>
+ <property name="comments" translatable="yes">
+Getting Things Gnome! is an organizer for the GNOME desktop environment.</property>
+ <property name="website_label" translatable="yes">GTG website</property>
+ <property name="license" translatable="yes">Getting Things Gnome! is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version.
+
+Getting Things Gnome! is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with Getting Things Gnome!; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</property>
+ <property name="authors">Lionel Dricot (ploum@xxxxxxxxx),
+Bertrand Rousseau (bertrand.rousseau@xxxxxxxxx)</property>
+ <property name="logo_icon_name">gtg</property>
+ <property name="wrap_license">True</property>
+ <signal name="delete-event" handler="on_about_delete" swapped="no"/>
+ <signal name="response" handler="on_about_close" swapped="no"/>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="about_dialog_vbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <object class="GtkAccelGroup" id="accelgroup1"/>
+>>>>>>> MERGE-SOURCE
<object class="GtkWindow" id="MainWindow">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Getting Things Gnome!</property>
@@ -19,9 +67,9 @@
<property name="can_focus">False</property>
<child>
<object class="GtkMenuItem" id="bm_task">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_Tasks</property>
<property name="use_underline">True</property>
<child type="submenu">
@@ -31,10 +79,10 @@
<child>
<object class="GtkImageMenuItem" id="new_task_mi">
<property name="label" translatable="yes">New _Task</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Create a new task</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="image">bm_img_task</property>
<property name="use_stock">False</property>
@@ -45,10 +93,10 @@
<child>
<object class="GtkImageMenuItem" id="new_subtask_mi">
<property name="label" translatable="yes">New _Subtask</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="image">bm_img_subtask</property>
<property name="use_stock">False</property>
@@ -59,10 +107,10 @@
<child>
<object class="GtkImageMenuItem" id="edit_mi">
<property name="label">gtk-edit</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
@@ -78,10 +126,10 @@
<child>
<object class="GtkImageMenuItem" id="done_mi">
<property name="label" translatable="yes">Mark as _Done</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="image">bm_img_done</property>
<property name="use_stock">False</property>
@@ -92,10 +140,10 @@
<child>
<object class="GtkImageMenuItem" id="dismiss_mi">
<property name="label" translatable="yes">D_ismiss</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="image">bm_img_dismiss</property>
<property name="use_stock">False</property>
@@ -106,10 +154,10 @@
<child>
<object class="GtkImageMenuItem" id="delete_mi">
<property name="label">gtk-delete</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
@@ -125,9 +173,9 @@
<child>
<object class="GtkImageMenuItem" id="file_quit">
<property name="label">gtk-quit</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
@@ -140,9 +188,9 @@
</child>
<child>
<object class="GtkMenuItem" id="bm_edit">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_Edit</property>
<property name="use_underline">True</property>
<child type="submenu">
@@ -152,8 +200,8 @@
<child>
<object class="GtkImageMenuItem" id="edit_undo">
<property name="label">gtk-undo</property>
+ <property name="use_action_appearance">False</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
@@ -162,8 +210,8 @@
<child>
<object class="GtkImageMenuItem" id="edit_redo">
<property name="label">gtk-redo</property>
+ <property name="use_action_appearance">False</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
@@ -177,9 +225,9 @@
<child>
<object class="GtkImageMenuItem" id="edit_preferences_mi">
<property name="label">gtk-preferences</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
@@ -188,10 +236,15 @@
</child>
<child>
<object class="GtkMenuItem" id="backends_mi">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+<<<<<<< TREE
<property name="use_action_appearance">False</property>
<property name="label">Setup Sync. Services</property>
+=======
+ <property name="label">Backends</property>
+>>>>>>> MERGE-SOURCE
<signal name="activate" handler="on_edit_backends_activate" swapped="no"/>
</object>
</child>
@@ -201,9 +254,9 @@
</child>
<child>
<object class="GtkMenuItem" id="menu_view">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_View</property>
<property name="use_underline">True</property>
<child type="submenu">
@@ -212,9 +265,9 @@
<property name="can_focus">False</property>
<child>
<object class="GtkCheckMenuItem" id="view_workview">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_Work View</property>
<property name="use_underline">True</property>
<signal name="toggled" handler="on_view_workview_toggled" swapped="no"/>
@@ -227,10 +280,30 @@
</object>
</child>
<child>
+<<<<<<< TREE
+=======
+ <object class="GtkCheckMenuItem" id="bgcol_enable">
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Background Colors</property>
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <signal name="toggled" handler="on_bg_color_toggled" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="separator_5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+>>>>>>> MERGE-SOURCE
<object class="GtkCheckMenuItem" id="view_sidebar">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_Tags Sidebar</property>
<property name="use_underline">True</property>
<signal name="toggled" handler="on_view_sidebar_toggled" swapped="no"/>
@@ -238,9 +311,9 @@
</child>
<child>
<object class="GtkCheckMenuItem" id="view_closed">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_Closed Tasks Pane</property>
<property name="use_underline">True</property>
<signal name="toggled" handler="on_view_closed_toggled" swapped="no"/>
@@ -248,9 +321,9 @@
</child>
<child>
<object class="GtkCheckMenuItem" id="view_toolbar">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">T_oolbar</property>
<property name="use_underline">True</property>
<signal name="toggled" handler="on_view_toolbar_toggled" swapped="no"/>
@@ -258,9 +331,9 @@
</child>
<child>
<object class="GtkCheckMenuItem" id="view_quickadd">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_Quick Add Entry</property>
<property name="use_underline">True</property>
<signal name="toggled" handler="on_view_quickadd_toggled" swapped="no"/>
@@ -272,8 +345,8 @@
</child>
<child>
<object class="GtkMenuItem" id="plugin_mi">
+ <property name="use_action_appearance">False</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_Plugins</property>
<property name="use_underline">True</property>
<child type="submenu">
@@ -286,9 +359,9 @@
</child>
<child>
<object class="GtkMenuItem" id="help_mi">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_Help</property>
<property name="use_underline">True</property>
<child type="submenu">
@@ -296,12 +369,17 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
+<<<<<<< TREE
<object class="GtkImageMenuItem" id="online_help">
<property name="label">Get _Help Online</property>
+=======
+ <object class="GtkImageMenuItem" id="gtk_help_mi">
+ <property name="label">gtk-help</property>
+ <property name="use_action_appearance">False</property>
+>>>>>>> MERGE-SOURCE
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Open GTG documentation in your web browser</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
@@ -349,9 +427,9 @@
<child>
<object class="GtkImageMenuItem" id="gtk_about_mi">
<property name="label">gtk-about</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
@@ -379,6 +457,7 @@
<property name="can_focus">False</property>
<child>
<object class="GtkToolButton" id="new_task_b">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
@@ -394,6 +473,7 @@
</child>
<child>
<object class="GtkToolButton" id="new_subtask_b">
+ <property name="use_action_appearance">False</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">New Subtask</property>
@@ -407,6 +487,7 @@
</child>
<child>
<object class="GtkToolButton" id="edit_b">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
@@ -432,6 +513,7 @@
</child>
<child>
<object class="GtkToolButton" id="Undo">
+ <property name="use_action_appearance">False</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Undo</property>
@@ -444,6 +526,7 @@
</child>
<child>
<object class="GtkToolButton" id="Redo">
+ <property name="use_action_appearance">False</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Redo</property>
@@ -466,6 +549,7 @@
</child>
<child>
<object class="GtkToolButton" id="done_b">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
@@ -482,6 +566,7 @@
</child>
<child>
<object class="GtkToolButton" id="dismiss_b">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
@@ -497,6 +582,7 @@
</child>
<child>
<object class="GtkToolButton" id="delete_b">
+ <property name="use_action_appearance">False</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
@@ -521,6 +607,7 @@
</child>
<child>
<object class="GtkToggleToolButton" id="workview_toggle">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
@@ -588,6 +675,7 @@
</child>
<child>
<object class="GtkButton" id="button-sidebar-close">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -627,7 +715,10 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">never</property>
+<<<<<<< TREE
<property name="vscrollbar_policy">automatic</property>
+=======
+>>>>>>> MERGE-SOURCE
<property name="shadow_type">in</property>
<child>
<placeholder/>
@@ -711,7 +802,10 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">never</property>
+<<<<<<< TREE
<property name="vscrollbar_policy">automatic</property>
+=======
+>>>>>>> MERGE-SOURCE
<child>
<placeholder/>
</child>
@@ -770,6 +864,7 @@
</object>
</child>
</object>
+<<<<<<< TREE
<object class="GtkAboutDialog" id="about_dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
@@ -815,6 +910,138 @@
</child>
</object>
<object class="GtkAccelGroup" id="accelgroup1"/>
+=======
+ <object class="GtkDialog" id="addtag_dialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Add a Tag...</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="addtag_dialog_vbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="addtag_ok">
+ <property name="label" translatable="yes">Add Tag</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <signal name="activate" handler="on_addtag_confirm" swapped="no"/>
+ <signal name="clicked" handler="on_addtag_confirm" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="addtag_cancel">
+ <property name="label" translatable="yes">Cancel</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="addtag_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Enter the name of the tag(s) you wish to add:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="tag_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="is_focus">True</property>
+ <property name="invisible_char">●</property>
+ <property name="activates_default">True</property>
+ <property name="text" translatable="yes">TagName</property>
+ <property name="shadow_type">none</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="hint_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Hint: you can add several tags by separating them with
+commas.</property>
+ <attributes>
+ <attribute name="foreground" value="#77bd77bd77bd"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="apply_to_subtasks">
+ <property name="label" translatable="yes">Apply to subtasks</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">addtag_ok</action-widget>
+ <action-widget response="0">addtag_cancel</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+>>>>>>> MERGE-SOURCE
<object class="GtkImage" id="bm_img_dismiss">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -845,9 +1072,9 @@
<child>
<object class="GtkImageMenuItem" id="ctcm_edit">
<property name="label">gtk-edit</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
@@ -863,9 +1090,9 @@
<child>
<object class="GtkImageMenuItem" id="ctcm_mark_as_not_done">
<property name="label" translatable="yes">Mark as Not Done</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="image">ctcm_img_mark_not_done</property>
<property name="use_stock">False</property>
@@ -876,9 +1103,9 @@
<child>
<object class="GtkImageMenuItem" id="ctcm_undismiss">
<property name="label" translatable="yes">Und_ismiss</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="image">tcm_img_undismiss</property>
<property name="use_stock">False</property>
@@ -889,9 +1116,9 @@
<child>
<object class="GtkImageMenuItem" id="ctcm_delete">
<property name="label">gtk-delete</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
@@ -911,9 +1138,9 @@
<child>
<object class="GtkImageMenuItem" id="tcm_due_today">
<property name="label" translatable="yes">t_oday</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">False</property>
<signal name="activate" handler="on_set_due_today" swapped="no"/>
@@ -922,9 +1149,9 @@
<child>
<object class="GtkImageMenuItem" id="tcm_due_tomorrow">
<property name="label" translatable="yes">_tomorrow</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">False</property>
<signal name="activate" handler="on_set_due_tomorrow" swapped="no"/>
@@ -933,9 +1160,9 @@
<child>
<object class="GtkImageMenuItem" id="tcm_due_next_week">
<property name="label" translatable="yes">next _week</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">False</property>
<signal name="activate" handler="on_set_due_next_week" swapped="no"/>
@@ -944,9 +1171,9 @@
<child>
<object class="GtkImageMenuItem" id="tcm_due_next_month">
<property name="label" translatable="yes">next _month</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">False</property>
<signal name="activate" handler="on_set_due_next_month" swapped="no"/>
@@ -955,9 +1182,9 @@
<child>
<object class="GtkImageMenuItem" id="tcm_due_next_year">
<property name="label" translatable="yes">next _year</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">False</property>
<signal name="activate" handler="on_set_due_next_year" swapped="no"/>
@@ -972,9 +1199,9 @@
<child>
<object class="GtkImageMenuItem" id="tcm_due_now">
<property name="label" translatable="yes">_now</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">False</property>
<signal name="activate" handler="on_set_due_now" swapped="no"/>
@@ -983,9 +1210,9 @@
<child>
<object class="GtkImageMenuItem" id="tcm_due_soon">
<property name="label" translatable="yes">_soon</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">False</property>
<signal name="activate" handler="on_set_due_soon" swapped="no"/>
@@ -994,9 +1221,9 @@
<child>
<object class="GtkImageMenuItem" id="tcm_due_someday">
<property name="label" translatable="yes">_someday</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">False</property>
<signal name="activate" handler="on_set_due_someday" swapped="no"/>
@@ -1011,9 +1238,9 @@
<child>
<object class="GtkImageMenuItem" id="tcm_due_clear">
<property name="label" translatable="yes">_clear due date</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">False</property>
<signal name="activate" handler="on_set_due_clear" swapped="no"/>
@@ -1058,33 +1285,54 @@
<property name="popup_set_width">False</property>
<signal name="action-activated" handler="on_quickadd_entrycompletion_action_activated" swapped="no"/>
</object>
- <object class="GtkMenu" id="search_context_menu">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkImageMenuItem" id="search_delete">
- <property name="label">Delete</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
- <property name="use_underline">True</property>
- <property name="image">image5</property>
- <property name="use_stock">False</property>
- <property name="accel_group">accelgroup1</property>
- <property name="always_show_image">True</property>
- <signal name="activate" handler="on_search_delete_activate" swapped="no"/>
- </object>
- </child>
- </object>
+<<<<<<< TREE
+ <object class="GtkMenu" id="search_context_menu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImageMenuItem" id="search_delete">
+ <property name="label">Delete</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="image">image5</property>
+ <property name="use_stock">False</property>
+ <property name="accel_group">accelgroup1</property>
+ <property name="always_show_image">True</property>
+ <signal name="activate" handler="on_search_delete_activate" swapped="no"/>
+ </object>
+ </child>
+ </object>
+=======
+ <object class="GtkMenu" id="search_context_menu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImageMenuItem" id="search_delete">
+ <property name="label">Delete</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="image">image5</property>
+ <property name="use_stock">False</property>
+ <property name="accel_group">accelgroup1</property>
+ <property name="always_show_image">True</property>
+ <signal name="activate" handler="on_search_delete_activate" swapped="no"/>
+ </object>
+ </child>
+ </object>
+>>>>>>> MERGE-SOURCE
<object class="GtkMenu" id="start_for_context_menu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkImageMenuItem" id="tcm_mark_as_started">
<property name="label" translatable="yes">t_oday</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">False</property>
<signal name="activate" handler="on_mark_as_started" swapped="no"/>
@@ -1093,9 +1341,9 @@
<child>
<object class="GtkImageMenuItem" id="tcm_start_for_tomorrow">
<property name="label" translatable="yes">_tomorrow</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">False</property>
<signal name="activate" handler="on_start_for_tomorrow" swapped="no"/>
@@ -1104,9 +1352,9 @@
<child>
<object class="GtkImageMenuItem" id="tcm_start_for_next_week">
<property name="label" translatable="yes">next _week</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">False</property>
<signal name="activate" handler="on_start_for_next_week" swapped="no"/>
@@ -1115,9 +1363,9 @@
<child>
<object class="GtkImageMenuItem" id="tcm_start_for_next_month">
<property name="label" translatable="yes">next _month</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">False</property>
<signal name="activate" handler="on_start_for_next_month" swapped="no"/>
@@ -1126,9 +1374,9 @@
<child>
<object class="GtkImageMenuItem" id="tcm_start_for_next_year">
<property name="label" translatable="yes">next _year</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">False</property>
<signal name="activate" handler="on_start_for_next_year" swapped="no"/>
@@ -1143,24 +1391,67 @@
<child>
<object class="GtkImageMenuItem" id="tcm_start_clear">
<property name="label" translatable="yes">_clear start date</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">False</property>
<signal name="activate" handler="on_start_clear" swapped="no"/>
</object>
</child>
</object>
+<<<<<<< TREE
+=======
+ <object class="GtkMenu" id="tag_context_menu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <signal name="deactivate" handler="on_tagcontext_deactivate" swapped="no"/>
+ <child>
+ <object class="GtkImageMenuItem" id="colorchooser_mi">
+ <property name="label">gtk-select-color</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
+ <property name="accel_group">accelgroup1</property>
+ <signal name="activate" handler="on_colorchooser_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="resetcolor_mi">
+ <property name="label" translatable="yes">Reset Color</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="image">image2</property>
+ <property name="use_stock">False</property>
+ <property name="accel_group">accelgroup1</property>
+ <signal name="activate" handler="on_resetcolor_activate" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCheckMenuItem" id="nonworkviewtag_mi">
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <signal name="toggled" handler="on_nonworkviewtag_toggled" swapped="no"/>
+ </object>
+ </child>
+ </object>
+>>>>>>> MERGE-SOURCE
<object class="GtkMenu" id="task_context_menu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkImageMenuItem" id="tcm_add_subtask">
<property name="label" translatable="yes">Add a subtask</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="image">tcm_img_add_subtask</property>
<property name="use_stock">False</property>
@@ -1171,9 +1462,9 @@
<child>
<object class="GtkImageMenuItem" id="tcm_edit">
<property name="label">gtk-edit</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
@@ -1189,9 +1480,9 @@
<child>
<object class="GtkImageMenuItem" id="tcm_mark_as_done">
<property name="label" translatable="yes">Mark as _Done</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="image">tcm_img_mark_done</property>
<property name="use_stock">False</property>
@@ -1202,9 +1493,9 @@
<child>
<object class="GtkImageMenuItem" id="tcm_dismiss">
<property name="label" translatable="yes">D_ismiss</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="image">tcm_img_dismiss</property>
<property name="use_stock">False</property>
@@ -1215,9 +1506,9 @@
<child>
<object class="GtkImageMenuItem" id="tcm_delete">
<property name="label">gtk-delete</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
@@ -1233,10 +1524,9 @@
<child>
<object class="GtkImageMenuItem" id="tcm_start_menu">
<property name="label" translatable="yes">_Set start date</property>
- <property name="submenu">start_for_context_menu</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">False</property>
</object>
@@ -1244,10 +1534,9 @@
<child>
<object class="GtkImageMenuItem" id="tcm_due_menu">
<property name="label" translatable="yes">Set due date</property>
- <property name="submenu">due_context_menu</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">False</property>
</object>
@@ -1259,11 +1548,16 @@
</object>
</child>
<child>
+<<<<<<< TREE
<object class="GtkImageMenuItem" id="tcm_modifytags">
<property name="label" translatable="yes">Modify Tags...</property>
+=======
+ <object class="GtkImageMenuItem" id="tcm_addtag">
+ <property name="label" translatable="yes">Add Tag...</property>
+ <property name="use_action_appearance">False</property>
+>>>>>>> MERGE-SOURCE
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="image">image3</property>
<property name="use_stock">False</property>
<signal name="activate" handler="on_modify_tags" swapped="no"/>
