netinvent/npbackup
1
1
Fork 0
mirror of https://github.com/netinvent/npbackup.git synced 2024-09-20 14:56:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

GUI rework

Browse source
This commit is contained in:
Orsiris de Jong 2023-09-01 16:52:18 +02:00
parent 1ddf96d3d1
commit 2c07a6b2e4
1 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
npbackup/__main__.py
View file

@ -58,7 +58,6 @@ if Globvars.GUI:
from npbackup.gui.config import config_gui from npbackup.gui.config import config_gui
from npbackup.gui.operations import operations_gui from npbackup.gui.operations import operations_gui
from npbackup.gui.main import main_gui from npbackup.gui.main import main_gui
from npbackup.gui.minimize_window import minimize_current_window
sg.theme(PYSIMPLEGUI_THEME) sg.theme(PYSIMPLEGUI_THEME)
sg.SetOptions(icon=OEM_ICON) sg.SetOptions(icon=OEM_ICON)
@ -153,18 +152,19 @@ This is free software, and you are welcome to redistribute it under certain cond
help="Path to alternative configuration file", help="Path to alternative configuration file",
) )
parser.add_argument( if Globvars.GUI:
"--config-gui", parser.add_argument(
action="store_true", "--config-gui",
default=False, action="store_true",
help="Show configuration GUI", default=False,
) help="Show configuration GUI",
)
parser.add_argument( parser.add_argument(
"--operations-gui", "--operations-gui",
action="store_true", action="store_true",
help="Show operations GUI" help="Show operations GUI"
) )
parser.add_argument( parser.add_argument(
"-l", "--list", action="store_true", help="Show current snapshots" "-l", "--list", action="store_true", help="Show current snapshots"
@ -295,7 +295,7 @@ This is free software, and you are welcome to redistribute it under certain cond
CONFIG_FILE = args.config_file CONFIG_FILE = args.config_file
# Program entry # Program entry
if args.config_gui or args.operations_gui: if Globvars.GUI and (args.config_gui or args.operations_gui):
try: try:
config_dict = configuration.load_config(CONFIG_FILE) config_dict = configuration.load_config(CONFIG_FILE)
if not config_dict: if not config_dict:
@ -339,7 +339,6 @@ This is free software, and you are welcome to redistribute it under certain cond
config_dict = configuration.empty_config_dict config_dict = configuration.empty_config_dict
# If no arguments are passed, assume we are launching the GUI # If no arguments are passed, assume we are launching the GUI
if len(sys.argv) == 1: if len(sys.argv) == 1:
minimize_current_window()
try: try:
result = sg.Popup( result = sg.Popup(
"{}\n\n{}".format(message, _t("config_gui.create_new_config")), "{}\n\n{}".format(message, _t("config_gui.create_new_config")),
@ -359,6 +358,7 @@ This is free software, and you are welcome to redistribute it under certain cond
parser.print_help(sys.stderr) parser.print_help(sys.stderr)
sys.exit(1) sys.exit(1)
sys.exit(7) sys.exit(7)
elif not config_dict: elif not config_dict:
if len(sys.argv) == 1 and Globvars.GUI: if len(sys.argv) == 1 and Globvars.GUI:
sg.Popup(_t("config_gui.bogus_config_file", config_file=CONFIG_FILE)) sg.Popup(_t("config_gui.bogus_config_file", config_file=CONFIG_FILE))
@ -496,10 +496,6 @@ This is free software, and you are welcome to redistribute it under certain cond
sys.exit(21) sys.exit(21)
if Globvars.GUI: if Globvars.GUI:
# When no argument is given, let's run the GUI
# Also, let's minimize the commandline window so the GUI user isn't distracted
minimize_current_window()
logger.info("Running GUI")
try: try:
with pidfile.PIDFile(PID_FILE): with pidfile.PIDFile(PID_FILE):
try: try: