summaryrefslogtreecommitdiff
path: root/jfr_playoff/gui
diff options
context:
space:
mode:
Diffstat (limited to 'jfr_playoff/gui')
-rw-r--r--jfr_playoff/gui/frames/network.py60
-rw-r--r--jfr_playoff/gui/tabs.py9
2 files changed, 55 insertions, 14 deletions
diff --git a/jfr_playoff/gui/frames/network.py b/jfr_playoff/gui/frames/network.py
index b3a96c7..946bdf5 100644
--- a/jfr_playoff/gui/frames/network.py
+++ b/jfr_playoff/gui/frames/network.py
@@ -22,6 +22,8 @@ def network_test(connFunction, testLabel):
return unicode(str(e).decode('utf-8', errors='replace'))
class MySQLConfigurationFrame(GuiFrame):
+ DEFAULT_PORT = 3306
+
def getConfig(self):
if len(self.host.get().strip()):
return {
@@ -49,28 +51,32 @@ class MySQLConfigurationFrame(GuiFrame):
'<<DBSettingsChanged>>', when='tail')
def renderContent(self):
+ self.host = tk.StringVar()
+ self.port = tk.StringVar()
+ self.user = tk.StringVar()
+ self.pass_ = tk.StringVar()
+
(ttk.Label(self, text='Ustawienia MySQL')).grid(
row=0, column=0, columnspan=4, sticky=tk.E+tk.W)
(ttk.Label(self, text='Host:')).grid(
row=1, column=0, sticky=tk.E)
- self.host = tk.StringVar()
self.host.trace('w', self._changeNotify)
(ttk.Entry(self, textvariable=self.host)).grid(
row=1, column=1, sticky=tk.E+tk.W)
+
(ttk.Label(self, text='Port:')).grid(
row=1, column=2, sticky=tk.E)
- self.port = tk.StringVar()
- self.port.set(3306)
self.port.trace('w', self._changeNotify)
(tk.Spinbox(
self, textvariable=self.port, width=5,
from_=0, to=65535)).grid(row=1, column=3, sticky=tk.W)
+
(ttk.Label(self, text='Użytkownik:')).grid(
row=2, column=0, sticky=tk.E)
- self.user = tk.StringVar()
self.user.trace('w', self._changeNotify)
(ttk.Entry(self, textvariable=self.user)).grid(
row=2, column=1, sticky=tk.E+tk.W)
+
(ttk.Button(
self, text='Testuj ustawienia', command=self._testDB)).grid(
row=2, column=3)
@@ -78,18 +84,27 @@ class MySQLConfigurationFrame(GuiFrame):
self.dbTestLabel = ttk.Label(self)
self.dbTestLabel.grid(row=2, column=4)
self.dbTestLabel.bind('<Button-1>', self._dbError)
+
(ttk.Label(self, text='Hasło:')).grid(
row=3, column=0, sticky=tk.E)
- self.pass_ = tk.StringVar()
self.pass_.trace('w', self._changeNotify)
(ttk.Entry(self, textvariable=self.pass_, show='*')).grid(
row=3, column=1, sticky=tk.E+tk.W)
+ self.setValues({})
+
+ def setValues(self, values):
+ self.host.set(values['host'] if 'host' in values else '')
+ self.port.set(
+ values['port'] if 'port' in values else self.DEFAULT_PORT)
+ self.user.set(values['user'] if 'user' in values else '')
+ self.pass_.set(values['pass'] if 'pass' in values else '')
+
class GoniecConfigurationFrame(GuiFrame):
DEFAULT_HOST = 'localhost'
DEFAULT_PORT = 8090
- def _enableWidgets(self):
+ def _enableWidgets(self, *args):
for field in [self.portField, self.hostField, self.testButton]:
field.configure(
state=tk.NORMAL if self.enable.get() else tk.DISABLED)
@@ -108,24 +123,26 @@ class GoniecConfigurationFrame(GuiFrame):
tkmb.showerror('Błąd połączenia z Gońcem', self.testError)
def renderContent(self):
+ self.enable = tk.IntVar()
+ self.host = tk.StringVar()
+ self.port = tk.StringVar()
+
(ttk.Label(self, text='Konfiguracja Gońca:')).grid(
row=0, column=0, columnspan=4, sticky=tk.W)
- self.enable = tk.IntVar()
(ttk.Checkbutton(
- self, text='Włącz obsługę Gońca', variable=self.enable,
- command=self._enableWidgets)).grid(
+ self, text='Włącz obsługę Gońca', variable=self.enable)).grid(
row=1, column=0, columnspan=2, sticky=tk.W)
+ self.enable.trace('w', self._enableWidgets)
+
(ttk.Label(self, text='Host:')).grid(row=2, column=0)
- self.host = tk.StringVar()
- self.host.set(self.DEFAULT_HOST)
self.hostField = ttk.Entry(self, textvariable=self.host)
self.hostField.grid(row=2, column=1)
+
(ttk.Label(self, text='Port:')).grid(row=2, column=2)
- self.port = tk.StringVar()
- self.port.set(self.DEFAULT_PORT)
self.portField = tk.Spinbox(
self, textvariable=self.port, width=5)
self.portField.grid(row=2, column=3)
+
self.testButton = ttk.Button(
self, text='Testuj ustawienia', command=self._test)
self.testButton.grid(row=3, column=1, sticky=tk.E)
@@ -133,8 +150,15 @@ class GoniecConfigurationFrame(GuiFrame):
self.testLabel = ttk.Label(self)
self.testLabel.grid(row=3, column=2, sticky=tk.W)
self.testLabel.bind('<Button-1>', self._testError)
- self._enableWidgets()
+ self.setValues({})
+
+ def setValues(self, values):
+ self.host.set(
+ values['host'] if 'host' in values else self.DEFAULT_HOST)
+ self.port.set(
+ values['port'] if 'port' in values else self.DEFAULT_PORT)
+ self.enable.set(values['enabled'] if 'enabled' in values else 0)
class RemoteConfigurationFrame(ScrollableFrame):
def renderContent(self, container):
@@ -144,4 +168,12 @@ class RemoteConfigurationFrame(ScrollableFrame):
container, RepeatableEntry, classParams={'width':100})
self.repeater.pack(side=tk.TOP, fill=tk.BOTH, expand=True)
+ def setValues(self, values):
+ for idx, value in enumerate(values):
+ if idx >= len(self.repeater.widgets):
+ self.repeater._addWidget()
+ self.repeater.widgets[idx].setValue(value)
+ for idx in range(len(values), len(self.repeater.widgets)):
+ self.repeater._removeWidget(idx)
+
__all__ = ['MySQLConfigurationFrame', 'GoniecConfigurationFrame', 'RemoteConfigurationFrame']
diff --git a/jfr_playoff/gui/tabs.py b/jfr_playoff/gui/tabs.py
index e9685f9..babb043 100644
--- a/jfr_playoff/gui/tabs.py
+++ b/jfr_playoff/gui/tabs.py
@@ -319,6 +319,15 @@ class NetworkTab(PlayoffTab):
self.winfo_toplevel().bind(
'<<DBSettingsChanged>>', self._onDBSettingsChange, add='+')
+ def setValues(self, config):
+ self.mysqlFrame.setValues(
+ config['database'] if 'database' in config else {})
+ self.goniecFrame.setValues(
+ config['goniec'] if 'goniec' in config else {})
+ self.remoteFrame.setValues(
+ config['remotes'] if 'remotes' in config else [])
+
+
class VisualTab(PlayoffTab):
@property
def title(self):