wip: basic theming support

* Settings and Singletons moved

.github/workflows/build-from-latest-dependency.yml

@@ -0,0 +1,65 @@
+name: Build Executable from latest `arcaea-offline-*` dependencies
+run-name: ${{ github.actor }} started a build request.
+
+on:
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  discussions: write
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+      fail-fast: false
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+          cache: "pip"
+
+      # install dependencies
+      - run: "pip install -r requirements.txt"
+      - run: "pip uninstall arcaea-offline arcaea-offline-ocr -y"
+      - run: "pip install git+https://github.com/283375/arcaea-offline"
+      - run: "pip install git+https://github.com/283375/arcaea-offline-ocr"
+      - run: "pip install imageio"
+      - name: Install UPX
+        uses: crazy-max/ghaction-upx@v3
+        with:
+          install-only: true
+
+      - name: Release builtin files
+        run: |
+          pyside6-lrelease ui/resources/lang/en_US.ts ui/resources/lang/zh_CN.ts
+          python prebuild.py
+          pyside6-rcc ui/resources/resources.qrc -o ui/resources/resources_rc.py
+
+      - name: Build Executable
+        uses: Nuitka/Nuitka-Action@main
+        with:
+          nuitka-version: main
+          script-name: index.py
+          standalone: true
+          onefile: true
+          enable-plugins: pyside6,upx
+          windows-icon-from-ico: ui/resources/images/icon.png
+          linux-icon: ui/resources/images/icon.png
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ runner.os }} Build
+          path: |
+            build/*.exe
+            build/*.bin
+            build/*.app/**/*

.github/workflows/build.yml

@@ -0,0 +1,78 @@
+name: Build Executable
+run-name: ${{ github.actor }} started a build request.
+
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - "v[0-9]+.[0-9]+.[0-9]+"
+
+permissions:
+  contents: write
+  discussions: write
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+      fail-fast: false
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+          cache: "pip"
+
+      - name: Install dependencies
+        run: |
+          pip install -r requirements.txt
+          pip install imageio
+
+      - name: Install UPX
+        uses: crazy-max/ghaction-upx@v3
+        with:
+          install-only: true
+
+      - name: Release builtin files
+        run: |
+          pyside6-lrelease ui/resources/lang/en_US.ts ui/resources/lang/zh_CN.ts
+          python prebuild.py
+          pyside6-rcc ui/resources/resources.qrc -o ui/resources/resources_rc.py
+
+      - name: Build Executable
+        uses: Nuitka/Nuitka-Action@main
+        with:
+          nuitka-version: main
+          script-name: index.py
+          standalone: true
+          onefile: true
+          enable-plugins: pyside6,upx
+          windows-icon-from-ico: ui/resources/images/icon.png
+          linux-icon: ui/resources/images/icon.png
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ runner.os }} Build
+          path: |
+            build/*.exe
+            build/*.bin
+            build/*.app/**/*
+
+      - name: Draft a release
+        uses: softprops/action-gh-release@v2
+        with:
+          discussion_category_name: New releases
+          draft: true
+          generate_release_notes: true
+          files: |
+            build/*.exe
+            build/*.bin
+            build/*.app/**/*

.gitignore

@@ -1,6 +1,9 @@
 __debug*
 .vscode/
 
+# QML type cache
+internal/
+
 arcaea_offline.db
 arcaea_offline.ini
 /data

.pre-commit-config.yaml

@@ -1,14 +1,13 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v6.0.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace
-  - repo: https://github.com/psf/black
-    rev: 23.1.0
+
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.13.0
     hooks:
-      - id: black
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
-    hooks:
-      - id: isort
+      - id: ruff
+        args: ["--fix"]
+      - id: ruff-format

README.md

@@ -1,9 +1,29 @@
 # Arcaea Offline PySide UI
 
-GUI for both [283375/arcaea-offline](https://github.com/283375/arcaea-offline) and [283375/arcaea-offline-ocr](https://github.com/283375/arcaea-offline-ocr)
+[![uv](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/uv/main/assets/badge/v0.json)](https://github.com/astral-sh/uv)
 
-## Before you run `python index.py`...
+GUI for both [283375/arcaea-offline](https://github.com/283375/arcaea-offline) and [ArcaeaOffline/core-ocr](https://github.com/ArcaeaOffline/core-ocr).
+
+## Prerequisites
 
 * Install requirements
 * Release translation files from `ui/resources/lang/*.ts`
+* Run `prebuild.py`
 * Compile `ui/resources/resources.qrc` to `ui/resources/resources_rc.py`
+
+You can refer to the [GitHub Actions file](./.github/workflows/build.yml) for a rough reference.
+
+```
+pip install -r ./requirements.txt
+pyside6-lrelease ./ui/resources/lang/en_US.ts ./ui/resources/lang/zh_CN.ts
+python prebuild.py
+pyside6-rcc ./ui/resources/resources.qrc -o ./ui/resources/resources_rc.py
+```
+
+Sometimes you have to install the latest, unpublished version of `arcaea-offline` and `arcaea-offline-ocr`.
+
+```
+pip uninstall -y arcaea-offline arcaea-offline-ocr
+pip install git+https://github.com/283375/arcaea-offline
+pip install git+https://github.com/ArcaeaOffline/core-ocr
+```

app.py

@@ -0,0 +1,91 @@
+import sys
+from pathlib import Path
+
+import structlog
+from PySide6.QtCore import QCoreApplication, QEvent, QObject, Qt, QUrl
+from PySide6.QtGui import QGuiApplication, QIcon
+from PySide6.QtQml import QQmlApplicationEngine
+from PySide6.QtQuickControls2 import QQuickStyle
+
+from ui.resources import resources_rc  # noqa: F401
+from ui.theme import ThemeManager
+from ui.utils import url  # noqa: F401
+from ui.viewmodels import overview  # noqa: F401
+
+CURRENT_DIRECTORY = Path(__file__).resolve().parent
+DEFAULT_FONTS = ["微软雅黑", "Microsoft YaHei UI", "Microsoft YaHei", "Segoe UI"]
+
+
+logger: structlog.stdlib.BoundLogger = structlog.get_logger()
+
+
+class ThemeChangeEventFilter(QObject):
+    logger: structlog.stdlib.BoundLogger = structlog.get_logger(
+        tag="ThemeChangeEventFilter",
+    )
+
+    def __init__(self, *, themeManager: ThemeManager):
+        super().__init__(None)
+        self.themeManager = themeManager
+
+        self.scheme = self.themeManager.getCurrentScheme()
+
+    def doSomething(self) -> None:
+        scheme = self.themeManager.getCurrentScheme()
+        if scheme == self.scheme:
+            self.logger.debug("Ignored same scheme event (%r)", scheme)
+            return
+
+        self.scheme = scheme
+        self.themeManager.updateTheme()
+        self.logger.debug("something done")
+
+    def eventFilter(self, obj: QObject, event: QEvent) -> bool:
+        if event.type() == QEvent.Type.ThemeChange:
+            self.doSomething()
+
+        return False
+
+
+def main() -> None:
+    app = QGuiApplication(sys.argv)
+    app.setFont(DEFAULT_FONTS)
+    app.setApplicationName("arcaea-offline-pyside-ui")
+    app.setApplicationDisplayName("Arcaea Offline")
+    app.setWindowIcon(QIcon(":/images/icon.png"))
+
+    engine = QQmlApplicationEngine()
+
+    themeManager = ThemeManager(parent=app)
+
+    def onThemeManagerThemeChanged():
+        logger.debug("App palette changed")
+        app.setPalette(themeManager.qPalette)  # pyright: ignore[reportArgumentType]
+        engine.rootContext().setContextProperty("appTheme", themeManager.qmlExposer)
+
+    onThemeManagerThemeChanged()
+    themeManager.themeChanged.connect(onThemeManagerThemeChanged)
+
+    QQuickStyle.setStyle("Fusion")
+
+    def onEngineObjectCreated(obj: QObject | None, objUrl: QUrl) -> None:
+        if obj is None:
+            logger.critical("rootObject is None! Exiting!")
+            QCoreApplication.exit(-1)
+
+    engine.objectCreated.connect(
+        onEngineObjectCreated,
+        Qt.ConnectionType.QueuedConnection,
+    )
+
+    engine.load("ui/qmls/App.qml")
+
+    rootObject = engine.rootObjects()[0]
+    ef = ThemeChangeEventFilter(themeManager=themeManager)
+    rootObject.installEventFilter(ef)
+
+    sys.exit(app.exec())
+
+
+if __name__ == "__main__":
+    main()

core/color.py

@@ -0,0 +1,10 @@
+from PySide6.QtGui import QColor
+
+
+def mixColor(source: QColor, mix: QColor, ratio: float = 0.5):
+    r = round((mix.red() - source.red()) * ratio + source.red())
+    g = round((mix.green() - source.green()) * ratio + source.green())
+    b = round((mix.blue() - source.blue()) * ratio + source.blue())
+    a = round((mix.alpha() - source.alpha()) * ratio + source.alpha())
+
+    return QColor(r, g, b, a)

core/database/__init__.py

@@ -0,0 +1,12 @@
+from .conn import Database
+from .init_checker import DatabaseInitCheckResult, check_db_init
+from .utils import create_engine, db_path_to_sqlite_url, sqlite_url_to_db_path
+
+__all__ = [
+    "check_db_init",
+    "create_engine",
+    "db_path_to_sqlite_url",
+    "Database",
+    "DatabaseInitCheckResult",
+    "sqlite_url_to_db_path",
+]

core/database/conn.py

@@ -0,0 +1,29 @@
+from pathlib import Path
+
+from sqlalchemy import text
+from sqlalchemy.orm import sessionmaker
+
+from core.settings import SettingsKeys, settings
+
+from .utils import create_engine, db_path_to_sqlite_url
+
+
+class Database:
+    def __init__(self):
+        if settings.stringValue(SettingsKeys.General.DatabaseType) != "file":
+            raise ValueError("DatabaseType is not file")
+
+        db_path = settings.stringValue(SettingsKeys.General.DatabaseConn)
+        if not db_path:
+            raise ValueError("DatabaseConn is empty")
+
+        self.engine = create_engine(db_path_to_sqlite_url(Path(db_path)))
+        self.sessionmaker = sessionmaker(bind=self.engine)
+
+    @property
+    def b30(self) -> float | None:
+        with self.sessionmaker() as session:
+            result = session.execute(
+                text("SELECT b30 FROM calculated_potential")
+            ).fetchone()
+            return result[0] if result else None

core/database/init_checker.py

@@ -0,0 +1,30 @@
+from enum import Flag, auto
+from pathlib import Path
+
+from arcaea_offline.database import Database
+
+from .utils import create_engine, db_path_to_sqlite_url
+
+
+class DatabaseInitCheckResult(Flag):
+    NONE = 0
+    FILE_EXISTS = auto()
+    INITIALIZED = auto()
+
+    OK = FILE_EXISTS | INITIALIZED
+
+
+def check_db_init(file: Path) -> DatabaseInitCheckResult:
+    flags = DatabaseInitCheckResult.NONE
+
+    if not file.exists():
+        return flags
+
+    flags |= DatabaseInitCheckResult.FILE_EXISTS
+
+    db_url = db_path_to_sqlite_url(file)
+    db = Database(create_engine(db_url))
+    if db.check_init():
+        flags |= DatabaseInitCheckResult.INITIALIZED
+
+    return flags

core/database/utils.py

@@ -0,0 +1,28 @@
+from pathlib import Path
+
+from PySide6.QtCore import QSysInfo, QUrl
+from sqlalchemy import Engine
+from sqlalchemy import create_engine as sa_create_engine
+from sqlalchemy.pool import NullPool, Pool
+
+
+def db_path_to_sqlite_url(file: Path) -> QUrl:
+    kernelType = QSysInfo.kernelType()
+
+    # the slash count varies depending on the kernel
+    # https://docs.sqlalchemy.org/en/20/core/engines.html#sqlite
+    uri = file.resolve().as_uri()
+    if kernelType == "winnt":
+        return QUrl(uri.replace("file://", "sqlite://"))
+    else:
+        return QUrl(uri.replace("file://", "sqlite:///"))
+
+
+def sqlite_url_to_db_path(url: str) -> Path:
+    db_file_url = url.replace("sqlite://", "file://")
+    return Path(QUrl(db_file_url).toLocalFile()).resolve()
+
+
+def create_engine(_url: str | QUrl, pool: type[Pool] = NullPool) -> Engine:
+    url = _url.toString() if isinstance(_url, QUrl) else _url
+    return sa_create_engine(url, poolclass=pool)

core/settings/__init__.py

@@ -0,0 +1,5 @@
+from .base import Settings, settings
+from .keys import SettingsKeys
+from .values import SettingsValues
+
+__all__ = ["settings", "Settings", "SettingsKeys", "SettingsValues"]

core/settings/base.py

@@ -0,0 +1,44 @@
+import sys
+from enum import Enum
+from typing import Any
+
+from PySide6.QtCore import QFileInfo, QSettings, Signal
+
+from core.singleton import QSingleton
+
+__all__ = ["Settings"]
+
+TSettingsKey = str | Enum
+
+
+class Settings(QSettings, metaclass=QSingleton):
+    updated = Signal(str)
+
+    def __init__(self, parent=None):
+        super().__init__(
+            QFileInfo(sys.argv[0]).dir().absoluteFilePath("arcaea_offline.ini"),
+            QSettings.Format.IniFormat,
+            parent,
+        )
+
+    def __settingsKey(self, key: TSettingsKey) -> str:
+        if isinstance(key, Enum):
+            return self.__settingsKey(key.value)
+
+        if isinstance(key, str):
+            return key
+
+        raise TypeError(f"{key!r} is not a valid key")
+
+    def setValue(self, key: TSettingsKey, value: Any) -> None:
+        _key = self.__settingsKey(key)
+
+        super().setValue(_key, value)
+        self.updated.emit(_key)
+
+    def stringValue(self, key: TSettingsKey) -> str | None:
+        _key = self.__settingsKey(key)
+        return self.value(_key, None, type=str)
+
+
+settings = Settings()

core/settings/keys.py

@@ -0,0 +1,27 @@
+from dataclasses import dataclass
+from enum import StrEnum
+
+
+class _General(StrEnum):
+    Language = "Language"
+    DatabaseType = "DatabaseType"
+    DatabaseConn = "DatabaseConn"
+
+
+class _Ocr(StrEnum):
+    KnnModelFile = "Ocr/KnnModelFile"
+    B30KnnModelFile = "Ocr/B30KnnModelFile"
+    PhashDatabaseFile = "Ocr/PHashDatabaseFile"
+    DateSource = "Ocr/DateSource"
+
+
+class _Andreal(StrEnum):
+    Folder = "Andreal/AndrealFolder"
+    Executable = "Andreal/AndrealExecutable"
+
+
+@dataclass(frozen=True)
+class SettingsKeys:
+    General = _General
+    Ocr = _Ocr
+    Andreal = _Andreal

core/settings/values.py

@@ -0,0 +1,23 @@
+from dataclasses import dataclass
+from enum import StrEnum
+
+
+class GeneralDatabaseType(StrEnum):
+    FILE = "file"
+    URL = "url"
+
+
+@dataclass(frozen=True)
+class _Ocr_ScoreDateSource:
+    FileCreated: str = "FileCreated"
+    FileLastModified: str = "FileLastModified"
+
+
+@dataclass(frozen=True)
+class _Ocr:
+    DateSource = _Ocr_ScoreDateSource()
+
+
+@dataclass(frozen=True)
+class SettingsValues:
+    Ocr = _Ocr()

core/singleton.py

@@ -14,5 +14,5 @@ class Singleton(type, Generic[T]):
         return cls._instance
 
 
-class QObjectSingleton(type(QObject), Singleton):
+class QSingleton(type(QObject), Singleton):
     pass

index.py

@@ -9,25 +9,21 @@ from PySide6.QtCore import QCoreApplication, QLocale
 from PySide6.QtGui import QFontDatabase, QIcon
 from PySide6.QtWidgets import QApplication, QDialog, QMessageBox
 
-import ui.resources.resources_rc
+import ui.resources.resources_rc  # noqa: F401
+from core.settings import SettingsKeys, settings
 from ui.extends.shared.language import changeAppLanguage
-from ui.extends.shared.settings import Settings
 from ui.implements.mainwindow import MainWindow
-from ui.startup.databaseChecker import DatabaseChecker, DatabaseCheckerResult
+from ui.startup.databaseChecker import DatabaseChecker, DatabaseInitCheckResult
 
 rootLogger = logging.getLogger("root")
 rootLogger.setLevel(logging.DEBUG)
 
-rootLoggerFormatter = logging.Formatter(
-    "[{levelname}]{asctime}|{name}: {msg}", "%m-%d %H:%M:%S", "{"
-)
-
 
 def handle_exception(exc_type, exc_value, exc_traceback):
-    if issubclass(exc_type, KeyboardInterrupt):
-        sys.__excepthook__(exc_type, exc_value, exc_traceback)
-        return
+    sys.__excepthook__(exc_type, exc_value, exc_traceback)
 
+    if issubclass(exc_type, KeyboardInterrupt):
+        return
     rootLogger.critical(
         "Uncaught exception", exc_info=(exc_type, exc_value, exc_traceback)
     )
@@ -46,6 +42,11 @@ if __name__ == "__main__":
     ymd = now.strftime("%Y%m%d")
     hms = now.strftime("%H%M%S")
 
+    rootLoggerFormatter = logging.Formatter(
+        "[%(asctime)s/%(levelname)s] %(name)s (%(tag)s): %(message)s",
+        "%m-%d %H:%M:%S",
+        defaults={"tag": "/"},
+    )
     rootLoggerFileHandler = logging.FileHandler(
         str(logFolder / f"arcaea-offline-pyside-ui-{ymd}-{hms}_debug.log"),
         encoding="utf-8",
@@ -59,18 +60,21 @@ if __name__ == "__main__":
     rootLogger.addHandler(rootLoggerStdOutHandler)
 
     app = QApplication(sys.argv)
-    locale = (
-        QLocale(Settings().language()) if Settings().language() else QLocale.system()
-    )
+    settingsLanguage = settings.stringValue(SettingsKeys.General.Language)
+    locale = QLocale(settingsLanguage) if settingsLanguage else QLocale.system()
     changeAppLanguage(locale)
 
     QFontDatabase.addApplicationFont(":/fonts/GeosansLight.ttf")
 
     databaseChecker = DatabaseChecker()
     databaseChecker.setWindowIcon(QIcon(":/images/icon.png"))
-    databaseCheckResult = databaseChecker.confirmDb() if Settings().databaseUrl() else 0
+    databaseCheckResult = (
+        databaseChecker.confirmDb()
+        if settings.stringValue(SettingsKeys.General.DatabaseUrl)
+        else DatabaseInitCheckResult.NONE
+    )
 
-    if not databaseCheckResult & DatabaseCheckerResult.Initted:
+    if not databaseCheckResult & DatabaseInitCheckResult.INITIALIZED:
         result = databaseChecker.exec()
 
         if result == QDialog.DialogCode.Accepted:

prebuild.py

@@ -40,7 +40,6 @@ def getBuildToolsVer():
 
 def writeVersionFile():
     versionFile = Path("ui/resources/VERSION")
-    assert versionFile.exists()
 
     versionText = (
         "arcaea-offline-pyside-ui\n{gitDesc}\n{buildToolsVer}\n\n"

pyproject.toml

@@ -1,42 +1,82 @@
-[build-system]
-requires = ["setuptools>=61.0"]
-build-backend = "setuptools.build_meta"
-
 [project]
 name = "arcaea-offline-pyside-ui"
-version = "0.1.0"
+version = "0.3.9"
 authors = [{ name = "283375", email = "log_283375@163.com" }]
 description = "No description."
 readme = "README.md"
 requires-python = ">=3.9"
 dependencies = [
-  "arcaea-offline==0.1.0",
-  "arcaea-offline-ocr==0.1.0",
-  "exif==1.6.0",
-  "PySide6==6.5.2",
+  "arcaea-offline==0.2.2",
+  "arcaea-offline-ocr==0.0.99",
+
+  "structlog~=25.4",
+  "colorama~=0.4.6",
+  "rich~=14.2",
+
+  "exif~=1.6.0",
+  "PySide6==6.10.0",
+  "Pillow~=10.1.0",
+  "materialyoucolor~=2.0.10",
 ]
 classifiers = [
   "Development Status :: 3 - Alpha",
   "Programming Language :: Python :: 3",
 ]
 
+[project.optional-dependencies]
+dev = [
+  "ruff>=0.14.2",
+  "pre-commit>=4.3.0",
+
+  "imageio",
+  "Nuitka~=2.7.6",
+]
+
 [project.urls]
-"Homepage" = "https://github.com/283375/arcaea-offline-pyside-ui"
-"Bug Tracker" = "https://github.com/283375/arcaea-offline-pyside-ui/issues"
+"Homepage" = "https://github.com/ArcaeaOffline/client-pyside6"
+"Bug Tracker" = "https://github.com/ArcaeaOffline/client-pyside6/issues"
 
-[tool.black]
-force-exclude = '''
-(
-  ui/designer
-  | .*_ui.py
-  | .*_rc.py
-)
-'''
+[tool.ruff]
+exclude = ["*_ui.py", "*_rc.py"]
 
-[tool.isort]
-profile = "black"
-extend_skip = ["ui/designer"]
-extend_skip_glob = ["*_ui.py", "*_rc.py"]
+[tool.ruff.lint]
+# Full list: https://docs.astral.sh/ruff/rules
+select = [
+  "E",   # pycodestyle (Error)
+  "W",   # pycodestyle (Warning)
+  "F",   # pyflakes
+  "I",   # isort
+  "PL",  # pylint
+  "N",   # pep8-naming
+  "A",   # flake8-builtins
+  "DTZ", # flake8-datetimez
+  "LOG", # flake8-logging
+  "Q",   # flake8-quotes
+  "G",   # flake8-logging-format
+  "PIE", # flake8-pie
+  "PT",  # flake8-pytest-style
+]
+ignore = [
+  "E501", # line-too-long
+  "N802", # invalid-function-name
+  "N803", # invalid-argument-name
+  "N806", # non-lowercase-variable-in-function
+  "N815", # mixed-case-variable-in-class-scope
+  "N816", # mixed-case-variable-in-global-scope
+  "N999", # invalid-module-name
+]
 
 [tool.pyright]
 ignore = ["**/__debug*.*"]
+
+[tool.pyside6-project]
+files = [
+  "app.py",
+  "ui/qmls/App.qml",
+  "ui/qmls/AppMain.qml",
+
+  "ui/viewmodels/overview.py",
+  "ui/qmls/Overview.qml",
+
+  "ui/qmls/404.qml",
+]

requirements.dev.txt

@@ -1,5 +0,0 @@
-black == 23.7.0
-isort == 5.12.0
-imageio==2.31.4
-Nuitka==1.8.4
-pytest==7.4.3

requirements.txt

@@ -1,5 +0,0 @@
-arcaea-offline==0.1.0
-arcaea-offline-ocr==0.1.0
-exif==1.6.0
-PySide6==6.5.2
-typing-extensions==4.8.0

tests/ui/navigation/test_navhost.py

@@ -1,31 +0,0 @@
-from ui.navigation.navhost import NavHost
-from ui.navigation.navitem import NavItem
-
-
-class TestNavHost:
-    def test_auto_append_parent(self):
-        navHost = NavHost()
-
-        navHost.registerNavItem(NavItem(id="aaa.bbb.ccc.ddd"))
-
-        navItems = navHost.navItems
-
-        assert NavItem(id="aaa.bbb.ccc.ddd") in navItems
-        assert NavItem(id="aaa.bbb.ccc") in navItems
-        assert NavItem(id="aaa.bbb") in navItems
-        assert NavItem(id="aaa") in navItems
-
-    def test_auto_select_child(self):
-        navHost = NavHost()
-
-        navHost.registerNavItem(NavItem(id="aaa"))
-        navHost.registerNavItem(NavItem(id="bbb"))
-
-        assert navHost.currentNavItem.id == "aaa"
-
-        navHost.registerNavItem(NavItem(id="aaa.bbb"))
-        navHost.registerNavItem(NavItem(id="aaa.ccc"))
-
-        navHost.navigate("aaa")
-
-        assert navHost.currentNavItem.id == "aaa.bbb"

ui/components/mainwindow/animatedstackednavitemwidgets.py

@@ -1,47 +0,0 @@
-from PySide6.QtWidgets import QWidget
-
-from ui.navigation.navhost import NavHost, navHost
-from ui.navigation.navitem import NavItem
-from ui.navigation.navitemwidgets import NavItemWidgets
-from ui.widgets.slidingstackedwidget import SlidingStackedWidget
-
-
-class AnimatedStackedNavItemsWidgets(SlidingStackedWidget):
-    def __init__(
-        self, navItemWidgets: NavItemWidgets, navHost: NavHost = navHost, parent=None
-    ):
-        super().__init__(parent)
-
-        self.navItemWidgets = navItemWidgets
-        self.navHost = navHost
-
-        self.navHost.activated.connect(self.__switchTo)
-        self.animationFinished.connect(self.endChangingWidget)
-
-    def __switchTo(self, oldNavItem: NavItem, newNavItem: NavItem):
-        oldNavItemDepth = self.navHost.getNavItemDepth(oldNavItem.id)
-        newNavItemDepth = self.navHost.getNavItemDepth(newNavItem.id)
-
-        if oldNavItemDepth != newNavItemDepth:
-            slidingDirection = (
-                self.slidingDirection.RightToLeft
-                if newNavItemDepth > oldNavItemDepth
-                else self.slidingDirection.LeftToRight
-            )
-        else:
-            slidingDirection = self.slidingDirection.TopToBottom
-
-        newWidget = self.navItemWidgets.get(newNavItem.id) or QWidget()
-        self.startChangingWidget(newWidget, slidingDirection)
-
-    def startChangingWidget(self, newWidget: QWidget, slidingDirection):
-        newIndex = self.addWidget(newWidget)
-        [self.widget(i).setEnabled(False) for i in range(self.count())]
-        self.slideInIdx(newIndex, slidingDirection)
-
-    def endChangingWidget(self):
-        oldWidget = self.widget(0)
-        self.removeWidget(oldWidget)
-
-        newWidget = self.widget(0)
-        newWidget.setEnabled(True)

ui/designer/components/ocrQueue.ui

@@ -22,39 +22,6 @@
         <string>queue.title</string>
        </property>
        <layout class="QVBoxLayout" name="verticalLayout_2">
-        <item>
-         <widget class="QGroupBox" name="groupBox">
-          <property name="title">
-           <string>iccOptionsGroupBox</string>
-          </property>
-          <layout class="QVBoxLayout" name="verticalLayout">
-           <item>
-            <widget class="QRadioButton" name="iccUseQtRadioButton">
-             <property name="text">
-              <string>icc.useQt</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QRadioButton" name="iccUsePILRadioButton">
-             <property name="text">
-              <string>icc.usePIL</string>
-             </property>
-             <property name="checked">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QRadioButton" name="iccTryFixRadioButton">
-             <property name="text">
-              <string>icc.tryFix</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
         <item>
          <widget class="QPushButton" name="ocr_addImageButton">
           <property name="text">
@@ -95,6 +62,13 @@
           </property>
          </spacer>
         </item>
+        <item>
+         <widget class="QPushButton" name="optionsDialogButton">
+          <property name="text">
+           <string>queue.optionsButton</string>
+          </property>
+         </widget>
+        </item>
         <item>
          <widget class="QPushButton" name="ocr_startButton">
           <property name="text">

ui/designer/components/ocrQueueOptionsDialog.ui

@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>OcrQueueOptionsDialog</class>
+ <widget class="QDialog" name="OcrQueueOptionsDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>331</width>
+    <height>157</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>OCR Options</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QGroupBox" name="groupBox">
+       <property name="title">
+        <string>iccOptionsGroupBox</string>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_2">
+        <item>
+         <widget class="QRadioButton" name="iccUseQtRadioButton">
+          <property name="text">
+           <string>icc.useQt</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="iccUsePILRadioButton">
+          <property name="text">
+           <string>icc.usePIL</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="iccTryFixRadioButton">
+          <property name="text">
+           <string>icc.tryFix</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="groupBox_2">
+       <property name="title">
+        <string>dateOptionsGroupBox</string>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_3">
+        <item>
+         <widget class="QCheckBox" name="dateReadFromExifCheckbox">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>date.readFromExif</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="dateUseCreationDateRadioButton">
+          <property name="text">
+           <string>date.useCreationDate</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="dateUseModifyDateRadioButton">
+          <property name="text">
+           <string>date.useModifyDate</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>OcrQueueOptionsDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>OcrQueueOptionsDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

ui/designer/components/ocrQueueOptionsDialog_ui.py

@@ -0,0 +1,107 @@
+# -*- coding: utf-8 -*-
+
+################################################################################
+## Form generated from reading UI file 'ocrQueueOptionsDialog.ui'
+##
+## Created by: Qt User Interface Compiler version 6.5.2
+##
+## WARNING! All changes made in this file will be lost when recompiling UI file!
+################################################################################
+
+from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale,
+    QMetaObject, QObject, QPoint, QRect,
+    QSize, QTime, QUrl, Qt)
+from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
+    QFont, QFontDatabase, QGradient, QIcon,
+    QImage, QKeySequence, QLinearGradient, QPainter,
+    QPalette, QPixmap, QRadialGradient, QTransform)
+from PySide6.QtWidgets import (QAbstractButton, QApplication, QCheckBox, QDialog,
+    QDialogButtonBox, QGroupBox, QHBoxLayout, QRadioButton,
+    QSizePolicy, QVBoxLayout, QWidget)
+
+class Ui_OcrQueueOptionsDialog(object):
+    def setupUi(self, OcrQueueOptionsDialog):
+        if not OcrQueueOptionsDialog.objectName():
+            OcrQueueOptionsDialog.setObjectName(u"OcrQueueOptionsDialog")
+        OcrQueueOptionsDialog.resize(331, 157)
+        self.verticalLayout = QVBoxLayout(OcrQueueOptionsDialog)
+        self.verticalLayout.setObjectName(u"verticalLayout")
+        self.horizontalLayout = QHBoxLayout()
+        self.horizontalLayout.setObjectName(u"horizontalLayout")
+        self.groupBox = QGroupBox(OcrQueueOptionsDialog)
+        self.groupBox.setObjectName(u"groupBox")
+        self.verticalLayout_2 = QVBoxLayout(self.groupBox)
+        self.verticalLayout_2.setObjectName(u"verticalLayout_2")
+        self.iccUseQtRadioButton = QRadioButton(self.groupBox)
+        self.iccUseQtRadioButton.setObjectName(u"iccUseQtRadioButton")
+
+        self.verticalLayout_2.addWidget(self.iccUseQtRadioButton)
+
+        self.iccUsePILRadioButton = QRadioButton(self.groupBox)
+        self.iccUsePILRadioButton.setObjectName(u"iccUsePILRadioButton")
+        self.iccUsePILRadioButton.setChecked(True)
+
+        self.verticalLayout_2.addWidget(self.iccUsePILRadioButton)
+
+        self.iccTryFixRadioButton = QRadioButton(self.groupBox)
+        self.iccTryFixRadioButton.setObjectName(u"iccTryFixRadioButton")
+
+        self.verticalLayout_2.addWidget(self.iccTryFixRadioButton)
+
+
+        self.horizontalLayout.addWidget(self.groupBox)
+
+        self.groupBox_2 = QGroupBox(OcrQueueOptionsDialog)
+        self.groupBox_2.setObjectName(u"groupBox_2")
+        self.verticalLayout_3 = QVBoxLayout(self.groupBox_2)
+        self.verticalLayout_3.setObjectName(u"verticalLayout_3")
+        self.dateReadFromExifCheckbox = QCheckBox(self.groupBox_2)
+        self.dateReadFromExifCheckbox.setObjectName(u"dateReadFromExifCheckbox")
+        self.dateReadFromExifCheckbox.setEnabled(False)
+        self.dateReadFromExifCheckbox.setChecked(True)
+
+        self.verticalLayout_3.addWidget(self.dateReadFromExifCheckbox)
+
+        self.dateUseCreationDateRadioButton = QRadioButton(self.groupBox_2)
+        self.dateUseCreationDateRadioButton.setObjectName(u"dateUseCreationDateRadioButton")
+        self.dateUseCreationDateRadioButton.setChecked(True)
+
+        self.verticalLayout_3.addWidget(self.dateUseCreationDateRadioButton)
+
+        self.dateUseModifyDateRadioButton = QRadioButton(self.groupBox_2)
+        self.dateUseModifyDateRadioButton.setObjectName(u"dateUseModifyDateRadioButton")
+
+        self.verticalLayout_3.addWidget(self.dateUseModifyDateRadioButton)
+
+
+        self.horizontalLayout.addWidget(self.groupBox_2)
+
+
+        self.verticalLayout.addLayout(self.horizontalLayout)
+
+        self.buttonBox = QDialogButtonBox(OcrQueueOptionsDialog)
+        self.buttonBox.setObjectName(u"buttonBox")
+        self.buttonBox.setOrientation(Qt.Horizontal)
+        self.buttonBox.setStandardButtons(QDialogButtonBox.Cancel|QDialogButtonBox.Ok)
+
+        self.verticalLayout.addWidget(self.buttonBox)
+
+
+        self.retranslateUi(OcrQueueOptionsDialog)
+        self.buttonBox.accepted.connect(OcrQueueOptionsDialog.accept)
+        self.buttonBox.rejected.connect(OcrQueueOptionsDialog.reject)
+
+        QMetaObject.connectSlotsByName(OcrQueueOptionsDialog)
+    # setupUi
+
+    def retranslateUi(self, OcrQueueOptionsDialog):
+        OcrQueueOptionsDialog.setWindowTitle(QCoreApplication.translate("OcrQueueOptionsDialog", u"OCR Options", None))
+        self.groupBox.setTitle(QCoreApplication.translate("OcrQueueOptionsDialog", u"iccOptionsGroupBox", None))
+        self.iccUseQtRadioButton.setText(QCoreApplication.translate("OcrQueueOptionsDialog", u"icc.useQt", None))
+        self.iccUsePILRadioButton.setText(QCoreApplication.translate("OcrQueueOptionsDialog", u"icc.usePIL", None))
+        self.iccTryFixRadioButton.setText(QCoreApplication.translate("OcrQueueOptionsDialog", u"icc.tryFix", None))
+        self.groupBox_2.setTitle(QCoreApplication.translate("OcrQueueOptionsDialog", u"dateOptionsGroupBox", None))
+        self.dateReadFromExifCheckbox.setText(QCoreApplication.translate("OcrQueueOptionsDialog", u"date.readFromExif", None))
+        self.dateUseCreationDateRadioButton.setText(QCoreApplication.translate("OcrQueueOptionsDialog", u"date.useCreationDate", None))
+        self.dateUseModifyDateRadioButton.setText(QCoreApplication.translate("OcrQueueOptionsDialog", u"date.useModifyDate", None))
+    # retranslateUi

ui/designer/components/ocrQueue_ui.py

@@ -17,8 +17,8 @@ from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
     QPalette, QPixmap, QRadialGradient, QTransform)
 from PySide6.QtWidgets import (QAbstractItemView, QApplication, QCheckBox, QGroupBox,
     QHBoxLayout, QHeaderView, QLabel, QProgressBar,
-    QPushButton, QRadioButton, QSizePolicy, QSpacerItem,
-    QTableView, QVBoxLayout, QWidget)
+    QPushButton, QSizePolicy, QSpacerItem, QTableView,
+    QVBoxLayout, QWidget)
 
 class Ui_OcrQueue(object):
     def setupUi(self, OcrQueue):
@@ -34,29 +34,6 @@ class Ui_OcrQueue(object):
         self.groupBox_3.setObjectName(u"groupBox_3")
         self.verticalLayout_2 = QVBoxLayout(self.groupBox_3)
         self.verticalLayout_2.setObjectName(u"verticalLayout_2")
-        self.groupBox = QGroupBox(self.groupBox_3)
-        self.groupBox.setObjectName(u"groupBox")
-        self.verticalLayout = QVBoxLayout(self.groupBox)
-        self.verticalLayout.setObjectName(u"verticalLayout")
-        self.iccUseQtRadioButton = QRadioButton(self.groupBox)
-        self.iccUseQtRadioButton.setObjectName(u"iccUseQtRadioButton")
-
-        self.verticalLayout.addWidget(self.iccUseQtRadioButton)
-
-        self.iccUsePILRadioButton = QRadioButton(self.groupBox)
-        self.iccUsePILRadioButton.setObjectName(u"iccUsePILRadioButton")
-        self.iccUsePILRadioButton.setChecked(True)
-
-        self.verticalLayout.addWidget(self.iccUsePILRadioButton)
-
-        self.iccTryFixRadioButton = QRadioButton(self.groupBox)
-        self.iccTryFixRadioButton.setObjectName(u"iccTryFixRadioButton")
-
-        self.verticalLayout.addWidget(self.iccTryFixRadioButton)
-
-
-        self.verticalLayout_2.addWidget(self.groupBox)
-
         self.ocr_addImageButton = QPushButton(self.groupBox_3)
         self.ocr_addImageButton.setObjectName(u"ocr_addImageButton")
 
@@ -78,6 +55,11 @@ class Ui_OcrQueue(object):
 
         self.verticalLayout_2.addItem(self.verticalSpacer)
 
+        self.optionsDialogButton = QPushButton(self.groupBox_3)
+        self.optionsDialogButton.setObjectName(u"optionsDialogButton")
+
+        self.verticalLayout_2.addWidget(self.optionsDialogButton)
+
         self.ocr_startButton = QPushButton(self.groupBox_3)
         self.ocr_startButton.setObjectName(u"ocr_startButton")
 
@@ -154,13 +136,10 @@ class Ui_OcrQueue(object):
 
     def retranslateUi(self, OcrQueue):
         self.groupBox_3.setTitle(QCoreApplication.translate("OcrQueue", u"queue.title", None))
-        self.groupBox.setTitle(QCoreApplication.translate("OcrQueue", u"iccOptionsGroupBox", None))
-        self.iccUseQtRadioButton.setText(QCoreApplication.translate("OcrQueue", u"icc.useQt", None))
-        self.iccUsePILRadioButton.setText(QCoreApplication.translate("OcrQueue", u"icc.usePIL", None))
-        self.iccTryFixRadioButton.setText(QCoreApplication.translate("OcrQueue", u"icc.tryFix", None))
         self.ocr_addImageButton.setText(QCoreApplication.translate("OcrQueue", u"queue.addImageButton", None))
         self.ocr_removeSelectedButton.setText(QCoreApplication.translate("OcrQueue", u"queue.removeSelected", None))
         self.ocr_removeAllButton.setText(QCoreApplication.translate("OcrQueue", u"queue.removeAll", None))
+        self.optionsDialogButton.setText(QCoreApplication.translate("OcrQueue", u"queue.optionsButton", None))
         self.ocr_startButton.setText(QCoreApplication.translate("OcrQueue", u"queue.startOcrButton", None))
         self.groupBox_5.setTitle(QCoreApplication.translate("OcrQueue", u"results", None))
         self.ocr_acceptSelectedButton.setText(QCoreApplication.translate("OcrQueue", u"results.acceptSelectedButton", None))
@@ -169,4 +148,3 @@ class Ui_OcrQueue(object):
         self.statusLabel.setText("")
         pass
     # retranslateUi
-

ui/designer/tabs/tabDb/tabDb_Manage.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>630</width>
-    <height>528</height>
+    <width>580</width>
+    <height>551</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,70 +17,21 @@
    <property name="labelAlignment">
     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
    </property>
-   <item row="0" column="0">
-    <widget class="QPushButton" name="syncArcSongDbButton">
-     <property name="text">
-      <string>syncArcSongDbButton</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>syncArcSongDb.description</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="0">
-    <widget class="QPushButton" name="importSt3Button">
-     <property name="text">
-      <string>importSt3Button</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="1">
-    <widget class="QLabel" name="label_2">
-     <property name="text">
-      <string>importSt3.description</string>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="0" colspan="2">
-    <widget class="Line" name="line">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="0">
-    <widget class="QPushButton" name="exportScoresButton">
-     <property name="text">
-      <string>exportScoresButton</string>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="1">
-    <widget class="QLabel" name="label_3">
-     <property name="text">
-      <string>exportScores.description</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" colspan="2">
-    <widget class="Line" name="line_2">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
+   <item row="1" column="0">
     <widget class="QPushButton" name="importPacklistButton">
      <property name="text">
       <string>importPacklistButton</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="0">
+   <item row="1" column="1">
+    <widget class="QLabel" name="label_4">
+     <property name="text">
+      <string>importPacklist.description</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
     <widget class="QPushButton" name="importSonglistButton">
      <property name="text">
       <string>importSonglistButton</string>
@@ -88,69 +39,129 @@
     </widget>
    </item>
    <item row="2" column="1">
-    <widget class="QLabel" name="label_4">
-     <property name="text">
-      <string>importPacklist.description</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1">
     <widget class="QLabel" name="label_5">
      <property name="text">
       <string>importSonglist.description</string>
      </property>
     </widget>
    </item>
-   <item row="9" column="0">
-    <widget class="QPushButton" name="exportArcsongJsonButton">
-     <property name="text">
-      <string>exportArcsongJsonButton</string>
-     </property>
-    </widget>
-   </item>
-   <item row="9" column="1">
-    <widget class="QLabel" name="label_6">
-     <property name="text">
-      <string>exportArcsongJson.description</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0">
+   <item row="3" column="0">
     <widget class="QPushButton" name="importApkButton">
      <property name="text">
       <string>importApkButton</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="1">
+   <item row="3" column="1">
     <widget class="QLabel" name="label_7">
      <property name="text">
       <string>importApk.description</string>
      </property>
     </widget>
    </item>
+   <item row="5" column="0" colspan="2">
+    <widget class="QLabel" name="label_11">
+     <property name="font">
+      <font>
+       <pointsize>12</pointsize>
+       <bold>false</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>chartInfoGroup</string>
+     </property>
+    </widget>
+   </item>
    <item row="6" column="0">
+    <widget class="QPushButton" name="syncArcSongDbButton">
+     <property name="text">
+      <string>syncArcSongDbButton</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="1">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>syncArcSongDb.description</string>
+     </property>
+    </widget>
+   </item>
+   <item row="9" column="0" colspan="2">
+    <widget class="QLabel" name="label_12">
+     <property name="font">
+      <font>
+       <pointsize>12</pointsize>
+       <bold>false</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>importScoreGroup</string>
+     </property>
+    </widget>
+   </item>
+   <item row="10" column="0">
+    <widget class="QPushButton" name="importSt3Button">
+     <property name="text">
+      <string>importSt3Button</string>
+     </property>
+    </widget>
+   </item>
+   <item row="10" column="1">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>importSt3.description</string>
+     </property>
+    </widget>
+   </item>
+   <item row="11" column="0">
     <widget class="QPushButton" name="importOnlineButton">
      <property name="text">
       <string>importOnlineButton</string>
      </property>
     </widget>
    </item>
-   <item row="6" column="1">
+   <item row="11" column="1">
     <widget class="QLabel" name="label_8">
      <property name="text">
       <string>importOnline.description</string>
      </property>
     </widget>
    </item>
-   <item row="10" column="0">
+   <item row="13" column="0" colspan="2">
+    <widget class="QLabel" name="label_13">
+     <property name="font">
+      <font>
+       <pointsize>12</pointsize>
+       <bold>false</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>exportScoreGroup</string>
+     </property>
+    </widget>
+   </item>
+   <item row="14" column="0">
+    <widget class="QPushButton" name="exportScoresButton">
+     <property name="text">
+      <string>exportScoresButton</string>
+     </property>
+    </widget>
+   </item>
+   <item row="14" column="1">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>exportScores.description</string>
+     </property>
+    </widget>
+   </item>
+   <item row="15" column="0">
     <widget class="QPushButton" name="exportSmartRteB30Button">
      <property name="text">
       <string>exportSmartRteB30Button</string>
      </property>
     </widget>
    </item>
-   <item row="10" column="1">
+   <item row="15" column="1">
     <widget class="QLabel" name="label_9">
      <property name="text">
       <string>exportSmartRteB30.description</string>
@@ -163,6 +174,124 @@
      </property>
     </widget>
    </item>
+   <item row="17" column="0" colspan="2">
+    <widget class="QLabel" name="label_14">
+     <property name="font">
+      <font>
+       <pointsize>12</pointsize>
+       <bold>false</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>miscGroup</string>
+     </property>
+    </widget>
+   </item>
+   <item row="18" column="0">
+    <widget class="QPushButton" name="exportArcsongJsonButton">
+     <property name="text">
+      <string>exportArcsongJsonButton</string>
+     </property>
+    </widget>
+   </item>
+   <item row="18" column="1">
+    <widget class="QLabel" name="label_6">
+     <property name="text">
+      <string>exportArcsongJson.description</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" colspan="2">
+    <widget class="QLabel" name="label_10">
+     <property name="font">
+      <font>
+       <pointsize>12</pointsize>
+       <bold>false</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>packSongInfoGroup</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Minimum</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="8" column="0">
+    <spacer name="verticalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Minimum</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="12" column="0">
+    <spacer name="verticalSpacer_3">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Minimum</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="16" column="0">
+    <spacer name="verticalSpacer_4">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Minimum</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="7" column="0">
+    <widget class="QPushButton" name="syncChartInfoDbButton">
+     <property name="text">
+      <string>syncChartInfoDbButton</string>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="1">
+    <widget class="QLabel" name="label_15">
+     <property name="text">
+      <string>syncChartInfoDb.description</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>

ui/designer/tabs/tabDb/tabDb_Manage_ui.py

@@ -15,123 +15,168 @@ from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
     QFont, QFontDatabase, QGradient, QIcon,
     QImage, QKeySequence, QLinearGradient, QPainter,
     QPalette, QPixmap, QRadialGradient, QTransform)
