Merge pull request #44 from jessielw/v2-stable

V2 stable

Author: jessielw

CHANGELOG.md

@@ -5,6 +5,22 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0.0] - 2025-12-18
+
+### Added
+
+- Settings panel is now split into tabs
+  - General tab is the same as settings was previously
+  - Added about tab with some misc information about the program
+
+### Changed
+
+- Now shows version on title bar
+
+### Fixed
+
+- Don't attempt to add job to queue with no output path
+
 ## [2.0.0-rc4] - 2025-12-16
 
 ### Added

core/__version__.py

@@ -2,4 +2,4 @@
 
 program_name = "Mp4Forge"
 program_url = "https://github.com/jessielw/MP4-Mux-Tool"
-__version__ = VersionInfo.parse("2.0.0-dev")
+__version__ = VersionInfo.parse("2.0.0")

core/config.py

@@ -6,6 +6,7 @@
 from dotenv import load_dotenv
 from tomlkit.toml_document import TOMLDocument
 
+from core.__version__ import __version__
 from core.logger import LogLevel
 from core.utils.working_dir import CONFIG_DIR
 
@@ -23,6 +24,9 @@ def __init__(self, config_path: Path | None = None) -> None:
         self.config_path.parent.mkdir(parents=True, exist_ok=True)
         self._config: TOMLDocument = self._load()
 
+        # instance variables for easy access
+        self.version = str(__version__)
+
     def _load(self) -> TOMLDocument:
         """Load configuration from file or create default"""
         if self.config_path.exists():

frontend_desktop/main.py

@@ -37,7 +37,7 @@
 class MainWindow(QMainWindow):
     def __init__(self):
         super().__init__()
-        self.setWindowTitle("Mp4Forge")
+        self.setWindowTitle(f"Mp4Forge {Conf.version}")
 
         # initialize exception handling
         self._setup_exception_hooks()

frontend_desktop/navigation/tabs/output.py

@@ -268,8 +268,16 @@ def _browse_output_file(self) -> None:
     @Slot()
     def _add_current_job(self) -> None:
         """Add current tab states to queue as a new job"""
+        # if nothing in output tab simply return
+        out_path = self.output_entry.toPlainText().strip()
+        if not out_path:
+            GSigs().main_window_update_status_tip.emit(
+                "Please select an output file", 3000
+            )
+            return
+
         # check if output path exists and ask to overwrite if needed
-        output_path = Path(self.output_entry.toPlainText().strip())
+        output_path = Path(out_path)
         if output_path.exists():
             if (
                 QMessageBox.question(

frontend_desktop/navigation/tabs/settings.py

@@ -10,6 +10,7 @@
     QLineEdit,
     QPushButton,
     QScrollArea,
+    QTabWidget,
     QToolButton,
     QVBoxLayout,
     QWidget,
@@ -25,14 +26,15 @@
 from frontend_desktop.widgets.utils import build_h_line
 
 
-class SettingsTab(QWidget):
+class GeneralSettingsTab(QWidget):
+    """General settings tab with scrollable content."""
+
     def __init__(self, parent=None) -> None:
         super().__init__(parent)
 
         # create scroll area
         scroll_area = QScrollArea(self, widgetResizable=True)
-        scroll_area.setFrameShape(QFrame.Shape.Box)
-        scroll_area.setFrameShadow(QFrame.Shadow.Sunken)
+        scroll_area.setFrameShape(QFrame.Shape.NoFrame)
 
         # create content widget
         content_widget = QWidget()
@@ -134,15 +136,12 @@ def __init__(self, parent=None) -> None:
         self.save_btn = QPushButton("Save Settings", self)
         self.save_btn.clicked.connect(self._save_settings)
 
-        save_layout = QHBoxLayout()
-        save_layout.addStretch()
-        save_layout.addWidget(self.save_btn)
-
         # main layout
         self.main_layout = QVBoxLayout(self)
         self.main_layout.setContentsMargins(0, 0, 0, 0)
         self.main_layout.addWidget(scroll_area)
-        self.main_layout.addLayout(save_layout)
+        self.main_layout.addWidget(self.save_btn, alignment=Qt.AlignmentFlag.AlignRight)
+        self.main_layout.addSpacing(6)
 
     @Slot(int)
     def _change_theme(self, _: int | None = None) -> None:
@@ -201,3 +200,67 @@ def _reload_preset_editors(self) -> None:
         self.audio_titles_editor.set_titles(Conf.audio_preset_titles)
         self.subtitle_titles_editor.set_titles(Conf.subtitle_preset_titles)
         GSigs().main_window_update_status_tip.emit("Settings saved successfully", 2000)
+
+
+class AboutTab(QWidget):
+    """About tab with scrollable content."""
+
+    def __init__(self, parent=None) -> None:
+        super().__init__(parent)
+
+        # create scroll area
+        scroll_area = QScrollArea(self, widgetResizable=True)
+        scroll_area.setFrameShape(QFrame.Shape.NoFrame)
+
+        # create content widget
+        content_widget = QWidget()
+
+        ####### UI elements #######
+        app_info_lbl = QLabel(
+            f"""<h2 style="text-align: center;">Mp4Forge</h2>
+            <span style="font-weight: bold;">Version:</span> {Conf.version}<br>
+            <span style="font-weight: bold;">Homepage:</span><a href="https://github.com/jessielw/MP4Forge">
+                https://github.com/jessielw/MP4Forge</a><br>
+            <span style="font-weight: bold;">Help:</span> <a href="https://github.com/jessielw/MP4Forge/issues">
+                https://github.com/jessielw/MP4Forge/issues</a>""",
+            content_widget,
+            wordWrap=True,
+            openExternalLinks=True,
+        )
+        ####### UI elements #######
+
+        # content layout
+        content_layout = QVBoxLayout(content_widget)
+        content_layout.addWidget(app_info_lbl)
+        content_layout.addStretch()
+
+        # set content widget in scroll area
+        scroll_area.setWidget(content_widget)
+
+        # main layout
+        self.main_layout = QVBoxLayout(self)
+        self.main_layout.setContentsMargins(0, 0, 0, 0)
+        self.main_layout.addWidget(scroll_area)
+
+
+class SettingsTab(QWidget):
+    """Main settings tab with notebook interface."""
+
+    def __init__(self, parent=None) -> None:
+        super().__init__(parent)
+
+        # create tab widget
+        self.tab_widget = QTabWidget(self)
+
+        # create tabs
+        self.general_settings_tab = GeneralSettingsTab(self)
+        self.about_tab = AboutTab(self)
+
+        # add tabs to widget
+        self.tab_widget.addTab(self.general_settings_tab, "General")
+        self.tab_widget.addTab(self.about_tab, "About")
+
+        # main layout
+        self.main_layout = QVBoxLayout(self)
+        self.main_layout.setContentsMargins(0, 0, 0, 0)
+        self.main_layout.addWidget(self.tab_widget)

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
-name = "mp4-forge"
-version = "2.0.0-rc4"
+name = "mp4forge"
+version = "2.0.0"
 description = "MP4 muxing tool with desktop and web interfaces"
 requires-python = ">=3.11,<3.14"