Merge lp:~abhiram-ampabathina/gtg/gtg2 into lp:~gtg/gtg/old-trunk

[Abhiram]

Hello,
      This is the merge request for the bug "Mouseover string incorrect". All the desired changes have been made for the tooltip design. Now it is made appropriate that the tooltip reacts with the status of the current task selected or not selected. Please, have a look and review it, it is working fine with me.

Best

[Izidor Matušov (izidor)]

Get rid of the print statement. Otherwise it looks good.

review: Needs Fixing (code, running)

[lp:~abhiram-ampabathina/gtg/gtg2]

1240. By Abhiram on 2012-08-16

removed the print statement

[Abhiram (abhiram-ampabathina)]

Hi izidor,
          Removed the print statement. Just wrote it for tracing purposes. Forgot to remove it. Removed it now.

Best,
Abhiram

[Abhiram (abhiram-ampabathina)]

Hello izidor,
        I guess i removed the print statement. If there is any problem in other parts of the code, let me know.

Best,
Abhiram

[Bertrand Rousseau (bertrand-rousseau)]

This one is deferred to 0.3.1 since we're now focusing on 0.3 release. Feel free to remind us to review this merge request after 0.3 is released if we take too much time to get back to it.

[Bertrand Rousseau (bertrand-rousseau)]

The patch is pretty much ok, except for one thing: I think the the new tooltip text for UNDISMISS is not correct. The original text ("Mark this task as to be done") was correct (although not very clear I admit, but fixing it requires to discuss the task activation/deactivation flow a bit)

Also, please update your patch by merging the trunk in it, and update the CHANGELOG to record your fix.

review: Needs Fixing (code, run)

[Izidor Matušov (izidor)]

Rejecting this patch for inactivty and not fixing problems.

review: Disapprove

Unmerged revisions

1240. By Abhiram on 2012-08-16

removed the print statement

1239. By Abhiram on 2012-08-16

made complete changes to tooltips. Makes better sense now.

1238. By Abhiram on 2012-08-08

fix for bug Mouseover string incorrrect

=== modified file 'GTG/gtk/browser/__init__.py'
--- GTG/gtk/browser/__init__.py	2012-08-08 14:56:18 +0000
+++ GTG/gtk/browser/__init__.py	2012-08-16 16:31:22 +0000
@@ -36,11 +36,11 @@
     MARK_DONE               = _("Mark as Done")
     MARK_DONE_TOOLTIP       = _("Mark the selected task as done")
     MARK_UNDONE             = _("Mark as not Done")
-    MARK_UNDONE_TOOLTIP     = _("Mark the selected task as to be done")
+    MARK_UNDONE_TOOLTIP     = _("Mark the selected task as not done")
     MARK_DISMISS            = _("Dismiss")
     MARK_DISMISS_TOOLTIP    = _("Mark the task as not to be done anymore")
     MARK_UNDISMISS          = _("Undismiss")
-    MARK_UNDISMISS_TOOLTIP  = _("Mark the selected task as to be done")
+    MARK_UNDISMISS_TOOLTIP  = _("Mark the selected task as not done")
     DELETE_TOOLTIP          = _("Permanently remove the selected task")
     EDIT_TOOLTIP            = _("Edit the selected task")
     NEW_TASK_TOOLTIP        = _("Create a new task")

=== modified file 'GTG/gtk/browser/browser.py'
--- GTG/gtk/browser/browser.py	2012-08-12 23:01:10 +0000
+++ GTG/gtk/browser/browser.py	2012-08-16 16:31:22 +0000
@@ -221,9 +221,7 @@
         """
         sets tooltips for widgets on toolbars
         """
-        self.donebutton.set_tooltip_text(GnomeConfig.MARK_DONE_TOOLTIP)
         self.editbutton.set_tooltip_text(GnomeConfig.EDIT_TOOLTIP)
-        self.dismissbutton.set_tooltip_text(GnomeConfig.MARK_DISMISS_TOOLTIP)
         self.newtask.set_tooltip_text(GnomeConfig.NEW_TASK_TOOLTIP)
         self.newsubtask.set_tooltip_text(GnomeConfig.NEW_SUBTASK_TOOLTIP)
         self.toggle_workview.set_tooltip_text(
@@ -1162,7 +1160,10 @@
         def update_button(button, settings):
             button.set_icon_name(settings["icon-name"])
             button.set_label(settings["label"])
-
+	    button.set_tooltip_text(settings["tooltip"])
+	    if selection.count_selected_rows() == 0:
+	        button.set_tooltip_text("")
+	        
         def update_menu_item(menu_item, settings):
             image = gtk.image_new_from_icon_name(settings["icon-name"], 16)
             image.set_pixel_size(16)
@@ -1205,12 +1206,17 @@
         #Only if something is selected in the active task list
         self.donebutton.set_icon_name("gtg-task-done")
         self.dismissbutton.set_icon_name("gtg-task-dismiss")
+        if selection.count_selected_rows() == 0 :
+	    self.donebutton.set_tooltip_text("")
+            self.dismissbutton.set_tooltip_text("")
+	
         if selection.count_selected_rows() > 0:
             if 'closed' in self.vtree_panes:
                 self.vtree_panes['closed'].get_selection().unselect_all()
             self.donebutton.set_label(GnomeConfig.MARK_DONE)
             self.donebutton.set_tooltip_text(GnomeConfig.MARK_DONE_TOOLTIP)
-            self.dismissbutton.set_label(GnomeConfig.MARK_DISMISS)
+	    self.dismissbutton.set_tooltip_text(GnomeConfig.MARK_DISMISS_TOOLTIP)
+        self.dismissbutton.set_label(GnomeConfig.MARK_DISMISS)
         self.update_buttons_sensitivity()
 
     def on_close(self, widget=None):

=== modified file 'GTG/gtk/editor/__init__.py'
--- GTG/gtk/editor/__init__.py	2012-05-23 08:55:31 +0000
+++ GTG/gtk/editor/__init__.py	2012-08-16 16:31:22 +0000
@@ -34,9 +34,9 @@
     MARK_UNDISMISS = _("Undismiss")
 
     MARK_DONE_TOOLTIP = _("Mark this task as done")
-    MARK_UNDONE_TOOLTIP = _("Mark this task as to be done")
+    MARK_UNDONE_TOOLTIP = _("Mark this task as not done")
     MARK_DISMISS_TOOLTIP = _("Mark this task as not to be done anymore")
-    MARK_UNDISMISS_TOOLTIP = _("Mark this task as to be done")
+    MARK_UNDISMISS_TOOLTIP = _("Mark this task as not done")
     DELETE_TOOLTIP = _("Permanently remove this task")
     SUBTASK_TOOLTIP = _("Insert a subtask in this task")
     TAG_TOOLTIP = _("Insert a tag in this task")