diff options
| author | florent <florent.pigout@gmail.com> | 2011-04-28 19:35:14 (GMT) |
|---|---|---|
| committer | florent <florent.pigout@gmail.com> | 2011-04-28 19:35:14 (GMT) |
| commit | f819d38d4001a90b207ef1f8420bed49d5383fb6 (patch) | |
| tree | 754f01bc54f499410562d1dd7323f7241c2721a8 | |
| parent | 1cc8cd378b181c67dbfbcf4978478d6847d68ad1 (diff) | |
fix project merge error on import
| -rw-r--r-- | activity.py | 2 | ||||
| -rw-r--r-- | atoidejouer/tools/storage.py | 9 | ||||
| -rw-r--r-- | atoidejouer/ui/screens.py | 17 |
3 files changed, 17 insertions, 11 deletions
diff --git a/activity.py b/activity.py index bf6d6ee..673c3de 100644 --- a/activity.py +++ b/activity.py @@ -332,5 +332,5 @@ class AToiDeJouerActivity(activity.Activity): pass else: _screen.item_preview._thread.kill() - # DEBUG + # .. activity.Activity.close(self, skip_save=True) diff --git a/atoidejouer/tools/storage.py b/atoidejouer/tools/storage.py index d9e3cc4..9f780c1 100644 --- a/atoidejouer/tools/storage.py +++ b/atoidejouer/tools/storage.py @@ -261,17 +261,18 @@ def __merge_dir(project_name, dir_name, exist_list=None): exist_list = list() if exist_list is None else exist_list for _f in os.listdir(_path_src): # .. - _p = os.path.join(_path_src, _f) + _p_src = os.path.join(_path_src, _f) + _p_dst = os.path.join(_path_dst, _f) # little check - if os.path.isdir(_p): + if os.path.isdir(_p_src): continue # do not replace - elif os.path.exists(_p): + elif os.path.exists(_p_dst): # update exist list exist_list.append(os.path.join(dir_name, _f)) # do copy else: - shutil.copy(_p, _path_dst) + shutil.copy(_p_src, _path_dst) # OK! return True else: diff --git a/atoidejouer/ui/screens.py b/atoidejouer/ui/screens.py index 657ad45..a4df397 100644 --- a/atoidejouer/ui/screens.py +++ b/atoidejouer/ui/screens.py @@ -590,22 +590,27 @@ def _on_button_click(button, screen, name, msg_label, value): ] = range(3) -class ScreenActivity(gtk.HBox): +class ScreenActivity(gtk.ScrolledWindow): def __init__(self, activity_): - # init parent - gtk.HBox.__init__(self, homogeneous=True, spacing=2) + gtk.ScrolledWindow.__init__(self) + self.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC) # keep toolbar self._activity = activity_ # keep result label self.msg_label_import = None self.msg_label_export = None + # init main box + self.__main_box = gtk.HBox(homogeneous=True, spacing=2) + self.__main_box.show() + # .. + self.add_with_viewport(self.__main_box) # add left menu self._group_mode = None self._group_rate = None self._add_left_part() # .. - self.pack_start(gtk.EventBox(), expand=False, fill=True) + self.__main_box.pack_start(gtk.EventBox(), expand=False, fill=True) # add right menu self._add_right_part() # do show @@ -751,7 +756,7 @@ class ScreenActivity(gtk.HBox): # show _vbox.show() # add - self.pack_start(_vbox, expand=False, fill=True) + self.__main_box.pack_start(_vbox, expand=False, fill=True) # add part choices _vbox.pack_start(self._get_mode_part(), expand=False, fill=True) @@ -805,7 +810,7 @@ class ScreenActivity(gtk.HBox): # show _vbox.show() # add - self.pack_start(_vbox, expand=False, fill=True) + self.__main_box.pack_start(_vbox, expand=False, fill=True) # add first part title _vbox.pack_start(self._get_export_part(), expand=False, fill=True) |