Merge lp:~parthpanchl/gtg/fix-calendar into lp:~gtg/gtg/old-trunk

[Parth Panchal]

Fixes Bug #931904 & Bug #1289284

Fixes Bug #931904 & Bug #1289284
- Adds "Pick a date" option to set start/due date in task browser's context menu to set date from calendar window
- Removes 'Now' option from 'Set due date' context menu in task browser
- Detaches calendar ui from taskeditor.ui
- Updates calendar ui to be consistent with parent window

[Nimit Shah (nimit-svnit)]

Hi Parth,
The branch fixes the problems but I want you to modify the UI a bit. There should be a quicker way to set dates to popular choices like today,tomorrow,next week or next month.
For this, you can create sub menu where you can give option for this and for a specific one say "Pick a date..."

[lp:~parthpanchl/gtg/fix-calendar]

1366. By Parth Panchal on 2014-03-23

Updated UI of task browser's context menu

1367. By Parth Panchal on 2014-03-23

Resolves conflicts

[Parth Panchal (parthpanchl)]

Nimit,
I imagined the same UI that you're suggesting but then thought that the popular choices like today, tomorrow, next week or next month could be easily understood by the users from calendar. So to reduce the average clicks to change the start/due date, I chose that UI.

Now, I've pushed the desired changes.

[lp:~parthpanchl/gtg/fix-calendar]

1368. By Parth Panchal on 2014-03-23

Fixes calendar pop up bug

1369. By Parth Panchal on 2014-03-23

Removes 'Now' from 'Set due date' context menu in Task Browser

=== modified file 'CHANGELOG'
--- CHANGELOG	2014-03-20 18:38:10 +0000
+++ CHANGELOG	2014-03-23 12:58:31 +0000
@@ -28,6 +28,8 @@
     * Moving to Sphinx for documentation and improving the scripts, by Izidor Matušov
     * Fixing the error getting thrown on drag-drop of text in taskeditor, by Sagar Ghuge
     * Fixes #1 : Searching for something and then clicking on any place in the tag sidebar doesn't clear the quick-add bar text, by Parth Panchal
+    * Fix for bug #931904 : Scheduling many task, by Parth Panchal
+    * Fix for bug #1289284 : Date gets dragged from calendar widget when its date is already set, by Parth Panchal
 
 2013-11-24 Getting Things GNOME! 0.3.1
     * Fix for bug #1024473: Have 'Show Main Window' in notification area, by Antonio Roquentin
 
=== modified file 'GTG/gtk/browser/browser.py'
--- GTG/gtk/browser/browser.py	2014-03-20 18:38:10 +0000
+++ GTG/gtk/browser/browser.py	2014-03-23 12:58:31 +0000
@@ -39,6 +39,7 @@
 from GTG.gtk.browser.modifytags_dialog import ModifyTagsDialog
 from GTG.gtk.browser.tag_context_menu import TagContextMenu
 from GTG.gtk.browser.treeview_factory import TreeviewFactory
+from GTG.gtk.editor.calendar import GTGCalendar
 from GTG.tools.dates import Date
 from GTG.tools.logger import Log
 
@@ -180,12 +181,15 @@
 
     def _init_ui_widget(self):
         """ Sets the main pane with the tree with active tasks and
-        create ModifyTagsDialog """
+        create ModifyTagsDialog & Calendar """
         # The Active tasks treeview
         self.main_pane.add(self.vtree_panes['active'])
 
         tag_completion = TagCompletion(self.req.get_tag_tree())
         self.modifytags_dialog = ModifyTagsDialog(tag_completion, self.req)
+        self.calendar = GTGCalendar()
+        self.calendar.set_transient_for(self.window)
+        self.calendar.connect("date-changed", self.on_date_changed)
 
     def init_tags_sidebar(self):
         """
@@ -276,6 +280,8 @@
             self.on_start_for_next_month,
             "on_start_for_next_year":
             self.on_start_for_next_year,
+            "on_start_for_specific_date":
+            self.on_start_for_specific_date,
             "on_start_clear":
             self.on_start_clear,
             "on_set_due_today":
@@ -288,12 +294,12 @@
             self.on_set_due_next_month,
             "on_set_due_next_year":
             self.on_set_due_next_year,
-            "on_set_due_now":
-            self.on_set_due_now,
             "on_set_due_soon":
             self.on_set_due_soon,
             "on_set_due_someday":
             self.on_set_due_someday,
+            "on_set_due_for_specific_date":
+            self.on_set_due_for_specific_date,
             "on_set_due_clear":
             self.on_set_due_clear,
             "on_dismiss_task":
@@ -1095,9 +1101,6 @@
     def on_set_due_next_year(self, widget):
         self.update_due_date(widget, "next year")
 
-    def on_set_due_now(self, widget):
-        self.update_due_date(widget, "now")
-
     def on_set_due_soon(self, widget):
         self.update_due_date(widget, "soon")
 
