Ticket #2002: 0001-Activity-does-not-pass-parent-window-xid-to-ObjectCh.patch

File 0001-Activity-does-not-pass-parent-window-xid-to-ObjectCh.patch, 2.9 KB (added by alsroot, 14 years ago)

  • TurtleArtActivity.py 

    From c7c67a1ec094094bbfeb867f783654d5f1e0186a Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Tue, 18 May 2010 22:34:29 +0000
Subject: Activity does not pass parent window xid to ObjectChooser #2002


diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py
index d91be2d..82cfded 100644
    a b class TurtleArtActivity(activity.Activity): 
    491491
    492492    def _do_load_ta_project_cb(self, button):
    493493        from sugar.graphics.objectchooser import ObjectChooser
    494         chooser = ObjectChooser(_("Project"), None, gtk.DIALOG_MODAL | \
     494        chooser = ObjectChooser(_("Project"), self, gtk.DIALOG_MODAL | \
    495495            gtk.DIALOG_DESTROY_WITH_PARENT)
    496496        try:
    497497            result = chooser.run()
    … … class TurtleArtActivity(activity.Activity): 
    511511    # Import Python code from the Journal to load into "myblock"
    512512    def _import_py(self):
    513513        from sugar.graphics.objectchooser import ObjectChooser
    514         chooser = ObjectChooser('Python code', None, gtk.DIALOG_MODAL | \
     514        chooser = ObjectChooser('Python code', self, gtk.DIALOG_MODAL | \
    515515            gtk.DIALOG_DESTROY_WITH_PARENT)
    516516        try:
    517517            result = chooser.run()
    … … class SaveAsToolbar(gtk.Toolbar): 
    11831183
    11841184    def do_load_ta_project_cb(self, button):
    11851185        from sugar.graphics.objectchooser import ObjectChooser
    1186         chooser = ObjectChooser(_("Project"), None, gtk.DIALOG_MODAL | \
     1186        chooser = ObjectChooser(_("Project"), self.activity, gtk.DIALOG_MODAL | \
    11871187            gtk.DIALOG_DESTROY_WITH_PARENT)
    11881188        try:
    11891189            result = chooser.run()
    … … class SaveAsToolbar(gtk.Toolbar): 
    12031203    # Import Python code from the Journal to load into "myblock"
    12041204    def import_py(self):
    12051205        from sugar.graphics.objectchooser import ObjectChooser
    1206         chooser = ObjectChooser('Python code', None, gtk.DIALOG_MODAL | \
     1206        chooser = ObjectChooser('Python code', self.activity, gtk.DIALOG_MODAL | \
    12071207            gtk.DIALOG_DESTROY_WITH_PARENT)
    12081208        try:
    12091209            result = chooser.run()

  • tawindow.py 

    diff --git a/tawindow.py b/tawindow.py
index 731d8e2..5ba06d5 100644
    a b dead_abovering = {'A':197,'a':229} 
    9696def twNew(win, path, lang, parent=None):
    9797    tw = taWindow()
    9898    tw.window = win
     99    tw.parent = parent
    99100    tw.path = os.path.join(path,'images')
    100101    tw.path_lang = os.path.join(path,'images',lang)
    101102    tw.path_en = os.path.join(path,'images/en') # en as fallback
    … … def button_release(tw, x, y, verbose=False): 
    460461        else: run_stack(tw, spr)
    461462
    462463def import_from_journal(tw, spr):
    463     chooser = ObjectChooser('Choose image', None, gtk.DIALOG_MODAL | \
     464    chooser = ObjectChooser('Choose image', tw.parent, gtk.DIALOG_MODAL | \
    464465        gtk.DIALOG_DESTROY_WITH_PARENT)
    465466    try:
    466467        result = chooser.run()