Cosmetic changes

This commit is contained in:
Orsiris de Jong 2023-12-29 12:44:07 +01:00
parent 1825e113da
commit f07c51df81
2 changed files with 14 additions and 14 deletions

View file

@ -36,8 +36,8 @@ ID_STRING = "__NPBACKUP__"
# PySimpleGUI theme
# Valid list: ['Black', 'BlueMono', 'BluePurple', 'BrightColors', 'BrownBlue', 'Dark', 'Dark2', 'DarkAmber', 'DarkBlack', 'DarkBlack1', 'DarkBlue', 'DarkBlue1', 'DarkBlue10', 'DarkBlue11', 'DarkBlue12', 'DarkBlue13', 'DarkBlue14', 'DarkBlue15', 'DarkBlue16', 'DarkBlue17', 'DarkBlue2', 'DarkBlue3', 'DarkBlue4', 'DarkBlue5', 'DarkBlue6', 'DarkBlue7', 'DarkBlue8', 'DarkBlue9', 'DarkBrown', 'DarkBrown1', 'DarkBrown2', 'DarkBrown3', 'DarkBrown4', 'DarkBrown5', 'DarkBrown6', 'DarkBrown7', 'DarkGreen', 'DarkGreen1', 'DarkGreen2', 'DarkGreen3', 'DarkGreen4', 'DarkGreen5', 'DarkGreen6', 'DarkGreen7', 'DarkGrey', 'DarkGrey1', 'DarkGrey10', 'DarkGrey11', 'DarkGrey12', 'DarkGrey13', 'DarkGrey14', 'DarkGrey15', 'DarkGrey2', 'DarkGrey3', 'DarkGrey4', 'DarkGrey5', 'DarkGrey6', 'DarkGrey7', 'DarkGrey8', 'DarkGrey9', 'DarkPurple', 'DarkPurple1', 'DarkPurple2', 'DarkPurple3', 'DarkPurple4', 'DarkPurple5', 'DarkPurple6', 'DarkPurple7', 'DarkRed', 'DarkRed1', 'DarkRed2', 'DarkTanBlue', 'DarkTeal', 'DarkTeal1', 'DarkTeal10', 'DarkTeal11', 'DarkTeal12', 'DarkTeal2', 'DarkTeal3', 'DarkTeal4', 'DarkTeal5', 'DarkTeal6', 'DarkTeal7', 'DarkTeal8', 'DarkTeal9', 'Default', 'Default1', 'DefaultNoMoreNagging', 'GrayGrayGray', 'Green', 'GreenMono', 'GreenTan', 'HotDogStand', 'Kayak', 'LightBlue', 'LightBlue1', 'LightBlue2', 'LightBlue3', 'LightBlue4', 'LightBlue5', 'LightBlue6', 'LightBlue7', 'LightBrown', 'LightBrown1', 'LightBrown10', 'LightBrown11', 'LightBrown12', 'LightBrown13', 'LightBrown2', 'LightBrown3', 'LightBrown4', 'LightBrown5', 'LightBrown6', 'LightBrown7', 'LightBrown8', 'LightBrown9', 'LightGray1', 'LightGreen', 'LightGreen1', 'LightGreen10', 'LightGreen2', 'LightGreen3', 'LightGreen4', 'LightGreen5', 'LightGreen6', 'LightGreen7', 'LightGreen8', 'LightGreen9', 'LightGrey', 'LightGrey1', 'LightGrey2', 'LightGrey3', 'LightGrey4', 'LightGrey5', 'LightGrey6', 'LightPurple', 'LightTeal', 'LightYellow', 'Material1', 'Material2', 'NeutralBlue', 'Purple', 'Python', 'PythonPlus', 'Reddit', 'Reds', 'SandyBeach', 'SystemDefault', 'SystemDefault1', 'SystemDefaultForReal', 'Tan', 'TanBlue', 'TealMono', 'Topanga']
PYSIMPLEGUI_THEME = "Reddit"
GUI_LOADER_COLOR = "#0079d3"
GUI_LOADER_TEXT_COLOR = "#FFFFFF"
BG_COLOR_LDR = "#0079d3"
TXT_COLOR_LDR = "#FFFFFF"
GUI_STATE_OK_BUTTON = ("#FFFFFF", "#0079d3")
GUI_STATE_OLD_BUTTON = ("white", "darkred")
GUI_STATE_UNKNOWN_BUTTON = ("white", "darkgrey")

View file

@ -19,8 +19,8 @@ import PySimpleGUI as sg
from npbackup.core.i18n_helper import _t
from npbackup.customization import (
LOADER_ANIMATION,
GUI_LOADER_COLOR,
GUI_LOADER_TEXT_COLOR,
BG_COLOR_LDR,
TXT_COLOR_LDR,
)
from npbackup.core.runner import NPBackupRunner
from npbackup.__debug__ import _DEBUG
@ -120,8 +120,8 @@ def gui_thread_runner(
sg.Text(
_t("main_gui.last_messages"),
key="-OPERATIONS-PROGRESS-STDOUT-TITLE-",
text_color=GUI_LOADER_TEXT_COLOR,
background_color=GUI_LOADER_COLOR,
text_color=TXT_COLOR_LDR,
background_color=BG_COLOR_LDR,
visible=not __compact,
)
],
@ -137,8 +137,8 @@ def gui_thread_runner(
sg.Text(
_t("main_gui.error_messages"),
key="-OPERATIONS-PROGRESS-STDERR-TITLE-",
text_color=GUI_LOADER_TEXT_COLOR,
background_color=GUI_LOADER_COLOR,
text_color=TXT_COLOR_LDR,
background_color=BG_COLOR_LDR,
visible=not __compact,
)
],
@ -153,28 +153,28 @@ def gui_thread_runner(
[
sg.Column(
[
[sg.Push(background_color=BG_COLOR_LDR), sg.Text("", key="--EXPAND--", enable_events=True, background_color=BG_COLOR_LDR, text_color=TXT_COLOR_LDR, visible=__compact)],
[
sg.Image(
LOADER_ANIMATION,
key="-LOADER-ANIMATION-",
background_color=GUI_LOADER_COLOR,
background_color=BG_COLOR_LDR,
visible=USE_THREADING,
)
],
[sg.Button(_t("generic.expand"), key="--EXPAND--", visible=__compact)],
[sg.Text("Debugging active", visible=not USE_THREADING)],
],
expand_x=True,
justification="C",
element_justification="C",
background_color=GUI_LOADER_COLOR,
background_color=BG_COLOR_LDR,
)
],
[
sg.Button(
_t("generic.close"),
key="--EXIT--",
button_color=(GUI_LOADER_TEXT_COLOR, GUI_LOADER_COLOR),
button_color=(TXT_COLOR_LDR, BG_COLOR_LDR),
)
],
]
@ -185,7 +185,7 @@ def gui_thread_runner(
progress_layout,
element_justification="C",
expand_x=True,
background_color=GUI_LOADER_COLOR,
background_color=BG_COLOR_LDR,
)
]
]
@ -196,7 +196,7 @@ def gui_thread_runner(
use_custom_titlebar=True,
grab_anywhere=True,
keep_on_top=True,
background_color=GUI_LOADER_COLOR,
background_color=BG_COLOR_LDR,
titlebar_icon=OEM_ICON,
)
# Finalize the window