- Theme modify to water-theme

- add ttk.Menubutton vor modern Menu and automatic theme and textvariable for color on font in menu
This commit is contained in:
Désiré Werner Menrath 2024-10-18 22:33:20 +02:00
parent e44fbeb9e4
commit 46514693bd
34 changed files with 138 additions and 233 deletions

View File

@ -4,138 +4,40 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment=" - Create file for settings (Autoupdate)&#10; - Create file for theme&#10; - Autoupdate in Options&#10; - Dark Theme for Wire-Py"> <list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment=" - Menu add &#10; - New Modern Dark and Light(default) Theme">
<change afterPath="$PROJECT_DIR$/TK-Themes/LICENSE" afterDir="false" /> <change afterPath="$PROJECT_DIR$/TK-Themes/water.tcl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/azure.tcl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark.tcl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/box-accent.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/box-basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/box-hover.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/box-invalid.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/button-hover.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/card.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/check-accent.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/check-basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/check-hover.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/check-tri-accent.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/check-tri-basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/check-tri-hover.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/circle-accent.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/circle-basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/circle-hover.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/combo-button-basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/combo-button-focus.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/combo-button-hover.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/down-accent.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/down.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/empty.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/hor-accent.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/hor-basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/hor-hover.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/notebook.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/off-basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/on-accent.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/on-basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/outline-basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/outline-hover.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/radio-accent.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/radio-basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/radio-hover.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/radio-tri-accent.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/radio-tri-basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/radio-tri-hover.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/rect-accent-hover.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/rect-accent.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/rect-basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/rect-hover.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/right.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/scale-hor.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/scale-vert.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/separator.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/size.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/tab-basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/tab-disabled.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/tab-hover.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/tick-hor-accent.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/tick-hor-basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/tick-hor-hover.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/tick-vert-accent.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/tick-vert-basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/tick-vert-hover.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/tree-basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/tree-pressed.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/up-accent.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/up.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/vert-accent.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/vert-basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/vert-hover.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light.tcl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/box-accent.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/box-basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/box-hover.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/box-invalid.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/button-hover.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/card.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/check-accent.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/check-basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/check-hover.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/check-tri-accent.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/check-tri-basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/check-tri-hover.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/circle-accent.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/circle-basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/circle-hover.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/combo-button-basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/combo-button-focus.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/combo-button-hover.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/down-accent.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/down.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/empty.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/hor-accent.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/hor-basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/hor-hover.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/notebook.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/off-basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/off-hover.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/on-accent.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/on-basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/on-hover.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/outline-basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/outline-hover.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/radio-accent.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/radio-basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/radio-hover.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/radio-tri-accent.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/radio-tri-basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/radio-tri-hover.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/rect-accent-hover.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/rect-accent.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/rect-basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/rect-hover.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/right.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/scale-hor.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/scale-vert.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/separator.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/size.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/tab-basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/tab-disabled.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/tab-hover.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/tick-hor-accent.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/tick-hor-basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/tick-hor-hover.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/tick-vert-accent.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/tick-vert-basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/tick-vert-hover.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/tree-basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/tree-pressed.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/up-accent.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/up.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/vert-accent.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/vert-basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TK-Themes/theme/light/vert-hover.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/testtheme.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/install" beforeDir="false" afterPath="$PROJECT_DIR$/install" afterDir="false" /> <change beforePath="$PROJECT_DIR$/TK-Themes/azure.tcl" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/TK-Themes/theme/dark.tcl" beforeDir="false" afterPath="$PROJECT_DIR$/TK-Themes/theme/dark.tcl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/TK-Themes/theme/dark/box-accent.png" beforeDir="false" afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/box-accent.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/TK-Themes/theme/dark/check-accent.png" beforeDir="false" afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/check-accent.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/TK-Themes/theme/dark/check-tri-accent.png" beforeDir="false" afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/check-tri-accent.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/TK-Themes/theme/dark/circle-accent.png" beforeDir="false" afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/circle-accent.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/TK-Themes/theme/dark/combo-button-focus.png" beforeDir="false" afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/combo-button-focus.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/TK-Themes/theme/dark/hor-accent.png" beforeDir="false" afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/hor-accent.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/TK-Themes/theme/dark/on-accent.png" beforeDir="false" afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/on-accent.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/TK-Themes/theme/dark/radio-accent.png" beforeDir="false" afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/radio-accent.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/TK-Themes/theme/dark/radio-tri-accent.png" beforeDir="false" afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/radio-tri-accent.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/TK-Themes/theme/dark/rect-accent.png" beforeDir="false" afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/rect-accent.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/TK-Themes/theme/dark/tab-basic.png" beforeDir="false" afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/tab-basic.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/TK-Themes/theme/dark/tick-hor-accent.png" beforeDir="false" afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/tick-hor-accent.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/TK-Themes/theme/dark/tick-vert-accent.png" beforeDir="false" afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/tick-vert-accent.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/TK-Themes/theme/dark/tree-pressed.png" beforeDir="false" afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/tree-pressed.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/TK-Themes/theme/dark/vert-accent.png" beforeDir="false" afterPath="$PROJECT_DIR$/TK-Themes/theme/dark/vert-accent.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/TK-Themes/theme/light.tcl" beforeDir="false" afterPath="$PROJECT_DIR$/TK-Themes/theme/light.tcl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/TK-Themes/theme/light/box-accent.png" beforeDir="false" afterPath="$PROJECT_DIR$/TK-Themes/theme/light/box-accent.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/TK-Themes/theme/light/check-accent.png" beforeDir="false" afterPath="$PROJECT_DIR$/TK-Themes/theme/light/check-accent.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/TK-Themes/theme/light/check-tri-accent.png" beforeDir="false" afterPath="$PROJECT_DIR$/TK-Themes/theme/light/check-tri-accent.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/TK-Themes/theme/light/circle-accent.png" beforeDir="false" afterPath="$PROJECT_DIR$/TK-Themes/theme/light/circle-accent.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/TK-Themes/theme/light/combo-button-focus.png" beforeDir="false" afterPath="$PROJECT_DIR$/TK-Themes/theme/light/combo-button-focus.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/TK-Themes/theme/light/hor-accent.png" beforeDir="false" afterPath="$PROJECT_DIR$/TK-Themes/theme/light/hor-accent.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/TK-Themes/theme/light/on-accent.png" beforeDir="false" afterPath="$PROJECT_DIR$/TK-Themes/theme/light/on-accent.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/TK-Themes/theme/light/radio-accent.png" beforeDir="false" afterPath="$PROJECT_DIR$/TK-Themes/theme/light/radio-accent.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/TK-Themes/theme/light/radio-tri-accent.png" beforeDir="false" afterPath="$PROJECT_DIR$/TK-Themes/theme/light/radio-tri-accent.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/TK-Themes/theme/light/rect-accent.png" beforeDir="false" afterPath="$PROJECT_DIR$/TK-Themes/theme/light/rect-accent.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/TK-Themes/theme/light/tick-hor-accent.png" beforeDir="false" afterPath="$PROJECT_DIR$/TK-Themes/theme/light/tick-hor-accent.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/TK-Themes/theme/light/tick-vert-accent.png" beforeDir="false" afterPath="$PROJECT_DIR$/TK-Themes/theme/light/tick-vert-accent.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/TK-Themes/theme/light/vert-accent.png" beforeDir="false" afterPath="$PROJECT_DIR$/TK-Themes/theme/light/vert-accent.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/wg_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/wg_func.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/wg_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/wg_func.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/wg_main.py" beforeDir="false" afterPath="$PROJECT_DIR$/wg_main.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/wg_main.py" beforeDir="false" afterPath="$PROJECT_DIR$/wg_main.py" afterDir="false" />
</list> </list>
@ -186,7 +88,7 @@
&quot;Shell Script.install.executor&quot;: &quot;Run&quot;, &quot;Shell Script.install.executor&quot;: &quot;Run&quot;,
&quot;git-widget-placeholder&quot;: &quot;main&quot;, &quot;git-widget-placeholder&quot;: &quot;main&quot;,
&quot;last_opened_file_path&quot;: &quot;/home/punix/Pyapps/wire-py&quot;, &quot;last_opened_file_path&quot;: &quot;/home/punix/Pyapps/wire-py&quot;,
&quot;settings.editor.selected.configurable&quot;: &quot;preferences.lookFeel&quot; &quot;settings.editor.selected.configurable&quot;: &quot;configurable.group.editor&quot;
} }
}</component> }</component>
<component name="RecentsManager"> <component name="RecentsManager">
@ -194,6 +96,8 @@
<recent name="$PROJECT_DIR$" /> <recent name="$PROJECT_DIR$" />
</key> </key>
<key name="MoveFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/TK-Themes/theme" />
<recent name="$PROJECT_DIR$/TK-Themes" />
<recent name="$PROJECT_DIR$" /> <recent name="$PROJECT_DIR$" />
<recent name="$PROJECT_DIR$/wire-py" /> <recent name="$PROJECT_DIR$/wire-py" />
</key> </key>
@ -265,14 +169,6 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1723279982210</updated> <updated>1723279982210</updated>
</task> </task>
<task id="LOCAL-00009" summary="add Class StartStopBTN to wg_func.py">
<option name="closed" value="true" />
<created>1724237471056</created>
<option name="number" value="00009" />
<option name="presentableId" value="LOCAL-00009" />
<option name="project" value="LOCAL" />
<updated>1724237471056</updated>
</task>
<task id="LOCAL-00010" summary="Set Style to Clam&#10;Improved layout of widgets"> <task id="LOCAL-00010" summary="Set Style to Clam&#10;Improved layout of widgets">
<option name="closed" value="true" /> <option name="closed" value="true" />
<created>1724272761629</created> <created>1724272761629</created>
@ -657,7 +553,15 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1728059870005</updated> <updated>1728059870005</updated>
</task> </task>
<option name="localTasksCounter" value="58" /> <task id="LOCAL-00058" summary=" - Menu add &#10; - New Modern Dark and Light(default) Theme">
<option name="closed" value="true" />
<created>1729103964804</created>
<option name="number" value="00058" />
<option name="presentableId" value="LOCAL-00058" />
<option name="project" value="LOCAL" />
<updated>1729103964804</updated>
</task>
<option name="localTasksCounter" value="59" />
<servers /> <servers />
</component> </component>
<component name="UnknownFeatures"> <component name="UnknownFeatures">
@ -698,7 +602,6 @@
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" /> <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="install fix for set dir right" />
<MESSAGE value="fix checkbox disable and policy rename main.py to wg_main.py" /> <MESSAGE value="fix checkbox disable and policy rename main.py to wg_main.py" />
<MESSAGE value="fix rename in Messagebox warning to error" /> <MESSAGE value="fix rename in Messagebox warning to error" />
<MESSAGE value="set rights in install and a .conf a import Tunnel Filedialog Part 1 /home when open" /> <MESSAGE value="set rights in install and a .conf a import Tunnel Filedialog Part 1 /home when open" />
@ -723,6 +626,7 @@
<MESSAGE value="fix installer add .keys file" /> <MESSAGE value="fix installer add .keys file" />
<MESSAGE value="Changelog create When exporting, the folder is now copied to /tmp and the non .conf files are deleted before the zip file is created. In main.py os import removed. Since os have been replaced by pathlib and shutil.&#10;Start with version number 1.4.7&#10;Message window size corrected so text is displayed better" /> <MESSAGE value="Changelog create When exporting, the folder is now copied to /tmp and the non .conf files are deleted before the zip file is created. In main.py os import removed. Since os have been replaced by pathlib and shutil.&#10;Start with version number 1.4.7&#10;Message window size corrected so text is displayed better" />
<MESSAGE value="Fix msg_window and remove x , y argument&#10;Install further adapted and with colored&#10;text if user is not in group sudo or wheel.&#10;Added to install Opensuse for installation" /> <MESSAGE value="Fix msg_window and remove x , y argument&#10;Install further adapted and with colored&#10;text if user is not in group sudo or wheel.&#10;Added to install Opensuse for installation" />
<option name="LAST_COMMIT_MESSAGE" value="Fix msg_window and remove x , y argument&#10;Install further adapted and with colored&#10;text if user is not in group sudo or wheel.&#10;Added to install Opensuse for installation" /> <MESSAGE value=" - Menu add &#10; - New Modern Dark and Light(default) Theme" />
<option name="LAST_COMMIT_MESSAGE" value=" - Menu add &#10; - New Modern Dark and Light(default) Theme" />
</component> </component>
</project> </project>