@@ -1107,6 +1110,46 @@
     def on_set_due_clear(self, widget):
         self.update_due_date(widget, None)
 
+    def on_start_for_specific_date(self, widget):
+        """ Display Calendar to set start date of selected tasks """
+        self.calendar.set_title("Set Start Date")
+        # Get task from task name
+        task = self.req.get_task(self.get_selected_tasks()[0])
+        date = task.get_start_date()
+        self.calendar.set_date(date, GTGCalendar.DATE_KIND_START)
+        # Shows the calendar just above the mouse on widget's line of symmetry
+        rect = widget.get_allocation()
+        result, x, y = widget.get_window().get_origin()
+        self.calendar.show_at_position(x + rect.x + rect.width,
+                                       y + rect.y)
+
+    def on_set_due_for_specific_date(self, widget):
+        """ Display Calendar to set due date of selected tasks """
+        self.calendar.set_title("Set Due Date")
+        # Get task from task name
+        task = self.req.get_task(self.get_selected_tasks()[0])
+        if not task.get_due_date():
+            date = task.get_start_date()
+        else:
+            date = task.get_due_date()
+        self.calendar.set_date(date, GTGCalendar.DATE_KIND_DUE)
+        # Shows the calendar just above the mouse on widget's line of symmetry
+        rect = widget.get_allocation()
+        result, x, y = widget.get_window().get_origin()
+        self.calendar.show_at_position(x + rect.x + rect.width,
+                                       y + rect.y)
+
+    def on_date_changed(self, calendar):
+        # Get tasks' list from task names' list
+        tasks = [self.req.get_task(task) for task in self.get_selected_tasks()]
+        date, date_kind = calendar.get_selected_date()
+        if date_kind == GTGCalendar.DATE_KIND_DUE:
+            for task in tasks:
+                task.set_due_date(date)
+        elif date_kind == GTGCalendar.DATE_KIND_START:
+            for task in tasks:
+                task.set_start_date(date)
+
     def on_modify_tags(self, widget):
         """ Run Modify Tags dialog on selected tasks """
         tasks = self.get_selected_tasks()
 
=== modified file 'GTG/gtk/browser/taskbrowser.ui'
--- GTG/gtk/browser/taskbrowser.ui	2013-11-25 02:37:46 +0000
+++ GTG/gtk/browser/taskbrowser.ui	2014-03-23 12:58:31 +0000
@@ -1059,6 +1059,16 @@
               </object>
             </child>
             <child>
+              <object class="GtkImageMenuItem" id="tcm_start_for_specific_date">
+                <property name="label" translatable="yes">Pick a date...</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="use_underline">True</property>
+                <property name="use_stock">False</property>
+                <signal name="activate" handler="on_start_for_specific_date" swapped="no"/>
+              </object>
+            </child>
+            <child>
               <object class="GtkSeparatorMenuItem" id="menuitem1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -1140,22 +1150,22 @@
               </object>
             </child>
             <child>
+              <object class="GtkImageMenuItem" id="tcm_due_specific_date">
+                <property name="label" translatable="yes">Pick a date...</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="use_underline">True</property>
+                <property name="use_stock">False</property>
+                <signal name="activate" handler="on_set_due_for_specific_date" swapped="no"/>
+              </object>
+            </child>
+            <child>
               <object class="GtkSeparatorMenuItem" id="menuitem2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
               </object>
             </child>
             <child>
-              <object class="GtkImageMenuItem" id="tcm_due_now">
-                <property name="label" translatable="yes">_Now</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="use_underline">True</property>
-                <property name="use_stock">False</property>
-                <signal name="activate" handler="on_set_due_now" swapped="no"/>
-              </object>
-            </child>
-            <child>
               <object class="GtkImageMenuItem" id="tcm_due_soon">
                 <property name="label" translatable="yes">_Soon</property>
                 <property name="visible">True</property>
 
=== modified file 'GTG/gtk/editor/__init__.py'
--- GTG/gtk/editor/__init__.py	2013-11-25 02:37:46 +0000
+++ GTG/gtk/editor/__init__.py	2014-03-23 12:58:31 +0000
@@ -27,6 +27,7 @@
 class GnomeConfig:
     current_rep = os.path.dirname(os.path.abspath(__file__))
     EDITOR_UI_FILE = os.path.join(current_rep, "taskeditor.ui")
+    CALENDAR_UI_FILE = os.path.join(current_rep, "calendar.ui")
 
     MARK_DONE = _("Mark as Done")
     MARK_UNDONE = _("Mark as not Done")
 
=== modified file 'GTG/gtk/editor/calendar.py'
--- GTG/gtk/editor/calendar.py	2014-03-09 12:59:59 +0000
+++ GTG/gtk/editor/calendar.py	2014-03-23 12:58:31 +0000
@@ -19,8 +19,9 @@
 
 import datetime
 
