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

flake8

Browse source
This commit is contained in:
Shlomi Fish 2017-04-18 21:04:11 +03:00
parent d467e9f33f
commit a54edfa5d2
2 changed files with 50 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
pysollib/tk/toolbar.py
View file

@ -29,7 +29,6 @@ import Tkinter
# PySol imports
from pysollib.mygettext import _, n_
from pysollib.mfxutil import destruct
from pysollib.mfxutil import Image, ImageTk
from pysollib.util import IMAGE_EXTENSIONS
from pysollib.settings import TITLE
@ -69,7 +68,8 @@ class AbstractToolbarButton:
sticky='nsew')
def hide(self):
if not self.visible: return
if not self.visible:
return
self.visible = False
self.grid_forget()
@ -77,13 +77,15 @@ class AbstractToolbarButton:
class ToolbarCheckbutton(AbstractToolbarButton, Tkinter.Checkbutton):
def __init__(self, parent, toolbar, toolbar_name, position, **kwargs):
Tkinter.Checkbutton.__init__(self, parent, kwargs)
AbstractToolbarButton.__init__(self, parent, toolbar, toolbar_name, position)
AbstractToolbarButton.__init__(
self, parent, toolbar, toolbar_name, position)
class ToolbarButton(AbstractToolbarButton, Tkinter.Button):
def __init__(self, parent, toolbar, toolbar_name, position, **kwargs):
Tkinter.Button.__init__(self, parent, kwargs)
AbstractToolbarButton.__init__(self, parent, toolbar, toolbar_name, position)
AbstractToolbarButton.__init__(
self, parent, toolbar, toolbar_name, position)
class ToolbarSeparator(Tkinter.Frame):
@ -92,6 +94,7 @@ class ToolbarSeparator(Tkinter.Frame):
self.toolbar = toolbar
self.position = position
self.visible = False
def show(self, orient, force=False):
if self.visible and not force:
return
@ -112,14 +115,18 @@ class ToolbarSeparator(Tkinter.Frame):
column=0,
padx=pady, pady=padx,
sticky='ew')
def hide(self):
if not self.visible: return
if not self.visible:
return
self.visible = False
self.grid_forget()
class ToolbarFlatSeparator(ToolbarSeparator):
pass
class ToolbarLabel(Tkinter.Message):
def __init__(self, parent, toolbar, toolbar_name, position, **kwargs):
Tkinter.Message.__init__(self, parent, kwargs)
@ -127,6 +134,7 @@ class ToolbarLabel(Tkinter.Message):
self.toolbar_name = toolbar_name
self.position = position
self.visible = False
def show(self, orient, force=False):
if self.visible and not force:
return
@ -142,8 +150,10 @@ class ToolbarLabel(Tkinter.Message):
column=0,
padx=padx, pady=pady,
sticky='nsew')
def hide(self):
if not self.visible: return
if not self.visible:
return
self.visible = False
self.grid_forget()
@ -206,7 +216,7 @@ class PysolToolbarTk:
tooltip=_("Player options"))
#
self.player_label.bind("<1>", self.mOptPlayerOptions)
##self.player_label.bind("<3>",self.mOptPlayerOptions)
# self.player_label.bind("<3>",self.mOptPlayerOptions)
self.popup = MfxMenu(master=None, label=n_('Toolbar'), tearoff=0)
createToolbarMenu(menubar, self.popup)
self.frame.bind("<1>", self.clickHandler)
@ -224,7 +234,6 @@ class PysolToolbarTk:
else:
# button
widget = getattr(self, w+'_button')
position = widget.position
if v:
widget.show(orient=self.orient)
else:
@ -234,7 +243,8 @@ class PysolToolbarTk:
last_visible = None
for w in self._widgets:
if w.__class__ is ToolbarSeparator:
if prev_visible is None or prev_visible.__class__ is ToolbarSeparator:
if prev_visible is None or \
prev_visible.__class__ is ToolbarSeparator:
w.hide()
else:
w.show(orient=self.orient)
@ -357,7 +367,6 @@ class PysolToolbarTk:
self.game.interruptSleep()
return self.game.busy
#
# public methods
#
@ -397,10 +406,12 @@ class PysolToolbarTk:
def destroy(self):
for w in self._tooltips:
if w: w.destroy()
if w:
w.destroy()
self._tooltips = []
for w in self._widgets:
if w: w.destroy()
if w:
w.destroy()
self._widgets = []
def setCursor(self, cursor):
@ -468,18 +479,22 @@ class PysolToolbarTk:
#
def clickHandler(self, event):
if self._busy(): return EVENT_HANDLED
if self._busy():
return EVENT_HANDLED
return EVENT_HANDLED
def rightclickHandler(self, event):
if self._busy(): return EVENT_HANDLED
if self._busy():
return EVENT_HANDLED
if self.popup:
##print event.x, event.y, event.x_root, event.y_root, event.__dict__
# print event.x, event.y, event.x_root, \
# event.y_root, event.__dict__
self.popup.tk_popup(event.x_root, event.y_root)
return EVENT_HANDLED
def middleclickHandler(self, event):
if self._busy(): return EVENT_HANDLED
if self._busy():
return EVENT_HANDLED
if 1 <= self.side <= 2:
self.menubar.setToolbarSide(3 - self.side)
return EVENT_HANDLED
@ -490,4 +505,3 @@ class PysolToolbarTk:
size = self.size
comp = int(self.compound in ('top', 'bottom'))
return int((size+comp) != 0)

2
tests/style/py-flake8.t
View file

@ -27,7 +27,7 @@ my %skip =
# my $cmd = shell_quote( 'flake8', '.' );
my $cmd = shell_quote( 'flake8',
grep { not exists $skip{$_} } glob('./*.py ./scripts/*.py ./tests/board_gen/*.py ./pysollib/*.py ./pysollib/[cmgpuw]*/{*/*.py,*.py} ./pysollib/tile/*.py ./pysollib/tk/{[a-sw],ta,ti}*.py ./pysollib/ui/tktile/*.py') );
grep { not exists $skip{$_} } glob('./*.py ./scripts/*.py ./tests/board_gen/*.py ./pysollib/*.py ./pysollib/[cmgpuw]*/{*/*.py,*.py} ./pysollib/tile/*.py ./pysollib/tk/{[a-sw],ta,ti,to}*.py ./pysollib/ui/tktile/*.py') );
# TEST
eq_or_diff( scalar(`$cmd`), '', "flake8 is happy with the code." );