-from PySide6.QtWidgets import (QApplication, QFormLayout, QFrame, QLabel,
-    QPushButton, QSizePolicy, QWidget)
+from PySide6.QtWidgets import (QApplication, QFormLayout, QLabel, QPushButton,
+    QSizePolicy, QSpacerItem, QWidget)
 
 class Ui_TabDb_Manage(object):
     def setupUi(self, TabDb_Manage):
         if not TabDb_Manage.objectName():
             TabDb_Manage.setObjectName(u"TabDb_Manage")
-        TabDb_Manage.resize(630, 528)
+        TabDb_Manage.resize(580, 551)
         TabDb_Manage.setWindowTitle(u"TabDb_Manage")
         self.formLayout = QFormLayout(TabDb_Manage)
         self.formLayout.setObjectName(u"formLayout")
         self.formLayout.setLabelAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter)
-        self.syncArcSongDbButton = QPushButton(TabDb_Manage)
-        self.syncArcSongDbButton.setObjectName(u"syncArcSongDbButton")
-
-        self.formLayout.setWidget(0, QFormLayout.LabelRole, self.syncArcSongDbButton)
-
-        self.label = QLabel(TabDb_Manage)
-        self.label.setObjectName(u"label")
-
-        self.formLayout.setWidget(0, QFormLayout.FieldRole, self.label)
-
-        self.importSt3Button = QPushButton(TabDb_Manage)
-        self.importSt3Button.setObjectName(u"importSt3Button")
-
-        self.formLayout.setWidget(5, QFormLayout.LabelRole, self.importSt3Button)
-
-        self.label_2 = QLabel(TabDb_Manage)
-        self.label_2.setObjectName(u"label_2")
-
-        self.formLayout.setWidget(5, QFormLayout.FieldRole, self.label_2)
-
-        self.line = QFrame(TabDb_Manage)
-        self.line.setObjectName(u"line")
-        self.line.setFrameShape(QFrame.HLine)
-        self.line.setFrameShadow(QFrame.Sunken)
-
-        self.formLayout.setWidget(7, QFormLayout.SpanningRole, self.line)
-
-        self.exportScoresButton = QPushButton(TabDb_Manage)
-        self.exportScoresButton.setObjectName(u"exportScoresButton")
-
-        self.formLayout.setWidget(8, QFormLayout.LabelRole, self.exportScoresButton)
-
-        self.label_3 = QLabel(TabDb_Manage)
-        self.label_3.setObjectName(u"label_3")
-
-        self.formLayout.setWidget(8, QFormLayout.FieldRole, self.label_3)
-
-        self.line_2 = QFrame(TabDb_Manage)
-        self.line_2.setObjectName(u"line_2")
-        self.line_2.setFrameShape(QFrame.HLine)
-        self.line_2.setFrameShadow(QFrame.Sunken)
-
-        self.formLayout.setWidget(1, QFormLayout.SpanningRole, self.line_2)
-
         self.importPacklistButton = QPushButton(TabDb_Manage)
         self.importPacklistButton.setObjectName(u"importPacklistButton")
 
-        self.formLayout.setWidget(2, QFormLayout.LabelRole, self.importPacklistButton)
-
-        self.importSonglistButton = QPushButton(TabDb_Manage)
-        self.importSonglistButton.setObjectName(u"importSonglistButton")
-
-        self.formLayout.setWidget(3, QFormLayout.LabelRole, self.importSonglistButton)
+        self.formLayout.setWidget(1, QFormLayout.LabelRole, self.importPacklistButton)
 
         self.label_4 = QLabel(TabDb_Manage)
         self.label_4.setObjectName(u"label_4")
 
-        self.formLayout.setWidget(2, QFormLayout.FieldRole, self.label_4)
+        self.formLayout.setWidget(1, QFormLayout.FieldRole, self.label_4)
+
+        self.importSonglistButton = QPushButton(TabDb_Manage)
+        self.importSonglistButton.setObjectName(u"importSonglistButton")
+
+        self.formLayout.setWidget(2, QFormLayout.LabelRole, self.importSonglistButton)
 
         self.label_5 = QLabel(TabDb_Manage)
         self.label_5.setObjectName(u"label_5")
 
-        self.formLayout.setWidget(3, QFormLayout.FieldRole, self.label_5)
-
-        self.exportArcsongJsonButton = QPushButton(TabDb_Manage)
-        self.exportArcsongJsonButton.setObjectName(u"exportArcsongJsonButton")
-
-        self.formLayout.setWidget(9, QFormLayout.LabelRole, self.exportArcsongJsonButton)
-
-        self.label_6 = QLabel(TabDb_Manage)
-        self.label_6.setObjectName(u"label_6")
-
-        self.formLayout.setWidget(9, QFormLayout.FieldRole, self.label_6)
+        self.formLayout.setWidget(2, QFormLayout.FieldRole, self.label_5)
 
         self.importApkButton = QPushButton(TabDb_Manage)
         self.importApkButton.setObjectName(u"importApkButton")
 
-        self.formLayout.setWidget(4, QFormLayout.LabelRole, self.importApkButton)
+        self.formLayout.setWidget(3, QFormLayout.LabelRole, self.importApkButton)
 
         self.label_7 = QLabel(TabDb_Manage)
         self.label_7.setObjectName(u"label_7")
 
-        self.formLayout.setWidget(4, QFormLayout.FieldRole, self.label_7)
+        self.formLayout.setWidget(3, QFormLayout.FieldRole, self.label_7)
+
+        self.label_11 = QLabel(TabDb_Manage)
+        self.label_11.setObjectName(u"label_11")
+        font = QFont()
+        font.setPointSize(12)
+        font.setBold(False)
+        self.label_11.setFont(font)
+
+        self.formLayout.setWidget(5, QFormLayout.SpanningRole, self.label_11)
+
+        self.syncArcSongDbButton = QPushButton(TabDb_Manage)
+        self.syncArcSongDbButton.setObjectName(u"syncArcSongDbButton")
+
+        self.formLayout.setWidget(6, QFormLayout.LabelRole, self.syncArcSongDbButton)
+
+        self.label = QLabel(TabDb_Manage)
+        self.label.setObjectName(u"label")
+
+        self.formLayout.setWidget(6, QFormLayout.FieldRole, self.label)
+
+        self.label_12 = QLabel(TabDb_Manage)
+        self.label_12.setObjectName(u"label_12")
+        self.label_12.setFont(font)
+
+        self.formLayout.setWidget(9, QFormLayout.SpanningRole, self.label_12)
+
+        self.importSt3Button = QPushButton(TabDb_Manage)
+        self.importSt3Button.setObjectName(u"importSt3Button")
+
+        self.formLayout.setWidget(10, QFormLayout.LabelRole, self.importSt3Button)
+
+        self.label_2 = QLabel(TabDb_Manage)
+        self.label_2.setObjectName(u"label_2")
+
+        self.formLayout.setWidget(10, QFormLayout.FieldRole, self.label_2)
 
         self.importOnlineButton = QPushButton(TabDb_Manage)
         self.importOnlineButton.setObjectName(u"importOnlineButton")
 
-        self.formLayout.setWidget(6, QFormLayout.LabelRole, self.importOnlineButton)
+        self.formLayout.setWidget(11, QFormLayout.LabelRole, self.importOnlineButton)
 
         self.label_8 = QLabel(TabDb_Manage)
         self.label_8.setObjectName(u"label_8")
 
-        self.formLayout.setWidget(6, QFormLayout.FieldRole, self.label_8)
+        self.formLayout.setWidget(11, QFormLayout.FieldRole, self.label_8)
+
+        self.label_13 = QLabel(TabDb_Manage)
+        self.label_13.setObjectName(u"label_13")
+        self.label_13.setFont(font)
+
+        self.formLayout.setWidget(13, QFormLayout.SpanningRole, self.label_13)
+
+        self.exportScoresButton = QPushButton(TabDb_Manage)
+        self.exportScoresButton.setObjectName(u"exportScoresButton")
+
+        self.formLayout.setWidget(14, QFormLayout.LabelRole, self.exportScoresButton)
+
+        self.label_3 = QLabel(TabDb_Manage)
+        self.label_3.setObjectName(u"label_3")
+
+        self.formLayout.setWidget(14, QFormLayout.FieldRole, self.label_3)
 
         self.exportSmartRteB30Button = QPushButton(TabDb_Manage)
         self.exportSmartRteB30Button.setObjectName(u"exportSmartRteB30Button")
 
-        self.formLayout.setWidget(10, QFormLayout.LabelRole, self.exportSmartRteB30Button)
+        self.formLayout.setWidget(15, QFormLayout.LabelRole, self.exportSmartRteB30Button)
 
         self.label_9 = QLabel(TabDb_Manage)
         self.label_9.setObjectName(u"label_9")
         self.label_9.setOpenExternalLinks(True)
         self.label_9.setTextInteractionFlags(Qt.LinksAccessibleByKeyboard|Qt.LinksAccessibleByMouse)
 
-        self.formLayout.setWidget(10, QFormLayout.FieldRole, self.label_9)
+        self.formLayout.setWidget(15, QFormLayout.FieldRole, self.label_9)
+
+        self.label_14 = QLabel(TabDb_Manage)
+        self.label_14.setObjectName(u"label_14")
+        self.label_14.setFont(font)
+
+        self.formLayout.setWidget(17, QFormLayout.SpanningRole, self.label_14)
+
+        self.exportArcsongJsonButton = QPushButton(TabDb_Manage)
+        self.exportArcsongJsonButton.setObjectName(u"exportArcsongJsonButton")
+
+        self.formLayout.setWidget(18, QFormLayout.LabelRole, self.exportArcsongJsonButton)
+
+        self.label_6 = QLabel(TabDb_Manage)
+        self.label_6.setObjectName(u"label_6")
+
+        self.formLayout.setWidget(18, QFormLayout.FieldRole, self.label_6)
+
+        self.label_10 = QLabel(TabDb_Manage)
+        self.label_10.setObjectName(u"label_10")
+        self.label_10.setFont(font)
+
+        self.formLayout.setWidget(0, QFormLayout.SpanningRole, self.label_10)
+
+        self.verticalSpacer = QSpacerItem(20, 20, QSizePolicy.Minimum, QSizePolicy.Minimum)
+
+        self.formLayout.setItem(4, QFormLayout.LabelRole, self.verticalSpacer)
+
+        self.verticalSpacer_2 = QSpacerItem(20, 20, QSizePolicy.Minimum, QSizePolicy.Minimum)
+
+        self.formLayout.setItem(8, QFormLayout.LabelRole, self.verticalSpacer_2)
+
+        self.verticalSpacer_3 = QSpacerItem(20, 20, QSizePolicy.Minimum, QSizePolicy.Minimum)
+
+        self.formLayout.setItem(12, QFormLayout.LabelRole, self.verticalSpacer_3)
+
+        self.verticalSpacer_4 = QSpacerItem(20, 20, QSizePolicy.Minimum, QSizePolicy.Minimum)
+
+        self.formLayout.setItem(16, QFormLayout.LabelRole, self.verticalSpacer_4)
+
+        self.syncChartInfoDbButton = QPushButton(TabDb_Manage)
+        self.syncChartInfoDbButton.setObjectName(u"syncChartInfoDbButton")
+
+        self.formLayout.setWidget(7, QFormLayout.LabelRole, self.syncChartInfoDbButton)
+
+        self.label_15 = QLabel(TabDb_Manage)
+        self.label_15.setObjectName(u"label_15")
+
+        self.formLayout.setWidget(7, QFormLayout.FieldRole, self.label_15)
 
 
         self.retranslateUi(TabDb_Manage)
@@ -140,24 +185,30 @@ class Ui_TabDb_Manage(object):
     # setupUi
 
     def retranslateUi(self, TabDb_Manage):
-        self.syncArcSongDbButton.setText(QCoreApplication.translate("TabDb_Manage", u"syncArcSongDbButton", None))
-        self.label.setText(QCoreApplication.translate("TabDb_Manage", u"syncArcSongDb.description", None))
-        self.importSt3Button.setText(QCoreApplication.translate("TabDb_Manage", u"importSt3Button", None))
-        self.label_2.setText(QCoreApplication.translate("TabDb_Manage", u"importSt3.description", None))
-        self.exportScoresButton.setText(QCoreApplication.translate("TabDb_Manage", u"exportScoresButton", None))
-        self.label_3.setText(QCoreApplication.translate("TabDb_Manage", u"exportScores.description", None))
         self.importPacklistButton.setText(QCoreApplication.translate("TabDb_Manage", u"importPacklistButton", None))
-        self.importSonglistButton.setText(QCoreApplication.translate("TabDb_Manage", u"importSonglistButton", None))
         self.label_4.setText(QCoreApplication.translate("TabDb_Manage", u"importPacklist.description", None))
+        self.importSonglistButton.setText(QCoreApplication.translate("TabDb_Manage", u"importSonglistButton", None))
         self.label_5.setText(QCoreApplication.translate("TabDb_Manage", u"importSonglist.description", None))
-        self.exportArcsongJsonButton.setText(QCoreApplication.translate("TabDb_Manage", u"exportArcsongJsonButton", None))
-        self.label_6.setText(QCoreApplication.translate("TabDb_Manage", u"exportArcsongJson.description", None))
         self.importApkButton.setText(QCoreApplication.translate("TabDb_Manage", u"importApkButton", None))
         self.label_7.setText(QCoreApplication.translate("TabDb_Manage", u"importApk.description", None))
+        self.label_11.setText(QCoreApplication.translate("TabDb_Manage", u"chartInfoGroup", None))
+        self.syncArcSongDbButton.setText(QCoreApplication.translate("TabDb_Manage", u"syncArcSongDbButton", None))
+        self.label.setText(QCoreApplication.translate("TabDb_Manage", u"syncArcSongDb.description", None))
+        self.label_12.setText(QCoreApplication.translate("TabDb_Manage", u"importScoreGroup", None))
+        self.importSt3Button.setText(QCoreApplication.translate("TabDb_Manage", u"importSt3Button", None))
+        self.label_2.setText(QCoreApplication.translate("TabDb_Manage", u"importSt3.description", None))
         self.importOnlineButton.setText(QCoreApplication.translate("TabDb_Manage", u"importOnlineButton", None))
         self.label_8.setText(QCoreApplication.translate("TabDb_Manage", u"importOnline.description", None))
+        self.label_13.setText(QCoreApplication.translate("TabDb_Manage", u"exportScoreGroup", None))
+        self.exportScoresButton.setText(QCoreApplication.translate("TabDb_Manage", u"exportScoresButton", None))
+        self.label_3.setText(QCoreApplication.translate("TabDb_Manage", u"exportScores.description", None))
         self.exportSmartRteB30Button.setText(QCoreApplication.translate("TabDb_Manage", u"exportSmartRteB30Button", None))
         self.label_9.setText(QCoreApplication.translate("TabDb_Manage", u"exportSmartRteB30.description", None))
+        self.label_14.setText(QCoreApplication.translate("TabDb_Manage", u"miscGroup", None))
+        self.exportArcsongJsonButton.setText(QCoreApplication.translate("TabDb_Manage", u"exportArcsongJsonButton", None))
+        self.label_6.setText(QCoreApplication.translate("TabDb_Manage", u"exportArcsongJson.description", None))
+        self.label_10.setText(QCoreApplication.translate("TabDb_Manage", u"packSongInfoGroup", None))
+        self.syncChartInfoDbButton.setText(QCoreApplication.translate("TabDb_Manage", u"syncChartInfoDbButton", None))
+        self.label_15.setText(QCoreApplication.translate("TabDb_Manage", u"syncChartInfoDb.description", None))
         pass
     # retranslateUi
-

ui/designer/tabs/tabOverview.ui

@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>TabOverview</class>
- <widget class="QWidget" name="TabOverview">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>696</width>
-    <height>509</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string notr="true">TabOverview</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QWidget" name="widget" native="true"/>
-   </item>
-   <item>
-    <widget class="QLabel" name="databaseDescribeLabel">
-     <property name="text">
-      <string notr="true" extracomment="This database now have {} packs, {} songs, {} difficulties, {} chart info ({} complete) and {} scores.">...</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QWidget" name="widget_2" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <item>
-       <widget class="QWidget" name="widget_3" native="true">
-        <layout class="QVBoxLayout" name="verticalLayout_2">
-         <item>
-          <widget class="QLabel" name="b30Label">
-           <property name="font">
-            <font>
-             <pointsize>30</pointsize>
-            </font>
-           </property>
-           <property name="text">
-            <string notr="true">0.00</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignBottom|Qt::AlignHCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="label_2">
-           <property name="font">
-            <font>
-             <pointsize>20</pointsize>
-            </font>
-           </property>
-           <property name="text">
-            <string notr="true">B30</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignHCenter|Qt::AlignTop</set>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item>
-       <widget class="QWidget" name="widget_4" native="true">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <layout class="QVBoxLayout" name="verticalLayout_3">
-         <item>
-          <widget class="QLabel" name="r10Label">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="font">
-            <font>
-             <pointsize>30</pointsize>
-            </font>
-           </property>
-           <property name="text">
-            <string notr="true">--</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignBottom|Qt::AlignHCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="label_4">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="font">
-            <font>
-             <pointsize>20</pointsize>
-            </font>
-           </property>
-           <property name="text">
-            <string notr="true">R10</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignHCenter|Qt::AlignTop</set>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

ui/designer/tabs/tabOverview_ui.py

@@ -1,114 +0,0 @@
-# -*- coding: utf-8 -*-
-
-################################################################################
-## Form generated from reading UI file 'tabOverview.ui'
-##
-## Created by: Qt User Interface Compiler version 6.5.2
-##
-## WARNING! All changes made in this file will be lost when recompiling UI file!
-################################################################################
-
-from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale,
-    QMetaObject, QObject, QPoint, QRect,
-    QSize, QTime, QUrl, Qt)
-from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
-    QFont, QFontDatabase, QGradient, QIcon,
-    QImage, QKeySequence, QLinearGradient, QPainter,
-    QPalette, QPixmap, QRadialGradient, QTransform)
-from PySide6.QtWidgets import (QApplication, QHBoxLayout, QLabel, QSizePolicy,
-    QVBoxLayout, QWidget)
-
-class Ui_TabOverview(object):
-    def setupUi(self, TabOverview):
-        if not TabOverview.objectName():
-            TabOverview.setObjectName(u"TabOverview")
-        TabOverview.resize(696, 509)
-        TabOverview.setWindowTitle(u"TabOverview")
-        self.verticalLayout = QVBoxLayout(TabOverview)
-        self.verticalLayout.setObjectName(u"verticalLayout")
-        self.widget = QWidget(TabOverview)
-        self.widget.setObjectName(u"widget")
-
-        self.verticalLayout.addWidget(self.widget)
-
-        self.databaseDescribeLabel = QLabel(TabOverview)
-        self.databaseDescribeLabel.setObjectName(u"databaseDescribeLabel")
-        self.databaseDescribeLabel.setText(u"...")
-
-        self.verticalLayout.addWidget(self.databaseDescribeLabel)
-
-        self.widget_2 = QWidget(TabOverview)
-        self.widget_2.setObjectName(u"widget_2")
-        sizePolicy = QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Expanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.widget_2.sizePolicy().hasHeightForWidth())
-        self.widget_2.setSizePolicy(sizePolicy)
-        self.horizontalLayout = QHBoxLayout(self.widget_2)
-        self.horizontalLayout.setObjectName(u"horizontalLayout")
-        self.widget_3 = QWidget(self.widget_2)
-        self.widget_3.setObjectName(u"widget_3")
-        self.verticalLayout_2 = QVBoxLayout(self.widget_3)
-        self.verticalLayout_2.setObjectName(u"verticalLayout_2")
-        self.b30Label = QLabel(self.widget_3)
-        self.b30Label.setObjectName(u"b30Label")
-        font = QFont()
-        font.setPointSize(30)
-        self.b30Label.setFont(font)
-        self.b30Label.setText(u"0.00")
-        self.b30Label.setAlignment(Qt.AlignBottom|Qt.AlignHCenter)
-
-        self.verticalLayout_2.addWidget(self.b30Label)
-
-        self.label_2 = QLabel(self.widget_3)
-        self.label_2.setObjectName(u"label_2")
-        font1 = QFont()
-        font1.setPointSize(20)
-        self.label_2.setFont(font1)
-        self.label_2.setText(u"B30")
-        self.label_2.setAlignment(Qt.AlignHCenter|Qt.AlignTop)
-
-        self.verticalLayout_2.addWidget(self.label_2)
-
-
-        self.horizontalLayout.addWidget(self.widget_3)
-
-        self.widget_4 = QWidget(self.widget_2)
-        self.widget_4.setObjectName(u"widget_4")
-        self.widget_4.setEnabled(False)
-        self.verticalLayout_3 = QVBoxLayout(self.widget_4)
-        self.verticalLayout_3.setObjectName(u"verticalLayout_3")
-        self.r10Label = QLabel(self.widget_4)
-        self.r10Label.setObjectName(u"r10Label")
-        self.r10Label.setEnabled(False)
-        self.r10Label.setFont(font)
-        self.r10Label.setText(u"--")
-        self.r10Label.setAlignment(Qt.AlignBottom|Qt.AlignHCenter)
-
-        self.verticalLayout_3.addWidget(self.r10Label)
-
-        self.label_4 = QLabel(self.widget_4)
-        self.label_4.setObjectName(u"label_4")
-        self.label_4.setEnabled(False)
-        self.label_4.setFont(font1)
-        self.label_4.setText(u"R10")
-        self.label_4.setAlignment(Qt.AlignHCenter|Qt.AlignTop)
-
-        self.verticalLayout_3.addWidget(self.label_4)
-
-
-        self.horizontalLayout.addWidget(self.widget_4)
-
-
-        self.verticalLayout.addWidget(self.widget_2)
-
-
-        self.retranslateUi(TabOverview)
-
-        QMetaObject.connectSlotsByName(TabOverview)
-    # setupUi
-
-    def retranslateUi(self, TabOverview):
-        pass
-    # retranslateUi
-

