Merge lp:~mendymeng-1206/gtg/mendy into lp:~gtg/gtg/old-trunk

[Meng Meng]

This commit fixed the due date can be chosen before start date bug. Partially finished the custom date format setting feature.

Date format preference implemented. But currently only AU date format supported.
More related work need to be done in the future.

Due date cannot be set before start date. otherwise it will be set to the same date as the start date and the background of due date textbox will turn to green color to inform user the change.

[Izidor Matušov (izidor)]

I don't think we need date format preference in GTG. That information is already in the system as locale setting.

Adding preferences for all languages is really laborious work - somebody else has done it already as locales system. Please, rewrite your patch using the locale.

Few tips:
 - use %x to get dateformat as it is with locales
 - See this question if you have problems: http://stackoverflow.com/questions/3438120/python-date-formatted-with-x-locale-is-not-as-expected

Please resubmit the rewritten patch.

review: Needs Resubmitting (code review)

Unmerged revisions

1016. By Meng Meng on 2011-10-22

AU dateformat implemented

1015. By Meng Meng on 2011-10-22

try

1014. By Meng Meng on 2011-10-05

date format change not finished

1013. By Meng Meng on 2011-10-03

set red color to the text box if due date is before start date

=== modified file 'GTG/__init__.py'
--- GTG/__init__.py	2011-09-25 15:25:40 +0000
+++ GTG/__init__.py	2011-10-24 14:14:27 +0000
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 # -----------------------------------------------------------------------------
+# -----------------------------------------------------------------------------
 # Gettings Things Gnome! - a personal organizer for the GNOME desktop
 # Copyright (c) 2008-2009 - Lionel Dricot & Bertrand Rousseau
 #

=== modified file 'GTG/core/__init__.py'
--- GTG/core/__init__.py	2011-09-25 15:21:46 +0000
+++ GTG/core/__init__.py	2011-10-24 14:14:27 +0000
@@ -53,6 +53,7 @@
 'browser': {
             'bg_color_enable' : False,
             "contents_preview_enable" : False,
+            "AU_date_format_enable" : False,
             'tag_pane' : False,
             "sidebar_width": 120,
             "closed_task_pane" : False,

=== modified file 'GTG/gtk/browser/browser.py'
--- GTG/gtk/browser/browser.py	2011-10-08 22:28:53 +0000
+++ GTG/gtk/browser/browser.py	2011-10-24 14:14:27 +0000
@@ -1001,7 +1001,7 @@
     def on_edit_active_task(self, widget, row=None, col=None):
         tid = self.get_selected_task()
         if tid:
-            self.vmanager.open_task(tid)
+            self.vmanager.open_task(tid,config_priv = self.config) #TODO: self.config
 
     def on_edit_done_task(self, widget, row=None, col=None):
         tid = self.get_selected_task('closed')

=== modified file 'GTG/gtk/editor/editor.py'
--- GTG/gtk/editor/editor.py	2010-09-15 05:02:01 +0000
+++ GTG/gtk/editor/editor.py	2011-10-24 14:14:27 +0000
@@ -48,6 +48,7 @@
                  requester, 
                  vmanager, 
                  task, 
+                 globconfig,
                  taskconfig = None,
                  thisisnew = False,
                  clipboard = None) :
@@ -60,6 +61,7 @@
         self.req = requester
         self.vmanager = vmanager
         self.config = taskconfig
+        self.globconfig = globconfig
         self.time = None
         self.clipboard = clipboard
         self.builder = gtk.Builder()
@@ -278,16 +280,25 @@
 
         #refreshing the due date field
         duedate = self.task.get_due_date()
-        prevdate = dates.strtodate(self.duedate_widget.get_text())
-        if duedate != prevdate or type(duedate) is not type(prevdate):
+        #prevdate = dates.strtodate(self.duedate_widget.get_text())
+        #the changes made below is not good , just show we can set different date format
+        #if duedate != prevdate or type(duedate) is not type(prevdate):
+        #    zedate = str(duedate).replace("-", date_separator)
+        #    self.duedate_widget.set_text(zedate)
+        if self.globconfig.get("AU_date_format_enable"):
+            self.duedate_widget.set_text(duedate.to_py_date().strftime('%d/%h/%Y'))
+        else:
             zedate = str(duedate).replace("-", date_separator)
             self.duedate_widget.set_text(zedate)
         # refreshing the closed date field
         closeddate = self.task.get_closed_date()
-        prevcldate = dates.strtodate(self.closeddate_widget.get_text())
-        if closeddate != prevcldate or type(closeddate) is not type(prevcldate):
-            zecldate = str(closeddate).replace("-", date_separator)
-            self.closeddate_widget.set_text(zecldate)
+        #prevcldate = dates.strtodate(self.closeddate_widget.get_text())
+        #if closeddate != prevcldate or type(closeddate) is not type(prevcldate):
+        if self.globconfig.get("AU_date_format_enable"):
+            self.closeddate_widget.set_text(closeddate.to_py_date().strftime('%d/%h/%Y'))
+        else:
+            zedate = str(closeddate).replace("-", date_separator)
+            self.closeddate_widget.set_text(zedate)
         #refreshing the day left label
         #If the task is marked as done, we display the delay between the 
         #due date and the actual closing date. If the task isn't marked 
