Compare commits
13 Commits
e44fbeb9e4
...
1.11.0724
| Author | SHA1 | Date | |
|---|---|---|---|
| 0a5341fab7 | |||
| 414a36b436 | |||
| fecbf2ab46 | |||
| 9d44e7ab42 | |||
| 18e042400c | |||
| 0769cabc1e | |||
| 33e31f06bb | |||
| cfffd590cb | |||
| 0fe591d70c | |||
| c4a4d328ae | |||
| bcdabadd0e | |||
| c645d23514 | |||
| 46514693bd |
298
.idea/workspace.xml
generated
298
.idea/workspace.xml
generated
@ -4,138 +4,14 @@
|
||||
<option name="autoReloadType" value="SELECTIVE" />
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment=" - Create file for settings (Autoupdate) - Create file for theme - Autoupdate in Options - Dark Theme for Wire-Py">
|
||||
<change afterPath="$PROJECT_DIR$/TK-Themes/LICENSE" 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" />
|
||||
<list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment="- Optimize Class and Tooltip">
|
||||
<change afterPath="$PROJECT_DIR$/run_as" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/Changelog" beforeDir="false" afterPath="$PROJECT_DIR$/Changelog" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/install" beforeDir="false" afterPath="$PROJECT_DIR$/install" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/settings" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/start_wg.py" beforeDir="false" afterPath="$PROJECT_DIR$/start_wg.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/theme" beforeDir="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" />
|
||||
</list>
|
||||
@ -160,6 +36,10 @@
|
||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||
<option name="UPDATE_TYPE" value="REBASE" />
|
||||
</component>
|
||||
<component name="HighlightingSettingsPerFile">
|
||||
<setting file="file://$PROJECT_DIR$/wg_func.py" root0="SKIP_INSPECTION" />
|
||||
<setting file="file://$PROJECT_DIR$/wg_main.py" root0="FORCE_HIGHLIGHTING" />
|
||||
</component>
|
||||
<component name="ProjectColorInfo">{
|
||||
"associatedIndex": 3
|
||||
}</component>
|
||||
@ -184,9 +64,10 @@
|
||||
"Python.wg_main.executor": "Run",
|
||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||
"Shell Script.install.executor": "Run",
|
||||
"Shell Script.run_as.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": "reference.settingsdialog.IDE.editor.colors"
|
||||
}
|
||||
}</component>
|
||||
<component name="RecentsManager">
|
||||
@ -194,6 +75,8 @@
|
||||
<recent name="$PROJECT_DIR$" />
|
||||
</key>
|
||||
<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$/wire-py" />
|
||||
</key>
|
||||
@ -265,70 +148,6 @@
|
||||
<option name="presentableId" value="Default" />
|
||||
<updated>1723279982210</updated>
|
||||
</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 Improved layout of widgets">
|
||||
<option name="closed" value="true" />
|
||||
<created>1724272761629</created>
|
||||
<option name="number" value="00010" />
|
||||
<option name="presentableId" value="LOCAL-00010" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1724272761629</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00011" summary="Remove open file function, add Show Address Labels with tk.StrVar when remove a not active Tunnel Labels of Active Tunnel removed!">
|
||||
<option name="closed" value="true" />
|
||||
<created>1724371229008</created>
|
||||
<option name="number" value="00011" />
|
||||
<option name="presentableId" value="LOCAL-00011" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1724371229008</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00012" summary="fixed error when active tunnel is deleted, now also the Address Label is emptied">
|
||||
<option name="closed" value="true" />
|
||||
<created>1724400463791</created>
|
||||
<option name="number" value="00012" />
|
||||
<option name="presentableId" value="LOCAL-00012" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1724400463791</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00013" summary="In FrameWidged Class else Block StrVar, this resorts reference and variable assignment together">
|
||||
<option name="closed" value="true" />
|
||||
<created>1724401340512</created>
|
||||
<option name="number" value="00013" />
|
||||
<option name="presentableId" value="LOCAL-00013" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1724401340512</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00014" summary="add method init_and_report and label_empty to Class ShowAddress">
|
||||
<option name="closed" value="true" />
|
||||
<created>1724410630021</created>
|
||||
<option name="number" value="00014" />
|
||||
<option name="presentableId" value="LOCAL-00014" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1724410630021</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00015" summary="little fixes in Class Import">
|
||||
<option name="closed" value="true" />
|
||||
<created>1724416642213</created>
|
||||
<option name="number" value="00015" />
|
||||
<option name="presentableId" value="LOCAL-00015" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1724416642213</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00016" summary="fix label when laat Tunnel delete and fix Tuple error in delete and Start/Stop when listbox empty">
|
||||
<option name="closed" value="true" />
|
||||
<created>1724495688099</created>
|
||||
<option name="number" value="00016" />
|
||||
<option name="presentableId" value="LOCAL-00016" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1724495688099</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00017" summary="remove a ',' in DNS Name">
|
||||
<option name="closed" value="true" />
|
||||
<created>1724576599289</created>
|
||||
@ -657,7 +476,71 @@
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1728059870005</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="58" />
|
||||
<task id="LOCAL-00058" summary=" - Menu add - 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>
|
||||
<task id="LOCAL-00059" summary=" - Theme modify to water-theme - add ttk.Menubutton vor modern Menu and automatic theme and textvariable for color on font in menu">
|
||||
<option name="closed" value="true" />
|
||||
<created>1729283656386</created>
|
||||
<option name="number" value="00059" />
|
||||
<option name="presentableId" value="LOCAL-00059" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1729283656387</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00060" summary=" - Theme modify to water-theme - add ttk.Menubutton vor modern Menu and automatic theme and textvariable for color on font in menu">
|
||||
<option name="closed" value="true" />
|
||||
<created>1729283719951</created>
|
||||
<option name="number" value="00060" />
|
||||
<option name="presentableId" value="LOCAL-00060" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1729283719951</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00061" summary=" - Add Options, Help, Update Label and Update Menubutton - Theme now separate Light and Dark">
|
||||
<option name="closed" value="true" />
|
||||
<created>1729353898829</created>
|
||||
<option name="number" value="00061" />
|
||||
<option name="presentableId" value="LOCAL-00061" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1729353898830</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00062" summary="- Optimize Class. Move to wg_main Import Start/StopBTN and Tooltip">
|
||||
<option name="closed" value="true" />
|
||||
<created>1729541504291</created>
|
||||
<option name="number" value="00062" />
|
||||
<option name="presentableId" value="LOCAL-00062" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1729541504292</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00063" summary="- Optimize Class. Move to wg_main Import Start/StopBTN and Tooltip">
|
||||
<option name="closed" value="true" />
|
||||
<created>1729541561434</created>
|
||||
<option name="number" value="00063" />
|
||||
<option name="presentableId" value="LOCAL-00063" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1729541561434</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00064" summary="- Optimize Class. Move to wg_main Import Start/StopBTN and Tooltip">
|
||||
<option name="closed" value="true" />
|
||||
<created>1729593628907</created>
|
||||
<option name="number" value="00064" />
|
||||
<option name="presentableId" value="LOCAL-00064" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1729593628908</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00065" summary="- Optimize Class and Tooltip">
|
||||
<option name="closed" value="true" />
|
||||
<created>1729938941026</created>
|
||||
<option name="number" value="00065" />
|
||||
<option name="presentableId" value="LOCAL-00065" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1729938941027</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="66" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="UnknownFeatures">
|
||||
@ -698,11 +581,6 @@
|
||||
</component>
|
||||
<component name="VcsManagerConfiguration">
|
||||
<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 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="fix set rights in install and a .conf a import Tunnel Filedialog Part 1 /home when open" />
|
||||
<MESSAGE value="fix a filedialog for hidden Files work install rollback to bash for start wirepy and wirepy rollback to bash" />
|
||||
<MESSAGE value="install rollback bash to py wirepy and wirepy rollback to py" />
|
||||
<MESSAGE value="fix install and .desktop File Tar works now for user home and filebrowser.askfilebrowser start now in user home" />
|
||||
@ -723,6 +601,22 @@
|
||||
<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. Start with version number 1.4.7 Message window size corrected so text is displayed better" />
|
||||
<MESSAGE value="Fix msg_window and remove x , y argument Install further adapted and with colored text if user is not in group sudo or wheel. Added to install Opensuse for installation" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Fix msg_window and remove x , y argument Install further adapted and with colored text if user is not in group sudo or wheel. Added to install Opensuse for installation" />
|
||||
<MESSAGE value=" - Menu add - New Modern Dark and Light(default) Theme" />
|
||||
<MESSAGE value=" - Theme modify to water-theme - add ttk.Menubutton vor modern Menu and automatic theme and textvariable for color on font in menu" />
|
||||
<MESSAGE value=" - Add Options, Help, Update Label and Update Menubutton - Theme now separate Light and Dark" />
|
||||
<MESSAGE value="- Optimize Class. Move to wg_main Import Start/StopBTN and Tooltip" />
|
||||
<MESSAGE value="- Optimize Class and Tooltip" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="- Optimize Class and Tooltip" />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
<breakpoint-manager>
|
||||
<breakpoints>
|
||||
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
|
||||
<url>file://$PROJECT_DIR$/start_wg.py</url>
|
||||
<line>1</line>
|
||||
<option name="timeStamp" value="2" />
|
||||
</line-breakpoint>
|
||||
</breakpoints>
|
||||
</breakpoint-manager>
|
||||
</component>
|
||||
</project>
|
||||
39
Changelog
39
Changelog
@ -4,12 +4,43 @@ My standard System: Linux Mint 22 Cinnamon
|
||||
## [Unreleased]
|
||||
|
||||
- os import in wg_func replaced by other methods
|
||||
- Guide to menu '?' with pictures
|
||||
- In Gitea Readme enter text, images
|
||||
- Own filedialog for import
|
||||
- If Wire-Py already runs, prevent further start
|
||||
- for loops with lists replaced by List Comprehensions
|
||||
- Keeping Classes Together
|
||||
- Update search after start of Wire-Py
|
||||
|
||||
|
||||
### Added
|
||||
27-10-2024
|
||||
|
||||
- Add Autoconnect settings to settings.conf
|
||||
|
||||
|
||||
### Added
|
||||
26-10-2024
|
||||
|
||||
- Add run_as Bash script and open_gitea.py python script
|
||||
- Add Tooltip disable/enable
|
||||
- Rename settings to settings.conf for theme, updates and tooltip enable in one file
|
||||
|
||||
|
||||
### Added
|
||||
25-10-2024
|
||||
|
||||
- Optimize Class and Tooltip
|
||||
|
||||
|
||||
### Added
|
||||
21-10-2024
|
||||
|
||||
- Optimize Class. Move to wg_main Import Start/StopBTN and Tooltip
|
||||
|
||||
|
||||
### Added
|
||||
19-10-2024
|
||||
|
||||
- Add Options, Help, Update Label and Update Menubutton
|
||||
- Theme now separate Light and Dark
|
||||
- Add Own Tooltip (Class and def's) Part One
|
||||
|
||||
### Added
|
||||
16-10-2024
|
||||
|
||||
23
README.md
23
README.md
@ -1,2 +1,25 @@
|
||||
# Wire-Py
|
||||
|
||||
Wire-Py is an easy-to-use Gui for nmcli.
|
||||
|
||||
Before the first use of Wire-Py, all previous tunnels with "nmcli connection delete example" should be removed.
|
||||
|
||||
Wire-Py can easily be imported, exported, started, popped as well as renamed and deleted.
|
||||
|
||||
Wire-Py runs on many distros.
|
||||
Tested on Arch Linux, OpenSuse Tumbleweed,
|
||||
Fedora, Debian12, Linux Mint 22 Cinnamon
|
||||
|
||||
With the desktops:
|
||||
Xfce4, Cinnamon, Kde, and Mate, LXDE, LXQT
|
||||
|
||||
|
||||
# Screenshots
|
||||
[](https://fb.ilunix.de/share/0cx7pPYK)
|
||||
|
||||
# Instruction
|
||||
|
||||
[](https://fb.ilunix.de/share/VpYEn3Gz)
|
||||
[](https://fb.ilunix.de/share/zBnbIiyD)
|
||||
[](https://fb.ilunix.de/share/gMc4-NAj)
|
||||
[](https://fb.ilunix.de/share/v0y_WiqV)
|
||||
@ -1,14 +1,14 @@
|
||||
# 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
|
||||
|
||||
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] {
|
||||
|
||||
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 |
@ -1,14 +1,14 @@
|
||||
# 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
|
||||
|
||||
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) \
|
||||
|
||||
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 |
@ -1,4 +1,5 @@
|
||||
# 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 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"
|
||||
}
|
||||
|
||||
16
install
16
install
@ -7,8 +7,8 @@ BLUE='\033[30;1;34m'
|
||||
install_file_with(){
|
||||
clear
|
||||
sudo apt install python3-tk && \
|
||||
sudo cp -u wg_main.py start_wg.py wg_func.py wirepy.py /usr/bin/ && \
|
||||
sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/.keys && sudo cp -u settings theme /etc/wire_py/ && \
|
||||
sudo cp -u wg_main.py start_wg.py wg_func.py wirepy.py run_as open_gitea.py /usr/bin/ && \
|
||||
sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/.keys && sudo cp -u settings.conf /etc/wire_py/ && \
|
||||
sudo cp -uR wp-icons /usr/share/icons/ && sudo cp -uR TK-Themes /usr/share/ && \
|
||||
sudo chown -R root:root /etc/wire_py && sudo chmod 755 /etc/wire_py && \
|
||||
sudo ln -sf /usr/bin/wirepy.py /usr/local/bin/wirepy && \
|
||||
@ -21,8 +21,8 @@ install_file_with(){
|
||||
install_arch_d(){
|
||||
clear
|
||||
sudo pacman -S --noconfirm tk python3 python-requests && \
|
||||
sudo cp -u wg_main.py start_wg.py wg_func.py wirepy.py /usr/bin/ && \
|
||||
sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/.keys && sudo cp -u settings theme /etc/wire_py/ && \
|
||||
sudo cp -u wg_main.py start_wg.py wg_func.py wirepy.py run_as open_gitea.py /usr/bin/ && \
|
||||
sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/.keys && sudo cp -u settings.conf /etc/wire_py/ && \
|
||||
sudo cp -uR wp-icons /usr/share/icons/ && sudo cp -uR TK-Themes /usr/share/ && \
|
||||
sudo chown -R root:root /etc/wire_py && sudo chmod 755 /etc/wire_py && \
|
||||
sudo ln -sf /usr/bin/wirepy.py /usr/local/bin/wirepy && \
|
||||
@ -89,9 +89,9 @@ elif grep -i 'fedora' /etc/os-release > /dev/null 2>&1
|
||||
if ! which python3-tkinter &> /dev/null
|
||||
then sudo dnf install python3-tkinter -y
|
||||
|
||||
sudo cp -u wg_main.py start_wg.py wg_func.py wirepy.py /usr/bin/ && \
|
||||
sudo cp -u wg_main.py start_wg.py wg_func.py wirepy.py run_as open_gitea.py /usr/bin/ && \
|
||||
sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/.keys && \
|
||||
sudo cp -u settings theme /etc/wire_py/ && \
|
||||
sudo cp -u settings.conf /etc/wire_py/ && \
|
||||
sudo cp -uR wp-icons /usr/share/icons/ && sudo cp -uR TK-Themes /usr/share/ && \
|
||||
sudo chown -R root:root /etc/wire_py && sudo chmod 755 /etc/wire_py && \
|
||||
sudo ln -sf /usr/bin/wirepy.py /usr/local/bin/wirepy && \
|
||||
@ -105,9 +105,9 @@ elif grep -i 'suse' /etc/os-release > /dev/null 2>&1
|
||||
then
|
||||
if ! which python311-tk &> /dev/null
|
||||
then sudo zypper install python311-tk
|
||||
sudo cp -u wg_main.py start_wg.py wg_func.py wirepy.py /usr/bin/ && \
|
||||
sudo cp -u wg_main.py start_wg.py wg_func.py wirepy.py run_as open_gitea.py /usr/bin/ && \
|
||||
sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/.keys && \
|
||||
sudo cp -u settings theme /etc/wire_py/ && \
|
||||
sudo cp -u settings.conf /etc/wire_py/ && \
|
||||
sudo cp -uR wp-icons /usr/share/icons/ && sudo cp -uR TK-Themes /usr/share/ && \
|
||||
sudo chown -R root:root /etc/wire_py && sudo chmod 755 /etc/wire_py && \
|
||||
sudo ln -sf /usr/bin/wirepy.py /usr/local/bin/wirepy && \
|
||||
|
||||
5
open_gitea.py
Executable file
5
open_gitea.py
Executable file
@ -0,0 +1,5 @@
|
||||
#!/usr/bin/python3
|
||||
|
||||
import webbrowser
|
||||
|
||||
webbrowser.open('https://git.ilunix.de/punix/Wire-Py')
|
||||
8
settings.conf
Normal file
8
settings.conf
Normal file
@ -0,0 +1,8 @@
|
||||
[UPDATES]
|
||||
on
|
||||
[THEME]
|
||||
light
|
||||
[TOOLTIP]
|
||||
True
|
||||
[AUTOSTART ON]
|
||||
off
|
||||
14
start_wg.py
14
start_wg.py
@ -2,11 +2,13 @@
|
||||
from subprocess import check_call
|
||||
from pathlib import Path
|
||||
|
||||
path_to_file = Path('/etc/wire_py/wg_py')
|
||||
path_to_file = Path('/etc/wire_py/settings.conf')
|
||||
|
||||
if Path.exists(path_to_file):
|
||||
a_con = Path.read_text(path_to_file)
|
||||
check_call(['nmcli', 'connection', 'up', a_con])
|
||||
else:
|
||||
pass
|
||||
with open(path_to_file, 'r') as a_con:
|
||||
lines = a_con.readlines()
|
||||
a_con = lines[7].strip()
|
||||
if a_con != 'off':
|
||||
check_call(['nmcli', 'connection', 'up', a_con])
|
||||
else:
|
||||
pass
|
||||
|
||||
|
||||
27
testtheme.py
27
testtheme.py
@ -1,27 +0,0 @@
|
||||
import tkinter as tk
|
||||
from tkinter import ttk
|
||||
|
||||
root = tk.Tk()
|
||||
|
||||
# Pack a big frame so, it behaves like the window background
|
||||
big_frame = ttk.Frame(root)
|
||||
big_frame.pack(fill="both", expand=True)
|
||||
|
||||
# Set the initial theme
|
||||
root.tk.call("source", "TK-Themes/azure.tcl")
|
||||
root.tk.call("set_theme", "light")
|
||||
|
||||
def change_theme():
|
||||
# NOTE: The theme's real name is azure-<mode>
|
||||
if root.tk.call("ttk::style", "theme", "use") == "azure-dark":
|
||||
# Set light theme
|
||||
root.tk.call("set_theme", "light")
|
||||
else:
|
||||
# Set dark theme
|
||||
root.tk.call("set_theme", "dark")
|
||||
|
||||
# Remember, you have to use ttk widgets
|
||||
button = ttk.Button(big_frame, text="Change theme!", command=change_theme)
|
||||
button.pack()
|
||||
|
||||
root.mainloop()
|
||||
346
wg_func.py
346
wg_func.py
@ -3,20 +3,20 @@
|
||||
import os
|
||||
import shutil
|
||||
import subprocess
|
||||
import time
|
||||
import tkinter as tk
|
||||
import zipfile
|
||||
from datetime import datetime
|
||||
from pathlib import Path
|
||||
from subprocess import check_call
|
||||
from tkinter import filedialog, ttk
|
||||
from tkinter import ttk
|
||||
import requests
|
||||
|
||||
''' 1 = 1. Year, 09 = Month of the Year, 2924 = Day and Year of the Year '''
|
||||
version = 'v. 1.10.1624'
|
||||
|
||||
path_to_file = Path('/etc/wire_py/wg_py')
|
||||
path_to_file2 = Path('/etc/wire_py/settings')
|
||||
path_to_file3 = Path('/etc/wire_py/theme')
|
||||
''' 1 = 1. Year, 09 = Month of the Year, 2924 = Day and Year of the Year '''
|
||||
version = 'v. 1.10.2124'
|
||||
|
||||
path_to_file2 = Path('/etc/wire_py/settings.conf')
|
||||
_u = Path.read_text(Path('/tmp/_u'))
|
||||
|
||||
UPDATE_API_URL = 'https://git.ilunix.de/api/v1/repos/punix/Wire-Py/releases'
|
||||
@ -31,7 +31,7 @@ class WirePyUpdate:
|
||||
response_dict = response_dict[0]
|
||||
with open(path_to_file2, 'r') as set_file:
|
||||
set_file = set_file.read()
|
||||
if 'Update on' in set_file:
|
||||
if 'on\n' in set_file:
|
||||
if version[3:] != response_dict['tag_name']:
|
||||
return response_dict['tag_name']
|
||||
else:
|
||||
@ -74,7 +74,9 @@ class WirePyUpdate:
|
||||
|
||||
res = WirePyUpdate.api_down()
|
||||
|
||||
def msg_window(img_w, img_i, w_title, w_txt):
|
||||
|
||||
|
||||
def msg_window(img_w, img_i, w_title, w_txt, txt2=None, com=None):
|
||||
"""
|
||||
Function for different message windows for the user. with 4 arguments to be passed.
|
||||
To create messages with your own images, icons, and titles. As an alternative to Python Messagebox.
|
||||
@ -91,13 +93,25 @@ def msg_window(img_w, img_i, w_title, w_txt):
|
||||
msg.configure(pady=15, padx=15)
|
||||
msg.img = tk.PhotoImage(file=img_w)
|
||||
msg.i_window = tk.Label(msg, image=msg.img)
|
||||
msg.i_window.grid(column=0, row=0)
|
||||
|
||||
label = tk.Label(msg, text=w_txt)
|
||||
label.config(font=('Ubuntu', 11), padx=15)
|
||||
|
||||
label.grid(column=1, row=0)
|
||||
button = ttk.Button(msg, text='OK', command=msg.destroy, padding=4)
|
||||
button.config()
|
||||
button.grid(column=0, columnspan=2, row=1)
|
||||
|
||||
if txt2 != None and com != None:
|
||||
label.config(font=('Ubuntu', 11), padx=15, justify='left')
|
||||
msg.i_window.grid(column=0, row=0, sticky='nw')
|
||||
button2 = ttk.Button(msg, text=f'{txt2}', command=com, padding=4)
|
||||
button2.grid(column=0, row=1, sticky='e', columnspan=2)
|
||||
button = ttk.Button(msg, text='OK', command=msg.destroy, padding=4)
|
||||
button.grid(column=0, row=1, sticky='w', columnspan=2)
|
||||
|
||||
else:
|
||||
label.config(font=('Ubuntu', 11), padx=15)
|
||||
msg.i_window.grid(column=0, row=0)
|
||||
button = ttk.Button(msg, text='OK', command=msg.destroy, padding=4)
|
||||
button.grid(column=0, columnspan=2, row=1)
|
||||
|
||||
img_i = tk.PhotoImage(file=img_i)
|
||||
msg.iconphoto(True, img_i)
|
||||
msg.columnconfigure(0, weight=1)
|
||||
@ -105,58 +119,19 @@ def msg_window(img_w, img_i, w_title, w_txt):
|
||||
msg.winfo_toplevel()
|
||||
|
||||
|
||||
class GreenLabel:
|
||||
class Tunnel:
|
||||
|
||||
"""
|
||||
Show the active tunnel in green in the label
|
||||
Class of Methods for Wire-Py
|
||||
"""
|
||||
|
||||
def __init__(self):
|
||||
self.StrVar = None
|
||||
self.lb_tunnel = None
|
||||
|
||||
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.columnconfigure(2, weight=1)
|
||||
self.rowconfigure(0, weight=1)
|
||||
|
||||
def columnconfigure(self, param, weight):
|
||||
pass
|
||||
|
||||
def rowconfigure(self, param, weight):
|
||||
pass
|
||||
|
||||
|
||||
class StartStopBTN:
|
||||
"""
|
||||
Show Start and Stop Button in Label
|
||||
"""
|
||||
|
||||
def __init__(self):
|
||||
self.lb_frame_btn_lbox = None
|
||||
self.wg_switch = None
|
||||
self.btn_stst = None
|
||||
self.wg_vpn_start = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/48/wg_vpn-start.png')
|
||||
self.wg_vpn_stop = tk.PhotoImage(file=r'/usr/share/icons/wp-icons/48/wg_vpn-stop.png')
|
||||
|
||||
def button_stop(self):
|
||||
self.btn_stst = ttk.Button(self.lb_frame_btn_lbox, image=self.wg_vpn_stop, command=self.wg_switch, padding=0)
|
||||
self.btn_stst.grid(column=0, row=0, padx=5, pady=8)
|
||||
|
||||
def button_start(self):
|
||||
self.btn_stst = ttk.Button(self.lb_frame_btn_lbox, image=self.wg_vpn_start, command=self.wg_switch, padding=0)
|
||||
self.btn_stst.grid(column=0, row=0, padx=5, pady=8)
|
||||
|
||||
|
||||
class ConToDict:
|
||||
"""
|
||||
The config file is packed into a dictionary,
|
||||
to display the values Address , DNS and Peer in the labels
|
||||
"""
|
||||
|
||||
@classmethod
|
||||
def covert_to_dict(cls, file):
|
||||
def con_to_dict(cls, file):
|
||||
|
||||
dictlist = []
|
||||
for lines in file.readlines():
|
||||
@ -197,7 +172,6 @@ class ConToDict:
|
||||
return address, dns, endpoint, pre_key
|
||||
|
||||
|
||||
class TunnelActiv:
|
||||
"""
|
||||
Shows the Active Tunnel
|
||||
"""
|
||||
@ -213,61 +187,12 @@ class TunnelActiv:
|
||||
|
||||
return active
|
||||
|
||||
|
||||
class ShowAddress:
|
||||
"""
|
||||
Displays the value address, DNS and peer in the labels
|
||||
or empty it again
|
||||
"""
|
||||
|
||||
def __init__(self):
|
||||
self.lb_frame2 = None
|
||||
self.lb_frame = None
|
||||
self.endpoint = None
|
||||
self.dns = None
|
||||
self.address = None
|
||||
self.enp = None
|
||||
self.DNS = None
|
||||
self.add = None
|
||||
|
||||
def init_and_report(self, data=None):
|
||||
""" Address Label """
|
||||
self.add = tk.StringVar()
|
||||
self.add.set('Address: ' + data[0])
|
||||
self.DNS = tk.StringVar()
|
||||
self.DNS.set(' DNS: ' + data[1])
|
||||
self.enp = tk.StringVar()
|
||||
self.enp.set('Endpoint: ' + data[2])
|
||||
|
||||
def label_empty(self):
|
||||
self.add.set('')
|
||||
self.DNS.set('')
|
||||
self.enp.set('')
|
||||
|
||||
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.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.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.config(font=('Ubuntu', 9))
|
||||
|
||||
|
||||
class ListTunnels:
|
||||
"""
|
||||
Shows all existing Wireguard tunnels
|
||||
"""
|
||||
|
||||
@staticmethod
|
||||
def tl_list():
|
||||
def list():
|
||||
wg_s = os.popen('nmcli con show | grep -iPo "(.*)(wireguard)"').read().split()
|
||||
|
||||
''' tl = Tunnel list # Show of 4.Element in list '''
|
||||
@ -275,194 +200,6 @@ class ListTunnels:
|
||||
return tl
|
||||
|
||||
|
||||
class ImportTunnel:
|
||||
"""
|
||||
Import Class for Wireguard config Files.
|
||||
Before importing, it is checked whether PrivateKey and PublicKey are in the file.
|
||||
If True then it is checked whether the PreSharedKey is already in the key file
|
||||
to avoid an import error so that no double wgconf are imported.
|
||||
Thus, tunnels can be renamed without the problems arise. If False then the key is written into the file.
|
||||
Furthermore, it is checked whether the name is longer than 12 characters.
|
||||
If True then the name is automatically shortened to 12 characters and then imported.
|
||||
If in each case false comes out, a corresponding window comes to inform the user that something is wrong.
|
||||
"""
|
||||
|
||||
def __init__(self):
|
||||
|
||||
self.select_tunnel = None
|
||||
self.wg_switch = None
|
||||
self.btn_stst = None
|
||||
self.lb_tunnel = None
|
||||
self.StrVar = None
|
||||
self.a = None
|
||||
self.l_box = None
|
||||
|
||||
def wg_import_select(self):
|
||||
|
||||
try:
|
||||
filepath = filedialog.askopenfilename(initialdir=str(_u), title='Select Wireguard config File',
|
||||
filetypes=[('WG config files', '*.conf')], )
|
||||
|
||||
with open(filepath, 'r') as file:
|
||||
read = file.read()
|
||||
path_split = filepath.split('/')
|
||||
path_split1 = path_split[-1]
|
||||
self.a = TunnelActiv.active()
|
||||
|
||||
if 'PrivateKey = ' in read and 'PublicKey = ' in read:
|
||||
with open(filepath, 'r') as file:
|
||||
key = ConToDict.covert_to_dict(file)
|
||||
pre_key = key[3]
|
||||
if len(pre_key) != 0:
|
||||
with open('/etc/wire_py/.keys', 'r') as readfile:
|
||||
p_key = readfile.readlines()
|
||||
if pre_key in p_key or pre_key + '\n' in p_key:
|
||||
"""img_w, img_i, w_title, w_txt hand over"""
|
||||
iw = r'/usr/share/icons/wp-icons/64/error.png'
|
||||
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
||||
wt = 'Import Error'
|
||||
msg_t = 'Tunnel already available!\nPlease use another file for import'
|
||||
msg_window(iw, ii, wt, msg_t)
|
||||
|
||||
else:
|
||||
|
||||
with open('/etc/wire_py/.keys', 'a') as keyfile:
|
||||
keyfile.write(pre_key + '\r')
|
||||
if len(path_split1) > 17:
|
||||
p1 = shutil.copy(filepath, Path('/etc/wire_py/'))
|
||||
path_split = path_split1[len(path_split1) - 17:]
|
||||
os.rename(p1, Path('/etc/wire_py') / str(path_split))
|
||||
new_conf = '/etc/wire_py/' + path_split
|
||||
if self.a != '':
|
||||
check_call(['nmcli', 'connection', 'down', TunnelActiv.active()])
|
||||
ShowAddress.label_empty(self)
|
||||
|
||||
subprocess.check_output(['nmcli', 'connection', 'import', 'type',
|
||||
'wireguard', 'file', new_conf], text=True)
|
||||
|
||||
else:
|
||||
shutil.copy(filepath, Path('/etc/wire_py/'))
|
||||
if self.a != '':
|
||||
check_call(['nmcli', 'connection', 'down', TunnelActiv.active()])
|
||||
ShowAddress.label_empty(self)
|
||||
|
||||
subprocess.check_output(['nmcli', 'connection', 'import', 'type',
|
||||
'wireguard', 'file', filepath], text=True)
|
||||
|
||||
self.StrVar.set('')
|
||||
self.a = TunnelActiv.active()
|
||||
self.l_box.insert(0, self.a)
|
||||
self.l_box.update()
|
||||
self.StrVar = tk.StringVar()
|
||||
self.StrVar.set(self.a)
|
||||
GreenLabel.green_show_label(self)
|
||||
StartStopBTN.button_stop(self)
|
||||
wg_read = Path('/etc/wire_py') / str(self.a + '.conf')
|
||||
with open(wg_read, 'r') as file_for_key:
|
||||
data = ConToDict.covert_to_dict(file_for_key)
|
||||
|
||||
''' Address Label '''
|
||||
ShowAddress.init_and_report(self, data)
|
||||
ShowAddress.show_data(self)
|
||||
check_call(['nmcli', 'con', 'mod', self.a, 'connection.autoconnect', 'no'])
|
||||
Path.chmod(wg_read, 0o600)
|
||||
|
||||
if 'PrivateKey = ' not in read:
|
||||
"""img_w, img_i, w_title, w_txt hand over"""
|
||||
iw = r'/usr/share/icons/wp-icons/64/error.png'
|
||||
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
||||
wt = 'Import Error'
|
||||
msg_t = 'Oh... no valid Wireguard File!\nPlease select a valid Wireguard File'
|
||||
msg_window(iw, ii, wt, msg_t)
|
||||
|
||||
except EOFError:
|
||||
pass
|
||||
except TypeError:
|
||||
pass
|
||||
except FileNotFoundError:
|
||||
pass
|
||||
except subprocess.CalledProcessError:
|
||||
|
||||
print('Tunnel exist!')
|
||||
|
||||
|
||||
class FileHandle:
|
||||
"""
|
||||
This class will display the autostart label which
|
||||
Tunnel is automatically started regardless of the active tunnel.
|
||||
The selected tunnel is written into a file to read it after the start of the system.
|
||||
"""
|
||||
|
||||
def __init__(self):
|
||||
|
||||
self.wg_autostart = None
|
||||
self.autoconnect = None
|
||||
self.auto_con = None
|
||||
self.autoconnect_var = None
|
||||
self.tl = None
|
||||
self.selected_option = None
|
||||
self.l_box = None
|
||||
|
||||
def box_set(self):
|
||||
|
||||
try:
|
||||
select_tunnel = self.l_box.curselection()
|
||||
select_tl = self.l_box.get(select_tunnel[0])
|
||||
|
||||
if self.selected_option.get() == 0:
|
||||
Path.unlink(path_to_file)
|
||||
tl = ListTunnels.tl_list()
|
||||
|
||||
if len(tl) == 0:
|
||||
self.wg_autostart.configure(state='disabled')
|
||||
|
||||
if self.selected_option.get() >= 1:
|
||||
Path.write_text(path_to_file, select_tl)
|
||||
|
||||
except IndexError:
|
||||
self.selected_option.set(1)
|
||||
|
||||
OnOff.on_off(self)
|
||||
|
||||
|
||||
class OnOff:
|
||||
"""
|
||||
Here it is checked whether the path to the file is there if not it is created.
|
||||
Set (on), the selected tunnel is displayed in the label.
|
||||
At (off) the label is first emptied then filled with No Autoconnect
|
||||
"""
|
||||
|
||||
def __init__(self):
|
||||
|
||||
self.wg_autostart = None
|
||||
self.selected_option = None
|
||||
self.auto_con = None
|
||||
self.autoconnect = None
|
||||
self.autoconnect_var = None
|
||||
self.lb_frame_buttons = None
|
||||
|
||||
def on_off(self):
|
||||
|
||||
if Path.exists(path_to_file):
|
||||
self.selected_option.set(1)
|
||||
self.autoconnect_var.set('')
|
||||
if not Path.is_dir(Path('/etc/wire_py')):
|
||||
Path.mkdir(Path('/etc/wire_py'))
|
||||
self.auto_con = Path.read_text(path_to_file)
|
||||
|
||||
else:
|
||||
|
||||
self.wg_autostart.configure(state='disabled')
|
||||
self.auto_con = 'no Autoconnect'
|
||||
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.config(font=('Ubuntu', 11))
|
||||
self.autoconnect.grid(column=0, row=4, sticky='ne', pady=22)
|
||||
|
||||
|
||||
class ExportTunnels:
|
||||
"""
|
||||
This will export the tunnels.
|
||||
A zipfile with current date and time is created
|
||||
@ -470,11 +207,11 @@ class ExportTunnels:
|
||||
"""
|
||||
|
||||
@staticmethod
|
||||
def wg_export():
|
||||
def export():
|
||||
_u1 = str(_u[6:])
|
||||
now_time = datetime.now()
|
||||
now_datetime = now_time.strftime('wg-exp-' + '%m-%d-%Y' + '-' + '%H:%M')
|
||||
tl = ListTunnels.tl_list()
|
||||
tl = Tunnel.list()
|
||||
|
||||
try:
|
||||
if len(tl) != 0:
|
||||
@ -483,6 +220,7 @@ class ExportTunnels:
|
||||
source = Path('/tmp/wire_py')
|
||||
Path.unlink(Path(source) / 'wg_py', missing_ok=True)
|
||||
Path.unlink(Path(source) / '.keys', missing_ok=True)
|
||||
Path.unlink(Path(source) / 'settings.conf', missing_ok=True)
|
||||
shutil.make_archive(wg_tar, 'zip', source)
|
||||
shutil.chown(wg_tar + '.zip', 1000, 1000)
|
||||
shutil.rmtree(source)
|
||||
@ -516,3 +254,17 @@ class ExportTunnels:
|
||||
|
||||
except TypeError:
|
||||
pass
|
||||
|
||||
@staticmethod
|
||||
def if_tip():
|
||||
with open(path_to_file2, 'r') as set_file2:
|
||||
lines2 = set_file2.readlines()
|
||||
if 'False\n' in lines2:
|
||||
return False
|
||||
else:
|
||||
return True
|
||||
|
||||
tips = Tunnel.if_tip()
|
||||
|
||||
|
||||
|
||||
|
||||
968
wg_main.py
968
wg_main.py
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user