Commit

src/ui/dialogs/CookieHelpDialog.py

@@ -16,7 +16,6 @@ class CookieHelpDialog(QDialog):
     It can be displayed as a simple informational popup or as a modal choice
     when cookies are required but not found.
     """
-    # Constants to define the user's choice from the dialog
     CHOICE_PROCEED_WITHOUT_COOKIES = 1
     CHOICE_CANCEL_DOWNLOAD = 2
     CHOICE_OK_INFO_ONLY = 3
@@ -64,7 +63,6 @@ class CookieHelpDialog(QDialog):
         button_layout.addStretch(1)
 
         if self.offer_download_without_option:
-            # Add buttons for making a choice
             self.download_without_button = QPushButton()
             self.download_without_button.clicked.connect(self._proceed_without_cookies)
             button_layout.addWidget(self.download_without_button)
@@ -73,7 +71,6 @@ class CookieHelpDialog(QDialog):
             self.cancel_button.clicked.connect(self._cancel_download)
             button_layout.addWidget(self.cancel_button)
         else:
-            # Add a simple OK button for informational display
             self.ok_button = QPushButton()
             self.ok_button.clicked.connect(self._ok_info_only)
             button_layout.addWidget(self.ok_button)

src/ui/dialogs/CustomFilenameDialog.py

@@ -0,0 +1,89 @@
+from PyQt5.QtWidgets import (
+    QDialog, QVBoxLayout, QHBoxLayout, QLabel, QLineEdit, QPushButton, 
+    QDialogButtonBox, QTextEdit
+)
+from PyQt5.QtCore import Qt
+
+class CustomFilenameDialog(QDialog):
+    """A dialog for creating a custom filename format string."""
+    
+    # --- REPLACE THE 'AVAILABLE_KEYS' LIST WITH THIS DICTIONARY ---
+    DISPLAY_KEY_MAP = {
+        "PostID": "id",
+        "CreatorName": "creator_name",  
+        "service": "service",
+        "title": "title",
+        "added": "added",
+        "published": "published",
+        "edited": "edited",
+        "name": "name"
+    }
+
+    def __init__(self, current_format, current_date_format, parent=None):
+        super().__init__(parent)
+        self.setWindowTitle("Custom Filename Format")
+        self.setMinimumWidth(500)
+
+        self.current_format = current_format
+        self.current_date_format = current_date_format
+        
+        # --- Main Layout ---
+        layout = QVBoxLayout(self)
+
+        # --- Description ---
+        description_label = QLabel(
+            "Create a filename format using placeholders. The date/time values for 'added', 'published', and 'edited' will be automatically shortened to your specified format."
+        )
+        description_label.setWordWrap(True)
+        layout.addWidget(description_label)
+        
+        # --- Format Input ---
+        format_label = QLabel("Filename Format:")
+        layout.addWidget(format_label)
+        self.format_input = QLineEdit(self)
+        self.format_input.setText(self.current_format)
+        self.format_input.setPlaceholderText("e.g., {published} {title} {id}")
+        layout.addWidget(self.format_input)
+
+        # --- Date Format Input ---
+        date_format_label = QLabel("Date Format (for {added}, {published}, {edited}):")
+        layout.addWidget(date_format_label)
+        self.date_format_input = QLineEdit(self)
+        self.date_format_input.setText(self.current_date_format)
+        self.date_format_input.setPlaceholderText("e.g., YYYY-MM-DD or DD-MM-YYYY")
+        layout.addWidget(self.date_format_input)
+
+        # --- Available Keys Display ---
+        keys_label = QLabel("Click to add a placeholder:")
+        layout.addWidget(keys_label)
+        
+        keys_layout = QHBoxLayout()
+        keys_layout.setSpacing(5)
+        
+        for display_key, internal_key in self.DISPLAY_KEY_MAP.items():
+            key_button = QPushButton(f"{{{display_key}}}")
+            # Use a lambda to pass the correct internal key when the button is clicked
+            key_button.clicked.connect(lambda checked, key=internal_key: self.add_key_to_input(key))
+            keys_layout.addWidget(key_button)
+        keys_layout.addStretch()
+
+        layout.addLayout(keys_layout)
+        
+        # --- OK/Cancel Buttons ---
+        button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+        button_box.accepted.connect(self.accept)
+        button_box.rejected.connect(self.reject)
+        layout.addWidget(button_box)
+
+    def add_key_to_input(self, key_to_insert):
+        """Adds the corresponding internal key placeholder to the input field."""
+        self.format_input.insert(f" {{{key_to_insert}}} ")
+        self.format_input.setFocus()
+
+    def get_format_string(self):
+        """Returns the final format string from the input field."""
+        return self.format_input.text().strip()
+
+    def get_date_format_string(self):
+        """Returns the date format string from its input field."""
+        return self.date_format_input.text().strip()

src/ui/dialogs/ErrorFilesDialog.py

@@ -2,49 +2,34 @@
 from PyQt5.QtCore import pyqtSignal, Qt
 from PyQt5.QtWidgets import (
     QApplication, QDialog, QHBoxLayout, QLabel, QListWidget, QListWidgetItem,
-    QMessageBox, QPushButton, QVBoxLayout, QAbstractItemView, QFileDialog
+    QMessageBox, QPushButton, QVBoxLayout, QAbstractItemView, QFileDialog, QCheckBox
 )
 
 # --- Local Application Imports ---
 from ...i18n.translator import get_translation
 from ..assets import get_app_icon_object
-# Corrected Import: The filename uses PascalCase.
 from .ExportOptionsDialog import ExportOptionsDialog
 from ...utils.resolution import get_dark_theme
+from ...config.constants import AUTO_RETRY_ON_FINISH_KEY
 
 class ErrorFilesDialog(QDialog):
     """
     Dialog to display files that were skipped due to errors and
     allows the user to retry downloading them or export the list of URLs.
     """
-
-    # Signal emitted with a list of file info dictionaries to retry
     retry_selected_signal = pyqtSignal(list)
 
     def __init__(self, error_files_info_list, parent_app, parent=None):
-        """
-        Initializes the dialog.
-
-        Args:
-            error_files_info_list (list): A list of dictionaries, each containing
-                                          info about a failed file.
-            parent_app (DownloaderApp): A reference to the main application window
-                                      for theming and translations.
-            parent (QWidget, optional): The parent widget. Defaults to None.
-        """
         super().__init__(parent)
         self.parent_app = parent_app
         self.setModal(True)
         self.error_files = error_files_info_list
-
-        # --- Basic Window Setup ---
         app_icon = get_app_icon_object()
         if app_icon and not app_icon.isNull():
             self.setWindowIcon(app_icon)
 
         scale_factor = getattr(self.parent_app, 'scale_factor', 1.0)
-
-        base_width, base_height = 550, 400
+        base_width, base_height = 600, 450
         self.setMinimumSize(int(base_width * scale_factor), int(base_height * scale_factor))
         self.resize(int(base_width * scale_factor * 1.1), int(base_height * scale_factor * 1.1))
 
@@ -53,21 +38,19 @@ class ErrorFilesDialog(QDialog):
         self._apply_theme()
 
     def _init_ui(self):
-        """Initializes all UI components and layouts for the dialog."""
         main_layout = QVBoxLayout(self)
-
         self.info_label = QLabel()
         self.info_label.setWordWrap(True)
         main_layout.addWidget(self.info_label)
 
-        if self.error_files:
-            self.files_list_widget = QListWidget()
-            self.files_list_widget.setSelectionMode(QAbstractItemView.NoSelection)
-            self._populate_list()
-            main_layout.addWidget(self.files_list_widget)
+        self.files_list_widget = QListWidget()
+        self.files_list_widget.setSelectionMode(QAbstractItemView.ExtendedSelection)
+        main_layout.addWidget(self.files_list_widget)
+        self._populate_list()
 
         # --- Control Buttons ---
         buttons_layout = QHBoxLayout()
+
         self.select_all_button = QPushButton()
         self.select_all_button.clicked.connect(self._select_all_items)
         buttons_layout.addWidget(self.select_all_button)
@@ -76,104 +59,170 @@ class ErrorFilesDialog(QDialog):
         self.retry_button.clicked.connect(self._handle_retry_selected)
         buttons_layout.addWidget(self.retry_button)
 
+        self.load_button = QPushButton()
+        self.load_button.clicked.connect(self._handle_load_errors_from_txt)
+        buttons_layout.addWidget(self.load_button)
+
         self.export_button = QPushButton()
         self.export_button.clicked.connect(self._handle_export_errors_to_txt)
         buttons_layout.addWidget(self.export_button)
+        
+        # The stretch will push everything added after this point to the right
         buttons_layout.addStretch(1)
 
+        # --- MOVED: Auto Retry Checkbox ---
+        self.auto_retry_checkbox = QCheckBox()
+        auto_retry_enabled = self.parent_app.settings.value(AUTO_RETRY_ON_FINISH_KEY, False, type=bool)
+        self.auto_retry_checkbox.setChecked(auto_retry_enabled)
+        self.auto_retry_checkbox.toggled.connect(self._save_auto_retry_setting)
+        buttons_layout.addWidget(self.auto_retry_checkbox)
+        # --- END ---
+        
         self.ok_button = QPushButton()
         self.ok_button.clicked.connect(self.accept)
         self.ok_button.setDefault(True)
         buttons_layout.addWidget(self.ok_button)
         main_layout.addLayout(buttons_layout)
 
-        # Enable/disable buttons based on whether there are errors
         has_errors = bool(self.error_files)
         self.select_all_button.setEnabled(has_errors)
         self.retry_button.setEnabled(has_errors)
         self.export_button.setEnabled(has_errors)
 
     def _populate_list(self):
-        """Populates the list widget with details of the failed files."""
+        self.files_list_widget.clear()
         for error_info in self.error_files:
-            filename = error_info.get('forced_filename_override',
-                                      error_info.get('file_info', {}).get('name', 'Unknown Filename'))
-            post_title = error_info.get('post_title', 'Unknown Post')
-            post_id = error_info.get('original_post_id_for_log', 'N/A')
+            self._add_item_to_list(error_info)
 
-            creator_name = "Unknown Creator"
-            service = error_info.get('service')
-            user_id = error_info.get('user_id')
+    def _handle_load_errors_from_txt(self):
+        """Opens a file dialog to load URLs from a .txt file."""
+        import re
+        
+        filepath, _ = QFileDialog.getOpenFileName(
+            self,
+            self._tr("error_files_load_dialog_title", "Load Error File URLs"),
+            "",
+            "Text Files (*.txt);;All Files (*)"
+        )
+
+        if not filepath:
+            return
+
+        try:
+            detailed_pattern = re.compile(r"^(https?://[^\s]+)\s*\[Post: '(.*?)' \(ID: (.*?)\), File: '(.*?)'\]$")
+            simple_pattern = re.compile(r'^(https?://[^\s]+)')
+
+            with open(filepath, 'r', encoding='utf-8') as f:
+                for line in f:
+                    line = line.strip()
+                    if not line: continue
+                    
+                    url, post_title, post_id, filename = None, 'Loaded from .txt', 'N/A', None
+                    
+                    detailed_match = detailed_pattern.match(line)
+                    if detailed_match:
+                        url, post_title, post_id, filename = detailed_match.groups()
+                    else:
+                        simple_match = simple_pattern.match(line)
+                        if simple_match:
+                            url = simple_match.group(1)
+                            filename = url.split('/')[-1]
+
+                    if url:
+                        simple_error_info = {
+                            'is_loaded_from_txt': True, 'file_info': {'url': url, 'name': filename},
+                            'post_title': post_title, 'original_post_id_for_log': post_id,
+                            'target_folder_path': self.parent_app.dir_input.text().strip(),
+                            'forced_filename_override': filename, 'file_index_in_post': 0,
+                            'num_files_in_this_post': 1, 'service': None, 'user_id': None, 'api_url_input': ''
+                        }
+                        self.error_files.append(simple_error_info)
+                        self._add_item_to_list(simple_error_info)
             
-            # Check if we have the necessary info and access to the cache
-            if service and user_id and hasattr(self.parent_app, 'creator_name_cache'):
-                creator_key = (service.lower(), str(user_id))
-                # Look up the name, fall back to the user_id if not found
-                creator_name = self.parent_app.creator_name_cache.get(creator_key, user_id)
-
-            item_text = f"File: {filename}\nCreator: {creator_name} - Post: '{post_title}' (ID: {post_id})"
-            list_item = QListWidgetItem(item_text)
-            list_item.setData(Qt.UserRole, error_info)
-            list_item.setFlags(list_item.flags() | Qt.ItemIsUserCheckable)
-            list_item.setCheckState(Qt.Unchecked)
-            self.files_list_widget.addItem(list_item)
+            self.info_label.setText(self._tr("error_files_found_label", "The following {count} file(s)...").format(count=len(self.error_files)))
+            
+            has_errors = bool(self.error_files)
+            self.select_all_button.setEnabled(has_errors)
+            self.retry_button.setEnabled(has_errors)
+            self.export_button.setEnabled(has_errors)
+            
+        except Exception as e:
+            QMessageBox.critical(self, self._tr("error_files_load_error_title", "Load Error"),
+                                 self._tr("error_files_load_error_message", "Could not load or parse the file: {error}").format(error=str(e)))
 
     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("error_files_dialog_title", "Files Skipped Due to Errors"))
         if not self.error_files:
             self.info_label.setText(self._tr("error_files_no_errors_label", "No files were recorded as skipped..."))
         else:
             self.info_label.setText(self._tr("error_files_found_label", "The following {count} file(s)...").format(count=len(self.error_files)))
 
-        self.select_all_button.setText(self._tr("error_files_select_all_button", "Select All"))
+        self.auto_retry_checkbox.setText(self._tr("error_files_auto_retry_checkbox", "Auto Retry at End"))
+        self.select_all_button.setText(self._tr("error_files_select_all_button", "Select/Deselect All"))
         self.retry_button.setText(self._tr("error_files_retry_selected_button", "Retry Selected"))
+        self.load_button.setText(self._tr("error_files_load_urls_button", "Load URLs from .txt"))       
         self.export_button.setText(self._tr("error_files_export_urls_button", "Export URLs to .txt"))
         self.ok_button.setText(self._tr("ok_button", "OK"))
 
     def _apply_theme(self):
-        """Applies the current theme from the parent application."""
         if self.parent_app and self.parent_app.current_theme == "dark":
-            # Get the scale factor from the parent app
             scale = getattr(self.parent_app, 'scale_factor', 1)
-            # Call the imported function with the correct scale
             self.setStyleSheet(get_dark_theme(scale))
         else:
-            # Explicitly set a blank stylesheet for light mode
             self.setStyleSheet("")
 
+    def _save_auto_retry_setting(self, checked):
+        """Saves the state of the auto-retry checkbox to QSettings."""
+        self.parent_app.settings.setValue(AUTO_RETRY_ON_FINISH_KEY, checked)
+
+    def _add_item_to_list(self, error_info):
+        """Creates and adds a single QListWidgetItem based on error_info content."""
+        if error_info.get('is_loaded_from_txt'):
+            filename = error_info.get('file_info', {}).get('name', 'Unknown Filename')
+            post_title = error_info.get('post_title', 'N/A')
+            post_id = error_info.get('original_post_id_for_log', 'N/A')
+            item_text = f"File: {filename}\nPost: '{post_title}' (ID: {post_id}) [Loaded from .txt]"
+        else:
+            filename = error_info.get('forced_filename_override', error_info.get('file_info', {}).get('name', 'Unknown Filename'))
+            post_title = error_info.get('post_title', 'Unknown Post')
+            post_id = error_info.get('original_post_id_for_log', 'N/A')
+            creator_name = "Unknown Creator"
+            service, user_id = error_info.get('service'), error_info.get('user_id')
+            if service and user_id and hasattr(self.parent_app, 'creator_name_cache'):
+                creator_name = self.parent_app.creator_name_cache.get((service.lower(), str(user_id)), user_id)
+            item_text = f"File: {filename}\nCreator: {creator_name} - Post: '{post_title}' (ID: {post_id})"
+
+        list_item = QListWidgetItem(item_text)
+        list_item.setData(Qt.UserRole, error_info)
+        list_item.setFlags(list_item.flags() | Qt.ItemIsUserCheckable)
+        list_item.setCheckState(Qt.Unchecked) # Start as unchecked
+        self.files_list_widget.addItem(list_item)
+
     def _select_all_items(self):
-        """Checks all items in the list."""
-        if hasattr(self, 'files_list_widget'):
-            for i in range(self.files_list_widget.count()):
-                self.files_list_widget.item(i).setCheckState(Qt.Checked)
+        """Toggles checking all items in the list."""
+        # Determine if we should check or uncheck all based on the first item's state
+        is_currently_checked = self.files_list_widget.item(0).checkState() == Qt.Checked if self.files_list_widget.count() > 0 else False
+        new_state = Qt.Unchecked if is_currently_checked else Qt.Checked
+        for i in range(self.files_list_widget.count()):
+            self.files_list_widget.item(i).setCheckState(new_state)
 
     def _handle_retry_selected(self):
-        """Gathers selected files and emits the retry signal."""
-        if not hasattr(self, 'files_list_widget'):
-            return
-
         selected_files_for_retry = [
             self.files_list_widget.item(i).data(Qt.UserRole)
             for i in range(self.files_list_widget.count())
             if self.files_list_widget.item(i).checkState() == Qt.Checked
         ]
-
         if selected_files_for_retry:
             self.retry_selected_signal.emit(selected_files_for_retry)
             self.accept()
         else:
-            QMessageBox.information(
-                self,
-                self._tr("fav_artists_no_selection_title", "No Selection"),
-                self._tr("error_files_no_selection_retry_message", "Please select at least one file to retry.")
-            )
+            QMessageBox.information(self, self._tr("fav_artists_no_selection_title", "No Selection"),
+                                    self._tr("error_files_no_selection_retry_message", "Please check the box next to at least one file to retry."))
 
     def _handle_export_errors_to_txt(self):
         """Exports the URLs of failed files to a text file."""
@@ -198,10 +247,13 @@ class ErrorFilesDialog(QDialog):
 
             if url:
                 if export_option == ExportOptionsDialog.EXPORT_MODE_WITH_DETAILS:
-                    original_filename = file_info.get('name', 'Unknown Filename')
                     post_title = error_item.get('post_title', 'Unknown Post')
                     post_id = error_item.get('original_post_id_for_log', 'N/A')
-                    details_string = f" [Post: '{post_title}' (ID: {post_id}), File: '{original_filename}']"
+                    
+                    # Prioritize the final renamed filename, but fall back to the original from the API
+                    filename_to_display = error_item.get('forced_filename_override') or file_info.get('name', 'Unknown Filename')
+                    
+                    details_string = f" [Post: '{post_title}' (ID: {post_id}), File: '{filename_to_display}']"
                     lines_to_export.append(f"{url}{details_string}")
                 else:
                     lines_to_export.append(url)

src/ui/dialogs/ExportLinksDialog.py

@@ -0,0 +1,226 @@
+import os
+import json
+import re
+from collections import defaultdict
+from PyQt5.QtWidgets import (
+    QApplication, QWidget, QLabel, QLineEdit, QTextEdit, QPushButton,
+    QVBoxLayout, QHBoxLayout, QFileDialog, QMessageBox, QListWidget, QRadioButton,
+    QButtonGroup, QCheckBox, QSplitter, QGroupBox, QDialog, QStackedWidget,
+    QScrollArea, QListWidgetItem, QSizePolicy, QProgressBar, QAbstractItemView, QFrame,
+    QMainWindow, QAction, QGridLayout, 
+)
+from PyQt5.QtCore import Qt
+
+class ExportLinksDialog(QDialog):
+    """
+    A dialog for exporting extracted links with various format options, including custom templates.
+    """
+    def __init__(self, links_data, parent=None):
+        super().__init__(parent)
+        self.links_data = links_data
+        self.setWindowTitle("Export Extracted Links")
+        self.setMinimumWidth(550)
+        self._setup_ui()
+        self._update_options_visibility()
+
+    def _setup_ui(self):
+        """Initializes the UI components of the dialog."""
+        main_layout = QVBoxLayout(self)
+
+        # Format Selection (Top Level)
+        format_group = QGroupBox("Export Format")
+        format_layout = QHBoxLayout()
+        self.radio_txt = QRadioButton("Plain Text (.txt)")
+        self.radio_json = QRadioButton("JSON (.json)")
+        self.radio_txt.setChecked(True)
+        format_layout.addWidget(self.radio_txt)
+        format_layout.addWidget(self.radio_json)
+        format_group.setLayout(format_layout)
+        main_layout.addWidget(format_group)
+
+        # TXT Options Group
+        self.txt_options_group = QGroupBox("TXT Options")
+        txt_options_layout = QVBoxLayout()
+        
+        self.txt_mode_group = QButtonGroup(self)
+        self.radio_simple = QRadioButton("Simple (URL only, one per line)")
+        self.radio_detailed = QRadioButton("Detailed (with checkboxes)")
+        self.radio_custom = QRadioButton("Custom Format Template")
+        
+        self.txt_mode_group.addButton(self.radio_simple)
+        self.txt_mode_group.addButton(self.radio_detailed)
+        self.txt_mode_group.addButton(self.radio_custom)
+        
+        txt_options_layout.addWidget(self.radio_simple)
+        txt_options_layout.addWidget(self.radio_detailed)
+        
+        self.detailed_options_widget = QWidget()
+        detailed_layout = QVBoxLayout(self.detailed_options_widget)
+        detailed_layout.setContentsMargins(20, 5, 0, 5)
+        self.check_include_titles = QCheckBox("Include post titles as separators")
+        self.check_include_link_text = QCheckBox("Include link text/description")
+        self.check_include_platform = QCheckBox("Include platform (e.g., Mega, GDrive)")
+        detailed_layout.addWidget(self.check_include_titles)
+        detailed_layout.addWidget(self.check_include_link_text)
+        detailed_layout.addWidget(self.check_include_platform)
+        txt_options_layout.addWidget(self.detailed_options_widget)
+
+        txt_options_layout.addWidget(self.radio_custom)
+
+        self.custom_format_widget = QWidget()
+        custom_layout = QVBoxLayout(self.custom_format_widget)
+        custom_layout.setContentsMargins(20, 5, 0, 5)
+        placeholders_label = QLabel("Available placeholders: <b>{url} {post_title} {link_text} {platform} {key}</b>")
+        self.custom_format_input = QTextEdit()
+        self.custom_format_input.setAcceptRichText(False)
+        self.custom_format_input.setPlaceholderText("Enter your format, e.g., ({url}) or Title: {post_title}\\nLink: {url}")
+        self.custom_format_input.setText("{url}")
+        self.custom_format_input.setFixedHeight(80)
+        custom_layout.addWidget(placeholders_label)
+        custom_layout.addWidget(self.custom_format_input)
+        txt_options_layout.addWidget(self.custom_format_widget)
+
+        separator = QLabel("-" * 70)
+        txt_options_layout.addWidget(separator)
+        self.check_separate_files = QCheckBox("Save each platform to a separate file (e.g., export_mega.txt)")
+        txt_options_layout.addWidget(self.check_separate_files)
+        
+        self.txt_options_group.setLayout(txt_options_layout)
+        main_layout.addWidget(self.txt_options_group)
+
+        # File Path Selection
+        path_layout = QHBoxLayout()
+        self.path_input = QLineEdit()
+        self.browse_button = QPushButton("Browse...")
+        path_layout.addWidget(self.path_input)
+        path_layout.addWidget(self.browse_button)
+        main_layout.addLayout(path_layout)
+        
+        # Action Buttons
+        button_layout = QHBoxLayout()
+        button_layout.addStretch(1)
+        self.export_button = QPushButton("Export")
+        self.cancel_button = QPushButton("Cancel")
+        button_layout.addWidget(self.export_button)
+        button_layout.addWidget(self.cancel_button)
+        main_layout.addLayout(button_layout)
+
+        # Connections
+        self.radio_txt.toggled.connect(self._update_options_visibility)
+        self.radio_simple.toggled.connect(self._update_options_visibility)
+        self.radio_detailed.toggled.connect(self._update_options_visibility)
+        self.radio_custom.toggled.connect(self._update_options_visibility)
+        self.browse_button.clicked.connect(self._browse)
+        self.export_button.clicked.connect(self._accept_and_export)
+        self.cancel_button.clicked.connect(self.reject)
+        
+        self.radio_simple.setChecked(True)
+
+    def _update_options_visibility(self):
+        is_txt = self.radio_txt.isChecked()
+        self.txt_options_group.setVisible(is_txt)
+        
+        self.detailed_options_widget.setVisible(is_txt and self.radio_detailed.isChecked())
+        self.custom_format_widget.setVisible(is_txt and self.radio_custom.isChecked())
+        
+    def _browse(self, base_filepath):
+        is_separate_files_mode = self.radio_txt.isChecked() and self.check_separate_files.isChecked()
+        
+        if is_separate_files_mode:
+            dir_path = QFileDialog.getExistingDirectory(self, "Select Folder to Save Files")
+            if dir_path:
+                self.path_input.setText(os.path.join(dir_path, "exported_links"))
+        else:
+            default_filename = "exported_links"
+            file_filter = "Text Files (*.txt)"
+            if self.radio_json.isChecked():
+                default_filename += ".json"
+                file_filter = "JSON Files (*.json)"
+            else:
+                default_filename += ".txt"
+            
+            filepath, _ = QFileDialog.getSaveFileName(self, "Save Links", default_filename, file_filter)
+            if filepath:
+                self.path_input.setText(filepath)
+
+    def _accept_and_export(self):
+        filepath = self.path_input.text().strip()
+        if not filepath:
+            QMessageBox.warning(self, "Input Error", "Please select a file path or folder.")
+            return
+
+        try:
+            if self.radio_txt.isChecked():
+                self._write_txt_file(filepath)
+            else:
+                self._write_json_file(filepath)
+            
+            QMessageBox.information(self, "Export Successful", "Links successfully exported!")
+            self.accept()
+        except OSError as e:
+            QMessageBox.critical(self, "Export Error", f"Could not write to file:\n{e}")
+
+    def _write_txt_file(self, base_filepath):
+        if self.check_separate_files.isChecked():
+            links_by_platform = defaultdict(list)
+            for _, _, link_url, platform, _ in self.links_data:
+                sanitized_platform = re.sub(r'[<>:"/\\|?*]', '_', platform.lower().replace(' ', '_'))
+                links_by_platform[sanitized_platform].append(link_url)
+            
+            base, ext = os.path.splitext(base_filepath)
+            if not ext: ext = ".txt"
+
+            for platform_key, links in links_by_platform.items():
+                platform_filepath = f"{base}_{platform_key}{ext}"
+                with open(platform_filepath, 'w', encoding='utf-8') as f:
+                    for url in links:
+                        f.write(url + "\n")
+            return
+
+        with open(base_filepath, 'w', encoding='utf-8') as f:
+            if self.radio_simple.isChecked():
+                for _, _, link_url, _, _ in self.links_data:
+                    f.write(link_url + "\n")
+
+            elif self.radio_detailed.isChecked():
+                include_titles = self.check_include_titles.isChecked()
+                include_text = self.check_include_link_text.isChecked()
+                include_platform = self.check_include_platform.isChecked()
+                current_title = None
+                for post_title, link_text, link_url, platform, _ in self.links_data:
+                    if include_titles and post_title != current_title:
+                        if current_title is not None: f.write("\n" + "="*60 + "\n\n")
+                        f.write(f"# Post: {post_title}\n")
+                        current_title = post_title
+                    line_parts = [link_url]
+                    if include_platform: line_parts.append(f"Platform: {platform}")
+                    if include_text and link_text: line_parts.append(f"Description: {link_text}")
+                    f.write(" | ".join(line_parts) + "\n")
+            
+            elif self.radio_custom.isChecked():
+                template = self.custom_format_input.toPlainText().replace("\\n", "\n")
+                for post_title, link_text, link_url, platform, decryption_key in self.links_data:
+                    formatted_line = template.format(
+                        url=link_url,
+                        post_title=post_title,
+                        link_text=link_text,
+                        platform=platform,
+                        key=decryption_key or ""
+                    )
+                    f.write(formatted_line)
+                    if not template.endswith('\n'):
+                        f.write('\n')
+
+    def _write_json_file(self, filepath):
+        output_data = []
+        for post_title, link_text, link_url, platform, decryption_key in self.links_data:
+            output_data.append({
+                "post_title": post_title,
+                "url": link_url,
+                "link_text": link_text,
+                "platform": platform,
+                "key": decryption_key or None
+            })
+        
+        with open(filepath, 'w', encoding='utf-8') as f:
+            json.dump(output_data, f, indent=2)

src/ui/dialogs/FutureSettingsDialog.py

@@ -7,7 +7,7 @@ import sys
 from PyQt5.QtCore import Qt, QStandardPaths, QTimer
 from PyQt5.QtWidgets import (
     QApplication, QDialog, QHBoxLayout, QLabel, QPushButton, QVBoxLayout,
-    QGroupBox, QComboBox, QMessageBox, QGridLayout, QCheckBox
+    QGroupBox, QComboBox, QMessageBox, QGridLayout, QCheckBox, QLineEdit
 )
 # --- Local Application Imports ---
 from ...i18n.translator import get_translation
@@ -18,6 +18,7 @@ from ..main_window import get_app_icon_object
 from ...config.constants import (
     THEME_KEY, LANGUAGE_KEY, DOWNLOAD_LOCATION_KEY,
     RESOLUTION_KEY, UI_SCALE_KEY, SAVE_CREATOR_JSON_KEY,
+    DATE_PREFIX_FORMAT_KEY, 
     COOKIE_TEXT_KEY, USE_COOKIE_KEY,
     FETCH_FIRST_KEY, DISCORD_TOKEN_KEY, POST_DOWNLOAD_ACTION_KEY
 )
@@ -175,19 +176,25 @@ class FutureSettingsDialog(QDialog):
         download_window_layout.addWidget(self.default_path_label, 1, 0)
         download_window_layout.addWidget(self.save_path_button, 1, 1)
 
+        self.date_prefix_format_label = QLabel()
+        self.date_prefix_format_input = QLineEdit()
+        self.date_prefix_format_input.textChanged.connect(self._date_prefix_format_changed)
+        download_window_layout.addWidget(self.date_prefix_format_label, 2, 0)
+        download_window_layout.addWidget(self.date_prefix_format_input, 2, 1)
+
         self.post_download_action_label = QLabel()
         self.post_download_action_combo = QComboBox()
         self.post_download_action_combo.currentIndexChanged.connect(self._post_download_action_changed)
-        download_window_layout.addWidget(self.post_download_action_label, 2, 0)
-        download_window_layout.addWidget(self.post_download_action_combo, 2, 1)
+        download_window_layout.addWidget(self.post_download_action_label, 3, 0)
+        download_window_layout.addWidget(self.post_download_action_combo, 3, 1)
 
         self.save_creator_json_checkbox = QCheckBox()
         self.save_creator_json_checkbox.stateChanged.connect(self._creator_json_setting_changed)
-        download_window_layout.addWidget(self.save_creator_json_checkbox, 3, 0, 1, 2)
+        download_window_layout.addWidget(self.save_creator_json_checkbox, 4, 0, 1, 2)
         
         self.fetch_first_checkbox = QCheckBox()
         self.fetch_first_checkbox.stateChanged.connect(self._fetch_first_setting_changed)
-        download_window_layout.addWidget(self.fetch_first_checkbox, 4, 0, 1, 2)
+        download_window_layout.addWidget(self.fetch_first_checkbox, 5, 0, 1, 2)
 
         main_layout.addWidget(self.download_window_group_box)
 
@@ -215,8 +222,26 @@ class FutureSettingsDialog(QDialog):
         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:"))
+
         self.window_size_label.setText(self._tr("window_size_label", "Window Size:"))
         self.default_path_label.setText(self._tr("default_path_label", "Default Path:"))
+
+        self.date_prefix_format_label.setText(self._tr("date_prefix_format_label", "Post Subfolder Format:"))
+        # Update placeholder to include {post}
+        self.date_prefix_format_input.setPlaceholderText(self._tr("date_prefix_format_placeholder", "e.g., YYYY-MM-DD {post} {postid}"))
+        # Add the tooltip to explain usage
+        self.date_prefix_format_input.setToolTip(self._tr(
+            "date_prefix_format_tooltip", 
+            "Create a custom folder name using placeholders:\n"
+            "• YYYY, MM, DD: for the date\n"
+            "• {post}: for the post title\n"
+            "• {postid}: for the post's unique ID\n\n"
+            "Example: {post} [{postid}] [YYYY-MM-DD]"
+        ))
+
+        
+        self.post_download_action_label.setText(self._tr("post_download_action_label", "Action After Download:"))
+
         self.post_download_action_label.setText(self._tr("post_download_action_label", "Action After Download:"))
         self.save_creator_json_checkbox.setText(self._tr("save_creator_json_label", "Save Creator.json file"))
         self.fetch_first_checkbox.setText(self._tr("fetch_first_label", "Fetch First (Download after all pages are found)"))
@@ -235,6 +260,7 @@ class FutureSettingsDialog(QDialog):
         self._populate_display_combo_boxes()
         self._populate_language_combo_box()
         self._populate_post_download_action_combo()
+        self._load_date_prefix_format()
         self._load_checkbox_states()
 
     def _check_for_updates(self):
@@ -412,6 +438,21 @@ class FutureSettingsDialog(QDialog):
         self.parent_app.settings.setValue(POST_DOWNLOAD_ACTION_KEY, selected_action)
         self.parent_app.settings.sync()
 
+    def _load_date_prefix_format(self):
+        """Loads the saved date prefix format and sets it in the input field."""
+        self.date_prefix_format_input.blockSignals(True)
+        current_format = self.parent_app.settings.value(DATE_PREFIX_FORMAT_KEY, "YYYY-MM-DD {post}", type=str)
+        self.date_prefix_format_input.setText(current_format)
+        self.date_prefix_format_input.blockSignals(False)
+
+    def _date_prefix_format_changed(self, text):
+        """Saves the date prefix format whenever it's changed."""
+        self.parent_app.settings.setValue(DATE_PREFIX_FORMAT_KEY, text)
+        self.parent_app.settings.sync()
+        # Also update the live value in the parent app
+        if hasattr(self.parent_app, 'date_prefix_format'):
+            self.parent_app.date_prefix_format = text
+
     def _save_settings(self):
         path_saved = False
         cookie_saved = False
@@ -449,4 +490,4 @@ class FutureSettingsDialog(QDialog):
         if path_saved or cookie_saved or token_saved:
             QMessageBox.information(self, "Settings Saved", "Settings have been saved successfully.")
         else:
-            QMessageBox.warning(self, "Nothing to Save", "No valid settings were found to save.")
+            QMessageBox.warning(self, "Nothing to Save", "No valid settings were found to save.")

src/ui/dialogs/HelpGuideDialog.py

@@ -172,7 +172,7 @@ class HelpGuideDialog(QDialog):
         icon_size = QSize(icon_dim, icon_dim)
         
         for button, tooltip_key, url in [
-            (self.github_button, "help_guide_github_tooltip", "https://github.com/Yuvi9587"),
+            (self.github_button, "help_guide_github_tooltip", "https://github.com/Yuvi63771/Kemono-Downloader"),
             (self.instagram_button, "help_guide_instagram_tooltip", "https://www.instagram.com/uvi.arts/"),
             (self.discord_button, "help_guide_discord_tooltip", "https://discord.gg/BqP64XTdJN")
         ]:

src/ui/dialogs/SinglePDF.py

@@ -66,12 +66,8 @@ def create_single_pdf_from_content(posts_data, output_filename, font_path, logge
 
     for i, post in enumerate(posts_data):
         if i > 0:
-            if 'content' in post:
-                pdf.add_page()
-            elif 'comments' in post:
-                pdf.ln(10)
-                pdf.cell(0, 0, '', border='T')
-                pdf.ln(10)
+            # This ensures every post after the first gets its own page.
+            pdf.add_page()
 
         pdf.set_font(default_font_family, 'B', 16)
         pdf.multi_cell(w=0, h=10, txt=post.get('title', 'Untitled Post'), align='L')

src/ui/dialogs/SupportDialog.py

@@ -1,71 +1,144 @@
-# src/ui/dialogs/SupportDialog.py
+# src/app/dialogs/SupportDialog.py
 
-# --- Standard Library Imports ---
 import sys
 import os
 
-# --- PyQt5 Imports ---
 from PyQt5.QtWidgets import (
-    QDialog, QVBoxLayout, QLabel, QFrame, QDialogButtonBox, QGridLayout
+    QDialog, QVBoxLayout, QHBoxLayout, QLabel, QFrame,
+    QPushButton, QSizePolicy
 )
-from PyQt5.QtCore import Qt, QSize
-from PyQt5.QtGui import QFont, QPixmap
+from PyQt5.QtCore import Qt, QSize, QUrl
+from PyQt5.QtGui import QPixmap, QDesktopServices
 
-# --- Local Application Imports ---
 from ...utils.resolution import get_dark_theme
 
-# --- Helper function for robust asset loading ---
-def get_asset_path(filename):
-    """
-    Gets the absolute path to a file in the assets folder,
-    handling both development and frozen (PyInstaller) environments.
-    """
-    if getattr(sys, 'frozen', False) and hasattr(sys, '_MEIPASS'):
-        # Running in a PyInstaller bundle
-        base_path = sys._MEIPASS
-    else:
-        # Running in a normal Python environment from src/ui/dialogs/
-        base_path = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-    
-    return os.path.join(base_path, 'assets', filename)
-
 
 class SupportDialog(QDialog):
     """
-    A dialog to show support and donation options.
+    A polished dialog showcasing support and community options in a
+    clean, modern card-based layout.
     """
     def __init__(self, parent=None):
         super().__init__(parent)
         self.parent_app = parent
-        self.setWindowTitle("❤️ Support the Developer")
-        self.setMinimumWidth(450)
+
+        self.setWindowTitle("❤️ Support & Community")
+        self.setMinimumWidth(560)
 
         self._init_ui()
         self._apply_theme()
 
-    def _init_ui(self):
-        """Initializes all UI components and layouts for the dialog."""
-        # Main layout
-        main_layout = QVBoxLayout(self)
-        main_layout.setSpacing(15)
+    def _create_card_button(
+        self, icon_path, title, subtitle, url,
+        hover_color="#2E2E2E", min_height=110, icon_size=44
+    ):
+        """Reusable clickable card widget with icon, title, and subtitle."""
+        button = QPushButton()
+        button.setCursor(Qt.PointingHandCursor)
+        button.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
+        button.setMinimumHeight(min_height)
 
-        # Title Label
-        title_label = QLabel("Thank You for Your Support!")
-        font = title_label.font()
-        font.setPointSize(14)
+        # Consistent style
+        button.setStyleSheet(f"""
+            QPushButton {{
+                background-color: #3A3A3A;
+                border: 1px solid #555;
+                border-radius: 10px;
+                text-align: center;
+                padding: 12px;
+            }}
+            QPushButton:hover {{
+                background-color: {hover_color};
+                border: 1px solid #777;
+            }}
+        """)
+
+        layout = QVBoxLayout(button)
+        layout.setSpacing(6)
+
+        # Icon
+        icon_label = QLabel()
+        pixmap = QPixmap(icon_path)
+        if not pixmap.isNull():
+            scale = getattr(self.parent_app, 'scale_factor', 1.0)
+            scaled_size = int(icon_size * scale)
+            icon_label.setPixmap(
+                pixmap.scaled(QSize(scaled_size, scaled_size), Qt.KeepAspectRatio, Qt.SmoothTransformation)
+            )
+        icon_label.setAlignment(Qt.AlignCenter)
+        layout.addWidget(icon_label)
+
+        # Title
+        title_label = QLabel(title)
+        font = self.font()
+        font.setPointSize(11)
         font.setBold(True)
         title_label.setFont(font)
         title_label.setAlignment(Qt.AlignCenter)
-        main_layout.addWidget(title_label)
+        title_label.setStyleSheet("background-color: transparent; border: none;")
+        layout.addWidget(title_label)
 
-        # Informational Text
-        info_label = QLabel(
-            "If you find this application useful, please consider supporting its development. "
-            "Your contribution helps cover costs and encourages future updates and features."
+        # Subtitle
+        if subtitle:
+            subtitle_label = QLabel(subtitle)
+            subtitle_label.setStyleSheet("color: #A8A8A8; background-color: transparent; border: none;")
+            subtitle_label.setAlignment(Qt.AlignCenter)
+            layout.addWidget(subtitle_label)
+
+        button.clicked.connect(lambda: QDesktopServices.openUrl(QUrl(url)))
+        return button
+
+    def _create_section_title(self, text):
+        """Stylized section heading."""
+        label = QLabel(text)
+        font = label.font()
+        font.setPointSize(13)
+        font.setBold(True)
+        label.setFont(font)
+        label.setAlignment(Qt.AlignCenter)
+        label.setStyleSheet("margin-top: 10px; margin-bottom: 5px;")
+        return label
+
+    def _init_ui(self):
+        main_layout = QVBoxLayout(self)
+        main_layout.setSpacing(18)
+        main_layout.setContentsMargins(20, 20, 20, 20)
+
+        # Header
+        header_label = QLabel("Support the Project")
+        font = header_label.font()
+        font.setPointSize(17)
+        font.setBold(True)
+        header_label.setFont(font)
+        header_label.setAlignment(Qt.AlignCenter)
+        main_layout.addWidget(header_label)
+
+        subtext = QLabel(
+            "If you enjoy this application, consider supporting its development. "
+            "Your help keeps the project alive and growing!"
         )
-        info_label.setWordWrap(True)
-        info_label.setAlignment(Qt.AlignCenter)
-        main_layout.addWidget(info_label)
+        subtext.setWordWrap(True)
+        subtext.setAlignment(Qt.AlignCenter)
+        main_layout.addWidget(subtext)
+
+        # Financial Support
+        main_layout.addWidget(self._create_section_title("Contribute Financially"))
+        donation_layout = QHBoxLayout()
+        donation_layout.setSpacing(15)
+
+        donation_layout.addWidget(self._create_card_button(
+            get_asset_path("ko-fi.png"), "Ko-fi", "One-time ",
+            "https://ko-fi.com/yuvi427183", "#2B2F36"
+        ))
+        donation_layout.addWidget(self._create_card_button(
+            get_asset_path("patreon.png"), "Patreon", "Soon ",
+            "https://www.patreon.com/Yuvi102", "#3A2E2B"
+        ))
+        donation_layout.addWidget(self._create_card_button(
+            get_asset_path("buymeacoffee.png"), "Buy Me a Coffee", "One-time",
+            "https://buymeacoffee.com/yuvi9587", "#403520"
+        ))
+        main_layout.addLayout(donation_layout)
 
         # Separator
         line = QFrame()
@@ -73,83 +146,62 @@ class SupportDialog(QDialog):
         line.setFrameShadow(QFrame.Sunken)
         main_layout.addWidget(line)
 
-        # --- Donation Options Layout (using a grid for icons and text) ---
-        options_layout = QGridLayout()
-        options_layout.setSpacing(18)
-        options_layout.setColumnStretch(0, 1) # Add stretch to center the content horizontally
-        options_layout.setColumnStretch(3, 1)
+        # Community Section
+        main_layout.addWidget(self._create_section_title("Get Help & Connect"))
+        community_layout = QHBoxLayout()
+        community_layout.setSpacing(15)
 
-        link_font = self.font()
-        link_font.setPointSize(12)
-        link_font.setBold(True)
-        
-        scale = getattr(self.parent_app, 'scale_factor', 1.0)
-        icon_size = int(32 * scale)
-
-        # --- Ko-fi ---
-        kofi_icon_label = QLabel()
-        kofi_pixmap = QPixmap(get_asset_path("kofi.png"))
-        if not kofi_pixmap.isNull():
-            kofi_icon_label.setPixmap(kofi_pixmap.scaled(QSize(icon_size, icon_size), Qt.KeepAspectRatio, Qt.SmoothTransformation))
-        
-        kofi_text_label = QLabel(
-            '<a href="https://ko-fi.com/yuvi427183" style="color: #13C2C2; text-decoration: none;">'
-            '☕ Buy me a Ko-fi'
-            '</a>'
-        )
-        kofi_text_label.setOpenExternalLinks(True)
-        kofi_text_label.setFont(link_font)
-        
-        options_layout.addWidget(kofi_icon_label, 0, 1, Qt.AlignRight | Qt.AlignVCenter)
-        options_layout.addWidget(kofi_text_label, 0, 2, Qt.AlignLeft | Qt.AlignVCenter)
-
-        # --- GitHub Sponsors ---
-        github_icon_label = QLabel()
-        github_pixmap = QPixmap(get_asset_path("github_sponsors.png"))
-        if not github_pixmap.isNull():
-            github_icon_label.setPixmap(github_pixmap.scaled(QSize(icon_size, icon_size), Qt.KeepAspectRatio, Qt.SmoothTransformation))
-
-        github_text_label = QLabel(
-            '<a href="https://github.com/sponsors/Yuvi9587" style="color: #EA4AAA; text-decoration: none;">'
-            '💜 Sponsor on GitHub'
-            '</a>'
-        )
-        github_text_label.setOpenExternalLinks(True)
-        github_text_label.setFont(link_font)
-
-        options_layout.addWidget(github_icon_label, 1, 1, Qt.AlignRight | Qt.AlignVCenter)
-        options_layout.addWidget(github_text_label, 1, 2, Qt.AlignLeft | Qt.AlignVCenter)
-
-        # --- Buy Me a Coffee (New) ---
-        bmac_icon_label = QLabel()
-        bmac_pixmap = QPixmap(get_asset_path("bmac.png"))
-        if not bmac_pixmap.isNull():
-            bmac_icon_label.setPixmap(bmac_pixmap.scaled(QSize(icon_size, icon_size), Qt.KeepAspectRatio, Qt.SmoothTransformation))
-            
-        bmac_text_label = QLabel(
-            '<a href="https://buymeacoffee.com/yuvi9587" style="color: #FFDD00; text-decoration: none;">'
-            '🍺 Buy Me a Coffee'
-            '</a>'
-        )
-        bmac_text_label.setOpenExternalLinks(True)
-        bmac_text_label.setFont(link_font)
-        
-        options_layout.addWidget(bmac_icon_label, 2, 1, Qt.AlignRight | Qt.AlignVCenter)
-        options_layout.addWidget(bmac_text_label, 2, 2, Qt.AlignLeft | Qt.AlignVCenter)
-
-        main_layout.addLayout(options_layout)
+        community_layout.addWidget(self._create_card_button(
+            get_asset_path("github.png"), "GitHub", "Report issues",
+            "https://github.com/Yuvi63771/Kemono-Downloader", "#2E2E2E",
+            min_height=100, icon_size=36
+        ))
+        community_layout.addWidget(self._create_card_button(
+            get_asset_path("discord.png"), "Discord", "Join the server",
+            "https://discord.gg/BqP64XTdJN", "#2C2F33",
+            min_height=100, icon_size=36
+        ))
+        community_layout.addWidget(self._create_card_button(
+            get_asset_path("instagram.png"), "Instagram", "Follow me",
+            "https://www.instagram.com/uvi.arts/", "#3B2E40",
+            min_height=100, icon_size=36
+        ))
+        main_layout.addLayout(community_layout)
 
         # Close Button
-        self.button_box = QDialogButtonBox(QDialogButtonBox.Close)
-        self.button_box.rejected.connect(self.reject)
-        main_layout.addWidget(self.button_box)
+        close_button = QPushButton("Close")
+        close_button.setMinimumWidth(100)
+        close_button.clicked.connect(self.accept)
+        close_button.setStyleSheet("""
+            QPushButton {
+                padding: 6px 14px;
+                border-radius: 6px;
+                background-color: #444;
+                color: white;
+            }
+            QPushButton:hover {
+                background-color: #555;
+            }
+        """)
 
-        self.setLayout(main_layout)
+        button_layout = QHBoxLayout()
+        button_layout.addStretch()
+        button_layout.addWidget(close_button)
+        button_layout.addStretch()
+        main_layout.addLayout(button_layout)
 
     def _apply_theme(self):
-        """Applies the current theme from the parent application."""
         if self.parent_app and hasattr(self.parent_app, 'current_theme') and self.parent_app.current_theme == "dark":
             scale = getattr(self.parent_app, 'scale_factor', 1)
             self.setStyleSheet(get_dark_theme(scale))
         else:
-            self.setStyleSheet("")
+            self.setStyleSheet("")
+
+
+def get_asset_path(filename):
+    """Return the path to an asset, works in both dev and packaged environments."""
+    if getattr(sys, 'frozen', False) and hasattr(sys, '_MEIPASS'):
+        base_path = sys._MEIPASS
+    else:
+        base_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', '..'))
+    return os.path.join(base_path, 'assets', filename)

src/ui/dialogs/TourDialog.py

@@ -1,6 +1,6 @@
 import os
 import sys
-from PyQt5.QtCore import pyqtSignal, Qt, QSettings, QCoreApplication
+from PyQt5.QtCore import pyqtSignal, Qt, QSettings
 from PyQt5.QtWidgets import (
     QApplication, QDialog, QHBoxLayout, QLabel, QPushButton, QVBoxLayout,
     QStackedWidget, QScrollArea, QFrame, QWidget, QCheckBox
@@ -8,89 +8,88 @@ from PyQt5.QtWidgets import (
 from ...i18n.translator import get_translation
 from ..main_window import get_app_icon_object
 from ...utils.resolution import get_dark_theme
-from ...config.constants import (
-    CONFIG_ORGANIZATION_NAME
-)
+from ...config.constants import CONFIG_ORGANIZATION_NAME
 
 
 class TourStepWidget(QWidget):
     """
-    A custom widget representing a single step or page in the feature tour.
-    It neatly formats a title and its corresponding content.
+    A custom widget for a single tour page, with improved styling for titles and content.
     """
     def __init__(self, title_text, content_text, parent=None):
         super().__init__(parent)
         layout = QVBoxLayout(self)
-        layout.setContentsMargins(20, 20, 20, 20)
-        layout.setSpacing(10)
+        layout.setContentsMargins(25, 20, 25, 20)
+        layout.setSpacing(15)
+        layout.setAlignment(Qt.AlignHCenter)
 
         title_label = QLabel(title_text)
         title_label.setAlignment(Qt.AlignCenter)
-        title_label.setStyleSheet("font-size: 18px; font-weight: bold; color: #E0E0E0; padding-bottom: 15px;")
+        title_label.setWordWrap(True)
+        title_label.setStyleSheet("font-size: 18pt; font-weight: bold; color: #E0E0E0; padding-bottom: 10px;")
         layout.addWidget(title_label)
 
+        # Frame for the content area to give it a nice border
+        content_frame = QFrame()
+        content_frame.setObjectName("contentFrame")
+        content_layout = QVBoxLayout(content_frame)
+        
         scroll_area = QScrollArea()
         scroll_area.setWidgetResizable(True)
         scroll_area.setFrameShape(QFrame.NoFrame)
         scroll_area.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
-        scroll_area.setVerticalScrollBarPolicy(Qt.ScrollBarAsNeeded)
-        scroll_area.setStyleSheet("background-color: transparent;")
-
+        
         content_label = QLabel(content_text)
         content_label.setWordWrap(True)
         content_label.setAlignment(Qt.AlignLeft | Qt.AlignTop)
         content_label.setTextFormat(Qt.RichText)
         content_label.setOpenExternalLinks(True)
-        content_label.setStyleSheet("font-size: 11pt; color: #C8C8C8; line-height: 1.8;")
+        # Indent the content slightly for better readability
+        content_label.setStyleSheet("font-size: 11pt; color: #C8C8C8; padding-left: 5px; padding-right: 5px;")
+        
         scroll_area.setWidget(content_label)
-        layout.addWidget(scroll_area, 1)
+        content_layout.addWidget(scroll_area)
+        layout.addWidget(content_frame, 1)
 
 
 class TourDialog(QDialog):
     """
-    A dialog that shows a multi-page tour to the user on first launch.
-    Includes a "Never show again" checkbox and uses QSettings to remember this preference.
+    A redesigned, multi-page tour dialog with a visual progress indicator.
     """
     tour_finished_normally = pyqtSignal()
     tour_skipped = pyqtSignal()
     CONFIG_APP_NAME_TOUR = "ApplicationTour"
-    TOUR_SHOWN_KEY = "neverShowTourAgainV19"
+    TOUR_SHOWN_KEY = "neverShowTourAgainV20" # Version bumped to ensure new tour shows once
+    CONFIG_ORGANIZATION_NAME = CONFIG_ORGANIZATION_NAME
 
     def __init__(self, parent_app, parent=None):
-        """
-        Initializes the dialog.
-
-        Args:
-            parent_app (DownloaderApp): A reference to the main application window.
-            parent (QWidget, optional): The parent widget. Defaults to None.
-        """
         super().__init__(parent)
-        self.settings = QSettings(CONFIG_ORGANIZATION_NAME, self.CONFIG_APP_NAME_TOUR)
+        self.settings = QSettings(self.CONFIG_ORGANIZATION_NAME, self.CONFIG_APP_NAME_TOUR)
         self.current_step = 0
         self.parent_app = parent_app
+        self.progress_dots = []
 
         self.setWindowIcon(get_app_icon_object())
         self.setModal(True)
-        self.setFixedSize(600, 620)
+        self.setFixedSize(680, 650)
         
         self._init_ui()
         self._apply_theme()
         self._center_on_screen()
 
     def _tr(self, key, default_text=""):
-        """Helper for translation."""
         if callable(get_translation) and self.parent_app:
             return get_translation(self.parent_app.current_selected_language, key, default_text)
         return default_text
 
     def _init_ui(self):
-        """Initializes all UI components and layouts."""
         main_layout = QVBoxLayout(self)
         main_layout.setContentsMargins(0, 0, 0, 0)
         main_layout.setSpacing(0)
 
         self.stacked_widget = QStackedWidget()
         main_layout.addWidget(self.stacked_widget, 1)
+
+        # All 8 steps from your translator.py file
         steps_content = [
             ("tour_dialog_step1_title", "tour_dialog_step1_content"),
             ("tour_dialog_step2_title", "tour_dialog_step2_content"),
@@ -102,52 +101,105 @@ class TourDialog(QDialog):
             ("tour_dialog_step8_title", "tour_dialog_step8_content"),
         ]
 
-        self.tour_steps_widgets = []
         for title_key, content_key in steps_content:
             title = self._tr(title_key, title_key)
             content = self._tr(content_key, "Content not found.")
             step_widget = TourStepWidget(title, content)
-            self.tour_steps_widgets.append(step_widget)
             self.stacked_widget.addWidget(step_widget)
 
         self.setWindowTitle(self._tr("tour_dialog_title", "Welcome to Kemono Downloader!"))
-        bottom_controls_layout = QVBoxLayout()
-        bottom_controls_layout.setContentsMargins(15, 10, 15, 15)
-        bottom_controls_layout.setSpacing(12)
+        
+        # --- Bottom Controls Area ---
+        bottom_frame = QFrame()
+        bottom_frame.setObjectName("bottomFrame")
+        main_layout.addWidget(bottom_frame)
 
-        self.never_show_again_checkbox = QCheckBox(self._tr("tour_dialog_never_show_checkbox", "Never show this tour again"))
-        bottom_controls_layout.addWidget(self.never_show_again_checkbox, 0, Qt.AlignLeft)
+        bottom_controls_layout = QVBoxLayout(bottom_frame)
+        bottom_controls_layout.setContentsMargins(20, 15, 20, 20)
+        bottom_controls_layout.setSpacing(15)
 
-        buttons_layout = QHBoxLayout()
-        buttons_layout.setSpacing(10)
-        self.skip_button = QPushButton(self._tr("tour_dialog_skip_button", "Skip Tour"))
+        # --- Progress Indicator ---
+        progress_layout = QHBoxLayout()
+        progress_layout.addStretch()
+        for i in range(len(steps_content)):
+            dot = QLabel()
+            dot.setObjectName("progressDot")
+            dot.setFixedSize(12, 12)
+            self.progress_dots.append(dot)
+            progress_layout.addWidget(dot)
+        progress_layout.addStretch()
+        bottom_controls_layout.addLayout(progress_layout)
+
+        # --- Buttons and Checkbox ---
+        buttons_and_check_layout = QHBoxLayout()
+        self.never_show_again_checkbox = QCheckBox(self._tr("tour_dialog_never_show_checkbox", "Never show this again"))
+        buttons_and_check_layout.addWidget(self.never_show_again_checkbox, 0, Qt.AlignLeft)
+        buttons_and_check_layout.addStretch()
+
+        self.skip_button = QPushButton(self._tr("tour_dialog_skip_button", "Skip"))
         self.skip_button.clicked.connect(self._skip_tour_action)
         self.back_button = QPushButton(self._tr("tour_dialog_back_button", "Back"))
         self.back_button.clicked.connect(self._previous_step)
         self.next_button = QPushButton(self._tr("tour_dialog_next_button", "Next"))
         self.next_button.clicked.connect(self._next_step_action)
         self.next_button.setDefault(True)
+        self.next_button.setObjectName("nextButton") # For special styling
 
-        buttons_layout.addWidget(self.skip_button)
-        buttons_layout.addStretch(1)
-        buttons_layout.addWidget(self.back_button)
-        buttons_layout.addWidget(self.next_button)
+        buttons_and_check_layout.addWidget(self.skip_button)
+        buttons_and_check_layout.addWidget(self.back_button)
+        buttons_and_check_layout.addWidget(self.next_button)
+        bottom_controls_layout.addLayout(buttons_and_check_layout)
 
-        bottom_controls_layout.addLayout(buttons_layout)
-        main_layout.addLayout(bottom_controls_layout)
-
-        self._update_button_states()
+        self._update_ui_states()
 
     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))
+            dark_theme_base = get_dark_theme(scale)
+            tour_styles = """
+                QDialog {
+                    background-color: #2D2D30;
+                }
+                #bottomFrame {
+                    background-color: #252526;
+                    border-top: 1px solid #3E3E42;
+                }
+                #contentFrame {
+                    border: 1px solid #3E3E42;
+                    border-radius: 5px;
+                }
+                QScrollArea {
+                    background-color: transparent;
+                    border: none;
+                }
+                #progressDot {
+                    background-color: #555;
+                    border-radius: 6px;
+                    border: 1px solid #4F4F4F;
+                }
+                #progressDot[active="true"] {
+                    background-color: #007ACC;
+                    border: 1px solid #005A9E;
+                }
+                #nextButton {
+                    background-color: #007ACC;
+                    border: 1px solid #005A9E;
+                    padding: 8px 18px;
+                    font-weight: bold;
+                }
+                #nextButton:hover {
+                    background-color: #1E90FF;
+                }
+                #nextButton:disabled {
+                    background-color: #444;
+                    border-color: #555;
+                }
+            """
+            self.setStyleSheet(dark_theme_base + tour_styles)
         else:
             self.setStyleSheet("QDialog { background-color: #f0f0f0; }")
 
     def _center_on_screen(self):
-        """Centers the dialog on the screen."""
         try:
             screen_geo = QApplication.primaryScreen().availableGeometry()
             self.move(screen_geo.center() - self.rect().center())
@@ -155,54 +207,49 @@ class TourDialog(QDialog):
             print(f"[TourDialog] Error centering dialog: {e}")
 
     def _next_step_action(self):
-        """Moves to the next step or finishes the tour."""
-        if self.current_step < len(self.tour_steps_widgets) - 1:
+        if self.current_step < self.stacked_widget.count() - 1:
             self.current_step += 1
             self.stacked_widget.setCurrentIndex(self.current_step)
         else:
             self._finish_tour_action()
-        self._update_button_states()
+        self._update_ui_states()
 
     def _previous_step(self):
-        """Moves to the previous step."""
         if self.current_step > 0:
             self.current_step -= 1
             self.stacked_widget.setCurrentIndex(self.current_step)
-        self._update_button_states()
+        self._update_ui_states()
 
-    def _update_button_states(self):
-        """Updates the state and text of navigation buttons."""
-        is_last_step = self.current_step == len(self.tour_steps_widgets) - 1
+    def _update_ui_states(self):
+        is_last_step = self.current_step == self.stacked_widget.count() - 1
         self.next_button.setText(self._tr("tour_dialog_finish_button", "Finish") if is_last_step else self._tr("tour_dialog_next_button", "Next"))
         self.back_button.setEnabled(self.current_step > 0)
+        self.skip_button.setVisible(not is_last_step)
+
+        for i, dot in enumerate(self.progress_dots):
+            dot.setProperty("active", i == self.current_step)
+            dot.style().polish(dot)
 
     def _skip_tour_action(self):
-        """Handles the action when the tour is skipped."""
         self._save_settings_if_checked()
         self.tour_skipped.emit()
         self.reject()
 
     def _finish_tour_action(self):
-        """Handles the action when the tour is finished normally."""
         self._save_settings_if_checked()
         self.tour_finished_normally.emit()
         self.accept()
 
     def _save_settings_if_checked(self):
-        """Saves the 'never show again' preference to QSettings."""
         self.settings.setValue(self.TOUR_SHOWN_KEY, self.never_show_again_checkbox.isChecked())
         self.settings.sync()
 
     @staticmethod
     def should_show_tour():
-        """Checks QSettings to see if the tour should be shown on startup."""
         settings = QSettings(TourDialog.CONFIG_ORGANIZATION_NAME, TourDialog.CONFIG_APP_NAME_TOUR)
         never_show = settings.value(TourDialog.TOUR_SHOWN_KEY, False, type=bool)
         return not never_show
 
-    CONFIG_ORGANIZATION_NAME = CONFIG_ORGANIZATION_NAME
-
     def closeEvent(self, event):
-        """Ensures settings are saved if the dialog is closed via the 'X' button."""
         self._skip_tour_action()
-        super().closeEvent(event)
+        super().closeEvent(event)