1
0
Fork 0
mirror of https://github.com/shlomif/PySolFC.git synced 2025-04-05 00:02:29 -04:00

Started merging some code.

This commit is contained in:
Shlomi Fish 2016-08-21 22:45:55 +03:00
parent c519bddc46
commit 29a9a61eef
2 changed files with 2 additions and 4 deletions

View file

@ -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

View file

@ -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