Merge lp:~paulliu/unity/add_superkey_configuration_dialog into lp:unity

[Ying-Chun Liu]

Add a configuration dialog when super key is disabled by OEM.
The window will be shown each time when the dash button is pressed first time and the super key is disabled.

[Neil J. Patel (njpatel)]

Obviously this won't apply to Unity trunk anymore, but I don't mind if you want to merge it into the 0.2 series if it will lessen the distropatch burden for OEM.

review: Approve

=== modified file 'tools/Makefile.am'
--- tools/Makefile.am	2010-09-09 16:05:44 +0000
+++ tools/Makefile.am	2010-10-04 13:13:12 +0000
@@ -1,3 +1,3 @@
 EXTRA_DIST = makebootchart.py unity-xephyr.py
 
-dist_libexec_SCRIPTS = migrate_favorites.py
+dist_libexec_SCRIPTS = migrate_favorites.py superkey_conf_dialog.py
 
=== added file 'tools/superkey_conf_dialog.py'
--- tools/superkey_conf_dialog.py	1970-01-01 00:00:00 +0000
+++ tools/superkey_conf_dialog.py	2010-10-04 13:13:12 +0000
@@ -0,0 +1,35 @@
+#!/usr/bin/python
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+# Copyright(C) 2010 Canonical
+# Author: Ying-Chun Liu
+#
+# This program is free software: you can redistributeit and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+
+import sys
+import os
+import gconf
+import gtk
+import gettext
+
+gettext.install('unity')
+
+if __name__ == '__main__':
+
+    gconfkey = '/desktop/unity/launcher/super_key_enable'
+    dialog = gtk.MessageDialog(parent=None, flags=0, type=gtk.MESSAGE_QUESTION, buttons=gtk.BUTTONS_NONE, message_format=None)
+    dialog.set_resizable(True);
+    dialog.set_default_size(420,-1);
+    dialog.set_title(_('Microsoft Windows key Trademark Compliance'))
+    dialog.set_markup(_('Wound you like to use the Super/Windows key to activate Ubuntu functions?'))
+    dialog.add_button(_('No thanks'),gtk.RESPONSE_NO)
+    dialog.add_button(_('Yes please'),gtk.RESPONSE_YES)
+    dialog.set_default_response(gtk.RESPONSE_YES)
+    response_id = dialog.run()
+    gconf_client = gconf.client_get_default()
+    gconf_client.add_dir("/desktop/unity/launcher",gconf.CLIENT_PRELOAD_NONE)
+    if (response_id != gtk.RESPONSE_NO):
+      gconf_client.set_bool(gconfkey,True)
+    else:
+      gconf_client.set_bool(gconfkey,False)
 
=== modified file 'unity-private/panel/panel-home-button.vala'
--- unity-private/panel/panel-home-button.vala	2010-09-24 12:40:30 +0000
+++ unity-private/panel/panel-home-button.vala	2010-10-04 13:13:12 +0000
@@ -28,6 +28,8 @@
     private Clutter.Texture bfb_bg_normal;
     private Clutter.Texture bfb_bg_prelight;
     private Clutter.Texture bfb_bg_active;
+    private bool super_key_enable_asked=false;
+    private bool super_key_enable=false;
 
     public HomeButton (Shell shell)
     {
@@ -97,6 +99,8 @@
       set_background_for_state (Ctk.ActorState.STATE_NORMAL, bfb_bg_normal);
       set_background_for_state (Ctk.ActorState.STATE_PRELIGHT, bfb_bg_prelight);
       set_background_for_state (Ctk.ActorState.STATE_ACTIVE, bfb_bg_active);
+      var gc = GConf.Client.get_default();
+      super_key_enable = gc.get_bool("/desktop/unity/launcher/super_key_enable");
     }
 
     private override void allocate (Clutter.ActorBox        box,
@@ -205,6 +209,11 @@
 
     private void on_clicked ()
     {
+      if (!super_key_enable && !super_key_enable_asked) {
+        show_super_key_enable_dialog();
+        super_key_enable_asked = true;
+        return;
+      }
       shell.show_unity ();
       MenuManager manager = MenuManager.get_default ();
       manager.popdown_current_menu ();
@@ -212,6 +221,12 @@
       on_mode_changed (shell.get_mode ());
     }
 
+    private void* show_super_key_enable_dialog()
+    {
+      Process.spawn_command_line_async("/usr/lib/unity/superkey_conf_dialog.py");
+      return null;
+    }
+
     private bool on_motion_event (Clutter.Event event)
     {
       shell.about_to_show_places ();