Add main folder mode for in-place file organization

- Add new `main_folder` mode to organize files directly in target folder
- New workflow treats output as main source with optional import folders
- Add reindex behavior to reorganize files into continuous sequence
- Add QStackedWidget for separate merge and main folder UI pages
- Update all 13 locale files with new UI strings
- Bump version to 1.0.4

Author: TamKungZ

MainApp.py

@@ -73,6 +73,11 @@ chmod +x ImageMerge-linux-x64.AppImage
 
 ### macOS
 
+```bash
+brew tap TamKungZ/tap
+brew install --cask imagemerge
+```
+
 - App bundle zip: `ImageMerge-macos-app-arm64.zip` or `ImageMerge-macos-app-x64.zip`
 - Binary zip: `ImageMerge-macos-binary-arm64.zip` or `ImageMerge-macos-binary-x64.zip`
 - Homebrew cask publishing workflow is configured (`imagemerge`)

README.md

@@ -1,3 +1,32 @@
+Tag: v1.0.4
+Release title: v1.0.4 - Main Folder Mode + In-Place Reindex
+Release notes:
+## ImageMerge v1.0.4
+
+Update focused on adding a workflow for organizing files directly inside the target folder.
+
+### Highlights
+- Added new **Main folder mode** (`main_folder`) for in-place organization on the output folder
+- Main folder mode now treats the output folder as the primary source and can merge additional input folders into it
+- Improved reindex behavior so filenames are reorganized into a continuous sequence after processing
+- Existing files already named by ImageMerge pattern (for example `0001.png`) are preserved in ordering logic
+- New/mixed filename patterns are still handled by existing sort logic and merged into final sequence
+- CLI now supports `--mode main_folder`, and this mode can run without `--input`
+- Added UI and localization labels/descriptions for the new mode (EN/TH)
+
+### License
+This project remains open-source under the **MIT License**.
+
+
+### What's New (Microsoft Store Update)
+- Added a dedicated **Main Folder page** to separate organizer workflow from merge workflow
+- Added optional **Import folders** section inside Main Folder page for selecting extra folders to merge in
+- Organizer now processes in this order: organize existing files in main folder first, then merge imports, then re-index final output
+- Expanded localization coverage for the new UI keys across all supported languages
+- Updated UI theme and button contrast for clearer visibility in grayscale styling
+
+---
+
 Tag: v1.0.3
 Release title: v1.0.3 - Multi-Channel Packaging + Store Automation
 Release notes:
@@ -93,30 +122,30 @@ Tag: v1.0.0
 Release title: v1.0.0 - PySide6 UI + Nuitka Cross-Platform Build
 Release notes:
 ## ImageMerge v1.0.0
-
-Major update focused on UI modernization, packaging reliability, and release automation.
-
-### Highlights
-- Migrated desktop UI to **PySide6**
-- Switched build system to **Nuitka**
-- Added native build support for:
-  - **Windows** (PE `.exe`)
-  - **Linux** (ELF binary)
-  - **macOS** (Mach-O binary + `.app`)
-- Embedded translation system with in-app language selector (EN/TH)
-- Embedded app fonts at runtime
-- Added executable metadata support via `app_metadata.json`
-- Added GitHub Actions workflows:
-  - Build test on every push
-  - Auto-build + upload release assets on tag
-
-### Build / Packaging Notes
-- Default CI build mode is `standalone` for reliability
-- Onefile mode can be enabled via environment variable when needed
-- Windows code signing is supported by providing PFX configuration in environment variables
-
-### License
-This project is open-source under the **MIT License**.
-
-### Checksums
+
+Major update focused on UI modernization, packaging reliability, and release automation.
+
+### Highlights
+- Migrated desktop UI to **PySide6**
+- Switched build system to **Nuitka**
+- Added native build support for:
+  - **Windows** (PE `.exe`)
+  - **Linux** (ELF binary)
+  - **macOS** (Mach-O binary + `.app`)
+- Embedded translation system with in-app language selector (EN/TH)
+- Embedded app fonts at runtime
+- Added executable metadata support via `app_metadata.json`
+- Added GitHub Actions workflows:
+  - Build test on every push
+  - Auto-build + upload release assets on tag
+
+### Build / Packaging Notes
+- Default CI build mode is `standalone` for reliability
+- Onefile mode can be enabled via environment variable when needed
+- Windows code signing is supported by providing PFX configuration in environment variables
+
+### License
+This project is open-source under the **MIT License**.
+
+### Checksums
 Release asset checksums can be added in a follow-up update for verification.

Releases.md

@@ -3,8 +3,8 @@
   "company_name": "TamKungZ_",
   "product_name": "ImageMerge",
   "file_description": "Open-source image and video merge tool",
-  "file_version": "1.0.3.0",
-  "product_version": "1.0.3.0",
+  "file_version": "1.0.4.0",
+  "product_version": "1.0.4.0",
   "copyright": "Copyright (c) 2026 TamKungZ_ (MIT License)",
   "icon_ico": "assets/icon.ico",
   "icon_icns": "assets/icon.icns",

