Merge lp:~rick-rickspencer3/pytask/date_column into lp:pytask

[Ryan Macnish]

[lp:~rick-rickspencer3/pytask/date_column]

77. By Ryan Macnish on 2010-05-18

fixed some conflicts.

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2010-05-18 13:41:11 +0000
@@ -0,0 +1,1 @@
+bin/pytaskc

=== modified file 'bin/pytask'
--- bin/pytask	2010-05-18 05:34:36 +0000
+++ bin/pytask	2010-05-18 13:41:11 +0000
@@ -107,7 +107,7 @@
         database_name = "pytask"
         keys = ["name","priority","due","complete?"]
         record_type = "url"
-        type_hints = {"due":DateColumn}
+        type_hints = {"due":DateColumn,"priority":IntegerColumn}
         self.grid = CouchGrid(database_name, record_type=record_type,keys=keys, 
                               editable=True, type_hints=type_hints)
 

=== modified file 'pytask/date_column.py'
--- pytask/date_column.py	2010-05-18 05:34:36 +0000
+++ pytask/date_column.py	2010-05-18 13:41:11 +0000
@@ -1,6 +1,7 @@
 
 import gobject
 import gtk
+import datetime
 from quickly.widgets.grid_column import StringColumn
 from quickly.widgets.grid_filter import StringFilterCombo
 
@@ -18,125 +19,158 @@
     default_filter = StringFilterCombo
 
     def __init__(self, key, index,dictionary_index, editable=True ):
-        """Creates a Date
-
-        Arguments:
-        key - the key from the dict for the row. Also used as the title for the
-        column by default.
-
-        index - the position of the column in the grid.
-
-        dictionary_index - the index in the ListStore where the dictionary
-        for the row is stored. Typically len(dict).
-
-        editable - False if the column does not allow the user to edit the
-        values in the column. Defaults to True.
-
-        """
-
-        StringColumn.__init__( self, key, index, dictionary_index, editable)
+          """Creates a Date
+
+          Arguments:
+          key - the key from the dict for the row. Also used as the title for the
+          column by default.
+
+          index - the position of the column in the grid.
+
+          dictionary_index - the index in the ListStore where the dictionary
+          for the row is stored. Typically len(dict).
+
+          editable - False if the column does not allow the user to edit the
+          values in the column. Defaults to True.
+
+          """
+          self._editable = editable
+          StringColumn.__init__( self, key, index, dictionary_index, editable)
+
 
     def _initialize_renderer( self, editable, index ):
-        """_initialize_renderer - internal function called to set up the
-        CellRenderer for the column.
-
-        arguments:
-
-        editable - True if the column should support user editing.
-
-        index - the position of the column in the grid
-
-        """
-
-        self.renderer = CellRendererDate()
-        self.renderer.connect("edited", self._cell_edited)
+          """_initialize_renderer - internal function called to set up the
+          CellRenderer for the column.
+
+          arguments:
+
+          editable - True if the column should support user editing.
+
+          index - the position of the column in the grid
+
+          """
+
+          self.renderer = CellRendererDate()
+          self.renderer.set_property('editable',self._editable)
+          self.renderer.connect("edited", self._cell_edited)
 
     def _cell_edited(self, cellrendererdate, path, new_date, data=None):
-        
-        iter = self.list_store.get_iter(path)
-        self.list_store.set_value(iter, self.index, self.display_val(new_date))
-        
-        dictionary = self.list_store.get_value(iter,self.dictionary_index)
-        dictionary[self.key] = self.real_val(new_date)
-        
+          iter = self.list_store.get_iter(path)
+          self.list_store.set_value(iter, self.index, self.display_val(new_date))
+          
+          dictionary = self.list_store.get_value(iter,self.dictionary_index)
+          dictionary[self.key] = self.real_val(new_date)
+          
     def display_val(self, val):
-        """display_val - takes a real value and returns the cooresponding
-        display value
-
-        arguments:
-
-        val - the real value to convert
-
-        """
-
-        return StringColumn.display_val(self, val)
+          """display_val - takes a real value and returns the cooresponding
+          display value
+
+          arguments:
+
+          val - the real value to convert
+
+          """
+
+          return StringColumn.display_val(self, val)
 
 
     def real_val(self, val):
-        """real_val - takes a display value and returns the cooresponding
-        real value.
-
-        arguments:
-
-        val - the display value to convert
-
-        """
-        return StringColumn.real_val(self, val)
-        
+          """real_val - takes a display value and returns the cooresponding
+          real value.
+
+          arguments:
+
+          val - the display value to convert
+
+          """
+          return StringColumn.real_val(self, val)
+          
 
     def default_display_val(self):
-        """default_dislay_val - return the value to display in the case
-        where there is no real value for the column for the row.
-
-        """
-
-        return ""
+          """default_dislay_val - return the value to display in the case
+          where there is no real value for the column for the row.
+
+          """
+
+          return ""
 
     def _cell_edited(self, cellrenderertext, path, new_text, data=None):
-        #get an iterator that points to the edited row
-        if self.list_store is not None:
-            iter = self.list_store.get_iter(path)
-            #update the ListStore with the new text
-            self.list_store.set_value(iter, self.index, self.display_val(new_text))
-            dictionary = self.list_store.get_value(iter,self.dictionary_index)
-            dictionary[self.key] = self.real_val(new_text)
-
+          #get an iterator that points to the edited row
+          if self.list_store is not None:
+                iter = self.list_store.get_iter(path)
+                #update the ListStore with the new text
+                self.list_store.set_value(iter, self.index, self.display_val(new_text))
+                dictionary = self.list_store.get_value(iter,self.dictionary_index)
+                dictionary[self.key] = self.real_val(new_text)
 
     def _sort_ascending(self, x, y):
-        return StringColumn._sort_ascending(self, x, y)
+          return StringColumn._sort_ascending(self, x, y)
 
     def _sort_descending(self, x, y):
+<<<<<<< TREE
         return StringColumn._sort_descending(self, x, y)
         
 class CellRendererDate(gtk.CellRendererText):
 
+=======
+          return StringColumn._sort_descending(self, x, y)
+          
+class CellRendererDate(gtk.CellRendererText):
+>>>>>>> MERGE-SOURCE
     __gtype_name__ = 'CellRendererDate'
 
     def __init__(self):
+<<<<<<< TREE
         gtk.CellRendererText.__init__(self)
         self.date_format = '%d/%m/%Y'
         self.calendar_window = None
         self.calendar = None
+=======
+        gtk.CellRendererText.__init__(self)
+        self.date_format = '%Y/%m/%d'
+        self.calendar_window = None
+        self.calendar = None
+>>>>>>> MERGE-SOURCE
 
     def _create_calendar(self, treeview):
-        self.calendar_window = gtk.Dialog(parent=treeview.get_toplevel())
-        self.calendar_window.action_area.hide()
-        self.calendar_window.set_decorated(False)
-        self.calendar_window.set_property('skip-taskbar-hint', True)
-    
-        self.calendar = gtk.Calendar()
-        self.calendar.display_options(gtk.CALENDAR_SHOW_DAY_NAMES | gtk.CALENDAR_SHOW_HEADING)
-        self.calendar.connect('day-selected-double-click', self._day_selected, None)
-        self.calendar.connect('key-press-event', self._day_selected)
-        self.calendar.connect('focus-out-event', self._selection_cancelled)
-        self.calendar_window.set_transient_for(None) # cancel the modality of dialog
-        self.calendar_window.vbox.pack_start(self.calendar)
-    
-        # necessary for getting the (width, height) of calendar_window
-        self.calendar.show()
-        self.calendar_window.realize()
+<<<<<<< TREE
+        self.calendar_window = gtk.Dialog(parent=treeview.get_toplevel())
+        self.calendar_window.action_area.hide()
+        self.calendar_window.set_decorated(False)
+        self.calendar_window.set_property('skip-taskbar-hint', True)
+    
+        self.calendar = gtk.Calendar()
+        self.calendar.display_options(gtk.CALENDAR_SHOW_DAY_NAMES | gtk.CALENDAR_SHOW_HEADING)
+        self.calendar.connect('day-selected-double-click', self._day_selected, None)
+        self.calendar.connect('key-press-event', self._day_selected)
+        self.calendar.connect('focus-out-event', self._selection_cancelled)
+        self.calendar_window.set_transient_for(None) # cancel the modality of dialog
+        self.calendar_window.vbox.pack_start(self.calendar)
+    
+        # necessary for getting the (width, height) of calendar_window
+        self.calendar.show()
+        self.calendar_window.realize()
+=======
+        self.calendar_window = gtk.Dialog(parent=treeview.get_toplevel())
+        self.calendar_window.action_area.hide()
+        self.calendar_window.set_decorated(False)
+        self.calendar_window.set_property('skip-taskbar-hint', True)
+
+        self.calendar = gtk.Calendar()
+        self.calendar.display_options(gtk.CALENDAR_SHOW_DAY_NAMES | gtk.CALENDAR_SHOW_HEADING)
+        self.calendar.connect('day-selected-double-click', self._day_selected, None)
+        self.calendar.connect('key-press-event', self._day_selected)
+        self.calendar.connect('focus-out-event', self._selection_cancelled)
+        self.calendar_window.set_transient_for(None) # cancel the modality of dialog
+        self.calendar_window.vbox.pack_start(self.calendar)
+
+        # necessary for getting the (width, height) of calendar_window
+        self.calendar.show()
+        self.calendar_window.realize()
+>>>>>>> MERGE-SOURCE
 
     def do_start_editing(self, event, treeview, path, background_area, cell_area, flags):
