diff options
author | Aleksey Lim <alsroot@member.fsf.org> | 2008-12-27 08:19:28 (GMT) |
---|---|---|
committer | Aleksey Lim <alsroot@member.fsf.org> | 2008-12-27 08:19:28 (GMT) |
commit | 310687f48af7263c76e0032926f4526c16e87778 (patch) | |
tree | 73c397b0d4a042c97a88b6139d6acde77f69d90a | |
parent | 7ce6046f986e2a3b6c13748215fc80c7e077fd8b (diff) |
0.83 Palette fixes
-rw-r--r-- | TamTamEdit.activity/Edit/MainWindow.py | 7 | ||||
-rw-r--r-- | TamTamJam.activity/Jam/Popup.py | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/TamTamEdit.activity/Edit/MainWindow.py b/TamTamEdit.activity/Edit/MainWindow.py index dc698c0..e613351 100644 --- a/TamTamEdit.activity/Edit/MainWindow.py +++ b/TamTamEdit.activity/Edit/MainWindow.py @@ -17,7 +17,7 @@ from EditToolbars import mainToolbar from EditToolbars import generateToolbar from gettext import gettext as _ from subprocess import Popen -from sugar.graphics.palette import Palette, Invoker, _palette_observer +from sugar.graphics.palette import Palette, Invoker from sugar.datastore import datastore import time import os @@ -2051,8 +2051,6 @@ class Popup( Palette ): self.props.invoker = NoneInvoker() self.set_group_id( "TamTamPopup" ) - self._set_state( Palette.SECONDARY ) # skip to fully exposed - self.connect( "key-press-event", self.on_key_press ) self.connect( "key-release-event", self.on_key_release ) @@ -2068,11 +2066,10 @@ class Popup( Palette ): Palette._show( self ) if self._palette_popup_sid != None: - #_palette_observer.disconnect( self._palette_popup_sid ) # don't hide when other palettes pop self._palette_popup_sid = None def popup( self, immediate = False ): - Palette.popup( self, immediate ) + Palette.popup( self, immediate, state = Palette.SECONDARY ) def popdown( self, immediate = False ): self.block = None diff --git a/TamTamJam.activity/Jam/Popup.py b/TamTamJam.activity/Jam/Popup.py index 0711c5a..2606f6a 100644 --- a/TamTamJam.activity/Jam/Popup.py +++ b/TamTamJam.activity/Jam/Popup.py @@ -7,7 +7,7 @@ import common.Config as Config from gettext import gettext as _ from sugar.graphics import style -from sugar.graphics.palette import Palette, Invoker, _palette_observer +from sugar.graphics.palette import Palette, Invoker import gobject from Jam import Block @@ -51,8 +51,6 @@ class Popup( Palette ): self.props.invoker = NoneInvoker() self.set_group_id( "TamTamPopup" ) - self._set_state( Palette.SECONDARY ) # skip to fully exposed - self.connect( "key-press-event", self.on_key_press ) self.connect( "key-release-event", self.on_key_release ) @@ -68,11 +66,10 @@ class Popup( Palette ): Palette._show( self ) if self._palette_popup_sid != None: - _palette_observer.disconnect( self._palette_popup_sid ) # don't hide when other palettes pop self._palette_popup_sid = None def popup( self, immediate = False ): - Palette.popup( self, immediate ) + Palette.popup( self, immediate, state = Palette.SECONDARY ) def popdown( self, immediate = False ): self.block = None |