Merge lp:~andrea.corbellini/diodon/disable-indicator into lp:~diodon-team/diodon/trunk

[Andrea Corbellini]

This branch adds a new GConf key (/diodon/show-indicator) to let you disable the application indicator. The reason for this change is that for people like me, who use just the keyboard shortcut to access the clipboard, the application indicator is useless and often annoying too.

Note that I've not added this option to the preferences window. That's because if you set this option by mistake and if you don't know what the keyboard shortcut is, Diodon is unreachable. Instead, having just the GConf key allow only power users to use this option (i.e.: users that can easily roll-back mistakes).

[Oliver Sauder (sao)]

I can see your point. As this is a power user option it is better not to add it to the preferences dialog.

Currently I'm working on a Diodon unity lens. As soon as this is up and running I'm thinking of a plugin system where the indicator and the lens (and other features...) can be enabled/disabled. This would make this option deprecated. However this option do for now.

Thanks for your work.

review: Approve

=== modified file 'src/configuration-model.vala'
--- src/configuration-model.vala	2011-01-19 20:38:18 +0000
+++ src/configuration-model.vala	2011-04-23 19:38:22 +0000
@@ -91,12 +91,22 @@
         /**
          * key for clipboard history accelerator
          */
-       public string history_accelerator_key { get { return "/keybindings/history"; } }
-       
-       /**
-        * clipboard history accelerator
-        */
-       public string history_accelerator { get; set; default = "<Ctrl><Alt>V"; }
+        public string history_accelerator_key { get { return "/keybindings/history"; } }
+       
+        /**
+         * clipboard history accelerator
+         */
+        public string history_accelerator { get; set; default = "<Ctrl><Alt>V"; }
+       
+        /**
+         * key for show indicator flag
+         */
+        public string show_indicator_key { get { return "/show-indicator"; } }
+        
+        /**
+         * flag whether the indicator should be shown
+         */
+        public bool show_indicator { get; set; default = true; }
     }
 }
 

=== modified file 'src/controller.vala'
--- src/controller.vala	2011-03-30 14:15:44 +0000
+++ src/controller.vala	2011-04-23 19:38:22 +0000
@@ -244,6 +244,19 @@
             // history_accelerator
             configuration_manager.add_string_notify(configuration_model.history_accelerator_key,
                 change_history_accelerator, configuration_model.history_accelerator);
+            
+            // show app indicator
+            configuration_manager.add_bool_notify(configuration_model.show_indicator_key,
+                () => {
+                    indicator_view.set_visible(true);
+                    configuration_model.show_indicator = true;
+                },
+                () => {
+                    indicator_view.set_visible(false);
+                    configuration_model.show_indicator = false;
+                },
+                configuration_model.show_indicator // default value
+            );
         }
         
         /**

=== modified file 'src/indicator-view.vala'
--- src/indicator-view.vala	2011-04-23 14:09:37 +0000
+++ src/indicator-view.vala	2011-04-23 19:38:22 +0000
@@ -67,7 +67,7 @@
             // Setup indicator
             indicator = new AppIndicator.Indicator("diodon", "gtk-paste",
                 AppIndicator.IndicatorCategory.APPLICATION_STATUS);
-            indicator.set_status(AppIndicator.IndicatorStatus.ACTIVE);
+            set_visible(true);
             
             // Setup application menu
             menu = new Gtk.Menu();
@@ -104,6 +104,14 @@
             menu.destroy();
         }
         
+        public void set_visible(bool visible)
+        {
+            if (visible)
+                indicator.set_status(AppIndicator.IndicatorStatus.ACTIVE);
+            else
+                indicator.set_status(AppIndicator.IndicatorStatus.PASSIVE);
+        }
+        
         /**
          * Select item by highlighting it.
          *