Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot <root@localhost.localdomain>2010-12-30 00:10:10 (GMT)
committer Aleksey Lim <alsroot@member.fsf.org>2010-12-29 18:58:06 (GMT)
commit91a500fda4fb6cf46f6ab5d30b197859ee3c42da (patch)
treede797043726c4033b341a5f876b7bd1e8b321423
parent24c21dfb99bb73ffed2401a9008bfcbc238440b6 (diff)
sl#2004 Activity does not pass parent window xid to ObjectChooserHEADmaster
Signed-off-by: Mohit Nagpal <mohit@localhost.localdomain>
-rwxr-xr-x[-rw-r--r--]SliderPuzzleUI.py2
-rwxr-xr-x[-rw-r--r--]mmm_modules/image_category.py5
2 files changed, 4 insertions, 3 deletions
diff --git a/SliderPuzzleUI.py b/SliderPuzzleUI.py
index 70a7102..802ea82 100644..100755
--- a/SliderPuzzleUI.py
+++ b/SliderPuzzleUI.py
@@ -196,7 +196,7 @@ class SliderPuzzleUI (gtk.Table):
- self.thumb = ImageSelectorWidget(frame_color=COLOR_FRAME_THUMB, prepare_btn_cb=prepare_btn, image_dir='images')
+ self.thumb = ImageSelectorWidget(self._parent,frame_color=COLOR_FRAME_THUMB, prepare_btn_cb=prepare_btn, image_dir='images')
self.thumb.connect("category_press", self.do_select_category)
self.thumb.connect("image_press", self.set_nr_pieces)
control_panel_box.pack_start(self.thumb, False)
diff --git a/mmm_modules/image_category.py b/mmm_modules/image_category.py
index 5f13733..4ea4782 100644..100755
--- a/mmm_modules/image_category.py
+++ b/mmm_modules/image_category.py
@@ -160,7 +160,7 @@ class ImageSelectorWidget (gtk.Table):
__gsignals__ = {'category_press' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, ()),
'image_press' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, ()),}
- def __init__ (self,
+ def __init__ (self,parentp,
width=IMAGE_SIZE,
height=IMAGE_SIZE,
frame_color=None,
@@ -169,6 +169,7 @@ class ImageSelectorWidget (gtk.Table):
image_dir=None):
gtk.Table.__init__(self, 2,5,False)
self._signals = []
+ self.parentp = parentp
self.width = width
self.height = height
self.image = gtk.Image()
@@ -218,7 +219,7 @@ class ImageSelectorWidget (gtk.Table):
else:
filter = { }
- chooser = ObjectChooser(_('Choose image'), None, #self._parent,
+ chooser = ObjectChooser(_('Choose image'), self.parentp, #self._parent,
gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
**filter)
try: