Skip to content

Commit 456d5bf

Browse files
committed
- fixed final UI connections
- updated german translations
1 parent 1bce801 commit 456d5bf

File tree

9 files changed

+580
-568
lines changed

9 files changed

+580
-568
lines changed

main.py

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1113,26 +1113,20 @@ def __init__(self, parent=None):
11131113
})
11141114
self.logger.debug("Startup: [5/5] OK")
11151115
self.initialize_pornfetch()
1116-
if conf["Setup"]["activate_logging"] == "not_set":
1117-
self.switch_to_logging()
1118-
self.ui.button_server_enable_logging.setStyleSheet(self.stylesheets["button_green"])
1119-
self.ui.button_server_disable_logging.setStyleSheet(self.stylesheets["button_reset"])
1120-
self.ui.button_server_enable_logging.clicked.connect(self.enable_logging)
1121-
self.ui.button_server_disable_logging.clicked.connect(self.disable_logging)
11221116

11231117
def disable_logging(self):
11241118
conf["Setup"]["activate_logging"] = "false"
11251119
with open("config.ini", "w") as configuration:
11261120
conf.write(configuration)
11271121

1128-
self.switch_to_download()
1122+
self.initialize_pornfetch()
11291123

11301124
def enable_logging(self):
11311125
conf["Setup"]["activate_logging"] = "true"
11321126
with open("config.ini", "w") as configuration:
11331127
conf.write(configuration)
11341128

1135-
self.switch_to_download()
1129+
self.initialize_pornfetch()
11361130

11371131
"""
11381132
The following functions just switch the Stacked Widget to the different widgets
@@ -1202,7 +1196,7 @@ def switch_to_disclaimer(self):
12021196
self.ui.CentralStackedWidget.setCurrentIndex(10)
12031197

12041198
def switch_to_logging(self):
1205-
self.ui.CentralStackedWidget.setCurrentIndex(7)
1199+
self.ui.CentralStackedWidget.setCurrentIndex(11)
12061200

12071201
def load_style(self):
12081202
icons = {
@@ -1471,7 +1465,7 @@ def button_connections(self):
14711465
# Settings
14721466
self.ui.settings_button_apply.clicked.connect(self.save_user_settings)
14731467
self.ui.settings_button_reset.clicked.connect(reset_pornfetch)
1474-
self.ui.settings_button_system_install_pornfetch.clicked.connect(self.install_pornfetch)
1468+
self.ui.settings_button_system_install_pornfetch.clicked.connect(self.switch_to_install_dialog)
14751469
self.ui.settings_checkbox_system_activate_proxy.clicked.connect(self.set_proxies)
14761470
self.ui.button_install.clicked.connect(self.install_pornfetch)
14771471
self.ui.button_portable.clicked.connect(self.install_porn_fetch_portable)
@@ -1807,6 +1801,7 @@ def initialize_pornfetch(self):
18071801
if the License was shown and accepted, if the disclaimer text was shown, if the user downloaded the amount
18081802
of videos to show the sponsoring dialog and after all that switch to the main widget.
18091803
"""
1804+
global FORCE_PORTABLE_RUN
18101805
if not self.license.check_license():
18111806
self.switch_to_license()
18121807
return
@@ -1819,15 +1814,26 @@ def initialize_pornfetch(self):
18191814
self.switch_to_donation_nag()
18201815
return
18211816

1822-
self.ui.CentralStackedWidget.setCurrentIndex(0)
1823-
global FORCE_PORTABLE_RUN
1817+
if conf["Setup"]["activate_logging"] == "not_set":
1818+
self.handle_network_logging()
1819+
return
1820+
18241821
if not FORCE_PORTABLE_RUN:
18251822
if sys.platform == "darwin":
18261823
return
18271824

18281825
if conf["Setup"]["install"] == "unknown":
18291826
self.switch_to_install_dialog()
1827+
return
1828+
1829+
self.ui.CentralStackedWidget.setCurrentIndex(0)
18301830

1831+
def handle_network_logging(self):
1832+
self.switch_to_logging()
1833+
self.ui.button_server_enable_logging.setStyleSheet(self.stylesheets["button_green"])
1834+
self.ui.button_server_disable_logging.setStyleSheet(self.stylesheets["button_reset"])
1835+
self.ui.button_server_enable_logging.clicked.connect(self.enable_logging)
1836+
self.ui.button_server_disable_logging.clicked.connect(self.disable_logging)
18311837

18321838
def start_single_video(self):
18331839
"""

src/frontend/UI/form_main_window.ui

Lines changed: 82 additions & 82 deletions
Large diffs are not rendered by default.

src/frontend/UI/resources.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27385,11 +27385,11 @@
2738527385
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x03\x00\x00\x00\x07\
2738627386
\x00\x00\x00\x00\x00\x00\x00\x00\
2738727387
\x00\x00\x07r\x00\x00\x00\x00\x00\x01\x00\x06s\xbe\
27388-
\x00\x00\x01\x98\x8c\x07\x938\
27388+
\x00\x00\x01\x98\x8c2\xd4\xda\
2738927389
\x00\x00\x07\x82\x00\x00\x00\x00\x00\x01\x00\x06s\xe0\
27390-
\x00\x00\x01\x98\x8c\x07\x92t\
27390+
\x00\x00\x01\x98\x8c2\xd4\x10\
2739127391
\x00\x00\x07\x98\x00\x00\x00\x00\x00\x01\x00\x06\x97\xa4\
27392-
\x00\x00\x01\x98\x8c\x07\x92\xd8\
27392+
\x00\x00\x01\x98\x8c2\xd4v\
2739327393
\x00\x00\x07\x0e\x00\x02\x00\x00\x00\x01\x00\x00\x00\x0b\
2739427394
\x00\x00\x00\x00\x00\x00\x00\x00\
2739527395
\x00\x00\x07 \x00\x04\x00\x00\x00\x01\x00\x02=\xf4\

src/frontend/UI/ui_form_main_window.py

Lines changed: 65 additions & 65 deletions
Large diffs are not rendered by default.

src/frontend/translations/de_DE.qm

15.6 KB
Binary file not shown.

src/frontend/translations/de_DE.ts

Lines changed: 217 additions & 211 deletions
Large diffs are not rendered by default.

src/frontend/translations/en.ts

Lines changed: 65 additions & 65 deletions
Large diffs are not rendered by default.

src/frontend/translations/fr.ts

Lines changed: 65 additions & 65 deletions
Large diffs are not rendered by default.

src/frontend/translations/zh_CN.ts

Lines changed: 65 additions & 65 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)