Commit

src/ui/dialogs/EmptyPopupDialog.py

@@ -140,12 +140,11 @@ class EmptyPopupDialog (QDialog ):
 
     def __init__ (self ,app_base_dir ,parent_app_ref ,parent =None ):
         super ().__init__ (parent )
-        self .setMinimumSize (400 ,300 )
-        screen_height =QApplication .primaryScreen ().availableGeometry ().height ()if QApplication .primaryScreen ()else 768 
-        scale_factor =screen_height /768.0 
-        self .setMinimumSize (int (400 *scale_factor ),int (300 *scale_factor ))
+        self.parent_app = parent_app_ref
 
-        self .parent_app =parent_app_ref 
+        scale_factor = getattr(self.parent_app, 'scale_factor', 1.0)
+        
+        self.setMinimumSize(int(400 * scale_factor), int(300 * scale_factor))
         self.current_scope_mode = self.SCOPE_CREATORS
         self .app_base_dir =app_base_dir 
 

src/ui/dialogs/FutureSettingsDialog.py

@@ -1,119 +1,139 @@
 # --- Standard Library Imports ---
 import os
+import json
 
 # --- PyQt5 Imports ---
 from PyQt5.QtCore import Qt, QStandardPaths
 from PyQt5.QtWidgets import (
     QApplication, QDialog, QHBoxLayout, QLabel, QPushButton, QVBoxLayout,
-    QGroupBox, QComboBox, QMessageBox
+    QGroupBox, QComboBox, QMessageBox, QGridLayout
 )
 
 # --- Local Application Imports ---
-# This assumes the new project structure is in place.
 from ...i18n.translator import get_translation
 from ...utils.resolution import get_dark_theme
 from ..main_window import get_app_icon_object
 from ...config.constants import (
-    THEME_KEY, LANGUAGE_KEY, DOWNLOAD_LOCATION_KEY
+    THEME_KEY, LANGUAGE_KEY, DOWNLOAD_LOCATION_KEY,
+    RESOLUTION_KEY, UI_SCALE_KEY
 )
 
 
 class FutureSettingsDialog(QDialog):
     """
     A dialog for managing application-wide settings like theme, language,
-    and saving the default download path.
+    and display options, with an organized layout.
     """
     def __init__(self, parent_app_ref, parent=None):
-        """
-        Initializes the dialog.
-
-        Args:
-            parent_app_ref (DownloaderApp): A reference to the main application window.
-            parent (QWidget, optional): The parent widget. Defaults to None.
-        """
         super().__init__(parent)
         self.parent_app = parent_app_ref
         self.setModal(True)
 
-        # --- Basic Window Setup ---
         app_icon = get_app_icon_object()
         if app_icon and not app_icon.isNull():
             self.setWindowIcon(app_icon)
-        
-        # Set window size dynamically
-        screen_height = QApplication.primaryScreen().availableGeometry().height() if QApplication.primaryScreen() else 768
-        scale_factor = screen_height / 768.0
-        base_min_w, base_min_h = 380, 250
+
+        screen_height = QApplication.primaryScreen().availableGeometry().height() if QApplication.primaryScreen() else 800
+        scale_factor = screen_height / 800.0
+        base_min_w, base_min_h = 420, 320 # Adjusted height for new layout
         scaled_min_w = int(base_min_w * scale_factor)
         scaled_min_h = int(base_min_h * scale_factor)
         self.setMinimumSize(scaled_min_w, scaled_min_h)
 
-        # --- Initialize UI and Apply Theming ---
         self._init_ui()
         self._retranslate_ui()
         self._apply_theme()
 
     def _init_ui(self):
         """Initializes all UI components and layouts for the dialog."""
-        layout = QVBoxLayout(self)
+        main_layout = QVBoxLayout(self)
 
-        # --- Appearance Settings ---
-        self.appearance_group_box = QGroupBox()
-        appearance_layout = QVBoxLayout(self.appearance_group_box)
+        # --- Group 1: Interface Settings ---
+        self.interface_group_box = QGroupBox()
+        interface_layout = QGridLayout(self.interface_group_box)
+
+        # Theme
+        self.theme_label = QLabel()
         self.theme_toggle_button = QPushButton()
         self.theme_toggle_button.clicked.connect(self._toggle_theme)
