Merge lp:~gtg-user/gtg/urgency-color-api into lp:~gtg/gtg/old-trunk

[Wolter HV]

Merged branch ~gtg-user/gtg/urgency-color-api to fix bug #1002160

This merge proposal will add a fix to the bug #1002160. The branch only modifies the Urgency Color plugin, so it shouldn't be create conflicts.

[Bertrand Rousseau (bertrand-rousseau)]

Hi Wolter,

Thanks a lot for your patch!

There seems to be an issue with your branch: every *.py scripts have been marked as executable. This is not the case in trunk. Could you please fix this?

review: Needs Fixing (code, run)

[Wolter HV (wolterh)]

Should I run a chmod -x to every python script?

[Bertrand Rousseau (bertrand-rousseau)]

Only those originally marked as executable should stay as such.

On Wed, May 23, 2012 at 7:06 AM, Wolter Hellmund <email address hidden> wrote:
> Should I run a chmod -x to every python script?
>
> --
> https://code.launchpad.net/~gtg-user/gtg/urgency-color-api/+merge/106581
> You are reviewing the proposed merge of lp:~gtg-user/gtg/urgency-color-api into lp:gtg.

--
Bertrand Rousseau

[lp:~gtg-user/gtg/urgency-color-api]

1185. By Wolter HV on 2012-05-23

Attempted to fix file permissions on Bertrand Rousseau's request (Great catch! A lot of the files had different permissions because I had branched on NTFS which doesn't support linux permissions). Did so: 1. Branched lp:gtg on an ext4 FS. 2. Copied the plugin files to this new branch. 3. Corrected the permissions on the copied files. 4. Tested. 5. Comitting now.

[Wolter HV (wolterh)]

Ok I now know what was happening. I had been working on an NTFS partition, which doesn't support Linux partitions, so all the branch's permissions were ignored and modified. I bet not only python scripts' permissions were modified.

I have moved my workspace to an ext4 filesystem and attempted to fix the problem. I tried to fix the problem (please check if I did a good job or if its still not done) and included a little explanation in the commit message.

[lp:~gtg-user/gtg/urgency-color-api]

1186. By Wolter HV on 2012-05-23

Removed patch filename from the .bzrignore list (which already ignores patches, thus the line was superfluous)

[Izidor Matušov (izidor)]

=== modified file '.bzrignore' (properties changed: -x to +x)

.bzignore has still +x, please remove it. Otherwise it looks good to me and it could be merged.

review: Approve (code)

[lp:~gtg-user/gtg/urgency-color-api]

1187. By Wolter HV on 2012-05-26

.bzrignore permissions restored as suggested by izidor

[Wolter HV (wolterh)]

Bertrand so you think the branch is ready for merging?

[Bertrand Rousseau (bertrand-rousseau)]

Hi,

I approve the code. I also made it run successfully.

I have a small remark, though: you changed the color labels to priority labels in the code (red, yellow, green, to high, low, med). It's a good idea, but could you also update the comments as well, so that the code is consistent?

review: Needs Fixing

[Wolter HV (wolterh)]

Ok, I had forgot about that! Thanks for reminding.

[lp:~gtg-user/gtg/urgency-color-api]

1188. By Wolter HV on 2012-06-10

Updated a couple of comments replacing color references with urgency references as to satisfy Bertrand's suggestion

[Wolter HV (wolterh)]

I corrected the comments, if there is anything else needed before the plugin can be merged let me know!

[Bertrand Rousseau (bertrand-rousseau)]

Yes, there are still comments to update in prefs_update_widgets()

review: Needs Fixing

[lp:~gtg-user/gtg/urgency-color-api]

1189. By Wolter HV on 2012-07-13

Fixed a last triplet of comments that referenced urgency status by color

[Wolter HV (wolterh)]

> Yes, there are still comments to update in prefs_update_widgets()

Next time I'll do a case insensitive search :) Fixed.

[Bertrand Rousseau (bertrand-rousseau)]

Ok. Approve.

review: Approve

=== modified file 'GTG/plugins/urgency_color/preferences.ui'
--- GTG/plugins/urgency_color/preferences.ui	2012-03-05 15:23:05 +0000
+++ GTG/plugins/urgency_color/preferences.ui	2012-07-13 17:03:24 +0000
@@ -111,17 +111,55 @@
                     <property name="can_focus">False</property>
                     <property name="spacing">5</property>
                     <child>
-                      <object class="GtkHBox" id="hbox_colors_red">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkColorButton" id="colorbutton_red">
-                            <property name="use_action_appearance">False</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="use_action_appearance">False</property>
-                            <signal name="color-set" handler="on_prefs_colorbutton_red_changed" swapped="no"/>
+                      <object class="GtkHBox" id="hbox_colors_overdue">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkColorButton" id="colorbutton_overdue">
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="use_action_appearance">False</property>
+                            <signal name="color-set" handler="on_prefs_colorbutton_overdue_changed" swapped="no"/>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label20">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Overdue</property>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkHBox" id="hbox_colors_high">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkColorButton" id="colorbutton_high">
+                            <property name="use_action_appearance">False</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="use_action_appearance">False</property>
+                            <signal name="color-set" handler="on_prefs_colorbutton_high_changed" swapped="no"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -133,7 +171,7 @@
                           <object class="GtkLabel" id="label5">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">In danger zone</property>
