Merge lp:~fboucault/unity-2d/dconf_migration_super_key into lp:unity-2d/3.0

[Florian Boucault]

[launcher] Migrated GConf key /desktop/unity-2d/launcher/super_key_enable to dconf

Added a GSettings schemas file and a GConf-to-GSettings conversion file.

Packaging changes:
* debian/unity-2d.install:
  - install GSettings schemas into usr/share/glib-2.0/schemas
  - install GConf to GSettings conversion into usr/share/GConf/gsettings
* debian/gconf/schemas/unity-2d.schemas:
  - remove GConf schema for /desktop/unity-2d/launcher/super_key_enable
* debian/control:
  - add dependency on libdconf-qt-dev

[lp:~fboucault/unity-2d/dconf_migration_super_key]

632. By Florian Boucault on 2011-07-22

* debian/20_unity-2d-gconf-default:
  - remove default value for /desktop/unity-2d/launcher/super_key_enable

633. By Florian Boucault on 2011-07-22

Merged lp:unity-2d

[Didier Roche-Tolomelli (didrocks)]

compile and works well.

However, we try now to enforce sane dconf values, and not only for desrt ;)
so, can you please use as a gsettings path some /com/canonical/ one? instead of /desktop/unity-2d (it should match the id com.canonical.* for non relocatable schemas)

Maybe a stupid question, but shouldn't updateSuperKeyMonitoring() SLOT take the bool parameter rather than asking dconf again about which value for this property?

Apart from that, all looks good, it works and changing the value in dconf-editor has indeed some effect. Nice work :)

review: Needs Fixing

[Florian Boucault (fboucault)]

> compile and works well.
>
> However, we try now to enforce sane dconf values, and not only for desrt ;)
> so, can you please use as a gsettings path some /com/canonical/ one? instead
> of /desktop/unity-2d (it should match the id com.canonical.* for non
> relocatable schemas)
>

I was not sure so I followed what Unity was doing. Should I definitely do what you suggest?

>
> Maybe a stupid question, but shouldn't updateSuperKeyMonitoring() SLOT take
> the bool parameter rather than asking dconf again about which value for this
> property?
>

Not a stupid question. I wanted the change to be minimal and strictly about migrating to dconf so I kept it as is.

> Apart from that, all looks good, it works and changing the value in dconf-
> editor has indeed some effect. Nice work :)

Thanks for the testing!

[Didier Roche-Tolomelli (didrocks)]

> > compile and works well.
> >
> > However, we try now to enforce sane dconf values, and not only for desrt ;)
> > so, can you please use as a gsettings path some /com/canonical/ one? instead
> > of /desktop/unity-2d (it should match the id com.canonical.* for non
> > relocatable schemas)
> >
>
> I was not sure so I followed what Unity was doing. Should I definitely do what
> you suggest?
Yeah, Unity will change that in the coming release

>
> >
> > Maybe a stupid question, but shouldn't updateSuperKeyMonitoring() SLOT take
> > the bool parameter rather than asking dconf again about which value for this
> > property?
> >
>
> Not a stupid question. I wanted the change to be minimal and strictly about
> migrating to dconf so I kept it as is.

Ok, nice enhancement target for the future then?
>
> > Apart from that, all looks good, it works and changing the value in dconf-
> > editor has indeed some effect. Nice work :)
>
> Thanks for the testing!

So, approved with once the change #1 is done :)

review: Approve

[Florian Boucault (fboucault)]

> > > compile and works well.
> > >
> > > However, we try now to enforce sane dconf values, and not only for desrt
> ;)
> > > so, can you please use as a gsettings path some /com/canonical/ one?
> instead
> > > of /desktop/unity-2d (it should match the id com.canonical.* for non
> > > relocatable schemas)
> > >
> >
> > I was not sure so I followed what Unity was doing. Should I definitely do
> what
> > you suggest?
> Yeah, Unity will change that in the coming release
>

Done.

> >
> > >
> > > Maybe a stupid question, but shouldn't updateSuperKeyMonitoring() SLOT
> take
> > > the bool parameter rather than asking dconf again about which value for
> this
> > > property?
> > >
> >
> > Not a stupid question. I wanted the change to be minimal and strictly about
> > migrating to dconf so I kept it as is.
>
> Ok, nice enhancement target for the future then?

Yes

> >
> > > Apart from that, all looks good, it works and changing the value in dconf-
> > > editor has indeed some effect. Nice work :)
> >
> > Thanks for the testing!
>
> So, approved with once the change #1 is done :)

[lp:~fboucault/unity-2d/dconf_migration_super_key]

634. By Florian Boucault on 2011-07-22

Changed schema path to match com.canonical.*

