Compare commits
75 Commits
e44fbeb9e4
...
2.02.2425
Author | SHA1 | Date | |
---|---|---|---|
6e54529c0f | |||
e28235af4b | |||
862cc91fa1 | |||
5fe6fd3f29 | |||
48a48ffd4c | |||
1278b02a95 | |||
22abe9f8b9 | |||
52f22beec6 | |||
8754e7ecda | |||
a6742a0c0e | |||
6b75713121 | |||
762694aa94 | |||
cc54f329fe | |||
8c01c1b984 | |||
ebafdbdcb3 | |||
ce4f6c84dc | |||
b68908eaef | |||
c4565ed169 | |||
485cfff457 | |||
1a0fc74a80 | |||
971c86c97f | |||
66dd27cc64 | |||
cf71eae7d3 | |||
1f80d5342c | |||
e719a1f23f | |||
a0da356cec | |||
ac87e0a4a7 | |||
6a3a982057 | |||
aab90eec70 | |||
511d5f72df | |||
ed93e99026 | |||
10c3b07053 | |||
e9814f2b60 | |||
c470783ff2 | |||
2fac03a927 | |||
03a7e48018 | |||
090842ab28 | |||
8a32065676 | |||
bc0d46d633 | |||
80c63eaf78 | |||
9eb99f0859 | |||
feb6217637 | |||
4bfc8c318e | |||
5f6aaa6cf1 | |||
0a5341fab7 | |||
414a36b436 | |||
fecbf2ab46 | |||
9d44e7ab42 | |||
18e042400c | |||
63ed0abc98 | |||
3102c685fd | |||
0769cabc1e | |||
33e31f06bb | |||
cfffd590cb | |||
ec10f912ea | |||
0fe591d70c | |||
96164eb132 | |||
c4a4d328ae | |||
a19f889950 | |||
bcdabadd0e | |||
c645d23514 | |||
46514693bd | |||
de2929896d | |||
f9d4256679 | |||
a0b895438c | |||
4c89488950 | |||
c0ae2d2b75 | |||
e4774abf19 | |||
7b1e543428 | |||
6f83fc7162 | |||
b70400b456 | |||
e25bc154ea | |||
7aa3cd75fe | |||
0b9eec8d1d | |||
b9083d4698 |
514
.idea/workspace.xml
generated
@ -4,140 +4,9 @@
|
|||||||
<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) - Create file for theme - Autoupdate in Options - Dark Theme for Wire-Py">
|
<list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment=" - Update Translate Files">
|
||||||
<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" />
|
|
||||||
<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$/cls_mth_fc.py" beforeDir="false" afterPath="$PROJECT_DIR$/cls_mth_fc.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" />
|
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
@ -154,12 +23,16 @@
|
|||||||
<component name="Git.Settings">
|
<component name="Git.Settings">
|
||||||
<option name="RECENT_BRANCH_BY_REPOSITORY">
|
<option name="RECENT_BRANCH_BY_REPOSITORY">
|
||||||
<map>
|
<map>
|
||||||
<entry key="$PROJECT_DIR$" value="main" />
|
<entry key="$PROJECT_DIR$" value="1.11.0824" />
|
||||||
</map>
|
</map>
|
||||||
</option>
|
</option>
|
||||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||||
<option name="UPDATE_TYPE" value="REBASE" />
|
<option name="UPDATE_TYPE" value="REBASE" />
|
||||||
</component>
|
</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">{
|
<component name="ProjectColorInfo">{
|
||||||
"associatedIndex": 3
|
"associatedIndex": 3
|
||||||
}</component>
|
}</component>
|
||||||
@ -184,16 +57,20 @@
|
|||||||
"Python.wg_main.executor": "Run",
|
"Python.wg_main.executor": "Run",
|
||||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||||
"Shell Script.install.executor": "Run",
|
"Shell Script.install.executor": "Run",
|
||||||
"git-widget-placeholder": "main",
|
"Shell Script.run_as.executor": "Run",
|
||||||
|
"git-widget-placeholder": "1.11.1024",
|
||||||
"last_opened_file_path": "/home/punix/Pyapps/wire-py",
|
"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>
|
||||||
<component name="RecentsManager">
|
<component name="RecentsManager">
|
||||||
<key name="CopyFile.RECENT_KEYS">
|
<key name="CopyFile.RECENT_KEYS">
|
||||||
|
<recent name="$PROJECT_DIR$/lx-icons" />
|
||||||
<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>
|
||||||
@ -252,7 +129,7 @@
|
|||||||
<component name="SharedIndexes">
|
<component name="SharedIndexes">
|
||||||
<attachedChunks>
|
<attachedChunks>
|
||||||
<set>
|
<set>
|
||||||
<option value="bundled-python-sdk-0e3be3396995-c546a90a8094-com.jetbrains.pycharm.community.sharedIndexes.bundled-PC-242.23339.19" />
|
<option value="bundled-python-sdk-8336bb23522e-31b6be0877a2-com.jetbrains.pycharm.community.sharedIndexes.bundled-PC-241.19072.16" />
|
||||||
</set>
|
</set>
|
||||||
</attachedChunks>
|
</attachedChunks>
|
||||||
</component>
|
</component>
|
||||||
@ -265,166 +142,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 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>
|
|
||||||
<option name="number" value="00017" />
|
|
||||||
<option name="presentableId" value="LOCAL-00017" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1724576599289</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00018" summary="fix when Filname > 17 first copy file after rename">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1724593165879</created>
|
|
||||||
<option name="number" value="00018" />
|
|
||||||
<option name="presentableId" value="LOCAL-00018" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1724593165879</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00019" summary="add export Tunnel as zip">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1724610514657</created>
|
|
||||||
<option name="number" value="00019" />
|
|
||||||
<option name="presentableId" value="LOCAL-00019" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1724610514658</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00020" summary="columnconfigure on all widgets set">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1724778892233</created>
|
|
||||||
<option name="number" value="00020" />
|
|
||||||
<option name="presentableId" value="LOCAL-00020" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1724778892233</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00021" summary="little fixes a " " to ' '">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1725119445803</created>
|
|
||||||
<option name="number" value="00021" />
|
|
||||||
<option name="presentableId" value="LOCAL-00021" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1725119445803</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00022" summary="add class FileHandle, add Label to show autoconnect Tunnel disable checkbox when Listbox is empty or no select Tunnel">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1725391658456</created>
|
|
||||||
<option name="number" value="00022" />
|
|
||||||
<option name="presentableId" value="LOCAL-00022" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1725391658456</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00023" summary="add if question and add autoconnect, autoconnect_var to class Filehandle in box_set no finish!">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1725434328731</created>
|
|
||||||
<option name="number" value="00023" />
|
|
||||||
<option name="presentableId" value="LOCAL-00023" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1725434328731</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00024" summary="fixes on empty Listbox now is disable and now works autoconnect label with read and write, delete works now with read and write">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1725475967338</created>
|
|
||||||
<option name="number" value="00024" />
|
|
||||||
<option name="presentableId" value="LOCAL-00024" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1725475967338</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00025" summary="add Frame widget 3 for Buttons and Listbox with Scrollbar. all Widgets new format delete works now of disable checkbox when Listbox empty (part two)">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1725567453540</created>
|
|
||||||
<option name="number" value="00025" />
|
|
||||||
<option name="presentableId" value="LOCAL-00025" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1725567453540</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00026" summary="little fixes">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1725639633873</created>
|
|
||||||
<option name="number" value="00026" />
|
|
||||||
<option name="presentableId" value="LOCAL-00026" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1725639633873</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00027" summary="little fixes">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1725746027132</created>
|
|
||||||
<option name="number" value="00027" />
|
|
||||||
<option name="presentableId" value="LOCAL-00027" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1725746027132</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00028" summary="little fixes replace os.system with check_call first steps in install Script add wg_start.service file">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1725820337669</created>
|
|
||||||
<option name="number" value="00028" />
|
|
||||||
<option name="presentableId" value="LOCAL-00028" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1725820337669</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00029" summary="little fixes a labels when stop and start, installer first functions works">
|
<task id="LOCAL-00029" summary="little fixes a labels when stop and start, installer first functions works">
|
||||||
<option name="closed" value="true" />
|
<option name="closed" value="true" />
|
||||||
<created>1725991610908</created>
|
<created>1725991610908</created>
|
||||||
@ -657,18 +374,173 @@
|
|||||||
<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 - 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>
|
||||||
|
<task id="LOCAL-00066" summary="- methods from class MainWindow move to class FrameWidgets for active color_label when theme change - optimize columnconfigure, rowconfigure in class MainWindow and FrameWidgets - add new Frame for Widgets on Bottom - optimize from tkinter * to from tkinter import filedialog, ttk, TclError">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1731097309468</created>
|
||||||
|
<option name="number" value="00066" />
|
||||||
|
<option name="presentableId" value="LOCAL-00066" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1731097309468</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00067" summary="- methods from class MainWindow move to class FrameWidgets for active color_label when theme change - optimize columnconfigure, rowconfigure in class MainWindow and FrameWidgets - add new Frame for Widgets on Bottom - optimize from tkinter * to from tkinter import filedialog, ttk, TclError">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1731097969343</created>
|
||||||
|
<option name="number" value="00067" />
|
||||||
|
<option name="presentableId" value="LOCAL-00067" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1731097969344</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00068" summary="- methods from class MainWindow move to class FrameWidgets for active color_label when theme change - optimize columnconfigure, rowconfigure in class MainWindow and FrameWidgets - add new Frame for Widgets on Bottom - optimize from tkinter * to from tkinter import filedialog, ttk, TclError">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1731098372497</created>
|
||||||
|
<option name="number" value="00068" />
|
||||||
|
<option name="presentableId" value="LOCAL-00068" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1731098372497</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00069" summary=" - - Fix Checkbutton Autostart when first install Wire-Py">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1731690583059</created>
|
||||||
|
<option name="number" value="00069" />
|
||||||
|
<option name="presentableId" value="LOCAL-00069" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1731690583060</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00070" summary=" - - Fix Checkbutton Autostart when first install Wire-Py">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1731836942211</created>
|
||||||
|
<option name="number" value="00070" />
|
||||||
|
<option name="presentableId" value="LOCAL-00070" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1731836942212</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00071" summary=" - Update Translate Files">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1731840048762</created>
|
||||||
|
<option name="number" value="00071" />
|
||||||
|
<option name="presentableId" value="LOCAL-00071" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1731840048763</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00072" summary=" - Update Translate Files">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1731840089956</created>
|
||||||
|
<option name="number" value="00072" />
|
||||||
|
<option name="presentableId" value="LOCAL-00072" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1731840089956</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00073" summary=" - Update Translate Files">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1731840188277</created>
|
||||||
|
<option name="number" value="00073" />
|
||||||
|
<option name="presentableId" value="LOCAL-00073" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1731840188278</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00074" summary=" - Update Translate Files">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1731840383592</created>
|
||||||
|
<option name="number" value="00074" />
|
||||||
|
<option name="presentableId" value="LOCAL-00074" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1731840383592</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00075" summary=" - Update Translate Files">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1731841930614</created>
|
||||||
|
<option name="number" value="00075" />
|
||||||
|
<option name="presentableId" value="LOCAL-00075" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1731841930615</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00076" summary=" - Update Translate Files">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1731844213239</created>
|
||||||
|
<option name="number" value="00076" />
|
||||||
|
<option name="presentableId" value="LOCAL-00076" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1731844213239</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00077" summary=" - Update Translate Files">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1731844339039</created>
|
||||||
|
<option name="number" value="00077" />
|
||||||
|
<option name="presentableId" value="LOCAL-00077" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1731844339039</updated>
|
||||||
|
</task>
|
||||||
|
<option name="localTasksCounter" value="78" />
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="UnknownFeatures">
|
<component name="UnknownFeatures">
|
||||||
<option featureType="com.intellij.fileTypeFactory" implementationName="*.policy" />
|
<option featureType="com.intellij.fileTypeFactory" implementationName="*.policy" />
|
||||||
</component>
|
</component>
|
||||||
<component name="Vcs.Log.Tabs.Properties">
|
<component name="Vcs.Log.Tabs.Properties">
|
||||||
<option name="OPEN_GENERIC_TABS">
|
|
||||||
<map>
|
|
||||||
<entry key="f9756e7d-0c5c-4b84-84e4-660314c46ea4" value="TOOL_WINDOW" />
|
|
||||||
</map>
|
|
||||||
</option>
|
|
||||||
<option name="TAB_STATES">
|
<option name="TAB_STATES">
|
||||||
<map>
|
<map>
|
||||||
<entry key="MAIN">
|
<entry key="MAIN">
|
||||||
@ -679,7 +551,7 @@
|
|||||||
<entry key="branch">
|
<entry key="branch">
|
||||||
<value>
|
<value>
|
||||||
<list>
|
<list>
|
||||||
<option value="origin/wire-py-reformat-14-08-2024" />
|
<option value="1.11.0824" />
|
||||||
</list>
|
</list>
|
||||||
</value>
|
</value>
|
||||||
</entry>
|
</entry>
|
||||||
@ -688,24 +560,11 @@
|
|||||||
</State>
|
</State>
|
||||||
</value>
|
</value>
|
||||||
</entry>
|
</entry>
|
||||||
<entry key="f9756e7d-0c5c-4b84-84e4-660314c46ea4">
|
|
||||||
<value>
|
|
||||||
<State />
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
</map>
|
</map>
|
||||||
</option>
|
</option>
|
||||||
</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 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" />
|
|
||||||
<MESSAGE value="replace tar with zip and Check if Zip file is empty" />
|
<MESSAGE value="replace tar with zip and Check if Zip file is empty" />
|
||||||
<MESSAGE value="Create your own message boxes for export" />
|
<MESSAGE value="Create your own message boxes for export" />
|
||||||
<MESSAGE value="chown Export File to 1000:1000" />
|
<MESSAGE value="chown Export File to 1000:1000" />
|
||||||
@ -723,6 +582,25 @@
|
|||||||
<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. Start with version number 1.4.7 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. 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" />
|
<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" />
|
||||||
|
<MESSAGE value="- methods from class MainWindow move to class FrameWidgets for active color_label when theme change - optimize columnconfigure, rowconfigure in class MainWindow and FrameWidgets - add new Frame for Widgets on Bottom - optimize from tkinter * to from tkinter import filedialog, ttk, TclError" />
|
||||||
|
<MESSAGE value=" - - Fix Checkbutton Autostart when first install Wire-Py" />
|
||||||
|
<MESSAGE value=" - Update Translate Files" />
|
||||||
|
<option name="LAST_COMMIT_MESSAGE" value=" - Update Translate Files" />
|
||||||
|
</component>
|
||||||
|
<component name="XDebuggerManager">
|
||||||
|
<breakpoint-manager>
|
||||||
|
<breakpoints>
|
||||||
|
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
|
||||||
|
<url>file://$PROJECT_DIR$/wg_main.py</url>
|
||||||
|
<line>1128</line>
|
||||||
|
<option name="timeStamp" value="3" />
|
||||||
|
</line-breakpoint>
|
||||||
|
</breakpoints>
|
||||||
|
</breakpoint-manager>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
91
Changelog
@ -3,13 +3,94 @@ My standard System: Linux Mint 22 Cinnamon
|
|||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
- os import in wg_func replaced by other methods
|
- os import in cls_mth_fc.py 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
|
- If Wire-Py already runs, prevent further start
|
||||||
- for loops with lists replaced by List Comprehensions
|
- for loops with lists replaced by List Comprehensions
|
||||||
- Keeping Classes Together
|
- Update search after start of Wire-Py
|
||||||
|
|
||||||
|
### Added
|
||||||
|
07-11-2024
|
||||||
|
|
||||||
|
- remove classes and add methods to class FrameWidgets (removed self errors)
|
||||||
|
|
||||||
|
|
||||||
|
### Added
|
||||||
|
10-11-2024
|
||||||
|
|
||||||
|
- Fix Checkbutton Autostart when first install Wire-Py
|
||||||
|
- Update Translate Files
|
||||||
|
|
||||||
|
### Added
|
||||||
|
10-11-2024
|
||||||
|
|
||||||
|
- Translate file de_De complete
|
||||||
|
- new FrameWidget for rename Entry and rename Button
|
||||||
|
|
||||||
|
|
||||||
|
### Added
|
||||||
|
09-11-2024
|
||||||
|
|
||||||
|
- Move Tips Method in separate class for Tooltips in another Apps
|
||||||
|
- Move Version Variable in main script
|
||||||
|
- Edit Class GiteaUpdate for requests in api_down and download
|
||||||
|
- Description on Class GiteaUpdate
|
||||||
|
|
||||||
|
|
||||||
|
### Added
|
||||||
|
08-11-2024
|
||||||
|
|
||||||
|
- Preparation for language translation part 1
|
||||||
|
- separate folder for general icons
|
||||||
|
- install edit for new dir lx-icons
|
||||||
|
|
||||||
|
|
||||||
|
### Added
|
||||||
|
08-11-2024
|
||||||
|
|
||||||
|
- methods from class MainWindow move to class FrameWidgets for active color_label when theme change
|
||||||
|
- optimize columnconfigure, rowconfigure in class MainWindow and FrameWidgets
|
||||||
|
- add new Frame for Widgets on Bottom
|
||||||
|
- optimize from tkinter * to from tkinter import filedialog, ttk, TclError
|
||||||
|
|
||||||
|
|
||||||
|
### Added
|
||||||
|
07-11-2024
|
||||||
|
|
||||||
|
- remove classes and add methods to class FrameWidgets (removed self errors)
|
||||||
|
|
||||||
|
|
||||||
|
### 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
|
### Added
|
||||||
16-10-2024
|
16-10-2024
|
||||||
|
23
README.md
@ -1,2 +1,25 @@
|
|||||||
# Wire-Py
|
# 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>
|
# 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] {
|
||||||
|
Before Width: | Height: | Size: 424 B After Width: | Height: | Size: 4.3 KiB |
Before Width: | Height: | Size: 482 B After Width: | Height: | Size: 4.6 KiB |
Before Width: | Height: | Size: 346 B After Width: | Height: | Size: 4.2 KiB |
Before Width: | Height: | Size: 484 B After Width: | Height: | Size: 4.4 KiB |
Before Width: | Height: | Size: 248 B After Width: | Height: | Size: 4.2 KiB |
Before Width: | Height: | Size: 154 B After Width: | Height: | Size: 4.1 KiB |
Before Width: | Height: | Size: 736 B After Width: | Height: | Size: 4.6 KiB |
Before Width: | Height: | Size: 629 B After Width: | Height: | Size: 4.6 KiB |
Before Width: | Height: | Size: 524 B After Width: | Height: | Size: 4.5 KiB |
Before Width: | Height: | Size: 319 B After Width: | Height: | Size: 4.2 KiB |
Before Width: | Height: | Size: 249 B After Width: | Height: | Size: 4.2 KiB |
Before Width: | Height: | Size: 302 B After Width: | Height: | Size: 4.2 KiB |
Before Width: | Height: | Size: 295 B After Width: | Height: | Size: 4.2 KiB |
Before Width: | Height: | Size: 168 B After Width: | Height: | Size: 4.1 KiB |
Before Width: | Height: | Size: 158 B After Width: | Height: | Size: 4.1 KiB |
@ -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) \
|
||||||
|
Before Width: | Height: | Size: 346 B After Width: | Height: | Size: 4.3 KiB |
Before Width: | Height: | Size: 442 B After Width: | Height: | Size: 4.6 KiB |
Before Width: | Height: | Size: 314 B After Width: | Height: | Size: 4.2 KiB |
Before Width: | Height: | Size: 440 B After Width: | Height: | Size: 4.4 KiB |
Before Width: | Height: | Size: 254 B After Width: | Height: | Size: 4.2 KiB |
Before Width: | Height: | Size: 153 B After Width: | Height: | Size: 4.1 KiB |
Before Width: | Height: | Size: 635 B After Width: | Height: | Size: 4.6 KiB |
Before Width: | Height: | Size: 554 B After Width: | Height: | Size: 4.5 KiB |
Before Width: | Height: | Size: 471 B After Width: | Height: | Size: 4.4 KiB |
Before Width: | Height: | Size: 292 B After Width: | Height: | Size: 4.2 KiB |
Before Width: | Height: | Size: 274 B After Width: | Height: | Size: 4.2 KiB |
Before Width: | Height: | Size: 273 B After Width: | Height: | Size: 4.2 KiB |
Before Width: | Height: | Size: 152 B After Width: | Height: | Size: 4.1 KiB |
@ -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"
|
||||||
}
|
}
|
||||||
|
|
BIN
__pycache__/cls_mth_fc.cpython-312.pyc
Normal file
BIN
__pycache__/message.cpython-312.pyc
Normal file
BIN
__pycache__/start_wg.cpython-312.pyc
Normal file
BIN
__pycache__/wg_main.cpython-312.pyc
Normal file
272
cls_mth_fc.py
Executable file
@ -0,0 +1,272 @@
|
|||||||
|
""" Classes Method and functions for lx apps """
|
||||||
|
|
||||||
|
import gettext
|
||||||
|
import locale
|
||||||
|
import os
|
||||||
|
import shutil
|
||||||
|
import subprocess
|
||||||
|
import tkinter as tk
|
||||||
|
import zipfile
|
||||||
|
from datetime import datetime
|
||||||
|
from pathlib import Path
|
||||||
|
from tkinter import ttk
|
||||||
|
import requests
|
||||||
|
|
||||||
|
APP = 'wirepy'
|
||||||
|
LOCALE_DIR = "/usr/share/locale/"
|
||||||
|
locale.bindtextdomain(APP, LOCALE_DIR)
|
||||||
|
gettext.bindtextdomain(APP, LOCALE_DIR)
|
||||||
|
gettext.textdomain(APP)
|
||||||
|
_ = gettext.gettext
|
||||||
|
|
||||||
|
wg_set = Path('/etc/wire_py/settings.conf')
|
||||||
|
_u = Path.read_text(Path('/tmp/_u'))
|
||||||
|
|
||||||
|
|
||||||
|
class GiteaUpdate:
|
||||||
|
"""
|
||||||
|
Calling api_down requests the URL and the version of the running script.
|
||||||
|
Example: version = 'v. 1.1.1.1' GiteaUpdate.api_down(http://example.de, version)
|
||||||
|
|
||||||
|
Calling download requests the download URL of the running script,
|
||||||
|
the taskbar image for the “Download OK” window, the taskbar image for the
|
||||||
|
“Download error” window and the variable res
|
||||||
|
"""
|
||||||
|
@staticmethod
|
||||||
|
def api_down(update_api_url, version):
|
||||||
|
try:
|
||||||
|
response = requests.get(update_api_url)
|
||||||
|
response_dict = response.json()
|
||||||
|
response_dict = response_dict[0]
|
||||||
|
with open(wg_set, 'r') as set_file:
|
||||||
|
set_file = set_file.read()
|
||||||
|
if 'on\n' in set_file:
|
||||||
|
if version[3:] != response_dict['tag_name']:
|
||||||
|
return response_dict['tag_name']
|
||||||
|
else:
|
||||||
|
return 'No Updates'
|
||||||
|
else:
|
||||||
|
return 'False'
|
||||||
|
except requests.exceptions.ConnectionError:
|
||||||
|
return 'No Internet Connection!'
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def download(urld, down_ok_image, down_not_ok_image, res):
|
||||||
|
try:
|
||||||
|
to_down = 'wget -qP ' + str(_u) + ' ' + urld
|
||||||
|
result = subprocess.call(to_down, shell=True)
|
||||||
|
if result == 0:
|
||||||
|
shutil.chown(str(_u) + f'/{res}.zip', 1000, 1000)
|
||||||
|
"""img_w, img_i, w_title, w_txt hand over"""
|
||||||
|
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
||||||
|
ii = down_ok_image
|
||||||
|
wt = _('Download Successful')
|
||||||
|
msg_t = _('Your zip file is in home directory')
|
||||||
|
msg_window(iw, ii, wt, msg_t)
|
||||||
|
|
||||||
|
else:
|
||||||
|
"""img_w, img_i, w_title, w_txt hand over"""
|
||||||
|
iw = r'/usr/share/icons/lx-icons/64/error.png'
|
||||||
|
ii = down_not_ok_image
|
||||||
|
wt = _('Download error')
|
||||||
|
msg_t = _('Download failed! Please try again')
|
||||||
|
msg_window(iw, ii, wt, msg_t)
|
||||||
|
except subprocess.CalledProcessError:
|
||||||
|
"""img_w, img_i, w_title, w_txt hand over"""
|
||||||
|
iw = r'/usr/share/icons/lx-icons/64/error.png'
|
||||||
|
ii = down_not_ok_image
|
||||||
|
wt = _('Download error')
|
||||||
|
msg_t = _('Download failed! No internet connection!')
|
||||||
|
msg_window(iw, ii, wt, msg_t)
|
||||||
|
|
||||||
|
|
||||||
|
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.
|
||||||
|
Paths to images must be specified: r'/usr/share/icons/lx-icons/64/info.png'
|
||||||
|
img_w = Image for Tk Window
|
||||||
|
img_i = Image for Icon
|
||||||
|
w_title = Windows Title
|
||||||
|
w_txt = Text for Tk Window
|
||||||
|
txt2 = Text for Button two
|
||||||
|
com = function for Button command
|
||||||
|
"""
|
||||||
|
msg = tk.Toplevel()
|
||||||
|
msg.resizable(width=False, height=False)
|
||||||
|
msg.title(w_title)
|
||||||
|
msg.configure(pady=15, padx=15)
|
||||||
|
msg.img = tk.PhotoImage(file=img_w)
|
||||||
|
msg.i_window = tk.Label(msg, image=msg.img)
|
||||||
|
|
||||||
|
label = tk.Label(msg, text=w_txt)
|
||||||
|
|
||||||
|
label.grid(column=1, row=0)
|
||||||
|
|
||||||
|
if txt2 is not None and com is not 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)
|
||||||
|
msg.rowconfigure(0, weight=1)
|
||||||
|
msg.winfo_toplevel()
|
||||||
|
|
||||||
|
|
||||||
|
class Tunnel:
|
||||||
|
"""
|
||||||
|
Class of Methods for Wire-Py
|
||||||
|
"""
|
||||||
|
|
||||||
|
"""
|
||||||
|
The config file is packed into a dictionary,
|
||||||
|
to display the values Address , DNS and Peer in the labels
|
||||||
|
"""
|
||||||
|
@classmethod
|
||||||
|
def con_to_dict(cls, file):
|
||||||
|
|
||||||
|
dictlist = []
|
||||||
|
for lines in file.readlines():
|
||||||
|
line_plit = lines.split()
|
||||||
|
dictlist = dictlist + line_plit
|
||||||
|
dictlist.remove('[Interface]')
|
||||||
|
dictlist.remove('[Peer]')
|
||||||
|
for items in dictlist:
|
||||||
|
if items == '=':
|
||||||
|
dictlist.remove(items)
|
||||||
|
|
||||||
|
''' Here is the beginning (Loop) of convert List to Dictionary '''
|
||||||
|
for _ in dictlist:
|
||||||
|
a = [dictlist[0], dictlist[1]]
|
||||||
|
b = [dictlist[2], dictlist[3]]
|
||||||
|
c = [dictlist[4], dictlist[5]]
|
||||||
|
d = [dictlist[6], dictlist[7]]
|
||||||
|
e = [dictlist[8], dictlist[9]]
|
||||||
|
f = [dictlist[10], dictlist[11]]
|
||||||
|
g = [dictlist[12], dictlist[13]]
|
||||||
|
h = [dictlist[14], dictlist[15]]
|
||||||
|
new_list = [a, b, c, d, e, f, g, h]
|
||||||
|
final_dict = {}
|
||||||
|
for elements in new_list:
|
||||||
|
final_dict[elements[0]] = elements[1]
|
||||||
|
|
||||||
|
''' end... result a Dictionary '''
|
||||||
|
|
||||||
|
address = final_dict['Address']
|
||||||
|
dns = final_dict['DNS']
|
||||||
|
if ',' in dns:
|
||||||
|
dns = dns[:-1]
|
||||||
|
endpoint = final_dict['Endpoint']
|
||||||
|
if 'PresharedKey' in final_dict:
|
||||||
|
pre_key = final_dict['PresharedKey']
|
||||||
|
else:
|
||||||
|
pre_key = final_dict['PreSharedKey']
|
||||||
|
return address, dns, endpoint, pre_key
|
||||||
|
|
||||||
|
"""
|
||||||
|
Shows the Active Tunnel
|
||||||
|
"""
|
||||||
|
@staticmethod
|
||||||
|
def active():
|
||||||
|
|
||||||
|
active = os.popen('nmcli con show --active | grep -iPo "(.*)(wireguard)"').read().split()
|
||||||
|
if not active:
|
||||||
|
active = ''
|
||||||
|
else:
|
||||||
|
active = active[0]
|
||||||
|
|
||||||
|
return active
|
||||||
|
|
||||||
|
"""
|
||||||
|
Shows all existing Wireguard tunnels
|
||||||
|
"""
|
||||||
|
@staticmethod
|
||||||
|
def list():
|
||||||
|
wg_s = os.popen('nmcli con show | grep -iPo "(.*)(wireguard)"').read().split()
|
||||||
|
|
||||||
|
''' tl = Tunnel list # Show of 4.Element in list '''
|
||||||
|
tl = wg_s[::3]
|
||||||
|
return tl
|
||||||
|
|
||||||
|
"""
|
||||||
|
This will export the tunnels.
|
||||||
|
A zipfile with current date and time is created
|
||||||
|
in the user's home directory with correct right
|
||||||
|
"""
|
||||||
|
@staticmethod
|
||||||
|
def export():
|
||||||
|
_u1 = str(_u[6:])
|
||||||
|
now_time = datetime.now()
|
||||||
|
now_datetime = now_time.strftime('wg-exp-' + '%m-%d-%Y' + '-' + '%H:%M')
|
||||||
|
tl = Tunnel.list()
|
||||||
|
|
||||||
|
try:
|
||||||
|
if len(tl) != 0:
|
||||||
|
wg_tar = str(_u) + '/' + now_datetime
|
||||||
|
shutil.copytree('/etc/wire_py', '/tmp/wire_py', dirs_exist_ok=True)
|
||||||
|
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)
|
||||||
|
with zipfile.ZipFile((wg_tar + '.zip'), 'r') as zf:
|
||||||
|
if len(zf.namelist()) != 0:
|
||||||
|
|
||||||
|
"""img_w, img_i, w_title, w_txt hand over"""
|
||||||
|
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
||||||
|
ii = r'/usr/share/icons/wp-icons/48/wg_vpn.png'
|
||||||
|
wt = _('Export Successful')
|
||||||
|
msg_t = _('Your zip file is in home directory')
|
||||||
|
msg_window(iw, ii, wt, msg_t)
|
||||||
|
|
||||||
|
else:
|
||||||
|
|
||||||
|
"""img_w, img_i, w_title, w_txt hand over"""
|
||||||
|
iw = r'/usr/share/icons/lx-icons/64/error.png'
|
||||||
|
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
||||||
|
wt = _('Export error')
|
||||||
|
msg_t = _('Export failed! Please try again')
|
||||||
|
msg_window(iw, ii, wt, msg_t)
|
||||||
|
|
||||||
|
else:
|
||||||
|
|
||||||
|
"""img_w, img_i, w_title, w_txt hand over"""
|
||||||
|
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
||||||
|
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
||||||
|
wt = _('Select tunnel')
|
||||||
|
msg_t = _('Please first import tunnel')
|
||||||
|
msg_window(iw, ii, wt, msg_t)
|
||||||
|
|
||||||
|
except TypeError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
class Tipi:
|
||||||
|
"""
|
||||||
|
Class for Tooltip setting write in File
|
||||||
|
Calling request path to file
|
||||||
|
"""
|
||||||
|
@staticmethod
|
||||||
|
def if_tip(path):
|
||||||
|
with open(path, 'r') as set_file2:
|
||||||
|
lines2 = set_file2.readlines()
|
||||||
|
if 'False\n' in lines2:
|
||||||
|
return False
|
||||||
|
else:
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
wg_tips = Tipi.if_tip(wg_set)
|
28
install
@ -7,10 +7,11 @@ BLUE='\033[30;1;34m'
|
|||||||
install_file_with(){
|
install_file_with(){
|
||||||
clear
|
clear
|
||||||
sudo apt install python3-tk && \
|
sudo apt install python3-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 cls_mth_fc.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 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 cp -uR wp-icons lx-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 chown -R root:root /etc/wire_py && sudo chmod 755 /etc/wire_py && \
|
||||||
|
sudo cp -u languages/de/*.mo /usr/share/locale/de/LC_MESSAGES/ && \
|
||||||
sudo ln -sf /usr/bin/wirepy.py /usr/local/bin/wirepy && \
|
sudo ln -sf /usr/bin/wirepy.py /usr/local/bin/wirepy && \
|
||||||
sudo cp -u org.wirepy.policy /usr/share/polkit-1/actions/ && \
|
sudo cp -u org.wirepy.policy /usr/share/polkit-1/actions/ && \
|
||||||
sudo cp -u Wire-Py.desktop /usr/share/applications/ && \
|
sudo cp -u Wire-Py.desktop /usr/share/applications/ && \
|
||||||
@ -21,10 +22,11 @@ install_file_with(){
|
|||||||
install_arch_d(){
|
install_arch_d(){
|
||||||
clear
|
clear
|
||||||
sudo pacman -S --noconfirm tk python3 python-requests && \
|
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 cp -u wg_main.py start_wg.py cls_mth_fc.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 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 cp -uR wp-icons lx-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 chown -R root:root /etc/wire_py && sudo chmod 755 /etc/wire_py && \
|
||||||
|
sudo cp -u languages/de/*.mo /usr/share/locale/de/LC_MESSAGES/ && \
|
||||||
sudo ln -sf /usr/bin/wirepy.py /usr/local/bin/wirepy && \
|
sudo ln -sf /usr/bin/wirepy.py /usr/local/bin/wirepy && \
|
||||||
sudo cp -u org.wirepy.policy /usr/share/polkit-1/actions/ && \
|
sudo cp -u org.wirepy.policy /usr/share/polkit-1/actions/ && \
|
||||||
sudo cp -u Wire-Py.desktop /usr/share/applications/ && \
|
sudo cp -u Wire-Py.desktop /usr/share/applications/ && \
|
||||||
@ -89,10 +91,11 @@ elif grep -i 'fedora' /etc/os-release > /dev/null 2>&1
|
|||||||
if ! which python3-tkinter &> /dev/null
|
if ! which python3-tkinter &> /dev/null
|
||||||
then sudo dnf install python3-tkinter -y
|
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 cls_mth_fc.py wirepy.py run_as open_gitea.py /usr/bin/ && \
|
||||||
sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/.keys && \
|
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 cp -u languages/de/*.mo /usr/share/locale/de/LC_MESSAGES/ && \
|
||||||
|
sudo cp -uR wp-icons lx-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 chown -R root:root /etc/wire_py && sudo chmod 755 /etc/wire_py && \
|
||||||
sudo ln -sf /usr/bin/wirepy.py /usr/local/bin/wirepy && \
|
sudo ln -sf /usr/bin/wirepy.py /usr/local/bin/wirepy && \
|
||||||
sudo cp -u org.wirepy.policy /usr/share/polkit-1/actions/ && \
|
sudo cp -u org.wirepy.policy /usr/share/polkit-1/actions/ && \
|
||||||
@ -105,10 +108,11 @@ elif grep -i 'suse' /etc/os-release > /dev/null 2>&1
|
|||||||
then
|
then
|
||||||
if ! which python311-tk &> /dev/null
|
if ! which python311-tk &> /dev/null
|
||||||
then sudo zypper install python311-tk
|
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 cls_mth_fc.py wirepy.py run_as open_gitea.py /usr/bin/ && \
|
||||||
sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/.keys && \
|
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 cp -u languages/de/*.mo /usr/share/locale/de/LC_MESSAGES/ && \
|
||||||
|
sudo cp -uR wp-icons lx-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 chown -R root:root /etc/wire_py && sudo chmod 755 /etc/wire_py && \
|
||||||
sudo ln -sf /usr/bin/wirepy.py /usr/local/bin/wirepy && \
|
sudo ln -sf /usr/bin/wirepy.py /usr/local/bin/wirepy && \
|
||||||
sudo cp -u org.wirepy.policy /usr/share/polkit-1/actions/ && \
|
sudo cp -u org.wirepy.policy /usr/share/polkit-1/actions/ && \
|
||||||
|
BIN
languages/de/wirepy.mo
Normal file
BIN
lx-icons/128/error.png
Normal file
After Width: | Height: | Size: 5.7 KiB |
BIN
lx-icons/128/info.png
Normal file
After Width: | Height: | Size: 5.7 KiB |
BIN
lx-icons/256/error.png
Normal file
After Width: | Height: | Size: 12 KiB |
BIN
lx-icons/256/info.png
Normal file
After Width: | Height: | Size: 10 KiB |
BIN
lx-icons/32/error.png
Normal file
After Width: | Height: | Size: 5.1 KiB |
BIN
lx-icons/32/info.png
Normal file
After Width: | Height: | Size: 1.6 KiB |
BIN
lx-icons/48/error.png
Normal file
After Width: | Height: | Size: 5.7 KiB |
BIN
lx-icons/48/info.png
Normal file
After Width: | Height: | Size: 2.2 KiB |
BIN
lx-icons/64/error.png
Normal file
After Width: | Height: | Size: 2.7 KiB |
BIN
lx-icons/64/info.png
Normal file
After Width: | Height: | Size: 2.7 KiB |
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
@ -0,0 +1,8 @@
|
|||||||
|
[UPDATES]
|
||||||
|
on
|
||||||
|
[THEME]
|
||||||
|
light
|
||||||
|
[TOOLTIP]
|
||||||
|
True
|
||||||
|
[AUTOSTART ON]
|
||||||
|
off
|
14
start_wg.py
@ -2,11 +2,13 @@
|
|||||||
from subprocess import check_call
|
from subprocess import check_call
|
||||||
from pathlib import Path
|
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):
|
with open(path_to_file, 'r') as a_con:
|
||||||
a_con = Path.read_text(path_to_file)
|
lines = a_con.readlines()
|
||||||
check_call(['nmcli', 'connection', 'up', a_con])
|
a_con = lines[7].strip()
|
||||||
else:
|
if a_con != 'off':
|
||||||
pass
|
check_call(['nmcli', 'connection', 'up', a_con])
|
||||||
|
else:
|
||||||
|
pass
|
||||||
|
|
||||||
|
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()
|
|
518
wg_func.py
@ -1,518 +0,0 @@
|
|||||||
""" Wireguard Classes and Method for Wire-Py """
|
|
||||||
|
|
||||||
import os
|
|
||||||
import shutil
|
|
||||||
import subprocess
|
|
||||||
import tkinter as tk
|
|
||||||
import zipfile
|
|
||||||
from datetime import datetime
|
|
||||||
from pathlib import Path
|
|
||||||
from subprocess import check_call
|
|
||||||
from tkinter import filedialog, 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')
|
|
||||||
_u = Path.read_text(Path('/tmp/_u'))
|
|
||||||
|
|
||||||
UPDATE_API_URL = 'https://git.ilunix.de/api/v1/repos/punix/Wire-Py/releases'
|
|
||||||
|
|
||||||
|
|
||||||
class WirePyUpdate:
|
|
||||||
@staticmethod
|
|
||||||
def api_down():
|
|
||||||
try:
|
|
||||||
response = requests.get(UPDATE_API_URL)
|
|
||||||
response_dict = response.json()
|
|
||||||
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 version[3:] != response_dict['tag_name']:
|
|
||||||
return response_dict['tag_name']
|
|
||||||
else:
|
|
||||||
return 'No Updates'
|
|
||||||
else:
|
|
||||||
return 'False'
|
|
||||||
except requests.exceptions.ConnectionError:
|
|
||||||
return 'No Internet Connection!'
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def download():
|
|
||||||
try:
|
|
||||||
url = f'https://git.ilunix.de/punix/Wire-Py/archive/{res}.zip'
|
|
||||||
to_down = 'wget -qP ' + str(_u) + ' ' + url
|
|
||||||
result = subprocess.call(to_down, shell=True)
|
|
||||||
if result == 0:
|
|
||||||
shutil.chown(str(_u) + f'/{res}.zip', 1000, 1000)
|
|
||||||
"""img_w, img_i, w_title, w_txt hand over"""
|
|
||||||
iw = r'/usr/share/icons/wp-icons/64/info.png'
|
|
||||||
ii = r'/usr/share/icons/wp-icons/48/wg_vpn.png'
|
|
||||||
wt = 'Download Successful'
|
|
||||||
msg_t = 'Your zip file is in home directory'
|
|
||||||
msg_window(iw, ii, wt, msg_t)
|
|
||||||
|
|
||||||
else:
|
|
||||||
"""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 = 'Download error'
|
|
||||||
msg_t = 'Download failed! Please try again'
|
|
||||||
msg_window(iw, ii, wt, msg_t)
|
|
||||||
except subprocess.CalledProcessError:
|
|
||||||
"""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 = 'Download error'
|
|
||||||
msg_t = 'Download failed! No internet connection!'
|
|
||||||
msg_window(iw, ii, wt, msg_t)
|
|
||||||
|
|
||||||
|
|
||||||
res = WirePyUpdate.api_down()
|
|
||||||
|
|
||||||
def msg_window(img_w, img_i, w_title, w_txt):
|
|
||||||
"""
|
|
||||||
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.
|
|
||||||
Paths to images must be specified: r'/usr/share/icons/wp-icons/64/info.png'
|
|
||||||
img_w = Image for Tk Window
|
|
||||||
img_i = Image for Icon
|
|
||||||
w_title = Windows Title
|
|
||||||
w_txt = Text for Tk Window
|
|
||||||
"""
|
|
||||||
|
|
||||||
msg = tk.Toplevel()
|
|
||||||
msg.resizable(width=False, height=False)
|
|
||||||
msg.title(w_title)
|
|
||||||
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)
|
|
||||||
img_i = tk.PhotoImage(file=img_i)
|
|
||||||
msg.iconphoto(True, img_i)
|
|
||||||
msg.columnconfigure(0, weight=1)
|
|
||||||
msg.rowconfigure(0, weight=1)
|
|
||||||
msg.winfo_toplevel()
|
|
||||||
|
|
||||||
|
|
||||||
class GreenLabel:
|
|
||||||
"""
|
|
||||||
Show the active tunnel in green in the label
|
|
||||||
"""
|
|
||||||
|
|
||||||
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):
|
|
||||||
|
|
||||||
dictlist = []
|
|
||||||
for lines in file.readlines():
|
|
||||||
line_plit = lines.split()
|
|
||||||
dictlist = dictlist + line_plit
|
|
||||||
dictlist.remove('[Interface]')
|
|
||||||
dictlist.remove('[Peer]')
|
|
||||||
for items in dictlist:
|
|
||||||
if items == '=':
|
|
||||||
dictlist.remove(items)
|
|
||||||
|
|
||||||
''' Here is the beginning (Loop) of convert List to Dictionary '''
|
|
||||||
for _ in dictlist:
|
|
||||||
a = [dictlist[0], dictlist[1]]
|
|
||||||
b = [dictlist[2], dictlist[3]]
|
|
||||||
c = [dictlist[4], dictlist[5]]
|
|
||||||
d = [dictlist[6], dictlist[7]]
|
|
||||||
e = [dictlist[8], dictlist[9]]
|
|
||||||
f = [dictlist[10], dictlist[11]]
|
|
||||||
g = [dictlist[12], dictlist[13]]
|
|
||||||
h = [dictlist[14], dictlist[15]]
|
|
||||||
new_list = [a, b, c, d, e, f, g, h]
|
|
||||||
final_dict = {}
|
|
||||||
for elements in new_list:
|
|
||||||
final_dict[elements[0]] = elements[1]
|
|
||||||
|
|
||||||
''' end... result a Dictionary '''
|
|
||||||
|
|
||||||
address = final_dict['Address']
|
|
||||||
dns = final_dict['DNS']
|
|
||||||
if ',' in dns:
|
|
||||||
dns = dns[:-1]
|
|
||||||
endpoint = final_dict['Endpoint']
|
|
||||||
if 'PresharedKey' in final_dict:
|
|
||||||
pre_key = final_dict['PresharedKey']
|
|
||||||
else:
|
|
||||||
pre_key = final_dict['PreSharedKey']
|
|
||||||
return address, dns, endpoint, pre_key
|
|
||||||
|
|
||||||
|
|
||||||
class TunnelActiv:
|
|
||||||
"""
|
|
||||||
Shows the Active Tunnel
|
|
||||||
"""
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def active():
|
|
||||||
|
|
||||||
active = os.popen('nmcli con show --active | grep -iPo "(.*)(wireguard)"').read().split()
|
|
||||||
if not active:
|
|
||||||
active = ''
|
|
||||||
else:
|
|
||||||
active = active[0]
|
|
||||||
|
|
||||||
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():
|
|
||||||
wg_s = os.popen('nmcli con show | grep -iPo "(.*)(wireguard)"').read().split()
|
|
||||||
|
|
||||||
''' tl = Tunnel list # Show of 4.Element in list '''
|
|
||||||
tl = wg_s[::3]
|
|
||||||
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
|
|
||||||
in the user's home directory with correct right
|
|
||||||
"""
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def wg_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()
|
|
||||||
|
|
||||||
try:
|
|
||||||
if len(tl) != 0:
|
|
||||||
wg_tar = str(_u) + '/' + now_datetime
|
|
||||||
shutil.copytree('/etc/wire_py', '/tmp/wire_py', dirs_exist_ok=True)
|
|
||||||
source = Path('/tmp/wire_py')
|
|
||||||
Path.unlink(Path(source) / 'wg_py', missing_ok=True)
|
|
||||||
Path.unlink(Path(source) / '.keys', missing_ok=True)
|
|
||||||
shutil.make_archive(wg_tar, 'zip', source)
|
|
||||||
shutil.chown(wg_tar + '.zip', 1000, 1000)
|
|
||||||
shutil.rmtree(source)
|
|
||||||
with zipfile.ZipFile((wg_tar + '.zip'), 'r') as zf:
|
|
||||||
if len(zf.namelist()) != 0:
|
|
||||||
|
|
||||||
"""img_w, img_i, w_title, w_txt hand over"""
|
|
||||||
iw = r'/usr/share/icons/wp-icons/64/info.png'
|
|
||||||
ii = r'/usr/share/icons/wp-icons/48/wg_vpn.png'
|
|
||||||
wt = 'Export Successful'
|
|
||||||
msg_t = 'Your zip file is in home directory'
|
|
||||||
msg_window(iw, ii, wt, msg_t)
|
|
||||||
|
|
||||||
else:
|
|
||||||
|
|
||||||
"""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 = 'Export error'
|
|
||||||
msg_t = 'Export failed! Please try again'
|
|
||||||
msg_window(iw, ii, wt, msg_t)
|
|
||||||
|
|
||||||
else:
|
|
||||||
|
|
||||||
"""img_w, img_i, w_title, w_txt hand over"""
|
|
||||||
iw = r'/usr/share/icons/wp-icons/64/info.png'
|
|
||||||
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
|
||||||
wt = 'Select tunnel'
|
|
||||||
msg_t = 'Please first import tunnel.'
|
|
||||||
msg_window(iw, ii, wt, msg_t)
|
|
||||||
|
|
||||||
except TypeError:
|
|
||||||
pass
|
|