Merge lp:~robert-ancell/onboard/bug-982699 into lp:onboard

[Robert Ancell]

See bug 982699. I don't know if there's a migration issue for 0.96.0 and 0.97.0 users.

[marmuta (marmuta)]

Thank you. Yes we would have to migrate the old settings. Snippets in particular, but other stuff, like scanner settings, would be annoying to lose too. There are quit a lot of keys overall, it's probably best to just recursively copy them all.

AFAIK there is no official plan in place for GIO to handle this, but for the majority of installations we can probably pull the old data from dconf. At least this is how I did it before on a smaller scale, see migrate_dconf_value calls in Config.py. migrate_dconf_value doesn't handle a lot of data types yet though.

If you'd like to do this, that would be great, but let's wait until we know what exactly to do, if and where to move to.

[marmuta (marmuta)]

This is merged now. I've changed the paths to /org/onboard and added migration for all keys. Thanks again, Robert.

review: Approve

=== modified file 'Onboard/Config.py'
--- Onboard/Config.py	2012-03-31 13:29:36 +0000
+++ Onboard/Config.py	2012-04-16 01:04:18 +0000
@@ -24,19 +24,19 @@
 ###############
 
 # gsettings objects
-SCHEMA_ONBOARD          = "apps.onboard"
-SCHEMA_KEYBOARD         = "apps.onboard.keyboard"
-SCHEMA_WINDOW           = "apps.onboard.window"
-SCHEMA_WINDOW_LANDSCAPE = "apps.onboard.window.landscape"
-SCHEMA_WINDOW_PORTRAIT  = "apps.onboard.window.portrait"
-SCHEMA_ICP              = "apps.onboard.icon-palette"
-SCHEMA_ICP_LANDSCAPE    = "apps.onboard.icon-palette.landscape"
-SCHEMA_ICP_PORTRAIT     = "apps.onboard.icon-palette.portrait"
-SCHEMA_AUTO_SHOW        = "apps.onboard.auto-show"
-SCHEMA_UNIVERSAL_ACCESS = "apps.onboard.universal-access"
-SCHEMA_THEME            = "apps.onboard.theme-settings"
-SCHEMA_LOCKDOWN         = "apps.onboard.lockdown"
-SCHEMA_SCANNER          = "apps.onboard.scanner"
+SCHEMA_ONBOARD          = "com.ubuntu.onboard"
+SCHEMA_KEYBOARD         = "com.ubuntu.onboard.keyboard"
+SCHEMA_WINDOW           = "com.ubuntu.onboard.window"
+SCHEMA_WINDOW_LANDSCAPE = "com.ubuntu.onboard.window.landscape"
+SCHEMA_WINDOW_PORTRAIT  = "com.ubuntu.onboard.window.portrait"
+SCHEMA_ICP              = "com.ubuntu.onboard.icon-palette"
+SCHEMA_ICP_LANDSCAPE    = "com.ubuntu.onboard.icon-palette.landscape"
+SCHEMA_ICP_PORTRAIT     = "com.ubuntu.onboard.icon-palette.portrait"
+SCHEMA_AUTO_SHOW        = "com.ubuntu.onboard.auto-show"
+SCHEMA_UNIVERSAL_ACCESS = "com.ubuntu.onboard.universal-access"
+SCHEMA_THEME            = "com.ubuntu.onboard.theme-settings"
+SCHEMA_LOCKDOWN         = "com.ubuntu.onboard.lockdown"
+SCHEMA_SCANNER          = "com.ubuntu.onboard.scanner"
 SCHEMA_GSS              = "org.gnome.desktop.screensaver"
 SCHEMA_GDI              = "org.gnome.desktop.interface"
 
@@ -385,8 +385,8 @@
         format = Version.from_string(self.schema_version)
         if format < SCHEMA_VERSION_0_97:
 
-            # window rect moves from apps.onboard to
-            # apps.onboard.window.landscape/portrait
+            # window rect moves from com.ubuntu.onboard to
+            # com.ubuntu.onboard.window.landscape/portrait
             co = self.window.landscape
             if co.gskeys["x"].is_default() and \
                co.gskeys["y"].is_default() and \
@@ -400,8 +400,8 @@
                 migrate_dconf_value("/apps/onboard/height", co, co.gskeys["height"])
                 co.settings.apply()
 
-            # icon-palette rect moves from apps.onboard.icon-palette to
-            # apps.onboard.icon-palette.landscape/portrait
+            # icon-palette rect moves from com.ubuntu.onboard.icon-palette to
+            # com.ubuntu.onboard.icon-palette.landscape/portrait
             co = self.icp.landscape
             if co.gskeys["x"].is_default() and \
                co.gskeys["y"].is_default() and \

=== renamed file 'data/onboard.gschema.xml' => 'data/com.ubuntu.onboard.gschema.xml'
--- data/onboard.gschema.xml	2012-02-14 15:39:47 +0000
+++ data/com.ubuntu.onboard.gschema.xml	2012-04-16 01:04:18 +0000
@@ -1,5 +1,5 @@
 <schemalist>
-    <schema id="apps.onboard" path="/apps/onboard/">
+    <schema id="com.ubuntu.onboard" path="/com/ubuntu/onboard/">
         <key name="schema-version" type="s">
             <default>""</default>
             <summary>Schema version</summary>
@@ -70,17 +70,17 @@
             <summary>Current settings page</summary>
             <description>Current tab page of onboard-settings.</description>
         </key>
-        <child name="auto-show" schema="apps.onboard.auto-show" />
-        <child name="keyboard" schema="apps.onboard.keyboard" />
-        <child name="window" schema="apps.onboard.window" />
-        <child name="icon-palette" schema="apps.onboard.icon-palette" />
-        <child name="universal-access" schema="apps.onboard.universal-access" />
-        <child name="theme-settings" schema="apps.onboard.theme-settings" />
-        <child name="lockdown" schema="apps.onboard.lockdown" />
-        <child name="scanner" schema="apps.onboard.scanner" />
+        <child name="auto-show" schema="com.ubuntu.onboard.auto-show" />
+        <child name="keyboard" schema="com.ubuntu.onboard.keyboard" />
+        <child name="window" schema="com.ubuntu.onboard.window" />
+        <child name="icon-palette" schema="com.ubuntu.onboard.icon-palette" />
+        <child name="universal-access" schema="com.ubuntu.onboard.universal-access" />
+        <child name="theme-settings" schema="com.ubuntu.onboard.theme-settings" />
+        <child name="lockdown" schema="com.ubuntu.onboard.lockdown" />
+        <child name="scanner" schema="com.ubuntu.onboard.scanner" />
     </schema>
 
-    <schema id="apps.onboard.auto-show" path="/apps/onboard/auto-show/">
+    <schema id="com.ubuntu.onboard.auto-show" path="/com/ubuntu/onboard/auto-show/">
         <key name="enabled" type="b">
             <default>false</default>
             <summary>Auto-show enabled</summary>
@@ -93,7 +93,7 @@
         </key>
     </schema>
 
-    <schema id="apps.onboard.keyboard" path="/apps/onboard/keyboard/">
+    <schema id="com.ubuntu.onboard.keyboard" path="/com/ubuntu/onboard/keyboard/">
         <key name="show-click-buttons" type="b">
             <default>false</default>
             <summary>Show click buttons</summary>
@@ -115,7 +115,7 @@
         </key>
     </schema>
 
-    <schema id="apps.onboard.window" path="/apps/onboard/window/">
+    <schema id="com.ubuntu.onboard.window" path="/com/ubuntu/onboard/window/">
         <key name="window-state-sticky" type="b">
             <default>true</default>
             <summary>Always on visible workspace</summary>
@@ -172,57 +172,57 @@
             <description>Active resize handles, space separated.</description>
         </key>
 
