Merge lp:~odd-rationale/diodon/odd-branch into lp:~diodon-team/diodon/trunk

[Dariel Dato-on]

Implements "<empty>" menu item when clipboard is empty.

[Dariel Dato-on (odd-rationale)]

I'm merging these changes for now.

In the future, would it be better for you to review/approve any merge proposals I make? You are more familiar with the code and could let me know if I implemented it correctly.

review: Approve

[Oliver Sauder (sao)]

I'd say for you it's much easier to directly commit into the trunk. As currently the project is still small we can easily handle it this way.

I than can review them from there. For easier review it would be good if you add the bug number to the commit message.

About this particular change:
I moved the logic of showing or hiding the empty label to the Controller.

As the user interface is also written in Vala, it is sometimes difficult to figure out what the difference is between user interface and logic (in some cases I'm also not sure if some of the code of the view belongs actually to the Controller).

I hope I will soon be able to create a diagram to make it a little bit easier to understand where what code belongs too.

[Oliver Sauder (sao)]

I've just found the following to say bzr what bug has been fixed:
bzr ci --fixes lp:689447 -m "some message"

This is even better as there will be link directly to the bug in the bzr qlog and glog user interfaces.

=== modified file 'src/clipboard-manager.vala'
--- src/clipboard-manager.vala	2010-12-02 21:07:32 +0000
+++ src/clipboard-manager.vala	2010-12-12 23:29:32 +0000
@@ -97,7 +97,7 @@
                 on_text_received(type, text);
             }
             
-             return true;
+            return true;
         }
     }  
 }

=== modified file 'src/indicator-view.vala'
--- src/indicator-view.vala	2010-12-11 18:11:07 +0000
+++ src/indicator-view.vala	2010-12-12 23:29:32 +0000
@@ -30,6 +30,7 @@
     {
         private AppIndicator.Indicator indicator;
         private Gtk.Menu menu;
+        private Gtk.MenuItem empty_item;
         
         /**
          * HashMap of all available clipboard items
@@ -67,6 +68,10 @@
             // Setup application menu
             menu = new Gtk.Menu();
             
+            empty_item = new Gtk.MenuItem.with_label(_("<Empty>"));
+            empty_item.set_sensitive(false);
+            menu.append(empty_item);
+            
             Gtk.SeparatorMenuItem sep_item = new Gtk.SeparatorMenuItem();
             menu.append(sep_item);
             
@@ -107,6 +112,7 @@
             menu_item.activate.connect(on_clicked_item);
             menu_item.show();
             clipboard_menu_items.set(item, menu_item);
+            clipboard_is_empty(false);
             menu.prepend(menu_item);
         }
         
@@ -134,6 +140,7 @@
             }
             
             clipboard_menu_items.clear();
+            clipboard_is_empty(true);
         }
         
         /**
@@ -146,6 +153,18 @@
         }
         
         /**
+         * Show or hide the empty clipboard label
+         */
+        private void clipboard_is_empty(bool is_empty)
+        {
+            if (is_empty) {
+                empty_item.set_visible(true);
+            } else {
+                empty_item.set_visible(false);
+            }
+        }
+        
+        /**
          * User event: clicked menu item clear
          */
         private void on_clicked_clear()

=== modified file 'src/main.vala'
--- src/main.vala	2010-12-01 21:14:30 +0000
+++ src/main.vala	2010-12-12 23:29:32 +0000
@@ -36,8 +36,8 @@
             Gtk.init(ref args);
             
             // setup storage    
-            string diodon_dir =  Environment.get_home_dir()
-                + "/.local/share/diodon";
+            string diodon_dir =  Environment.get_user_data_dir()
+                + "/diodon";
             IClipboardStorage storage = new XmlClipboardStorage(diodon_dir, "storage.xml");
             ClipboardModel model = new ClipboardModel(storage);