punix/Wire-Py
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 8 Wiki Activity

28-09-2024 #15

Merged
punix merged 28 commits from 28-09-2024 into main 2024-09-28 14:17:38 +02:00
Conversation 0 Commits 28 Files Changed 65 +35 -89
3 changed files with 35 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 53124ed7c4 - Show all commits

120
.idea/workspace.xml
View File

@ -4,75 +4,10 @@
<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="new format little fixes icons sort add policy add .desktop File install Part 2"> <list default="true" id="940e1630-c825-4d4c-be80-bc11f543c122" name="Changes" comment="install fix for set dir right">
<change afterPath="$PROJECT_DIR$/Wire-Py.desktop" afterDir="false" />
<change afterPath="$PROJECT_DIR$/install" afterDir="false" />
<change afterPath="$PROJECT_DIR$/org.wirepy.policy" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wirepy" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/128/wg_export.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/128/wg_import.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/128/wg_msg.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/128/wg_trash.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/128/wg_vpn-start.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/128/wg_vpn-stop.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/128/wg_vpn.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/256/wg_export.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/256/wg_import.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/32/wg_export.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/32/wg_import.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/32/wg_msg.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/32/wg_trash.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/32/wg_vpn-start.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/32/wg_vpn-stop.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/32/wg_vpn.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/48/error.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/48/wg_export.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/48/wg_import.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/48/wg_msg.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/48/wg_trash.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/48/wg_vpn-start.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/48/wg_vpn-stop.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/48/wg_vpn.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/64/wg_export.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/64/wg_import.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/64/wg_msg.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/64/wg_trash.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/64/wg_vpn-start.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/64/wg_vpn-stop.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/wp-icons/64/wg_vpn.png" 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$/icons/warning_128.png" beforeDir="false" afterPath="$PROJECT_DIR$/wp-icons/128/error.png" afterDir="false" /> <change beforePath="$PROJECT_DIR$/org.wirepy.policy" beforeDir="false" afterPath="$PROJECT_DIR$/org.wirepy.policy" afterDir="false" />
<change beforePath="$PROJECT_DIR$/icons/warning_256.png" beforeDir="false" afterPath="$PROJECT_DIR$/wp-icons/256/error.png" afterDir="false" /> <change beforePath="$PROJECT_DIR$/wg_main.py" beforeDir="false" afterPath="$PROJECT_DIR$/wg_main.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/icons/warning_32.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/icons/warning_64.png" beforeDir="false" afterPath="$PROJECT_DIR$/wp-icons/64/error.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-active.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-export-48.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-export.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-import-orig.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-import.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-info.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-stop.png" beforeDir="false" afterPath="$PROJECT_DIR$/wp-icons/256/wg_msg.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-trash-48.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-trash-64.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-trash-info.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-trash.png" beforeDir="false" afterPath="$PROJECT_DIR$/wp-icons/256/wg_trash.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-vpn-48.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-vpn-info.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-vpn-start-48.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-vpn-start.png" beforeDir="false" afterPath="$PROJECT_DIR$/wp-icons/256/wg_vpn-start.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-vpn-stop-48.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-vpn-stop.png" beforeDir="false" afterPath="$PROJECT_DIR$/wp-icons/256/wg_vpn-stop.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wg-vpn.png" beforeDir="false" afterPath="$PROJECT_DIR$/wp-icons/256/wg_vpn.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wire-switch-off-256.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wire-switch-off-48.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wire-switch-on-256.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/icons/wire-switch-on-48.png" beforeDir="false" afterPath="$PROJECT_DIR$/wp-icons/32/error.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/install.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/wg_main.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/start_wg.py" beforeDir="false" afterPath="$PROJECT_DIR$/start_wg.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_py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/wg_start.service" beforeDir="false" afterPath="$PROJECT_DIR$/wg_start.service" 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" />
@ -106,23 +41,23 @@
<option name="hideEmptyMiddlePackages" value="true" /> <option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent"><![CDATA[{ <component name="PropertiesComponent">{
"keyToString": { &quot;keyToString&quot;: {
"ASKED_ADD_EXTERNAL_FILES": "true", &quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,
"Python.INSTALL.executor": "Run", &quot;Python.INSTALL.executor&quot;: &quot;Run&quot;,
"Python.install.executor": "Run", &quot;Python.install.executor&quot;: &quot;Run&quot;,
"Python.main.executor": "Run", &quot;Python.main.executor&quot;: &quot;Run&quot;,
"Python.messagebox.executor": "Run", &quot;Python.messagebox.executor&quot;: &quot;Run&quot;,
"Python.start_wg.executor": "Run", &quot;Python.start_wg.executor&quot;: &quot;Run&quot;,
"Python.wg_func.executor": "Run", &quot;Python.wg_func.executor&quot;: &quot;Run&quot;,
"Python.wg_main.executor": "Run", &quot;Python.wg_main.executor&quot;: &quot;Run&quot;,
"RunOnceActivity.ShowReadmeOnStart": "true", &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
"Shell Script.install.executor": "Run", &quot;Shell Script.install.executor&quot;: &quot;Run&quot;,
"git-widget-placeholder": "main", &quot;git-widget-placeholder&quot;: &quot;main&quot;,
"last_opened_file_path": "/home/punix/Pyapps/wire-py", &quot;last_opened_file_path&quot;: &quot;/home/punix/Pyapps/wire-py&quot;,
"settings.editor.selected.configurable": "preferences.fileTypes" &quot;settings.editor.selected.configurable&quot;: &quot;preferences.fileTypes&quot;
} }
}]]></component> }</component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$" /> <recent name="$PROJECT_DIR$" />
@ -455,9 +390,20 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1726599446538</updated> <updated>1726599446538</updated>
</task> </task>
<option name="localTasksCounter" value="33" /> <task id="LOCAL-00033" summary="install fix for set dir right">
<option name="closed" value="true" />
<created>1726599588155</created>
<option name="number" value="00033" />
<option name="presentableId" value="LOCAL-00033" />
<option name="project" value="LOCAL" />
<updated>1726599588155</updated>
</task>
<option name="localTasksCounter" value="34" />
<servers /> <servers />
</component> </component>
<component name="UnknownFeatures">
<option featureType="com.intellij.fileTypeFactory" implementationName="*.policy" />
</component>
<component name="Vcs.Log.Tabs.Properties"> <component name="Vcs.Log.Tabs.Properties">
<option name="OPEN_GENERIC_TABS"> <option name="OPEN_GENERIC_TABS">
<map> <map>
@ -493,7 +439,6 @@
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" /> <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="add Label Interface and Peer to new FrameWidget one and two. when import Tunnel then add to list works and remove of list when Tunnel delete.(with Label active on and off) &#10;add to class and methods open a avtive Tunnel when Wire-Py open, when import and start a Tunnel" />
<MESSAGE value="add file dict_to_address for &#10;address a active Tunnel. Label green pack in Class.&#10;add Class to convert fileoutput as String to Dictionary" /> <MESSAGE value="add file dict_to_address for &#10;address a active Tunnel. Label green pack in Class.&#10;add Class to convert fileoutput as String to Dictionary" />
<MESSAGE value="add Class StartStopBTN to wg_func.py" /> <MESSAGE value="add Class StartStopBTN to wg_func.py" />
<MESSAGE value="Set Style to Clam&#10;Improved layout of widgets" /> <MESSAGE value="Set Style to Clam&#10;Improved layout of widgets" />
@ -518,6 +463,7 @@
<MESSAGE value="little fixes, add msg_window() &#10;function for Messagebox to show a tk.Toplevel()&#10;replace var = open() with: &#10;with open() as var:&#10;and remove by classes (tk.tk) and super()" /> <MESSAGE value="little fixes, add msg_window() &#10;function for Messagebox to show a tk.Toplevel()&#10;replace var = open() with: &#10;with open() as var:&#10;and remove by classes (tk.tk) and super()" />
<MESSAGE value="in delete replace open with Path&#10;install fixes" /> <MESSAGE value="in delete replace open with Path&#10;install fixes" />
<MESSAGE value="new format little fixes icons sort add policy add .desktop File install Part 2" /> <MESSAGE value="new format little fixes icons sort add policy add .desktop File install Part 2" />
<option name="LAST_COMMIT_MESSAGE" value="new format little fixes icons sort add policy add .desktop File install Part 2" /> <MESSAGE value="install fix for set dir right" />
<option name="LAST_COMMIT_MESSAGE" value="install fix for set dir right" />
</component> </component>
</project> </project>

2
org.wirepy.policy
View File

@ -10,7 +10,7 @@
<allow_inactive>auth_admin_keep</allow_inactive> <allow_inactive>auth_admin_keep</allow_inactive>
<allow_active>yes</allow_active> <allow_active>yes</allow_active>
</defaults> </defaults>
<annotate key="org.freedesktop.policykit.exec.path">/usr/bin/wire-py/main.py</annotate> <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/wire-py/wg_main.py</annotate>
<annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate> <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
</action> </action>
</policyconfig> </policyconfig>

2
wg_main.py
View File

@ -159,13 +159,13 @@ class FrameWidgets(ttk.Frame):
if select_tl == a_con: if select_tl == a_con:
self.selected_option.set(0) self.selected_option.set(0)
self.autoconnect_var.set('no Autoconnect') self.autoconnect_var.set('no Autoconnect')
self.wg_autostart.configure(state='disabled')
Path.unlink(path_to_file) Path.unlink(path_to_file)
Path.unlink(Path('/etc/wire_py') / str(select_tl + '.conf')) Path.unlink(Path('/etc/wire_py') / str(select_tl + '.conf'))
# for disable checkbox when Listbox empty # for disable checkbox when Listbox empty
tl = ListTunnels.tl_list() tl = ListTunnels.tl_list()
if len(tl) == 0: if len(tl) == 0:
self.wg_autostart.configure(state='disabled') self.wg_autostart.configure(state='disabled')
Path.unlink(path_to_file)
if self.a != '' and self.a == select_tl: if self.a != '' and self.a == select_tl:
self.StrVar.set(value='') self.StrVar.set(value='')