-        appearance_layout.addWidget(self.theme_toggle_button)
-        layout.addWidget(self.appearance_group_box)
+        interface_layout.addWidget(self.theme_label, 0, 0)
+        interface_layout.addWidget(self.theme_toggle_button, 0, 1)
 
-        # --- Language Settings ---
-        self.language_group_box = QGroupBox()
-        language_group_layout = QVBoxLayout(self.language_group_box)
-        self.language_selection_layout = QHBoxLayout()
+        # UI Scale
+        self.ui_scale_label = QLabel()
+        self.ui_scale_combo_box = QComboBox()
+        self.ui_scale_combo_box.currentIndexChanged.connect(self._display_setting_changed)
+        interface_layout.addWidget(self.ui_scale_label, 1, 0)
+        interface_layout.addWidget(self.ui_scale_combo_box, 1, 1)
+        
+        # Language
         self.language_label = QLabel()
-        self.language_selection_layout.addWidget(self.language_label)
         self.language_combo_box = QComboBox()
         self.language_combo_box.currentIndexChanged.connect(self._language_selection_changed)
-        self.language_selection_layout.addWidget(self.language_combo_box, 1)
-        language_group_layout.addLayout(self.language_selection_layout)
-        layout.addWidget(self.language_group_box)
-        
-        # --- Download Settings ---
-        self.download_settings_group_box = QGroupBox()
-        download_settings_layout = QVBoxLayout(self.download_settings_group_box)
+        interface_layout.addWidget(self.language_label, 2, 0)
+        interface_layout.addWidget(self.language_combo_box, 2, 1)
+
+        main_layout.addWidget(self.interface_group_box)
+
+        # --- Group 2: Download & Window Settings ---
+        self.download_window_group_box = QGroupBox()
+        download_window_layout = QGridLayout(self.download_window_group_box)
+
+        # Window Size (Resolution)
+        self.window_size_label = QLabel()
+        self.resolution_combo_box = QComboBox()
+        self.resolution_combo_box.currentIndexChanged.connect(self._display_setting_changed)
+        download_window_layout.addWidget(self.window_size_label, 0, 0)
+        download_window_layout.addWidget(self.resolution_combo_box, 0, 1)
+
+        # Default Path
+        self.default_path_label = QLabel()
         self.save_path_button = QPushButton()
         self.save_path_button.clicked.connect(self._save_download_path)
-        download_settings_layout.addWidget(self.save_path_button)
-        layout.addWidget(self.download_settings_group_box)
+        download_window_layout.addWidget(self.default_path_label, 1, 0)
+        download_window_layout.addWidget(self.save_path_button, 1, 1)
 
-        layout.addStretch(1)
+        main_layout.addWidget(self.download_window_group_box)
+
+        main_layout.addStretch(1)
 
         # --- OK Button ---
         self.ok_button = QPushButton()
         self.ok_button.clicked.connect(self.accept)
-        layout.addWidget(self.ok_button, 0, Qt.AlignRight | Qt.AlignBottom)
+        main_layout.addWidget(self.ok_button, 0, Qt.AlignRight | Qt.AlignBottom)
 
     def _tr(self, key, default_text=""):
-        """Helper to get translation based on the main application's current language."""
         if callable(get_translation) and self.parent_app:
             return get_translation(self.parent_app.current_selected_language, key, default_text)
         return default_text
 
     def _retranslate_ui(self):
-        """Sets the text for all translatable UI elements."""
         self.setWindowTitle(self._tr("settings_dialog_title", "Settings"))
-        self.appearance_group_box.setTitle(self._tr("appearance_group_title", "Appearance"))
-        self.language_group_box.setTitle(self._tr("language_group_title", "Language Settings"))
-        self.download_settings_group_box.setTitle(self._tr("settings_download_group_title", "Download Settings"))
-        self.language_label.setText(self._tr("language_label", "Language:"))
-        self._update_theme_toggle_button_text()
-        self._populate_language_combo_box()
         
+        # Group Box Titles
+        self.interface_group_box.setTitle(self._tr("interface_group_title", "Interface Settings"))
+        self.download_window_group_box.setTitle(self._tr("download_window_group_title", "Download & Window Settings"))
+
+        # Interface Group Labels
+        self.theme_label.setText(self._tr("theme_label", "Theme:"))
+        self.ui_scale_label.setText(self._tr("ui_scale_label", "UI Scale:"))
+        self.language_label.setText(self._tr("language_label", "Language:"))
+        
+        # Download & Window Group Labels
+        self.window_size_label.setText(self._tr("window_size_label", "Window Size:"))
+        self.default_path_label.setText(self._tr("default_path_label", "Default Path:"))
+        
+        # Buttons and Controls
+        self._update_theme_toggle_button_text()
         self.save_path_button.setText(self._tr("settings_save_path_button", "Save Current Download Path"))
         self.save_path_button.setToolTip(self._tr("settings_save_path_tooltip", "Save the current 'Download Location' for future sessions."))
         self.ok_button.setText(self._tr("ok_button", "OK"))
 
+        # Populate dropdowns
+        self._populate_display_combo_boxes()
+        self._populate_language_combo_box()
+
     def _apply_theme(self):
-        """Applies the current theme from the parent application."""
         if self.parent_app and self.parent_app.current_theme == "dark":
             scale = getattr(self.parent_app, 'scale_factor', 1)
             self.setStyleSheet(get_dark_theme(scale))
@@ -121,53 +141,106 @@ class FutureSettingsDialog(QDialog):
             self.setStyleSheet("")
 
     def _update_theme_toggle_button_text(self):
-        """Updates the theme button text and tooltip based on the current theme."""
         if self.parent_app.current_theme == "dark":
             self.theme_toggle_button.setText(self._tr("theme_toggle_light", "Switch to Light Mode"))
-            self.theme_toggle_button.setToolTip(self._tr("theme_tooltip_light", "Change the application appearance to light."))
         else:
             self.theme_toggle_button.setText(self._tr("theme_toggle_dark", "Switch to Dark Mode"))
-            self.theme_toggle_button.setToolTip(self._tr("theme_tooltip_dark", "Change the application appearance to dark."))
 
     def _toggle_theme(self):
-        """Toggles the application theme and updates the UI."""
         new_theme = "light" if self.parent_app.current_theme == "dark" else "dark"
-        self.parent_app.apply_theme(new_theme)
-        self._retranslate_ui()
+        self.parent_app.settings.setValue(THEME_KEY, new_theme)
+        self.parent_app.settings.sync()
+        self.parent_app.current_theme = new_theme
         self._apply_theme()
+        if hasattr(self.parent_app, '_apply_theme_and_restart_prompt'):
+            self.parent_app._apply_theme_and_restart_prompt()
+
+    def _populate_display_combo_boxes(self):
+        self.resolution_combo_box.blockSignals(True)
+        self.resolution_combo_box.clear()
+        resolutions = [
+            ("Auto", self._tr("auto_resolution", "Auto (System Default)")),
+            ("1280x720", "1280 x 720"),
+            ("1600x900", "1600 x 900"),
+            ("1920x1080", "1920 x 1080 (Full HD)"),
+            ("2560x1440", "2560 x 1440 (2K)"),
+            ("3840x2160", "3840 x 2160 (4K)")
+        ]
+        current_res = self.parent_app.settings.value(RESOLUTION_KEY, "Auto")
+        for res_key, res_name in resolutions:
+            self.resolution_combo_box.addItem(res_name, res_key)
+            if current_res == res_key:
+                self.resolution_combo_box.setCurrentIndex(self.resolution_combo_box.count() - 1)
+        self.resolution_combo_box.blockSignals(False)
+
+        self.ui_scale_combo_box.blockSignals(True)
+        self.ui_scale_combo_box.clear()
+        scales = [
+            (0.5, "50%"),
+            (0.7, "70%"),
+            (0.9, "90%"),
+            (1.0, "100% (Default)"),
+            (1.25, "125%"),
+            (1.50, "150%"),
+            (1.75, "175%"),
+            (2.0, "200%")
+        ]
+
+        current_scale = float(self.parent_app.settings.value(UI_SCALE_KEY, 1.0))
+        for scale_val, scale_name in scales:
+            self.ui_scale_combo_box.addItem(scale_name, scale_val)
+            if abs(current_scale - scale_val) < 0.01:
+                self.ui_scale_combo_box.setCurrentIndex(self.ui_scale_combo_box.count() - 1)
+        self.ui_scale_combo_box.blockSignals(False)
+
+    def _display_setting_changed(self):
+        selected_res = self.resolution_combo_box.currentData()
+        selected_scale = self.ui_scale_combo_box.currentData()
+
+        self.parent_app.settings.setValue(RESOLUTION_KEY, selected_res)
+        self.parent_app.settings.setValue(UI_SCALE_KEY, selected_scale)
+        self.parent_app.settings.sync()
+
+        msg_box = QMessageBox(self)
+        msg_box.setIcon(QMessageBox.Information)
+        msg_box.setWindowTitle(self._tr("display_change_title", "Display Settings Changed"))
+        msg_box.setText(self._tr("language_change_message", "A restart is required for these changes to take effect."))
+        msg_box.setInformativeText(self._tr("language_change_informative", "Would you like to restart now?"))
+        restart_button = msg_box.addButton(self._tr("restart_now_button", "Restart Now"), QMessageBox.ApplyRole)
+        ok_button = msg_box.addButton(self._tr("ok_button", "OK"), QMessageBox.AcceptRole)
+        msg_box.setDefaultButton(ok_button)
+        msg_box.exec_()
+
+        if msg_box.clickedButton() == restart_button:
+            self.parent_app._request_restart_application()
 
     def _populate_language_combo_box(self):
-        """Populates the language dropdown with available languages."""
         self.language_combo_box.blockSignals(True)
         self.language_combo_box.clear()
         languages = [
-        ("en","English"),
-        ("ja","日本語 (Japanese)"),
-        ("fr","Français (French)"),
-        ("de","Deutsch (German)"),
-        ("es","Español (Spanish)"),
-        ("pt","Português (Portuguese)"),
-        ("ru","Русский (Russian)"),
-        ("zh_CN","简体中文 (Simplified Chinese)"),
-        ("zh_TW","繁體中文 (Traditional Chinese)"),
-        ("ko","한국어 (Korean)")
+            ("en", "English"), ("ja", "日本語 (Japanese)"), ("fr", "Français (French)"),
+            ("de", "Deutsch (German)"), ("es", "Español (Spanish)"), ("pt", "Português (Portuguese)"),
+            ("ru", "Русский (Russian)"), ("zh_CN", "简体中文 (Simplified Chinese)"),
+            ("zh_TW", "繁體中文 (Traditional Chinese)"), ("ko", "한국어 (Korean)")
         ]
+        current_lang = self.parent_app.current_selected_language
         for lang_code, lang_name in languages:
             self.language_combo_box.addItem(lang_name, lang_code)
-            if self.parent_app.current_selected_language == lang_code:
+            if current_lang == lang_code:
                 self.language_combo_box.setCurrentIndex(self.language_combo_box.count() - 1)
         self.language_combo_box.blockSignals(False)
 
     def _language_selection_changed(self, index):
-        """Handles the user selecting a new language."""
         selected_lang_code = self.language_combo_box.itemData(index)
         if selected_lang_code and selected_lang_code != self.parent_app.current_selected_language:
-            self.parent_app.current_selected_language = selected_lang_code
             self.parent_app.settings.setValue(LANGUAGE_KEY, selected_lang_code)
             self.parent_app.settings.sync()
+            self.parent_app.current_selected_language = selected_lang_code
             
             self._retranslate_ui()
-
+            if hasattr(self.parent_app, '_retranslate_main_ui'):
+                 self.parent_app._retranslate_main_ui()
+            
             msg_box = QMessageBox(self)
             msg_box.setIcon(QMessageBox.Information)
             msg_box.setWindowTitle(self._tr("language_change_title", "Language Changed"))