-        <child name="landscape" schema="apps.onboard.window.landscape"/>
-        <child name="portrait" schema="apps.onboard.window.portrait"/>
-    </schema>
-
-    <schema id="apps.onboard.window.landscape" path="/apps/onboard/window/landscape/">
-        <key name="x" type="i">
-            <default>100</default>
-            <summary>X position of the keyboard</summary>
-            <description>Horizontal position of the keyboard window.</description>
-        </key>
-        <key name="y" type="i">
-            <default>50</default>
-            <summary>Y position of the keyboard</summary>
-            <description>Vertical position of the keyboard window.</description>
-        </key>
-        <key name="width" type="i">
-            <default>600</default>
-            <summary>Window width</summary>
-            <description>Width of the keyboard window.</description>
-        </key>
-        <key name="height" type="i">
-            <default>200</default>
-            <summary>Window height</summary>
-            <description>Height of the keyboard window..</description>
-        </key>
-    </schema>
-
-    <schema id="apps.onboard.window.portrait" path="/apps/onboard/window/portrait/">
-        <key name="x" type="i">
-            <default>100</default>
-            <summary>X position of the keyboard</summary>
-            <description>Horizontal position of the keyboard window.</description>
-        </key>
-        <key name="y" type="i">
-            <default>50</default>
-            <summary>Y position of the keyboard</summary>
-            <description>Vertical position of the keyboard window.</description>
-        </key>
-        <key name="width" type="i">
-            <default>600</default>
-            <summary>Window width</summary>
-            <description>Width of the keyboard window.</description>
-        </key>
-        <key name="height" type="i">
-            <default>200</default>
-            <summary>Window height</summary>
-            <description>Height of the keyboard window..</description>
-        </key>
-    </schema>
-
-    <schema id="apps.onboard.icon-palette" path="/apps/onboard/icon-palette/">
+        <child name="landscape" schema="com.ubuntu.onboard.window.landscape"/>
+        <child name="portrait" schema="com.ubuntu.onboard.window.portrait"/>
+    </schema>
+
+    <schema id="com.ubuntu.onboard.window.landscape" path="/com/ubuntu/onboard/window/landscape/">
+        <key name="x" type="i">
+            <default>100</default>
+            <summary>X position of the keyboard</summary>
+            <description>Horizontal position of the keyboard window.</description>
+        </key>
+        <key name="y" type="i">
+            <default>50</default>
+            <summary>Y position of the keyboard</summary>
+            <description>Vertical position of the keyboard window.</description>
+        </key>
+        <key name="width" type="i">
+            <default>600</default>
+            <summary>Window width</summary>
+            <description>Width of the keyboard window.</description>
+        </key>
+        <key name="height" type="i">
+            <default>200</default>
+            <summary>Window height</summary>
+            <description>Height of the keyboard window..</description>
+        </key>
+    </schema>
+
+    <schema id="com.ubuntu.onboard.window.portrait" path="/com/ubuntu/onboard/window/portrait/">
+        <key name="x" type="i">
+            <default>100</default>
+            <summary>X position of the keyboard</summary>
+            <description>Horizontal position of the keyboard window.</description>
+        </key>
+        <key name="y" type="i">
+            <default>50</default>
+            <summary>Y position of the keyboard</summary>
+            <description>Vertical position of the keyboard window.</description>
+        </key>
+        <key name="width" type="i">
+            <default>600</default>
+            <summary>Window width</summary>
+            <description>Width of the keyboard window.</description>
+        </key>
+        <key name="height" type="i">
+            <default>200</default>
+            <summary>Window height</summary>
+            <description>Height of the keyboard window..</description>
+        </key>
+    </schema>
+
+    <schema id="com.ubuntu.onboard.icon-palette" path="/com/ubuntu/onboard/icon-palette/">
         <key name="in-use" type="b">
             <default>false</default>
             <summary>Show icon palette when onboard is minimized.</summary>
@@ -233,57 +233,57 @@
             <summary>Resize handles</summary>
             <description>Active resize handles, space separated.</description>
         </key>
-        <child name="landscape" schema="apps.onboard.icon-palette.landscape"/>
-        <child name="portrait" schema="apps.onboard.icon-palette.portrait"/>
-    </schema>
-
-    <schema id="apps.onboard.icon-palette.landscape" path="/apps/onboard/icon-palette/landscape/">
-        <key name="x" type="i">
-            <default>100</default>
-            <summary>Horizontal position of the icon palette.</summary>
-            <description>Horizontal position of the icon palette on the screen.</description>
-        </key>
-        <key name="y" type="i">
-            <default>50</default>
-            <summary>Vertical position of the icon palette.</summary>
-            <description>Vertical position of the icon palette on the screen.</description>
-        </key>
-        <key name="width" type="i">
-            <default>64</default>
-            <summary>Width of the icon palette.</summary>
-            <description>Horizontal size in pixel of the icon palette.</description>
-        </key>
-        <key name="height" type="i">
-            <default>64</default>
-            <summary>Height of the icon palette.</summary>
-            <description>Vertical size in pixel of the icon palette.</description>
-        </key>
-    </schema>
-
-    <schema id="apps.onboard.icon-palette.portrait" path="/apps/onboard/icon-palette/portrait/">
-        <key name="x" type="i">
-            <default>100</default>
-            <summary>Horizontal position of the icon palette.</summary>
-            <description>Horizontal position of the icon palette on the screen.</description>
-        </key>
-        <key name="y" type="i">
-            <default>50</default>
-            <summary>Vertical position of the icon palette.</summary>
-            <description>Vertical position of the icon palette on the screen.</description>
-        </key>
-        <key name="width" type="i">
-            <default>64</default>
-            <summary>Width of the icon palette.</summary>
-            <description>Horizontal size in pixel of the icon palette.</description>
-        </key>
-        <key name="height" type="i">
-            <default>64</default>
-            <summary>Height of the icon palette.</summary>
-            <description>Vertical size in pixel of the icon palette.</description>
-        </key>
-    </schema>
-
-    <schema id="apps.onboard.universal-access" path="/apps/onboard/universal-access/">
+        <child name="landscape" schema="com.ubuntu.onboard.icon-palette.landscape"/>
+        <child name="portrait" schema="com.ubuntu.onboard.icon-palette.portrait"/>
+    </schema>
+
+    <schema id="com.ubuntu.onboard.icon-palette.landscape" path="/com/ubuntu/onboard/icon-palette/landscape/">
+        <key name="x" type="i">
+            <default>100</default>
+            <summary>Horizontal position of the icon palette.</summary>
+            <description>Horizontal position of the icon palette on the screen.</description>
+        </key>
+        <key name="y" type="i">
+            <default>50</default>
+            <summary>Vertical position of the icon palette.</summary>
+            <description>Vertical position of the icon palette on the screen.</description>
+        </key>
+        <key name="width" type="i">
+            <default>64</default>
+            <summary>Width of the icon palette.</summary>
+            <description>Horizontal size in pixel of the icon palette.</description>
+        </key>
+        <key name="height" type="i">
+            <default>64</default>
+            <summary>Height of the icon palette.</summary>
+            <description>Vertical size in pixel of the icon palette.</description>
+        </key>
+    </schema>
+
+    <schema id="com.ubuntu.onboard.icon-palette.portrait" path="/com/ubuntu/onboard/icon-palette/portrait/">
+        <key name="x" type="i">
+            <default>100</default>
+            <summary>Horizontal position of the icon palette.</summary>
+            <description>Horizontal position of the icon palette on the screen.</description>
+        </key>
+        <key name="y" type="i">
+            <default>50</default>
+            <summary>Vertical position of the icon palette.</summary>
+            <description>Vertical position of the icon palette on the screen.</description>
+        </key>
+        <key name="width" type="i">
+            <default>64</default>
+            <summary>Width of the icon palette.</summary>
+            <description>Horizontal size in pixel of the icon palette.</description>
+        </key>
+        <key name="height" type="i">
+            <default>64</default>
+            <summary>Height of the icon palette.</summary>
+            <description>Vertical size in pixel of the icon palette.</description>
+        </key>
+    </schema>
+
+    <schema id="com.ubuntu.onboard.universal-access" path="/com/ubuntu/onboard/universal-access/">
         <key name="drag-threshold" type="i">
             <default>-1</default>
             <summary>Drag threshold</summary>
@@ -301,7 +301,7 @@
         </key>
     </schema>
 
-    <schema id="apps.onboard.theme-settings" path="/apps/onboard/theme-settings/">
+    <schema id="com.ubuntu.onboard.theme-settings" path="/com/ubuntu/onboard/theme-settings/">
         <key name="color-scheme" type="s">
             <default>''</default>
             <summary>Color scheme filename</summary>
@@ -349,7 +349,7 @@
         </key>
     </schema>
 
-    <schema id="apps.onboard.lockdown" path="/apps/onboard/lockdown/">
+    <schema id="com.ubuntu.onboard.lockdown" path="/com/ubuntu/onboard/lockdown/">
         <key name="disable-click-buttons" type="b">
             <default>false</default>
             <summary>Disallow showing click helpers</summary>
@@ -377,20 +377,20 @@
         </key>
     </schema>
 
-    <enum id="apps.onboard.scanner.ScanMode">
+    <enum id="com.ubuntu.onboard.scanner.ScanMode">
         <value nick="Autoscan" value="0"/>
         <value nick="Overscan" value="1"/>
         <value nick="Stepscan" value="2"/>
         <value nick="Directed" value="3"/>
     </enum>
 
-    <schema id="apps.onboard.scanner" path="/apps/onboard/scanner/">
+    <schema id="com.ubuntu.onboard.scanner" path="/com/ubuntu/onboard/scanner/">
         <key name="enabled" type="b">
             <default>false</default>
             <summary>Enable scanner</summary>
             <description>Set Onboard to keyboard scanning mode.</description>
         </key>
-        <key name="mode" enum="apps.onboard.scanner.ScanMode">
+        <key name="mode" enum="com.ubuntu.onboard.scanner.ScanMode">
             <default>"Autoscan"</default>
             <summary>Scan mode</summary>
             <description>The scan mode determines how the scanner moves between keys.</description>

=== modified file 'data/onboard.convert'
--- data/onboard.convert	2012-01-21 06:44:13 +0000
+++ data/onboard.convert	2012-04-16 01:04:18 +0000
@@ -1,4 +1,4 @@
-[apps.onboard]
+[com.ubuntu.onboard]
 layout = /apps/onboard/layout_filename
 theme = /apps/onboard/theme_filename
 x = /apps/onboard/horizontal_position
@@ -10,7 +10,7 @@
 show-status-icon = /apps/onboard/use_status_icon
 xembed-onboard = /apps/onboard/xembed_onboard
 
-[apps.onboard.icon-palette]
+[com.ubuntu.onboard.icon-palette]
 in-use = /apps/onboard/icon_palette/in_use
 x = /apps/onboard/icon_palette/horizontal_position
 y = /apps/onboard/icon_palette/vertical_position