View File

@ -1,14 +1,14 @@
# Copyright (c) 2021 rdbende <rdbende@gmail.com> # Copyright (c) 2021 rdbende <rdbende@gmail.com>
# 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 package require Tk 8.6
namespace eval ttk::theme::azure-dark { namespace eval ttk::theme::water-dark {
variable version 2.0 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} { proc load_images {imgdir} {
variable I variable I
foreach file [glob -directory $imgdir *.png] { foreach file [glob -directory $imgdir *.png] {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 424 B

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 482 B

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 346 B

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 484 B

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 248 B

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 154 B

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 736 B

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 629 B

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 524 B

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 319 B

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 249 B

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 302 B

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 295 B

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 168 B

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 158 B

After

Width:  |  Height:  |  Size: 4.1 KiB

View File

@ -1,14 +1,14 @@
# Copyright (c) 2021 rdbende <rdbende@gmail.com> # Copyright (c) 2021 rdbende <rdbende@gmail.com>
# 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 package require Tk 8.6
namespace eval ttk::theme::azure-light { namespace eval ttk::theme::water-light {
variable version 2.0 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} { proc load_images {imgdir} {
variable I variable I
foreach file [glob -directory $imgdir *.png] { foreach file [glob -directory $imgdir *.png] {
@ -39,7 +39,7 @@ namespace eval ttk::theme::azure-light {
ttk::style layout Toolbutton { ttk::style layout Toolbutton {
Toolbutton.button -children { Toolbutton.button -children {
Toolbutton.padding -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 ] -border 4 -sticky ewns
# Toolbutton # 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 \ ttk::style element create Toolbutton.button image \
[list $I(empty) \ [list $I(empty) \

Binary file not shown.

Before

Width:  |  Height:  |  Size: 346 B

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 442 B

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 314 B

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 440 B

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 254 B

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 153 B

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 635 B

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 554 B

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 471 B

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 292 B

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 274 B

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 273 B

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 152 B

After

Width:  |  Height:  |  Size: 4.1 KiB

View File

@ -1,4 +1,5 @@
# Copyright © 2021 rdbende <rdbende@gmail.com> # Copyright © 2021 rdbende <rdbende@gmail.com>
# 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 light.tcl]
source [file join [file dirname [info script]] theme dark.tcl] source [file join [file dirname [info script]] theme dark.tcl]
@ -7,14 +8,14 @@ option add *tearOff 0
proc set_theme {mode} { proc set_theme {mode} {
if {$mode == "dark"} { if {$mode == "dark"} {
ttk::style theme use "azure-dark" ttk::style theme use "water-dark"
array set colors { array set colors {
-fg "#ffffff" -fg "#ffffff"
-bg "#333333" -bg "#333333"
-disabledfg "#ffffff" -disabledfg "#ffffff"
-disabledbg "#737373" -disabledbg "#737373"
-selectfg "#ffffff" -selectfg "#000000"
-selectbg "#00c4ff" -selectbg "#00c4ff"
} }
@ -46,14 +47,14 @@ proc set_theme {mode} {
option add *Menu.selectcolor $colors(-fg) option add *Menu.selectcolor $colors(-fg)
} elseif {$mode == "light"} { } elseif {$mode == "light"} {
ttk::style theme use "azure-light" ttk::style theme use "water-light"
array set colors { array set colors {
-fg "#000000" -fg "#000000"
-bg "#ffffff" -bg "#ffffff"
-disabledfg "#737373" -disabledfg "#737373"
-disabledbg "#ffffff" -disabledbg "#ffffff"
-selectfg "#ffffff" -selectfg "#000000"
-selectbg "#00c4ff" -selectbg "#00c4ff"
} }

View File

@ -117,7 +117,7 @@ class GreenLabel:
def green_show_label(self): def green_show_label(self):
self.lb_tunnel = ttk.Label(self, textvariable=self.StrVar) self.lb_tunnel = ttk.Label(self, textvariable=self.StrVar)
self.lb_tunnel.config(font=('Ubuntu', 11, 'bold')) 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.columnconfigure(2, weight=1)
self.rowconfigure(0, weight=1) self.rowconfigure(0, weight=1)
@ -247,17 +247,17 @@ class ShowAddress:
def show_data(self): def show_data(self):
""" Address Label """ """ Address Label """
self.address = ttk.Label(self.lb_frame, textvariable=self.add, foreground='#0071ff') 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)) self.address.config(font=('Ubuntu', 9))
''' DNS Label ''' ''' DNS Label '''
self.dns = ttk.Label(self.lb_frame, textvariable=self.DNS, foreground='#0071ff') 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)) self.dns.config(font=('Ubuntu', 9))
''' Endpoint Label ''' ''' Endpoint Label '''
self.endpoint = ttk.Label(self.lb_frame2, textvariable=self.enp, foreground='#0071ff') 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)) self.endpoint.config(font=('Ubuntu', 9))
@ -457,9 +457,10 @@ class OnOff:
self.autoconnect_var.set('') self.autoconnect_var.set('')
self.autoconnect_var = tk.StringVar() self.autoconnect_var = tk.StringVar()
self.autoconnect_var.set(self.auto_con) 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.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: class ExportTunnels:

View File

@ -19,32 +19,24 @@ class MainWindow(tk.Tk):
self.switch_on = None self.switch_on = None
self.switch_off = None self.switch_off = None
self.x_width = 600 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_x = self.winfo_screenwidth() / 2 - (self.x_width / 2)
self.monitor_center_y = self.winfo_screenheight() / 2 - (self.y_height / 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.title('Wire-Py')
#self.configure(background=back_gd) #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.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.columnconfigure(0, weight=1)
self.rowconfigure(0, weight=1) #self.rowconfigure(0, weight=1)
self.style = ttk.Style(self) 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: with open(path_to_file3, 'r') as read_file:
if 'light' in read_file: if 'light' in read_file:
self.tk.call('set_theme', 'light') self.tk.call('set_theme', 'light')
back_gd = '#e0e2fd'
fore_gd = 'black'
activ_background = '#e0e2fd'
activ_foreground = '#0071ff'
else: else:
self.tk.call('set_theme', 'dark') self.tk.call('set_theme', 'dark')
back_gd = '#424242'
fore_gd = 'white'
activ_background = '#424242'
activ_foreground = '#0071ff'
''' Load the image file from disk. ''' ''' Load the image file from disk. '''
self.wg_icon = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/48/wg_vpn.png') self.wg_icon = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/48/wg_vpn.png')
# Set it as the window icon. # Set it as the window icon.
@ -63,69 +55,75 @@ class MainWindow(tk.Tk):
# Set dark or light # Set dark or light
def theme_change(): 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 # Set light theme
self.tk.call('set_theme', 'light') 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: with open(path_to_file3, 'w') as theme_set2:
theme_set2.write('light') theme_set2.write('light')
else: else:
# Set dark theme # Set dark theme
self.tk.call('set_theme', 'dark') 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: with open(path_to_file3, 'w') as theme_set2:
theme_set2.write('dark') 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 # App Menu
self.app_menu = tk.Menu(self, borderwidth=0, tearoff=tk.NO) self.version_lb = ttk.Label(self.menu_frame, text=version)
self.configure(menu=self.app_menu) self.version_lb.config(font=('Ubuntu', 11), foreground='#00c4ff')
self.version = ttk.Label(self, text=version) self.version_lb.grid(column=0, row=0, padx=10)
self.version.config(font=('Ubuntu', 11)) self.options_btn = ttk.Menubutton(self.menu_frame, text='Options')
self.version.grid(column=0, row=0) self.options_btn.grid(column=1, row=0)
set_option = tk.IntVar() set_option = tk.IntVar()
#self.options_btn = ttk.Menubutton(self, text='Options', style='Toolbutton') self.settings = tk.Menu(self)
self.options_btn.configure(menu=self.settings, style='Toolbutton')
self.settings = tk.Menu(self.app_menu, tearoff=tk.NO)
self.settings.add_checkbutton(label='Disable updates', command=on_off, variable=set_option) self.settings.add_checkbutton(label='Disable updates', command=on_off, variable=set_option)
self.settings.add_command(label='Dark/Light', command=theme_change) 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: #self.to_load = tk.Menu(self.app_menu, tearoff=tk.NO)
set_option.set(value=0) #self.to_load.add_command(label='Download Update', command=WirePyUpdate.download)
with open(path_to_file3, 'r') as read_file: #self.app_menu.add_cascade(label=version, foreground='#0071ff', activebackground=activ_background,
if 'light' in read_file: # activeforeground=activ_foreground)
self.tk.call('set_theme', 'light') #self.app_menu.add_cascade(label='Options', menu=self.settings)
self.app_menu.add_cascade(label=f'Update {res} available!', menu=self.to_load, foreground='green', #self.app_menu.add_cascade(label='?')
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')
with open(path_to_file3, 'r') as read_file: #if res == 'False':
if 'light' in read_file: # set_option.set(value=1)
self.app_menu.configure(background='#e0e2fd', foreground='black', activebackground='#e0e2fd') # 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: #with open(path_to_file3, 'r') as read_file:
self.app_menu.configure(background='#424242', foreground='white', activebackground='#424242') # 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() FrameWidgets(self).grid()
@ -154,29 +152,29 @@ class FrameWidgets(ttk.Frame):
''' Label Frame 1 ''' ''' Label Frame 1 '''
self.lb_frame_btn_lbox = ttk.Frame(self) self.lb_frame_btn_lbox = ttk.Frame(self)
self.lb_frame_btn_lbox.configure(relief='flat') 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.columnconfigure(0, weight=1)
self.rowconfigure(0, weight=1) self.rowconfigure(1, weight=1)
''' Label Frame 2 ''' ''' Label Frame 2 '''
self.lb_frame = ttk.Frame(self) self.lb_frame = ttk.Frame(self)
self.lb_frame.configure(relief='solid') 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.columnconfigure(2, weight=1)
self.rowconfigure(1, weight=1) self.rowconfigure(2, weight=1)
''' Label Frame 3 ''' ''' Label Frame 3 '''
self.lb_frame2 = ttk.Frame(self) self.lb_frame2 = ttk.Frame(self)
self.lb_frame2.configure(relief='solid') 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.columnconfigure(2, weight=1)
self.rowconfigure(2, weight=1) self.rowconfigure(3, weight=1)
''' Show active Label ''' ''' Show active Label '''
self.select_tunnel = None self.select_tunnel = None
self.lb = ttk.Label(self, text='Active: ') self.lb = ttk.Label(self, text='Active: ')
self.lb.config(font=('Ubuntu', 11, 'bold')) 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.columnconfigure(2, weight=1)
self.rowconfigure(0, weight=1) self.rowconfigure(0, weight=1)
@ -186,13 +184,13 @@ class FrameWidgets(ttk.Frame):
''' Interface Label ''' ''' Interface Label '''
self.interface = ttk.Label(self.lb_frame, text='Interface') 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)) self.interface.config(font=('Ubuntu', 9))
''' Peer Label ''' ''' Peer Label '''
self.peer = ttk.Label(self.lb_frame2, text='Peer') self.peer = ttk.Label(self.lb_frame2, text='Peer')
self.peer.config(font=('Ubuntu', 9)) 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 ''' ''' Listbox with Scrollbar '''
@ -321,7 +319,7 @@ class FrameWidgets(ttk.Frame):
''' Label Entry ''' ''' Label Entry '''
self.lb_rename = ttk.Entry(self, width=20) 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.insert(0, 'Max. 12 characters!')
self.lb_rename.config(state='disable') self.lb_rename.config(state='disable')
@ -394,20 +392,21 @@ class FrameWidgets(ttk.Frame):
''' Button Rename ''' ''' Button Rename '''
self.btn_rename = ttk.Button(self, text='Rename', state='disable', command=tl_rename, padding=4, self.btn_rename = ttk.Button(self, text='Rename', state='disable', command=tl_rename, padding=4,
style='RnButton.TButton') 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 ''' ''' Check Buttons '''
self.selected_option = tk.IntVar() self.selected_option = tk.IntVar()
self.autoconnect_var = tk.StringVar() self.autoconnect_var = tk.StringVar()
self.autoconnect_var.set(self.auto_con) self.autoconnect_var.set(self.auto_con)
''' Frame for Labels, Entry and Button'''
self.autoconnect = ttk.Label(self, textvariable=self.autoconnect_var) self.autoconnect = ttk.Label(self, textvariable=self.autoconnect_var)
self.autoconnect.config(font=('Ubuntu', 11)) 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, self.wg_autostart = ttk.Checkbutton(self,
text='Autoconnect on:', text='Autoconnect on:',
variable=self.selected_option, variable=self.selected_option,
command=lambda: FileHandle.box_set(self)) 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) OnOff.on_off(self)