+<<<<<<< TREE
         if not self.get_property('editable'):
             return
 
@@ -153,6 +187,26 @@
             self.calendar.select_month(int(month), int(year))
             self.calendar.select_day(int(day))
             self.calendar.thaw()
+=======
+        if not self.get_property('editable'):
+            return
+
+        if not self.calendar_window:
+            self._create_calendar(treeview)
+
+        # select cell's previously stored date if any exists - or today
+        if self.get_property('text'):
+            date = datetime.datetime.strptime(self.get_property('text'), self.date_format)
+
+        else:
+            date = datetime.datetime.today()
+
+        self.calendar.freeze() # prevent flicker
+        (year, month, day) = (date.year, date.month - 1, date.day) # datetime's month starts from one
+        self.calendar.select_month(int(month), int(year))
+        self.calendar.select_day(int(day))
+        self.calendar.thaw()
+>>>>>>> MERGE-SOURCE
 
         # position the popup below the edited cell (and try hard to keep the popup within the toplevel window)
         (tree_x, tree_y) = treeview.get_bin_window().get_origin()
@@ -163,18 +217,34 @@
         self.calendar_window.move(x, y)
     
         response = self.calendar_window.run()
+        self.calendar_window.hide()
         if response == gtk.RESPONSE_OK:
+<<<<<<< TREE
           (year, month, day) = self.calendar.get_date()
           date = datetime.date(year, month + 1, day).strftime (self.date_format) # gtk.Calendar's month     starts from zero
           self.emit('edited', path, date)
           self.calendar_window.hide()
         return None # don't return any editable, our gtk.Dialog did the work already
+=======
+            (year, month, day) = self.calendar.get_date()
+            date = datetime.date(year, month + 1, day).strftime (self.date_format) # gtk.Calendar's month starts from zero
+            self.emit('edited', path, date)
+            
+            return None # don't return any editable, our gtk.Dialog did the work already
+>>>>>>> MERGE-SOURCE
 
     def _day_selected(self, calendar, event):
+<<<<<<< TREE
         # event == None for day selected via doubleclick
         if not event or event.type == gtk.gdk.KEY_PRESS and gtk.gdk.keyval_name(event.keyval) == 'Return':
             self.calendar_window.response(gtk.RESPONSE_OK)
         return True
+=======
+        # event == None for day selected via doubleclick
+        if not event or event.type == gtk.gdk.KEY_PRESS and gtk.gdk.keyval_name(event.keyval) == 'Return':
+            self.calendar_window.response(gtk.RESPONSE_OK)
+            return True
+>>>>>>> MERGE-SOURCE
 
     def _selection_cancelled(self, calendar, event):
         self.calendar_window.response(gtk.RESPONSE_CANCEL)