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>

3 files changed, 10 insertions, 10 deletions

diff --git a/src/jarabe/controlpanel/gui.py b/src/jarabe/controlpanel/gui.py
index b075638..f8afca3 100644
--- a/src/jarabe/controlpanel/gui.py
+++ b/src/jarabe/controlpanel/gui.py
@@ -88,7 +88,7 @@ class ControlPanel(Gtk.Window):
 
     def __realize_cb(self, widget):
         self.set_type_hint(Gdk.WindowTypeHint.DIALOG)
-        self.window.set_accept_focus(True)
+        self.get_window().set_accept_focus(True)
 
     def _set_canvas(self, canvas):
         if self._canvas:
@@ -100,12 +100,12 @@ class ControlPanel(Gtk.Window):
     def _set_toolbar(self, toolbar):
         if self._toolbar:
             self._vbox.remove(self._toolbar)
-        self._vbox.pack_start(toolbar, False)
+        self._vbox.pack_start(toolbar, False, False, 0)
         self._vbox.reorder_child(toolbar, 0)
         self._toolbar = toolbar
         if not self._separator:
             self._separator = Gtk.HSeparator()
-            self._vbox.pack_start(self._separator, False)
+            self._vbox.pack_start(self._separator, False, False, 0)
             self._vbox.reorder_child(self._separator, 1)
             self._separator.show()
 
@@ -135,7 +135,7 @@ class ControlPanel(Gtk.Window):
             del self._options['power']
 
         try:
-            import xklavier
+            from gi.repository import Xkl
         except ImportError:
             del self._options['keyboard']
 
@@ -311,7 +311,7 @@ class ControlPanel(Gtk.Window):
             alert.add_button(Gtk.ResponseType.APPLY, _('Restart now'), icon)
             icon.show()
 
-            self._vbox.pack_start(alert, False)
+            self._vbox.pack_start(alert, False, False, 0)
             self._vbox.reorder_child(alert, 2)
             alert.connect('response', self.__response_cb)
             alert.show()
@@ -401,12 +401,12 @@ class _SectionIcon(Gtk.EventBox):
         self._icon = Icon(icon_name=self._icon_name,
                           pixel_size=self._pixel_size,
                           xo_color=self._xo_color)
-        self._vbox.pack_start(self._icon, expand=False, fill=False)
+        self._vbox.pack_start(self._icon, expand=False, fill=False, padding=0)
 
         self._label = Gtk.Label(label=self._title)
         self._label.modify_fg(Gtk.StateType.NORMAL,
                               style.COLOR_WHITE.get_gdk_color())
-        self._vbox.pack_start(self._label, expand=False, fill=False)
+        self._vbox.pack_start(self._label, expand=False, fill=False, padding=0)
 
         self._vbox.set_spacing(style.DEFAULT_SPACING)
         self.set_visible_window(False)
diff --git a/src/jarabe/controlpanel/inlinealert.py b/src/jarabe/controlpanel/inlinealert.py
index d768724..3c0164e 100644
--- a/src/jarabe/controlpanel/inlinealert.py
+++ b/src/jarabe/controlpanel/inlinealert.py
@@ -62,8 +62,8 @@ class InlineAlert(Gtk.HBox):
         self.modify_bg(Gtk.StateType.NORMAL,
                        style.COLOR_WHITE.get_gdk_color())
 
-        self.pack_start(self._icon, False)
-        self.pack_start(self._msg_label, False)
+        self.pack_start(self._icon, False, False, 0)
+        self.pack_start(self._msg_label, False, False, 0)
         self._msg_label.show()
         self._icon.show()
 
diff --git a/src/jarabe/view/buddymenu.py b/src/jarabe/view/buddymenu.py
index a2c0c92..d17f4ff 100644
--- a/src/jarabe/view/buddymenu.py
+++ b/src/jarabe/view/buddymenu.py
@@ -123,7 +123,7 @@ class BuddyMenu(Palette):
 
     def __controlpanel_activate_cb(self, menu_item):
         panel = ControlPanel()
-        panel.set_transient_for(self.get_toplevel())
+        panel.set_transient_for(self._widget.get_toplevel())
         panel.show()
 
     def _update_invite_menu(self, activity):