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

Consolidate code in edittextdialog .

Browse source
This commit is contained in:
Shlomi Fish 2016-11-13 13:16:00 +02:00
parent 622a035d5b
commit d97b20b17b
2 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pysollib/tile/edittextdialog.py
View file

@ -28,8 +28,8 @@ import Tkinter
import ttk import ttk
# PySol imports # PySol imports
from pysollib.mfxutil import KwStruct
from pysollib.mygettext import _, n_ from pysollib.mygettext import _, n_
from pysollib.mfxutil import KwStruct
# Toolkit imports # Toolkit imports
from tkwidget import MfxDialog from tkwidget import MfxDialog
@ -40,9 +40,18 @@ from tkwidget import MfxDialog
class EditTextDialog(MfxDialog): class EditTextDialog(MfxDialog):
def _calcToolkit(self):
return ttk
def _calc_MfxDialog(self):
return MfxDialog
def _calc_Resizable(self):
return False
def __init__(self, parent, title, text, **kw): def __init__(self, parent, title, text, **kw):
kw = self.initKw(kw) kw = self.initKw(kw)
MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) self._calc_MfxDialog().__init__(self, parent, title, kw.resizable, kw.default)
top_frame, bottom_frame = self.createFrames(kw) top_frame, bottom_frame = self.createFrames(kw)
self.createBitmaps(top_frame, kw) self.createBitmaps(top_frame, kw)
# #
@ -50,7 +59,7 @@ class EditTextDialog(MfxDialog):
wrap="word", width=64, height=16) wrap="word", width=64, height=16)
self.text_w.pack(side='left', fill="both", expand=True) self.text_w.pack(side='left', fill="both", expand=True)
###self.text_w.pack(side='top', padx=kw.padx, pady=kw.pady) ###self.text_w.pack(side='top', padx=kw.padx, pady=kw.pady)
vbar = ttk.Scrollbar(top_frame) vbar = self._calcToolkit().Scrollbar(top_frame)
vbar.pack(side='right', fill='y') vbar.pack(side='right', fill='y')
self.text_w["yscrollcommand"] = vbar.set self.text_w["yscrollcommand"] = vbar.set
vbar["command"] = self.text_w.yview vbar["command"] = self.text_w.yview
@ -71,14 +80,14 @@ class EditTextDialog(MfxDialog):
kw = KwStruct(kw, kw = KwStruct(kw,
strings=(_("&OK"), _("&Cancel")), strings=(_("&OK"), _("&Cancel")),
default=-1, default=-1,
resizable=False, resizable=self._calc_Resizable(),
separator=False, separator=False,
) )
return MfxDialog.initKw(self, kw) return self._calc_MfxDialog().initKw(self, kw)
def destroy(self): def destroy(self):
self.text = self.text_w.get("1.0", "end") self.text = self.text_w.get("1.0", "end")
MfxDialog.destroy(self) self._calc_MfxDialog().destroy(self)
def wmDeleteWindow(self, *event): # ignore def wmDeleteWindow(self, *event): # ignore
pass pass

19
pysollib/tk/edittextdialog.py
View file

@ -39,9 +39,18 @@ from tkwidget import MfxDialog
class EditTextDialog(MfxDialog): class EditTextDialog(MfxDialog):
def _calcToolkit(self):
return Tkinter
def _calc_MfxDialog(self):
return MfxDialog
def _calc_Resizable(self):
return True
def __init__(self, parent, title, text, **kw): def __init__(self, parent, title, text, **kw):
kw = self.initKw(kw) kw = self.initKw(kw)
MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) self._calc_MfxDialog().__init__(self, parent, title, kw.resizable, kw.default)
top_frame, bottom_frame = self.createFrames(kw) top_frame, bottom_frame = self.createFrames(kw)
self.createBitmaps(top_frame, kw) self.createBitmaps(top_frame, kw)
# #
@ -49,7 +58,7 @@ class EditTextDialog(MfxDialog):
wrap="word", width=64, height=16) wrap="word", width=64, height=16)
self.text_w.pack(side='left', fill="both", expand=True) self.text_w.pack(side='left', fill="both", expand=True)
###self.text_w.pack(side='top', padx=kw.padx, pady=kw.pady) ###self.text_w.pack(side='top', padx=kw.padx, pady=kw.pady)
vbar = Tkinter.Scrollbar(top_frame) vbar = self._calcToolkit().Scrollbar(top_frame)
vbar.pack(side='right', fill='y') vbar.pack(side='right', fill='y')
self.text_w["yscrollcommand"] = vbar.set self.text_w["yscrollcommand"] = vbar.set
vbar["command"] = self.text_w.yview vbar["command"] = self.text_w.yview
@ -70,14 +79,14 @@ class EditTextDialog(MfxDialog):
kw = KwStruct(kw, kw = KwStruct(kw,
strings=(_("&OK"), _("&Cancel")), strings=(_("&OK"), _("&Cancel")),
default=-1, default=-1,
resizable=True, resizable=self._calc_Resizable(),
separator=False, separator=False,
) )
return MfxDialog.initKw(self, kw) return self._calc_MfxDialog().initKw(self, kw)
def destroy(self): def destroy(self):
self.text = self.text_w.get("1.0", "end") self.text = self.text_w.get("1.0", "end")
MfxDialog.destroy(self) self._calc_MfxDialog().destroy(self)
def wmDeleteWindow(self, *event): # ignore def wmDeleteWindow(self, *event): # ignore
pass pass