Merge lp:~mvo/software-center/trivial-restore-state-fix into lp:software-center

[Michael Vogt]

Fix the initial window size to be consistent with what we did with 5.2 again. Started trivial, is a little less trivial now and makes the config.app_window_size a property that supports tuples.

[lp:~mvo/software-center/trivial-restore-state-fix]

3153. By Michael Vogt on 2012-09-05

small stylistic fixes

[Gary Lasker (gary-lasker)]

Very nice, thank you, mvo!

review: Approve

=== modified file 'softwarecenter/config.py'
--- softwarecenter/config.py	2012-08-29 20:56:32 +0000
+++ softwarecenter/config.py	2012-09-05 15:11:20 +0000
@@ -99,11 +99,6 @@
         lambda self, value: self._generic_setbool("add_to_launcher", value),
         None,
         "Defines if apps should get added to the unity launcher")
-    app_window_size = property(
-        lambda self: self._generic_get("size", default="-1, -1"),
-        lambda self, value: self._generic_set("size", value),
-        None,
-        "Defines the size of the application window")
     app_window_maximized = property(
         lambda self: self._generic_getbool("maximized", default=False),
         lambda self, value: self._generic_setbool("maximized", value),
@@ -155,6 +150,17 @@
         None,
         "The account id to use when sending via gwibber")
 
+    # app_window_size is special as its a tuple
+    def _app_window_size_get(self):
+        size_as_string = self._generic_get("size", default="-1, -1")
+        return [int(v) for v in size_as_string.split(",")]
+    def _app_window_size_set(self, size_tuple):
+        size_as_string = "%s, %s" % (size_tuple[0], size_tuple[1])
+        self._generic_set("size", size_as_string)
+    app_window_size = property(_app_window_size_get, _app_window_size_set,
+        None,
+        "Defines the size of the application window as a tuple (x,y)")
+
 
 # one global instance of the config
 _software_center_config = None

=== modified file 'softwarecenter/ui/gtk3/app.py'
--- softwarecenter/ui/gtk3/app.py	2012-09-03 09:31:29 +0000
+++ softwarecenter/ui/gtk3/app.py	2012-09-05 15:11:20 +0000
@@ -1356,9 +1356,9 @@
             self.view_manager.set_active_view(ViewPages.AVAILABLE)
 
     def restore_state(self):
-        (x, y) = self.config.app_window_size.split(",")
+        (x, y) = self.config.app_window_size
         if x > 0 and y > 0:
-            self.window_main.set_default_size(int(x), int(y))
+            self.window_main.set_default_size(x, y)
         else:
             # on first launch, specify the default window size to take
             # advantage of the available screen real estate (but set a
@@ -1382,7 +1382,7 @@
         if not maximized:
             # size only matters when non-maximized
             size = self.window_main.get_size()
-            self.config.app_window_size = "%s, %s" % (size[0], size[1])
+            self.config.app_window_size = [size[0], size[1]]
         self.config.write()
 
     def write_memory_dump(self, fname=None):

=== modified file 'tests/test_config.py'
--- tests/test_config.py	2012-08-29 07:27:51 +0000
+++ tests/test_config.py	2012-09-05 15:11:20 +0000
@@ -30,15 +30,23 @@
     def test_properties_default_bool(self):
         """ test default values for properties """
         self.assertTrue(self.config.add_to_unity_launcher)
-        self.assertEqual(self.config.app_window_size, "-1, -1")
+
+    def test_properties_default_window_size(self):
+        """ default value for window size tuple """
+        self.assertEqual(self.config.app_window_size, [-1, -1])
+
+    def test_properties_window_size(self):
+        """ test the app_window_size getter/setter """
+        self.config.app_window_size = [10, 10]
+        self.assertEqual(self.config.app_window_size, [10, 10])
 
     def test_property_simple_string(self):
         """ test a string property """
-        for value in [ "", "10, 10"]:
-            self.config.app_window_size = value
-            self.assertEqual(self.config.app_window_size, value)
+        for value in [ "", "xxxyyy"]:
+            self.config.recommender_uuid = value
+            self.assertEqual(self.config.recommender_uuid, value)
             self.assertEqual(
-                self.config.get("general", "size"), value)
+                self.config.get("general", "recommender_uuid"), value)
 
     def test_write(self):
         """ test that write writes """