app_metadata.json

@@ -8,6 +8,8 @@
   "section_input": "مجلدات الإدخال + البادئة",
   "section_output": "مجلد الإخراج",
   "section_mode": "الوضع",
+  "page_mode_merge": "صفحة الدمج",
+  "page_mode_main_folder": "صفحة المجلد الرئيسي",
   "section_options": "الخيارات",
   "section_log": "السجل",
   "btn_add_folder": "إضافة مجلد",
@@ -22,12 +24,22 @@
   "mode_copy_keep": "نسخ فقط (الاحتفاظ بالملفات المصدر)",
   "mode_copy_delete": "نسخ ثم حذف الملفات المصدر",
   "mode_move": "نقل الملفات من الإدخال إلى الإخراج",
+  "mode_main_folder": "وضع المجلد الرئيسي (تنظيم داخل نفس المجلد)",
   "mode_desc_copy_keep": "الاحتفاظ بالأصول في أمان",
   "mode_desc_copy_delete": "نسخ ثم حذف المصادر",
   "mode_desc_move": "لا يُحفظ أي نسخة",
+  "mode_desc_main_folder": "استخدام مجلد الإخراج كمجلد رئيسي، وإعادة ترقيم الملفات الحالية ودمج الملفات الجديدة",
   "opt_clear_output": "مسح الوسائط الموجودة في الإخراج قبل البدء",
   "mode_note": "ملاحظات: يتم تخطي الملفات المكررة عند تطابق هاش الملف والامتداد. الأسماء مثل IMG_0072 تُرتَّب حسب الرقم أولاً. الأسماء من نوع UUID أو الهاش الطويل تُرتَّب حسب وقت الإنشاء.",
+  "main_page_title": "منظّم المجلد الرئيسي",
+  "main_page_desc": "استخدم هذه الصفحة عندما تريد تنظيم الملفات مباشرة داخل مجلد هدف واحد دون خلط إعدادات وضع الدمج.",
+  "main_page_target": "المجلد الرئيسي",
+  "main_page_import_section": "مجلدات اختيارية للاستيراد",
+  "main_page_sources_hint": "قائمة الاستيراد: سيتم دمج {count} مجلد(ات) في المجلد الرئيسي.",
+  "main_page_no_sources_hint": "لم يتم اختيار مجلدات للاستيراد. سيتم فقط تنظيم الوسائط الموجودة مسبقاً في المجلد الرئيسي.",
+  "main_page_note": "ترتيب التنفيذ: تنظيم الملفات الموجودة في المجلد الرئيسي أولاً، ثم دمج المجلدات المحددة، ثم إعادة الترقيم النهائي للملفات.",
   "empty_no_source": "لم يتم إضافة مجلدات مصدر بعد",
+  "empty_no_main_source": "لم يتم اختيار مجلدات للاستيراد",
   "status_processing": "جارٍ المعالجة...",
   "stat_added": "مُضاف",
   "stat_skipped": "مُتخطَّى",

assets/imagemerge-icon-71.png

@@ -8,6 +8,8 @@
   "section_input": "Eingabeordner + Präfix",
   "section_output": "Ausgabeordner",
   "section_mode": "Modus",
+  "page_mode_merge": "Zusammenführen-Seite",
+  "page_mode_main_folder": "Hauptordner-Seite",
   "section_options": "Optionen",
   "section_log": "Protokoll",
   "btn_add_folder": "Ordner hinzufügen",
@@ -22,12 +24,22 @@
   "mode_copy_keep": "Nur kopieren (Quelldateien behalten)",
   "mode_copy_delete": "Kopieren und Quelldateien löschen",
   "mode_move": "Dateien von Eingabe nach Ausgabe verschieben",
+  "mode_main_folder": "Hauptordner-Modus (direkt im Ordner organisieren)",
   "mode_desc_copy_keep": "Originale sicher aufbewahren",
   "mode_desc_copy_delete": "Kopieren und dann Quellen löschen",
   "mode_desc_move": "Keine Kopie behalten",
+  "mode_desc_main_folder": "Ausgabe als Hauptordner verwenden, bestehende Dateien neu indizieren und neue Dateien einfügen",
   "opt_clear_output": "Vorhandene Medien im Ausgabeordner vor dem Start löschen",
   "mode_note": "Hinweis: Doppelte Dateien werden übersprungen, wenn Hash und Erweiterung übereinstimmen. Namen wie IMG_0072 werden zuerst nach Nummer sortiert. UUID-artige und lange Hash-Namen werden nach Erstellungszeit sortiert.",
+  "main_page_title": "Hauptordner-Organizer",
+  "main_page_desc": "Diese Seite verwenden, wenn Dateien direkt in einem Zielordner organisiert werden sollen, ohne die Merge-Einstellungen zu mischen.",
+  "main_page_target": "Hauptordner",
+  "main_page_import_section": "Optionale Importordner",
+  "main_page_sources_hint": "Importliste: {count} Ordner werden in den Hauptordner zusammengeführt.",
+  "main_page_no_sources_hint": "Keine Importordner ausgewählt. Es werden nur Medien organisiert, die bereits im Hauptordner liegen.",
+  "main_page_note": "Ablauf: Erst Dateien im Hauptordner organisieren, dann ausgewählte Importordner zusammenführen, anschließend finale Neuindizierung.",
   "empty_no_source": "Noch keine Quellordner hinzugefügt",
+  "empty_no_main_source": "Keine Importordner ausgewählt",
   "status_processing": "Verarbeitung läuft...",
   "stat_added": "Hinzugefügt",
   "stat_skipped": "Übersprungen",

embedded_locales.py

@@ -8,6 +8,8 @@
   "section_input": "Input folders + prefix",
   "section_output": "Output folder",
   "section_mode": "Mode",
+  "page_mode_merge": "Merge page",
+  "page_mode_main_folder": "Main folder page",
   "section_options": "Options",
   "section_log": "Log",
   "btn_add_folder": "Add folder",
@@ -22,12 +24,22 @@
   "mode_copy_keep": "Copy only (keep source files)",
   "mode_copy_delete": "Copy then delete source files",
   "mode_move": "Move files from input to output",
+  "mode_main_folder": "Main folder mode (organize in place)",
   "mode_desc_copy_keep": "Keep originals safe",
   "mode_desc_copy_delete": "Copy then remove sources",
   "mode_desc_move": "No copy kept",
+  "mode_desc_main_folder": "Use output as main folder, re-index existing files, and merge new files in",
   "opt_clear_output": "Clear existing media in output before starting",
   "mode_note": "Notes: Duplicate files are skipped when both file hash and extension match. Names like IMG_0072 are sorted by number first. UUID-like and long-hash names are sorted by creation time.",
+  "main_page_title": "Main Folder Organizer",
+  "main_page_desc": "Use this page when you want to organize files directly in one target folder without mixing with merge mode settings.",
+  "main_page_target": "Main folder",
+  "main_page_import_section": "Optional folders to import",
+  "main_page_sources_hint": "Import list: {count} folder(s) will be merged into the main folder.",
+  "main_page_no_sources_hint": "No import folders selected. This will only organize media already in the main folder.",
+  "main_page_note": "Process order: organize files already in main folder first, then merge selected import folders, then re-index final output.",
   "empty_no_source": "No source folders added yet",
+  "empty_no_main_source": "No import folders selected",
   "status_processing": "Processing...",
   "stat_added": "Added",
   "stat_skipped": "Skipped",

locales/ar.json

@@ -8,6 +8,8 @@
   "section_input": "Carpetas de entrada + prefijo",
   "section_output": "Carpeta de salida",
   "section_mode": "Modo",
+  "page_mode_merge": "Página de fusión",
+  "page_mode_main_folder": "Página de carpeta principal",
   "section_options": "Opciones",
   "section_log": "Registro",
   "btn_add_folder": "Agregar carpeta",
@@ -22,12 +24,22 @@
   "mode_copy_keep": "Solo copiar (conservar archivos fuente)",
   "mode_copy_delete": "Copiar y luego eliminar archivos fuente",
   "mode_move": "Mover archivos de entrada a salida",
+  "mode_main_folder": "Modo carpeta principal (organizar en el mismo lugar)",
   "mode_desc_copy_keep": "Mantener originales seguros",
   "mode_desc_copy_delete": "Copiar y luego eliminar fuentes",
   "mode_desc_move": "Sin copia guardada",
+  "mode_desc_main_folder": "Usar la salida como carpeta principal, reindexar archivos existentes y agregar archivos nuevos",
   "opt_clear_output": "Borrar medios existentes en la salida antes de iniciar",
   "mode_note": "Notas: Los archivos duplicados se omiten cuando coinciden el hash y la extensión. Los nombres como IMG_0072 se ordenan primero por número. Los nombres tipo UUID o hash largo se ordenan por fecha de creación.",
+  "main_page_title": "Organizador de carpeta principal",
+  "main_page_desc": "Usa esta página cuando quieras organizar archivos directamente en una sola carpeta objetivo sin mezclar ajustes del modo de fusión.",
+  "main_page_target": "Carpeta principal",
+  "main_page_import_section": "Carpetas opcionales para importar",
+  "main_page_sources_hint": "Lista de importación: se fusionarán {count} carpeta(s) en la carpeta principal.",
+  "main_page_no_sources_hint": "No hay carpetas de importación seleccionadas. Solo se organizarán los medios que ya están en la carpeta principal.",
+  "main_page_note": "Orden del proceso: primero organizar los archivos de la carpeta principal, luego fusionar las carpetas seleccionadas y finalmente reindexar la salida.",
   "empty_no_source": "Aún no se han agregado carpetas fuente",
+  "empty_no_main_source": "No hay carpetas de importación seleccionadas",
   "status_processing": "Procesando...",
   "stat_added": "Agregado",
   "stat_skipped": "Omitido",