diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fb066e4..d3e2ff1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,138 +4,40 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -186,7 +88,7 @@
"Shell Script.install.executor": "Run",
"git-widget-placeholder": "main",
"last_opened_file_path": "/home/punix/Pyapps/wire-py",
- "settings.editor.selected.configurable": "preferences.lookFeel"
+ "settings.editor.selected.configurable": "configurable.group.editor"
}
}
@@ -194,6 +96,8 @@
+
+
@@ -265,14 +169,6 @@
1723279982210
-
-
- 1724237471056
-
-
-
- 1724237471056
-
1724272761629
@@ -657,7 +553,15 @@
1728059870005
-
+
+
+ 1729103964804
+
+
+
+ 1729103964804
+
+
@@ -698,7 +602,6 @@
-
@@ -723,6 +626,7 @@
-
+
+
\ No newline at end of file
diff --git a/TK-Themes/theme/dark.tcl b/TK-Themes/theme/dark.tcl
index 1127ed2..2ad09db 100644
--- a/TK-Themes/theme/dark.tcl
+++ b/TK-Themes/theme/dark.tcl
@@ -1,14 +1,14 @@
# Copyright (c) 2021 rdbende
-# The Azure theme is a beautiful modern ttk theme inspired by Microsoft's fluent design.
+# inspired by rdbende modified azure to water by Désire Werner Menrath polunga40@unity-mail.de 2024
package require Tk 8.6
-namespace eval ttk::theme::azure-dark {
+namespace eval ttk::theme::water-dark {
variable version 2.0
- package provide ttk::theme::azure-dark $version
+ package provide ttk::theme::water-dark $version
- ttk::style theme create azure-dark -parent clam -settings {
+ ttk::style theme create water-dark -parent clam -settings {
proc load_images {imgdir} {
variable I
foreach file [glob -directory $imgdir *.png] {
diff --git a/TK-Themes/theme/dark/box-accent.png b/TK-Themes/theme/dark/box-accent.png
index d0e186b..767a81b 100644
Binary files a/TK-Themes/theme/dark/box-accent.png and b/TK-Themes/theme/dark/box-accent.png differ
diff --git a/TK-Themes/theme/dark/check-accent.png b/TK-Themes/theme/dark/check-accent.png
index 9854ec3..7cabf6a 100644
Binary files a/TK-Themes/theme/dark/check-accent.png and b/TK-Themes/theme/dark/check-accent.png differ
diff --git a/TK-Themes/theme/dark/check-tri-accent.png b/TK-Themes/theme/dark/check-tri-accent.png
index c0539f9..1d0c255 100644
Binary files a/TK-Themes/theme/dark/check-tri-accent.png and b/TK-Themes/theme/dark/check-tri-accent.png differ
diff --git a/TK-Themes/theme/dark/circle-accent.png b/TK-Themes/theme/dark/circle-accent.png
index e9a5ee5..1b25b16 100644
Binary files a/TK-Themes/theme/dark/circle-accent.png and b/TK-Themes/theme/dark/circle-accent.png differ
diff --git a/TK-Themes/theme/dark/combo-button-focus.png b/TK-Themes/theme/dark/combo-button-focus.png
index 5b1e0ff..e37db17 100644
Binary files a/TK-Themes/theme/dark/combo-button-focus.png and b/TK-Themes/theme/dark/combo-button-focus.png differ
diff --git a/TK-Themes/theme/dark/hor-accent.png b/TK-Themes/theme/dark/hor-accent.png
index e59a1c6..ab4b182 100644
Binary files a/TK-Themes/theme/dark/hor-accent.png and b/TK-Themes/theme/dark/hor-accent.png differ
diff --git a/TK-Themes/theme/dark/on-accent.png b/TK-Themes/theme/dark/on-accent.png
index 4a33465..9d48eb6 100644
Binary files a/TK-Themes/theme/dark/on-accent.png and b/TK-Themes/theme/dark/on-accent.png differ
diff --git a/TK-Themes/theme/dark/radio-accent.png b/TK-Themes/theme/dark/radio-accent.png
index c34e4a8..6535a97 100644
Binary files a/TK-Themes/theme/dark/radio-accent.png and b/TK-Themes/theme/dark/radio-accent.png differ
diff --git a/TK-Themes/theme/dark/radio-tri-accent.png b/TK-Themes/theme/dark/radio-tri-accent.png
index 8084141..b09b6ae 100644
Binary files a/TK-Themes/theme/dark/radio-tri-accent.png and b/TK-Themes/theme/dark/radio-tri-accent.png differ
diff --git a/TK-Themes/theme/dark/rect-accent.png b/TK-Themes/theme/dark/rect-accent.png
index 5e7c72c..a4821d1 100644
Binary files a/TK-Themes/theme/dark/rect-accent.png and b/TK-Themes/theme/dark/rect-accent.png differ
diff --git a/TK-Themes/theme/dark/tab-basic.png b/TK-Themes/theme/dark/tab-basic.png
index 6db676b..8c6d008 100644
Binary files a/TK-Themes/theme/dark/tab-basic.png and b/TK-Themes/theme/dark/tab-basic.png differ
diff --git a/TK-Themes/theme/dark/tick-hor-accent.png b/TK-Themes/theme/dark/tick-hor-accent.png
index b7c28dd..3a90f28 100644
Binary files a/TK-Themes/theme/dark/tick-hor-accent.png and b/TK-Themes/theme/dark/tick-hor-accent.png differ
diff --git a/TK-Themes/theme/dark/tick-vert-accent.png b/TK-Themes/theme/dark/tick-vert-accent.png
index da4f481..0c0ff98 100644
Binary files a/TK-Themes/theme/dark/tick-vert-accent.png and b/TK-Themes/theme/dark/tick-vert-accent.png differ
diff --git a/TK-Themes/theme/dark/tree-pressed.png b/TK-Themes/theme/dark/tree-pressed.png
index 96d3a53..41b65c6 100644
Binary files a/TK-Themes/theme/dark/tree-pressed.png and b/TK-Themes/theme/dark/tree-pressed.png differ
diff --git a/TK-Themes/theme/dark/vert-accent.png b/TK-Themes/theme/dark/vert-accent.png
index 1c228fd..495f804 100644
Binary files a/TK-Themes/theme/dark/vert-accent.png and b/TK-Themes/theme/dark/vert-accent.png differ
diff --git a/TK-Themes/theme/light.tcl b/TK-Themes/theme/light.tcl
index 9288fc5..dbd6dad 100644
--- a/TK-Themes/theme/light.tcl
+++ b/TK-Themes/theme/light.tcl
@@ -1,14 +1,14 @@
# Copyright (c) 2021 rdbende
-# The Azure theme is a beautiful modern ttk theme inspired by Microsoft's fluent design.
+# inspired by rdbende modified azure to water by Désire Werner Menrath polunga40@unity-mail.de 2024
package require Tk 8.6
-namespace eval ttk::theme::azure-light {
+namespace eval ttk::theme::water-light {
variable version 2.0
- package provide ttk::theme::azure-light $version
+ package provide ttk::theme::water-light $version
- ttk::style theme create azure-light -parent clam -settings {
+ ttk::style theme create water-light -parent clam -settings {
proc load_images {imgdir} {
variable I
foreach file [glob -directory $imgdir *.png] {
@@ -39,7 +39,7 @@ namespace eval ttk::theme::azure-light {
ttk::style layout Toolbutton {
Toolbutton.button -children {
Toolbutton.padding -children {
- Toolbutton.label -side left -expand true
+ Toolbutton.label -side left -expand true
}
}
}
@@ -210,7 +210,7 @@ namespace eval ttk::theme::azure-light {
] -border 4 -sticky ewns
# Toolbutton
- ttk::style configure Toolbutton -padding {8 4 8 4} -width -10 -anchor center
+ ttk::style configure Toolbutton -padding {8 4 8 4} -width -5 -anchor center
ttk::style element create Toolbutton.button image \
[list $I(empty) \
diff --git a/TK-Themes/theme/light/box-accent.png b/TK-Themes/theme/light/box-accent.png
index 89f1faf..70c1e38 100644
Binary files a/TK-Themes/theme/light/box-accent.png and b/TK-Themes/theme/light/box-accent.png differ
diff --git a/TK-Themes/theme/light/check-accent.png b/TK-Themes/theme/light/check-accent.png
index 4aea79b..67de0a6 100644
Binary files a/TK-Themes/theme/light/check-accent.png and b/TK-Themes/theme/light/check-accent.png differ
diff --git a/TK-Themes/theme/light/check-tri-accent.png b/TK-Themes/theme/light/check-tri-accent.png
index d6baad5..c02f75d 100644
Binary files a/TK-Themes/theme/light/check-tri-accent.png and b/TK-Themes/theme/light/check-tri-accent.png differ
diff --git a/TK-Themes/theme/light/circle-accent.png b/TK-Themes/theme/light/circle-accent.png
index ea76e7a..b2202e2 100644
Binary files a/TK-Themes/theme/light/circle-accent.png and b/TK-Themes/theme/light/circle-accent.png differ
diff --git a/TK-Themes/theme/light/combo-button-focus.png b/TK-Themes/theme/light/combo-button-focus.png
index 59c7db4..521aef0 100644
Binary files a/TK-Themes/theme/light/combo-button-focus.png and b/TK-Themes/theme/light/combo-button-focus.png differ
diff --git a/TK-Themes/theme/light/hor-accent.png b/TK-Themes/theme/light/hor-accent.png
index 145b10e..20ea079 100644
Binary files a/TK-Themes/theme/light/hor-accent.png and b/TK-Themes/theme/light/hor-accent.png differ
diff --git a/TK-Themes/theme/light/on-accent.png b/TK-Themes/theme/light/on-accent.png
index f5a86c9..31ee2fc 100644
Binary files a/TK-Themes/theme/light/on-accent.png and b/TK-Themes/theme/light/on-accent.png differ
diff --git a/TK-Themes/theme/light/radio-accent.png b/TK-Themes/theme/light/radio-accent.png
index 1f7329d..4daef1d 100644
Binary files a/TK-Themes/theme/light/radio-accent.png and b/TK-Themes/theme/light/radio-accent.png differ
diff --git a/TK-Themes/theme/light/radio-tri-accent.png b/TK-Themes/theme/light/radio-tri-accent.png
index 86dd4cb..806d575 100644
Binary files a/TK-Themes/theme/light/radio-tri-accent.png and b/TK-Themes/theme/light/radio-tri-accent.png differ
diff --git a/TK-Themes/theme/light/rect-accent.png b/TK-Themes/theme/light/rect-accent.png
index 2d08674..8b3f822 100644
Binary files a/TK-Themes/theme/light/rect-accent.png and b/TK-Themes/theme/light/rect-accent.png differ
diff --git a/TK-Themes/theme/light/tick-hor-accent.png b/TK-Themes/theme/light/tick-hor-accent.png
index 6940b1c..aa32534 100644
Binary files a/TK-Themes/theme/light/tick-hor-accent.png and b/TK-Themes/theme/light/tick-hor-accent.png differ
diff --git a/TK-Themes/theme/light/tick-vert-accent.png b/TK-Themes/theme/light/tick-vert-accent.png
index dfdb89c..53c102d 100644
Binary files a/TK-Themes/theme/light/tick-vert-accent.png and b/TK-Themes/theme/light/tick-vert-accent.png differ
diff --git a/TK-Themes/theme/light/vert-accent.png b/TK-Themes/theme/light/vert-accent.png
index 7f87bdc..58b0c32 100644
Binary files a/TK-Themes/theme/light/vert-accent.png and b/TK-Themes/theme/light/vert-accent.png differ
diff --git a/TK-Themes/azure.tcl b/TK-Themes/water.tcl
similarity index 92%
rename from TK-Themes/azure.tcl
rename to TK-Themes/water.tcl
index b2773fa..ac96081 100755
--- a/TK-Themes/azure.tcl
+++ b/TK-Themes/water.tcl
@@ -1,4 +1,5 @@
# Copyright © 2021 rdbende
+# inspired by rdbende modified azure to water by Désire Werner Menrath polunga40@unity-mail.de 2024
source [file join [file dirname [info script]] theme light.tcl]
source [file join [file dirname [info script]] theme dark.tcl]
@@ -7,14 +8,14 @@ option add *tearOff 0
proc set_theme {mode} {
if {$mode == "dark"} {
- ttk::style theme use "azure-dark"
+ ttk::style theme use "water-dark"
array set colors {
-fg "#ffffff"
-bg "#333333"
-disabledfg "#ffffff"
-disabledbg "#737373"
- -selectfg "#ffffff"
+ -selectfg "#000000"
-selectbg "#00c4ff"
}
@@ -46,14 +47,14 @@ proc set_theme {mode} {
option add *Menu.selectcolor $colors(-fg)
} elseif {$mode == "light"} {
- ttk::style theme use "azure-light"
+ ttk::style theme use "water-light"
array set colors {
-fg "#000000"
-bg "#ffffff"
-disabledfg "#737373"
-disabledbg "#ffffff"
- -selectfg "#ffffff"
+ -selectfg "#000000"
-selectbg "#00c4ff"
}
diff --git a/wg_func.py b/wg_func.py
index 1615117..9841dd2 100755
--- a/wg_func.py
+++ b/wg_func.py
@@ -117,7 +117,7 @@ class GreenLabel:
def green_show_label(self):
self.lb_tunnel = ttk.Label(self, textvariable=self.StrVar)
self.lb_tunnel.config(font=('Ubuntu', 11, 'bold'))
- self.lb_tunnel.grid(column=2, padx=10, row=0)
+ self.lb_tunnel.grid(column=2, padx=10, row=1)
self.columnconfigure(2, weight=1)
self.rowconfigure(0, weight=1)
@@ -247,17 +247,17 @@ class ShowAddress:
def show_data(self):
""" Address Label """
self.address = ttk.Label(self.lb_frame, textvariable=self.add, foreground='#0071ff')
- self.address.grid(column=0, row=4, sticky='w', padx=10, pady=6)
+ self.address.grid(column=0, row=5, sticky='w', padx=10, pady=6)
self.address.config(font=('Ubuntu', 9))
''' DNS Label '''
self.dns = ttk.Label(self.lb_frame, textvariable=self.DNS, foreground='#0071ff')
- self.dns.grid(column=0, row=6, sticky='w', padx=10, pady=6)
+ self.dns.grid(column=0, row=7, sticky='w', padx=10, pady=6)
self.dns.config(font=('Ubuntu', 9))
''' Endpoint Label '''
self.endpoint = ttk.Label(self.lb_frame2, textvariable=self.enp, foreground='#0071ff')
- self.endpoint.grid(column=0, row=7, sticky='w', padx=10, pady=10)
+ self.endpoint.grid(column=0, row=8, sticky='w', padx=10, pady=20)
self.endpoint.config(font=('Ubuntu', 9))
@@ -457,9 +457,10 @@ class OnOff:
self.autoconnect_var.set('')
self.autoconnect_var = tk.StringVar()
self.autoconnect_var.set(self.auto_con)
- self.autoconnect = ttk.Label(self, textvariable=self.autoconnect_var)
+
+ self.autoconnect = ttk.Label(self, textvariable=self.autoconnect_var, foreground='blue')
self.autoconnect.config(font=('Ubuntu', 11))
- self.autoconnect.grid(column=0, row=4, sticky='ne', pady=22)
+ self.autoconnect.grid(column=0, row=4, sticky='ne', pady=19)
class ExportTunnels:
diff --git a/wg_main.py b/wg_main.py
index f4c8999..6141a56 100755
--- a/wg_main.py
+++ b/wg_main.py
@@ -19,32 +19,24 @@ class MainWindow(tk.Tk):
self.switch_on = None
self.switch_off = None
self.x_width = 600
- self.y_height = 350
+ self.y_height = 390
self.monitor_center_x = self.winfo_screenwidth() / 2 - (self.x_width / 2)
self.monitor_center_y = self.winfo_screenheight() / 2 - (self.y_height / 2)
- self.resizable(width=False, height=False)
+ #self.resizable(width=False, height=False)
self.title('Wire-Py')
#self.configure(background=back_gd)
self.geometry('%dx%d+%d+%d' % (self.x_width, self.y_height, self.monitor_center_x, self.monitor_center_y))
- self.columnconfigure(0, weight=1)
- self.rowconfigure(0, weight=1)
+ #self.columnconfigure(0, weight=1)
+ #self.rowconfigure(0, weight=1)
self.style = ttk.Style(self)
- self.tk.call('source', str(tcl_path) + '/azure.tcl')
+ #self.tk.call('source', str(tcl_path) + '/azure.tcl')
+ self.tk.call('source', 'TK-Themes/water.tcl')
with open(path_to_file3, 'r') as read_file:
if 'light' in read_file:
self.tk.call('set_theme', 'light')
- back_gd = '#e0e2fd'
- fore_gd = 'black'
- activ_background = '#e0e2fd'
- activ_foreground = '#0071ff'
else:
self.tk.call('set_theme', 'dark')
- back_gd = '#424242'
- fore_gd = 'white'
- activ_background = '#424242'
- activ_foreground = '#0071ff'
-
''' Load the image file from disk. '''
self.wg_icon = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/48/wg_vpn.png')
# Set it as the window icon.
@@ -63,69 +55,75 @@ class MainWindow(tk.Tk):
# Set dark or light
def theme_change():
- if self.tk.call("ttk::style", "theme", "use") == "azure-dark":
+ if self.tk.call("ttk::style", "theme", "use") == "water-dark":
# Set light theme
self.tk.call('set_theme', 'light')
- self.app_menu.configure(background='#e0e2fd', foreground='black', activebackground='#e0e2fd')
+
with open(path_to_file3, 'w') as theme_set2:
theme_set2.write('light')
else:
# Set dark theme
self.tk.call('set_theme', 'dark')
- self.app_menu.configure(background='#424242', foreground='white', activebackground='#424242')
with open(path_to_file3, 'w') as theme_set2:
theme_set2.write('dark')
+ ''' Frame for Menu '''
+ self.menu_frame = ttk.Frame(self)
+ self.menu_frame.configure(relief='flat')
+ self.menu_frame.grid(column=0, row=0, sticky='w')
+ self.columnconfigure(0, weight=1)
+ self.rowconfigure(0, weight=1)
+
# App Menu
- self.app_menu = tk.Menu(self, borderwidth=0, tearoff=tk.NO)
- self.configure(menu=self.app_menu)
- self.version = ttk.Label(self, text=version)
- self.version.config(font=('Ubuntu', 11))
- self.version.grid(column=0, row=0)
+ self.version_lb = ttk.Label(self.menu_frame, text=version)
+ self.version_lb.config(font=('Ubuntu', 11), foreground='#00c4ff')
+ self.version_lb.grid(column=0, row=0, padx=10)
+ self.options_btn = ttk.Menubutton(self.menu_frame, text='Options')
+ self.options_btn.grid(column=1, row=0)
+
set_option = tk.IntVar()
- #self.options_btn = ttk.Menubutton(self, text='Options', style='Toolbutton')
-
-
- self.settings = tk.Menu(self.app_menu, tearoff=tk.NO)
+ self.settings = tk.Menu(self)
+ self.options_btn.configure(menu=self.settings, style='Toolbutton')
self.settings.add_checkbutton(label='Disable updates', command=on_off, variable=set_option)
-
self.settings.add_command(label='Dark/Light', command=theme_change)
- self.to_load = tk.Menu(self.app_menu, tearoff=tk.NO)
- self.to_load.add_command(label='Download Update', command=WirePyUpdate.download)
- self.app_menu.add_cascade(label=version, foreground='#0071ff', activebackground=activ_background,
- activeforeground=activ_foreground)
- self.app_menu.add_cascade(label='Options', menu=self.settings)
- self.app_menu.add_cascade(label='?')
- if res == 'False':
- set_option.set(value=1)
- self.app_menu.add_cascade(label='Update search off', state='disabled')
- elif res == 'No Internet Connection!':
- self.app_menu.add_cascade(label='No Internet Connection!', foreground='red', activebackground=back_gd,
- activeforeground='red')
- elif res == 'No Updates':
- self.app_menu.add_cascade(label='No Updates', activeforeground=fore_gd, activebackground=back_gd)
- else:
- set_option.set(value=0)
- with open(path_to_file3, 'r') as read_file:
- if 'light' in read_file:
- self.tk.call('set_theme', 'light')
- self.app_menu.add_cascade(label=f'Update {res} available!', menu=self.to_load, foreground='green',
- activebackground=activ_background, activeforeground='green')
- else:
- self.app_menu.add_cascade(label=f'Update {res} available!', menu=self.to_load,
- foreground='yellow', activebackground=activ_background,
- activeforeground='yellow')
+ #self.to_load = tk.Menu(self.app_menu, tearoff=tk.NO)
+ #self.to_load.add_command(label='Download Update', command=WirePyUpdate.download)
+ #self.app_menu.add_cascade(label=version, foreground='#0071ff', activebackground=activ_background,
+ # activeforeground=activ_foreground)
+ #self.app_menu.add_cascade(label='Options', menu=self.settings)
+ #self.app_menu.add_cascade(label='?')
- with open(path_to_file3, 'r') as read_file:
- if 'light' in read_file:
- self.app_menu.configure(background='#e0e2fd', foreground='black', activebackground='#e0e2fd')
+ #if res == 'False':
+ # set_option.set(value=1)
+ # self.app_menu.add_cascade(label='Update search off', state='disabled')
+ #elif res == 'No Internet Connection!':
+ # self.app_menu.add_cascade(label='No Internet Connection!', foreground='red', activebackground=back_gd,
+ # activeforeground='red')
+ #elif res == 'No Updates':
+ # self.app_menu.add_cascade(label='No Updates', activeforeground=fore_gd, activebackground=back_gd)
+#
+ #else:
+ # set_option.set(value=0)
+ # with open(path_to_file3, 'r') as read_file:
+ # if 'light' in read_file:
+ # self.tk.call('set_theme', 'light')
+ # self.app_menu.add_cascade(label=f'Update {res} available!', menu=self.to_load, foreground='green',
+ # activebackground=activ_background, activeforeground='green')
+ # else:
+ # self.app_menu.add_cascade(label=f'Update {res} available!', menu=self.to_load,
+ # foreground='yellow', activebackground=activ_background,
+ # activeforeground='yellow')
- else:
- self.app_menu.configure(background='#424242', foreground='white', activebackground='#424242')
+ #with open(path_to_file3, 'r') as read_file:
+ # if 'light' in read_file:
+ # self.app_menu.configure(background='#e0e2fd', foreground='black', activebackground='#e0e2fd')
+
+ # else:
+ # self.app_menu.configure(background='#424242', foreground='white', activebackground='#424242')
FrameWidgets(self).grid()
@@ -154,29 +152,29 @@ class FrameWidgets(ttk.Frame):
''' Label Frame 1 '''
self.lb_frame_btn_lbox = ttk.Frame(self)
self.lb_frame_btn_lbox.configure(relief='flat')
- self.lb_frame_btn_lbox.grid(column=0, rowspan=4, row=0)
+ self.lb_frame_btn_lbox.grid(column=0, rowspan=3, row=1)
self.columnconfigure(0, weight=1)
- self.rowconfigure(0, weight=1)
+ self.rowconfigure(1, weight=1)
''' Label Frame 2 '''
self.lb_frame = ttk.Frame(self)
self.lb_frame.configure(relief='solid')
- self.lb_frame.grid(column=2, row=1, sticky='snew', padx=20, pady=5)
+ self.lb_frame.grid(column=2, row=2, sticky='snew', padx=20, pady=5)
self.columnconfigure(2, weight=1)
- self.rowconfigure(1, weight=1)
+ self.rowconfigure(2, weight=1)
''' Label Frame 3 '''
self.lb_frame2 = ttk.Frame(self)
self.lb_frame2.configure(relief='solid')
- self.lb_frame2.grid(column=2, row=2, sticky='snew', padx=20, pady=5)
+ self.lb_frame2.grid(column=2, row=3, sticky='snew', padx=20, pady=5)
self.columnconfigure(2, weight=1)
- self.rowconfigure(2, weight=1)
+ self.rowconfigure(3, weight=1)
''' Show active Label '''
self.select_tunnel = None
self.lb = ttk.Label(self, text='Active: ')
self.lb.config(font=('Ubuntu', 11, 'bold'))
- self.lb.grid(column=2, row=0, padx=15, sticky='w')
+ self.lb.grid(column=2, row=1, padx=15, pady=4, sticky='w')
self.columnconfigure(2, weight=1)
self.rowconfigure(0, weight=1)
@@ -186,13 +184,13 @@ class FrameWidgets(ttk.Frame):
''' Interface Label '''
self.interface = ttk.Label(self.lb_frame, text='Interface')
- self.interface.grid(column=0, row=2, sticky='we', padx=120)
+ self.interface.grid(column=0, row=3, sticky='we', padx=120)
self.interface.config(font=('Ubuntu', 9))
''' Peer Label '''
self.peer = ttk.Label(self.lb_frame2, text='Peer')
self.peer.config(font=('Ubuntu', 9))
- self.peer.grid(column=0, row=3, sticky='we', padx=130)
+ self.peer.grid(column=0, row=4, sticky='we', padx=130)
''' Listbox with Scrollbar '''
@@ -321,7 +319,7 @@ class FrameWidgets(ttk.Frame):
''' Label Entry '''
self.lb_rename = ttk.Entry(self, width=20)
- self.lb_rename.grid(column=2, row=4, padx=30, pady=5, sticky='w')
+ self.lb_rename.grid(column=2, row=4, padx=30, pady=15, sticky='nw')
self.lb_rename.insert(0, 'Max. 12 characters!')
self.lb_rename.config(state='disable')
@@ -394,20 +392,21 @@ class FrameWidgets(ttk.Frame):
''' Button Rename '''
self.btn_rename = ttk.Button(self, text='Rename', state='disable', command=tl_rename, padding=4,
style='RnButton.TButton')
- self.btn_rename.grid(column=2, row=4, padx=20, pady=10, sticky='e')
+ self.btn_rename.grid(column=2, row=4, padx=20, pady=15, sticky='ne')
''' Check Buttons '''
self.selected_option = tk.IntVar()
self.autoconnect_var = tk.StringVar()
self.autoconnect_var.set(self.auto_con)
+ ''' Frame for Labels, Entry and Button'''
self.autoconnect = ttk.Label(self, textvariable=self.autoconnect_var)
self.autoconnect.config(font=('Ubuntu', 11))
- self.autoconnect.grid(column=0, row=4, sticky='ne', pady=0, padx=10)
+ self.autoconnect.grid(column=0, row=4, sticky='ne', padx=10, pady=15)
self.wg_autostart = ttk.Checkbutton(self,
text='Autoconnect on:',
variable=self.selected_option,
command=lambda: FileHandle.box_set(self))
- self.wg_autostart.grid(column=0, row=4, pady=19, padx=15, sticky='nw')
+ self.wg_autostart.grid(column=0, row=4, pady=15, padx=15, sticky='nw')
OnOff.on_off(self)