gtg-user team mailing list archive
-
gtg-user team
-
Mailing list archive
-
Message #00426
[Merge] lp:~gtg-user/gtg/urgency-color-api into lp:gtg
Wolter Hellmund has proposed merging lp:~gtg-user/gtg/urgency-color-api into lp:gtg.
Requested reviews:
Izidor Matušov (izidor)
Related bugs:
Bug #906516 in Getting Things GNOME!: "Task urgency color coding"
https://bugs.launchpad.net/gtg/+bug/906516
For more details, see:
https://code.launchpad.net/~gtg-user/gtg/urgency-color-api/+merge/106581
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.
--
https://code.launchpad.net/~gtg-user/gtg/urgency-color-api/+merge/106581
Your team Gtg users is subscribed to branch lp:~gtg-user/gtg/urgency-color-api.
=== modified file '.bzrignore' (properties changed: -x to +x)
--- .bzrignore 2012-03-22 13:21:52 +0000
+++ .bzrignore 2012-05-21 08:19:20 +0000
@@ -12,3 +12,4 @@
MANIFEST
**.patch
gtg.prof
+overdue_task.patch
=== modified file 'AUTHORS' (properties changed: -x to +x)
=== modified file 'CHANGELOG' (properties changed: -x to +x)
=== modified file 'GTG/__init__.py' (properties changed: -x to +x)
=== modified file 'GTG/backends/__init__.py' (properties changed: -x to +x)
=== modified file 'GTG/backends/backend_evolution.py' (properties changed: -x to +x)
=== modified file 'GTG/backends/backend_gnote.py' (properties changed: -x to +x)
=== modified file 'GTG/backends/backend_identica.py' (properties changed: -x to +x)
=== modified file 'GTG/backends/backend_launchpad.py' (properties changed: -x to +x)
=== modified file 'GTG/backends/backend_localfile.py' (properties changed: -x to +x)
=== modified file 'GTG/backends/backend_mantis.py' (properties changed: -x to +x)
=== modified file 'GTG/backends/backend_rtm.py' (properties changed: -x to +x)
=== modified file 'GTG/backends/backend_tomboy.py' (properties changed: -x to +x)
=== modified file 'GTG/backends/backend_twitter.py' (properties changed: -x to +x)
=== modified file 'GTG/backends/backendsignals.py' (properties changed: -x to +x)
=== modified file 'GTG/backends/genericbackend.py' (properties changed: -x to +x)
=== modified file 'GTG/backends/generictomboy.py' (properties changed: -x to +x)
=== modified file 'GTG/backends/periodicimportbackend.py' (properties changed: -x to +x)
=== modified file 'GTG/backends/rtm/__init__.py' (properties changed: -x to +x)
=== modified file 'GTG/backends/syncengine.py' (properties changed: -x to +x)
=== modified file 'GTG/backends/tweepy/__init__.py' (properties changed: -x to +x)
=== modified file 'GTG/backends/tweepy/api.py' (properties changed: -x to +x)
=== modified file 'GTG/backends/tweepy/auth.py' (properties changed: -x to +x)
=== modified file 'GTG/backends/tweepy/binder.py' (properties changed: -x to +x)
=== modified file 'GTG/backends/tweepy/cache.py' (properties changed: -x to +x)
=== modified file 'GTG/backends/tweepy/cursor.py' (properties changed: -x to +x)
=== modified file 'GTG/backends/tweepy/error.py' (properties changed: -x to +x)
=== modified file 'GTG/backends/tweepy/models.py' (properties changed: -x to +x)
=== modified file 'GTG/backends/tweepy/oauth.py' (properties changed: -x to +x)
=== modified file 'GTG/backends/tweepy/parsers.py' (properties changed: -x to +x)
=== modified file 'GTG/backends/tweepy/streaming.py' (properties changed: -x to +x)
=== modified file 'GTG/backends/tweepy/utils.py' (properties changed: -x to +x)
=== modified file 'GTG/core/__init__.py' (properties changed: -x to +x)
=== modified file 'GTG/core/datastore.py' (properties changed: -x to +x)
=== modified file 'GTG/core/firstrun_tasks.py' (properties changed: -x to +x)
=== modified file 'GTG/core/plugins/__init__.py' (properties changed: -x to +x)
=== modified file 'GTG/core/plugins/api.py' (properties changed: -x to +x)
=== modified file 'GTG/core/plugins/engine.py' (properties changed: -x to +x)
=== modified file 'GTG/core/requester.py' (properties changed: -x to +x)
=== modified file 'GTG/core/search.py' (properties changed: -x to +x)
=== modified file 'GTG/core/tag.py' (properties changed: -x to +x)
=== modified file 'GTG/core/task.py' (properties changed: -x to +x)
=== modified file 'GTG/core/treefactory.py' (properties changed: -x to +x)
=== modified file 'GTG/gtg.py' (properties changed: -x to +x)
=== modified file 'GTG/gtk/__init__.py' (properties changed: -x to +x)
=== modified file 'GTG/gtk/backends_dialog.glade' (properties changed: -x to +x)
=== modified file 'GTG/gtk/backends_dialog/__init__.py' (properties changed: -x to +x)
=== modified file 'GTG/gtk/backends_dialog/addpanel.py' (properties changed: -x to +x)
=== modified file 'GTG/gtk/backends_dialog/backendscombo.py' (properties changed: -x to +x)
=== modified file 'GTG/gtk/backends_dialog/backendstree.py' (properties changed: -x to +x)
=== modified file 'GTG/gtk/backends_dialog/configurepanel.py' (properties changed: -x to +x)
=== modified file 'GTG/gtk/backends_dialog/parameters_ui/__init__.py' (properties changed: -x to +x)
=== modified file 'GTG/gtk/backends_dialog/parameters_ui/checkboxui.py' (properties changed: -x to +x)
=== modified file 'GTG/gtk/backends_dialog/parameters_ui/importtagsui.py' (properties changed: -x to +x)
=== modified file 'GTG/gtk/backends_dialog/parameters_ui/passwordui.py' (properties changed: -x to +x)
=== modified file 'GTG/gtk/backends_dialog/parameters_ui/pathui.py' (properties changed: -x to +x)
=== modified file 'GTG/gtk/backends_dialog/parameters_ui/periodui.py' (properties changed: -x to +x)
=== modified file 'GTG/gtk/backends_dialog/parameters_ui/textui.py' (properties changed: -x to +x)
=== modified file 'GTG/gtk/browser/CellRendererTags.py' (properties changed: -x to +x)
=== modified file 'GTG/gtk/browser/__init__.py' (properties changed: -x to +x)
=== modified file 'GTG/gtk/browser/browser.py' (properties changed: -x to +x)
=== modified file 'GTG/gtk/browser/custominfobar.py' (properties changed: -x to +x)
=== modified file 'GTG/gtk/browser/modifytags_dialog.glade' (properties changed: -x to +x)
=== modified file 'GTG/gtk/browser/modifytags_dialog.py' (properties changed: -x to +x)
=== modified file 'GTG/gtk/browser/simple_color_selector.py' (properties changed: -x to +x)
=== modified file 'GTG/gtk/browser/tag_context_menu.py' (properties changed: -x to +x)
=== modified file 'GTG/gtk/browser/tag_editor.py' (properties changed: -x to +x)
=== modified file 'GTG/gtk/browser/taskbrowser.glade' (properties changed: -x to +x)
=== modified file 'GTG/gtk/browser/treeview_factory.py' (properties changed: -x to +x)
=== modified file 'GTG/gtk/colors.py' (properties changed: -x to +x)
=== modified file 'GTG/gtk/crashhandler.py' (properties changed: -x to +x)
=== modified file 'GTG/gtk/dbuswrapper.py' (properties changed: -x to +x)
=== modified file 'GTG/gtk/delete_dialog.py' (properties changed: -x to +x)
=== modified file 'GTG/gtk/deletion.glade' (properties changed: -x to +x)
=== modified file 'GTG/gtk/editor/__init__.py' (properties changed: -x to +x)
=== modified file 'GTG/gtk/editor/calendar.py' (properties changed: -x to +x)
=== modified file 'GTG/gtk/editor/editor.py' (properties changed: -x to +x)
=== modified file 'GTG/gtk/editor/taskeditor.glade' (properties changed: -x to +x)
=== modified file 'GTG/gtk/editor/taskview.py' (properties changed: -x to +x)
=== modified file 'GTG/gtk/editor/taskviewserial.py' (properties changed: -x to +x)
=== modified file 'GTG/gtk/manager.py' (properties changed: -x to +x)
=== modified file 'GTG/gtk/preferences.glade' (properties changed: -x to +x)
=== modified file 'GTG/gtk/preferences.py' (properties changed: -x to +x)
=== modified file 'GTG/gtk/tag_completion.py' (properties changed: -x to +x)
=== modified file 'GTG/info.py' (properties changed: -x to +x)
=== modified file 'GTG/plugins/__init__.py' (properties changed: -x to +x)
=== modified file 'GTG/plugins/bugzilla.gtg-plugin' (properties changed: -x to +x)
=== modified file 'GTG/plugins/bugzilla/__init__.py' (properties changed: -x to +x)
=== modified file 'GTG/plugins/bugzilla/bug.py' (properties changed: -x to +x)
=== modified file 'GTG/plugins/bugzilla/bugzilla.py' (properties changed: -x to +x)
=== modified file 'GTG/plugins/bugzilla/server.py' (properties changed: -x to +x)
=== modified file 'GTG/plugins/export.gtg-plugin' (properties changed: -x to +x)
=== modified file 'GTG/plugins/export/__init__.py' (properties changed: -x to +x)
=== modified file 'GTG/plugins/export/export.py' (properties changed: -x to +x)
=== modified file 'GTG/plugins/export/export.ui' (properties changed: -x to +x)
=== modified file 'GTG/plugins/export/export_templates/description_pocketmod.py' (properties changed: -x to +x)
=== modified file 'GTG/plugins/export/export_templates/description_sexy.py' (properties changed: -x to +x)
=== modified file 'GTG/plugins/export/export_templates/description_simple.py' (properties changed: -x to +x)
=== modified file 'GTG/plugins/export/export_templates/description_statusrpt.py' (properties changed: -x to +x)
=== modified file 'GTG/plugins/export/export_templates/description_textual.py' (properties changed: -x to +x)
=== modified file 'GTG/plugins/export/export_templates/graphics_pocketmod.svg' (properties changed: -x to +x)
=== modified file 'GTG/plugins/export/export_templates/template_pocketmod.tex' (properties changed: -x to +x)
=== modified file 'GTG/plugins/export/export_templates/template_sexy.html' (properties changed: -x to +x)
=== modified file 'GTG/plugins/export/export_templates/template_simple.html' (properties changed: -x to +x)
=== modified file 'GTG/plugins/export/export_templates/template_statusrpt.txt' (properties changed: -x to +x)
=== modified file 'GTG/plugins/export/export_templates/template_textual.txt' (properties changed: -x to +x)
=== modified file 'GTG/plugins/export/export_templates/thumbnail_pocketmod.png' (properties changed: -x to +x)
=== modified file 'GTG/plugins/export/export_templates/thumbnail_sexy.png' (properties changed: -x to +x)
=== modified file 'GTG/plugins/export/export_templates/thumbnail_simple.png' (properties changed: -x to +x)
=== modified file 'GTG/plugins/export/export_templates/thumbnail_statusrpt.png' (properties changed: -x to +x)
=== modified file 'GTG/plugins/export/export_templates/thumbnail_textual.png' (properties changed: -x to +x)
=== modified file 'GTG/plugins/export/task_str.py' (properties changed: -x to +x)
=== modified file 'GTG/plugins/export/templates.py' (properties changed: -x to +x)
=== modified file 'GTG/plugins/geolocalized-tasks.gtg-plugin' (properties changed: -x to +x)
=== modified file 'GTG/plugins/geolocalized_tasks/__init__.py' (properties changed: -x to +x)
=== modified file 'GTG/plugins/geolocalized_tasks/geolocalized.glade' (properties changed: -x to +x)
=== modified file 'GTG/plugins/geolocalized_tasks/geolocalized_tasks.py' (properties changed: -x to +x)
=== modified file 'GTG/plugins/geolocalized_tasks/icons/hicolor/16x16/assign-location.png' (properties changed: -x to +x)
=== modified file 'GTG/plugins/geolocalized_tasks/icons/hicolor/24x24/geolocalization.png' (properties changed: -x to +x)
=== modified file 'GTG/plugins/geolocalized_tasks/icons/hicolor/svg/assign-location.svg' (properties changed: -x to +x)
=== modified file 'GTG/plugins/geolocalized_tasks/icons/hicolor/svg/geolocalization.svg' (properties changed: -x to +x)
=== modified file 'GTG/plugins/geolocalized_tasks/marker.py' (properties changed: -x to +x)
=== modified file 'GTG/plugins/hamster.gtg-plugin' (properties changed: -x to +x)
=== modified file 'GTG/plugins/hamster/__init__.py' (properties changed: -x to +x)
=== modified file 'GTG/plugins/hamster/hamster.py' (properties changed: -x to +x)
=== modified file 'GTG/plugins/hamster/prefs.ui' (properties changed: -x to +x)
=== modified file 'GTG/plugins/notification-area.gtg-plugin' (properties changed: -x to +x)
=== modified file 'GTG/plugins/notification_area/__init__.py' (properties changed: -x to +x)
=== modified file 'GTG/plugins/notification_area/notification_area.py' (properties changed: -x to +x)
=== modified file 'GTG/plugins/notification_area/notification_area.ui' (properties changed: -x to +x)
=== modified file 'GTG/plugins/send-email.gtg-plugin' (properties changed: -x to +x)
=== modified file 'GTG/plugins/send_email/__init__.py' (properties changed: -x to +x)
=== modified file 'GTG/plugins/send_email/sendEmail.py' (properties changed: -x to +x)
=== modified file 'GTG/plugins/task-reaper.gtg-plugin' (properties changed: -x to +x)
=== modified file 'GTG/plugins/task_reaper/__init__.py' (properties changed: -x to +x)
=== modified file 'GTG/plugins/task_reaper/reaper.py' (properties changed: -x to +x)
=== modified file 'GTG/plugins/task_reaper/reaper.ui' (properties changed: -x to +x)
=== modified file 'GTG/plugins/tomboy.gtg-plugin' (properties changed: -x to +x)
=== modified file 'GTG/plugins/tomboy/__init__.py' (properties changed: -x to +x)
=== modified file 'GTG/plugins/tomboy/combobox_enhanced.py' (properties changed: -x to +x)
=== modified file 'GTG/plugins/tomboy/tomboy.py' (properties changed: -x to +x)
=== modified file 'GTG/plugins/tomboy/tomboy.ui' (properties changed: -x to +x)
=== modified file 'GTG/plugins/urgency-color.gtg-plugin' (properties changed: -x to +x)
=== modified file 'GTG/plugins/urgency_color/__init__.py' (properties changed: -x to +x)
=== modified file 'GTG/plugins/urgency_color/preferences.ui' (properties changed: -x to +x)
--- GTG/plugins/urgency_color/preferences.ui 2012-03-05 15:23:05 +0000
+++ GTG/plugins/urgency_color/preferences.ui 2012-05-21 08:19:20 +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"><b>Colors</b></property>
+ <property name="label" translatable="yes"><b>Urgency level color</b></property>
<property name="use_markup">True</property>
</object>
</child>
=== modified file 'GTG/plugins/urgency_color/urgency_color.py' (properties changed: -x to +x)
--- GTG/plugins/urgency_color/urgency_color.py 2012-05-02 08:49:19 +0000
+++ GTG/plugins/urgency_color/urgency_color.py 2012-05-21 08:19:20 +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 - OVERDUE
+ self.colorbutton_overdue = self.builder.get_object('colorbutton_overdue')
+
# Colorbutton - RED
- self.colorbutton_red = self.builder.get_object('colorbutton_red')
+ self.colorbutton_high = self.builder.get_object('colorbutton_high')
# Colorbutton - YELLOW
- self.colorbutton_yellow = self.builder.get_object('colorbutton_yellow')
+ self.colorbutton_normal = self.builder.get_object('colorbutton_normal')
# Colorbutton - GREEN
- self.colorbutton_green = self.builder.get_object('colorbutton_green')
+ 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 - OVERDUE
+ self.colorbutton_overdue.set_color( \
+ gtk.gdk.color_parse(self._pref_data['color_overdue']))
# Colorbutton - RED
- self.colorbutton_red.set_color( \
- gtk.gdk.color_parse(self._pref_data['color_red']))
+ self.colorbutton_high.set_color( \
+ gtk.gdk.color_parse(self._pref_data['color_high']))
# Colorbutton - YELLOW
- self.colorbutton_yellow.set_color( \
- gtk.gdk.color_parse(self._pref_data['color_yellow']))
+ self.colorbutton_normal.set_color( \
+ gtk.gdk.color_parse(self._pref_data['color_normal']))
# Colorbutton - GREEN
- self.colorbutton_green.set_color( \
- gtk.gdk.color_parse(self._pref_data['color_green']))
+ 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()
=== modified file 'GTG/tests/__init__.py' (properties changed: -x to +x)
=== modified file 'GTG/tests/signals_testing.py' (properties changed: -x to +x)
=== modified file 'GTG/tests/test_apidocs.py' (properties changed: -x to +x)
=== modified file 'GTG/tests/test_backend_tomboy.py' (properties changed: -x to +x)
=== modified file 'GTG/tests/test_backends.py' (properties changed: -x to +x)
=== modified file 'GTG/tests/test_bidict.py' (properties changed: -x to +x)
=== modified file 'GTG/tests/test_datastore.py' (properties changed: -x to +x)
=== modified file 'GTG/tests/test_dates.py' (properties changed: -x to +x)
=== modified file 'GTG/tests/test_interruptible.py' (properties changed: -x to +x)
=== modified file 'GTG/tests/test_networkmanager.py' (properties changed: -x to +x)
=== modified file 'GTG/tests/test_search_filter.py' (properties changed: -x to +x)
=== modified file 'GTG/tests/test_search_query.py' (properties changed: -x to +x)
=== modified file 'GTG/tests/test_signal_testing.py' (properties changed: -x to +x)
=== modified file 'GTG/tests/test_syncengine.py' (properties changed: -x to +x)
=== modified file 'GTG/tests/test_syncmeme.py' (properties changed: -x to +x)
=== modified file 'GTG/tests/test_tag.py' (properties changed: -x to +x)
=== modified file 'GTG/tests/test_tool_tags.py' (properties changed: -x to +x)
=== modified file 'GTG/tests/test_tools_tags.py' (properties changed: -x to +x)
=== modified file 'GTG/tests/test_twokeydict.py' (properties changed: -x to +x)
=== modified file 'GTG/tests/tree_testing.py' (properties changed: -x to +x)
=== modified file 'GTG/tests/xdg/xdg.txt' (properties changed: -x to +x)
=== modified file 'GTG/tools/__init__.py' (properties changed: -x to +x)
=== modified file 'GTG/tools/bidict.py' (properties changed: -x to +x)
=== modified file 'GTG/tools/borg.py' (properties changed: -x to +x)
=== modified file 'GTG/tools/cleanxml.py' (properties changed: -x to +x)
=== modified file 'GTG/tools/clipboard.py' (properties changed: -x to +x)
=== modified file 'GTG/tools/dates.py' (properties changed: -x to +x)
=== modified file 'GTG/tools/interruptible.py' (properties changed: -x to +x)
=== modified file 'GTG/tools/keyring.py' (properties changed: -x to +x)
=== modified file 'GTG/tools/logger.py' (properties changed: -x to +x)
=== modified file 'GTG/tools/tags.py' (properties changed: -x to +x)
=== modified file 'GTG/tools/taskxml.py' (properties changed: -x to +x)
=== modified file 'GTG/tools/testingmode.py' (properties changed: -x to +x)
=== modified file 'GTG/tools/twokeydict.py' (properties changed: -x to +x)
=== modified file 'GTG/tools/urlregex.py' (properties changed: -x to +x)
=== modified file 'GTG/tools/watchdog.py' (properties changed: -x to +x)
=== modified file 'HACKING' (properties changed: -x to +x)
=== modified file 'LICENSE' (properties changed: -x to +x)
=== modified file 'MANIFEST.in' (properties changed: -x to +x)
=== modified file 'Makefile' (properties changed: -x to +x)
=== modified file 'README' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/16x16/actions/gtg-note-new.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/16x16/actions/gtg-plugin.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/16x16/actions/gtg-tag-new.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/16x16/actions/gtg-tag.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/16x16/actions/gtg-task-dismiss.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/16x16/actions/gtg-task-done.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/16x16/actions/gtg-task-new.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/16x16/actions/gtg-task-undismiss.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/16x16/actions/gtg-task-undone.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/16x16/apps/gtg.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/16x16/categories/gtg-tags-all.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/16x16/categories/gtg-tags-none.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/16x16/categories/search.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/16x16/emblems/gtg-home.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/16x16/emblems/gtg-people.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/16x16/emblems/gtg-work.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/22x22/actions/gtg-note-new.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/22x22/actions/gtg-plugin.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/22x22/actions/gtg-tag-new.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/22x22/actions/gtg-tag.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/22x22/actions/gtg-task-dismiss.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/22x22/actions/gtg-task-done.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/22x22/actions/gtg-task-new.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/22x22/actions/gtg-task-undismiss.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/22x22/actions/gtg-task-undone.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/22x22/apps/gtg.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/22x22/categories/items-tags.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/24x24/actions/gtg-tag-new.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/24x24/apps/gtg.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/32x32/actions/gtg-plugin.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/32x32/apps/gtg.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/scalable/apps/backend_evolution.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/scalable/apps/backend_gnote.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/scalable/apps/backend_identica.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/scalable/apps/backend_launchpad.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/scalable/apps/backend_localfile.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/scalable/apps/backend_localfile.svg' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/scalable/apps/backend_mantis.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/scalable/apps/backend_rtm.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/scalable/apps/backend_tomboy.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/scalable/apps/backend_twitter.png' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/scalable/apps/gtg.svg' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/svg/gtg-plugin.svg' (properties changed: -x to +x)
=== modified file 'data/icons/hicolor/svg/gtg.svg' (properties changed: -x to +x)
=== modified file 'doc/gtg.1' (properties changed: -x to +x)
=== modified file 'doc/gtg_new_task.1' (properties changed: -x to +x)
=== modified file 'gtg.desktop' (properties changed: -x to +x)
=== modified file 'org.gnome.GTG.service' (properties changed: -x to +x)
=== modified file 'po/af.po' (properties changed: -x to +x)
=== modified file 'po/ar.po' (properties changed: -x to +x)
=== modified file 'po/ast.po' (properties changed: -x to +x)
=== modified file 'po/be.po' (properties changed: -x to +x)
=== modified file 'po/bg.po' (properties changed: -x to +x)
=== modified file 'po/bn.po' (properties changed: -x to +x)
=== modified file 'po/ca.po' (properties changed: -x to +x)
=== modified file 'po/cs.po' (properties changed: -x to +x)
=== modified file 'po/da.po' (properties changed: -x to +x)
=== modified file 'po/de.po' (properties changed: -x to +x)
=== modified file 'po/el.po' (properties changed: -x to +x)
=== modified file 'po/en_CA.po' (properties changed: -x to +x)
=== modified file 'po/en_GB.po' (properties changed: -x to +x)
=== modified file 'po/eo.po' (properties changed: -x to +x)
=== modified file 'po/es.po' (properties changed: -x to +x)
=== modified file 'po/eu.po' (properties changed: -x to +x)
=== modified file 'po/fa.po' (properties changed: -x to +x)
=== modified file 'po/fi.po' (properties changed: -x to +x)
=== modified file 'po/fr.po' (properties changed: -x to +x)
=== modified file 'po/gl.po' (properties changed: -x to +x)
=== modified file 'po/gtg.pot' (properties changed: -x to +x)
=== modified file 'po/he.po' (properties changed: -x to +x)
=== modified file 'po/hr.po' (properties changed: -x to +x)
=== modified file 'po/hu.po' (properties changed: -x to +x)
=== modified file 'po/ia.po' (properties changed: -x to +x)
=== modified file 'po/id.po' (properties changed: -x to +x)
=== modified file 'po/is.po' (properties changed: -x to +x)
=== modified file 'po/it.po' (properties changed: -x to +x)
=== modified file 'po/ja.po' (properties changed: -x to +x)
=== modified file 'po/jbo.po' (properties changed: -x to +x)
=== modified file 'po/ka.po' (properties changed: -x to +x)
=== modified file 'po/ko.po' (properties changed: -x to +x)
=== modified file 'po/lt.po' (properties changed: -x to +x)
=== modified file 'po/mg.po' (properties changed: -x to +x)
=== modified file 'po/ms.po' (properties changed: -x to +x)
=== modified file 'po/nb.po' (properties changed: -x to +x)
=== modified file 'po/nds.po' (properties changed: -x to +x)
=== modified file 'po/nl.po' (properties changed: -x to +x)
=== modified file 'po/oc.po' (properties changed: -x to +x)
=== modified file 'po/pl.po' (properties changed: -x to +x)
=== modified file 'po/pt.po' (properties changed: -x to +x)
=== modified file 'po/pt_BR.po' (properties changed: -x to +x)
=== modified file 'po/ro.po' (properties changed: -x to +x)
=== modified file 'po/ru.po' (properties changed: -x to +x)
=== modified file 'po/si.po' (properties changed: -x to +x)
=== modified file 'po/sk.po' (properties changed: -x to +x)
=== modified file 'po/sl.po' (properties changed: -x to +x)
=== modified file 'po/sq.po' (properties changed: -x to +x)
=== modified file 'po/sr.po' (properties changed: -x to +x)
=== modified file 'po/sv.po' (properties changed: -x to +x)
=== modified file 'po/te.po' (properties changed: -x to +x)
=== modified file 'po/th.po' (properties changed: -x to +x)
=== modified file 'po/tr.po' (properties changed: -x to +x)
=== modified file 'po/uk.po' (properties changed: -x to +x)
=== modified file 'po/zh_CN.po' (properties changed: -x to +x)
=== modified file 'po/zh_TW.po' (properties changed: -x to +x)
=== modified file 'setup.py' (properties changed: -x to +x)
=== modified file 'test/data/bryce/xdg/config/gtg/gtg.conf' (properties changed: -x to +x)
=== modified file 'test/data/bryce/xdg/config/gtg/tasks.conf' (properties changed: -x to +x)
=== modified file 'test/data/bryce/xdg/data/gtg/d4657d9f-3440-4791-a3d7-63cb4f00012e.xml' (properties changed: -x to +x)
=== modified file 'test/data/bryce/xdg/data/gtg/projects.xml' (properties changed: -x to +x)
=== modified file 'test/data/bryce/xdg/data/gtg/tags.xml' (properties changed: -x to +x)
=== modified file 'test/data/standard/xdg/config/gtg/gtg.conf' (properties changed: -x to +x)
=== modified file 'test/data/standard/xdg/config/gtg/tasks.conf' (properties changed: -x to +x)
=== modified file 'test/data/standard/xdg/data/gtg/866eace6-7482-41e9-b450-e9664a5d1602.xml' (properties changed: -x to +x)
=== modified file 'test/data/standard/xdg/data/gtg/gtg.pid' (properties changed: -x to +x)
=== modified file 'test/data/standard/xdg/data/gtg/projects.xml' (properties changed: -x to +x)
=== modified file 'test/data/standard/xdg/data/gtg/tags.xml' (properties changed: -x to +x)
Follow ups
-
[Merge] lp:~gtg-user/gtg/urgency-color-api into lp:gtg
From: noreply, 2012-07-13
-
Re: [Merge] lp:~gtg-user/gtg/urgency-color-api into lp:gtg
From: Bertrand Rousseau, 2012-07-13
-
Re: [Merge] lp:~gtg-user/gtg/urgency-color-api into lp:gtg
From: Bertrand Rousseau, 2012-06-10
-
Re: [Merge] lp:~gtg-user/gtg/urgency-color-api into lp:gtg
From: Wolter Hellmund, 2012-06-10
-
Re: [Merge] lp:~gtg-user/gtg/urgency-color-api into lp:gtg
From: Wolter Hellmund, 2012-06-06
-
Re: [Merge] lp:~gtg-user/gtg/urgency-color-api into lp:gtg
From: Bertrand Rousseau, 2012-05-31
-
Re: [Merge] lp:~gtg-user/gtg/urgency-color-api into lp:gtg
From: Wolter Hellmund, 2012-05-29
-
Re: [Merge] lp:~gtg-user/gtg/urgency-color-api into lp:gtg
From: Izidor Matušov, 2012-05-25
-
Re: [Merge] lp:~gtg-user/gtg/urgency-color-api into lp:gtg
From: Wolter Hellmund, 2012-05-23
-
Re: [Merge] lp:~gtg-user/gtg/urgency-color-api into lp:gtg
From: Wolter Hellmund, 2012-05-23
-
Re: [Merge] lp:~gtg-user/gtg/urgency-color-api into lp:gtg
From: Bertrand Rousseau, 2012-05-21
-
[Merge] lp:~gtg-user/gtg/urgency-color-api into lp:gtg
From: Wolter Hellmund, 2012-05-21
-
[Merge] lp:~gtg-user/gtg/urgency-color-api into lp:gtg
From: Wolter Hellmund, 2012-05-21
