Labeled frames to group some widgets

2 files changed, 11 insertions, 19 deletions

diff --git a/jfr_playoff/gui/frames/match.py b/jfr_playoff/gui/frames/match.py
index 9aa5622..b785f99 100644
--- a/jfr_playoff/gui/frames/match.py
+++ b/jfr_playoff/gui/frames/match.py
@@ -67,7 +67,7 @@ class SwissSettingsFrame(RepeatableFrame):
 
         (ttk.Label(
             self, text='Ustaw od miejsca: ')).grid(
-                row=4, column=0, sticky=tk.E)
+                row=4, column=0, sticky=tk.W, padx=18)
         self.setFrom = tk.StringVar()
         (tk.Spinbox(
             self, textvariable=self.setFrom,
@@ -77,7 +77,7 @@ class SwissSettingsFrame(RepeatableFrame):
         (ttk.Checkbutton(
             self, variable=self.setToEnabled,
             text='Ustaw do miejsca: ')).grid(
-                row=5, column=0, sticky=tk.E)
+                row=5, column=0, sticky=tk.W)
         self.setTo = tk.StringVar()
         (tk.Spinbox(
             self, textvariable=self.setTo,
@@ -87,7 +87,7 @@ class SwissSettingsFrame(RepeatableFrame):
         (ttk.Checkbutton(
             self, variable=self.fetchFromEnabled,
             text='Pobierz od miejsca: ')).grid(
-                row=6, column=0, sticky=tk.E)
+                row=6, column=0, sticky=tk.W)
         self.fetchFrom = tk.StringVar()
         (tk.Spinbox(
             self, textvariable=self.fetchFrom,
diff --git a/jfr_playoff/gui/frames/visual.py b/jfr_playoff/gui/frames/visual.py
index eea87f0..b36a5ec 100644
--- a/jfr_playoff/gui/frames/visual.py
+++ b/jfr_playoff/gui/frames/visual.py
@@ -11,22 +11,14 @@ from ..frames.team import TeamSelectionButton
 
 class VisualSettingsFrame(GuiFrame):
     def renderContent(self):
-        (ttk.Label(self, text='Znaczniki pozycji:')).grid(
-            row=0, column=0, sticky=tk.W, pady=5)
-        (ttk.Label(self, text='Wymiary tabelki meczu:')).grid(
-            row=0, column=1, sticky=tk.W, pady=5)
-        indicatorsFrame = tk.Frame(self)
-        indicatorsFrame.grid(row=1, column=0, sticky=tk.W+tk.N, padx=10)
-        dimensionsFrame = tk.Frame(self)
-        dimensionsFrame.grid(row=1, column=1, sticky=tk.W+tk.N, padx=10)
-        (ttk.Label(self, text='Nazwy teamów:')).grid(
-            row=2, column=0, sticky=tk.W, pady=5)
-        (ttk.Label(self, text='Separatory nazw teamów:')).grid(
-            row=2, column=1, sticky=tk.W, pady=5)
-        teamNamesFrame = tk.Frame(self)
-        teamNamesFrame.grid(row=3, column=0, sticky=tk.W+tk.N, padx=10)
-        separatorsFrame = tk.Frame(self)
-        separatorsFrame.grid(row=3, column=1, sticky=tk.W+tk.N, padx=10)
+        indicatorsFrame = ttk.LabelFrame(self, text='Znaczniki pozycji:')
+        indicatorsFrame.grid(row=0, column=0, sticky=tk.W+tk.E+tk.N+tk.S)
+        dimensionsFrame = ttk.LabelFrame(self, text='Wymiary tabelki meczu:')
+        dimensionsFrame.grid(row=0, column=1, sticky=tk.W+tk.E+tk.N+tk.S)
+        teamNamesFrame = ttk.LabelFrame(self, text='Nazwy teamów:')
+        teamNamesFrame.grid(row=1, column=0, sticky=tk.W+tk.E+tk.N+tk.S)
+        separatorsFrame = ttk.LabelFrame(self, text='Separatory nazw teamów:')
+        separatorsFrame.grid(row=1, column=1, sticky=tk.W+tk.E+tk.N+tk.S)
 
         self._fieldsToEnable = []