diff --git a/pysollib/init.py b/pysollib/init.py index b004c92c..a2d7e34d 100644 --- a/pysollib/init.py +++ b/pysollib/init.py @@ -103,15 +103,11 @@ def init(): if os.name == 'nt': if sys.path[0] and not os.path.isdir(sys.path[0]): # i.e. library.zip d = os.path.dirname(sys.path[0]) - ##d = os.path.join(d, 'freecell-solver') - fcs_command = os.path.join('freecell-solver', 'fc-solve.exe') - ##fcs_command = '"%s"' % fcs_command # quote command - settings.FCS_COMMAND = fcs_command - f = os.path.join(d, 'freecell-solver', 'presetrc') - os.environ['FREECELL_SOLVER_PRESETRC'] = f os.chdir(d) # for read presets - ##print >> file('/fcs.log', 'a'), d - ##print >> file('/fcs.log', 'a'), f + fcs_command = os.path.join('freecell-solver', 'fc-solve.exe') + settings.FCS_COMMAND = fcs_command + ##f = os.path.join(d, 'freecell-solver', 'presetrc') + ##os.environ['FREECELL_SOLVER_PRESETRC'] = f # defined in prefix.h if os.name in ('posix', 'nt'): try: pin, pout, perr = os.popen3(settings.FCS_COMMAND+' --help') diff --git a/pysollib/tile/toolbar.py b/pysollib/tile/toolbar.py index f2aee2a5..56d1ff3b 100644 --- a/pysollib/tile/toolbar.py +++ b/pysollib/tile/toolbar.py @@ -351,16 +351,20 @@ class PysolToolbar(PysolToolbarActions): if side == 1: # top - pack_func(row=0, column=1, sticky='ew', padx=0, pady=0) + padx, pady = TkSettings.horizontal_toolbar_padding + pack_func(row=0, column=1, sticky='ew', padx=padx, pady=pady) elif side == 2: # bottom - pack_func(row=2, column=1, sticky='ew', padx=0, pady=0) + padx, pady = TkSettings.horizontal_toolbar_padding + pack_func(row=2, column=1, sticky='ew', padx=padx, pady=pady) elif side == 3: # left - pack_func(row=1, column=0, sticky='ns', padx=0, pady=1) + padx, pady = TkSettings.vertical_toolbar_padding + pack_func(row=1, column=0, sticky='ns', padx=padx, pady=pady) else: # right - pack_func(row=1, column=2, sticky='ns', padx=0, pady=1) + padx, pady = TkSettings.vertical_toolbar_padding + pack_func(row=1, column=2, sticky='ns', padx=padx, pady=pady) # set orient orient = side in (1, 2) and Tkinter.HORIZONTAL or Tkinter.VERTICAL self._setOrient(orient) diff --git a/pysollib/winsystems/common.py b/pysollib/winsystems/common.py index 4397d313..69e7b4f9 100644 --- a/pysollib/winsystems/common.py +++ b/pysollib/winsystems/common.py @@ -97,6 +97,8 @@ class baseInitRootWindow: class BaseTkSettings: canvas_padding = (0, 0) + horizontal_toolbar_padding = (0, 0) + vertical_toolbar_padding = (0, 1) toolbar_button_padding = (2, 2) toolbar_label_padding = (4, 4) if USE_TILE: diff --git a/pysollib/winsystems/win32.py b/pysollib/winsystems/win32.py index b8468e38..772fb4e9 100644 --- a/pysollib/winsystems/win32.py +++ b/pysollib/winsystems/win32.py @@ -51,6 +51,7 @@ class initRootWindow(baseInitRootWindow): class TkSettings(BaseTkSettings): canvas_padding = (1, 1) + horizontal_toolbar_padding = (1, 0) toolbar_relief = 'groove' toolbar_borderwidth = 2 if USE_TILE: