Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implemented tkinter graphics on Linux #303

Merged
merged 6 commits into from
Jun 21, 2024
Merged

Implemented tkinter graphics on Linux #303

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8e4087d
Began tkinter implementation
sdasda7777 Jun 20, 2024
57aa316
Implemented rest of prompts using tkinter
sdasda7777 Jun 20, 2024
8926b5f
Fixed a typo, ordered elements into a grid
sdasda7777 Jun 21, 2024
9b6a0ac
`showinfo` -> `showwarning` in `alert`
sdasda7777 Jun 21, 2024
4d1a8de
Removed forgotten strings
sdasda7777 Jun 21, 2024
305d610
Added ok string
sdasda7777 Jun 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
262 changes: 163 additions & 99 deletions devices/linux/Files/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ class Messages:
cert_error = "Certificate file not found, looks like a CAT error"
unknown_version = "Unknown version"
dbus_error = "DBus connection problem, a sudo might help"
ok = "OK"
yes = "Y"
nay = "N"
p12_filter = "personal certificate file (p12 or pfx)"
Expand Down Expand Up @@ -351,23 +352,27 @@ def ask(self, question: str, prompt: str = '', default: bool = None) -> int:
return 0
if i == nay:
return 1
command = []
if self.graphics == "zenity":
command = ['zenity', '--title=' + Config.title, '--width=500',
'--question', '--text=' + question + "\n\n" + prompt]
elif self.graphics == 'kdialog':
command = ['kdialog', '--yesno', question + "\n\n" + prompt,
'--title=' + Config.title]
elif self.graphics == 'yad':
command = ['yad', '--image="dialog-question"',
'--button=gtk-yes:0',
'--button=gtk-no:1',
'--width=500',
'--wrap',
'--text=' + question + "\n\n" + prompt,
'--title=' + Config.title]
returncode = subprocess.call(command, stderr=subprocess.DEVNULL)
return returncode
elif self.graphics == 'tkinter':
from tkinter import messagebox
return 0 if messagebox.askyesno(Config.title, question + "\n\n" + prompt) else 1
else:
command = []
if self.graphics == "zenity":
command = ['zenity', '--title=' + Config.title, '--width=500',
'--question', '--text=' + question + "\n\n" + prompt]
elif self.graphics == 'kdialog':
command = ['kdialog', '--yesno', question + "\n\n" + prompt,
'--title=' + Config.title]
elif self.graphics == 'yad':
command = ['yad', '--image="dialog-question"',
'--button=gtk-yes:0',
'--button=gtk-no:1',
'--width=500',
'--wrap',
'--text=' + question + "\n\n" + prompt,
'--title=' + Config.title]
returncode = subprocess.call(command, stderr=subprocess.DEVNULL)
return returncode

def show_info(self, data: str) -> None:
"""
Expand All @@ -377,16 +382,19 @@ def show_info(self, data: str) -> None:
return
if self.graphics == 'tty':
print(data)
return
if self.graphics == "zenity":
command = ['zenity', '--info', '--width=500', '--text=' + data]
elif self.graphics == "kdialog":
command = ['kdialog', '--msgbox', data, '--title=' + Config.title]
elif self.graphics == "yad":
command = ['yad', '--button=OK', '--width=500', '--text=' + data]
elif self.graphics == 'tkinter':
from tkinter import messagebox
messagebox.showinfo(Config.title, data)
else:
sys.exit(1)
subprocess.call(command, stderr=subprocess.DEVNULL)
if self.graphics == "zenity":
command = ['zenity', '--info', '--width=500', '--text=' + data]
elif self.graphics == "kdialog":
command = ['kdialog', '--msgbox', data, '--title=' + Config.title]
elif self.graphics == "yad":
command = ['yad', '--button=OK', '--width=500', '--text=' + data]
else:
sys.exit(1)
subprocess.call(command, stderr=subprocess.DEVNULL)

def confirm_exit(self) -> None:
"""
Expand All @@ -402,16 +410,19 @@ def alert(self, text: str) -> None:
return
if self.graphics == 'tty':
print(text)
return
if self.graphics == 'zenity':
command = ['zenity', '--warning', '--text=' + text]
elif self.graphics == "kdialog":
command = ['kdialog', '--sorry', text, '--title=' + Config.title]
elif self.graphics == "yad":
command = ['yad', '--text=' + text]
elif self.graphics == 'tkinter':
from tkinter import messagebox
messagebox.showwarning(Config.title, text)
else:
sys.exit(1)
subprocess.call(command, stderr=subprocess.DEVNULL)
if self.graphics == 'zenity':
command = ['zenity', '--warning', '--text=' + text]
elif self.graphics == "kdialog":
command = ['kdialog', '--sorry', text, '--title=' + Config.title]
elif self.graphics == "yad":
command = ['yad', '--text=' + text]
else:
sys.exit(1)
subprocess.call(command, stderr=subprocess.DEVNULL)

def prompt_nonempty_string(self, show: int, prompt: str, val: str = '') -> str:
"""
Expand All @@ -429,82 +440,129 @@ def prompt_nonempty_string(self, show: int, prompt: str, val: str = '') -> str:
output = inp.strip()
if output != '':
return output
command = []
if self.graphics == 'zenity':
if val == '':
default_val = ''
else:
default_val = '--entry-text=' + val
if show == 0:
hide_text = '--hide-text'
else:
hide_text = ''
command = ['zenity', '--entry', hide_text, default_val,
'--width=500', '--text=' + prompt]
elif self.graphics == 'kdialog':
if show == 0:
hide_text = '--password'
else:
hide_text = '--inputbox'
command = ['kdialog', hide_text, prompt, '--title=' + Config.title]
elif self.graphics == 'yad':
if show == 0:
hide_text = ':H'
else:
hide_text = ''
command = ['yad', '--form', '--field=' + hide_text,
'--text=' + prompt, val]

output = ''
while not output:
shell_command = subprocess.Popen(command, stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
out, _ = shell_command.communicate()
output = out.decode('utf-8')
if self.graphics == 'yad':
output = output[:-2]
output = output.strip()
if shell_command.returncode == 1:
self.confirm_exit()
return output

def __get_username_password_atomic(self) -> None:
"""
use single form to get username, password and password confirmation
"""
output_fields_separator = "\n\n\n\n\n"
while True:
elif self.graphics == 'tkinter':
from tkinter import simpledialog
simpledialog.askstring(Config.title, prompt,
initialvalue=val,
show="*" if show == 0 else "")
else:
command = []
if self.graphics == 'zenity':
command = ['zenity', '--forms', '--width=500',
f"--title={Config.title}",
# f"--text={Messages.credentials_prompt}",
f"--add-entry={Messages.username_prompt}",
f"--add-password={Messages.enter_password}",
f"--add-password={Messages.repeat_password}",
"--separator", output_fields_separator]
if val == '':
default_val = ''
else:
default_val = '--entry-text=' + val
if show == 0:
hide_text = '--hide-text'
else:
hide_text = ''
command = ['zenity', '--entry', hide_text, default_val,
'--width=500', '--text=' + prompt]
elif self.graphics == 'kdialog':
if show == 0:
hide_text = '--password'
else:
hide_text = '--inputbox'
command = ['kdialog', hide_text, prompt, '--title=' + Config.title]
elif self.graphics == 'yad':
command = ['yad', '--form',
f"--title={Config.title}",
# f"--text={Messages.credentials_prompt}",
f"--field={Messages.username_prompt}", self.username,
f"--field={Messages.enter_password}:H",
f"--field={Messages.repeat_password}:H",
"--separator", output_fields_separator]
if show == 0:
hide_text = ':H'
else:
hide_text = ''
command = ['yad', '--form', '--field=' + hide_text,
'--text=' + prompt, val]

output = ''
while not output:
shell_command = subprocess.Popen(command, stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
stderr=subprocess.PIPE)
out, _ = shell_command.communicate()
output = out.decode('utf-8')
if self.graphics == 'yad':
output = output[:-(len(output_fields_separator)+1)]
output = output[:-2]
output = output.strip()
if shell_command.returncode == 1:
self.confirm_exit()
return output

if self.graphics in ('zenity', 'yad'):
self.username, password, password1 = output.split(output_fields_separator)
def __get_username_password_atomic(self) -> None:
"""
use single form to get username, password and password confirmation
"""
output_fields_separator = "\n\n\n\n\n"
while True:
password = "a"
password1 = "b"
if self.graphics == 'tkinter':
import tkinter as tk

root = tk.Tk()
root.title(Config.title)

# desc_label = tk.Label(root, text=Messages.credentials_prompt)
# desc_label.grid(row=0, column=0, columnspan=2, sticky=tk.W)

username_label = tk.Label(root, text=Messages.username_prompt)
username_label.grid(row=1, column=0, sticky=tk.W)

username_entry = tk.Entry(root, textvariable=tk.StringVar(root, value=self.username))
username_entry.grid(row=1, column=1)

password_label = tk.Label(root, text=Messages.enter_password)
password_label.grid(row=2, column=0, sticky=tk.W)

password_entry = tk.Entry(root, show="*")
password_entry.grid(row=2, column=1)

password1_label = tk.Label(root, text=Messages.repeat_password)
password1_label.grid(row=3, column=0, sticky=tk.W)

password1_entry = tk.Entry(root, show="*")
password1_entry.grid(row=3, column=1)

def submit(installer):
def inner():
nonlocal password, password1
(installer.username, password, password1) = (username_entry.get(), password_entry.get(), password1_entry.get())
root.destroy()
return inner

login_button = tk.Button(root, text=Messages.ok, command=submit(self))
login_button.grid(row=4, column=0, columnspan=2)

root.mainloop()
else:
if self.graphics == 'zenity':
command = ['zenity', '--forms', '--width=500',
f"--title={Config.title}",
# f"--text={Messages.credentials_prompt}",
f"--add-entry={Messages.username_prompt}",
f"--add-password={Messages.enter_password}",
f"--add-password={Messages.repeat_password}",
"--separator", output_fields_separator]
elif self.graphics == 'yad':
command = ['yad', '--form',
f"--title={Config.title}",
# f"--text={Messages.credentials_prompt}",
f"--field={Messages.username_prompt}", self.username,
f"--field={Messages.enter_password}:H",
f"--field={Messages.repeat_password}:H",
"--separator", output_fields_separator]

output = ''
while not output:
shell_command = subprocess.Popen(command, stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
out, _ = shell_command.communicate()
output = out.decode('utf-8')
if self.graphics == 'yad':
output = output[:-(len(output_fields_separator)+1)]
output = output.strip()
if shell_command.returncode == 1:
self.confirm_exit()

if self.graphics in ('zenity', 'yad'):
self.username, password, password1 = output.split(output_fields_separator)

if not self.__validate_user_name():
continue
Expand All @@ -531,7 +589,7 @@ def __get_username_password(self) -> None:
"""
if self.silent:
return
elif self.graphics in ('zenity', 'yad'):
elif self.graphics in ('tkinter', 'zenity', 'yad'):
self.__get_username_password_atomic()
else:
password = "a"
Expand Down Expand Up @@ -569,6 +627,12 @@ def __check_graphics(self, command) -> bool:

def __get_graphics_support(self) -> None:
if os.environ.get('DISPLAY') is not None:
try:
import tkinter
self.graphics = 'tkinter'
return
except ModuleNotFoundError:
pass
for cmd in ('yad', 'zenity', 'kdialog'):
if self.__check_graphics(cmd):
return
Expand Down
Loading