-from gi.repository import GObject, Gdk
+from gi.repository import GObject, Gdk, Gtk
 
+from GTG.gtk.editor import GnomeConfig
 from GTG.tools.dates import Date
 
 
@@ -39,9 +40,10 @@
 
     __gsignals__ = {'date-changed': __signal_type__, }
 
-    def __init__(self, Gtk_builder):
+    def __init__(self):
         super(GTGCalendar, self).__init__()
-        self.__builder = Gtk_builder
+        self.__builder = Gtk.Builder()
+        self.__builder.add_from_file(GnomeConfig.CALENDAR_UI_FILE)
         self.__date_kind = None
         self.__date = Date.no_date()
         self.__init_gtk__()
@@ -117,9 +119,6 @@
         width, height = self.__window.get_size()
         self.move_calendar_inside(width, height, x, y)
         self.__window.show()
-        # some window managers ignore move before you show a window. (which
-        # ones? question by invernizzi)
-        self.move_calendar_inside(width, height, x, y)
         self.__window.grab_add()
 
         #We grab the pointer in the calendar
@@ -140,7 +139,10 @@
             0,
         )
 
-        self.__window.connect('button-press-event', self.__focus_out)
+        if self.get_decorated():
+            self.__window.connect("delete-event", self.close_calendar)
+        else:
+            self.__window.connect('button-press-event', self.__focus_out)
         self.__sigid = self.__calendar.connect("day-selected",
                                                self.__day_selected,
                                                "RealDate",)
@@ -172,6 +174,7 @@
         if self.__sigid_month is not None:
             self.__calendar.disconnect(self.__sigid_month)
             self.__sigid_month = None
+        return True
 
     def __day_selected(self, widget, date_type):
         if date_type == "RealDate":
 
=== added file 'GTG/gtk/editor/calendar.ui'
--- GTG/gtk/editor/calendar.ui	1970-01-01 00:00:00 +0000
+++ GTG/gtk/editor/calendar.ui	2014-03-23 12:58:31 +0000
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkWindow" id="calendar">
+    <property name="can_focus">False</property>
+    <property name="events">GDK_STRUCTURE_MASK | GDK_PROXIMITY_OUT_MASK</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="skip_pager_hint">True</property>
+    <child>
+      <object class="GtkBox" id="vbox5">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkCalendar" id="calendar1">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="fuzzydate_btns">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="homogeneous">True</property>
+            <child>
+              <object class="GtkButton" id="button_now">
+                <property name="label" translatable="yes">Now</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button_soon">
+                <property name="label" translatable="yes">Soon</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button_someday">
+                <property name="label" translatable="yes">Someday</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="button_clear">
+            <property name="label">gtk-clear</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="use_stock">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
 \ No newline at end of file
 
=== modified file 'GTG/gtk/editor/editor.py'
--- GTG/gtk/editor/editor.py	2014-03-11 01:37:13 +0000
+++ GTG/gtk/editor/editor.py	2014-03-23 12:58:31 +0000
@@ -119,7 +119,9 @@
         if conf_font_value != "":
             self.textview.override_font(Pango.FontDescription(conf_font_value))
         # Voila! it's done
-        self.calendar = GTGCalendar(self.builder)
+        self.calendar = GTGCalendar()
+        self.calendar.set_transient_for(self.window)
+        self.calendar.set_decorated(False)
         self.duedate_widget = self.builder.get_object("duedate_entry")
         self.startdate_widget = self.builder.get_object("startdate_entry")
         self.closeddate_widget = self.builder.get_object("closeddate_entry")
 
=== modified file 'GTG/gtk/editor/taskeditor.ui'
--- GTG/gtk/editor/taskeditor.ui	2014-03-05 19:25:18 +0000
+++ GTG/gtk/editor/taskeditor.ui	2014-03-23 12:58:31 +0000
@@ -403,99 +403,4 @@
       </object>
     </child>
   </object>
-  <object class="GtkWindow" id="calendar">
-    <property name="can_focus">False</property>
-    <property name="events">GDK_STRUCTURE_MASK | GDK_PROXIMITY_OUT_MASK</property>
-    <property name="type">popup</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="type_hint">dropdown-menu</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="skip_pager_hint">True</property>
-    <property name="transient_for">TaskEditor</property>
-    <child>
-      <object class="GtkBox" id="vbox5">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkCalendar" id="calendar1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="fuzzydate_btns">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="homogeneous">True</property>
-            <child>
-              <object class="GtkButton" id="button_now">
-                <property name="label" translatable="yes">Now</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button_soon">
-                <property name="label" translatable="yes">Soon</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button_someday">
-                <property name="label" translatable="yes">Someday</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="button_clear">
-            <property name="label">gtk-clear</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="use_stock">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
 </interface>