ui/extends/components/ocrQueue.py

@@ -5,7 +5,6 @@ from typing import Any, Callable, Optional, overload
 from arcaea_offline.calculate import calculate_score_range
 from arcaea_offline.database import Database
 from arcaea_offline.models import Chart, Score
-from arcaea_offline_ocr.b30.shared import B30OcrResultItem
 from arcaea_offline_ocr.device.common import DeviceOcrResult
 from PIL import Image
 from PIL.ImageQt import ImageQt
@@ -140,7 +139,11 @@ class OcrQueueModel(QAbstractListModel):
             return True
         else:
             logger.warning(
-                f"{repr(self)} setData at row {index.row()} with role {role} and value {value} rejected."
+                "%r setData at row %d with role %d and value %s rejected!",
+                self,
+                index.row(),
+                role,
+                value,
             )
             return False
 
@@ -150,6 +153,7 @@ class OcrQueueModel(QAbstractListModel):
 
     @iccOption.setter
     def iccOption(self, opt: IccOption):
+        logger.debug("ICC option changed to %s", opt)
         self.__iccOption = opt
 
     @overload
@@ -158,8 +162,7 @@ class OcrQueueModel(QAbstractListModel):
         image: str,
         runnable: OcrRunnable = None,
         process_func: Callable[[Optional[str], QImage, Any], Score] = None,
-    ):
-        ...
+    ): ...
 
     @overload
     def addItem(
@@ -167,8 +170,7 @@ class OcrQueueModel(QAbstractListModel):
         image: QImage,
         runnable: OcrRunnable = None,
         process_func: Callable[[Optional[str], QImage, Any], Score] = None,
-    ):
-        ...
+    ): ...
 
     def addItem(
         self,
@@ -178,7 +180,7 @@ class OcrQueueModel(QAbstractListModel):
     ):
         if isinstance(image, str):
             if image in self.imagePaths or not QFileInfo(image).exists():
-                logger.warning(f"Attempting to add an invalid file {image}")
+                logger.warning("Attempting to add an invalid file %s", image)
                 return
             imagePath = image
             if self.iccOption == IccOption.TryFix:
@@ -222,7 +224,7 @@ class OcrQueueModel(QAbstractListModel):
         index = self.index(row, 0)
         imagePath: str = index.data(self.ImagePathRole)
         qImage: QImage = index.data(self.ImageQImageRole)
-        logger.debug(f"update request: {result}@row{row}")
+        logger.debug("update request: %r@row%d", result, row)
         processOcrResultFunc = index.data(self.ProcessOcrResultFuncRole)
 
         chart, scoreInsert = processOcrResultFunc(imagePath, qImage, result)
@@ -293,8 +295,8 @@ class OcrQueueModel(QAbstractListModel):
             self.__items.pop(row)
             self.endRemoveRows()
             return
-        except Exception as e:
-            logger.exception(f"Error accepting {repr(item)}")
+        except Exception:
+            logger.exception("Error accepting %r", item)
             return
 
     def acceptItems(self, __rows: list[int], ignoreValidate: bool = False):
@@ -343,13 +345,11 @@ class OcrQueueTableProxyModel(QAbstractTableModel):
 
     def retranslateHeaders(self):
         self.__horizontalHeaders = [
-            # fmt: off
             QCoreApplication.translate("OcrTableModel", "horizontalHeader.title.select"),
             QCoreApplication.translate("OcrTableModel", "horizontalHeader.title.imagePreview"),
             QCoreApplication.translate("OcrTableModel", "horizontalHeader.title.chart"),
             QCoreApplication.translate("OcrTableModel", "horizontalHeader.title.score"),
-            # fmt: on
-        ]
+        ]  # fmt: skip
 
     def sourceModel(self) -> OcrQueueModel:
         return self.__sourceModel

ui/extends/components/songIdSelector.py

@@ -1,39 +0,0 @@
-from arcaea_offline.database import Database
-from arcaea_offline.models import Chart
-from arcaea_offline.searcher import Searcher
-from arcaea_offline.utils.rating import rating_class_to_short_text
-from PySide6.QtCore import Qt
-from PySide6.QtGui import QStandardItem, QStandardItemModel
-
-
-class SearchCompleterModel(QStandardItemModel):
-    def __init__(self, parent=None):
-        super().__init__(parent)
-        self.searcher = Searcher()
-        self.db = Database()
-
-    def updateSearcherSongs(self):
-        with self.db.sessionmaker() as session:
-            self.searcher.import_songs(session)
-
-    def getSearchResult(self, kw: str):
-        self.clear()
-
-        songIds = self.searcher.search(kw)
-
-        charts: list[Chart] = []
-        for songId in songIds:
-            _charts = self.db.get_charts_by_song_id(songId)
-            _charts = sorted(_charts, key=lambda c: c.rating_class, reverse=True)
-            charts += _charts
-
-        for chart in charts:
-            displayText = (
-                f"{chart.title} [{rating_class_to_short_text(chart.rating_class)}]"
-            )
-            item = QStandardItem(kw)
-            item.setData(kw)
-            item.setData(displayText, Qt.ItemDataRole.UserRole + 75)
-            item.setData(f"{chart.song_id}, {chart.set}", Qt.ItemDataRole.UserRole + 76)
-            item.setData(chart, Qt.ItemDataRole.UserRole + 10)
-            self.appendRow(item)

ui/extends/shared/color.py

@@ -1,16 +0,0 @@
-from PySide6.QtGui import QColor
-
-
-def mix_color(source_color: QColor, mix_color: QColor, mix_ratio: float = 0.5):
-    r = round((mix_color.red() - source_color.red()) * mix_ratio + source_color.red())
-    g = round(
-        (mix_color.green() - source_color.green()) * mix_ratio + source_color.green()
-    )
-    b = round(
-        (mix_color.blue() - source_color.blue()) * mix_ratio + source_color.blue()
-    )
-    a = round(
-        (mix_color.alpha() - source_color.alpha()) * mix_ratio + source_color.alpha()
-    )
-
-    return QColor(r, g, b, a)

ui/extends/shared/data.py

@@ -7,7 +7,7 @@ from typing import Literal, Optional, overload
 from arcaea_offline.models import Chart, Difficulty, Song
 from PySide6.QtCore import QFile
 
-from .singleton import Singleton
+from core.singleton import Singleton
 
 TPartnerModifier = dict[str, Literal[0, 1, 2]]
 
@@ -48,14 +48,12 @@ class Data(metaclass=Singleton):
         return self.dataPath / "Arcaea"
 
     @overload
-    def getJacketPath(self, chart: Chart, /) -> Path | None:
-        ...
+    def getJacketPath(self, chart: Chart, /) -> Path | None: ...
 
     @overload
     def getJacketPath(
         self, song: Song, difficulty: Optional[Difficulty] = None, /
-    ) -> Path | None:
-        ...
+    ) -> Path | None: ...
 
     def getJacketPath(self, *args) -> Path | None:
         if isinstance(args[0], Chart):

ui/extends/shared/database.py

@@ -1,14 +1,4 @@
-from typing import Type
-
-from PySide6.QtCore import QObject, QUrl, Signal
-from sqlalchemy import Engine
-from sqlalchemy import create_engine as sa_create_engine
-from sqlalchemy.pool import NullPool, Pool
-
-
-def create_engine(_url: str | QUrl, pool: Type[Pool] = NullPool) -> Engine:
-    url = _url.toString() if isinstance(_url, QUrl) else _url
-    return sa_create_engine(url, poolclass=pool)
+from PySide6.QtCore import QObject, Signal
 
 
 class DatabaseUpdateSignals(QObject):

ui/extends/shared/delegates/chartDelegate.py

@@ -82,6 +82,7 @@ class ChartDelegate(TextSegmentDelegate):
         QColor("#809955"),
         QColor("#702d60"),
         QColor("#710f25"),
+        QColor("#8b77a4"),
     ]
     ChartInvalidBackgroundColor = QColor("#e6a23c")
 

ui/extends/shared/models/tables/b30.py

@@ -16,13 +16,11 @@ class DbB30TableModel(DbTableModel):
 
     def retranslateHeaders(self):
         self._horizontalHeaders = [
-            # fmt: off
             QCoreApplication.translate("DbB30TableModel", "horizontalHeader.id"),
             QCoreApplication.translate("DbB30TableModel", "horizontalHeader.chart"),
             QCoreApplication.translate("DbB30TableModel", "horizontalHeader.score"),
             QCoreApplication.translate("DbB30TableModel", "horizontalHeader.potential"),
-            # fmt: on
-        ]
+        ]  # fmt: skip
 
     def syncDb(self):
         self.beginResetModel()
@@ -39,7 +37,7 @@ class DbB30TableModel(DbTableModel):
                     (ScoreBest.song_id == Chart.song_id)
                     & (ScoreBest.rating_class == Chart.rating_class),
                 )
-                .order_by(ScoreBest.potential)
+                .order_by(ScoreBest.potential.desc())
                 .limit(50)
                 .all()
             )

ui/extends/shared/models/tables/score.py

@@ -24,13 +24,11 @@ class DbScoreTableModel(DbTableModel):
 
     def retranslateHeaders(self):
         self._horizontalHeaders = [
-            # fmt: off
             QCoreApplication.translate("DbScoreTableModel", "horizontalHeader.id"),
             QCoreApplication.translate("DbScoreTableModel", "horizontalHeader.chart"),
             QCoreApplication.translate("DbScoreTableModel", "horizontalHeader.score"),
             QCoreApplication.translate("DbScoreTableModel", "horizontalHeader.potential"),
-            # fmt: on
-        ]
+        ]  # fmt: skip
 
     def syncDb(self):
         self.beginResetModel()
@@ -154,7 +152,7 @@ class DbScoreTableModel(DbTableModel):
                 self.syncDb()
             return True
         except Exception:
-            logger.exception(f"Table[Score]: Cannot remove row {row}")
+            logger.exception("Table[Score]: Cannot remove row %s", row)
             return False
 
     def removeRow(self, row: int, parent=...):

ui/extends/shared/settings.py

@@ -1,111 +0,0 @@
-import sys
-
-from PySide6.QtCore import QFileInfo, QSettings, Signal
-
-from .singleton import QObjectSingleton
-
-__all__ = [
-    "LANGUAGE",
-    "DATABASE_URL",
-    "KNN_MODEL_FILE",
-    "B30_KNN_MODEL_FILE",
-    "PHASH_DATABASE_FILE",
-    "ANDREAL_FOLDER",
-    "ANDREAL_EXECUTABLE",
-    "Settings",
-]
-
-# a key without slashes will appear in the "General" section
-# see https://doc.qt.io/qt-6/qsettings.html#Format-enum for details
-LANGUAGE = "Language"
-DATABASE_URL = "DatabaseUrl"
-
-KNN_MODEL_FILE = "Ocr/KnnModelFile"
-B30_KNN_MODEL_FILE = "Ocr/B30KnnModelFile"
-PHASH_DATABASE_FILE = "Ocr/PHashDatabaseFile"
-
-ANDREAL_FOLDER = "Andreal/AndrealFolder"
-ANDREAL_EXECUTABLE = "Andreal/AndrealExecutable"
-
-
-class Settings(QSettings, metaclass=QObjectSingleton):
-    updated = Signal(str)
-
-    def __init__(self, parent=None):
-        super().__init__(
-            QFileInfo(sys.argv[0]).dir().absoluteFilePath("arcaea_offline.ini"),
-            QSettings.Format.IniFormat,
-            parent,
-        )
-
-    def setValue(self, key: str, value) -> None:
-        super().setValue(key, value)
-        self.updated.emit(key)
-
-    def _strItem(self, key: str) -> str | None:
-        return self.value(key, None, str)
-
-    def _setStrItem(self, key: str, value: str):
-        self.setValue(key, value)
-        self.sync()
-
-    def _resetStrItem(self, key: str):
-        self.setValue(key, None)
-        self.sync()
-
-    def language(self):
-        return self._strItem(LANGUAGE)
-
-    def setLanguage(self, value: str):
-        self._setStrItem(LANGUAGE, value)
-
-    def databaseUrl(self):
-        return self._strItem(DATABASE_URL)
-
-    def setDatabaseUrl(self, value: str):
-        self._setStrItem(DATABASE_URL, value)
-
-    def knnModelFile(self):
-        return self._strItem(KNN_MODEL_FILE)
-
-    def setKnnModelFile(self, value: str):
-        self._setStrItem(KNN_MODEL_FILE, value)
-
-    def resetKnnModelFile(self):
-        self._resetStrItem(KNN_MODEL_FILE)
-
-    def b30KnnModelFile(self):
-        return self._strItem(B30_KNN_MODEL_FILE)
-
-    def setB30KnnModelFile(self, value: str):
-        self._setStrItem(B30_KNN_MODEL_FILE, value)
-
-    def resetB30KnnModelFile(self):
-        self._resetStrItem(B30_KNN_MODEL_FILE)
-
-    def phashDatabaseFile(self):
-        return self._strItem(PHASH_DATABASE_FILE)
-
-    def setPHashDatabaseFile(self, value: str):
-        self._setStrItem(PHASH_DATABASE_FILE, value)
-
-    def resetPHashDatabaseFile(self):
-        self._resetStrItem(PHASH_DATABASE_FILE)
-
-    def andrealFolder(self):
-        return self._strItem(ANDREAL_FOLDER)
-
-    def setAndrealFolder(self, value: str):
-        self._setStrItem(ANDREAL_FOLDER, value)
-
-    def resetAndrealFolder(self):
-        self._resetStrItem(ANDREAL_FOLDER)
-
-    def andrealExecutable(self):
-        return self._strItem(ANDREAL_EXECUTABLE)
-
-    def setAndrealExecutable(self, value: str):
-        self._setStrItem(ANDREAL_EXECUTABLE, value)
-
-    def resetAndrealExecutable(self):
-        self._resetStrItem(ANDREAL_EXECUTABLE)

ui/extends/tabs/tabOcr/tabOcr_B30.py

@@ -6,10 +6,10 @@ from arcaea_offline_ocr.b30.chieri.v4.ocr import ChieriBotV4Ocr
 from arcaea_offline_ocr.b30.shared import B30OcrResultItem
 from PySide6.QtGui import QImage
 
-logger = logging.getLogger(__name__)
-
 from ui.extends.components.ocrQueue import OcrRunnable
 
+logger = logging.getLogger(__name__)
+
 
 class ChieriV4OcrRunnable(OcrRunnable):
     def __init__(self, ocr: ChieriBotV4Ocr, component):

ui/extends/tabs/tabOcr/tabOcr_Device.py

@@ -19,6 +19,7 @@ from arcaea_offline_ocr.phash_db import ImagePhashDatabase
 from arcaea_offline_ocr.utils import imread_unicode
 from PySide6.QtCore import QDateTime, QFileInfo
 
+from core.settings import SettingsKeys, SettingsValues, settings
 from ui.extends.components.ocrQueue import OcrRunnable
 from ui.extends.shared.data import Data
 
@@ -67,8 +68,14 @@ def getImageDate(imagePath: str) -> QDateTime:
         if exifImage.has_exif and exifImage.get("datetime_original"):
             datetimeStr = exifImage.get("datetime_original")
             datetime = QDateTime.fromString(datetimeStr, "yyyy:MM:dd hh:mm:ss")
+
     if not isinstance(datetime, QDateTime):
-        datetime = QFileInfo(imagePath).birthTime()
+        dateSource = settings.stringValue(SettingsKeys.Ocr.DateSource)
+        if dateSource == SettingsValues.Ocr.DateSource.FileLastModified:
+            datetime = QFileInfo(imagePath).lastModified()
+        else:
+            datetime = QFileInfo(imagePath).birthTime()
+
     return datetime
 
 

ui/extends/tabs/tabTools/tabTools_Andreal.py

@@ -41,7 +41,7 @@ class AndrealExecuteRunnable(QRunnable):
             self.signals.completed.emit(self.jsonPath, imageBytes)
         except Exception as e:
             imageBytes = None
-            logger.exception(f"{self.__class__.__name__} error")
+            logger.exception("%s error", self.__class__.__name__)
             self.signals.error.emit(self.jsonPath, str(e))
         finally:
             os.unlink(self.jsonPath)
@@ -84,7 +84,10 @@ class AndrealHelper(QObject):
 
     def request(self, jsonPath: str, arguments: list[str]):
         logger.debug(
-            f"{self.__class__.__name__} received request {jsonPath=} {arguments=}"
+            "%s received request jsonPath=%r arguments=%r",
+            self.__class__.__name__,
+            jsonPath,
+            arguments,
         )
         runnable = AndrealExecuteRunnable(self.andrealExecutable, jsonPath, arguments)
         runnable.signals.error.connect(self.error)

ui/implements/components/fileSelector.py

@@ -2,9 +2,9 @@ from PySide6.QtCore import QDir, QFileInfo, Qt, Signal, Slot
 from PySide6.QtGui import QDragEnterEvent, QDragLeaveEvent, QDropEvent
 from PySide6.QtWidgets import QFileDialog, QWidget
 
+from core.settings import settings
 from ui.designer.components.fileSelector_ui import Ui_FileSelector
 from ui.extends.shared.language import LanguageChangeEventFilter
-from ui.extends.shared.settings import Settings
 
 
 class FileSelector(Ui_FileSelector, QWidget):
@@ -122,13 +122,13 @@ class FileSelector(Ui_FileSelector, QWidget):
         if self.__selectedFiles:
             return
 
-        if value := Settings().value(self.settingsKey):
+        if value := settings.value(self.settingsKey):
             self.selectFile(value)
 
-        Settings().updated.connect(self.settingsUpdated)
+        settings.updated.connect(self.settingsUpdated)
 
     def disconnectSettings(self):
-        Settings().updated.disconnect(self.settingsUpdated)
+        settings.updated.disconnect(self.settingsUpdated)
         self.settingsKey = None
 
     def settingsUpdated(self, key: str):
@@ -139,4 +139,4 @@ class FileSelector(Ui_FileSelector, QWidget):
         if self.__selectedFiles:
             return
 
-        self.selectFile(Settings().value(self.settingsKey))
+        self.selectFile(settings.value(self.settingsKey))

ui/implements/components/ocrQueue.py

@@ -2,7 +2,7 @@ from typing import Optional
 
 from PySide6.QtCore import Qt, QTimer, Slot
 from PySide6.QtGui import QColor, QPalette