=== modified file '.bzrignore'
--- .bzrignore	2011-06-15 14:39:35 +0000
+++ .bzrignore	2011-07-22 16:53:25 +0000
@@ -78,3 +78,4 @@
 debian/unity-qt-spread
 debian/libuqpanel-dev
 debian/libuqpanel0
+data/gschemas.compiled
 
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-06-27 13:40:51 +0000
+++ CMakeLists.txt	2011-07-22 16:53:25 +0000
@@ -4,6 +4,7 @@
 # Dirs
 set(UNITY_2D_DIR share/unity-2d)
 set(UNITY_DIR /usr/share/unity/)
+set(UNITY_2D_DATA_DIR "${CMAKE_SOURCE_DIR}/data")
 
 configure_file(config.h.in config.h)
 
@@ -24,6 +25,31 @@
 find_package(X11 REQUIRED)
 find_package(Gettext REQUIRED)
 
+
+# GSettings schemas
+pkg_check_modules(GLIB REQUIRED glib-2.0)
+set (UNITY_2D_SCHEMAS "com.canonical.Unity2d.gschema.xml")
+set (UNITY_2D_GCONF_CONVERT "unity-2d.convert")
+set (GSETTINGS_DIR "${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas/")
+set (GCONF_CONVERT_DIR "${CMAKE_INSTALL_PREFIX}/share/GConf/gsettings")
+execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas  OUTPUT_VARIABLE GLIB_COMPILE_SCHEMAS OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+# Run the schemas validator and error if it fails
+execute_process (COMMAND ${GLIB_COMPILE_SCHEMAS} ${UNITY_2D_DATA_DIR} ERROR_VARIABLE _schemas_invalid OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+if (_schemas_invalid)
+  message (SEND_ERROR "Schemas validation error: ${_schemas_invalid}")
+endif (_schemas_invalid)
+
+# Actually install and recompile the schemas
+message (STATUS "GSettings schemas will be installed into ${GSETTINGS_DIR}")
+install (FILES ${UNITY_2D_DATA_DIR}/${UNITY_2D_SCHEMAS} DESTINATION ${GSETTINGS_DIR})
+install (CODE "message (STATUS \"Compiling GSettings schemas\")")
+install (CODE "execute_process (COMMAND ${GLIB_COMPILE_SCHEMAS} ${GSETTINGS_DIR})")
+
+# Install GConf to GSettings conversion file
+install (FILES ${UNITY_2D_DATA_DIR}/${UNITY_2D_GCONF_CONVERT} DESTINATION ${GCONF_CONVERT_DIR})
+
 include_directories(
     ${CMAKE_BINARY_DIR}
     ${QT_INCLUDE_DIR}
 
=== added directory 'data'
=== added file 'data/com.canonical.Unity2d.gschema.xml'
--- data/com.canonical.Unity2d.gschema.xml	1970-01-01 00:00:00 +0000
+++ data/com.canonical.Unity2d.gschema.xml	2011-07-22 16:53:25 +0000
@@ -0,0 +1,9 @@
+<schemalist>
+  <schema path="/com/canonical/unity-2d/launcher/" id="com.canonical.Unity2d.Launcher" gettext-domain="unity-2d">
+    <key type="b" name="super-key-enable">
+      <default>true</default>
+      <summary>Super key activation.</summary>
+      <description>Whether or not the super (also called windows key) key is used.</description>
+    </key>
+  </schema>
+</schemalist>
 
=== added file 'data/unity-2d.convert'
--- data/unity-2d.convert	1970-01-01 00:00:00 +0000
+++ data/unity-2d.convert	2011-07-22 16:53:25 +0000
@@ -0,0 +1,2 @@
+[com.canonical.Unity2d.Launcher]
+super-key-enable = /desktop/unity-2d/launcher/super_key_enable
 
=== modified file 'debian/20_unity-2d-gconf-default'
--- debian/20_unity-2d-gconf-default	2011-06-15 13:05:38 +0000
+++ debian/20_unity-2d-gconf-default	2011-07-22 16:53:25 +0000
@@ -3,7 +3,6 @@
 /desktop/unity-2d/launcher/favorites [ubiquity-gtkui.desktop,nautilus-home.desktop,firefox.desktop,libreoffice-writer.desktop,libreoffice-calc.desktop,libreoffice-impress.desktop,ubuntu-software-center.desktop,ubuntuone-control-panel-gtk.desktop]
 /desktop/unity-2d/launcher/hide_mode 2
 /desktop/unity-2d/launcher/use_strut false
-/desktop/unity-2d/launcher/super_key_enable true
 /desktop/gnome/applications/window_manager/default /usr/bin/metacity
 /desktop/gnome/applications/window_manager/current /usr/bin/metacity
 /apps/metacity/general/show_maximized_titlebars false
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-07-19 07:02:13 +0000
+++ debian/changelog	2011-07-22 16:53:25 +0000
@@ -4,13 +4,22 @@
   * do not run pkgbinarymangler to convert images to 8bit since this breaks
     the launcher icon background handling. (LP: #809205)
     (QT upstream bug: http://bugreports.qt.nokia.com/browse/QTBUG-4459)
+  * debian/unity-2d.install:
+    - install GSettings schemas into usr/share/glib-2.0/schemas
+    - install GConf to GSettings conversion into usr/share/GConf/gsettings
+  * debian/gconf/schemas/unity-2d.schemas:
+    - remove GConf schema for /desktop/unity-2d/launcher/super_key_enable
+  * debian/20_unity-2d-gconf-default:
+    - remove default value for /desktop/unity-2d/launcher/super_key_enable
+  * debian/control:
+    - add dependency on libdconf-qt-dev
 
   [ Didier Roche ]
   * Fix typo in trigger (debian/unity-2d.triggers): (LP: #807358)
   * Install the apport hook in the right directory so that it's not launched
     unconditionally (LP: #712343)
 
- -- Didier Roche <[e-mail]>  Mon, 18 Jul 2011 11:02:17 +0200
+ -- Florian Boucault <[e-mail]>  Fri, 22 Jul 2011 16:44:37 +0200
 
 unity-2d (3.8.10-0ubuntu1) natty; urgency=low
 
 
=== modified file 'debian/control'
--- debian/control	2011-06-22 21:17:49 +0000
+++ debian/control	2011-07-22 16:53:25 +0000
@@ -12,6 +12,7 @@
                libglib2.0-dev,
                libwnck-dev,
                libqtgconf-dev,
+               libdconf-qt-dev,
                libqtbamf-dev,
                libqtdee-dev,
                libdbusmenu-qt-dev,
 
=== modified file 'debian/gconf/schemas/unity-2d.schemas'
--- debian/gconf/schemas/unity-2d.schemas	2011-06-15 13:10:14 +0000
+++ debian/gconf/schemas/unity-2d.schemas	2011-07-22 16:53:25 +0000
@@ -39,18 +39,6 @@
 		   <long>Use EWMH standard to reserve an area of the desktop (struts) so that no window can use the launcher's area</long>
 		</locale>
 	</schema>
-
-	<schema>
-		<key>/schemas/desktop/unity-2d/launcher/super_key_enable</key>
-		<applyto>/desktop/unity-2d/launcher/super_key_enable</applyto>
-		<owner>unity-2d</owner>
-		<type>bool</type>
-		<default>true</default>
-		<locale name="C">
-		   <short>Super key activation</short>
-		   <long>Whether or not the super (also called windows key) key is used</long>
-		</locale>
-	</schema>
 </schemalist>
 </gconfschemafile>
 
 
=== modified file 'debian/unity-2d.install'
--- debian/unity-2d.install	2011-07-19 07:02:13 +0000
+++ debian/unity-2d.install	2011-07-22 16:53:25 +0000
@@ -5,3 +5,5 @@
 debian/20_unity-2d-gconf-mandatory /usr/share/gconf/unity-2d/mandatory
 debian/20_unity-2d-gconf-default /usr/share/gconf/unity-2d/default
 usr/share/locale/*/LC_MESSAGES/unity-2d.mo
+usr/share/glib-2.0/schemas/com.canonical.Unity2d.gschema.xml
+usr/share/GConf/gsettings
 
=== modified file 'launcher/app/CMakeLists.txt'
--- launcher/app/CMakeLists.txt	2011-06-11 11:33:52 +0000
+++ launcher/app/CMakeLists.txt	2011-07-22 16:53:25 +0000
@@ -3,6 +3,7 @@
 pkg_check_modules(X11 REQUIRED x11)
 pkg_check_modules(GEIS REQUIRED libutouch-geis)
 pkg_check_modules(QTGCONF REQUIRED libqtgconf)
+pkg_check_modules(DCONFQT REQUIRED dconf-qt)
 
 # Sources
 set(launcher_SRCS
@@ -38,6 +39,7 @@
     ${X11_INCLUDE_DIRS}
     ${GEIS_INCLUDE_DIRS}
     ${QTGCONF_INCLUDE_DIRS}
+    ${DCONFQT_INCLUDE_DIRS}
     ${libunity-2d-private_SOURCE_DIR}/src
     )
 
@@ -50,6 +52,7 @@
     ${X11_LDFLAGS}
     ${GEIS_LDFLAGS}
     ${QTGCONF_LDFLAGS}
+    ${DCONFQT_LDFLAGS}
     unity-2d-private
     )
 
 
=== modified file 'launcher/app/launcherview.cpp'
--- launcher/app/launcherview.cpp	2011-06-22 08:54:52 +0000
+++ launcher/app/launcherview.cpp	2011-07-22 16:53:25 +0000
@@ -36,6 +36,9 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
+// libdconf-qt
+#include "qconf.h"
+
 #include <keyboardmodifiersmonitor.h>
 #include <hotkey.h>
 #include <hotkeymonitor.h>
@@ -55,6 +58,7 @@
 static const char* SPREAD_DBUS_METHOD_IS_SHOWN = "IsShown";
 static const char* APPLICATIONS_PLACE = "/usr/share/unity/places/applications.place";
 static const char* COMMANDS_PLACE_ENTRY = "Runner";
+static const char* LAUNCHER_DCONF_SCHEMA = "com.canonical.Unity2d.Launcher";
 
 LauncherView::LauncherView(QWidget* parent) :
     Unity2DDeclarativeView(parent),
@@ -67,8 +71,8 @@
     connect(&m_superKeyHoldTimer, SIGNAL(timeout()), SLOT(updateSuperKeyHoldState()));
     connect(this, SIGNAL(superKeyTapped()), SLOT(toggleDash()));
 
-    m_enableSuperKey.setKey("/desktop/unity-2d/launcher/super_key_enable");
-    connect(&m_enableSuperKey, SIGNAL(valueChanged()), SLOT(updateSuperKeyMonitoring()));
+    m_dconf_launcher = new QConf(LAUNCHER_DCONF_SCHEMA);
+    connect(m_dconf_launcher, SIGNAL(superKeyEnableChanged(bool)), SLOT(updateSuperKeyMonitoring()));
     updateSuperKeyMonitoring();
 
     /* Alt+F1 gives the keyboard focus to the launcher. */
@@ -86,6 +90,11 @@
     }
 }
 
+LauncherView::~LauncherView()
+{
+    delete m_dconf_launcher;
+}
+
 void
 LauncherView::activateWindow()
 {
@@ -111,7 +120,7 @@
 {
     KeyboardModifiersMonitor *modifiersMonitor = KeyboardModifiersMonitor::instance();
 
-    QVariant value = m_enableSuperKey.getValue();
+    QVariant value = m_dconf_launcher->property("superKeyEnable");
     if (!value.isValid() || value.toBool() == true) {
         QObject::connect(modifiersMonitor,
                          SIGNAL(keyboardModifiersChanged(Qt::KeyboardModifiers)),
 
=== modified file 'launcher/app/launcherview.h'
--- launcher/app/launcherview.h	2011-06-22 08:54:52 +0000
+++ launcher/app/launcherview.h	2011-07-22 16:53:25 +0000
@@ -24,13 +24,13 @@
 #include <QList>
 #include <QUrl>
 #include <QTimer>
-
-#include "gconfitem-qml-wrapper.h"
+#include <QVariant>
 
 #include <unity2ddeclarativeview.h>
 
 class DeclarativeDragDropEvent;
 class LauncherDBus;
+class QConf;
 
 class LauncherView : public Unity2DDeclarativeView
 {
@@ -40,6 +40,7 @@
 
 public:
     explicit LauncherView(QWidget* parent = NULL);
+    ~LauncherView();
 
     bool superKeyHeld() const { return m_superKeyHeld; }
 
@@ -66,7 +67,7 @@
     void focusOutEvent(QFocusEvent* event);
 
 private:
-    GConfItemQmlWrapper m_enableSuperKey;
+    QConf* m_dconf_launcher;
     bool m_superKeyPressed;
     bool m_superKeyHeld;
     QTimer m_superKeyHoldTimer;
 
=== modified file 'libunity-2d-private/src/unity2dapplication.cpp'
--- libunity-2d-private/src/unity2dapplication.cpp	2011-06-11 10:50:03 +0000
+++ libunity-2d-private/src/unity2dapplication.cpp	2011-07-22 16:53:25 +0000
@@ -21,6 +21,7 @@
 
 // Self
 #include "unity2dapplication.h"
+#include "config.h"
 
 // Qt
 
@@ -35,6 +36,13 @@
 Unity2dApplication::Unity2dApplication(int& argc, char** argv)
 : QApplication(argc, argv)
 {
+    /* Allow developers to run Unity 2D uninstalled by telling dconf-qt
+       where to look for Unity 2D's schemas.
+       It relies on the fact that the schema is compiled when running cmake.
+    */
+    if (!isRunningInstalled()) {
+        qputenv("GSETTINGS_SCHEMA_DIR", unity2dDirectory().toLocal8Bit() + "/data");
+    }
 }
 
 Unity2dApplication::~Unity2dApplication()