+                            <property name="label" translatable="yes">High</property>
                           </object>
                           <packing>
                             <property name="expand">True</property>
@@ -145,21 +183,21 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">0</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkHBox" id="hbox_colors_yellow">
+                      <object class="GtkHBox" id="hbox_colors_normal">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
-                          <object class="GtkColorButton" id="colorbutton_yellow">
+                          <object class="GtkColorButton" id="colorbutton_normal">
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="use_action_appearance">False</property>
-                            <signal name="color-set" handler="on_prefs_colorbutton_yellow_changed" swapped="no"/>
+                            <signal name="color-set" handler="on_prefs_colorbutton_normal_changed" swapped="no"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -171,7 +209,7 @@
                           <object class="GtkLabel" id="label6">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Should work on it</property>
+                            <property name="label" translatable="yes">Normal</property>
                           </object>
                           <packing>
                             <property name="expand">True</property>
@@ -183,21 +221,21 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">1</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkHBox" id="hbox_colors_green">
+                      <object class="GtkHBox" id="hbox_colors_low">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
-                          <object class="GtkColorButton" id="colorbutton_green">
+                          <object class="GtkColorButton" id="colorbutton_low">
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="use_action_appearance">False</property>
-                            <signal name="color-set" handler="on_prefs_colorbutton_green_changed" swapped="no"/>
+                            <signal name="color-set" handler="on_prefs_colorbutton_low_changed" swapped="no"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -209,7 +247,7 @@
                           <object class="GtkLabel" id="label7">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Don't worry about it</property>
+                            <property name="label" translatable="yes">Low</property>
                           </object>
                           <packing>
                             <property name="expand">True</property>
@@ -221,7 +259,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">2</property>
+                        <property name="position">3</property>
                       </packing>
                     </child>
                   </object>
@@ -232,7 +270,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">&lt;b&gt;Colors&lt;/b&gt;</property>
+                <property name="label" translatable="yes">&lt;b&gt;Urgency level color&lt;/b&gt;</property>
                 <property name="use_markup">True</property>
               </object>
             </child>

=== modified file 'GTG/plugins/urgency_color/urgency_color.py'
--- GTG/plugins/urgency_color/urgency_color.py	2012-05-02 08:49:19 +0000
+++ GTG/plugins/urgency_color/urgency_color.py	2012-07-13 17:03:24 +0000
@@ -26,9 +26,10 @@
     PLUGIN_NAME = 'Urgency Color'
     DEFAULT_PREFS = {
         'reddays': 30,
-        'color_green': '#cfff84',
-        'color_yellow': '#ffed84',
-        'color_red': '#ff9784'}
+        'color_low': '#cfff84',
+        'color_normal': '#ffed84',
+        'color_high': '#ff9784',
+        'color_overdue': '#b8b8b8'}
 
     def __init__(self):
         self._plugin_api = None
@@ -41,15 +42,20 @@
         self.prefs_load()
         self.prefs_init()
         # Set color function
+        self._refresh_task_color()
+
+    def _refresh_task_color(self):
         self._plugin_api.set_bgcolor_func(self.bgcolor)
 
     def _get_color(self, colindex):
         if colindex == 0:
-            return self._pref_data['color_green']
+            return self._pref_data['color_low']
         elif colindex == 1:
-            return self._pref_data['color_yellow']
+            return self._pref_data['color_normal']
         elif colindex == 2:
-            return self._pref_data['color_red']
+            return self._pref_data['color_high']
+        elif colindex == 3:
+            return self._pref_data['color_overdue']
         else:
             return None
 
@@ -67,6 +73,8 @@
                 color = 1
             if daysleft <= reddays:
                 color = 2
+            if daysleft < 0:
+                color = 3
             # This list should be implemented in the settings
             #print "Giving color"
             return self._get_color(color)
@@ -106,14 +114,17 @@
         #   Spin button
         self.spinbutton_reddays = self.builder.get_object('spinbutton_reddays')
 
-        #   Colorbutton - RED
-        self.colorbutton_red = self.builder.get_object('colorbutton_red')
-
-        #   Colorbutton - YELLOW
-        self.colorbutton_yellow = self.builder.get_object('colorbutton_yellow')
-
-        #   Colorbutton - GREEN
-        self.colorbutton_green = self.builder.get_object('colorbutton_green')
+        #   Colorbutton - OVERDUE
+        self.colorbutton_overdue = self.builder.get_object('colorbutton_overdue')
+
+        #   Colorbutton - HIGH
+        self.colorbutton_high = self.builder.get_object('colorbutton_high')
+
+        #   Colorbutton - NORMAL
+        self.colorbutton_normal = self.builder.get_object('colorbutton_normal')
+
+        #   Colorbutton - LOW
+        self.colorbutton_low = self.builder.get_object('colorbutton_low')
 
         #   Buttons
         self.button_apply = self.builder.get_object('button_apply')