@@ -319,10 +330,14 @@
         self.dayleft_label.set_markup("<span color='"+color+"'>"+txt+"</span>")
 
         startdate = self.task.get_start_date()
-        prevdate = dates.strtodate(self.startdate_widget.get_text())
-        if startdate != prevdate or type(startdate) is not type(prevdate):
+        #prevdate = dates.strtodate(self.startdate_widget.get_text())
+        #if startdate != prevdate or type(startdate) is not type(prevdate):
+        if self.globconfig.get("AU_date_format_enable"):
+            self.startdate_widget.set_text(startdate.to_py_date().strftime('%d/%h/%Y'))
+        else:
             zedate = str(startdate).replace("-",date_separator)
             self.startdate_widget.set_text(zedate) 
+            
         #Refreshing the tag list in the insert tag button
         taglist = self.req.get_used_tags()
         menu = gtk.Menu()
@@ -345,13 +360,17 @@
             self.light_save()
 
     def date_changed(self,widget,data):
+        """we need to do some thing here , as the date text format has been changed"""
         text = widget.get_text()
         validdate = False
         if not text :
             validdate = True
             datetoset = dates.no_date
         else :
-            datetoset = dates.strtodate(text)
+            if self.globconfig.get("AU_date_format_enable"):
+                datetoset = dates.strtodate(text, "AU")
+            else :
+                datetoset = dates.strtodate(text)
             if datetoset :
                 validdate = True
 
@@ -371,7 +390,18 @@
             start_date = self.task.get_start_date()
             due_date = self.task.get_due_date()
             if start_date and (start_date > due_date):
-                self.task.set_due_date(self.task.get_start_date())
+                self.task.set_due_date(self.task.get_start_date()) 
+                # there may be problem here, as the view is different with model
+                # so set the text.
+                startdate = self.task.get_start_date()
+                if self.globconfig.get("AU_date_format_enable"):
+                    self.duedate_widget.set_text(startdate.to_py_date().strftime('%d/%h/%Y'))
+                else:
+                    zedate = str(startdate).replace("-",date_separator)
+                    self.duedate_widget.set_text(zedate) 
+                # in this case, set color to green to inform user that the due date is reseted to the same with start date
+                self.duedate_widget.modify_text(gtk.STATE_NORMAL, gtk.gdk.color_parse("#000"))
+                self.duedate_widget.modify_base(gtk.STATE_NORMAL, gtk.gdk.color_parse("#8F8"))
         else :
             #We should write in red in the entry if the date is not valid
             widget.modify_text(gtk.STATE_NORMAL, gtk.gdk.color_parse("#F00"))

