Bring back the Control Panel

The keyboard and updater section still need to be ported.

Signed-off-by: Manuel Quiñones <manuq@laptop.org>
Acked-by: Simon Schampijer <simon@laptop.org>

9 files changed, 28 insertions, 24 deletions

diff --git a/extensions/cpsection/aboutcomputer/view.py b/extensions/cpsection/aboutcomputer/view.py
index 05529ca..fd6c38f 100644
--- a/extensions/cpsection/aboutcomputer/view.py
+++ b/extensions/cpsection/aboutcomputer/view.py
@@ -195,7 +195,7 @@ class AboutComputer(SectionView):
         label_info.show()
         vbox_copyright.pack_start(label_info, False, True, 0)
 
-        expander = Gtk.Expander(_('Full license:'))
+        expander = Gtk.Expander(label=_('Full license:'))
         expander.connect('notify::expanded', self.license_expander_cb)
         expander.show()
         vbox_copyright.pack_start(expander, True, True, 0)
diff --git a/extensions/cpsection/aboutme/view.py b/extensions/cpsection/aboutme/view.py
index a899a97..293923d 100644
--- a/extensions/cpsection/aboutme/view.py
+++ b/extensions/cpsection/aboutme/view.py
@@ -204,10 +204,10 @@ class AboutMe(SectionView):
             self._nick_alert.props.msg = self.restart_msg
             self._nick_alert.show()
 
-        self._center_in_panel = Gtk.Alignment.new(0.5)
+        self._center_in_panel = Gtk.Alignment.new(0.5, 0, 0, 0)
         self._center_in_panel.add(self._nick_box)
-        self.pack_start(self._center_in_panel, False)
-        self.pack_start(self._nick_alert_box, False)
+        self.pack_start(self._center_in_panel, False, False, 0)
+        self.pack_start(self._nick_alert_box, False, False, 0)
         self._nick_box.show()
         self._nick_alert_box.show()
         self._center_in_panel.show()
@@ -246,11 +246,11 @@ class AboutMe(SectionView):
             self._color_alert.props.msg = self.restart_msg
             self._color_alert.show()
 
-        self._center_in_panel = Gtk.Alignment.new(0.5)
+        self._center_in_panel = Gtk.Alignment.new(0.5, 0, 0, 0)
         self._center_in_panel.add(self._color_box)
-        self.pack_start(self._color_label, False)
-        self.pack_start(self._center_in_panel, False)
-        self.pack_start(self._color_alert_box, False)
+        self.pack_start(self._color_label, False, False, 0)
+        self.pack_start(self._center_in_panel, False, False, 0)
+        self.pack_start(self._color_alert_box, False, False, 0)
         self._color_label.show()
         self._color_box.show()
         self._color_alert_box.show()
diff --git a/extensions/cpsection/datetime/view.py b/extensions/cpsection/datetime/view.py
index 7586868..64789b4 100644
--- a/extensions/cpsection/datetime/view.py
+++ b/extensions/cpsection/datetime/view.py
@@ -47,7 +47,7 @@ class TimeZone(SectionView):
                         style.COLOR_WHITE.get_gdk_color())
         self._entry.modify_base(Gtk.StateType.INSENSITIVE,
                           style.COLOR_WHITE.get_gdk_color())
-        self.pack_start(self._entry, False)
+        self.pack_start(self._entry, False, False, 0)
         self._entry.show()
 
         self._scrolled_window = Gtk.ScrolledWindow()
@@ -62,7 +62,7 @@ class TimeZone(SectionView):
 
         self._treeview = Gtk.TreeView(self._store)
         self._treeview.set_search_entry(self._entry)
-        self._treeview.set_search_equal_func(self._search)
+        self._treeview.set_search_equal_func(self._search, None)
         self._treeview.set_search_column(0)
         self._scrolled_window.add(self._treeview)
         self._treeview.show()
@@ -78,7 +78,7 @@ class TimeZone(SectionView):
         self._scrolled_window.show()
 
         self._zone_alert_box = Gtk.HBox(spacing=style.DEFAULT_SPACING)
-        self.pack_start(self._zone_alert_box, False)
+        self.pack_start(self._zone_alert_box, False, False, 0)
 
         self._zone_alert = InlineAlert()
         self._zone_alert_box.pack_start(self._zone_alert, True, True, 0)
diff --git a/extensions/cpsection/frame/view.py b/extensions/cpsection/frame/view.py
index f3b796e..a17a4f6 100644
--- a/extensions/cpsection/frame/view.py
+++ b/extensions/cpsection/frame/view.py
@@ -85,7 +85,8 @@ class Frame(SectionView):
 
         adj = Gtk.Adjustment(value=100, lower=0, upper=_MAX_DELAY,
                              step_incr=100, page_incr=100, page_size=0)
-        self._corner_delay_slider = Gtk.HScale(adj)
+        self._corner_delay_slider = Gtk.HScale()
+        self._corner_delay_slider.set_adjustment(adj)
         self._corner_delay_slider.set_digits(0)
         self._corner_delay_slider.connect('format-value',
                                           self.__corner_delay_format_cb)
@@ -120,7 +121,8 @@ class Frame(SectionView):
 
         adj = Gtk.Adjustment(value=100, lower=0, upper=_MAX_DELAY,
                              step_incr=100, page_incr=100, page_size=0)
-        self._edge_delay_slider = Gtk.HScale(adj)
+        self._edge_delay_slider = Gtk.HScale()
+        self._edge_delay_slider.set_adjustment(adj)
         self._edge_delay_slider.set_digits(0)
         self._edge_delay_slider.connect('format-value',
                                         self.__edge_delay_format_cb)
