Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Kaufmann <humitos@gmail.com>2012-11-29 14:18:41 (GMT)
committer Simon Schampijer <simon@laptop.org>2012-11-29 15:31:04 (GMT)
commit0066fdf1de1ffba602421ebecc556c627d5a658e (patch)
tree784e991fe8fc3f662bcd0e4876188b2a9a966d42
parentdc6851d43d13bf6227b4103131666cb7921d1eee (diff)
Hide the frame when 'My Settings' is shown SL #4071
When the frame is popped up and the user clicks on 'My Settings', the frame is hidden and the Control Panel ModalAlert is shown. I had to import the frame module inside the menuitem activate callback because importing it at the top genereates an import recursion. Signed-off-by: Manuel Kaufmann <humitos@gmail.com> Acked-by: Simon Schampijer <simon@laptop.org>
-rw-r--r--src/jarabe/view/buddymenu.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/jarabe/view/buddymenu.py b/src/jarabe/view/buddymenu.py
index 2d2a7fa..e38d215 100644
--- a/src/jarabe/view/buddymenu.py
+++ b/src/jarabe/view/buddymenu.py
@@ -126,6 +126,12 @@ class BuddyMenu(Palette):
self._quit(get_session_manager().shutdown)
def __controlpanel_activate_cb(self, menu_item):
+ # hide the frame when control panel is shown
+ import jarabe.frame
+ frame = jarabe.frame.get_view()
+ frame.hide()
+
+ # show the control panel
panel = ControlPanel()
panel.set_transient_for(self._widget.get_toplevel())
panel.show()