Compare commits
14 Commits
e9814f2b60
...
1.11.1124
Author | SHA1 | Date | |
---|---|---|---|
c4565ed169 | |||
485cfff457 | |||
1a0fc74a80 | |||
971c86c97f | |||
cf71eae7d3 | |||
1f80d5342c | |||
e719a1f23f | |||
a0da356cec | |||
ac87e0a4a7 | |||
6a3a982057 | |||
aab90eec70 | |||
511d5f72df | |||
ed93e99026 | |||
10c3b07053 |
19
Changelog
19
Changelog
@ -8,6 +8,23 @@ My standard System: Linux Mint 22 Cinnamon
|
|||||||
- for loops with lists replaced by List Comprehensions
|
- for loops with lists replaced by List Comprehensions
|
||||||
- Update search after start of Wire-Py
|
- Update search after start of Wire-Py
|
||||||
|
|
||||||
|
|
||||||
|
### 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
|
### Added
|
||||||
08-11-2024
|
08-11-2024
|
||||||
|
|
||||||
@ -15,6 +32,7 @@ My standard System: Linux Mint 22 Cinnamon
|
|||||||
- separate folder for general icons
|
- separate folder for general icons
|
||||||
- install edit for new dir lx-icons
|
- install edit for new dir lx-icons
|
||||||
|
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
08-11-2024
|
08-11-2024
|
||||||
|
|
||||||
@ -23,6 +41,7 @@ My standard System: Linux Mint 22 Cinnamon
|
|||||||
- add new Frame for Widgets on Bottom
|
- add new Frame for Widgets on Bottom
|
||||||
- optimize from tkinter * to from tkinter import filedialog, ttk, TclError
|
- optimize from tkinter * to from tkinter import filedialog, ttk, TclError
|
||||||
|
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
07-11-2024
|
07-11-2024
|
||||||
|
|
||||||
|
@ -1,16 +1,14 @@
|
|||||||
""" Wireguard Classes and Method for Wire-Py """
|
""" Classes Method and functions for lx apps """
|
||||||
|
|
||||||
|
import gettext
|
||||||
|
import locale
|
||||||
import os
|
import os
|
||||||
import shutil
|
import shutil
|
||||||
import subprocess
|
import subprocess
|
||||||
import time
|
|
||||||
import tkinter as tk
|
import tkinter as tk
|
||||||
import zipfile
|
import zipfile
|
||||||
import gettext
|
|
||||||
import locale
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from subprocess import check_call
|
|
||||||
from tkinter import ttk
|
from tkinter import ttk
|
||||||
import requests
|
import requests
|
||||||
|
|
||||||
@ -20,43 +18,48 @@ locale.bindtextdomain(APP, LOCALE_DIR)
|
|||||||
gettext.bindtextdomain(APP, LOCALE_DIR)
|
gettext.bindtextdomain(APP, LOCALE_DIR)
|
||||||
gettext.textdomain(APP)
|
gettext.textdomain(APP)
|
||||||
_ = gettext.gettext
|
_ = gettext.gettext
|
||||||
''' 1 = 1. Year, 09 = Month of the Year, 2924 = Day and Year of the Year '''
|
|
||||||
version = 'v. 1.11.0824'
|
|
||||||
|
|
||||||
path_to_file2 = Path('/etc/wire_py/settings.conf')
|
wg_set = Path('/etc/wire_py/settings.conf')
|
||||||
_u = Path.read_text(Path('/tmp/_u'))
|
_u = Path.read_text(Path('/tmp/_u'))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class GiteaUpdate:
|
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
|
@staticmethod
|
||||||
def api_down(UPDATE_API_URL):
|
def api_down(update_api_url, version):
|
||||||
try:
|
try:
|
||||||
response = requests.get(UPDATE_API_URL)
|
response = requests.get(update_api_url)
|
||||||
response_dict = response.json()
|
response_dict = response.json()
|
||||||
response_dict = response_dict[0]
|
response_dict = response_dict[0]
|
||||||
with open(path_to_file2, 'r') as set_file:
|
with open(wg_set, 'r') as set_file:
|
||||||
set_file = set_file.read()
|
set_file = set_file.read()
|
||||||
if 'on\n' in set_file:
|
if 'on\n' in set_file:
|
||||||
if version[3:] != response_dict['tag_name']:
|
if version[3:] != response_dict['tag_name']:
|
||||||
return response_dict['tag_name']
|
return response_dict['tag_name']
|
||||||
else:
|
else:
|
||||||
return _('No Updates')
|
return 'No Updates'
|
||||||
else:
|
else:
|
||||||
return _('False')
|
return 'False'
|
||||||
except requests.exceptions.ConnectionError:
|
except requests.exceptions.ConnectionError:
|
||||||
return 'No Internet Connection!'
|
return 'No Internet Connection!'
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def download(URLD):
|
def download(urld, down_ok_image, down_not_ok_image, res):
|
||||||
try:
|
try:
|
||||||
to_down = 'wget -qP ' + str(_u) + ' ' + URLD
|
to_down = 'wget -qP ' + str(_u) + ' ' + urld
|
||||||
result = subprocess.call(to_down, shell=True)
|
result = subprocess.call(to_down, shell=True)
|
||||||
if result == 0:
|
if result == 0:
|
||||||
shutil.chown(str(_u) + f'/{res}.zip', 1000, 1000)
|
shutil.chown(str(_u) + f'/{res}.zip', 1000, 1000)
|
||||||
"""img_w, img_i, w_title, w_txt hand over"""
|
"""img_w, img_i, w_title, w_txt hand over"""
|
||||||
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
||||||
ii = r'/usr/share/icons/wp-icons/48/wg_vpn.png'
|
ii = down_ok_image
|
||||||
wt = _('Download Successful')
|
wt = _('Download Successful')
|
||||||
msg_t = _('Your zip file is in home directory')
|
msg_t = _('Your zip file is in home directory')
|
||||||
msg_window(iw, ii, wt, msg_t)
|
msg_window(iw, ii, wt, msg_t)
|
||||||
@ -64,23 +67,19 @@ class GiteaUpdate:
|
|||||||
else:
|
else:
|
||||||
"""img_w, img_i, w_title, w_txt hand over"""
|
"""img_w, img_i, w_title, w_txt hand over"""
|
||||||
iw = r'/usr/share/icons/lx-icons/64/error.png'
|
iw = r'/usr/share/icons/lx-icons/64/error.png'
|
||||||
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
ii = down_not_ok_image
|
||||||
wt = _('Download error')
|
wt = _('Download error')
|
||||||
msg_t = _('Download failed! Please try again')
|
msg_t = _('Download failed! Please try again')
|
||||||
msg_window(iw, ii, wt, msg_t)
|
msg_window(iw, ii, wt, msg_t)
|
||||||
except subprocess.CalledProcessError:
|
except subprocess.CalledProcessError:
|
||||||
"""img_w, img_i, w_title, w_txt hand over"""
|
"""img_w, img_i, w_title, w_txt hand over"""
|
||||||
iw = r'/usr/share/icons/lx-icons/64/error.png'
|
iw = r'/usr/share/icons/lx-icons/64/error.png'
|
||||||
ii = r'/usr/share/icons/wg-icons/48/wg_msg.png'
|
ii = down_not_ok_image
|
||||||
wt = _('Download error')
|
wt = _('Download error')
|
||||||
msg_t = _('Download failed! No internet connection!')
|
msg_t = _('Download failed! No internet connection!')
|
||||||
msg_window(iw, ii, wt, msg_t)
|
msg_window(iw, ii, wt, msg_t)
|
||||||
|
|
||||||
|
|
||||||
res = GiteaUpdate.api_down('https://git.ilunix.de/api/v1/repos/punix/Wire-Py/releases')
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def msg_window(img_w, img_i, w_title, w_txt, txt2=None, com=None):
|
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.
|
Function for different message windows for the user. with 4 arguments to be passed.
|
||||||
@ -90,8 +89,9 @@ def msg_window(img_w, img_i, w_title, w_txt, txt2=None, com=None):
|
|||||||
img_i = Image for Icon
|
img_i = Image for Icon
|
||||||
w_title = Windows Title
|
w_title = Windows Title
|
||||||
w_txt = Text for Tk Window
|
w_txt = Text for Tk Window
|
||||||
|
txt2 = Text for Button two
|
||||||
|
com = function for Button command
|
||||||
"""
|
"""
|
||||||
|
|
||||||
msg = tk.Toplevel()
|
msg = tk.Toplevel()
|
||||||
msg.resizable(width=False, height=False)
|
msg.resizable(width=False, height=False)
|
||||||
msg.title(w_title)
|
msg.title(w_title)
|
||||||
@ -103,7 +103,7 @@ def msg_window(img_w, img_i, w_title, w_txt, txt2=None, com=None):
|
|||||||
|
|
||||||
label.grid(column=1, row=0)
|
label.grid(column=1, row=0)
|
||||||
|
|
||||||
if txt2 != None and com != None:
|
if txt2 is not None and com is not None:
|
||||||
label.config(font=('Ubuntu', 11), padx=15, justify='left')
|
label.config(font=('Ubuntu', 11), padx=15, justify='left')
|
||||||
msg.i_window.grid(column=0, row=0, sticky='nw')
|
msg.i_window.grid(column=0, row=0, sticky='nw')
|
||||||
button2 = ttk.Button(msg, text=f'{txt2}', command=com, padding=4)
|
button2 = ttk.Button(msg, text=f'{txt2}', command=com, padding=4)
|
||||||
@ -125,7 +125,6 @@ def msg_window(img_w, img_i, w_title, w_txt, txt2=None, com=None):
|
|||||||
|
|
||||||
|
|
||||||
class Tunnel:
|
class Tunnel:
|
||||||
|
|
||||||
"""
|
"""
|
||||||
Class of Methods for Wire-Py
|
Class of Methods for Wire-Py
|
||||||
"""
|
"""
|
||||||
@ -134,7 +133,6 @@ class Tunnel:
|
|||||||
The config file is packed into a dictionary,
|
The config file is packed into a dictionary,
|
||||||
to display the values Address , DNS and Peer in the labels
|
to display the values Address , DNS and Peer in the labels
|
||||||
"""
|
"""
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def con_to_dict(cls, file):
|
def con_to_dict(cls, file):
|
||||||
|
|
||||||
@ -176,11 +174,9 @@ class Tunnel:
|
|||||||
pre_key = final_dict['PreSharedKey']
|
pre_key = final_dict['PreSharedKey']
|
||||||
return address, dns, endpoint, pre_key
|
return address, dns, endpoint, pre_key
|
||||||
|
|
||||||
|
|
||||||
"""
|
"""
|
||||||
Shows the Active Tunnel
|
Shows the Active Tunnel
|
||||||
"""
|
"""
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def active():
|
def active():
|
||||||
|
|
||||||
@ -195,7 +191,6 @@ class Tunnel:
|
|||||||
"""
|
"""
|
||||||
Shows all existing Wireguard tunnels
|
Shows all existing Wireguard tunnels
|
||||||
"""
|
"""
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def list():
|
def list():
|
||||||
wg_s = os.popen('nmcli con show | grep -iPo "(.*)(wireguard)"').read().split()
|
wg_s = os.popen('nmcli con show | grep -iPo "(.*)(wireguard)"').read().split()
|
||||||
@ -204,13 +199,11 @@ class Tunnel:
|
|||||||
tl = wg_s[::3]
|
tl = wg_s[::3]
|
||||||
return tl
|
return tl
|
||||||
|
|
||||||
|
|
||||||
"""
|
"""
|
||||||
This will export the tunnels.
|
This will export the tunnels.
|
||||||
A zipfile with current date and time is created
|
A zipfile with current date and time is created
|
||||||
in the user's home directory with correct right
|
in the user's home directory with correct right
|
||||||
"""
|
"""
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def export():
|
def export():
|
||||||
_u1 = str(_u[6:])
|
_u1 = str(_u[6:])
|
||||||
@ -254,19 +247,26 @@ class Tunnel:
|
|||||||
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
||||||
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
||||||
wt = _('Select tunnel')
|
wt = _('Select tunnel')
|
||||||
msg_t = _('Please first import tunnel.')
|
msg_t = _('Please first import tunnel')
|
||||||
msg_window(iw, ii, wt, msg_t)
|
msg_window(iw, ii, wt, msg_t)
|
||||||
|
|
||||||
except TypeError:
|
except TypeError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
class Tipi:
|
||||||
|
"""
|
||||||
|
Class for Tooltip setting write in File
|
||||||
|
Calling request path to file
|
||||||
|
"""
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def if_tip():
|
def if_tip(path):
|
||||||
with open(path_to_file2, 'r') as set_file2:
|
with open(path, 'r') as set_file2:
|
||||||
lines2 = set_file2.readlines()
|
lines2 = set_file2.readlines()
|
||||||
if 'False\n' in lines2:
|
if 'False\n' in lines2:
|
||||||
return False
|
return False
|
||||||
else:
|
else:
|
||||||
return True
|
return True
|
||||||
|
|
||||||
tips = Tunnel.if_tip()
|
|
||||||
|
wg_tips = Tipi.if_tip(wg_set)
|
||||||
|
4
install
4
install
@ -11,6 +11,7 @@ install_file_with(){
|
|||||||
sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/.keys && sudo cp -u settings.conf /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 lx-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/ && \
|
||||||
@ -25,6 +26,7 @@ install_arch_d(){
|
|||||||
sudo mkdir -p /etc/wire_py && sudo touch /etc/wire_py/.keys && sudo cp -u settings.conf /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 lx-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/ && \
|
||||||
@ -92,6 +94,7 @@ elif grep -i 'fedora' /etc/os-release > /dev/null 2>&1
|
|||||||
sudo cp -u wg_main.py start_wg.py cls_mth_fc.py wirepy.py run_as open_gitea.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.conf /etc/wire_py/ && \
|
sudo cp -u settings.conf /etc/wire_py/ && \
|
||||||
|
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 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 && \
|
||||||
@ -108,6 +111,7 @@ elif grep -i 'suse' /etc/os-release > /dev/null 2>&1
|
|||||||
sudo cp -u wg_main.py start_wg.py cls_mth_fc.py wirepy.py run_as open_gitea.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.conf /etc/wire_py/ && \
|
sudo cp -u settings.conf /etc/wire_py/ && \
|
||||||
|
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 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 && \
|
||||||
|
BIN
languages/de/cls_mth_fc.mo
Normal file
BIN
languages/de/cls_mth_fc.mo
Normal file
Binary file not shown.
BIN
languages/de/wirepy.mo
Normal file
BIN
languages/de/wirepy.mo
Normal file
Binary file not shown.
106
wg_main.py
106
wg_main.py
@ -1,4 +1,5 @@
|
|||||||
#!/usr/bin/python3
|
#!/usr/bin/python3
|
||||||
|
|
||||||
import gettext
|
import gettext
|
||||||
import locale
|
import locale
|
||||||
import os
|
import os
|
||||||
@ -8,12 +9,17 @@ import tkinter as tk
|
|||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from subprocess import check_call
|
from subprocess import check_call
|
||||||
from tkinter import filedialog, ttk, TclError
|
from tkinter import filedialog, ttk, TclError
|
||||||
|
from cls_mth_fc import (Tunnel, msg_window, GiteaUpdate, _u, wg_tips, wg_set)
|
||||||
from cls_mth_fc import (Tunnel, msg_window, GiteaUpdate, res, _u, version, path_to_file2, tips)
|
|
||||||
|
|
||||||
tcl_path = Path('/usr/share/TK-Themes')
|
tcl_path = Path('/usr/share/TK-Themes')
|
||||||
|
|
||||||
APP = 'wg_main'
|
''' 1 = 1. Year, 09 = Month of the Year, 2924 = Day and Year of the Year '''
|
||||||
|
version = 'v. 1.11.1024'
|
||||||
|
|
||||||
|
res = GiteaUpdate.api_down('https://git.ilunix.de/api/v1/repos/punix/Wire-Py/releases', version)
|
||||||
|
|
||||||
|
''' Translate '''
|
||||||
|
APP = 'wirepy'
|
||||||
LOCALE_DIR = "/usr/share/locale/"
|
LOCALE_DIR = "/usr/share/locale/"
|
||||||
locale.bindtextdomain(APP, LOCALE_DIR)
|
locale.bindtextdomain(APP, LOCALE_DIR)
|
||||||
gettext.bindtextdomain(APP, LOCALE_DIR)
|
gettext.bindtextdomain(APP, LOCALE_DIR)
|
||||||
@ -40,7 +46,7 @@ class MainWindow(tk.Tk):
|
|||||||
self.style = ttk.Style(self)
|
self.style = ttk.Style(self)
|
||||||
self.tk.call('source', str(tcl_path) + '/water.tcl')
|
self.tk.call('source', str(tcl_path) + '/water.tcl')
|
||||||
''' self.tk.call('source', 'TK-Themes/water.tcl') '''
|
''' self.tk.call('source', 'TK-Themes/water.tcl') '''
|
||||||
with open(path_to_file2, 'r') as read_file:
|
with open(wg_set, 'r') as read_file:
|
||||||
lines = read_file.readlines()
|
lines = read_file.readlines()
|
||||||
if 'light\n' in lines:
|
if 'light\n' in lines:
|
||||||
self.tk.call('set_theme', 'light')
|
self.tk.call('set_theme', 'light')
|
||||||
@ -79,34 +85,34 @@ class FrameWidgets(ttk.Frame):
|
|||||||
|
|
||||||
def update():
|
def update():
|
||||||
if set_update.get() == 1:
|
if set_update.get() == 1:
|
||||||
with open(path_to_file2, 'r') as set_file2:
|
with open(wg_set, 'r') as set_file2:
|
||||||
lines2 = set_file2.readlines()
|
lines2 = set_file2.readlines()
|
||||||
lines2[1] = 'off\n'
|
lines2[1] = 'off\n'
|
||||||
with open(path_to_file2, 'w') as set_file2:
|
with open(wg_set, 'w') as set_file2:
|
||||||
set_file2.writelines(lines2)
|
set_file2.writelines(lines2)
|
||||||
|
|
||||||
if set_update.get() == 0:
|
if set_update.get() == 0:
|
||||||
with open(path_to_file2, 'r') as set_file2:
|
with open(wg_set, 'r') as set_file2:
|
||||||
lines2 = set_file2.readlines()
|
lines2 = set_file2.readlines()
|
||||||
lines2[1] = 'on\n'
|
lines2[1] = 'on\n'
|
||||||
with open(path_to_file2, 'w') as set_file2:
|
with open(wg_set, 'w') as set_file2:
|
||||||
set_file2.writelines(lines2)
|
set_file2.writelines(lines2)
|
||||||
|
|
||||||
''' Set True or False in file '''
|
''' Set True or False in file '''
|
||||||
|
|
||||||
def tooltip():
|
def tooltip():
|
||||||
if set_tip.get():
|
if set_tip.get():
|
||||||
with open(path_to_file2, 'r') as set_file2:
|
with open(wg_set, 'r') as set_file2:
|
||||||
lines2 = set_file2.readlines()
|
lines2 = set_file2.readlines()
|
||||||
lines2[5] = 'False\n'
|
lines2[5] = 'False\n'
|
||||||
with open(path_to_file2, 'w') as set_file2:
|
with open(wg_set, 'w') as set_file2:
|
||||||
set_file2.writelines(lines2)
|
set_file2.writelines(lines2)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
with open(path_to_file2, 'r') as set_file2:
|
with open(wg_set, 'r') as set_file2:
|
||||||
lines2 = set_file2.readlines()
|
lines2 = set_file2.readlines()
|
||||||
lines2[5] = 'True\n'
|
lines2[5] = 'True\n'
|
||||||
with open(path_to_file2, 'w') as set_file2:
|
with open(wg_set, 'w') as set_file2:
|
||||||
set_file2.writelines(lines2)
|
set_file2.writelines(lines2)
|
||||||
|
|
||||||
''' Set dark or light '''
|
''' Set dark or light '''
|
||||||
@ -115,10 +121,10 @@ class FrameWidgets(ttk.Frame):
|
|||||||
if self.tk.call("ttk::style", "theme", "use") == "water-dark":
|
if self.tk.call("ttk::style", "theme", "use") == "water-dark":
|
||||||
''' Set light theme '''
|
''' Set light theme '''
|
||||||
self.tk.call('set_theme', 'light')
|
self.tk.call('set_theme', 'light')
|
||||||
with open(path_to_file2, 'r') as theme_set2:
|
with open(wg_set, 'r') as theme_set2:
|
||||||
lines3 = theme_set2.readlines()
|
lines3 = theme_set2.readlines()
|
||||||
lines3[3] = 'light\n'
|
lines3[3] = 'light\n'
|
||||||
with open(path_to_file2, 'w') as theme_set2:
|
with open(wg_set, 'w') as theme_set2:
|
||||||
theme_set2.writelines(lines3)
|
theme_set2.writelines(lines3)
|
||||||
self.color_label()
|
self.color_label()
|
||||||
|
|
||||||
@ -126,10 +132,10 @@ class FrameWidgets(ttk.Frame):
|
|||||||
if not self.tk.call("ttk::style", "theme", "use") == "water-dark":
|
if not self.tk.call("ttk::style", "theme", "use") == "water-dark":
|
||||||
''' Set dark theme '''
|
''' Set dark theme '''
|
||||||
self.tk.call('set_theme', 'dark')
|
self.tk.call('set_theme', 'dark')
|
||||||
with open(path_to_file2, 'r') as theme_set2:
|
with open(wg_set, 'r') as theme_set2:
|
||||||
lines4 = theme_set2.readlines()
|
lines4 = theme_set2.readlines()
|
||||||
lines4[3] = 'dark\n'
|
lines4[3] = 'dark\n'
|
||||||
with open(path_to_file2, 'w') as theme_set2:
|
with open(wg_set, 'w') as theme_set2:
|
||||||
theme_set2.writelines(lines4)
|
theme_set2.writelines(lines4)
|
||||||
self.color_label()
|
self.color_label()
|
||||||
|
|
||||||
@ -172,7 +178,7 @@ class FrameWidgets(ttk.Frame):
|
|||||||
window.my_tool_tip.destroy()
|
window.my_tool_tip.destroy()
|
||||||
|
|
||||||
self.options_btn = ttk.Menubutton(self.menu_frame, text=_('Options'))
|
self.options_btn = ttk.Menubutton(self.menu_frame, text=_('Options'))
|
||||||
self.options_btn.grid(column=1, row=0)
|
self.options_btn.grid(column=1, columnspan=1, row=0)
|
||||||
|
|
||||||
def sets_enter(event):
|
def sets_enter(event):
|
||||||
""" The mouse moves into the entry widget """
|
""" The mouse moves into the entry widget """
|
||||||
@ -199,14 +205,14 @@ class FrameWidgets(ttk.Frame):
|
|||||||
|
|
||||||
''' About BTN Menu / Label '''
|
''' About BTN Menu / Label '''
|
||||||
self.about_btn = ttk.Button(self.menu_frame, text=_('About'), style='Toolbutton', command=info)
|
self.about_btn = ttk.Button(self.menu_frame, text=_('About'), style='Toolbutton', command=info)
|
||||||
self.about_btn.grid(column=2, row=0)
|
self.about_btn.grid(column=2, columnspan=2, row=0)
|
||||||
self.readme = tk.Menu(self)
|
self.readme = tk.Menu(self)
|
||||||
|
|
||||||
''' Update and Tooltip Label '''
|
''' Update and Tooltip Label '''
|
||||||
self.updates_lb = ttk.Label(self.menu_frame)
|
self.updates_lb = ttk.Label(self.menu_frame)
|
||||||
self.updates_lb.grid(column=3, row=0, padx=10)
|
self.updates_lb.grid(column=4, columnspan=3, row=0, padx=10)
|
||||||
'''View Checkbox for enable or disable Tooltip '''
|
'''View Checkbox for enable or disable Tooltip '''
|
||||||
if tips:
|
if wg_tips:
|
||||||
set_tip.set(value=False)
|
set_tip.set(value=False)
|
||||||
else:
|
else:
|
||||||
set_tip.set(value=True)
|
set_tip.set(value=True)
|
||||||
@ -245,11 +251,11 @@ class FrameWidgets(ttk.Frame):
|
|||||||
self.updates_lb.bind('<Leave>', congratulations_leave)
|
self.updates_lb.bind('<Leave>', congratulations_leave)
|
||||||
else:
|
else:
|
||||||
set_update.set(value=0)
|
set_update.set(value=0)
|
||||||
text = _(f'Update {res} available!')
|
text = f'Update {res} ' + _('available!')
|
||||||
|
|
||||||
''' Update BTN Menu'''
|
''' Update BTN Menu'''
|
||||||
self.update_btn = ttk.Menubutton(self.menu_frame, text=text)
|
self.update_btn = ttk.Menubutton(self.menu_frame, text=text)
|
||||||
self.update_btn.grid(column=4, row=0, padx=0)
|
self.update_btn.grid(column=4, columnspan=3, row=0, padx=0)
|
||||||
|
|
||||||
def download_enter(event):
|
def download_enter(event):
|
||||||
""" The mouse moves into the entry widget """
|
""" The mouse moves into the entry widget """
|
||||||
@ -266,8 +272,15 @@ class FrameWidgets(ttk.Frame):
|
|||||||
self.download = tk.Menu(self, relief='flat')
|
self.download = tk.Menu(self, relief='flat')
|
||||||
|
|
||||||
self.update_btn.configure(menu=self.download, style='Toolbutton')
|
self.update_btn.configure(menu=self.download, style='Toolbutton')
|
||||||
self.download.add_command(label=_('Download'), command=GiteaUpdate.download(f'https://git.ilunix.de/punix'
|
self.download.add_command(label=_('Download'),
|
||||||
f'/Wire-Py/archive/{res}.zip'))
|
command=lambda: GiteaUpdate.download(f'https://git.ilunix.de/punix'
|
||||||
|
f'/Wire-Py/archive/'
|
||||||
|
f'{res}.zip', r'/usr/'
|
||||||
|
r'share/icons/wp-icons'
|
||||||
|
r'/48/wg_vpn.png',
|
||||||
|
r'/usr/share/icons/wp-icons'
|
||||||
|
r'/48/wg_msg.png', res))
|
||||||
|
|
||||||
''' Show active Tunnel '''
|
''' Show active Tunnel '''
|
||||||
self.a = Tunnel.active()
|
self.a = Tunnel.active()
|
||||||
|
|
||||||
@ -291,6 +304,11 @@ class FrameWidgets(ttk.Frame):
|
|||||||
self.lb_frame3.configure(relief='flat')
|
self.lb_frame3.configure(relief='flat')
|
||||||
self.lb_frame3.grid(column=0, row=5, columnspan=4, sticky='snew', padx=2, pady=2)
|
self.lb_frame3.grid(column=0, row=5, columnspan=4, sticky='snew', padx=2, pady=2)
|
||||||
|
|
||||||
|
''' Bottom Frame 5 '''
|
||||||
|
self.lb_frame4 = ttk.Frame(self)
|
||||||
|
self.lb_frame4.configure(relief='flat')
|
||||||
|
self.lb_frame4.grid(column=2, row=5, columnspan=3, sticky='e', padx=15)
|
||||||
|
|
||||||
''' Show active Label '''
|
''' Show active Label '''
|
||||||
self.select_tunnel = None
|
self.select_tunnel = None
|
||||||
self.lb = ttk.Label(self, text=_('Active: '))
|
self.lb = ttk.Label(self, text=_('Active: '))
|
||||||
@ -407,11 +425,11 @@ class FrameWidgets(ttk.Frame):
|
|||||||
pre_key = key[3]
|
pre_key = key[3]
|
||||||
check_call(['nmcli', 'connection', 'delete', select_tl])
|
check_call(['nmcli', 'connection', 'delete', select_tl])
|
||||||
self.l_box.delete(self.select_tunnel[0])
|
self.l_box.delete(self.select_tunnel[0])
|
||||||
with open(path_to_file2, 'r') as set_file6:
|
with open(wg_set, 'r') as set_file6:
|
||||||
lines6 = set_file6.readlines()
|
lines6 = set_file6.readlines()
|
||||||
if select_tl == lines6[7].strip() and 'off' not in lines6[7].strip():
|
if select_tl == lines6[7].strip() and 'off' not in lines6[7].strip():
|
||||||
lines6[7] = 'off'
|
lines6[7] = 'off'
|
||||||
with open(path_to_file2, 'w') as set_file7:
|
with open(wg_set, 'w') as set_file7:
|
||||||
set_file7.writelines(lines6)
|
set_file7.writelines(lines6)
|
||||||
self.selected_option.set(0)
|
self.selected_option.set(0)
|
||||||
self.autoconnect_var.set(_('no Autoconnect'))
|
self.autoconnect_var.set(_('no Autoconnect'))
|
||||||
@ -474,7 +492,7 @@ class FrameWidgets(ttk.Frame):
|
|||||||
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
||||||
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
||||||
wt = _('Select tunnel')
|
wt = _('Select tunnel')
|
||||||
msg_t = _('Please select a tunnel from the list.')
|
msg_t = _('Please select a tunnel from the list')
|
||||||
msg_window(iw, ii, wt, msg_t)
|
msg_window(iw, ii, wt, msg_t)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
@ -483,7 +501,7 @@ class FrameWidgets(ttk.Frame):
|
|||||||
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
||||||
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
||||||
wt = _('Select tunnel')
|
wt = _('Select tunnel')
|
||||||
msg_t = _('Please first import tunnel.')
|
msg_t = _('Please first import tunnel')
|
||||||
msg_window(iw, ii, wt, msg_t)
|
msg_window(iw, ii, wt, msg_t)
|
||||||
|
|
||||||
''' Button Trash '''
|
''' Button Trash '''
|
||||||
@ -548,7 +566,7 @@ class FrameWidgets(ttk.Frame):
|
|||||||
self.btn_exp.bind('<Leave>', exp_leave)
|
self.btn_exp.bind('<Leave>', exp_leave)
|
||||||
|
|
||||||
''' Label Entry '''
|
''' Label Entry '''
|
||||||
self.lb_rename = ttk.Entry(self.lb_frame3, width=20)
|
self.lb_rename = ttk.Entry(self.lb_frame4, width=20)
|
||||||
self.lb_rename.grid(column=2, row=0, padx=8, pady=10, sticky='ne')
|
self.lb_rename.grid(column=2, row=0, padx=8, pady=10, sticky='ne')
|
||||||
self.lb_rename.insert(0, _('Max. 12 characters!'))
|
self.lb_rename.insert(0, _('Max. 12 characters!'))
|
||||||
self.lb_rename.config(state='disable')
|
self.lb_rename.config(state='disable')
|
||||||
@ -589,7 +607,7 @@ class FrameWidgets(ttk.Frame):
|
|||||||
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
||||||
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
||||||
wt = _('Renaming not possible')
|
wt = _('Renaming not possible')
|
||||||
msg_t = _('The new name may contain only 12 characters.')
|
msg_t = _('The new name may contain only 12 characters')
|
||||||
msg_window(iw, ii, wt, msg_t)
|
msg_window(iw, ii, wt, msg_t)
|
||||||
|
|
||||||
elif len(self.lb_rename.get()) == 0:
|
elif len(self.lb_rename.get()) == 0:
|
||||||
@ -598,7 +616,7 @@ class FrameWidgets(ttk.Frame):
|
|||||||
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
||||||
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
||||||
wt = _('Renaming not possible')
|
wt = _('Renaming not possible')
|
||||||
msg_t = _('At least one character must be entered.')
|
msg_t = _('At least one character must be entered')
|
||||||
msg_window(iw, ii, wt, msg_t)
|
msg_window(iw, ii, wt, msg_t)
|
||||||
|
|
||||||
elif any(ch in special_characters for ch in self.lb_rename.get()):
|
elif any(ch in special_characters for ch in self.lb_rename.get()):
|
||||||
@ -629,11 +647,11 @@ class FrameWidgets(ttk.Frame):
|
|||||||
if self.a != '' and self.a == select_tl:
|
if self.a != '' and self.a == select_tl:
|
||||||
self.a = Tunnel.active()
|
self.a = Tunnel.active()
|
||||||
self.StrVar.set(value=self.a)
|
self.StrVar.set(value=self.a)
|
||||||
with open(path_to_file2, 'r') as set_file5:
|
with open(wg_set, 'r') as set_file5:
|
||||||
lines5 = set_file5.readlines()
|
lines5 = set_file5.readlines()
|
||||||
if select_tl == lines5[7].strip() and 'off' not in lines5[7].strip():
|
if select_tl == lines5[7].strip() and 'off' not in lines5[7].strip():
|
||||||
lines5[7] = new_a_connect
|
lines5[7] = new_a_connect
|
||||||
with open(path_to_file2, 'w') as theme_set5:
|
with open(wg_set, 'w') as theme_set5:
|
||||||
theme_set5.writelines(lines5)
|
theme_set5.writelines(lines5)
|
||||||
self.autoconnect_var.set(value=new_a_connect)
|
self.autoconnect_var.set(value=new_a_connect)
|
||||||
|
|
||||||
@ -645,11 +663,11 @@ class FrameWidgets(ttk.Frame):
|
|||||||
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
||||||
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
||||||
wt = _('Renaming not possible')
|
wt = _('Renaming not possible')
|
||||||
msg_t = _('Please select a tunnel from the list.')
|
msg_t = _('Please select a tunnel from the list')
|
||||||
msg_window(iw, ii, wt, msg_t)
|
msg_window(iw, ii, wt, msg_t)
|
||||||
|
|
||||||
''' Button Rename '''
|
''' Button Rename '''
|
||||||
self.btn_rename = ttk.Button(self.lb_frame3, text=_('Rename'), state='disable', command=tl_rename, padding=4,
|
self.btn_rename = ttk.Button(self.lb_frame4, text=_('Rename'), state='disable', command=tl_rename, padding=4,
|
||||||
style='RnButton.TButton')
|
style='RnButton.TButton')
|
||||||
self.btn_rename.grid(column=3, row=0, padx=5, pady=10, sticky='ne')
|
self.btn_rename.grid(column=3, row=0, padx=5, pady=10, sticky='ne')
|
||||||
|
|
||||||
@ -886,10 +904,10 @@ class FrameWidgets(ttk.Frame):
|
|||||||
select_tl = self.l_box.get(select_tunnel[0])
|
select_tl = self.l_box.get(select_tunnel[0])
|
||||||
|
|
||||||
if self.selected_option.get() == 0:
|
if self.selected_option.get() == 0:
|
||||||
with open(path_to_file2, 'r') as set_file3:
|
with open(wg_set, 'r') as set_file3:
|
||||||
lines3 = set_file3.readlines()
|
lines3 = set_file3.readlines()
|
||||||
lines3[7] = 'off'
|
lines3[7] = 'off'
|
||||||
with open(path_to_file2, 'w') as set_file3:
|
with open(wg_set, 'w') as set_file3:
|
||||||
set_file3.writelines(lines3)
|
set_file3.writelines(lines3)
|
||||||
|
|
||||||
tl = Tunnel.list()
|
tl = Tunnel.list()
|
||||||
@ -898,10 +916,10 @@ class FrameWidgets(ttk.Frame):
|
|||||||
self.wg_autostart.configure(state='disabled')
|
self.wg_autostart.configure(state='disabled')
|
||||||
|
|
||||||
if self.selected_option.get() >= 1:
|
if self.selected_option.get() >= 1:
|
||||||
with open(path_to_file2, 'r') as set_file3:
|
with open(wg_set, 'r') as set_file3:
|
||||||
lines3 = set_file3.readlines()
|
lines3 = set_file3.readlines()
|
||||||
lines3[7] = select_tl
|
lines3[7] = select_tl
|
||||||
with open(path_to_file2, 'w') as set_file3:
|
with open(wg_set, 'w') as set_file3:
|
||||||
set_file3.writelines(lines3)
|
set_file3.writelines(lines3)
|
||||||
|
|
||||||
except IndexError:
|
except IndexError:
|
||||||
@ -915,7 +933,7 @@ class FrameWidgets(ttk.Frame):
|
|||||||
Set (on), the selected tunnel is displayed in the label.
|
Set (on), the selected tunnel is displayed in the label.
|
||||||
At (off) the label is first emptied then filled with No Autoconnect
|
At (off) the label is first emptied then filled with No Autoconnect
|
||||||
"""
|
"""
|
||||||
with open(path_to_file2, 'r') as set_file4:
|
with open(wg_set, 'r') as set_file4:
|
||||||
lines4 = set_file4.readlines()
|
lines4 = set_file4.readlines()
|
||||||
|
|
||||||
if lines4[7] != 'off':
|
if lines4[7] != 'off':
|
||||||
@ -1021,7 +1039,7 @@ class FrameWidgets(ttk.Frame):
|
|||||||
def color_label(self):
|
def color_label(self):
|
||||||
""" View activ Tunnel in color green or yellow """
|
""" View activ Tunnel in color green or yellow """
|
||||||
|
|
||||||
with open(path_to_file2, 'r') as read_file:
|
with open(wg_set, 'r') as read_file:
|
||||||
lines = read_file.readlines()
|
lines = read_file.readlines()
|
||||||
if 'light\n' in lines:
|
if 'light\n' in lines:
|
||||||
self.lb_tunnel = ttk.Label(self, textvariable=self.StrVar, foreground='green')
|
self.lb_tunnel = ttk.Label(self, textvariable=self.StrVar, foreground='green')
|
||||||
@ -1083,7 +1101,7 @@ class FrameWidgets(ttk.Frame):
|
|||||||
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
||||||
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
||||||
wt = _('Select tunnel')
|
wt = _('Select tunnel')
|
||||||
msg_t = _('Please select a tunnel from the list.')
|
msg_t = _('Please select a tunnel from the list')
|
||||||
msg_window(iw, ii, wt, msg_t)
|
msg_window(iw, ii, wt, msg_t)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
@ -1092,14 +1110,14 @@ class FrameWidgets(ttk.Frame):
|
|||||||
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
iw = r'/usr/share/icons/lx-icons/64/info.png'
|
||||||
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
ii = r'/usr/share/icons/wp-icons/48/wg_msg.png'
|
||||||
wt = _('Select tunnel')
|
wt = _('Select tunnel')
|
||||||
msg_t = _('Please first import tunnel.')
|
msg_t = _('Please first import tunnel')
|
||||||
msg_window(iw, ii, wt, msg_t)
|
msg_window(iw, ii, wt, msg_t)
|
||||||
|
|
||||||
|
|
||||||
class MyToolTip(tk.Toplevel):
|
class MyToolTip(tk.Toplevel):
|
||||||
TIP_X_OFFSET = 20
|
TIP_X_OFFSET = 20
|
||||||
TIP_Y_OFFSET = 20
|
TIP_Y_OFFSET = 20
|
||||||
if not tips:
|
if not wg_tips:
|
||||||
AUTO_CLEAR_TIME = 0
|
AUTO_CLEAR_TIME = 0
|
||||||
else:
|
else:
|
||||||
AUTO_CLEAR_TIME = 2000 # Millisecond. (1/200 sec.)
|
AUTO_CLEAR_TIME = 2000 # Millisecond. (1/200 sec.)
|
||||||
|
Reference in New Issue
Block a user