From 29a9a61eef93e2376ead5f3d5001f254955c4031 Mon Sep 17 00:00:00 2001
From: Shlomi Fish <shlomif@shlomifish.org>
Date: Sun, 21 Aug 2016 22:45:55 +0300
Subject: [PATCH] Started merging some code.

---
 pysollib/tile/selectcardset.py | 2 --
 pysollib/tk/selectcardset.py   | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pysollib/tile/selectcardset.py b/pysollib/tile/selectcardset.py
index b594ff5b..4bad55c5 100644
--- a/pysollib/tile/selectcardset.py
+++ b/pysollib/tile/selectcardset.py
@@ -25,7 +25,6 @@ __all__ = ['SelectCardsetDialogWithPreview']
 
 # imports
 import os
-import traceback
 import Tkinter
 import ttk
 
@@ -443,7 +442,6 @@ class CardsetInfoDialog(MfxDialog):
                 info_frame.columnconfigure(2, weight=1)
                 info_frame.rowconfigure(frow, weight=1)
             except:
-                traceback.print_exc()
                 pass
         if USE_PIL:
             padx = 4
diff --git a/pysollib/tk/selectcardset.py b/pysollib/tk/selectcardset.py
index fdd78eab..3d14f792 100644
--- a/pysollib/tk/selectcardset.py
+++ b/pysollib/tk/selectcardset.py
@@ -283,7 +283,7 @@ class SelectCardsetDialogWithPreview(MfxDialog):
         return MfxDialog.initKw(self, kw)
 
     def mDone(self, button):
-        if button in (0, 1):               # Ok/Load
+        if button in (0, 1):            # Load/Cancel
             self.key = self.tree.selection_key
             self.tree.n_expansions = 1  # save xyview in any case
             if USE_PIL:
@@ -365,8 +365,8 @@ class SelectCardsetDialogWithPreview(MfxDialog):
                 x = x + dx
         canvas.config(scrollregion=(0, 0, sx+dx, sy+dy),
                       width=sx+dx, height=sy+dy)
-        canvas.event_generate('<Configure>') # update bg image
         #canvas.config(xscrollincrement=dx, yscrollincrement=dy)
+        canvas.event_generate('<Configure>') # update bg image
         self.preview_key = key
         self.key = key