diff --git a/extensions/cpsection/language/view.py b/extensions/cpsection/language/view.py
index ec364e1..e88e383 100644
--- a/extensions/cpsection/language/view.py
+++ b/extensions/cpsection/language/view.py
@@ -61,7 +61,7 @@ class Language(SectionView):
         self._text.set_width_chars(100)
         self._text.set_line_wrap(True)
         self._text.set_alignment(0, 0)
-        self.pack_start(self._text, False)
+        self.pack_start(self._text, False, False, 0)
         self._text.show()
 
         scrolled = Gtk.ScrolledWindow()
@@ -75,7 +75,7 @@ class Language(SectionView):
         scrolled.add_with_viewport(self._table)
 
         self._lang_alert_box = Gtk.HBox(spacing=style.DEFAULT_SPACING)
-        self.pack_start(self._lang_alert_box, False)
+        self.pack_start(self._lang_alert_box, False, True, 0)
 
         self._lang_alert = InlineAlert()
         self._lang_alert_box.pack_start(self._lang_alert, True, True, 0)
@@ -93,7 +93,7 @@ class Language(SectionView):
 
         self._table.resize(self._selected_lang_count, 3)
 
-        label = Gtk.Label(label=str=str(self._selected_lang_count))
+        label = Gtk.Label(label=str(self._selected_lang_count))
         label.modify_fg(Gtk.StateType.NORMAL,
             style.COLOR_SELECTION_GREY.get_gdk_color())
         self._labels.append(label)
@@ -108,7 +108,7 @@ class Language(SectionView):
 
         combobox = Gtk.ComboBox(model=store)
         cell = Gtk.CellRendererText()
-        combobox.pack_start(cell, True, True, 0)
+        combobox.pack_start(cell, True)
         combobox.add_attribute(cell, 'text', 1)
 
         if locale_code:
diff --git a/extensions/cpsection/modemconfiguration/view.py b/extensions/cpsection/modemconfiguration/view.py
index 2fe0a6f..7257679 100644
--- a/extensions/cpsection/modemconfiguration/view.py
+++ b/extensions/cpsection/modemconfiguration/view.py
@@ -41,7 +41,8 @@ class EntryWithLabel(Gtk.HBox):
         self.pack_start(self.label, False, True, 0)
         self.label.show()
 
-        self._entry = Gtk.Entry(25)
+        self._entry = Gtk.Entry()
+        self._entry.set_max_length(25)
         self._entry.set_width_chars(25)
         self.pack_start(self._entry, False, True, 0)
         self._entry.show()
@@ -71,7 +72,7 @@ class ModemConfiguration(SectionView):
         self._text.set_width_chars(100)
         self._text.set_line_wrap(True)
         self._text.set_alignment(0, 0)
-        self.pack_start(self._text, False)
+        self.pack_start(self._text, False, False, 0)
         self._text.show()
 
         self._username_entry = EntryWithLabel(_('Username:'))
diff --git a/extensions/cpsection/network/view.py b/extensions/cpsection/network/view.py
index 018ade3..f3a1b6b 100644
--- a/extensions/cpsection/network/view.py
+++ b/extensions/cpsection/network/view.py
@@ -117,7 +117,7 @@ class Network(SectionView):
         box_wireless.show()
 
         separator_mesh = Gtk.HSeparator()
-        workspace.pack_start(separator_mesh, False)
+        workspace.pack_start(separator_mesh, False, False, 0)
         separator_mesh.show()
 
         label_mesh = Gtk.Label(label=_('Collaboration'))
diff --git a/extensions/cpsection/updater/backends/aslo.py b/extensions/cpsection/updater/backends/aslo.py
index c9bcd0f..8e10e7c 100644
--- a/extensions/cpsection/updater/backends/aslo.py
+++ b/extensions/cpsection/updater/backends/aslo.py
@@ -85,7 +85,7 @@ class _UpdateFetcher(object):
         logging.debug('Fetch %s', url)
 
         self._completion_cb = completion_cb
-        self._file = Gio.File(url)
+        self._file = Gio.File.new_for_uri(url)
         self._stream = None
         self._xml_data = ''
         self._bundle = bundle
diff --git a/extensions/cpsection/updater/view.py b/extensions/cpsection/updater/view.py
index a73a5b9..2a1f643 100644
--- a/extensions/cpsection/updater/view.py
+++ b/extensions/cpsection/updater/view.py
@@ -85,7 +85,7 @@ class ActivityUpdater(SectionView):
             self._update_box.install_button.connect('clicked',
                     self.__install_button_clicked_cb)
 
-        self.pack_start(self._update_box, expand=True, fill=True)
+        self.pack_start(self._update_box, expand=True, fill=True, padding=0)
         self._update_box.show()
 
     def _switch_to_progress_pane(self):
@@ -101,7 +101,7 @@ class ActivityUpdater(SectionView):
             self._progress_pane.cancel_button.connect('clicked',
                     self.__cancel_button_clicked_cb)
 
-        self.pack_start(self._progress_pane, expand=True, fill=False)
+        self.pack_start(self._progress_pane, expand=True, fill=False, padding=0)
         self._progress_pane.show()
 
     def _clear_center(self):
@@ -202,7 +202,8 @@ class ProgressPane(Gtk.VBox):
         self.pack_start(self._label, True, True, 0)
         self._label.show()
 
-        alignment_box = Gtk.Alignment.new(xalign=0.5, yalign=0.5)
+        alignment_box = Gtk.Alignment.new(xalign=0.5, yalign=0.5,
+                                          xscale=0, yscale=0)
         self.pack_start(alignment_box, True, True, 0)
         alignment_box.show()