@@ -132,27 +143,32 @@
                 self.on_prefs_reset,
             'on_prefs_spinbutton_reddays_changed':
                 self.on_prefs_spinbutton_reddays_changed,
-            'on_prefs_colorbutton_red_changed':
-                self.on_prefs_colorbutton_red_changed,
-            'on_prefs_colorbutton_yellow_changed':
-                self.on_prefs_colorbutton_yellow_changed,
-            'on_prefs_colorbutton_green_changed':
-                self.on_prefs_colorbutton_green_changed}
+            'on_prefs_colorbutton_overdue_changed':
+                self.on_prefs_colorbutton_overdue_changed,
+            'on_prefs_colorbutton_high_changed':
+                self.on_prefs_colorbutton_high_changed,
+            'on_prefs_colorbutton_normal_changed':
+                self.on_prefs_colorbutton_normal_changed,
+            'on_prefs_colorbutton_low_changed':
+                self.on_prefs_colorbutton_low_changed}
         self.builder.connect_signals(SIGNAL_CONNECTIONS_DIC)
 
     def prefs_update_widgets(self):
         """ Synchronizes the widgets with the data in _pref_data """
         # Spin button
         self.spinbutton_reddays.set_value(self._pref_data['reddays'])
-        # Colorbutton - RED
-        self.colorbutton_red.set_color( \
-            gtk.gdk.color_parse(self._pref_data['color_red']))
-        # Colorbutton - YELLOW
-        self.colorbutton_yellow.set_color( \
-            gtk.gdk.color_parse(self._pref_data['color_yellow']))
-        # Colorbutton - GREEN
-        self.colorbutton_green.set_color( \
-            gtk.gdk.color_parse(self._pref_data['color_green']))
+        # Colorbutton - OVERDUE
+        self.colorbutton_overdue.set_color( \
+            gtk.gdk.color_parse(self._pref_data['color_overdue']))
+        # Colorbutton - HIGH
+        self.colorbutton_high.set_color( \
+            gtk.gdk.color_parse(self._pref_data['color_high']))
+        # Colorbutton - NORMAL
+        self.colorbutton_normal.set_color( \
+            gtk.gdk.color_parse(self._pref_data['color_normal']))
+        # Colorbutton - LOW
+        self.colorbutton_low.set_color( \
+            gtk.gdk.color_parse(self._pref_data['color_low']))
 
     def on_prefs_cancel(self, widget=None, data=None):
         self.prefs_update_widgets()
@@ -162,6 +178,7 @@
     def on_prefs_apply(self, widget=None, data=None):
         self._pref_data = self._pref_data_potential
         self.prefs_store()
+        self._refresh_task_color()
         self.prefs_window.hide()
 
     def on_prefs_reset(self, widget=None, data=None):
@@ -176,7 +193,21 @@
         if not data or not isinstance(data, dict):
             self._pref_data = dict(self.DEFAULT_PREFS)
         else:
-            self._pref_data = data
+            # CORRECT NAMES FROM OLD PREFERENCES
+            # This is a dirty fix and thus should be removed in a
+            # distant future, when nobody has "red", "yellow" or "green"
+            # settings
+            namepairs = {'red':'high','yellow':'normal','green':'low'}
+            for key,val in data.iteritems():
+                for oldname,newname in namepairs.iteritems():
+                    if key == "color_"+oldname:
+                        data['color_'+newname] = data.pop(key)
+            # Add new preferences where not present
+            for setting in self.DEFAULT_PREFS.iterkeys():
+                if setting not in data:
+                    data[setting] = self.DEFAULT_PREFS[setting]
+            self._pref_data = dict(data)
+
 
     def prefs_store(self):
         self._plugin_api.save_configuration_object( \
@@ -188,14 +219,18 @@
         self._pref_data_potential['reddays'] = \
             self.spinbutton_reddays.get_value()
 
-    def on_prefs_colorbutton_red_changed(self, widget=None, data=None):
-        self._pref_data_potential['color_red'] = \
-            self.colorbutton_red.get_color().to_string()
-
-    def on_prefs_colorbutton_yellow_changed(self, widget=None, data=None):
-        self._pref_data_potential['color_yellow'] = \
-            self.colorbutton_yellow.get_color().to_string()
-
-    def on_prefs_colorbutton_green_changed(self, widget=None, data=None):
-        self._pref_data_potential['color_green'] = \
-            self.colorbutton_green.get_color().to_string()
+    def on_prefs_colorbutton_overdue_changed(self, widget=None, data=None):
+        self._pref_data_potential['color_overdue'] = \
+            self.colorbutton_overdue.get_color().to_string()
+
+    def on_prefs_colorbutton_high_changed(self, widget=None, data=None):
+        self._pref_data_potential['color_high'] = \
+            self.colorbutton_high.get_color().to_string()
+
+    def on_prefs_colorbutton_normal_changed(self, widget=None, data=None):
+        self._pref_data_potential['color_normal'] = \
+            self.colorbutton_normal.get_color().to_string()
+
+    def on_prefs_colorbutton_low_changed(self, widget=None, data=None):
+        self._pref_data_potential['color_low'] = \
+            self.colorbutton_low.get_color().to_string()