@@ -182,23 +255,21 @@ class FutureSettingsDialog(QDialog):
                 self.parent_app._request_restart_application()
 
     def _save_download_path(self):
-        """Saves the current download path from the main window to settings."""
         if hasattr(self.parent_app, 'dir_input') and self.parent_app.dir_input:
             current_path = self.parent_app.dir_input.text().strip()
-            if current_path:
-                if os.path.isdir(current_path):
-                    self.parent_app.settings.setValue(DOWNLOAD_LOCATION_KEY, current_path)
-                    self.parent_app.settings.sync()
-                    QMessageBox.information(self,
-                        self._tr("settings_save_path_success_title", "Path Saved"),
-                        self._tr("settings_save_path_success_message", "Download location '{path}' saved.").format(path=current_path))
-                else:
-                    QMessageBox.warning(self,
-                        self._tr("settings_save_path_invalid_title", "Invalid Path"),
-                        self._tr("settings_save_path_invalid_message", "The path '{path}' is not a valid directory.").format(path=current_path))
-            else:
-                QMessageBox.warning(self,
+            if current_path and os.path.isdir(current_path):
+                self.parent_app.settings.setValue(DOWNLOAD_LOCATION_KEY, current_path)
+                self.parent_app.settings.sync()
+                QMessageBox.information(self,
+                    self._tr("settings_save_path_success_title", "Path Saved"),
+                    self._tr("settings_save_path_success_message", "Download location '{path}' saved.").format(path=current_path))
+            elif not current_path:
+                 QMessageBox.warning(self,
                     self._tr("settings_save_path_empty_title", "Empty Path"),
                     self._tr("settings_save_path_empty_message", "Download location cannot be empty."))
+            else:
+                QMessageBox.warning(self,
+                    self._tr("settings_save_path_invalid_title", "Invalid Path"),
+                    self._tr("settings_save_path_invalid_message", "The path '{path}' is not a valid directory.").format(path=current_path))
         else:
-            QMessageBox.critical(self, "Error", "Could not access download path input from main application.")
+            QMessageBox.critical(self, "Error", "Could not access download path input from main application.")

src/ui/main_window.py

@@ -101,18 +101,22 @@ class DownloaderApp (QWidget ):
     def __init__(self):
         super().__init__()
         self.settings = QSettings(CONFIG_ORGANIZATION_NAME, CONFIG_APP_NAME_MAIN)
-        
-        # --- CORRECT PATH DEFINITION ---
-        # This block correctly determines the application's base directory whether
-        # it's running from source or as a frozen executable.
+        self.is_finishing = False 
+
+        saved_res = self.settings.value(RESOLUTION_KEY, "Auto")
+        if saved_res != "Auto":
+            try:
+                width, height = map(int, saved_res.split('x'))
+                self.resize(width, height)
+                self._center_on_screen() 
+            except ValueError:
+                self.log_signal.emit(f"⚠️ Invalid saved resolution '{saved_res}'. Using default.")
+
         if getattr(sys, 'frozen', False) and hasattr(sys, '_MEIPASS'):
-             # Path for PyInstaller one-file bundle
             self.app_base_dir = os.path.dirname(sys.executable)
         else:
-            # Path for running from source code
             self.app_base_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
 
-        # All file paths will now correctly use the single, correct app_base_dir
         self.config_file = os.path.join(self.app_base_dir, "appdata", "Known.txt")
         self.session_file_path = os.path.join(self.app_base_dir, "appdata", "session.json")
         self.persistent_history_file = os.path.join(self.app_base_dir, "appdata", "download_history.json")
@@ -272,6 +276,28 @@ class DownloaderApp (QWidget ):
         self._update_button_states_and_connections()
         self._check_for_interrupted_session()
 
+    def _apply_theme_and_restart_prompt(self):
+        """Applies the theme and prompts the user to restart."""
+        if self.current_theme == "dark":
+            scale = getattr(self, 'scale_factor', 1)
+            self.setStyleSheet(get_dark_theme(scale))
+        else:
+            self.setStyleSheet("")
+
+        # Prompt for restart
+        msg_box = QMessageBox(self)
+        msg_box.setIcon(QMessageBox.Information)
+        msg_box.setWindowTitle(self._tr("theme_change_title", "Theme Changed"))
+        msg_box.setText(self._tr("language_change_message", "A restart is required for these changes to take effect."))
+        msg_box.setInformativeText(self._tr("language_change_informative", "Would you like to restart now?"))
+        restart_button = msg_box.addButton(self._tr("restart_now_button", "Restart Now"), QMessageBox.ApplyRole)
+        ok_button = msg_box.addButton(self._tr("ok_button", "OK"), QMessageBox.AcceptRole)
+        msg_box.setDefaultButton(ok_button)
+        msg_box.exec_()
+
+        if msg_box.clickedButton() == restart_button:
+            self._request_restart_application()
+
     def _create_initial_session_file(self, api_url_for_session, override_output_dir_for_session): # ADD override_output_dir_for_session
         """Creates the initial session file at the start of a new download."""
         if self.is_restore_pending:
@@ -2602,6 +2628,7 @@ class DownloaderApp (QWidget ):
             self .file_progress_label .setText ("")
 
     def start_download(self, direct_api_url=None, override_output_dir=None, is_restore=False):
+        self.is_finishing = False 
         global KNOWN_NAMES, BackendDownloadThread, PostProcessorWorker, extract_post_info, clean_folder_name, MAX_FILE_THREADS_PER_POST_OR_WORKER
 
         self._clear_stale_temp_files()
@@ -3521,9 +3548,7 @@ class DownloaderApp (QWidget ):
         except Exception as e:
             self.log_signal.emit(f"❌ Error in _handle_worker_result: {e}\n{traceback.format_exc(limit=2)}")
         
-        # Check if all submitted tasks are complete
         if not self.is_fetcher_thread_running and self.processed_posts_count >= self.total_posts_to_process:
-            self.log_signal.emit("🏁 All fetcher and worker tasks complete.")
             self.finished_signal.emit(self.download_counter, self.skip_counter, self.cancellation_event.is_set(), self.all_kept_original_filenames)
 
     def _trigger_single_pdf_creation(self):
@@ -3850,6 +3875,7 @@ class DownloaderApp (QWidget ):
         self ._filter_links_log ()
 
     def cancel_download_button_action (self ):
+        self.is_finishing = True
         if not self .cancel_btn .isEnabled ()and not self .cancellation_event .is_set ():self .log_signal .emit ("ℹ️ No active download to cancel or already cancelling.");return 
         self .log_signal .emit ("⚠️ Requesting cancellation of download process (soft reset)...")
 
@@ -3903,6 +3929,12 @@ class DownloaderApp (QWidget ):
         return "kemono.su"
 
     def download_finished (self ,total_downloaded ,total_skipped ,cancelled_by_user ,kept_original_names_list =None ):
+        if self.is_finishing:
+            return
+        self.is_finishing = True
+        
+        self.log_signal.emit("🏁 All fetcher and worker tasks complete.")
+
         if kept_original_names_list is None :
             kept_original_names_list =list (self .all_kept_original_filenames )if hasattr (self ,'all_kept_original_filenames')else []
         if kept_original_names_list is None :
@@ -3940,7 +3972,7 @@ class DownloaderApp (QWidget ):
             self.single_pdf_setting = False
 
         # Reset session state for the next run
-        self.session_text_content = [] 
+        self.session_temp_files = [] 
         self.single_pdf_setting = False
 
         if kept_original_names_list :
@@ -4029,7 +4061,8 @@ class DownloaderApp (QWidget ):
                 self ._process_next_favorite_download ()
         else :
             self .set_ui_enabled (True )
-        self .cancellation_message_logged_this_session =False 
+        self .cancellation_message_logged_this_session =False
+
 
     def _handle_thumbnail_mode_change (self ,thumbnails_checked ):
         """Handles UI changes when 'Download Thumbnails Only' is toggled."""