-from PySide6.QtWidgets import QButtonGroup, QWidget
+from PySide6.QtWidgets import QWidget
 
 from ui.designer.components.ocrQueue_ui import Ui_OcrQueue
 from ui.extends.components.ocrQueue import (
@@ -13,6 +13,7 @@ from ui.extends.components.ocrQueue import (
     OcrScoreDelegate,
 )
 from ui.extends.shared.language import LanguageChangeEventFilter
+from ui.implements.components.ocrQueueOptionsDialog import OcrQueueOptionsDialog
 
 
 class OcrQueue(Ui_OcrQueue, QWidget):
@@ -26,6 +27,9 @@ class OcrQueue(Ui_OcrQueue, QWidget):
         self.__model: Optional[OcrQueueModel] = None
         self.__tableProxyModel: Optional[OcrQueueTableProxyModel] = None
 
+        self.optionsDialog = OcrQueueOptionsDialog(self)
+        self.optionsDialog.iccOptionsChanged.connect(self.setIccOption)
+
         self.__firstResizeDone = False
         self.resizeTimer = QTimer(self)
         self.resizeTimer.timeout.connect(self.tableView.resizeRowsToContents)
@@ -41,13 +45,6 @@ class OcrQueue(Ui_OcrQueue, QWidget):
         tableViewPalette.setColor(QPalette.ColorRole.Highlight, highlightColor)
         self.tableView.setPalette(tableViewPalette)
 
-        self.iccOptionButtonGroup = QButtonGroup(self)
-        self.iccOptionButtonGroup.buttonToggled.connect(self.updateIccOption)
-        self.iccOptionButtonGroup.addButton(self.iccUseQtRadioButton, 0)
-        self.iccOptionButtonGroup.addButton(self.iccUsePILRadioButton, 1)
-        self.iccOptionButtonGroup.addButton(self.iccTryFixRadioButton, 2)
-        self.updateIccOption()
-
         self.statusLabelClearTimer = QTimer(self)
         self.statusLabelClearTimer.setSingleShot(True)
         self.statusLabelClearTimer.timeout.connect(self.clearStatusMessage)
@@ -93,9 +90,10 @@ class OcrQueue(Ui_OcrQueue, QWidget):
         self.ocr_acceptAllButton.setEnabled(__bool)
         self.ocr_ignoreValidateCheckBox.setEnabled(__bool)
 
-    def updateIccOption(self):
+    @Slot(int)
+    def setIccOption(self, option):
         if self.model():
-            self.model().iccOption = self.iccOptionButtonGroup.checkedId()
+            self.model().iccOption = option
 
     def showStatusMessage(self, message: str):
         self.statusLabel.setText(message)
@@ -131,6 +129,10 @@ class OcrQueue(Ui_OcrQueue, QWidget):
     def modelReseted(self):
         self.progressBar.setMaximum(0)
 
+    @Slot()
+    def on_optionsDialogButton_clicked(self):
+        self.optionsDialog.exec()
+
     @Slot()
     def on_ocr_removeSelectedButton_clicked(self):
         if self.model():

ui/implements/components/ocrQueueOptionsDialog.py

@@ -0,0 +1,49 @@
+from PySide6.QtCore import Signal
+from PySide6.QtWidgets import QButtonGroup, QDialog
+
+from core.settings import SettingsKeys, SettingsValues, settings
+from ui.designer.components.ocrQueueOptionsDialog_ui import Ui_OcrQueueOptionsDialog
+
+
+class OcrQueueOptionsDialog(QDialog, Ui_OcrQueueOptionsDialog):
+    iccOptionsChanged = Signal(int)
+
+    def __init__(self, parent=None):
+        super(OcrQueueOptionsDialog, self).__init__(parent)
+        self.setupUi(self)
+
+        self.iccOptionButtonGroup = QButtonGroup(self)
+        self.iccOptionButtonGroup.buttonToggled.connect(
+            lambda: self.iccOptionsChanged.emit(self.iccOptionButtonGroup.checkedId())
+        )
+        self.iccOptionButtonGroup.addButton(self.iccUseQtRadioButton, 0)
+        self.iccOptionButtonGroup.addButton(self.iccUsePILRadioButton, 1)
+        self.iccOptionButtonGroup.addButton(self.iccTryFixRadioButton, 2)
+
+        self.scoreDateSourceButtonGroup = QButtonGroup(self)
+        self.scoreDateSourceButtonGroup.addButton(
+            self.dateUseCreationDateRadioButton, 0
+        )
+        self.scoreDateSourceButtonGroup.addButton(self.dateUseModifyDateRadioButton, 1)
+        self.scoreDateSourceButtonGroup.buttonClicked.connect(
+            self.on_scoreDateSourceButtonGroup_buttonClicked
+        )
+
+        settings.updated.connect(self.syncCheckboxesFromSettings)
+        self.syncCheckboxesFromSettings()
+
+    def syncCheckboxesFromSettings(self):
+        scoreDateSource = settings.stringValue(SettingsKeys.Ocr.DateSource)
+        if scoreDateSource == SettingsValues.Ocr.DateSource.FileLastModified:
+            self.dateUseModifyDateRadioButton.setChecked(True)
+        else:
+            self.dateUseCreationDateRadioButton.setChecked(True)
+
+    def on_scoreDateSourceButtonGroup_buttonClicked(self, button):
+        buttonId = self.scoreDateSourceButtonGroup.id(button)
+        if buttonId == 1:
+            value = SettingsValues.Ocr.DateSource.FileLastModified
+        else:
+            value = SettingsValues.Ocr.DateSource.FileCreated
+
+        settings.setValue(SettingsKeys.Ocr.DateSource, value)

ui/implements/components/ratingClassRadioButton.py

@@ -2,7 +2,7 @@ from PySide6.QtCore import Slot
 from PySide6.QtGui import QColor
 from PySide6.QtWidgets import QGraphicsColorizeEffect, QRadioButton
 
-from ui.extends.shared.color import mix_color
+from core.color import mixColor
 
 STYLESHEET = """
 QRadioButton {{
@@ -40,7 +40,7 @@ class RatingClassRadioButton(QRadioButton):
     def setColors(self, dark_color: QColor, text_color: QColor):
         self._dark_color = dark_color
         self._text_color = text_color
-        self._mid_color = mix_color(dark_color, text_color, 0.616)
+        self._mid_color = mixColor(dark_color, text_color, 0.616)
         self.updateEffects()
 
     def isColorsSet(self) -> bool:

ui/implements/components/ratingClassSelector.py

@@ -1,3 +1,4 @@
+import logging
 from typing import Type
 
 from PySide6.QtCore import Signal
@@ -6,6 +7,8 @@ from PySide6.QtWidgets import QHBoxLayout, QSizePolicy, QVBoxLayout, QWidget
 
 from ui.implements.components.ratingClassRadioButton import RatingClassRadioButton
 
+logger = logging.getLogger(__name__)
+
 
 class RatingClassSelector(QWidget):
     valueChanged = Signal()
@@ -41,16 +44,30 @@ class RatingClassSelector(QWidget):
         self.bydButton.setAutoExclusive(False)
         self.preferredLayout.addWidget(self.bydButton)
 
-        self.buttons = [self.pstButton, self.prsButton, self.ftrButton, self.bydButton]
+        self.etrButton = RatingClassRadioButton(self)
+        self.etrButton.setObjectName("etrButton")
+        self.etrButton.setText("ETERNAL")
+        self.etrButton.setAutoExclusive(False)
+        self.preferredLayout.addWidget(self.etrButton)
+
+        self.buttons = [
+            self.pstButton,
+            self.prsButton,
+            self.ftrButton,
+            self.bydButton,
+            self.etrButton,
+        ]
         self.pstButton.setColors(QColor("#399bb2"), QColor("#f0f8fa"))
         self.prsButton.setColors(QColor("#809955"), QColor("#f7f9f4"))
         self.ftrButton.setColors(QColor("#702d60"), QColor("#f7ebf4"))
         self.bydButton.setColors(QColor("#710f25"), QColor("#f9ced8"))
+        self.etrButton.setColors(QColor("#4f2c7a"), QColor("#e4daf1"))
 
         self.pstButton.clicked.connect(self.select)
         self.prsButton.clicked.connect(self.select)
         self.ftrButton.clicked.connect(self.select)
         self.bydButton.clicked.connect(self.select)
+        self.etrButton.clicked.connect(self.select)
         self.reset()
         self.setButtonsEnabled([])
 
@@ -106,9 +123,10 @@ class RatingClassSelector(QWidget):
 
         if ratingClass is None or isinstance(ratingClass, bool):
             button = self.sender()
-        elif ratingClass in range(4):
+        elif ratingClass in range(len(self.buttons)):
             button = self.buttons[ratingClass]
         else:
+            logger.debug("Cannot select ratingClass=%s, condition check failed", ratingClass)
             return
 
         if not button.isEnabled():

ui/implements/components/scoreEditor.py

@@ -61,30 +61,22 @@ class ScoreEditor(Ui_ScoreEditor, QWidget):
 
     VALIDATION_ITEMS_TEXT = [
         [
-            # fmt: off
             lambda: QCoreApplication.translate("ScoreEditor", "confirmDialog.chartIncomplete.title"),
             lambda: QCoreApplication.translate("ScoreEditor", "confirmDialog.chartIncomplete.text"),
-            # fmt: on
         ],
         [
-            # fmt: off
             lambda: QCoreApplication.translate("ScoreEditor", "confirmDialog.scoreMismatch.title"),
             lambda: QCoreApplication.translate("ScoreEditor", "confirmDialog.scoreMismatch.text"),
-            # fmt: on
         ],
         [
-            # fmt: off
             lambda: QCoreApplication.translate("ScoreEditor", "confirmDialog.emptyScore.title"),
             lambda: QCoreApplication.translate("ScoreEditor", "confirmDialog.emptyScore.text"),
-            # fmt: on
         ],
         [
-            # fmt: off
             lambda: QCoreApplication.translate("ScoreEditor", "confirmDialog.scoreIncompleteForValidate.title"),
             lambda: QCoreApplication.translate("ScoreEditor", "confirmDialog.scoreIncompleteForValidate.text"),
-            # fmt: on,
         ],
-    ]
+    ]  # fmt: skip
 
     def __init__(self, parent=None):
         super().__init__(parent)
@@ -208,20 +200,16 @@ class ScoreEditor(Ui_ScoreEditor, QWidget):
         if validate & ScoreValidateResult.ChartNotSet:
             self.__triggerMessageBox(
                 "critical",
-                # fmt: off
                 QCoreApplication.translate("ScoreEditor", "confirmDialog.chartNotSet.title"),
                 QCoreApplication.translate("ScoreEditor", "confirmDialog.chartNotSet.text"),
-                # fmt: on
-            )
+            )  # fmt: skip
             return False
         if validate & ScoreValidateResult.ScoreIncomplete:
             self.__triggerMessageBox(
                 "critical",
-                # fmt: off
                 QCoreApplication.translate("ScoreEditor", "confirmDialog.scoreIncomplete.title"),
                 QCoreApplication.translate("ScoreEditor", "confirmDialog.scoreIncomplete.text"),
-                # fmt: on
-            )
+            )  # fmt: skip
             return False
 
         # since validate may have multiple results
@@ -347,10 +335,8 @@ class ScoreEditor(Ui_ScoreEditor, QWidget):
             )
         if validate & ScoreValidateResult.ScoreIncompleteForValidate:
             texts.append(
-                # fmt: off
                 QCoreApplication.translate("ScoreEditor", "validate.scoreIncompleteForValidate")
-                # fmt: on
-            )
+            )  # fmt: skip
 
         if not texts:
             texts.append(

ui/implements/components/songIdSelector.py

@@ -1,14 +1,18 @@
+import dataclasses
 import logging
 import re
 from enum import IntEnum
+from typing import Any
 
 from arcaea_offline.database import Database
 from arcaea_offline.models import Chart
-from PySide6.QtCore import QModelIndex, QSignalMapper, Qt, Signal, Slot
-from PySide6.QtWidgets import QCompleter, QWidget
+from arcaea_offline.searcher import Searcher
+from arcaea_offline.utils.rating import rating_class_to_short_text
+from PySide6.QtCore import QModelIndex, QObject, QSignalMapper, Qt, Signal, Slot
+from PySide6.QtGui import QStandardItem, QStandardItemModel
+from PySide6.QtWidgets import QComboBox, QCompleter, QWidget
 
 from ui.designer.components.songIdSelector_ui import Ui_SongIdSelector
-from ui.extends.components.songIdSelector import SearchCompleterModel
 from ui.extends.shared.database import databaseUpdateSignals
 from ui.extends.shared.delegates.descriptionDelegate import DescriptionDelegate
 from ui.extends.shared.language import LanguageChangeEventFilter
@@ -21,6 +25,168 @@ class SongIdSelectorMode(IntEnum):
     Chart = 1
 
 
+# region logics
+
+
+@dataclasses.dataclass
+class _ComboBoxItem:
+    text: str
+    userData: Any
+    additionalData: dict[int, Any]
+
+    def apply(self, comboBox: QComboBox):
+        comboBox.addItem(self.text, self.userData)
+
+        index = comboBox.findText(self.text)
+        if index > -1:
+            for role, value in self.additionalData.items():
+                comboBox.setItemData(index, value, role)
+
+
+class SearchCompleterModel(QStandardItemModel):
+    ChartRole = Qt.ItemDataRole.UserRole + 10
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        self.searcher = Searcher()
+        self.db = Database()
+
+    def updateSearcherSongs(self):
+        with self.db.sessionmaker() as session:
+            self.searcher.import_songs(session)
+
+    def getSearchResult(self, kw: str):
+        self.clear()
+
+        songIds = self.searcher.search(kw)
+
+        charts: list[Chart] = []
+        for songId in songIds:
+            _charts = self.db.get_charts_by_song_id(songId)
+            _charts = sorted(_charts, key=lambda c: c.rating_class, reverse=True)
+            charts += _charts
+
+        for chart in charts:
+            displayText = (
+                f"{chart.title} [{rating_class_to_short_text(chart.rating_class)}]"
+            )
+            item = QStandardItem(kw)
+            item.setData(kw)
+            item.setData(displayText, DescriptionDelegate.MainTextRole)
+            item.setData(
+                f"{chart.song_id}, {chart.set}", DescriptionDelegate.DescriptionTextRole
+            )
+            item.setData(chart, self.ChartRole)
+            self.appendRow(item)
+
+
+class SongIdSelectorViewModel(QObject):
+    packComboBoxItemsReady = Signal()
+    songIdComboBoxItemsReady = Signal()
+
+    def __init__(self, parent=None, *, db: Database):
+        super().__init__(parent)
+
+        if not isinstance(db, Database):
+            raise TypeError(
+                "`db` should be an instance of arcaea_offline.database.Database"
+            )
+
+        self.__db: Database = None  # type: ignore
+        self.__mode = SongIdSelectorMode.SongId
+
+        self.__packComboBoxItems: list[_ComboBoxItem] = []
+        self.__songIdComboBoxItems: list[_ComboBoxItem] = []
+
+        self.setDatabase(db)
+
+    @property
+    def packComboBoxItems(self):
+        return self.__packComboBoxItems
+
+    @property
+    def songIdComboBoxItems(self):
+        return self.__songIdComboBoxItems
+
+    @property
+    def mode(self):
+        return self.__mode
+
+    @mode.setter
+    def mode(self, value):
+        if not isinstance(value, SongIdSelectorMode):
+            raise TypeError("value is not SongIdSelectorMode")
+        self.__mode = value
+
+    def setDatabase(self, db: Database):
+        self.__db = db
+
+    def updatePackComboBoxItems(self):
+        packs = self.__db.get_packs()
+
+        self.__packComboBoxItems.clear()
+        for pack in packs:
+            if re.search(r"_append_.*$", pack.id):
+                basePackId = re.sub(r"_append_.*$", "", pack.id)
+                basePackName = self.__db.get_pack(basePackId).name  # type: ignore
+                packName = f"{basePackName} - {pack.name}"
+            else:
+                packName = pack.name
+
+            self.__packComboBoxItems.append(
+                _ComboBoxItem(
+                    text=f"{packName} ({pack.id})",
+                    userData=pack.id,
+                    additionalData={
+                        DescriptionDelegate.MainTextRole: packName,
+                        DescriptionDelegate.DescriptionTextRole: pack.id,
+                    },
+                )
+            )
+
+        self.packComboBoxItemsReady.emit()
+
+    def updateSongIdComboBoxItems(self, packId: str):
+        self.__songIdComboBoxItems.clear()
+
+        items = []
+        if self.mode == SongIdSelectorMode.SongId:
+            items = self.__db.get_songs_by_pack_id(packId)
+        elif self.mode == SongIdSelectorMode.Chart:
+            items = self.__db.get_charts_by_pack_id(packId)
+        else:
+            assert not "reachable"
+
+        insertedSongIds = []
+
+        for item in items:
+            if self.mode == SongIdSelectorMode.SongId:
+                itemId = item.id  # type: ignore
+            elif self.mode == SongIdSelectorMode.Chart:
+                itemId = item.song_id  # type: ignore
+            else:
+                continue
+
+            if itemId not in insertedSongIds:
+                self.__songIdComboBoxItems.append(
+                    _ComboBoxItem(
+                        text=f"{item.title} ({itemId})",
+                        userData=itemId,
+                        additionalData={
+                            DescriptionDelegate.MainTextRole: item.title,
+                            DescriptionDelegate.DescriptionTextRole: itemId,
+                        },
+                    )
+                )
+
+                insertedSongIds.append(itemId)
+
+        self.songIdComboBoxItemsReady.emit()
+
+
+# endregion
+
+
 class SongIdSelector(Ui_SongIdSelector, QWidget):
     valueChanged = Signal()
     quickSearchActivated = Signal(Chart)
@@ -33,6 +199,10 @@ class SongIdSelector(Ui_SongIdSelector, QWidget):
         self.languageChangeEventFilter = LanguageChangeEventFilter(self)
         self.installEventFilter(self.languageChangeEventFilter)
 
+        self.vm = SongIdSelectorViewModel(self, db=self.db)
+        self.vm.packComboBoxItemsReady.connect(self.fillPackComboBox)
+        self.vm.songIdComboBoxItemsReady.connect(self.fillSongIdComboBox)
+
         # quick switch bindings
         self.quickSwitchSignalMapper = QSignalMapper(self)
         self.previousPackageButton.clicked.connect(self.quickSwitchSignalMapper.map)
@@ -75,6 +245,7 @@ class SongIdSelector(Ui_SongIdSelector, QWidget):
         databaseUpdateSignals.songAddOrDelete.connect(self.updateDatabase)
 
     def setMode(self, mode: SongIdSelectorMode):
+        self.vm.mode = mode
         self.mode = mode
 
     @Slot(str)
@@ -116,7 +287,7 @@ class SongIdSelector(Ui_SongIdSelector, QWidget):
         pack = self.packComboBox.currentData()
         songId = self.songIdComboBox.currentData()
 
-        self.fillPackComboBox()
+        self.vm.updatePackComboBoxItems()
 
         if pack:
             self.selectPack(pack)
@@ -125,58 +296,24 @@ class SongIdSelector(Ui_SongIdSelector, QWidget):
 
     def fillPackComboBox(self):
         self.packComboBox.clear()
-        packs = self.db.get_packs()
-        for pack in packs:
-            if isAppendPack := re.search(r"_append_.*$", pack.id):
-                basePackId = re.sub(r"_append_.*$", "", pack.id)
-                basePackName = self.db.get_pack(basePackId).name
-                packName = f"{basePackName} - {pack.name}"
-            else:
-                packName = pack.name
-            self.packComboBox.addItem(f"{packName} ({pack.id})", pack.id)
-            row = self.packComboBox.count() - 1
-            self.packComboBox.setItemData(
-                row, packName, DescriptionDelegate.MainTextRole
-            )
-            self.packComboBox.setItemData(
-                row, pack.id, DescriptionDelegate.DescriptionTextRole
-            )
+
+        for item in self.vm.packComboBoxItems:
+            item.apply(self.packComboBox)
 
         self.packComboBox.setCurrentIndex(-1)
 
     def fillSongIdComboBox(self):
         self.songIdComboBox.clear()
-        if packId := self.packComboBox.currentData():
-            if self.mode == SongIdSelectorMode.SongId:
-                items = self.db.get_songs_by_pack_id(packId)
-            elif self.mode == SongIdSelectorMode.Chart:
-                items = self.db.get_charts_by_pack_id(packId)
-            else:
-                raise ValueError("Unknown SongIdSelectorMode.")
-            insertedSongIds = []
-            for item in items:
-                if self.mode == SongIdSelectorMode.SongId:
-                    itemId = item.id
-                elif self.mode == SongIdSelectorMode.Chart:
-                    itemId = item.song_id
-                else:
-                    continue
 
-                if itemId not in insertedSongIds:
-                    self.songIdComboBox.addItem(f"{item.title} ({itemId})", itemId)
-                    insertedSongIds.append(itemId)
-                    row = self.songIdComboBox.count() - 1
-                    self.songIdComboBox.setItemData(
-                        row, item.title, DescriptionDelegate.MainTextRole
-                    )
-                    self.songIdComboBox.setItemData(
-                        row, itemId, DescriptionDelegate.DescriptionTextRole
-                    )
+        for item in self.vm.songIdComboBoxItems:
+            item.apply(self.songIdComboBox)
+
         self.songIdComboBox.setCurrentIndex(-1)
 
     @Slot()
     def on_packComboBox_currentIndexChanged(self):
-        self.fillSongIdComboBox()
+        if packId := self.packComboBox.currentData():
+            self.vm.updateSongIdComboBoxItems(packId)
 
     @Slot(str)
     def on_searchLineEdit_textChanged(self, text: str):
@@ -189,10 +326,10 @@ class SongIdSelector(Ui_SongIdSelector, QWidget):
         packIdIndex = self.packComboBox.findData(packId)
         if packIdIndex > -1:
             self.packComboBox.setCurrentIndex(packIdIndex)
-            self.fillSongIdComboBox()
+            self.vm.updateSongIdComboBoxItems(packId)
             return True
         else:
-            logger.warning(f'Attempting to select an unknown pack "{packId}"')
+            logger.warning("Attempting to select an unknown pack [%s]", packId)
             return False
 
     def selectSongId(self, songId: str) -> bool:
@@ -202,7 +339,8 @@ class SongIdSelector(Ui_SongIdSelector, QWidget):
             return True
         else:
             logger.warning(
-                f'Attempting to select an unknown song "{songId}", maybe try selecting a pack first?'
+                "Attempting to select an unknown song [%s], maybe try selecting a pack first?",
+                songId,
             )
             return False
 
@@ -213,7 +351,7 @@ class SongIdSelector(Ui_SongIdSelector, QWidget):
 
     @Slot(QModelIndex)
     def searchCompleterSetSelection(self, index: QModelIndex):
-        chart: Chart = index.data(Qt.ItemDataRole.UserRole + 10)
+        chart: Chart = index.data(SearchCompleterModel.ChartRole)
         self.selectChart(chart)
         self.quickSearchActivated.emit(chart)
 

ui/implements/settings/settingsAndreal.py

@@ -1,6 +1,7 @@
 from PySide6.QtCore import QCoreApplication
 from PySide6.QtWidgets import QLabel, QPushButton
 
+from core.settings import SettingsKeys, settings
 from ui.implements.components.fileSelector import FileSelector
 from ui.implements.settings.settingsBaseWidget import SettingsBaseWidget
 
@@ -14,8 +15,8 @@ class SettingsAndreal(SettingsBaseWidget):
         self.andrealFolderValueWidget.setMode(
             self.andrealFolderValueWidget.getExistingDirectory
         )
-        if self.settings.andrealFolder():
-            self.andrealFolderValueWidget.selectFile(self.settings.andrealFolder())
+        if andrealFolder := settings.stringValue(SettingsKeys.Andreal.Folder):
+            self.andrealFolderValueWidget.selectFile(andrealFolder)
         self.andrealFolderValueWidget.filesSelected.connect(self.setAndrealFolder)
         self.andrealFolderResetButton.clicked.connect(self.resetAndrealFolder)
         self.insertItem(
@@ -25,10 +26,8 @@ class SettingsAndreal(SettingsBaseWidget):
             self.andrealFolderResetButton,
         )
 
-        if self.settings.andrealExecutable():
-            self.andrealExecutableValueWidget.selectFile(
-                self.settings.andrealExecutable()
-            )
+        if andrealExecutable := settings.stringValue(SettingsKeys.Andreal.Executable):
+            self.andrealExecutableValueWidget.selectFile(andrealExecutable)
         self.andrealExecutableValueWidget.filesSelected.connect(
             self.setAndrealExecutable
         )
@@ -44,21 +43,21 @@ class SettingsAndreal(SettingsBaseWidget):
         selectedFile = self.andrealFolderValueWidget.selectedFiles()
         if selectedFile and selectedFile[0]:
             file = selectedFile[0]
-            self.settings.setAndrealFolder(file)
+            settings.setValue(SettingsKeys.Andreal.Folder, file)
 
     def resetAndrealFolder(self):
         self.andrealFolderValueWidget.reset()
-        self.settings.resetAndrealFolder()
+        settings.setValue(SettingsKeys.Andreal.Folder, None)
 
     def setAndrealExecutable(self):
         selectedFile = self.andrealExecutableValueWidget.selectedFiles()
         if selectedFile and selectedFile[0]:
             file = selectedFile[0]
-            self.settings.setAndrealExecutable(file)
+            settings.setValue(SettingsKeys.Andreal.Executable, file)
 
     def resetAndrealExecutable(self):
         self.andrealExecutableValueWidget.reset()
-        self.settings.resetAndrealExecutable()
+        settings.setValue(SettingsKeys.Andreal.Executable, None)
 
     def setupUi(self, *args):
         self.andrealFolderLabel = QLabel(self)

ui/implements/settings/settingsBaseWidget.py

@@ -1,15 +1,15 @@
 from PySide6.QtCore import Qt
 from PySide6.QtWidgets import QLabel, QPushButton, QWidget
 
+from core.settings import settings
 from ui.designer.settings.settingsBaseWidget_ui import Ui_SettingsBaseWidget
 from ui.extends.shared.language import LanguageChangeEventFilter
-from ui.extends.shared.settings import Settings
 
 
 class SettingsBaseWidget(Ui_SettingsBaseWidget, QWidget):
     def __init__(self, parent=None):
         super().__init__(parent)
-        self.settings = Settings()
+        self.settings = settings
 
         self.languageChangeEventFilter = LanguageChangeEventFilter(self)
         self.installEventFilter(self.languageChangeEventFilter)

ui/implements/settings/settingsGeneral.py

@@ -1,6 +1,4 @@
-import sys
-
-from PySide6.QtCore import QCoreApplication, QDir, QLocale, QProcess
+from PySide6.QtCore import QCoreApplication, QDir, QLocale
 from PySide6.QtWidgets import (
     QApplication,
     QCheckBox,
@@ -10,8 +8,8 @@ from PySide6.QtWidgets import (
     QPushButton,
 )
 
+from core.settings import SettingsKeys, settings
 from ui.extends.shared.language import changeAppLanguage, localeToCode, localeToFullName
-from ui.extends.shared.settings import DATABASE_URL, LANGUAGE
 from ui.implements.settings.settingsBaseWidget import SettingsBaseWidget
 
 
@@ -33,8 +31,8 @@ class SettingsGeneral(SettingsBaseWidget):
         self.languageFollowSystemCheckBox.toggled.connect(
             self.changeLanguageFollowSystem
         )
-        if self.settings.language():
-            locale = QLocale(self.settings.language())
+        if language := settings.stringValue(SettingsKeys.General.Language):
+            locale = QLocale(language)
             index = self.languageValueWidget.findData(locale)
             if index > -1:
                 self.languageValueWidget.setCurrentIndex(index)
@@ -51,7 +49,7 @@ class SettingsGeneral(SettingsBaseWidget):
         self.insertItem(
             "dbUrl",
             self.dbUrlLabel,
-            QLabel(self.settings.databaseUrl()),
+            QLabel(settings.stringValue(SettingsKeys.General.DatabaseUrl)),
             self.dbUrlResetButton,
         )
 
@@ -59,13 +57,13 @@ class SettingsGeneral(SettingsBaseWidget):
         locale = self.languageValueWidget.currentData()
         if locale:
             changeAppLanguage(locale)
-            self.settings.setLanguage(localeToCode(locale))
+            settings.setValue(SettingsKeys.General.Language, localeToCode(locale))
 
     def changeLanguageFollowSystem(self):
         followSystem = self.languageFollowSystemCheckBox.isChecked()
         self.languageValueWidget.setCurrentIndex(-1)
         if followSystem:
-            self.settings.remove(LANGUAGE)
+            settings.remove(SettingsKeys.General.Language)
             changeAppLanguage(QLocale.system())
             self.languageValueWidget.setEnabled(False)
         else:
@@ -80,7 +78,7 @@ class SettingsGeneral(SettingsBaseWidget):
             QMessageBox.StandardButton.No,
         )
         if userConfirm == QMessageBox.StandardButton.Yes:
-            self.settings.remove(DATABASE_URL)
+            settings.remove(SettingsKeys.General.DatabaseUrl)
             QApplication.instance().quit()
 
     def setupUi(self, *args):

ui/implements/settings/settingsOcr.py

@@ -1,6 +1,7 @@
 from PySide6.QtCore import QCoreApplication
 from PySide6.QtWidgets import QLabel, QPushButton
 
+from core.settings import SettingsKeys, settings
 from ui.implements.components.fileSelector import FileSelector
 from ui.implements.settings.settingsBaseWidget import SettingsBaseWidget
 
@@ -11,8 +12,8 @@ class SettingsOcr(SettingsBaseWidget):
 
         self.setupUi(self)
 
-        if self.settings.knnModelFile():
-            self.knnModelFileValueWidget.selectFile(self.settings.knnModelFile())
+        if knnModelFile := settings.stringValue(SettingsKeys.Ocr.KnnModelFile):
+            self.knnModelFileValueWidget.selectFile(knnModelFile)
         self.knnModelFileValueWidget.filesSelected.connect(self.setKnnModelFile)
         self.knnModelFileResetButton.clicked.connect(self.resetKnnModelFile)
         self.insertItem(
@@ -22,8 +23,8 @@ class SettingsOcr(SettingsBaseWidget):
             self.knnModelFileResetButton,
         )
 
-        if self.settings.b30KnnModelFile():
-            self.b30KnnModelFileValueWidget.selectFile(self.settings.b30KnnModelFile())
+        if b30KnnModelFile := settings.stringValue(SettingsKeys.Ocr.B30KnnModelFile):
+            self.b30KnnModelFileValueWidget.selectFile(b30KnnModelFile)
         self.b30KnnModelFileValueWidget.filesSelected.connect(self.setB30KnnModelFile)
         self.b30KnnModelFileResetButton.clicked.connect(self.resetB30KnnModelFile)
         self.insertItem(
@@ -33,10 +34,10 @@ class SettingsOcr(SettingsBaseWidget):
             self.b30KnnModelFileResetButton,
         )
 
-        if self.settings.phashDatabaseFile():
-            self.phashDatabaseFileValueWidget.selectFile(
-                self.settings.phashDatabaseFile()
-            )
+        if phashDatabaseFile := settings.stringValue(
+            SettingsKeys.Ocr.PhashDatabaseFile
+        ):
+            self.phashDatabaseFileValueWidget.selectFile(phashDatabaseFile)
         self.phashDatabaseFileValueWidget.filesSelected.connect(
             self.setPHashDatabaseFile
         )
@@ -52,31 +53,31 @@ class SettingsOcr(SettingsBaseWidget):
         selectedFile = self.knnModelFileValueWidget.selectedFiles()
         if selectedFile and selectedFile[0]:
             file = selectedFile[0]
-            self.settings.setKnnModelFile(file)
+            settings.setValue(SettingsKeys.Ocr.KnnModelFile, file)
 
     def resetKnnModelFile(self):
         self.knnModelFileValueWidget.reset()
-        self.settings.resetKnnModelFile()
+        settings.setValue(SettingsKeys.Ocr.KnnModelFile, None)
 
     def setB30KnnModelFile(self):
         selectedFile = self.b30KnnModelFileValueWidget.selectedFiles()
         if selectedFile and selectedFile[0]:
             file = selectedFile[0]
-            self.settings.setB30KnnModelFile(file)
+            settings.setValue(SettingsKeys.Ocr.B30KnnModelFile, file)
 
     def resetB30KnnModelFile(self):
         self.b30KnnModelFileValueWidget.reset()
-        self.settings.resetB30KnnModelFile()
+        settings.setValue(SettingsKeys.Ocr.B30KnnModelFile, None)
 
     def setPHashDatabaseFile(self):
         selectedFile = self.phashDatabaseFileValueWidget.selectedFiles()
         if selectedFile and selectedFile[0]:
             file = selectedFile[0]
-            self.settings.setPHashDatabaseFile(file)
+            settings.setValue(SettingsKeys.Ocr.PhashDatabaseFile, file)
 
     def resetPHashDatabaseFile(self):
         self.phashDatabaseFileValueWidget.reset()
-        self.settings.resetPHashDatabaseFile()
+        settings.setValue(SettingsKeys.Ocr.PhashDatabaseFile, None)
 
     def setupUi(self, *args):
         self.knnModelFileLabel = QLabel(self)

ui/implements/tabs/tabDb/tabDb_ChartInfoEditor.py

@@ -163,19 +163,15 @@ class TabDb_ChartInfoEditor(Ui_TabDb_ChartInfoEditor, QWidget):
             QMessageBox.critical(
                 self,
                 None,
-                # fmt: off
                 QCoreApplication.translate("TabDb_ChartInfoEditor", "commit.chartNotSelected"),
-                # fmt: on
-            )
+            )  # fmt: skip
             return
         if not self.constantLineEdit.hasAcceptableInput():
             QMessageBox.critical(
                 self,
                 None,
-                # fmt: off
                 QCoreApplication.translate("TabDb_ChartInfoEditor", "commit.constantRequired"),
-                # fmt: on
-            )
+            )  # fmt: skip
             return
 
         constant = int(self.constantLineEdit.text())
@@ -202,10 +198,8 @@ class TabDb_ChartInfoEditor(Ui_TabDb_ChartInfoEditor, QWidget):
             QMessageBox.critical(
                 self,
                 None,
-                # fmt: off
                 QCoreApplication.translate("TabDb_ChartInfoEditor", "commit.chartNotSelected"),
-                # fmt: on
-            )
+            )  # fmt: skip
             return
 
         chartInfo = self.db.get_chart_info(chart.song_id, chart.rating_class)
@@ -213,12 +207,10 @@ class TabDb_ChartInfoEditor(Ui_TabDb_ChartInfoEditor, QWidget):
             result = QMessageBox.warning(
                 self,
                 None,
-                # fmt: off
                 QCoreApplication.translate("TabDb_ChartInfoEditor", "deleteConfirm"),
-                # fmt: on
                 QMessageBox.StandardButton.Yes,
                 QMessageBox.StandardButton.No,
-            )
+            )  # fmt: skip
             if result == QMessageBox.StandardButton.Yes:
                 with self.db.sessionmaker() as session:
                     session.delete(chartInfo)

ui/implements/tabs/tabDb/tabDb_Manage.py

@@ -14,9 +14,10 @@ from arcaea_offline.external.arcaea import (
 )
 from arcaea_offline.external.arcaea.common import ArcaeaParser
 from arcaea_offline.external.arcsong import ArcsongDbParser
+from arcaea_offline.external.chart_info_db import ChartInfoDbParser
 from arcaea_offline.external.smartrte import SmartRteB30CsvConverter
 from arcaea_offline.models import Difficulty, Pack, Song
-from PySide6.QtCore import QDir, Slot
+from PySide6.QtCore import QDateTime, QDir, Slot
 from PySide6.QtWidgets import QFileDialog, QMessageBox, QWidget
 
 from ui.designer.tabs.tabDb.tabDb_Manage_ui import Ui_TabDb_Manage
@@ -57,6 +58,29 @@ class TabDb_Manage(Ui_TabDb_Manage, QWidget):
                 self, "Sync Error", "\n".join(traceback.format_exception(e))
             )
 
+    @Slot()
+    def on_syncChartInfoDbButton_clicked(self):
+        dbFile, filter = QFileDialog.getOpenFileName(
+            self, None, "", "DB File (*.db);;*"
+        )
+
+        if not dbFile:
+            return
+
+        try:
+            db = Database()
+            parser = ChartInfoDbParser(dbFile)
+            with db.sessionmaker() as session:
+                parser.write_database(session)
+                session.commit()
+                databaseUpdateSignals.chartInfoUpdated.emit()
+            QMessageBox.information(self, None, "OK")
+        except Exception as e:
+            logging.exception("Sync chart info database error")
+            QMessageBox.critical(
+                self, "Sync Error", "\n".join(traceback.format_exception(e))
+            )
+
     def importFromArcaeaParser(
         self, parser: ArcaeaParser, instance, logName, path
     ) -> int:
@@ -67,7 +91,7 @@ class TabDb_Manage(Ui_TabDb_Manage, QWidget):
             session.commit()
             databaseUpdateSignals.songAddOrDelete.emit()
         itemNum = len([item for item in parser.parse() if isinstance(item, instance)])
-        logger.info(f"updated {itemNum} {logName} from {path}")
+        logger.info("updated %d %s from %s", itemNum, logName, path)
         return itemNum
 
     def importPacklist(self, packlistPath):
@@ -137,7 +161,7 @@ class TabDb_Manage(Ui_TabDb_Manage, QWidget):
             return
 
         try:
-            logger.info(f"Importing {apkFile}")
+            logger.info("Importing %s", apkFile)
 
             with zipfile.ZipFile(apkFile) as zf:
                 packlistPath = zipfile.Path(zf) / "assets" / "songs" / "packlist"
@@ -169,7 +193,9 @@ class TabDb_Manage(Ui_TabDb_Manage, QWidget):
             db = Database()
             parser = St3ScoreParser(dbFile)
             logger.info(
-                f"Got {len(parser.parse())} items from {dbFile}, writing into database..."
+                "Got %d items from %s, writing into database...",
+                len(parser.parse()),
+                dbFile,
             )
             with db.sessionmaker() as session:
                 parser.write_database(session)
@@ -194,7 +220,9 @@ class TabDb_Manage(Ui_TabDb_Manage, QWidget):
             db = Database()
             parser = ArcaeaOnlineParser(apiResultFile)
             logger.info(
-                f"Got {len(parser.parse())} items from {apiResultFile}, writing into database..."
+                "Got %d items from %s, writing into database...",
+                len(parser.parse()),
+                apiResultFile,
             )
             with db.sessionmaker() as session:
                 parser.write_database(session)
@@ -208,14 +236,14 @@ class TabDb_Manage(Ui_TabDb_Manage, QWidget):
 
     @Slot()
     def on_exportScoresButton_clicked(self):
-        scores = Database().export_scores()
-        version = Database().version()
+        scores = Database().export_scores_def_v2()
+        timestamp = QDateTime.currentMSecsSinceEpoch()
         content = json.dumps(scores, ensure_ascii=False)
 
         exportLocation, _filter = QFileDialog.getSaveFileName(
             self,
             "Save your scores to...",
-            QDir.current().filePath(f"arcaea-offline-scores-v{version}.json"),
+            QDir.current().filePath(f"arcaea-offline-def-v2-scores-{timestamp}.json"),
             "JSON (*.json);;*",
         )
         with open(exportLocation, "w", encoding="utf-8") as f:

ui/implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py

@@ -154,23 +154,17 @@ class TabDb_RemoveDuplicateScores(Ui_TabDb_RemoveDuplicateScores, QWidget):
         self.treeView.setItemDelegateForColumn(1, self.treeViewProxyDelegate)
 
         self.quickSelect_comboBox.addItem(
-            # fmt: off
             QCoreApplication.translate("TabDb_RemoveDuplicateScores", "quickSelectComboBox.idEarlier"),
-            # fmt: on
             QuickSelectComboBoxValues.ID_EARLIER
-        )
+        )  # fmt: skip
         self.quickSelect_comboBox.addItem(
-            # fmt: off
             QCoreApplication.translate("TabDb_RemoveDuplicateScores", "quickSelectComboBox.dateEarlier"),
-            # fmt: on
             QuickSelectComboBoxValues.DATE_EARLIER
-        )
+        )  # fmt: skip
         self.quickSelect_comboBox.addItem(
-            # fmt: off
             QCoreApplication.translate("TabDb_RemoveDuplicateScores", "quickSelectComboBox.columnsIntegral"),
-            # fmt: on
             QuickSelectComboBoxValues.COLUMNS_INTEGRAL
-        )
+        )  # fmt: skip
 
     def getQueryColumns(self):
         columns: list[InstrumentedAttribute] = [Score.song_id, Score.rating_class]
@@ -291,12 +285,12 @@ class TabDb_RemoveDuplicateScores(Ui_TabDb_RemoveDuplicateScores, QWidget):
         confirm = QMessageBox.warning(
             self,
             None,
-            # fmt: off
-            QCoreApplication.translate("TabDb_RemoveDuplicateScores", "deleteSelectionDialog.content {}").format(len(selectedScores)),
-            # fmt: on
+            QCoreApplication.translate(
+                "TabDb_RemoveDuplicateScores", "deleteSelectionDialog.content {}"
+            ).format(len(selectedScores)),
             QMessageBox.StandardButton.Yes,
             QMessageBox.StandardButton.No,
-        )
+        )  # fmt: skip
         if confirm != QMessageBox.StandardButton.Yes:
             return
 
@@ -310,12 +304,11 @@ class TabDb_RemoveDuplicateScores(Ui_TabDb_RemoveDuplicateScores, QWidget):
     @Slot()
     def on_scan_scanButton_clicked(self):
         if len(self.getQueryColumns()) <= 2:
+            message = QCoreApplication.translate("TabDb_RemoveDuplicateScores", "scan_noColumnsDialog.content")  # fmt: skip
             result = QMessageBox.warning(
                 self,
                 None,
-                # fmt: off
-                QCoreApplication.translate("TabDb_RemoveDuplicateScores", "scan_noColumnsDialog.content"),
-                # fmt: on
+                message,
                 QMessageBox.StandardButton.Yes,
                 QMessageBox.StandardButton.No,
             )

ui/implements/tabs/tabOcr/tabOcr_B30.py

@@ -9,6 +9,7 @@ from PIL import Image
 from PySide6.QtCore import Signal, Slot
 from PySide6.QtWidgets import QFileDialog, QMessageBox, QWidget
 
+from core.settings import SettingsKeys
 from ui.designer.tabs.tabOcr.tabOcr_B30_ui import Ui_TabOcr_B30
 from ui.extends.components.ocrQueue import OcrQueueModel
 from ui.extends.ocr.dependencies import (
@@ -16,11 +17,6 @@ from ui.extends.ocr.dependencies import (
     getPhashDatabaseStatusText,
 )
 from ui.extends.shared.language import LanguageChangeEventFilter
-from ui.extends.shared.settings import (
-    B30_KNN_MODEL_FILE,
-    KNN_MODEL_FILE,
-    PHASH_DATABASE_FILE,
-)
 from ui.extends.tabs.tabOcr.tabOcr_B30 import ChieriV4OcrRunnable, b30ResultToScore
 
 logger = logging.getLogger(__name__)
@@ -55,9 +51,15 @@ class TabOcr_B30(Ui_TabOcr_B30, QWidget):
         self.ocr = None
 
         logger.info("Applying settings...")
-        self.dependencies_knnModelSelector.connectSettings(KNN_MODEL_FILE)
-        self.dependencies_b30KnnModelSelector.connectSettings(B30_KNN_MODEL_FILE)
-        self.dependencies_phashDatabaseSelector.connectSettings(PHASH_DATABASE_FILE)
+        self.dependencies_knnModelSelector.connectSettings(
+            SettingsKeys.Ocr.KnnModelFile
+        )
+        self.dependencies_b30KnnModelSelector.connectSettings(
+            SettingsKeys.Ocr.B30KnnModelFile
+        )
+        self.dependencies_phashDatabaseSelector.connectSettings(
+            SettingsKeys.Ocr.PhashDatabaseFile
+        )
 
         self.ocrQueueModel = OcrQueueModel(self)
         self.ocrQueue.setModel(self.ocrQueueModel)

ui/implements/tabs/tabOcr/tabOcr_Device.py

@@ -11,10 +11,10 @@ from arcaea_offline_ocr.phash_db import ImagePhashDatabase
 from PySide6.QtCore import Slot
 from PySide6.QtWidgets import QApplication, QFileDialog, QMessageBox, QWidget
 
+from core.settings import SettingsKeys
 from ui.designer.tabs.tabOcr.tabOcr_Device_ui import Ui_TabOcr_Device
 from ui.extends.components.ocrQueue import OcrQueueModel
 from ui.extends.shared.language import LanguageChangeEventFilter
-from ui.extends.shared.settings import KNN_MODEL_FILE, PHASH_DATABASE_FILE
 from ui.extends.tabs.tabOcr.tabOcr_Device import ScoreConverter, TabDeviceOcrRunnable
 
 logger = logging.getLogger(__name__)
@@ -54,8 +54,12 @@ class TabOcr_Device(Ui_TabOcr_Device, QWidget):
         )
 
         logger.info("Applying settings...")
-        self.dependencies_knnModelSelector.connectSettings(KNN_MODEL_FILE)
-        self.dependencies_phashDatabaseSelector.connectSettings(PHASH_DATABASE_FILE)
+        self.dependencies_knnModelSelector.connectSettings(
+            SettingsKeys.Ocr.KnnModelFile
+        )
+        self.dependencies_phashDatabaseSelector.connectSettings(
+            SettingsKeys.Ocr.PhashDatabaseFile
+        )
 
         self.options_usePresetCheckBox.setChecked(True)
         self.options_usePresetCheckBox.setEnabled(False)

ui/implements/tabs/tabOverview.py

@@ -1,55 +0,0 @@
-import logging
-
-from arcaea_offline.database import Database
-from PySide6.QtCore import QCoreApplication
-from PySide6.QtGui import QShowEvent
-from PySide6.QtWidgets import QWidget
-
-from ui.designer.tabs.tabOverview_ui import Ui_TabOverview
-from ui.extends.shared.language import LanguageChangeEventFilter
-
-logger = logging.getLogger(__name__)
-
-
-class TabOverview(Ui_TabOverview, QWidget):
-    def __init__(self, parent=None):
-        super().__init__(parent)
-        self.setupUi(self)
-
-        self.languageChangeEventFilter = LanguageChangeEventFilter(self)
-        self.installEventFilter(self.languageChangeEventFilter)
-
-        self.db = Database()
-
-    def showEvent(self, event: QShowEvent) -> None:
-        self.updateOverview()
-        return super().showEvent(event)
-
-    def updateOverview(self):
-        try:
-            b30 = self.db.get_b30() or 0.00
-            self.b30Label.setText(str(f"{b30:.3f}"))
-        except Exception:
-            logger.exception("Cannot get b30:")
-            self.b30Label.setText("ERR")
-
-        try:
-            self.databaseDescribeLabel.setText(
-                self.describeFormatString.format(
-                    self.db.count_packs(),
-                    self.db.count_songs(),
-                    self.db.count_difficulties(),
-                    self.db.count_chart_infos(),
-                    self.db.count_complete_chart_infos(),
-                    self.db.count_scores(),
-                )
-            )
-        except Exception:
-            logger.exception("Cannot update overview:")
-            self.databaseDescribeLabel.setText("ERR")
-
-    def retranslateUi(self, *args):
-        super().retranslateUi(self)
-        # fmt: off
-        self.describeFormatString = QCoreApplication.translate("TabOverview", "databaseDescribeLabel {} {} {} {} {} {}")
-        # fmt: on

ui/implements/tabs/tabTools/tabTools_Andreal.py

@@ -11,9 +11,9 @@ from PySide6.QtCore import QCoreApplication, QDir, QFileInfo, Qt, Slot
 from PySide6.QtGui import QGuiApplication, QImage, QPainter, QPaintEvent, QPixmap
 from PySide6.QtWidgets import QButtonGroup, QFileDialog, QLabel, QMessageBox, QWidget
 
+from core.settings import SettingsKeys
 from ui.designer.tabs.tabTools.tabTools_Andreal_ui import Ui_TabTools_Andreal
 from ui.extends.shared.language import LanguageChangeEventFilter
-from ui.extends.shared.settings import ANDREAL_EXECUTABLE, ANDREAL_FOLDER
 from ui.extends.tabs.tabTools.tabTools_Andreal import AndrealHelper
 from ui.implements.components.chartSelector import ChartSelector
 from ui.implements.components.songIdSelector import SongIdSelectorMode
@@ -80,8 +80,8 @@ class TabTools_Andreal(Ui_TabTools_Andreal, QWidget):
         self.andrealFolderSelector.filesSelected.connect(self.setHelperPaths)
         self.andrealExecutableSelector.filesSelected.connect(self.setHelperPaths)
 
-        self.andrealFolderSelector.connectSettings(ANDREAL_FOLDER)
-        self.andrealExecutableSelector.connectSettings(ANDREAL_EXECUTABLE)
+        self.andrealFolderSelector.connectSettings(SettingsKeys.Andreal.Folder)
+        self.andrealExecutableSelector.connectSettings(SettingsKeys.Andreal.Executable)
 
         self.generatePreviewButton.clicked.connect(self.requestPreview)
         self.generateImageButton.clicked.connect(self.requestGenerate)
@@ -131,13 +131,8 @@ class TabTools_Andreal(Ui_TabTools_Andreal, QWidget):
 
     @Slot()
     def on_imageTypeWhatIsThisButton_clicked(self):
-        QMessageBox.information(
-            self,
-            None,
-            # fmt: off
-            QCoreApplication.translate("TabTools_Andreal", "imageWhatIsThisDialog.description"),
-            # fmt: on
-        )
+        message = QCoreApplication.translate("TabTools_Andreal", "imageWhatIsThisDialog.description")  # fmt: skip
+        QMessageBox.information(self, None, message)
 
     def imageFormat(self):
         buttonId = self.imageFormatButtonGroup.checkedId()

ui/implements/tabs/tabTools/tabTools_StepCalculator.py

@@ -90,10 +90,8 @@ class PlayRatingCalculatorDialog(QDialog):
 
         self.acceptButton = QPushButton(self)
         self.acceptButton.setText(
-            # fmt: off
             QCoreApplication.translate("StepCalculator", "playRatingCalculatorDialog.acceptButton")
-            # fmt: on
-        )
+        )  # fmt: skip
         self.acceptButton.setEnabled(False)
         self.verticalLayout.addWidget(self.acceptButton)
 

ui/navigation/navhost.py

@@ -1,151 +0,0 @@
-import logging
-from dataclasses import dataclass
-from typing import Optional
-
-from PySide6.QtCore import QObject, Signal
-
-from .navitem import NavItem
-
-logger = logging.getLogger(__name__)
-
-
-@dataclass
-class NavItemRelatives:
-    parent: Optional[NavItem]
-    children: list[NavItem]
-
-
-class NavHost(QObject):
-    activated = Signal(NavItem, NavItem)
-
-    navItemsChanged = Signal()
-
-    def __init__(self, parent=None):
-        super().__init__(parent)
-
-        self.__navItems: list[NavItem] = []
-        self.__cachedNavItems: list[NavItem] = []
-        self.__currentNavItem: NavItem = None
-
-    def __flushCachedNavItems(self):
-        navItems = set(self.__navItems)
-
-        for item in self.__navItems:
-            parts = item.id.split(".")
-            for i in range(1, len(parts)):
-                parentItemId = ".".join(parts[:i])
-                navItems.add(NavItem(id=parentItemId))
-
-        self.__cachedNavItems = list(navItems)
-
-    @property
-    def navItems(self) -> list[NavItem]:
-        return self.__cachedNavItems
-
-    @property
-    def currentNavItem(self) -> NavItem:
-        if self.__currentNavItem:
-            return self.__currentNavItem
-
-        if self.__navItems:
-            self.__currentNavItem = self.__navItems[0]
-            return self.__currentNavItem
-
-    def findNavItem(self, navItemId: str) -> Optional[NavItem]:
-        navItemIds = [item.id for item in self.__navItems]
-        try:
-            index = navItemIds.index(navItemId)
-            return self.__navItems[index]
-        except IndexError:
-            return None
-
-    def isNavigatingBack(self, oldNavItemId: str, newNavItemId: str) -> bool:
-        # sourcery skip: class-extract-method
-        # |     oldNavItemId      |    newNavItemId    | back? |
-        # |-----------------------|--------------------|-------|
-        # | database.manage.packs |      database      | True  |
-        # |      ocr.device       |        ocr         | True  |
-        # | database.manage.songs |      ocr.b30       | False |
-        # |       database        |      database      | False |
-
-        oldNavItemIdSplitted = self.getNavItemIdSplitted(oldNavItemId)
-        newNavItemIdSplitted = self.getNavItemIdSplitted(newNavItemId)
-
-        return self.getNavItemDepth(newNavItemId) < self.getNavItemDepth(
-            oldNavItemId
-        ) and all((idFrag in oldNavItemIdSplitted) for idFrag in newNavItemIdSplitted)
-
-    def isChild(self, childNavItemId: str, parentNavItemId: str) -> bool:
-        childNavItemIdSplitted = self.getNavItemIdSplitted(childNavItemId)
-        parentNavItemIdSplitted = self.getNavItemIdSplitted(parentNavItemId)
-
-        return all(
-            (idFrag in childNavItemIdSplitted) for idFrag in parentNavItemIdSplitted
-        )
-
-    def getNavItemIdSplitted(self, navItemId: str) -> list[str]:
-        return navItemId.split(".")
-
-    def getNavItemDepth(self, navItemId: str) -> int:
-        return len(self.getNavItemIdSplitted(navItemId))
-
-    def getNavItemRelatives(self, navItemId: str) -> NavItemRelatives:
-        parent = None
-        if "." in navItemId:
-            navItemIdSplitted = navItemId.split(".")
-            parentId = navItemIdSplitted[:-1]
-            parent = self.findNavItem(".".join(parentId))
-
-        if not navItemId:
-            # return root navItems
-            children = [navItem for navItem in self.__navItems if "." not in navItem.id]
-        else:
-            children = [
-                navItem
-                for navItem in self.__navItems
-                if navItem.id.startswith(navItemId)
-                and navItem.id != navItemId
-                and self.getNavItemDepth(navItem.id)
-                == self.getNavItemDepth(navItemId) + 1
-            ]
-
-        return NavItemRelatives(parent=parent, children=children)
-
-    def registerNavItem(self, item: NavItem):
-        self.__navItems.append(item)
-        self.__flushCachedNavItems()
-        self.navItemsChanged.emit()
-
-    def navigate(self, navItemId: str):
-        oldNavItem = self.__currentNavItem or NavItem("")
-        newNavItem = self.findNavItem(navItemId)
-
-        if newNavItem is None:
-            raise IndexError(
-                f"Cannot find '{navItemId}' in {repr(self)}. "
-                "Maybe try registering it?"
-            )
-
-        # if the navItem have children, navigate to first child
-        # but if the navItem is going back, e.g. 'database.manage' -> 'database'
-        # then don't navigate to it's child.
-        if self.isNavigatingBack(oldNavItem.id, newNavItem.id):
-            # navItem is going back
-            currentNavItem = newNavItem
-        else:
-            newNavItemRelatives = self.getNavItemRelatives(newNavItem.id)
-            if newNavItemRelatives.children:
-                currentNavItem = newNavItemRelatives.children[0]
-            else:
-                currentNavItem = newNavItem
-
-        self.__currentNavItem = currentNavItem
-        self.activated.emit(oldNavItem, self.currentNavItem)
-
-    def navigateUp(self):
-        navItemRelatives = self.getNavItemRelatives(self.currentNavItem.id)
-        if navItemRelatives.parent:
-            self.navigate(navItemRelatives.parent.id)
-
-
-navHost = NavHost()

ui/navigation/navitem.py

@@ -1,17 +0,0 @@
-from dataclasses import dataclass
-from typing import Optional
-
-from PySide6.QtCore import QCoreApplication
-from PySide6.QtGui import QIcon, QPixmap
-
-
-@dataclass
-class NavItem:
-    id: str
-    icon: Optional[QIcon | QPixmap | str] = None
-
-    def text(self):
-        return QCoreApplication.translate("NavItem", f"{self.id}.title")
-
-    def __hash__(self):
-        return hash(self.id)

ui/navigation/navitemwidgets.py

@@ -1,84 +0,0 @@
-from PySide6.QtCore import QObject
-from PySide6.QtGui import QFont
-from PySide6.QtWidgets import QLabel, QSizePolicy, QSpacerItem, QVBoxLayout, QWidget
-
-from ui.navigation.navhost import NavHost, navHost
-from ui.navigation.navitem import NavItem
-from ui.navigation.navsidebar import NavigationSideBar
-
-
-class DefaultParentNavItemWidget(QWidget):
-    def __init__(self, navItem: NavItem, navItemChildren: list[NavItem], parent=None):
-        super().__init__(parent)
-
-        self.navItem = navItem
-
-        self.partialNavHost = NavHost(self)
-        self.partialNavHost.registerNavItem(navItem)
-        for _navItem in navItemChildren:
-            self.partialNavHost.registerNavItem(_navItem)
-        self.partialNavHost.navigate(navItem.id)
-
-        self.verticalLayout = QVBoxLayout(self)
-
-        self.navItemLabelFont = QFont(self.font())
-        self.navItemLabelFont.setPointSize(14)
-        self.navItemLabel = QLabel(self)
-        self.navItemLabel.setFont(self.navItemLabelFont)
-
-        spacer = QSpacerItem(
-            20, 20, QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Expanding
-        )
-
-        self.verticalLayout.addSpacerItem(spacer)
-
-        self.navSideBar = NavigationSideBar(self, self.partialNavHost)
-        self.navSideBar.navigateUpButton.setEnabled(False)
-        self.verticalLayout.addWidget(self.navSideBar)
-
-        self.verticalLayout.addSpacerItem(spacer)
-
-        self.retranslateUi()
-
-    def retranslateUi(self):
-        self.navItemLabel.setText(self.navItem.text())
-
-
-class NavItemWidgets(QObject):
-    def __init__(self, parent=None):
-        super().__init__(parent)
-
-        self.__map: dict[str, QWidget] = {}
-        # this reference holds all the `DefaultParentNavItemWidget`s
-        # since these widgets are created with no parents, not keeping a reference to
-        # them may result in errors, even a silent app crash that is hard to debug
-        self.__defaultParentWidgetRefs: dict[str, QWidget] = {}
-
-    def register(self, navItemId: str, widget: QWidget):
-        self.__map[navItemId] = widget
-
-    def unregister(self, navItemId: str) -> bool:
-        try:
-            widget = self.__map.pop(navItemId)
-            widget.deleteLater()
-            return True
-        except KeyError:
-            return False
-
-    def get(self, navItemId: str) -> QWidget | None:
-        widget = self.__map.get(navItemId)
-        if widget is not None:
-            return widget
-        elif navItemChildren := navHost.getNavItemRelatives(navItemId).children:
-            if self.__defaultParentWidgetRefs.get(navItemId) is None:
-                defaultParentNavItemWidget = DefaultParentNavItemWidget(
-                    navHost.findNavItem(navItemId), navItemChildren
-                )
-                self.__defaultParentWidgetRefs[navItemId] = defaultParentNavItemWidget
-                defaultParentNavItemWidget.partialNavHost.activated.connect(
-                    lambda o, n: navHost.navigate(n.id)
-                )
-
-            return self.__defaultParentWidgetRefs.get(navItemId)
-        else:
-            return None

ui/navigation/navsidebar.py

@@ -1,190 +0,0 @@
-from PySide6.QtCore import QModelIndex, Qt, Signal, Slot
-from PySide6.QtGui import QFont, QIcon, QKeySequence, QShortcut
-from PySide6.QtWidgets import (
-    QListWidget,
-    QListWidgetItem,
-    QPushButton,
-    QVBoxLayout,
-    QWidget,
-)
-
-from ui.navigation.navhost import NavHost, NavItem, navHost
-from ui.widgets.slidingstackedwidget import SlidingStackedWidget
-
-
-class NavItemListWidget(QListWidget):
-    NavItemRole = Qt.ItemDataRole.UserRole
-
-    def __init__(self, parent=None):
-        super().__init__(parent)
-
-        font = QFont(self.font())
-        font.setPointSize(14)
-        self.setFont(font)
-
-        self.clicked.connect(self.activated)
-
-    def setNavItems(self, items: list[NavItem]):
-        self.clear()
-
-        for navItem in items:
-            if navItem.icon:
-                listWidgetItem = QListWidgetItem(QIcon(navItem.icon), navItem.text())
-            else:
-                listWidgetItem = QListWidgetItem(navItem.text())
-            listWidgetItem.setData(self.NavItemRole, navItem)
-            listWidgetItem.setTextAlignment(
-                Qt.AlignmentFlag.AlignLeading | Qt.AlignmentFlag.AlignVCenter
-            )
-
-            self.addItem(listWidgetItem)
-
-    def selectNavItem(self, navItemId: str):
-        navItemIds = [
-            self.item(r).data(self.NavItemRole).id for r in range(self.count())
-        ]
-        index = navItemIds.index(navItemId)
-        self.setCurrentIndex(self.model().index(index, 0))
-
-
-class NavigationWidget(QWidget):
-    def __init__(self, parent=None):
-        super().__init__(parent)
-
-        self.navHost = navHost
-
-        self.verticalLayout = QVBoxLayout(self)
-        self.verticalLayout.setContentsMargins(0, 0, 0, 0)
-
-        self.backButton = QPushButton(QIcon(":/icons/back.svg"), "")
-        self.backButton.setFlat(True)
-        self.backButton.setFixedHeight(20)
-        self.verticalLayout.addWidget(self.backButton)
-
-        self.navListWidget = NavItemListWidget(self)
-        self.verticalLayout.addWidget(self.navListWidget)
-
-    def setNavigationItems(self, items: list[NavItem]):
-        self.navListWidget.setNavItems(items)
-
-
-class NavigationSideBar(QWidget):
-    navItemActivated = Signal(NavItem)
-
-    def __init__(self, parent=None, navHost=navHost):
-        super().__init__(parent)
-
-        self.navHost = None
-        self.navigateUpKeyboardShortcut = QShortcut(
-            QKeySequence(Qt.Modifier.ALT | Qt.Key.Key_Left), self, lambda: True
-        )
-
-        self.verticalLayout = QVBoxLayout(self)
-
-        self.navigateUpButton = QPushButton(QIcon(":/icons/back.svg"), "")
-        self.navigateUpButton.setFlat(True)
-        self.navigateUpButton.setFixedHeight(20)
-        self.verticalLayout.addWidget(self.navigateUpButton)
-
-        self.slidingStackedWidget = SlidingStackedWidget(self)
-        self.slidingStackedWidget.animationFinished.connect(
-            self.endChangingNavItemListWidget
-        )
-        self.verticalLayout.addWidget(self.slidingStackedWidget)
-
-        navItemListWidget = NavItemListWidget(self)
-        navItemListWidget.activated.connect(self.navItemListWidgetActivatedProxy)
-        self.slidingStackedWidget.addWidget(navItemListWidget)
-
-        self.setNavHost(navHost)
-        self.reloadNavWidget()
-
-    def setNavHost(self, navHost: NavHost):
-        if self.navHost is not None:
-            self.navHost.navItemsChanged.disconnect(self.reloadNavWidget)
-            self.navHost.activated.disconnect(self.navItemChanged)
-            self.navigateUpKeyboardShortcut.activated.disconnect(
-                self.navHost.navigateUp
-            )
-            self.navigateUpButton.clicked.disconnect(self.navHost.navigateUp)
-
-        self.navHost = navHost
-
-        self.navHost.navItemsChanged.connect(self.reloadNavWidget)
-        self.navHost.activated.connect(self.navItemChanged)
-        self.navigateUpKeyboardShortcut.activated.connect(self.navHost.navigateUp)
-        self.navigateUpButton.clicked.connect(self.navHost.navigateUp)
-
-    @Slot(QModelIndex)
-    def navItemListWidgetActivatedProxy(self, index: QModelIndex):
-        self.navHost.navigate(index.data(NavItemListWidget.NavItemRole).id)
-        self.navItemActivated.emit(index.data(NavItemListWidget.NavItemRole))
-
-    def fillNavItemListWidget(
-        self, currentNavItem: NavItem, listWidget: NavItemListWidget
-    ):
-        currentNavItemParent = self.navHost.getNavItemRelatives(
-            currentNavItem.id
-        ).parent
-        currentNavItems = self.navHost.getNavItemRelatives(
-            currentNavItemParent.id if currentNavItemParent else ""
-        )
-        listWidget.setNavItems(currentNavItems.children)
-        listWidget.selectNavItem(currentNavItem.id)
-
-    def reloadNavWidget(self):
-        self.fillNavItemListWidget(
-            self.navHost.currentNavItem, self.slidingStackedWidget.widget(0)
-        )
-        self.navItemChanged(self.navHost.currentNavItem, self.navHost.currentNavItem)
-
-    @Slot(NavItem, NavItem)
-    def navItemChanged(self, oldNavItem: NavItem, newNavItem: NavItem):
-        # update navigateUpButton text
-        if newNavItemParent := self.navHost.getNavItemRelatives(newNavItem.id).parent:
-            self.navigateUpButton.setText(newNavItemParent.text())
-        else:
-            self.navigateUpButton.setText("Arcaea Offline")
-
-        # update navItemListWidget
-        oldNavItemIdSplitted = self.navHost.getNavItemIdSplitted(oldNavItem.id)
-        newNavItemIdSplitted = self.navHost.getNavItemIdSplitted(newNavItem.id)
-
-        oldNavItemDepth = len(oldNavItemIdSplitted)
-        newNavItemDepth = len(newNavItemIdSplitted)
-
-        if oldNavItemDepth != newNavItemDepth:
-            # navItem depth changed, replace current NavItemListWidget
-            newNavItemListWidget = NavItemListWidget(self)
-            slidingDirection = (
-                self.slidingStackedWidget.slidingDirection.RightToLeft
-                if newNavItemDepth > oldNavItemDepth
-                else self.slidingStackedWidget.slidingDirection.LeftToRight
-            )
-
-            self.fillNavItemListWidget(newNavItem, newNavItemListWidget)
-            newNavItemListWidget.activated.connect(self.navItemListWidgetActivatedProxy)
-
-            self.startChangingNavItemListWidget(newNavItemListWidget, slidingDirection)
-
-    def startChangingNavItemListWidget(
-        self, newNavItemListWidget: NavItemListWidget, slidingDirection
-    ):
-        newIndex = self.slidingStackedWidget.addWidget(newNavItemListWidget)
-        [
-            self.slidingStackedWidget.widget(i).setEnabled(False)
-            for i in range(self.slidingStackedWidget.count())
-        ]
-        self.navigateUpButton.setEnabled(False)
-        self.navigateUpKeyboardShortcut.setEnabled(False)
-        self.slidingStackedWidget.slideInIdx(newIndex, slidingDirection)
-
-    def endChangingNavItemListWidget(self):
-        oldWidget = self.slidingStackedWidget.widget(0)
-        self.slidingStackedWidget.removeWidget(oldWidget)
-        oldWidget.deleteLater()
-
-        newWidget = self.slidingStackedWidget.widget(0)
-        newWidget.setEnabled(True)
-        self.navigateUpButton.setEnabled(True)
-        self.navigateUpKeyboardShortcut.setEnabled(True)

ui/qmls/404.qml

@@ -0,0 +1,22 @@
+import QtQuick
+import QtQuick.Controls
+
+Page {
+    Column {
+        anchors.centerIn: parent
+        width: parent.width
+
+        Label {
+            width: parent.width
+            text: '?'
+            font.pointSize: 50
+            horizontalAlignment: Qt.AlignCenter
+        }
+
+        Label {
+            width: parent.width
+            text: 'Placeholder page'
+            horizontalAlignment: Qt.AlignCenter
+        }
+    }
+}

ui/qmls/App.qml

@@ -0,0 +1,63 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import "./DatabaseChecker" as DatabaseChecker
+
+ApplicationWindow {
+    visible: true
+
+    width: 800
+    height: 600
+
+    SystemPalette {
+        id: systemPaletteActive
+        colorGroup: SystemPalette.Active
+    }
+
+    SystemPalette {
+        id: systemPaletteDisabled
+        colorGroup: SystemPalette.Disabled
+    }
+
+    palette {
+        accent: systemPaletteActive.accent
+        alternateBase: systemPaletteActive.alternateBase
+        base: systemPaletteActive.base
+        button: systemPaletteActive.button
+        buttonText: systemPaletteActive.buttonText
+        dark: systemPaletteActive.dark
+        highlight: systemPaletteActive.highlight
+        highlightedText: systemPaletteActive.highlightedText
+        light: systemPaletteActive.light
+        mid: systemPaletteActive.mid
+        midlight: systemPaletteActive.midlight
+        placeholderText: systemPaletteActive.placeholderText
+        shadow: systemPaletteActive.shadow
+        text: systemPaletteActive.text
+        window: systemPaletteActive.window
+        windowText: systemPaletteActive.windowText
+
+        disabled {
+            button: systemPaletteDisabled.button
+            buttonText: systemPaletteDisabled.buttonText
+        }
+
+        inactive {
+            button: systemPaletteDisabled.button
+            buttonText: systemPaletteDisabled.buttonText
+        }
+    }
+
+    StackLayout {
+        id: stackLayout
+        anchors.fill: parent
+        currentIndex: 0
+
+        DatabaseChecker.Index {
+            onReady: parent.currentIndex = 1
+        }
+
+        AppMain {}
+    }
+}

ui/qmls/AppMain.qml

@@ -0,0 +1,71 @@
+pragma ComponentBehavior: Bound
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+RowLayout {
+    id: layout
+    spacing: 5
+
+    ListModel {
+        id: navListModel
+
+        ListElement {
+            _id: 'home'
+            label: 'Overview'
+            qmlSource: 'Overview.qml'
+        }
+        ListElement {
+            _id: 'database'
+            label: 'Database'
+            qmlSource: '404.qml'
+        }
+    }
+
+    ListView {
+        id: navListView
+
+        Layout.preferredWidth: 200
+        Layout.fillHeight: true
+
+        model: navListModel
+        focus: true
+
+        delegate: Item {
+            id: navListItem
+            required property int index
+            required property string label
+            width: parent.width
+            height: 30
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: () => {
+                    navListView.currentIndex = navListItem.index;
+                }
+            }
+
+            Label {
+                anchors.margins: 5
+                anchors.fill: parent
+
+                text: parent.label
+            }
+        }
+
+        highlight: Rectangle {
+            width: parent.width
+            height: 30
+            color: "#FFFF88"
+            y: ListView.view.currentItem.y
+        }
+    }
+
+    Loader {
+        Layout.preferredWidth: 500
+        Layout.fillWidth: true
+        Layout.fillHeight: true
+
+        source: navListView.currentIndex > -1 ? navListModel.get(navListView.currentIndex).qmlSource : '404.qml'
+    }
+}

ui/qmls/Components/DirectorySelector.qml

@@ -0,0 +1,25 @@
+import QtQuick
+import QtQuick.Dialogs
+
+import internal.ui.utils
+
+SelectorBase {
+    id: base
+
+    FolderDialog {
+        id: folderDialog
+        selectedFolder: base.directoryUrl
+        onAccepted: {
+            base.directoryUrl = this.selectedFolder;
+            this.currentFolder = this.selectedFolder;
+        }
+    }
+
+    property alias directoryUrl: base.url
+
+    shouldAcceptUrl: url => UrlUtils.isDir(url)
+    onBrowseButtonClicked: {
+        folderDialog.open();
+    }
+    placeholderText: '<font color="gray">Select a directory…</font>'
+}

ui/qmls/Components/FileSelector.qml

@@ -0,0 +1,33 @@
+import QtQuick
+import QtQuick.Dialogs
+
+import internal.ui.utils
+
+SelectorBase {
+    id: base
+
+    FileDialog {
+        id: fileDialog
+        onAccepted: {
+            base.url = this.selectedFile;
+        }
+    }
+
+    function isFileUrlValid(url: url): bool {
+        return url.toString().startsWith("file://");
+    }
+
+    property alias fileUrl: base.url
+    onFileUrlChanged: {
+        if (isFileUrlValid(fileUrl)) {
+            fileDialog.selectedFile = fileUrl;
+            fileDialog.currentFolder = UrlUtils.parent(fileUrl);
+        }
+    }
+
+    shouldAcceptUrl: url => UrlUtils.isFile(url)
+    onBrowseButtonClicked: {
+        fileDialog.open();
+    }
+    placeholderText: '<font color="gray">Select a file…</font>'
+}

ui/qmls/Components/SectionTitle.qml

@@ -0,0 +1,13 @@
+import QtQuick.Controls
+import QtQuick.Layouts
+
+Label {
+    Layout.topMargin: 7
+    Layout.bottomMargin: 10
+
+    anchors.topMargin: 7
+    anchors.bottomMargin: 10
+
+    font.pointSize: 14
+    font.bold: true
+}

ui/qmls/Components/SelectorBase.qml

@@ -0,0 +1,64 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import internal.ui.utils
+
+RowLayout {
+    id: root
+
+    required property var shouldAcceptUrl  // function (url)
+    signal browseButtonClicked
+    property string placeholderText: '<font color="gray">…</font>'
+
+    required property url url
+    onUrlChanged: {
+        Qt.callLater(() => {
+            updateLabel();
+        });
+    }
+
+    function updateLabel(): void {
+        urlLabel.text = url.toString().length > 0 ? UrlFormatUtils.toLocalFile(url) : root.placeholderText;
+    }
+
+    spacing: 2
+
+    Label {
+        id: urlLabel
+        Layout.fillWidth: true
+        text: root.placeholderText
+
+        DropArea {
+            anchors.fill: parent
+
+            onEntered: drag => {
+                if (!drag.hasUrls || drag.urls.length !== 1) {
+                    drag.accepted = false;
+                    return false;
+                }
+
+                const url = drag.urls[0];
+                const shouldAccept = root.shouldAcceptUrl(url);
+                if (!shouldAccept) {
+                    drag.accepted = false;
+                    return false;
+                }
+
+                urlLabel.text = `<font color="gray">Drop "<font color="text">${UrlUtils.name(url)}</font>"?</font>`;
+            }
+            onExited: {
+                root.updateLabel();
+            }
+            onDropped: drop => {
+                root.url = drop.urls[0];
+                root.updateLabel();
+            }
+        }
+    }
+
+    Button {
+        text: "Browse"
+        onClicked: root.browseButtonClicked()
+    }
+}

ui/qmls/Components/qmldir

@@ -0,0 +1,6 @@
+module Components
+internal SelectorBase SelectorBase.qml
+DirectorySelector 1.0 DirectorySelector.qml
+FileSelector 1.0 FileSelector.qml
+
+SectionTitle 1.0 SectionTitle.qml

ui/qmls/DatabaseChecker/DatabaseFileCreator.qml

@@ -0,0 +1,56 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import "../Components"
+
+ColumnLayout {
+    id: root
+
+    signal confirm
+
+    required property url directoryUrl
+    required property string filename
+
+    GridLayout {
+        columns: 2
+
+        Label {
+            text: "Directory"
+        }
+
+        DirectorySelector {
+            Layout.fillWidth: true
+
+            directoryUrl: root.directoryUrl
+            onDirectoryUrlChanged: {
+                root.directoryUrl = this.directoryUrl;
+            }
+        }
+
+        Label {
+            text: "Filename"
+        }
+
+        TextField {
+            Layout.fillWidth: true
+
+            text: root.filename
+            placeholderText: 'Please enter…'
+            onEditingFinished: {
+                root.filename = this.text;
+            }
+            onAccepted: {
+                confirmButton.click();
+            }
+        }
+    }
+
+    Button {
+        id: confirmButton
+        Layout.alignment: Qt.AlignRight
+
+        text: 'Confirm'
+        onClicked: root.confirm()
+    }
+}

ui/qmls/DatabaseChecker/Dialog_ConfirmConnection.qml

@@ -0,0 +1,31 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+Dialog {
+    id: root
+
+    required property string databaseUrl
+
+    padding: 10
+
+    title: qsTr('Confirm Database Connection')
+    standardButtons: Dialog.Ok | Dialog.Cancel
+    modal: true
+    Overlay.modal: Rectangle {
+        color: Qt.alpha('gray', 0.2)
+    }
+
+    ColumnLayout {
+        Label {
+            text: 'The connection below will be saved to settings. Confirm?'
+        }
+
+        Pane {
+            Label {
+                id: databaseUrlLabel
+                text: root.databaseUrl
+            }
+        }
+    }
+}

ui/qmls/DatabaseChecker/Dialog_Error.qml

@@ -0,0 +1,34 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+Dialog {
+    id: root
+
+    required property string errorTitle
+    required property string errorMessage
+
+    padding: 10
+
+    title: qsTr('Error')
+    standardButtons: Dialog.Ok
+    modal: true
+    Overlay.modal: Rectangle {
+        color: Qt.alpha('darkgray', 0.5)
+    }
+
+    ColumnLayout {
+        spacing: 5
+
+        Label {
+            font.pointSize: 12
+            font.bold: true
+
+            text: root.errorTitle
+        }
+
+        Label {
+            text: root.errorMessage
+        }
+    }
+}

ui/qmls/DatabaseChecker/HorizontalDivider.qml

@@ -0,0 +1,13 @@
+import QtQuick
+import QtQuick.Layouts
+
+Rectangle {
+    Layout.fillWidth: true
+    Layout.preferredHeight: 1
+
+    Layout.topMargin: 5
+    Layout.bottomMargin: 5
+
+    color: "lightgray"
+    opacity: 0.5
+}

ui/qmls/DatabaseChecker/Index.qml

@@ -0,0 +1,124 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import internal.ui.vm 1.0
+import "../Components"
+
+Page {
+    id: root
+
+    property bool showConfirmConnectionDialog: false
+
+    signal ready
+
+    function confirm(source: string): void {
+        if (!source)
+            throw new Error("source is required");
+
+        const shouldConfirm = (source === 'continueButton' && vm.canConfirmSilently) || source === 'dialog';
+
+        if (shouldConfirm) {
+            vm.confirmCurrentConnection();
+            root.ready();
+        } else {
+            root.showConfirmConnectionDialog = true;
+        }
+    }
+
+    DatabaseInitViewModel {
+        id: vm
+
+        onSelectFileUrlChanged: {
+            selectOrCreate.selectFileUrl = this.selectFileUrl;
+        }
+        onDirectoryUrlChanged: {
+            selectOrCreate.directoryUrl = this.directoryUrl;
+        }
+        onFilenameChanged: {
+            selectOrCreate.filename = this.filename;
+        }
+        onDatabaseUrlChanged: {
+            confirmConnectionDialog.databaseUrl = this.databaseUrl;
+        }
+        onDatabaseInfoChanged: {
+            databaseInfo.info = this.databaseInfo;
+        }
+        onCanContinueChanged: {
+            continueButton.enabled = this.canContinue;
+        }
+    }
+
+    Page {
+        padding: 10
+        anchors.fill: parent
+
+        Dialog_ConfirmConnection {
+            id: confirmConnectionDialog
+
+            anchors.centerIn: parent
+            visible: root.showConfirmConnectionDialog
+
+            onAccepted: root.confirm('dialog')
+            onClosed: root.showConfirmConnectionDialog = false
+
+            databaseUrl: vm.databaseUrl
+        }
+
+        ColumnLayout {
+            width: parent.width
+            spacing: 2
+
+            SectionTitle {
+                text: qsTr('Select or Create Database')
+            }
+
+            Section_SelectOrCreate {
+                id: selectOrCreate
+                selectFileUrl: vm.selectFileUrl
+                createDirectoryUrl: vm.directoryUrl
+                createFilename: vm.filename
+
+                onUiModeChanged: uiMode => vm.uiMode = uiMode
+                onSelectFileUrlChanged: {
+                    vm.selectFileUrl = selectFileUrl;
+                }
+                onCreateDirectoryUrlChanged: {
+                    vm.directoryUrl = createDirectoryUrl;
+                }
+                onCreateFilenameChanged: {
+                    vm.filename = createFilename;
+                }
+                onConfirmCreate: {
+                    vm.loadDatabaseInfo();
+                }
+            }
+
+            HorizontalDivider {}
+
+            SectionTitle {
+                text: 'Database Status'
+            }
+
+            Section_DatabaseInfo {
+                id: databaseInfo
+                info: vm.databaseInfo
+            }
+        }
+
+        footer: Pane {
+            padding: 5
+            RowLayout {
+                Button {
+                    id: continueButton
+                    Layout.alignment: Qt.AlignHCenter
+
+                    text: qsTr('Continue')
+                    enabled: vm.canContinue
+
+                    onClicked: root.confirm('continueButton')
+                }
+            }
+        }
+    }
+}

ui/qmls/DatabaseChecker/Section_DatabaseInfo.qml

@@ -0,0 +1,137 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+ColumnLayout {
+    id: root
+
+    property var info: {
+        'url': undefined,
+        'error': {
+            'title': undefined,
+            'message': undefined
+        },
+        'initialized': undefined,
+        'version': undefined
+    }
+    property bool showErrorDialog: false
+
+    function hasError(): bool {
+        return info?.error?.title !== undefined || info?.error?.message !== undefined;
+    }
+
+    function displayText(value): string {
+        return value ?? '-';
+    }
+
+    function displayBool(value): string {
+        if (value === undefined)
+            return '-';
+        return value ? `<font color="${appTheme.success}">Yes</font>` : `<font color="${appTheme.error}">No</font>`;
+    }
+
+    component LabelLabel: Label {
+        Layout.alignment: Qt.AlignRight | Qt.AlignBaseline
+        font.pointSize: 10
+    }
+
+    SystemPalette {
+        id: palette
+    }
+
+    Dialog_Error {
+        parent: Overlay.overlay
+
+        anchors.centerIn: parent
+        visible: root.hasError() && root.showErrorDialog
+
+        errorTitle: root.displayText(root.info?.error?.title)
+        errorMessage: root.displayText(root.info?.error?.message)
+
+        onClosed: root.showErrorDialog = false
+    }
+
+    Pane {
+        clip: true
+        background: Rectangle {
+            color: Qt.darker(Qt.alpha(palette.window, 0.9), 0.2)
+        }
+
+        // Layout.preferredHeight: root.hasError() ? this.implicitHeight : 0
+        Layout.preferredHeight: 0
+        Behavior on Layout.preferredHeight {
+            PropertyAnimation {
+                duration: 300
+                easing.type: Easing.InOutCubic
+            }
+        }
+
+        ColumnLayout {
+            anchors.fill: parent
+
+            Label {
+                font.bold: true
+                text: root.displayText(root.info.error?.title)
+            }
+
+            Label {
+                text: root.displayText(root.info.error?.message)
+            }
+        }
+    }
+
+    GridLayout {
+        columns: 2
+        columnSpacing: 10
+
+        LabelLabel {
+            text: 'Connection'
+        }
+
+        Label {
+            text: root.info.url
+        }
+
+        LabelLabel {
+            text: 'Initialized'
+        }
+
+        Label {
+            text: root.displayBool(root.info?.initialized)
+        }
+
+        LabelLabel {
+            text: 'Version'
+        }
+
+        Label {
+            text: root.displayText(root.info?.version)
+        }
+
+        Column {
+            Layout.alignment: Qt.AlignRight | Qt.AlignBaseline
+
+            LabelLabel {
+                text: 'Error'
+            }
+
+            ToolButton {
+                Layout.preferredWidth: root.hasError() ? this.implicitWidth : 0
+                Behavior on Layout.preferredWidth {
+                    PropertyAnimation {
+                        duration: 300
+                        easing.type: Easing.InOutCubic
+                    }
+                }
+
+                text: '[?]'
+                onClicked: root.showErrorDialog = true
+            }
+        }
+
+        Label {
+            Layout.alignment: Qt.AlignBaseline
+            text: root.displayText(root.info?.error?.title)
+        }
+    }
+}

ui/qmls/DatabaseChecker/Section_SelectOrCreate.qml

@@ -0,0 +1,69 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import "../Components"
+
+ColumnLayout {
+    id: root
+
+    property alias selectFileUrl: fileSelector.url
+    property alias createDirectoryUrl: fileCreator.directoryUrl
+    property alias createFilename: fileCreator.filename
+
+    signal uiModeChanged(string value)
+    signal confirmCreate
+
+    ListModel {
+        id: uiModeModel
+        ListElement {
+            value: 'select'
+        }
+        ListElement {
+            value: 'create'
+        }
+    }
+
+    TabBar {
+        id: tabBar
+        Layout.fillWidth: true
+
+        TabButton {
+            text: qsTr("Select Existing")
+            width: implicitWidth + 10
+        }
+        TabButton {
+            text: qsTr("Create New File")
+            width: implicitWidth + 10
+        }
+
+        onCurrentIndexChanged: {
+            const idx = this.currentIndex;
+            root.uiModeChanged(uiModeModel.get(idx).value);
+        }
+    }
+
+    StackLayout {
+        currentIndex: tabBar.currentIndex
+
+        Layout.fillWidth: true
+        Layout.preferredHeight: children[currentIndex].height
+        Behavior on Layout.preferredHeight {
+            PropertyAnimation {
+                duration: 300
+                easing.type: Easing.InOutCubic
+            }
+        }
+        clip: true
+
+        FileSelector {
+            id: fileSelector
+        }
+
+        DatabaseFileCreator {
+            id: fileCreator
+
+            onConfirm: root.confirmCreate()
+        }
+    }
+}

ui/qmls/Overview.qml

@@ -0,0 +1,62 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+import internal.ui.vm 1.0
+
+Page {
+    id: root
+
+    property alias b30: vm.b30
+
+    OverviewViewModel {
+        id: vm
+    }
+
+    component Display: RowLayout {
+        required property string label
+        required property string value
+
+        spacing: 5
+
+        // implicitHeight: valueText.implicitHeight
+
+        Label {
+            text: parent.label
+            Layout.alignment: Qt.AlignBaseline
+        }
+
+        Label {
+            id: valueText
+
+            text: parent.value
+            font.pointSize: 18
+            Layout.alignment: Qt.AlignBaseline
+        }
+    }
+
+    RowLayout {
+        ColumnLayout {
+            Layout.fillWidth: true
+            Layout.alignment: Qt.AlignBottom
+
+            Display {
+                label: 'B30'
+                value: root.b30 >= 0 ? root.b30.toFixed(3) : 'N/A'
+            }
+
+            Display {
+                label: 'R10'
+                value: 'Not supported'
+            }
+        }
+
+        Button {
+            Layout.alignment: Qt.AlignBottom
+
+            // TODO: icon
+            text: 'Reload'
+            onClicked: vm.reload()
+        }
+    }
+}

ui/resources/icons/back.svg

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   version="1.1"
-   id="svg1"
-   inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
-   sodipodi:docname="back.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview1"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="true"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="px"
-     showgrid="true"
-     inkscape:zoom="24.40625"
-     inkscape:cx="15.323944"
-     inkscape:cy="10.632522"
-     inkscape:current-layer="layer1">
-    <inkscape:grid
-       id="grid4"
-       units="px"
-       originx="12"
-       originy="12"
-       spacingx="1"
-       spacingy="1"
-       empcolor="#0099e5"
-       empopacity="0.30196078"
-       color="#0099e5"
-       opacity="0.14901961"
-       empspacing="5"
-       dotted="false"
-       gridanglex="30"
-       gridanglez="30"
-       visible="true" />
-  </sodipodi:namedview>
-  <defs
-     id="defs1" />
-  <g
-     inkscape:label="图层 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-dasharray:none;stroke-opacity:1"
-       d="M 17,2 7,12 17,22"
-       id="path2" />
-  </g>
-</svg>

ui/resources/lang/en_US.ts

@@ -70,12 +70,12 @@
         <translation>Continue</translation>
     </message>
     <message>
-        <location filename="../../startup/databaseChecker.py" line="117"/>
+        <location filename="../../startup/databaseChecker.py" line="122"/>
         <source>dialog.tryInitExistingDatabase</source>
         <translation>The existing database doesn&apos;t seem to be initialized properly, try initialize again?</translation>
     </message>
     <message>
-        <location filename="../../startup/databaseChecker.py" line="133"/>
+        <location filename="../../startup/databaseChecker.py" line="138"/>
         <source>dialog.confirmNewDatabase</source>
         <translation>Database file does not exist. Create now?</translation>
     </message>
@@ -224,85 +224,118 @@
     </message>
     <message>
         <location filename="../../designer/components/ocrQueue.ui" line="28"/>
-        <source>iccOptionsGroupBox</source>
-        <translation>ICC Profile Options</translation>
-    </message>
-    <message>
-        <location filename="../../designer/components/ocrQueue.ui" line="34"/>
-        <source>icc.useQt</source>
-        <translation>Use Qt</translation>
-    </message>
-    <message>
-        <location filename="../../designer/components/ocrQueue.ui" line="41"/>
-        <source>icc.usePIL</source>
-        <translation>Use PIL</translation>
-    </message>
-    <message>
-        <location filename="../../designer/components/ocrQueue.ui" line="51"/>
-        <source>icc.tryFix</source>
-        <translation>Try fix</translation>
-    </message>
-    <message>
-        <location filename="../../designer/components/ocrQueue.ui" line="61"/>
         <source>queue.addImageButton</source>
         <translation>Add Image</translation>
     </message>
     <message>
-        <location filename="../../designer/components/ocrQueue.ui" line="71"/>
+        <location filename="../../designer/components/ocrQueue.ui" line="38"/>
         <source>queue.removeSelected</source>
         <translation>Remove Selected</translation>
     </message>
     <message>
-        <location filename="../../designer/components/ocrQueue.ui" line="81"/>
+        <location filename="../../designer/components/ocrQueue.ui" line="48"/>
         <source>queue.removeAll</source>
         <translation>Remove All</translation>
     </message>
     <message>
-        <location filename="../../designer/components/ocrQueue.ui" line="101"/>
+        <location filename="../../designer/components/ocrQueue.ui" line="68"/>
+        <source>queue.optionsButton</source>
+        <translation>Options</translation>
+    </message>
+    <message>
+        <location filename="../../designer/components/ocrQueue.ui" line="75"/>
         <source>queue.startOcrButton</source>
         <translation>Start OCR</translation>
     </message>
     <message>
-        <location filename="../../designer/components/ocrQueue.ui" line="153"/>
+        <location filename="../../designer/components/ocrQueue.ui" line="127"/>
         <source>results</source>
         <translation>Results</translation>
     </message>
     <message>
-        <location filename="../../designer/components/ocrQueue.ui" line="162"/>
+        <location filename="../../designer/components/ocrQueue.ui" line="136"/>
         <source>results.acceptSelectedButton</source>
         <translation>Accept Selected</translation>
     </message>
     <message>
-        <location filename="../../designer/components/ocrQueue.ui" line="169"/>
+        <location filename="../../designer/components/ocrQueue.ui" line="143"/>
         <source>results.acceptAllButton</source>
         <translation>Accept All</translation>
     </message>
     <message>
-        <location filename="../../designer/components/ocrQueue.ui" line="189"/>
+        <location filename="../../designer/components/ocrQueue.ui" line="163"/>
         <source>results.ignoreValidate</source>
         <translation>Ignore
 validation</translation>
     </message>
 </context>
+<context>
+    <name>OcrQueueOptionsDialog</name>
+    <message>
+        <location filename="../../designer/components/ocrQueueOptionsDialog.ui" line="14"/>
+        <source>OCR Options</source>
+        <translation>OCR Options</translation>
+    </message>
+    <message>
+        <location filename="../../designer/components/ocrQueueOptionsDialog.ui" line="22"/>
+        <source>iccOptionsGroupBox</source>
+        <translation>ICC Profile Options</translation>
+    </message>
+    <message>
+        <location filename="../../designer/components/ocrQueueOptionsDialog.ui" line="28"/>
+        <source>icc.useQt</source>
+        <translation>Use Qt</translation>
+    </message>
+    <message>
+        <location filename="../../designer/components/ocrQueueOptionsDialog.ui" line="35"/>
+        <source>icc.usePIL</source>
+        <translation>Use PIL</translation>
+    </message>
+    <message>
+        <location filename="../../designer/components/ocrQueueOptionsDialog.ui" line="45"/>
+        <source>icc.tryFix</source>
+        <translation>Try fix</translation>
+    </message>
+    <message>
+        <location filename="../../designer/components/ocrQueueOptionsDialog.ui" line="55"/>
+        <source>dateOptionsGroupBox</source>
+        <translation>Date Source</translation>
+    </message>
+    <message>
+        <location filename="../../designer/components/ocrQueueOptionsDialog.ui" line="64"/>
+        <source>date.readFromExif</source>
+        <translation>Read from image EXIF</translation>
+    </message>
+    <message>
+        <location filename="../../designer/components/ocrQueueOptionsDialog.ui" line="74"/>
+        <source>date.useCreationDate</source>
+        <translation>File creation time</translation>
+    </message>
+    <message>
+        <location filename="../../designer/components/ocrQueueOptionsDialog.ui" line="84"/>
+        <source>date.useModifyDate</source>
+        <translation>File last modification time</translation>
+    </message>
+</context>
 <context>
     <name>OcrTableModel</name>
     <message>
-        <location filename="../../extends/components/ocrQueue.py" line="347"/>
+        <location filename="../../extends/components/ocrQueue.py" line="348"/>
         <source>horizontalHeader.title.select</source>
         <translation>Select</translation>
     </message>
     <message>
-        <location filename="../../extends/components/ocrQueue.py" line="348"/>
+        <location filename="../../extends/components/ocrQueue.py" line="351"/>
         <source>horizontalHeader.title.imagePreview</source>
         <translation>Image Preview</translation>
     </message>
     <message>
-        <location filename="../../extends/components/ocrQueue.py" line="349"/>
+        <location filename="../../extends/components/ocrQueue.py" line="352"/>
         <source>horizontalHeader.title.chart</source>
         <translation>Chart</translation>
     </message>
     <message>
-        <location filename="../../extends/components/ocrQueue.py" line="350"/>
+        <location filename="../../extends/components/ocrQueue.py" line="353"/>
         <source>horizontalHeader.title.score</source>
         <translation>Score</translation>
     </message>
@@ -672,92 +705,127 @@ validation</translation>
 <context>
     <name>TabDb_Manage</name>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="23"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="78"/>
         <source>syncArcSongDbButton</source>
         <translation>Sync arcsong.db</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="30"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="85"/>
         <source>syncArcSongDb.description</source>
         <translation>Update chart info</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="37"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="98"/>
+        <source>importScoreGroup</source>
+        <translation>Import Score</translation>
+    </message>
+    <message>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="105"/>
         <source>importSt3Button</source>
-        <translation>Import from Game Save</translation>
+        <translation>Game Save Database</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="44"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="112"/>
         <source>importSt3.description</source>
-        <translation>Import scores from your game save</translation>
+        <translation>Import scores from your game save database</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="58"/>
-        <source>exportScoresButton</source>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="139"/>
+        <source>exportScoreGroup</source>
         <translation>Export Scores</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="65"/>
-        <source>exportScores.description</source>
-        <translation>Export all your scores to a JSON file</translation>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="146"/>
+        <source>exportScoresButton</source>
+        <translation>D.E.F. V2</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="79"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="153"/>
+        <source>exportScores.description</source>
+        <translation>Export all your scores in &lt;i&gt;Arcaea Offline Data Exchange Format V2&lt;/i&gt; formed JSON file</translation>
+    </message>
+    <message>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="186"/>
+        <source>miscGroup</source>
+        <translation>Miscellaneous</translation>
+    </message>
+    <message>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="284"/>
+        <source>syncChartInfoDbButton</source>
+        <translation>Sync Chart Info Database</translation>
+    </message>
+    <message>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="291"/>
+        <source>syncChartInfoDb.description</source>
+        <translation>Update chart info</translation>
+    </message>
+    <message>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="23"/>
         <source>importPacklistButton</source>
         <translation>Import packlist</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="86"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="37"/>
         <source>importSonglistButton</source>
         <translation>Import songlist</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="93"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="30"/>
         <source>importPacklist.description</source>
         <translation>Import packlist file</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="100"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="44"/>
         <source>importSonglist.description</source>
         <translation>Import songlist file</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="107"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="193"/>
         <source>exportArcsongJsonButton</source>
         <translation>Export arcsong.json</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="114"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="200"/>
         <source>exportArcsongJson.description</source>
-        <translation>Export arcsong.json file</translation>
+        <translation>Export arcsong.json file based on the information in database</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="121"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="51"/>
         <source>importApkButton</source>
         <translation>Import from APK</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="128"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="213"/>
+        <source>packSongInfoGroup</source>
+        <translation>Pack/Song Info</translation>
+    </message>
+    <message>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="58"/>
         <source>importApk.description</source>
         <translation>Import packlist and songlist from .apk file</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="135"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="71"/>
+        <source>chartInfoGroup</source>
+        <translation>Chart Info</translation>
+    </message>
+    <message>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="119"/>
         <source>importOnlineButton</source>
-        <translation>Import from Arcaea Online</translation>
+        <translation>Arcaea Online</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="142"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="126"/>
         <source>importOnline.description</source>
-        <translation>Import scores from the result of Arcaea Online API</translation>
+        <translation>Import scores from the Arcaea Online API result</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="149"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="160"/>
         <source>exportSmartRteB30Button</source>
-        <translation>Export Scores (CSV, SmartRTE B30)</translation>
+        <translation>SmartRTE B30</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="156"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="167"/>
         <source>exportSmartRteB30.description</source>
         <translation>Export all your scores to &lt;a href=&quot;https://smartrte.github.io/b30gen.html&quot;&gt;smartrte.github.io&lt;/a&gt; compatible CSV file</translation>
     </message>
@@ -840,27 +908,27 @@ validation</translation>
         <translation>Delete Selected Scores</translation>
     </message>
     <message>
-        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="142"/>
+        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="158"/>
         <source>quickSelectComboBox.idEarlier</source>
         <translation>Earlier ID</translation>
     </message>
     <message>
-        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="148"/>
+        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="164"/>
         <source>quickSelectComboBox.dateEarlier</source>
         <translation>Earlier date</translation>
     </message>
     <message>
-        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="154"/>
+        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="170"/>
         <source>quickSelectComboBox.columnsIntegral</source>
         <translation>More complete data</translation>
     </message>
     <message>
-        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="279"/>
+        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="295"/>
         <source>deleteSelectionDialog.content {}</source>
         <translation>Deleting {} scores from database, this cannot be undone!&lt;br&gt;Confirm?</translation>
     </message>
     <message>
-        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="301"/>
+        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="317"/>
         <source>scan_noColumnsDialog.content</source>
         <translation>You haven&apos;t selected any column! Are you sure to continue?</translation>
     </message>

ui/resources/lang/zh_CN.ts

@@ -70,12 +70,12 @@
         <translation>继续</translation>
     </message>
     <message>
-        <location filename="../../startup/databaseChecker.py" line="117"/>
+        <location filename="../../startup/databaseChecker.py" line="122"/>
         <source>dialog.tryInitExistingDatabase</source>
         <translation>现有的数据库似乎没有正确初始化，是否尝试再次初始化？</translation>
     </message>
     <message>
-        <location filename="../../startup/databaseChecker.py" line="133"/>
+        <location filename="../../startup/databaseChecker.py" line="138"/>
         <source>dialog.confirmNewDatabase</source>
         <translation>数据库文件不存在，是否创建？</translation>
     </message>
@@ -224,84 +224,117 @@
     </message>
     <message>
         <location filename="../../designer/components/ocrQueue.ui" line="28"/>
-        <source>iccOptionsGroupBox</source>
-        <translation>ICC 文件选项</translation>
-    </message>
-    <message>
-        <location filename="../../designer/components/ocrQueue.ui" line="34"/>
-        <source>icc.useQt</source>
-        <translation>使用 Qt</translation>
-    </message>
-    <message>
-        <location filename="../../designer/components/ocrQueue.ui" line="41"/>
-        <source>icc.usePIL</source>
-        <translation>使用 PIL</translation>
-    </message>
-    <message>
-        <location filename="../../designer/components/ocrQueue.ui" line="51"/>
-        <source>icc.tryFix</source>
-        <translation>尝试修复</translation>
-    </message>
-    <message>
-        <location filename="../../designer/components/ocrQueue.ui" line="61"/>
         <source>queue.addImageButton</source>
         <translation>添加图像文件</translation>
     </message>
     <message>
-        <location filename="../../designer/components/ocrQueue.ui" line="71"/>
+        <location filename="../../designer/components/ocrQueue.ui" line="38"/>
         <source>queue.removeSelected</source>
         <translation>移除选中</translation>
     </message>
     <message>
-        <location filename="../../designer/components/ocrQueue.ui" line="81"/>
+        <location filename="../../designer/components/ocrQueue.ui" line="48"/>
         <source>queue.removeAll</source>
         <translation>移除所有</translation>
     </message>
     <message>
-        <location filename="../../designer/components/ocrQueue.ui" line="101"/>
+        <location filename="../../designer/components/ocrQueue.ui" line="68"/>
+        <source>queue.optionsButton</source>
+        <translation>选项</translation>
+    </message>
+    <message>
+        <location filename="../../designer/components/ocrQueue.ui" line="75"/>
         <source>queue.startOcrButton</source>
         <translation>开始 OCR</translation>
     </message>
     <message>
-        <location filename="../../designer/components/ocrQueue.ui" line="153"/>
+        <location filename="../../designer/components/ocrQueue.ui" line="127"/>
         <source>results</source>
         <translation>结果</translation>
     </message>
     <message>
-        <location filename="../../designer/components/ocrQueue.ui" line="162"/>
+        <location filename="../../designer/components/ocrQueue.ui" line="136"/>
         <source>results.acceptSelectedButton</source>
         <translation>提交选中</translation>
     </message>
     <message>
-        <location filename="../../designer/components/ocrQueue.ui" line="169"/>
+        <location filename="../../designer/components/ocrQueue.ui" line="143"/>
         <source>results.acceptAllButton</source>
         <translation>提交所有</translation>
     </message>
     <message>
-        <location filename="../../designer/components/ocrQueue.ui" line="189"/>
+        <location filename="../../designer/components/ocrQueue.ui" line="163"/>
         <source>results.ignoreValidate</source>
         <translation>忽略验证</translation>
     </message>
 </context>
+<context>
+    <name>OcrQueueOptionsDialog</name>
+    <message>
+        <location filename="../../designer/components/ocrQueueOptionsDialog.ui" line="14"/>
+        <source>OCR Options</source>
+        <translation>OCR 选项</translation>
+    </message>
+    <message>
+        <location filename="../../designer/components/ocrQueueOptionsDialog.ui" line="22"/>
+        <source>iccOptionsGroupBox</source>
+        <translation>ICC 文件选项</translation>
+    </message>
+    <message>
+        <location filename="../../designer/components/ocrQueueOptionsDialog.ui" line="28"/>
+        <source>icc.useQt</source>
+        <translation>使用 Qt</translation>
+    </message>
+    <message>
+        <location filename="../../designer/components/ocrQueueOptionsDialog.ui" line="35"/>
+        <source>icc.usePIL</source>
+        <translation>使用 PIL</translation>
+    </message>
+    <message>
+        <location filename="../../designer/components/ocrQueueOptionsDialog.ui" line="45"/>
+        <source>icc.tryFix</source>
+        <translation>尝试修复</translation>
+    </message>
+    <message>
+        <location filename="../../designer/components/ocrQueueOptionsDialog.ui" line="55"/>
+        <source>dateOptionsGroupBox</source>
+        <translation>日期来源</translation>
+    </message>
+    <message>
+        <location filename="../../designer/components/ocrQueueOptionsDialog.ui" line="64"/>
+        <source>date.readFromExif</source>
+        <translation>从 EXIF 读取</translation>
+    </message>
+    <message>
+        <location filename="../../designer/components/ocrQueueOptionsDialog.ui" line="74"/>
+        <source>date.useCreationDate</source>
+        <translation>文件创建时间</translation>
+    </message>
+    <message>
+        <location filename="../../designer/components/ocrQueueOptionsDialog.ui" line="84"/>
+        <source>date.useModifyDate</source>
+        <translation>文件最后修改时间</translation>
+    </message>
+</context>
 <context>
     <name>OcrTableModel</name>
     <message>
-        <location filename="../../extends/components/ocrQueue.py" line="347"/>
+        <location filename="../../extends/components/ocrQueue.py" line="348"/>
         <source>horizontalHeader.title.select</source>
         <translation>选择</translation>
     </message>
     <message>
-        <location filename="../../extends/components/ocrQueue.py" line="348"/>
+        <location filename="../../extends/components/ocrQueue.py" line="351"/>
         <source>horizontalHeader.title.imagePreview</source>
         <translation>图像预览</translation>
     </message>
     <message>
-        <location filename="../../extends/components/ocrQueue.py" line="349"/>
+        <location filename="../../extends/components/ocrQueue.py" line="352"/>
         <source>horizontalHeader.title.chart</source>
         <translation>谱面</translation>
     </message>
     <message>
-        <location filename="../../extends/components/ocrQueue.py" line="350"/>
+        <location filename="../../extends/components/ocrQueue.py" line="353"/>
         <source>horizontalHeader.title.score</source>
         <translation>分数</translation>
     </message>
@@ -671,92 +704,127 @@
 <context>
     <name>TabDb_Manage</name>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="23"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="78"/>
         <source>syncArcSongDbButton</source>
         <translation>同步 arcsong.db</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="30"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="85"/>
         <source>syncArcSongDb.description</source>
         <translation>更新谱面信息</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="37"/>
-        <source>importSt3Button</source>
-        <translation>导入本地存档</translation>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="98"/>
+        <source>importScoreGroup</source>
+        <translation>导入分数</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="44"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="105"/>
+        <source>importSt3Button</source>
+        <translation>存档文件</translation>
+    </message>
+    <message>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="112"/>
         <source>importSt3.description</source>
         <translation>遏卡抑五年，天降飞龙，姿容极度美艳。白衣仙女以妙法擒之，与之相恋。&lt;br&gt;来年，恶人携联结万邦之力来袭，仙女龙妃以根源之术，呼唤神通叁式之威，退敌千里，永护宝库安宁。</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="58"/>
-        <source>exportScoresButton</source>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="139"/>
+        <source>exportScoreGroup</source>
         <translation>导出分数</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="65"/>
-        <source>exportScores.description</source>
-        <translation>将所有分数导出为 JSON 文件</translation>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="146"/>
+        <source>exportScoresButton</source>
+        <translation>数据交换格式 V2</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="79"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="153"/>
+        <source>exportScores.description</source>
+        <translation>将所有分数导出为 &lt;i&gt;Arcaea Offline 数据交换格式 V2&lt;/i&gt; JSON 文件</translation>
+    </message>
+    <message>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="186"/>
+        <source>miscGroup</source>
+        <translation>杂项</translation>
+    </message>
+    <message>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="284"/>
+        <source>syncChartInfoDbButton</source>
+        <translation>同步谱面信息数据库</translation>
+    </message>
+    <message>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="291"/>
+        <source>syncChartInfoDb.description</source>
+        <translation>更新谱面信息</translation>
+    </message>
+    <message>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="23"/>
         <source>importPacklistButton</source>
         <translation>导入 packlist</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="86"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="37"/>
         <source>importSonglistButton</source>
         <translation>导入 songlist</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="93"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="30"/>
         <source>importPacklist.description</source>
         <translation>导入 packlist 文件</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="100"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="44"/>
         <source>importSonglist.description</source>
         <translation>导入 songlist 文件</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="107"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="193"/>
         <source>exportArcsongJsonButton</source>
         <translation>导出 arcsong.json</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="114"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="200"/>
         <source>exportArcsongJson.description</source>
-        <translation>导出 arcsong.json 文件</translation>
+        <translation>基于数据库信息导出 arcsong.json 文件</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="121"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="51"/>
         <source>importApkButton</source>
         <translation>从 APK 导入</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="128"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="213"/>
+        <source>packSongInfoGroup</source>
+        <translation>曲包、歌曲信息</translation>
+    </message>
+    <message>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="58"/>
         <source>importApk.description</source>
         <translation>从 .apk 文件导入 packlist 和 songlist</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="135"/>
-        <source>importOnlineButton</source>
-        <translation>从 Arcaea Online 导入</translation>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="71"/>
+        <source>chartInfoGroup</source>
+        <translation>谱面信息</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="142"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="119"/>
+        <source>importOnlineButton</source>
+        <translation>Arcaea Online</translation>
+    </message>
+    <message>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="126"/>
         <source>importOnline.description</source>
         <translation>从 Arcaea Online 的 API 结果导入分数</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="149"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="160"/>
         <source>exportSmartRteB30Button</source>
-        <translation>导出分数（CSV，SmartRTE B30）</translation>
+        <translation>SmartRTE B30</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="156"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="167"/>
         <source>exportSmartRteB30.description</source>
         <translation>将所有分数导出为兼容 &lt;a href=&quot;https://smartrte.github.io/b30gen.html&quot;&gt;smartrte.github.io&lt;/a&gt; 的 CSV 文件</translation>
     </message>
@@ -839,27 +907,27 @@
         <translation>删除已选分数</translation>
     </message>
     <message>
-        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="142"/>
+        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="158"/>
         <source>quickSelectComboBox.idEarlier</source>
         <translation>ID 更早</translation>
     </message>
     <message>
-        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="148"/>
+        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="164"/>
         <source>quickSelectComboBox.dateEarlier</source>
         <translation>时间更早</translation>
     </message>
     <message>
-        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="154"/>
+        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="170"/>
         <source>quickSelectComboBox.columnsIntegral</source>
         <translation>数据更完整</translation>
     </message>
     <message>
-        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="279"/>
+        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="295"/>
         <source>deleteSelectionDialog.content {}</source>
         <translation>将从数据库中删除 {} 个分数。此操作无法撤销！&lt;br&gt;确认吗？</translation>
     </message>
     <message>
-        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="301"/>
+        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="317"/>
         <source>scan_noColumnsDialog.content</source>
         <translation>还未选择任何字段！确定继续吗？</translation>
     </message>

ui/resources/resources.qrc

@@ -8,8 +8,6 @@
 
     <file>fonts/GeosansLight.ttf</file>
 
-    <file>icons/back.svg</file>
-
     <file>images/icon.png</file>
     <file>images/logo.png</file>
     <file>images/jacket-placeholder.png</file>
@@ -21,5 +19,8 @@
 
     <file>lang/zh_CN.qm</file>
     <file>lang/en_US.qm</file>
+
+    <file>themes/default.json</file>
+    <file>themes/tempest.json</file>
   </qresource>
 </RCC>

ui/resources/themes/default.json

@@ -0,0 +1,427 @@
+{
+    "//url": "http://material-foundation.github.io/material-theme-builder/?primary=%234E486C&custom%3ASuccess=%2300C555&colorMatch=true",
+    "name": "default",
+    "description": "TYPE: CUSTOM\nMaterial Theme Builder export",
+    "seed": "#4E486C",
+    "coreColors": {
+        "primary": "#4E486C"
+    },
+    "extendedColors": [
+        {
+            "name": "Success",
+            "color": "#00C555",
+            "description": "",
+            "harmonized": true
+        }
+    ],
+    "schemes": {
+        "light": {
+            "primary": "#373154",
+            "surfaceTint": "#605A7F",
+            "onPrimary": "#FFFFFF",
+            "primaryContainer": "#4E486C",
+            "onPrimaryContainer": "#C0B8E3",
+            "secondary": "#605C6C",
+            "onSecondary": "#FFFFFF",
+            "secondaryContainer": "#E3DDF0",
+            "onSecondaryContainer": "#646071",
+            "tertiary": "#4F2B40",
+            "onTertiary": "#FFFFFF",
+            "tertiaryContainer": "#684157",
+            "onTertiaryContainer": "#E3B0CA",
+            "error": "#BA1A1A",
+            "onError": "#FFFFFF",
+            "errorContainer": "#FFDAD6",
+            "onErrorContainer": "#93000A",
+            "background": "#FDF8FC",
+            "onBackground": "#1C1B1E",
+            "surface": "#FDF8FC",
+            "onSurface": "#1C1B1E",
+            "surfaceVariant": "#E6E1EA",
+            "onSurfaceVariant": "#48464D",
+            "outline": "#79767E",
+            "outlineVariant": "#C9C5CE",
+            "shadow": "#000000",
+            "scrim": "#000000",
+            "inverseSurface": "#313033",
+            "inverseOnSurface": "#F4EFF3",
+            "inversePrimary": "#C9C1EC",
+            "primaryFixed": "#E6DEFF",
+            "onPrimaryFixed": "#1C1738",
+            "primaryFixedDim": "#C9C1EC",
+            "onPrimaryFixedVariant": "#484266",
+            "secondaryFixed": "#E6E0F3",
+            "onSecondaryFixed": "#1C1A27",
+            "secondaryFixedDim": "#C9C4D7",
+            "onSecondaryFixedVariant": "#484554",
+            "tertiaryFixed": "#FFD8EA",
+            "onTertiaryFixed": "#301024",
+            "tertiaryFixedDim": "#ECB8D2",
+            "onTertiaryFixedVariant": "#613B51",
+            "surfaceDim": "#DDD9DC",
+            "surfaceBright": "#FDF8FC",
+            "surfaceContainerLowest": "#FFFFFF",
+            "surfaceContainerLow": "#F7F2F6",
+            "surfaceContainer": "#F1ECF0",
+            "surfaceContainerHigh": "#EBE7EA",
+            "surfaceContainerHighest": "#E6E1E5"
+        },
+        "light-medium-contrast": {
+            "primary": "#373154",
+            "surfaceTint": "#605A7F",
+            "onPrimary": "#FFFFFF",
+            "primaryContainer": "#4E486C",
+            "onPrimaryContainer": "#EDE7FF",
+            "secondary": "#373443",
+            "onSecondary": "#FFFFFF",
+            "secondaryContainer": "#6F6B7B",
+            "onSecondaryContainer": "#FFFFFF",
+            "tertiary": "#4E2B40",
+            "onTertiary": "#FFFFFF",
+            "tertiaryContainer": "#684157",
+            "onTertiaryContainer": "#FFE4EF",
+            "error": "#740006",
+            "onError": "#FFFFFF",
+            "errorContainer": "#CF2C27",
+            "onErrorContainer": "#FFFFFF",
+            "background": "#FDF8FC",
+            "onBackground": "#1C1B1E",
+            "surface": "#FDF8FC",
+            "onSurface": "#121113",
+            "surfaceVariant": "#E6E1EA",
+            "onSurfaceVariant": "#37353D",
+            "outline": "#545159",
+            "outlineVariant": "#6F6C74",
+            "shadow": "#000000",
+            "scrim": "#000000",
+            "inverseSurface": "#313033",
+            "inverseOnSurface": "#F4EFF3",
+            "inversePrimary": "#C9C1EC",
+            "primaryFixed": "#6F688E",
+            "onPrimaryFixed": "#FFFFFF",
+            "primaryFixedDim": "#565075",
+            "onPrimaryFixedVariant": "#FFFFFF",
+            "secondaryFixed": "#6F6B7B",
+            "onSecondaryFixed": "#FFFFFF",
+            "secondaryFixedDim": "#565363",
+            "onSecondaryFixedVariant": "#FFFFFF",
+            "tertiaryFixed": "#8B6078",
+            "onTertiaryFixed": "#FFFFFF",
+            "tertiaryFixedDim": "#71495F",
+            "onTertiaryFixedVariant": "#FFFFFF",
+            "surfaceDim": "#C9C5C9",
+            "surfaceBright": "#FDF8FC",
+            "surfaceContainerLowest": "#FFFFFF",
+            "surfaceContainerLow": "#F7F2F6",
+            "surfaceContainer": "#EBE7EA",
+            "surfaceContainerHigh": "#E0DCDF",
+            "surfaceContainerHighest": "#D4D0D4"
+        },
+        "light-high-contrast": {
+            "primary": "#2D2749",
+            "surfaceTint": "#605A7F",
+            "onPrimary": "#FFFFFF",
+            "primaryContainer": "#4A4468",
+            "onPrimaryContainer": "#FFFFFF",
+            "secondary": "#2D2A39",
+            "onSecondary": "#FFFFFF",
+            "secondaryContainer": "#4A4757",
+            "onSecondaryContainer": "#FFFFFF",
+            "tertiary": "#432135",
+            "onTertiary": "#FFFFFF",
+            "tertiaryContainer": "#643D53",
+            "onTertiaryContainer": "#FFFFFF",
+            "error": "#600004",
+            "onError": "#FFFFFF",
+            "errorContainer": "#98000A",
+            "onErrorContainer": "#FFFFFF",
+            "background": "#FDF8FC",
+            "onBackground": "#1C1B1E",
+            "surface": "#FDF8FC",
+            "onSurface": "#000000",
+            "surfaceVariant": "#E6E1EA",
+            "onSurfaceVariant": "#000000",
+            "outline": "#2D2B32",
+            "outlineVariant": "#4A4850",
+            "shadow": "#000000",
+            "scrim": "#000000",
+            "inverseSurface": "#313033",
+            "inverseOnSurface": "#FFFFFF",
+            "inversePrimary": "#C9C1EC",
+            "primaryFixed": "#4A4468",
+            "onPrimaryFixed": "#FFFFFF",
+            "primaryFixedDim": "#342E50",
+            "onPrimaryFixedVariant": "#FFFFFF",
+            "secondaryFixed": "#4A4757",
+            "onSecondaryFixed": "#FFFFFF",
+            "secondaryFixedDim": "#34313F",
+            "onSecondaryFixedVariant": "#FFFFFF",
+            "tertiaryFixed": "#643D53",
+            "onTertiaryFixed": "#FFFFFF",
+            "tertiaryFixedDim": "#4A273C",
+            "onTertiaryFixedVariant": "#FFFFFF",
+            "surfaceDim": "#BBB8BB",
+            "surfaceBright": "#FDF8FC",
+            "surfaceContainerLowest": "#FFFFFF",
+            "surfaceContainerLow": "#F4EFF3",
+            "surfaceContainer": "#E6E1E5",
+            "surfaceContainerHigh": "#D7D3D7",
+            "surfaceContainerHighest": "#C9C5C9"
+        },
+        "dark": {
+            "primary": "#C9C1EC",
+            "surfaceTint": "#C9C1EC",
+            "onPrimary": "#312C4E",
+            "primaryContainer": "#4E486C",
+            "onPrimaryContainer": "#C0B8E3",
+            "secondary": "#C9C4D7",
+            "onSecondary": "#312E3D",
+            "secondaryContainer": "#4A4757",
+            "onSecondaryContainer": "#BBB6C8",
+            "tertiary": "#ECB8D2",
+            "onTertiary": "#48253A",
+            "tertiaryContainer": "#684157",
+            "onTertiaryContainer": "#E3B0CA",
+            "error": "#FFB4AB",
+            "onError": "#690005",
+            "errorContainer": "#93000A",
+            "onErrorContainer": "#FFDAD6",
+            "background": "#141315",
+            "onBackground": "#E6E1E5",
+            "surface": "#141315",
+            "onSurface": "#E6E1E5",
+            "surfaceVariant": "#48464D",
+            "onSurfaceVariant": "#C9C5CE",
+            "outline": "#938F98",
+            "outlineVariant": "#48464D",
+            "shadow": "#000000",
+            "scrim": "#000000",
+            "inverseSurface": "#E6E1E5",
+            "inverseOnSurface": "#313033",
+            "inversePrimary": "#605A7F",
+            "primaryFixed": "#E6DEFF",
+            "onPrimaryFixed": "#1C1738",
+            "primaryFixedDim": "#C9C1EC",
+            "onPrimaryFixedVariant": "#484266",
+            "secondaryFixed": "#E6E0F3",
+            "onSecondaryFixed": "#1C1A27",
+            "secondaryFixedDim": "#C9C4D7",
+            "onSecondaryFixedVariant": "#484554",
+            "tertiaryFixed": "#FFD8EA",
+            "onTertiaryFixed": "#301024",
+            "tertiaryFixedDim": "#ECB8D2",
+            "onTertiaryFixedVariant": "#613B51",
+            "surfaceDim": "#141315",
+            "surfaceBright": "#3A393B",
+            "surfaceContainerLowest": "#0F0E10",
+            "surfaceContainerLow": "#1C1B1E",
+            "surfaceContainer": "#201F22",
+            "surfaceContainerHigh": "#2B292C",
+            "surfaceContainerHighest": "#363437"
+        },
+        "dark-medium-contrast": {
+            "primary": "#E0D7FF",
+            "surfaceTint": "#C9C1EC",
+            "onPrimary": "#262142",
+            "primaryContainer": "#938CB4",
+            "onPrimaryContainer": "#000000",
+            "secondary": "#DFD9ED",
+            "onSecondary": "#262432",
+            "secondaryContainer": "#938EA0",
+            "onSecondaryContainer": "#000000",
+            "tertiary": "#FFCFE7",
+            "onTertiary": "#3C1A2E",
+            "tertiaryContainer": "#B2839C",
+            "onTertiaryContainer": "#000000",
+            "error": "#FFD2CC",
+            "onError": "#540003",
+            "errorContainer": "#FF5449",
+            "onErrorContainer": "#000000",
+            "background": "#141315",
+            "onBackground": "#E6E1E5",
+            "surface": "#141315",
+            "onSurface": "#FFFFFF",
+            "surfaceVariant": "#48464D",
+            "onSurfaceVariant": "#DFDAE4",
+            "outline": "#B4B0BA",
+            "outlineVariant": "#928F98",
+            "shadow": "#000000",
+            "scrim": "#000000",
+            "inverseSurface": "#E6E1E5",
+            "inverseOnSurface": "#2B292C",
+            "inversePrimary": "#494367",
+            "primaryFixed": "#E6DEFF",
+            "onPrimaryFixed": "#120C2D",
+            "primaryFixedDim": "#C9C1EC",
+            "onPrimaryFixedVariant": "#373254",
+            "secondaryFixed": "#E6E0F3",
+            "onSecondaryFixed": "#120F1D",
+            "secondaryFixedDim": "#C9C4D7",
+            "onSecondaryFixedVariant": "#373443",
+            "tertiaryFixed": "#FFD8EA",
+            "onTertiaryFixed": "#230619",
+            "tertiaryFixedDim": "#ECB8D2",
+            "onTertiaryFixedVariant": "#4E2B40",
+            "surfaceDim": "#141315",
+            "surfaceBright": "#454447",
+            "surfaceContainerLowest": "#080709",
+            "surfaceContainerLow": "#1E1D20",
+            "surfaceContainer": "#28272A",
+            "surfaceContainerHigh": "#333235",
+            "surfaceContainerHighest": "#3F3D40"
+        },
+        "dark-high-contrast": {
+            "primary": "#F3EDFF",
+            "surfaceTint": "#C9C1EC",
+            "onPrimary": "#000000",
+            "primaryContainer": "#C6BDE8",
+            "onPrimaryContainer": "#0B0627",
+            "secondary": "#F3EDFF",
+            "onSecondary": "#000000",
+            "secondaryContainer": "#C5C0D3",
+            "onSecondaryContainer": "#0C0916",
+            "tertiary": "#FFEBF3",
+            "onTertiary": "#000000",
+            "tertiaryContainer": "#E7B4CE",
+            "onTertiaryContainer": "#1C0213",
+            "error": "#FFECE9",
+            "onError": "#000000",
+            "errorContainer": "#FFAEA4",
+            "onErrorContainer": "#220001",
+            "background": "#141315",
+            "onBackground": "#E6E1E5",
+            "surface": "#141315",
+            "onSurface": "#FFFFFF",
+            "surfaceVariant": "#48464D",
+            "onSurfaceVariant": "#FFFFFF",
+            "outline": "#F3EEF8",
+            "outlineVariant": "#C5C1CA",
+            "shadow": "#000000",
+            "scrim": "#000000",
+            "inverseSurface": "#E6E1E5",
+            "inverseOnSurface": "#000000",
+            "inversePrimary": "#494367",
+            "primaryFixed": "#E6DEFF",
+            "onPrimaryFixed": "#000000",
+            "primaryFixedDim": "#C9C1EC",
+            "onPrimaryFixedVariant": "#120C2D",
+            "secondaryFixed": "#E6E0F3",
+            "onSecondaryFixed": "#000000",
+            "secondaryFixedDim": "#C9C4D7",
+            "onSecondaryFixedVariant": "#120F1D",
+            "tertiaryFixed": "#FFD8EA",
+            "onTertiaryFixed": "#000000",
+            "tertiaryFixedDim": "#ECB8D2",
+            "onTertiaryFixedVariant": "#230619",
+            "surfaceDim": "#141315",
+            "surfaceBright": "#514F52",
+            "surfaceContainerLowest": "#000000",
+            "surfaceContainerLow": "#201F22",
+            "surfaceContainer": "#313033",
+            "surfaceContainerHigh": "#3C3B3E",
+            "surfaceContainerHighest": "#484649"
+        }
+    },
+    "palettes": {
+        "primary": {
+            "0": "#000000",
+            "5": "#110B2C",
+            "10": "#1C1738",
+            "15": "#272142",
+            "20": "#312C4E",
+            "25": "#3C375A",
+            "30": "#484266",
+            "35": "#544E72",
+            "40": "#605A7F",
+            "50": "#797299",
+            "60": "#938CB4",
+            "70": "#AEA6CF",
+            "80": "#C9C1EC",
+            "90": "#E6DEFF",
+            "95": "#F4EEFF",
+            "98": "#FDF8FF",
+            "99": "#FFFBFF",
+            "100": "#FFFFFF"
+        },
+        "secondary": {
+            "0": "#000000",
+            "5": "#111018",
+            "10": "#1C1A23",
+            "15": "#26252D",
+            "20": "#312F38",
+            "25": "#3C3A43",
+            "30": "#48454F",
+            "35": "#54515B",
+            "40": "#605D67",
+            "50": "#797580",
+            "60": "#938F9A",
+            "70": "#AEA9B5",
+            "80": "#C9C4D0",
+            "90": "#E6E0EC",
+            "95": "#F4EEFB",
+            "98": "#FDF8FF",
+            "99": "#FFFBFF",
+            "100": "#FFFFFF"
+        },
+        "tertiary": {
+            "0": "#000000",
+            "5": "#1B0C13",
+            "10": "#27171E",
+            "15": "#322128",
+            "20": "#3E2B33",
+            "25": "#49363E",
+            "30": "#564149",
+            "35": "#624D55",
+            "40": "#6F5861",
+            "50": "#897179",
+            "60": "#A38A93",
+            "70": "#BFA4AD",
+            "80": "#DCBFC9",
+            "90": "#F9DBE5",
+            "95": "#FFECF1",
+            "98": "#FFF8F8",
+            "99": "#FFFBFF",
+            "100": "#FFFFFF"
+        },
+        "neutral": {
+            "0": "#000000",
+            "5": "#111112",
+            "10": "#1C1B1D",
+            "15": "#262527",
+            "20": "#313032",
+            "25": "#3C3B3D",
+            "30": "#484648",
+            "35": "#545254",
+            "40": "#605E60",
+            "50": "#797678",
+            "60": "#939092",
+            "70": "#ADAAAC",
+            "80": "#C9C5C7",
+            "90": "#E5E1E3",
+            "95": "#F4EFF1",
+            "98": "#FDF8FA",
+            "99": "#FFFBFF",
+            "100": "#FFFFFF"
+        },
+        "neutral-variant": {
+            "0": "#000000",
+            "5": "#111014",
+            "10": "#1C1B1F",
+            "15": "#262529",
+            "20": "#313034",
+            "25": "#3C3B3F",
+            "30": "#48464A",
+            "35": "#545256",
+            "40": "#605D62",
+            "50": "#79767B",
+            "60": "#939094",
+            "70": "#AEAAAF",
+            "80": "#C9C5CA",
+            "90": "#E6E1E6",
+            "95": "#F4EFF4",
+            "98": "#FDF8FD",
+            "99": "#FFFBFF",
+            "100": "#FFFFFF"
+        }
+    }
+}

ui/resources/themes/tempest.json

@@ -0,0 +1,427 @@
+{
+    "//url": "http://material-foundation.github.io/material-theme-builder/?primary=%23186D98&custom%3ASuccess=%2300C555&colorMatch=true",
+    "name": "tempest",
+    "description": "TYPE: CUSTOM\nMaterial Theme Builder export",
+    "seed": "#186D98",
+    "coreColors": {
+        "primary": "#186D98"
+    },
+    "extendedColors": [
+        {
+            "name": "Success",
+            "color": "#00C555",
+            "description": "",
+            "harmonized": true
+        }
+    ],
+    "schemes": {
+        "light": {
+            "primary": "#005479",
+            "surfaceTint": "#03658F",
+            "onPrimary": "#FFFFFF",
+            "primaryContainer": "#186D98",
+            "onPrimaryContainer": "#CEE9FF",
+            "secondary": "#496173",
+            "onSecondary": "#FFFFFF",
+            "secondaryContainer": "#C9E3F8",
+            "onSecondaryContainer": "#4D6678",
+            "tertiary": "#683D7A",
+            "onTertiary": "#FFFFFF",
+            "tertiaryContainer": "#825594",
+            "onTertiaryContainer": "#F9DCFF",
+            "error": "#BA1A1A",
+            "onError": "#FFFFFF",
+            "errorContainer": "#FFDAD6",
+            "onErrorContainer": "#93000A",
+            "background": "#F7F9FD",
+            "onBackground": "#191C1F",
+            "surface": "#F7F9FD",
+            "onSurface": "#191C1F",
+            "surfaceVariant": "#DCE3EB",
+            "onSurfaceVariant": "#40484E",
+            "outline": "#70787F",
+            "outlineVariant": "#C0C7CF",
+            "shadow": "#000000",
+            "scrim": "#000000",
+            "inverseSurface": "#2D3134",
+            "inverseOnSurface": "#EFF1F5",
+            "inversePrimary": "#88CEFE",
+            "primaryFixed": "#C8E6FF",
+            "onPrimaryFixed": "#001E2E",
+            "primaryFixedDim": "#88CEFE",
+            "onPrimaryFixedVariant": "#004C6D",
+            "secondaryFixed": "#CCE6FB",
+            "onSecondaryFixed": "#021E2D",
+            "secondaryFixedDim": "#B0CADF",
+            "onSecondaryFixedVariant": "#314A5B",
+            "tertiaryFixed": "#F8D8FF",
+            "onTertiaryFixed": "#300443",
+            "tertiaryFixedDim": "#E8B4FA",
+            "onTertiaryFixedVariant": "#603572",
+            "surfaceDim": "#D8DADE",
+            "surfaceBright": "#F7F9FD",
+            "surfaceContainerLowest": "#FFFFFF",
+            "surfaceContainerLow": "#F2F4F7",
+            "surfaceContainer": "#ECEEF2",
+            "surfaceContainerHigh": "#E6E8EC",
+            "surfaceContainerHighest": "#E0E2E6"
+        },
+        "light-medium-contrast": {
+            "primary": "#003A55",
+            "surfaceTint": "#03658F",
+            "onPrimary": "#FFFFFF",
+            "primaryContainer": "#186D98",
+            "onPrimaryContainer": "#FFFFFF",
+            "secondary": "#203949",
+            "onSecondary": "#FFFFFF",
+            "secondaryContainer": "#577082",
+            "onSecondaryContainer": "#FFFFFF",
+            "tertiary": "#4E2460",
+            "onTertiary": "#FFFFFF",
+            "tertiaryContainer": "#825594",
+            "onTertiaryContainer": "#FFFFFF",
+            "error": "#740006",
+            "onError": "#FFFFFF",
+            "errorContainer": "#CF2C27",
+            "onErrorContainer": "#FFFFFF",
+            "background": "#F7F9FD",
+            "onBackground": "#191C1F",
+            "surface": "#F7F9FD",
+            "onSurface": "#0E1214",
+            "surfaceVariant": "#DCE3EB",
+            "onSurfaceVariant": "#2F373D",
+            "outline": "#4C535A",
+            "outlineVariant": "#666E75",
+            "shadow": "#000000",
+            "scrim": "#000000",
+            "inverseSurface": "#2D3134",
+            "inverseOnSurface": "#EFF1F5",
+            "inversePrimary": "#88CEFE",
+            "primaryFixed": "#23749F",
+            "onPrimaryFixed": "#FFFFFF",
+            "primaryFixedDim": "#005B82",
+            "onPrimaryFixedVariant": "#FFFFFF",
+            "secondaryFixed": "#577082",
+            "onSecondaryFixed": "#FFFFFF",
+            "secondaryFixedDim": "#3F5869",
+            "onSecondaryFixedVariant": "#FFFFFF",
+            "tertiaryFixed": "#895C9B",
+            "onTertiaryFixed": "#FFFFFF",
+            "tertiaryFixedDim": "#6F4381",
+            "onTertiaryFixedVariant": "#FFFFFF",
+            "surfaceDim": "#C4C7CA",
+            "surfaceBright": "#F7F9FD",
+            "surfaceContainerLowest": "#FFFFFF",
+            "surfaceContainerLow": "#F2F4F7",
+            "surfaceContainer": "#E6E8EC",
+            "surfaceContainerHigh": "#DBDDE1",
+            "surfaceContainerHighest": "#CFD2D5"
+        },
+        "light-high-contrast": {
+            "primary": "#003046",
+            "surfaceTint": "#03658F",
+            "onPrimary": "#FFFFFF",
+            "primaryContainer": "#004E71",
+            "onPrimaryContainer": "#FFFFFF",
+            "secondary": "#152F3F",
+            "onSecondary": "#FFFFFF",
+            "secondaryContainer": "#344C5D",
+            "onSecondaryContainer": "#FFFFFF",
+            "tertiary": "#421955",
+            "onTertiary": "#FFFFFF",
+            "tertiaryContainer": "#623874",
+            "onTertiaryContainer": "#FFFFFF",
+            "error": "#600004",
+            "onError": "#FFFFFF",
+            "errorContainer": "#98000A",
+            "onErrorContainer": "#FFFFFF",
+            "background": "#F7F9FD",
+            "onBackground": "#191C1F",
+            "surface": "#F7F9FD",
+            "onSurface": "#000000",
+            "surfaceVariant": "#DCE3EB",
+            "onSurfaceVariant": "#000000",
+            "outline": "#252D33",
+            "outlineVariant": "#424A51",
+            "shadow": "#000000",
+            "scrim": "#000000",
+            "inverseSurface": "#2D3134",
+            "inverseOnSurface": "#FFFFFF",
+            "inversePrimary": "#88CEFE",
+            "primaryFixed": "#004E71",
+            "onPrimaryFixed": "#FFFFFF",
+            "primaryFixedDim": "#003650",
+            "onPrimaryFixedVariant": "#FFFFFF",
+            "secondaryFixed": "#344C5D",
+            "onSecondaryFixed": "#FFFFFF",
+            "secondaryFixedDim": "#1C3546",
+            "onSecondaryFixedVariant": "#FFFFFF",
+            "tertiaryFixed": "#623874",
+            "onTertiaryFixed": "#FFFFFF",
+            "tertiaryFixedDim": "#4A205C",
+            "onTertiaryFixedVariant": "#FFFFFF",
+            "surfaceDim": "#B6B9BD",
+            "surfaceBright": "#F7F9FD",
+            "surfaceContainerLowest": "#FFFFFF",
+            "surfaceContainerLow": "#EFF1F5",
+            "surfaceContainer": "#E0E2E6",
+            "surfaceContainerHigh": "#D2D4D8",
+            "surfaceContainerHighest": "#C4C7CA"
+        },
+        "dark": {
+            "primary": "#88CEFE",
+            "surfaceTint": "#88CEFE",
+            "onPrimary": "#00344D",
+            "primaryContainer": "#186D98",
+            "onPrimaryContainer": "#CEE9FF",
+            "secondary": "#B0CADF",
+            "onSecondary": "#1A3343",
+            "secondaryContainer": "#314A5B",
+            "onSecondaryContainer": "#9FB8CD",
+            "tertiary": "#E8B4FA",
+            "onTertiary": "#471E59",
+            "tertiaryContainer": "#825594",
+            "onTertiaryContainer": "#F9DCFF",
+            "error": "#FFB4AB",
+            "onError": "#690005",
+            "errorContainer": "#93000A",
+            "onErrorContainer": "#FFDAD6",
+            "background": "#101417",
+            "onBackground": "#E0E2E6",
+            "surface": "#101417",
+            "onSurface": "#E0E2E6",
+            "surfaceVariant": "#40484E",
+            "onSurfaceVariant": "#C0C7CF",
+            "outline": "#8A9299",
+            "outlineVariant": "#40484E",
+            "shadow": "#000000",
+            "scrim": "#000000",
+            "inverseSurface": "#E0E2E6",
+            "inverseOnSurface": "#2D3134",
+            "inversePrimary": "#03658F",
+            "primaryFixed": "#C8E6FF",
+            "onPrimaryFixed": "#001E2E",
+            "primaryFixedDim": "#88CEFE",
+            "onPrimaryFixedVariant": "#004C6D",
+            "secondaryFixed": "#CCE6FB",
+            "onSecondaryFixed": "#021E2D",
+            "secondaryFixedDim": "#B0CADF",
+            "onSecondaryFixedVariant": "#314A5B",
+            "tertiaryFixed": "#F8D8FF",
+            "onTertiaryFixed": "#300443",
+            "tertiaryFixedDim": "#E8B4FA",
+            "onTertiaryFixedVariant": "#603572",
+            "surfaceDim": "#101417",
+            "surfaceBright": "#363A3D",
+            "surfaceContainerLowest": "#0B0F11",
+            "surfaceContainerLow": "#191C1F",
+            "surfaceContainer": "#1D2023",
+            "surfaceContainerHigh": "#272A2D",
+            "surfaceContainerHighest": "#323538"
+        },
+        "dark-medium-contrast": {
+            "primary": "#BBE1FF",
+            "surfaceTint": "#88CEFE",
+            "onPrimary": "#00293D",
+            "primaryContainer": "#5098C5",
+            "onPrimaryContainer": "#000000",
+            "secondary": "#C6E0F5",
+            "onSecondary": "#0D2838",
+            "secondaryContainer": "#7B94A7",
+            "onSecondaryContainer": "#000000",
+            "tertiary": "#F5D0FF",
+            "onTertiary": "#3B114E",
+            "tertiaryContainer": "#AF7FC1",
+            "onTertiaryContainer": "#000000",
+            "error": "#FFD2CC",
+            "onError": "#540003",
+            "errorContainer": "#FF5449",
+            "onErrorContainer": "#000000",
+            "background": "#101417",
+            "onBackground": "#E0E2E6",
+            "surface": "#101417",
+            "onSurface": "#FFFFFF",
+            "surfaceVariant": "#40484E",
+            "onSurfaceVariant": "#D6DDE5",
+            "outline": "#ABB3BB",
+            "outlineVariant": "#899199",
+            "shadow": "#000000",
+            "scrim": "#000000",
+            "inverseSurface": "#E0E2E6",
+            "inverseOnSurface": "#272A2D",
+            "inversePrimary": "#004D6F",
+            "primaryFixed": "#C8E6FF",
+            "onPrimaryFixed": "#00131F",
+            "primaryFixedDim": "#88CEFE",
+            "onPrimaryFixedVariant": "#003A55",
+            "secondaryFixed": "#CCE6FB",
+            "onSecondaryFixed": "#00131F",
+            "secondaryFixedDim": "#B0CADF",
+            "onSecondaryFixedVariant": "#203949",
+            "tertiaryFixed": "#F8D8FF",
+            "onTertiaryFixed": "#220032",
+            "tertiaryFixedDim": "#E8B4FA",
+            "onTertiaryFixedVariant": "#4E2460",
+            "surfaceDim": "#101417",
+            "surfaceBright": "#424548",
+            "surfaceContainerLowest": "#05080A",
+            "surfaceContainerLow": "#1B1E21",
+            "surfaceContainer": "#25282B",
+            "surfaceContainerHigh": "#303336",
+            "surfaceContainerHighest": "#3B3E41"
+        },
+        "dark-high-contrast": {
+            "primary": "#E3F2FF",
+            "surfaceTint": "#88CEFE",
+            "onPrimary": "#000000",
+            "primaryContainer": "#84CAFA",
+            "onPrimaryContainer": "#000D17",
+            "secondary": "#E3F2FF",
+            "onSecondary": "#000000",
+            "secondaryContainer": "#ACC6DB",
+            "onSecondaryContainer": "#000D17",
+            "tertiary": "#FDEAFF",
+            "onTertiary": "#000000",
+            "tertiaryContainer": "#E4B0F6",
+            "onTertiaryContainer": "#190026",
+            "error": "#FFECE9",
+            "onError": "#000000",
+            "errorContainer": "#FFAEA4",
+            "onErrorContainer": "#220001",
+            "background": "#101417",
+            "onBackground": "#E0E2E6",
+            "surface": "#101417",
+            "onSurface": "#FFFFFF",
+            "surfaceVariant": "#40484E",
+            "onSurfaceVariant": "#FFFFFF",
+            "outline": "#E9F1F9",
+            "outlineVariant": "#BCC3CB",
+            "shadow": "#000000",
+            "scrim": "#000000",
+            "inverseSurface": "#E0E2E6",
+            "inverseOnSurface": "#000000",
+            "inversePrimary": "#004D6F",
+            "primaryFixed": "#C8E6FF",
+            "onPrimaryFixed": "#000000",
+            "primaryFixedDim": "#88CEFE",
+            "onPrimaryFixedVariant": "#00131F",
+            "secondaryFixed": "#CCE6FB",
+            "onSecondaryFixed": "#000000",
+            "secondaryFixedDim": "#B0CADF",
+            "onSecondaryFixedVariant": "#00131F",
+            "tertiaryFixed": "#F8D8FF",
+            "onTertiaryFixed": "#000000",
+            "tertiaryFixedDim": "#E8B4FA",
+            "onTertiaryFixedVariant": "#220032",
+            "surfaceDim": "#101417",
+            "surfaceBright": "#4D5054",
+            "surfaceContainerLowest": "#000000",
+            "surfaceContainerLow": "#1D2023",
+            "surfaceContainer": "#2D3134",
+            "surfaceContainerHigh": "#383C3F",
+            "surfaceContainerHighest": "#44474A"
+        }
+    },
+    "palettes": {
+        "primary": {
+            "0": "#000000",
+            "5": "#00131F",
+            "10": "#001E2E",
+            "15": "#00293D",
+            "20": "#00344D",
+            "25": "#00405D",
+            "30": "#004C6D",
+            "35": "#00587E",
+            "40": "#03658F",
+            "50": "#317EAA",
+            "60": "#5098C5",
+            "70": "#6CB3E1",
+            "80": "#88CEFE",
+            "90": "#C8E6FF",
+            "95": "#E5F2FF",
+            "98": "#F6FAFF",
+            "99": "#FBFCFF",
+            "100": "#FFFFFF"
+        },
+        "secondary": {
+            "0": "#000000",
+            "5": "#05121B",
+            "10": "#0F1D26",
+            "15": "#1A2731",
+            "20": "#25323C",
+            "25": "#303D47",
+            "30": "#3B4853",
+            "35": "#46545F",
+            "40": "#52606B",
+            "50": "#6B7984",
+            "60": "#84929E",
+            "70": "#9FADB9",
+            "80": "#BAC8D5",
+            "90": "#D6E4F2",
+            "95": "#E5F2FF",
+            "98": "#F6FAFF",
+            "99": "#FBFCFF",
+            "100": "#FFFFFF"
+        },
+        "tertiary": {
+            "0": "#000000",
+            "5": "#140D25",
+            "10": "#1E1730",
+            "15": "#29223B",
+            "20": "#342C46",
+            "25": "#3F3752",
+            "30": "#4B425E",
+            "35": "#564E6A",
+            "40": "#635A76",
+            "50": "#7C7290",
+            "60": "#968CAB",
+            "70": "#B1A6C6",
+            "80": "#CDC1E2",
+            "90": "#E9DDFF",
+            "95": "#F6EDFF",
+            "98": "#FEF7FF",
+            "99": "#FFFBFF",
+            "100": "#FFFFFF"
+        },
+        "neutral": {
+            "0": "#000000",
+            "5": "#0F1113",
+            "10": "#1A1C1E",
+            "15": "#242628",
+            "20": "#2F3132",
+            "25": "#3A3B3D",
+            "30": "#454749",
+            "35": "#515254",
+            "40": "#5D5E60",
+            "50": "#767779",
+            "60": "#909193",
+            "70": "#AAABAD",
+            "80": "#C6C6C8",
+            "90": "#E2E2E4",
+            "95": "#F1F0F3",
+            "98": "#F9F9FB",
+            "99": "#FCFCFE",
+            "100": "#FFFFFF"
+        },
+        "neutral-variant": {
+            "0": "#000000",
+            "5": "#0C1215",
+            "10": "#171C20",
+            "15": "#21262B",
+            "20": "#2C3135",
+            "25": "#373C40",
+            "30": "#42474C",
+            "35": "#4E5358",
+            "40": "#5A5F64",
+            "50": "#73787D",
+            "60": "#8C9196",
+            "70": "#A7ACB1",
+            "80": "#C2C7CC",
+            "90": "#DEE3E8",
+            "95": "#EDF1F7",
+            "98": "#F6FAFF",
+            "99": "#FBFCFF",
+            "100": "#FFFFFF"
+        }
+    }
+}

ui/startup/databaseChecker.py

@@ -1,148 +0,0 @@
-import logging
-import traceback
-from enum import IntEnum
-
-from arcaea_offline.database import Database
-from PySide6.QtCore import QCoreApplication, QDir, QFileInfo, Qt, QUrl, Slot
-from PySide6.QtWidgets import QDialog, QMessageBox
-
-from ui.extends.shared.database import create_engine
-from ui.extends.shared.settings import Settings
-
-from .databaseChecker_ui import Ui_DatabaseChecker
-
-logger = logging.getLogger(__name__)
-
-
-class DatabaseCheckerResult(IntEnum):
-    FileExist = 0x001
-    Initted = 0x002
-
-
-class DatabaseChecker(Ui_DatabaseChecker, QDialog):
-    def __init__(self, parent=None):
-        super().__init__(parent)
-        self.setupUi(self)
-        self.setWindowFlag(Qt.WindowType.WindowMinimizeButtonHint, False)
-        self.setWindowFlag(Qt.WindowType.WindowMaximizeButtonHint, False)
-        self.setWindowFlag(Qt.WindowType.WindowCloseButtonHint, True)
-        self.dbDirSelector.setMode(self.dbDirSelector.getExistingDirectory)
-
-        self.confirmDbByExistingSettings = False
-        self.settings = Settings(self)
-        if dbUrlString := self.settings.databaseUrl():
-            dbFileUrl = QUrl(dbUrlString.replace("sqlite://", "file://"))
-            dbFileInfo = QFileInfo(dbFileUrl.toLocalFile())
-            if dbFileInfo.exists():
-                self.dbDirSelector.selectFile(dbFileInfo.path())
-                self.dbFilenameLineEdit.setText(dbFileInfo.fileName())
-                self.confirmDbByExistingSettings = True
-                self.confirmDbPathButton.click()
-            else:
-                self.dbDirSelector.selectFile(QDir.currentPath())
-                self.dbFilenameLineEdit.setText("arcaea_offline.db")
-        else:
-            self.dbDirSelector.selectFile(QDir.currentPath())
-            self.dbFilenameLineEdit.setText("arcaea_offline.db")
-
-    def dbPath(self):
-        return QDir(self.dbDirSelector.selectedFiles()[0])
-
-    def dbFileInfo(self):
-        return QFileInfo(
-            QDir.cleanPath(
-                self.dbPath().absoluteFilePath(self.dbFilenameLineEdit.text())
-            )
-        )
-
-    def dbFileUrl(self):
-        return QUrl.fromLocalFile(self.dbFileInfo().filePath())
-
-    def dbSqliteUrl(self):
-        # dbSqliteUrl.setScheme("sqlite")
-        return QUrl(self.dbFileUrl().toString().replace("file://", "sqlite://"))
-
-    def confirmDb(self) -> DatabaseCheckerResult:
-        flags = 0x000
-
-        dbFileInfo = self.dbFileInfo()
-        dbSqliteUrl = self.dbSqliteUrl()
-        if not dbFileInfo.exists():
-            return flags
-
-        flags |= DatabaseCheckerResult.FileExist
-        db = Database(create_engine(dbSqliteUrl))
-        if db.check_init():
-            flags |= DatabaseCheckerResult.Initted
-            self.settings.setDatabaseUrl(self.dbSqliteUrl().toString())
-
-        return flags
-
-    def updateLabels(self):
-        result = self.confirmDb()
-        try:
-            db = Database()
-            version = db.version()
-            initted = db.check_init()
-            self.dbVersionLabel.setText(str(version))
-            self.dbCheckConnLabel.setText(
-                '<font color="green">OK</font>'
-                if initted
-                else '<font color="red">Not initted</font>'
-            )
-            self.continueButton.setEnabled(initted)
-        except Exception as e:
-            self.dbVersionLabel.setText("-")
-            self.dbCheckConnLabel.setText(
-                f'<font color="red">Error: {e}</font>'
-                if result & DatabaseCheckerResult.FileExist
-                else "-"
-            )
-            self.continueButton.setEnabled(False)
-
-    @Slot()
-    def on_confirmDbPathButton_clicked(self):
-        dbSqliteUrl = self.dbSqliteUrl()
-        self.settings.setDatabaseUrl(dbSqliteUrl.toString())
-
-        result = self.confirmDb()
-        if result & DatabaseCheckerResult.Initted:
-            if not self.confirmDbByExistingSettings:
-                self.settings.setDatabaseUrl(dbSqliteUrl.toString())
-        elif result & DatabaseCheckerResult.FileExist:
-            confirm_try_init = QMessageBox.question(
-                self,
-                None,
-                # fmt: off
-                QCoreApplication.translate("DatabaseChecker", "dialog.tryInitExistingDatabase"),
-                # fmt: on
-            )
-            if confirm_try_init == QMessageBox.StandardButton.Yes:
-                try:
-                    Database().init(checkfirst=True)
-                except Exception as e:
-                    logger.exception("Error while initializing an existing database")
-                    QMessageBox.critical(
-                        self, None, "\n".join(traceback.format_exception(e))
-                    )
-        else:
-            confirm_new_database = QMessageBox.question(
-                self,
-                None,
-                # fmt: off
-                QCoreApplication.translate("DatabaseChecker", "dialog.confirmNewDatabase"),
-                # fmt: on
-            )
-            if confirm_new_database == QMessageBox.StandardButton.Yes:
-                db = Database(create_engine(dbSqliteUrl))
-                db.init()
-        self.updateLabels()
-
-    @Slot()
-    def on_dbReInitButton_clicked(self):
-        Database().init(checkfirst=True)
-        QMessageBox.information(self, None, "OK")
-
-    @Slot()
-    def on_continueButton_clicked(self):
-        self.accept()

ui/startup/databaseChecker.ui

@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DatabaseChecker</class>
- <widget class="QWidget" name="DatabaseChecker">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>350</width>
-    <height>250</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string notr="true">DatabaseChecker</string>
-  </property>
-  <layout class="QFormLayout" name="formLayout">
-   <property name="labelAlignment">
-    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-   </property>
-   <item row="0" column="0">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>dbPathLabel</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1">
-    <widget class="FileSelector" name="dbDirSelector" native="true"/>
-   </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="label_3">
-     <property name="text">
-      <string>dbFilenameLabel</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
-    <widget class="QLineEdit" name="dbFilenameLineEdit"/>
-   </item>
-   <item row="2" column="1">
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="confirmDbPathButton">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>confirmDbPathButton</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="4" column="1">
-    <widget class="QLabel" name="dbVersionLabel">
-     <property name="text">
-      <string notr="true">-</string>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="1">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="7" column="0">
-    <widget class="QLabel" name="label_5">
-     <property name="text">
-      <string>dbCheckConnLabel</string>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="1">
-    <widget class="QLabel" name="dbCheckConnLabel">
-     <property name="text">
-      <string notr="true">...</string>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="0" colspan="2">
-    <widget class="QPushButton" name="continueButton">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="text">
-      <string>continueButton</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0">
-    <widget class="QLabel" name="label_2">
-     <property name="text">
-      <string>dbVersionLabel</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0" colspan="2">
-    <widget class="Line" name="line">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="0">
-    <widget class="QLabel" name="label_4">
-     <property name="text">
-      <string>dbReInitLabel</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="1">
-    <widget class="QPushButton" name="dbReInitButton">
-     <property name="text">
-      <string>dbReInitButton</string>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>FileSelector</class>
-   <extends>QWidget</extends>
-   <header>ui.implements.components.fileSelector</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>

ui/startup/databaseChecker_ui.py

@@ -1,138 +0,0 @@
-# -*- coding: utf-8 -*-
-
-################################################################################
-## Form generated from reading UI file 'databaseChecker.ui'
-##
-## Created by: Qt User Interface Compiler version 6.5.2
-##
-## WARNING! All changes made in this file will be lost when recompiling UI file!
-################################################################################
-
-from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale,
-    QMetaObject, QObject, QPoint, QRect,
-    QSize, QTime, QUrl, Qt)
-from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
-    QFont, QFontDatabase, QGradient, QIcon,
-    QImage, QKeySequence, QLinearGradient, QPainter,
-    QPalette, QPixmap, QRadialGradient, QTransform)
-from PySide6.QtWidgets import (QApplication, QFormLayout, QFrame, QHBoxLayout,
-    QLabel, QLineEdit, QPushButton, QSizePolicy,
-    QSpacerItem, QWidget)
-
-from ui.implements.components.fileSelector import FileSelector
-
-class Ui_DatabaseChecker(object):
-    def setupUi(self, DatabaseChecker):
-        if not DatabaseChecker.objectName():
-            DatabaseChecker.setObjectName(u"DatabaseChecker")
-        DatabaseChecker.resize(350, 250)
-        DatabaseChecker.setWindowTitle(u"DatabaseChecker")
-        self.formLayout = QFormLayout(DatabaseChecker)
-        self.formLayout.setObjectName(u"formLayout")
-        self.formLayout.setLabelAlignment(Qt.AlignRight|Qt.AlignTrailing|Qt.AlignVCenter)
-        self.label = QLabel(DatabaseChecker)
-        self.label.setObjectName(u"label")
-
-        self.formLayout.setWidget(0, QFormLayout.LabelRole, self.label)
-
-        self.dbDirSelector = FileSelector(DatabaseChecker)
-        self.dbDirSelector.setObjectName(u"dbDirSelector")
-
-        self.formLayout.setWidget(0, QFormLayout.FieldRole, self.dbDirSelector)
-
-        self.label_3 = QLabel(DatabaseChecker)
-        self.label_3.setObjectName(u"label_3")
-
-        self.formLayout.setWidget(1, QFormLayout.LabelRole, self.label_3)
-
-        self.dbFilenameLineEdit = QLineEdit(DatabaseChecker)
-        self.dbFilenameLineEdit.setObjectName(u"dbFilenameLineEdit")
-
-        self.formLayout.setWidget(1, QFormLayout.FieldRole, self.dbFilenameLineEdit)
-
-        self.horizontalLayout = QHBoxLayout()
-        self.horizontalLayout.setObjectName(u"horizontalLayout")
-        self.horizontalSpacer = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum)
-
-        self.horizontalLayout.addItem(self.horizontalSpacer)
-
-        self.confirmDbPathButton = QPushButton(DatabaseChecker)
-        self.confirmDbPathButton.setObjectName(u"confirmDbPathButton")
-        sizePolicy = QSizePolicy(QSizePolicy.Maximum, QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.confirmDbPathButton.sizePolicy().hasHeightForWidth())
-        self.confirmDbPathButton.setSizePolicy(sizePolicy)
-
-        self.horizontalLayout.addWidget(self.confirmDbPathButton)
-
-
-        self.formLayout.setLayout(2, QFormLayout.FieldRole, self.horizontalLayout)
-
-        self.dbVersionLabel = QLabel(DatabaseChecker)
-        self.dbVersionLabel.setObjectName(u"dbVersionLabel")
-        self.dbVersionLabel.setText(u"-")
-
-        self.formLayout.setWidget(4, QFormLayout.FieldRole, self.dbVersionLabel)
-
-        self.verticalSpacer = QSpacerItem(20, 40, QSizePolicy.Minimum, QSizePolicy.Expanding)
-
-        self.formLayout.setItem(6, QFormLayout.FieldRole, self.verticalSpacer)
-
-        self.label_5 = QLabel(DatabaseChecker)
-        self.label_5.setObjectName(u"label_5")
-
-        self.formLayout.setWidget(7, QFormLayout.LabelRole, self.label_5)
-
-        self.dbCheckConnLabel = QLabel(DatabaseChecker)
-        self.dbCheckConnLabel.setObjectName(u"dbCheckConnLabel")
-        self.dbCheckConnLabel.setText(u"...")
-
-        self.formLayout.setWidget(7, QFormLayout.FieldRole, self.dbCheckConnLabel)
-
-        self.continueButton = QPushButton(DatabaseChecker)
-        self.continueButton.setObjectName(u"continueButton")
-        self.continueButton.setEnabled(False)
-
-        self.formLayout.setWidget(8, QFormLayout.SpanningRole, self.continueButton)
-
-        self.label_2 = QLabel(DatabaseChecker)
-        self.label_2.setObjectName(u"label_2")
-
-        self.formLayout.setWidget(4, QFormLayout.LabelRole, self.label_2)
-
-        self.line = QFrame(DatabaseChecker)
-        self.line.setObjectName(u"line")
-        self.line.setFrameShape(QFrame.HLine)
-        self.line.setFrameShadow(QFrame.Sunken)
-
-        self.formLayout.setWidget(3, QFormLayout.SpanningRole, self.line)
-
-        self.label_4 = QLabel(DatabaseChecker)
-        self.label_4.setObjectName(u"label_4")
-
-        self.formLayout.setWidget(5, QFormLayout.LabelRole, self.label_4)
-
-        self.dbReInitButton = QPushButton(DatabaseChecker)
-        self.dbReInitButton.setObjectName(u"dbReInitButton")
-
-        self.formLayout.setWidget(5, QFormLayout.FieldRole, self.dbReInitButton)
-
-
-        self.retranslateUi(DatabaseChecker)
-
-        QMetaObject.connectSlotsByName(DatabaseChecker)
-    # setupUi
-
-    def retranslateUi(self, DatabaseChecker):
-        self.label.setText(QCoreApplication.translate("DatabaseChecker", u"dbPathLabel", None))
-        self.label_3.setText(QCoreApplication.translate("DatabaseChecker", u"dbFilenameLabel", None))
-        self.confirmDbPathButton.setText(QCoreApplication.translate("DatabaseChecker", u"confirmDbPathButton", None))
-        self.label_5.setText(QCoreApplication.translate("DatabaseChecker", u"dbCheckConnLabel", None))
-        self.continueButton.setText(QCoreApplication.translate("DatabaseChecker", u"continueButton", None))
-        self.label_2.setText(QCoreApplication.translate("DatabaseChecker", u"dbVersionLabel", None))
-        self.label_4.setText(QCoreApplication.translate("DatabaseChecker", u"dbReInitLabel", None))
-        self.dbReInitButton.setText(QCoreApplication.translate("DatabaseChecker", u"dbReInitButton", None))
-        pass
-    # retranslateUi
-

ui/theme/__init__.py

@@ -0,0 +1,3 @@
+from .manager import ThemeManager
+
+__all__ = ["ThemeManager"]

ui/theme/manager.py

@@ -0,0 +1,160 @@
+import dataclasses
+import json
+from typing import overload
+
+import structlog
+from PySide6.QtCore import Property, QObject, QResource, Qt, Signal
+from PySide6.QtGui import QColor, QGuiApplication, QPalette
+
+from .material3 import Material3DynamicThemeImpl, Material3ThemeImpl
+from .qml import ThemeQmlExposer
+from .shared import ThemeImpl, ThemeInfo, _TCustomPalette, _TScheme
+
+QML_IMPORT_NAME = "internal.ui.theme"
+QML_IMPORT_MAJOR_VERSION = 1
+QML_IMPORT_MINOR_VERSION = 0
+
+_THEME_CACHES: dict[ThemeInfo, ThemeImpl] = {}
+
+logger: structlog.stdlib.BoundLogger = structlog.get_logger()
+
+
+class ThemeManager(QObject):
+    _void = Signal()
+    themeChanged = Signal()
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+
+        self._qPalette = QPalette()
+        self._customPalette: _TCustomPalette = {
+            "primary": QColor.fromString("#616161"),
+            "success": QColor.fromString("#616161"),
+            "error": QColor.fromString("#616161"),
+        }
+
+        self._lastThemeInfo = ThemeInfo(
+            series="material3",
+            name="default",
+            scheme=self.getCurrentScheme(),
+        )
+        self._qmlExposer = ThemeQmlExposer(themeImpl=ThemeImpl())
+
+        self._cacheMaterial3Theme(themeName="default", scheme="light")
+        self._cacheMaterial3Theme(themeName="default", scheme="dark")
+        self._cacheMaterial3Theme(themeName="tempest", scheme="light")
+        self._cacheMaterial3Theme(themeName="tempest", scheme="dark")
+
+        self._cacheMaterial3DynamicTheme(themeName="default", scheme="light")
+        self._cacheMaterial3DynamicTheme(themeName="default", scheme="dark")
+        self._cacheMaterial3DynamicTheme(themeName="tempest", scheme="light")
+        self._cacheMaterial3DynamicTheme(themeName="tempest", scheme="dark")
+
+        self.setTheme("material3-dynamic", "default")
+
+    def getCurrentScheme(self) -> _TScheme:
+        qApp: QGuiApplication = QGuiApplication.instance()  # pyright: ignore[reportAssignmentType]
+        return (
+            "dark"
+            if qApp.styleHints().colorScheme() == Qt.ColorScheme.Dark
+            else "light"
+        )
+
+    def getMaterial3Theme(self, themeName: str, scheme: _TScheme) -> Material3ThemeImpl:
+        themeDataResource = QResource(f":/themes/{themeName}.json")
+        if not themeDataResource.isValid():
+            raise ValueError(f"Material3 theme {themeName!r} not found")
+
+        themeData = json.loads(
+            themeDataResource.uncompressedData().data().decode("utf-8")
+        )
+
+        return Material3ThemeImpl(themeData=themeData, scheme=scheme)
+
+    def getMaterial3DynamicTheme(
+        self, themeName: str, scheme: _TScheme
+    ) -> Material3DynamicThemeImpl:
+        themeDataResource = QResource(f":/themes/{themeName}.json")
+        if not themeDataResource.isValid():
+            raise ValueError(f"Material3 theme {themeName!r} not found")
+
+        themeData = json.loads(
+            themeDataResource.uncompressedData().data().decode("utf-8")
+        )
+
+        return Material3DynamicThemeImpl(
+            sourceColorHex=themeData["seed"],
+            scheme=scheme,
+            name=themeName,
+        )
+
+    def _cacheTheme(self, *, themeImpl: ThemeImpl):
+        _THEME_CACHES[themeImpl.info] = themeImpl
+        logger.debug("Theme %r cached", themeImpl.info)
+
+    def _getCachedTheme(self, *, themeInfo: ThemeInfo):
+        cachedTheme = _THEME_CACHES.get(themeInfo)
+        if cachedTheme is None:
+            raise KeyError(f"Theme {themeInfo!r} not cached")
+        return cachedTheme
+
+    def _cacheMaterial3Theme(self, *, themeName: str, scheme: _TScheme):
+        self._cacheTheme(
+            themeImpl=self.getMaterial3Theme(themeName=themeName, scheme=scheme),
+        )
+
+    def _cacheMaterial3DynamicTheme(self, *, themeName: str, scheme: _TScheme):
+        self._cacheTheme(
+            themeImpl=self.getMaterial3DynamicTheme(themeName=themeName, scheme=scheme)
+        )
+
+    @overload
+    def setTheme(self, *, themeInfo: ThemeInfo): ...
+
+    @overload
+    def setTheme(
+        self, themeSeries: str, themeName: str, scheme: _TScheme | None = None, /
+    ): ...
+
+    def setTheme(self, *args, **kwargs):
+        if "themeInfo" in kwargs:
+            themeInfo = kwargs["themeInfo"]
+        elif 2 <= len(args) <= 3:
+            themeSeries = args[0]
+            themeName = args[1]
+            schemeArg = args[2] if len(args) > 2 else None
+            scheme = schemeArg or self.getCurrentScheme()
+
+            themeInfo = ThemeInfo(series=themeSeries, name=themeName, scheme=scheme)
+        else:
+            raise TypeError("Invalid setTheme() call")
+
+        logger.debug("Preparing to set theme %r", themeInfo)
+
+        cachedTheme = self._getCachedTheme(themeInfo=themeInfo)
+
+        self._qPalette = cachedTheme.qPalette
+        self._customPalette = cachedTheme.customPalette
+        self._lastThemeInfo = themeInfo
+        self._qmlExposer.themeImpl = cachedTheme
+
+        self.themeChanged.emit()
+
+    def updateTheme(self, scheme: _TScheme | None = None):
+        themeInfo = dataclasses.replace(self._lastThemeInfo)  # make a copy
+        scheme = scheme or self.getCurrentScheme()
+        themeInfo.scheme = scheme
+
+        self.setTheme(themeInfo=themeInfo)
+
+    @Property(QPalette, notify=themeChanged)
+    def qPalette(self) -> QPalette:
+        return self._qPalette
+
+    @Property(dict, notify=themeChanged)
+    def customPalette(self) -> _TCustomPalette:
+        return self._customPalette
+
+    @Property(ThemeQmlExposer, notify=themeChanged)
+    def qmlExposer(self) -> ThemeQmlExposer:
+        return self._qmlExposer

ui/theme/material3.py

@@ -0,0 +1,245 @@
+from typing import TypedDict
+
+from materialyoucolor.blend import Blend
+from materialyoucolor.dynamiccolor.contrast_curve import ContrastCurve
+from materialyoucolor.dynamiccolor.dynamic_color import DynamicColor, FromPaletteOptions
+from materialyoucolor.dynamiccolor.material_dynamic_colors import MaterialDynamicColors
+from materialyoucolor.hct import Hct
+from materialyoucolor.palettes.tonal_palette import TonalPalette
+from materialyoucolor.scheme.scheme_tonal_spot import SchemeTonalSpot
+from PySide6.QtGui import QColor, QPalette
+
+from .shared import ThemeImpl, ThemeInfo, _TCustomPalette, _TScheme
+
+
+class _M3ThemeDataExtendedColorItem(TypedDict):
+    name: str
+    color: str
+    description: str
+    harmonized: bool
+
+
+_M3ThemeDataSchemes = TypedDict(
+    "_M3ThemeDataSchemes",
+    {
+        "light": dict[str, str],
+        "light-medium-contrast": dict[str, str],
+        "light-high-contrast": dict[str, str],
+        "dark": dict[str, str],
+        "dark-medium-contrast": dict[str, str],
+        "dark-high-contrast": dict[str, str],
+    },
+)
+
+_M3ThemeDataPalettes = TypedDict(
+    "_M3ThemeDataPalettes",
+    {
+        "primary": dict[str, str],
+        "secondary": dict[str, str],
+        "tertiary": dict[str, str],
+        "neutral": dict[str, str],
+        "neutral-variant": dict[str, str],
+    },
+)
+
+
+class _M3ThemeData(TypedDict):
+    name: str
+    description: str
+    seed: str
+    coreColors: dict[str, str]
+    extendedColors: list[_M3ThemeDataExtendedColorItem]
+    schemes: _M3ThemeDataSchemes
+    palettes: _M3ThemeDataPalettes
+
+
+def _hexToHct(hexColor: str) -> Hct:
+    pureHexPart = hexColor[1:] if hexColor.startswith("#") else hexColor
+    return Hct.from_int(int(f"0xff{pureHexPart}", 16))
+
+
+def _hctToQColor(hct: Hct) -> QColor:
+    return QColor.fromRgba(hct.to_int())
+
+
+class Material3ThemeImpl(ThemeImpl):
+    COLOR_ROLE_MAPPING: dict[QPalette.ColorRole, str] = {
+        QPalette.ColorRole.Window: "surface",
+        QPalette.ColorRole.WindowText: "onSurface",
+        QPalette.ColorRole.Base: "surfaceContainer",
+        QPalette.ColorRole.AlternateBase: "surfaceContainerHighest",
+        QPalette.ColorRole.ToolTipBase: "secondaryContainer",
+        QPalette.ColorRole.ToolTipText: "onSecondaryContainer",
+        QPalette.ColorRole.PlaceholderText: "inverseSurface",
+        QPalette.ColorRole.Text: "onSurface",
+        QPalette.ColorRole.Button: "primaryContainer",
+        QPalette.ColorRole.ButtonText: "onPrimaryContainer",
+        QPalette.ColorRole.BrightText: "onSecondary",
+        QPalette.ColorRole.Light: "surfaceContainerLowest",
+        QPalette.ColorRole.Midlight: "surfaceContainerLow",
+        QPalette.ColorRole.Dark: "inverseSurface",
+        QPalette.ColorRole.Mid: "surfaceContainer",
+        QPalette.ColorRole.Shadow: "shadow",
+        QPalette.ColorRole.Highlight: "primary",
+        QPalette.ColorRole.Accent: "primary",
+        QPalette.ColorRole.HighlightedText: "onPrimary",
+        QPalette.ColorRole.Link: "tertiary",
+        QPalette.ColorRole.LinkVisited: "tertiaryContainer",
+    }
+
+    def __init__(self, *, themeData: _M3ThemeData, scheme: _TScheme):
+        self.themeData = themeData
+        self.scheme: _TScheme = scheme
+
+        if self.themeData["schemes"].get(scheme) is None:
+            raise ValueError(f"Invalid scheme: {scheme}")
+
+    def _findExtendedColor(
+        self, colorName: str
+    ) -> _M3ThemeDataExtendedColorItem | None:
+        return next(
+            (it for it in self.themeData["extendedColors"] if it["name"] == colorName),
+            None,
+        )
+
+    @property
+    def info(self):
+        return ThemeInfo(
+            series="material3",
+            name=self.themeData["name"],
+            scheme=self.scheme,
+        )
+
+    @property
+    def qPalette(self) -> QPalette:
+        qPalette = QPalette()
+
+        for role, name in self.COLOR_ROLE_MAPPING.items():
+            color = QColor.fromString(self.themeData["schemes"][self.scheme][name])
+            qPalette.setColor(role, color)
+
+        return qPalette
+
+    @property
+    def customPalette(self) -> _TCustomPalette:
+        primaryHct = _hexToHct(self.themeData["schemes"][self.scheme]["primary"])
+
+        successColorItem = self._findExtendedColor("Success")
+        if successColorItem is None:
+            raise Exception("Success color not found")
+        successHct = _hexToHct(successColorItem["color"])
+
+        successHarmonizedHct = Hct.from_int(
+            Blend.harmonize(successHct.to_int(), primaryHct.to_int())
+        )
+
+        return {
+            "primary": _hctToQColor(primaryHct),
+            "success": _hctToQColor(successHarmonizedHct),
+            "error": QColor.fromString(self.themeData["schemes"][self.scheme]["error"]),
+        }
+
+
+class Material3DynamicThemeImpl(ThemeImpl):
+    ACTIVE_COLOR_ROLE_MAPPING: dict[QPalette.ColorRole, DynamicColor] = {
+        QPalette.ColorRole.Window: MaterialDynamicColors.surface,
+        QPalette.ColorRole.WindowText: MaterialDynamicColors.onSurface,
+        QPalette.ColorRole.Base: MaterialDynamicColors.surfaceContainer,
+        QPalette.ColorRole.AlternateBase: MaterialDynamicColors.surfaceContainerHighest,
+        QPalette.ColorRole.ToolTipBase: MaterialDynamicColors.secondaryContainer,
+        QPalette.ColorRole.ToolTipText: MaterialDynamicColors.onSecondaryContainer,
+        QPalette.ColorRole.PlaceholderText: MaterialDynamicColors.inverseSurface,
+        QPalette.ColorRole.Text: MaterialDynamicColors.onSurface,
+        QPalette.ColorRole.Button: MaterialDynamicColors.primaryContainer,
+        QPalette.ColorRole.ButtonText: MaterialDynamicColors.onPrimaryContainer,
+        QPalette.ColorRole.BrightText: MaterialDynamicColors.onSecondary,
+        QPalette.ColorRole.Light: MaterialDynamicColors.surfaceContainerLowest,
+        QPalette.ColorRole.Midlight: MaterialDynamicColors.surfaceContainerLow,
+        QPalette.ColorRole.Dark: MaterialDynamicColors.inverseSurface,
+        QPalette.ColorRole.Mid: MaterialDynamicColors.surfaceContainer,
+        QPalette.ColorRole.Shadow: MaterialDynamicColors.shadow,
+        QPalette.ColorRole.Highlight: MaterialDynamicColors.primary,
+        QPalette.ColorRole.Accent: MaterialDynamicColors.primary,
+        QPalette.ColorRole.HighlightedText: MaterialDynamicColors.onPrimary,
+        QPalette.ColorRole.Link: MaterialDynamicColors.tertiary,
+        QPalette.ColorRole.LinkVisited: MaterialDynamicColors.tertiaryContainer,
+    }
+
+    EXTENDED_COLORS = {
+        "success": "#00c555",
+    }
+
+    def __init__(self, sourceColorHex: str, scheme: _TScheme, *, name: str):
+        self.material3Scheme = SchemeTonalSpot(
+            _hexToHct(sourceColorHex),
+            is_dark=scheme == "dark",
+            contrast_level=0.0,
+        )
+        self.name = name
+
+    @property
+    def info(self):
+        return ThemeInfo(
+            series="material3-dynamic",
+            name=self.name,
+            scheme="dark" if self.material3Scheme.is_dark else "light",
+        )
+
+    @property
+    def qPalette(self) -> QPalette:
+        qPalette = QPalette()
+
+        for role, dynamicColor in self.ACTIVE_COLOR_ROLE_MAPPING.items():
+            hct = dynamicColor.get_hct(self.material3Scheme)
+            qColor = QColor.fromRgba(hct.to_int())
+            qPalette.setColor(QPalette.ColorGroup.Active, role, qColor)
+
+            # TODO: disabled palette seems to work only after a theme reload, needs further investigation
+            if role in [QPalette.ColorRole.Button, QPalette.ColorRole.ButtonText]:
+                disabledHct = Hct.from_hct(hct.hue, 1.0, hct.tone)
+                disabledQColor = QColor.fromRgba(disabledHct.to_int())
+                qPalette.setColor(QPalette.ColorGroup.Disabled, role, disabledQColor)
+
+        return qPalette
+
+    @property
+    def customPalette(self) -> _TCustomPalette:
+        primaryHct = MaterialDynamicColors.primary.get_hct(self.material3Scheme)
+        errorHct = MaterialDynamicColors.error.get_hct(self.material3Scheme)
+
+        extendedPalettes: dict[str, DynamicColor] = {}
+        for colorName, colorHex in self.EXTENDED_COLORS.items():
+            colorHct = _hexToHct(colorHex)
+            colorHarmonized = Blend.harmonize(colorHct.to_int(), primaryHct.to_int())
+
+            colorTonalPalette = TonalPalette.from_int(colorHarmonized)
+
+            colorSurfacePaletteOptions = DynamicColor.from_palette(
+                FromPaletteOptions(
+                    name=f"{colorName}_container",
+                    palette=lambda s: colorTonalPalette,
+                    tone=lambda s: 30 if s.is_dark else 90,
+                    is_background=True,
+                    background=lambda s: MaterialDynamicColors.highestSurface(s),
+                    contrast_curve=ContrastCurve(1, 1, 3, 4.5),
+                )
+            )
+
+            extendedPalettes[colorName] = DynamicColor.from_palette(
+                FromPaletteOptions(
+                    name=colorName,  # pyright: ignore[reportArgumentType]
+                    palette=lambda s: colorTonalPalette,
+                    tone=lambda s: 80 if s.is_dark else 40,  # pyright: ignore[reportArgumentType]
+                    is_background=False,  # pyright: ignore[reportArgumentType]
+                    background=lambda s: MaterialDynamicColors.highestSurface(s),
+                    contrast_curve=ContrastCurve(3, 4.5, 7, 7),
+                )
+            )
+
+        return {
+            "primary": _hctToQColor(primaryHct),
+            "success": _hctToQColor(
+                extendedPalettes["success"].get_hct(self.material3Scheme)
+            ),
+            "error": _hctToQColor(errorHct),
+        }