=== modified file 'GTG/gtk/manager.py'
--- GTG/gtk/manager.py	2011-08-16 16:20:15 +0000
+++ GTG/gtk/manager.py	2011-10-24 14:14:27 +0000
@@ -147,7 +147,7 @@
         '''
         return self.opened_task
 
-    def open_task(self, uid,thisisnew = False):
+    def open_task(self, uid,thisisnew = False, config_priv = None):
         """Open the task identified by 'uid'.
 
         If a Task editor is already opened for a given task, we present it.
@@ -163,6 +163,7 @@
                 requester = self.req, \
                 vmanager = self, \
                 task = t, \
+                globconfig = config_priv, \
                 taskconfig = self.task_config, \
                 thisisnew = thisisnew,\
                 clipboard = self.clipboard)

=== modified file 'GTG/gtk/preferences.glade'
--- GTG/gtk/preferences.glade	2010-07-29 10:36:24 +0000
+++ GTG/gtk/preferences.glade	2011-10-24 14:14:27 +0000
@@ -113,6 +113,28 @@
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
+                                    
+                                    
+                                    
+                                    <child>
+                                      <object class="GtkCheckButton" id="pref_date_format">
+                                        <property name="label" translatable="yes">Use Australia date format "dd/mm/yy".</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="draw_indicator">True</property>
+                                        <signal name="toggled" handler="on_pref_date_format_toggled"/>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="padding">3</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    
+                                    
+                                    
+                                    
                                     <child>
                                       <object class="GtkHBox" id="prefs-hbox1">
                                         <property name="no_show_all">True</property>

=== modified file 'GTG/gtk/preferences.py'
--- GTG/gtk/preferences.py	2011-08-07 09:32:44 +0000
+++ GTG/gtk/preferences.py	2011-10-24 14:14:27 +0000
@@ -118,7 +118,8 @@
           'plugin_depends': 'PluginDepends',
           'plugin_config_dialog': 'PluginConfigDialog',
           'pref_autostart': 'pref_autostart',
-          'pref_show_preview': 'pref_show_preview'
+          'pref_show_preview': 'pref_show_preview',
+          'pref_date_format': 'pref_date_format'
           }
         for attr, widget in widgets.iteritems():
             setattr(self, attr, self.builder.get_object(widget))
@@ -176,6 +177,13 @@
         else:
             toset = 0
         self.pref_show_preview.set_active(toset)
+        
+        if self.config_priv.get("AU_date_format_enable"):
+            toset = 1
+        else:
+            toset = 0
+        self.pref_date_format.set_active(toset)
+        
 
 
     def _init_plugin_tree(self):
@@ -233,6 +241,8 @@
           # preferences on the Tasks tab
           'on_pref_show_preview_toggled':
             self.toggle_preview,
+          'on_pref_date_format_toggled':
+            self.toggle_date_format,
           'on_pref_check_spelling_toggled':
             self.toggle_spellcheck,
           # buttons on the Plugins tab
@@ -350,7 +360,12 @@
         self.config_priv.set("contents_preview_enable",widget.get_active())
         view = self.req.get_tasks_tree(refresh=False)
         view.refresh_all()
-
+        
+    def toggle_date_format(self, widget):
+        """use AU date format or not."""
+        self.config_priv.set("AU_date_format_enable",widget.get_active())
+        view = self.req.get_tasks_tree(refresh=False)
+        view.refresh_all()
     
     def toggle_spellcheck(self, widget):
         """Toggle spell checking on or off."""

=== modified file 'GTG/tools/dates.py'
--- GTG/tools/dates.py	2011-09-25 12:57:54 +0000
+++ GTG/tools/dates.py	2011-10-24 14:14:27 +0000
@@ -20,6 +20,7 @@
 from datetime import date, timedelta
 import locale
 import calendar
+import time
 from GTG import _, ngettext
 
 #setting the locale of gtg to the system locale 
@@ -133,7 +134,7 @@
 #function to convert a string of the form YYYY-MM-DD
 #to a date
 #If the date is not correct, the function returns None
-def strtodate(stri) :
+def strtodate(stri, dateformat="") :
     if stri == _("now") or stri == "now":
         return NOW
     elif stri == _("soon") or stri == "soon":
@@ -153,6 +154,11 @@
             y = zedate[0]
             m = zedate[1]
             d = zedate[2]
+            if dateformat == "AU": # Australia date format dd/mm/yy
+                t = time.strptime(stri, '%d/%b/%Y')
+                y = str(t.tm_year)
+                m = str(t.tm_mon)
+                d = str(t.tm_mday)
             if y.isdigit() and m.isdigit() and d.isdigit() :
                 yy = int(y)
                 mm = int(m)

=== removed file 'gtg'
--- gtg	2010-09-08 09:50:32 +0000
+++ gtg	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-#!/usr/bin/env python
-# -*- coding:utf-8 -*-
-
-# -----------------------------------------------------------------------------
-# Getting Things Gnome! - A personal organizer for the GNOME desktop
-# Copyright (c) 2008,2009,2010 Lionel Dricot & Bertrand Rousseau
-#
-# This program 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.
-#
-# This program 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
-# this program.  If not, see <http://www.gnu.org/licenses/>.
-# -----------------------------------------------------------------------------
-
-"""
-Getting Things Gnome! - A personal organizer for the GNOME desktop
-==================================================================
-
-:copyright: 2008,2009,2010 Lionel Dricot & Bertrand Rousseau
-:license: GNU General Public License, version 3 or later
-"""
-
-import sys
-from optparse import OptionParser
-
-
-def X_is_running():
-    from gtk.gdk import Screen
-    try:
-        if Screen().get_display():
-            return True
-    except RuntimeError:
-        pass
-    return False
-
-
-try:
-    parser = OptionParser()
-    parser.add_option('-b', '--boot-test', action='store_true', dest='boot_test',
-      help="Exit immediately after completing boot-up actions", default=False)
-    parser.add_option('-c', '--no-crash-handler', action='store_true', dest='no_crash_handler',
-      help="Disable the automatic crash handler", default=False)
-    parser.add_option('-d', '--debug', action='store_true', dest='debug',
-      help="Enable debug output", default=False)
-    parser.add_option('-v', '--version', action='store_true', dest='version_and_exit',
-      help="Print GTG's version number", default=False)
-    (options, args) = parser.parse_args()
-
-    if options.version_and_exit:
-        from GTG import info
-        print "gtg (Getting Things Gnome!) %s" %(info.VERSION)
-        print
-        print "For more information: %s" %(info.URL)
-        sys.exit(0)
-
-    elif not X_is_running():
-        print "Could not open X display"
-        sys.exit(1)
-
-    else:
-        import GTG.gtg
-        sys.exit(GTG.gtg.main(options, args))
-
-except KeyboardInterrupt:
-    sys.exit(1)

=== modified file 'test/data/bryce/xdg/config/gtg/gtg.conf'
--- test/data/bryce/xdg/config/gtg/gtg.conf	2010-06-16 07:54:55 +0000
+++ test/data/bryce/xdg/config/gtg/gtg.conf	2011-10-24 14:14:27 +0000
@@ -1,5 +1,6 @@
 [browser]
 contents_preview_enable = True
+AU_date_format_enable = True
 x_pos = 562
 collapsed_tags = ,
 tag_pane_width = 250