wip: navigation system - NavItemWidgets

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

@@ -1,65 +0,0 @@
-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

@@ -1,78 +0,0 @@
-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/**/*

README.md

@@ -1,27 +1,9 @@
 # Arcaea Offline PySide UI
 
-GUI for both [283375/arcaea-offline](https://github.com/283375/arcaea-offline) and [ArcaeaOffline/core-ocr](https://github.com/ArcaeaOffline/core-ocr).
+GUI for both [283375/arcaea-offline](https://github.com/283375/arcaea-offline) and [283375/arcaea-offline-ocr](https://github.com/283375/arcaea-offline-ocr)
 
-## Prerequisites
+## Before you run `python index.py`...
 
 * 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
-```

prebuild.py

@@ -40,6 +40,7 @@ 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

@@ -4,14 +4,14 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "arcaea-offline-pyside-ui"
-version = "0.3.9"
+version = "0.1.0"
 authors = [{ name = "283375", email = "log_283375@163.com" }]
 description = "No description."
 readme = "README.md"
 requires-python = ">=3.9"
 dependencies = [
-  "arcaea-offline==0.2.2",
+  "arcaea-offline==0.1.0",
-  "arcaea-offline-ocr==0.0.99",
+  "arcaea-offline-ocr==0.1.0",
   "exif==1.6.0",
   "PySide6==6.5.2",
 ]
@@ -21,8 +21,8 @@ classifiers = [
 ]
 
 [project.urls]
-"Homepage" = "https://github.com/ArcaeaOffline/client-pyside6"
+"Homepage" = "https://github.com/283375/arcaea-offline-pyside-ui"
-"Bug Tracker" = "https://github.com/ArcaeaOffline/client-pyside6/issues"
+"Bug Tracker" = "https://github.com/283375/arcaea-offline-pyside-ui/issues"
 
 [tool.black]
 force-exclude = '''

requirements.dev.txt

@@ -2,3 +2,4 @@ black == 23.7.0
 isort == 5.12.0
 imageio==2.31.4
 Nuitka==1.8.4
+pytest==7.4.3

requirements.txt

@@ -1,5 +1,5 @@
-arcaea-offline==0.2.2
+arcaea-offline==0.1.0
-arcaea-offline-ocr==0.0.99
+arcaea-offline-ocr==0.1.0
 exif==1.6.0
-Pillow==10.1.0
 PySide6==6.5.2
+typing-extensions==4.8.0

tests/ui/navigation/test_navhost.py

@@ -0,0 +1,31 @@
+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

@@ -0,0 +1,47 @@
+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,6 +22,39 @@
         <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">
@@ -62,13 +95,6 @@
           </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

@@ -1,140 +0,0 @@
-<?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

@@ -1,107 +0,0 @@
-# -*- 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, QSizePolicy, QSpacerItem, QTableView,
+    QPushButton, QRadioButton, QSizePolicy, QSpacerItem,
-    QVBoxLayout, QWidget)
+    QTableView, QVBoxLayout, QWidget)
 
 class Ui_OcrQueue(object):
     def setupUi(self, OcrQueue):
@@ -34,6 +34,29 @@ 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")
 
@@ -55,11 +78,6 @@ 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")
 
@@ -136,10 +154,13 @@ 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))
@@ -148,3 +169,4 @@ 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>580</width>
+    <width>630</width>
-    <height>551</height>
+    <height>528</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,21 +17,70 @@
    <property name="labelAlignment">
     <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
    </property>
-   <item row="1" column="0">
+   <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">
     <widget class="QPushButton" name="importPacklistButton">
      <property name="text">
       <string>importPacklistButton</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
+   <item row="3" column="0">
-    <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>
@@ -39,129 +88,69 @@
     </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="3" column="0">
+   <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">
     <widget class="QPushButton" name="importApkButton">
      <property name="text">
       <string>importApkButton</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="1">
+   <item row="4" 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="11" column="1">
+   <item row="6" column="1">
     <widget class="QLabel" name="label_8">
      <property name="text">
       <string>importOnline.description</string>
      </property>
     </widget>
    </item>
-   <item row="13" column="0" colspan="2">
+   <item row="10" column="0">
-    <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="15" column="1">
+   <item row="10" column="1">
     <widget class="QLabel" name="label_9">
      <property name="text">
       <string>exportSmartRteB30.description</string>
@@ -174,124 +163,6 @@
      </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,168 +15,123 @@ 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, QLabel, QPushButton,
+from PySide6.QtWidgets import (QApplication, QFormLayout, QFrame, QLabel,
-    QSizePolicy, QSpacerItem, QWidget)
+    QPushButton, QSizePolicy, 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(580, 551)
+        TabDb_Manage.resize(630, 528)
         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.importPacklistButton = QPushButton(TabDb_Manage)
-        self.importPacklistButton.setObjectName(u"importPacklistButton")
-
-        self.formLayout.setWidget(1, QFormLayout.LabelRole, self.importPacklistButton)
-
-        self.label_4 = QLabel(TabDb_Manage)
-        self.label_4.setObjectName(u"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(2, QFormLayout.FieldRole, self.label_5)
-
-        self.importApkButton = QPushButton(TabDb_Manage)
-        self.importApkButton.setObjectName(u"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(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.formLayout.setWidget(0, QFormLayout.LabelRole, self.syncArcSongDbButton)
 
         self.label = QLabel(TabDb_Manage)
         self.label.setObjectName(u"label")
 
-        self.formLayout.setWidget(6, QFormLayout.FieldRole, self.label)
+        self.formLayout.setWidget(0, 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.formLayout.setWidget(5, 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.formLayout.setWidget(5, QFormLayout.FieldRole, self.label_2)
 
-        self.importOnlineButton = QPushButton(TabDb_Manage)
+        self.line = QFrame(TabDb_Manage)
-        self.importOnlineButton.setObjectName(u"importOnlineButton")
+        self.line.setObjectName(u"line")
+        self.line.setFrameShape(QFrame.HLine)
+        self.line.setFrameShadow(QFrame.Sunken)
 
-        self.formLayout.setWidget(11, QFormLayout.LabelRole, self.importOnlineButton)
+        self.formLayout.setWidget(7, QFormLayout.SpanningRole, self.line)
-
-        self.label_8 = QLabel(TabDb_Manage)
-        self.label_8.setObjectName(u"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.formLayout.setWidget(8, 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.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.label_4 = QLabel(TabDb_Manage)
+        self.label_4.setObjectName(u"label_4")
+
+        self.formLayout.setWidget(2, QFormLayout.FieldRole, self.label_4)
+
+        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.importApkButton = QPushButton(TabDb_Manage)
+        self.importApkButton.setObjectName(u"importApkButton")
+
+        self.formLayout.setWidget(4, 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.importOnlineButton = QPushButton(TabDb_Manage)
+        self.importOnlineButton.setObjectName(u"importOnlineButton")
+
+        self.formLayout.setWidget(6, 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.exportSmartRteB30Button = QPushButton(TabDb_Manage)
         self.exportSmartRteB30Button.setObjectName(u"exportSmartRteB30Button")
 
-        self.formLayout.setWidget(15, QFormLayout.LabelRole, self.exportSmartRteB30Button)
+        self.formLayout.setWidget(10, 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(15, QFormLayout.FieldRole, self.label_9)
+        self.formLayout.setWidget(10, 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)
@@ -185,30 +140,24 @@ class Ui_TabDb_Manage(object):
     # setupUi
 
     def retranslateUi(self, TabDb_Manage):
-        self.importPacklistButton.setText(QCoreApplication.translate("TabDb_Manage", u"importPacklistButton", 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.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.importPacklistButton.setText(QCoreApplication.translate("TabDb_Manage", u"importPacklistButton", None))
-        self.label_9.setText(QCoreApplication.translate("TabDb_Manage", u"exportSmartRteB30.description", None))
+        self.importSonglistButton.setText(QCoreApplication.translate("TabDb_Manage", u"importSonglistButton", None))
-        self.label_14.setText(QCoreApplication.translate("TabDb_Manage", u"miscGroup", None))
+        self.label_4.setText(QCoreApplication.translate("TabDb_Manage", u"importPacklist.description", 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.label_10.setText(QCoreApplication.translate("TabDb_Manage", u"packSongInfoGroup", None))
+        self.importApkButton.setText(QCoreApplication.translate("TabDb_Manage", u"importApkButton", None))
-        self.syncChartInfoDbButton.setText(QCoreApplication.translate("TabDb_Manage", u"syncChartInfoDbButton", None))
+        self.label_7.setText(QCoreApplication.translate("TabDb_Manage", u"importApk.description", None))
-        self.label_15.setText(QCoreApplication.translate("TabDb_Manage", u"syncChartInfoDb.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.exportSmartRteB30Button.setText(QCoreApplication.translate("TabDb_Manage", u"exportSmartRteB30Button", None))
+        self.label_9.setText(QCoreApplication.translate("TabDb_Manage", u"exportSmartRteB30.description", None))
         pass
     # retranslateUi
+

ui/extends/components/ocrQueue.py

@@ -150,7 +150,6 @@ class OcrQueueModel(QAbstractListModel):
 
     @iccOption.setter
     def iccOption(self, opt: IccOption):
-        logger.debug(f"ICC option changed to {opt}")
         self.__iccOption = opt
 
     @overload
@@ -345,12 +344,8 @@ class OcrQueueTableProxyModel(QAbstractTableModel):
     def retranslateHeaders(self):
         self.__horizontalHeaders = [
             # fmt: off
-            QCoreApplication.translate(
+            QCoreApplication.translate("OcrTableModel", "horizontalHeader.title.select"),
-                "OcrTableModel", "horizontalHeader.title.select"
+            QCoreApplication.translate("OcrTableModel", "horizontalHeader.title.imagePreview"),
-            ),
-            QCoreApplication.translate(
-                "OcrTableModel", "horizontalHeader.title.imagePreview"
-            ),
             QCoreApplication.translate("OcrTableModel", "horizontalHeader.title.chart"),
             QCoreApplication.translate("OcrTableModel", "horizontalHeader.title.score"),
             # fmt: on

ui/extends/shared/delegates/chartDelegate.py

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

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

@@ -39,7 +39,7 @@ class DbB30TableModel(DbTableModel):
                     (ScoreBest.song_id == Chart.song_id)
                     & (ScoreBest.rating_class == Chart.rating_class),
                 )
-                .order_by(ScoreBest.potential.desc())
+                .order_by(ScoreBest.potential)
                 .limit(50)
                 .all()
             )

ui/extends/shared/settings.py

@@ -10,7 +10,6 @@ __all__ = [
     "KNN_MODEL_FILE",
     "B30_KNN_MODEL_FILE",
     "PHASH_DATABASE_FILE",
-    "SCORE_DATE_SOURCE",
     "ANDREAL_FOLDER",
     "ANDREAL_EXECUTABLE",
     "Settings",
@@ -24,7 +23,6 @@ DATABASE_URL = "DatabaseUrl"
 KNN_MODEL_FILE = "Ocr/KnnModelFile"
 B30_KNN_MODEL_FILE = "Ocr/B30KnnModelFile"
 PHASH_DATABASE_FILE = "Ocr/PHashDatabaseFile"
-SCORE_DATE_SOURCE = "Ocr/DateSource"
 
 ANDREAL_FOLDER = "Andreal/AndrealFolder"
 ANDREAL_EXECUTABLE = "Andreal/AndrealExecutable"
@@ -94,15 +92,6 @@ class Settings(QSettings, metaclass=QObjectSingleton):
     def resetPHashDatabaseFile(self):
         self._resetStrItem(PHASH_DATABASE_FILE)
 
-    def scoreDateSource(self):
-        return self._strItem(SCORE_DATE_SOURCE)
-
-    def setScoreDateSource(self, value: str):
-        self._setStrItem(SCORE_DATE_SOURCE, value)
-
-    def resetScoreDateSource(self):
-        self._resetStrItem(SCORE_DATE_SOURCE)
-
     def andrealFolder(self):
         return self._strItem(ANDREAL_FOLDER)
 

ui/extends/tabs/tabOcr/tabOcr_Device.py

@@ -21,7 +21,6 @@ from PySide6.QtCore import QDateTime, QFileInfo
 
 from ui.extends.components.ocrQueue import OcrRunnable
 from ui.extends.shared.data import Data
-from ui.extends.shared.settings import Settings
 
 logger = logging.getLogger(__name__)
 
@@ -68,14 +67,8 @@ 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):
-        dateSource = Settings().scoreDateSource()
+        datetime = QFileInfo(imagePath).birthTime()
-        if dateSource == "lastModified":
-            datetime = QFileInfo(imagePath).lastModified()
-        else:
-            datetime = QFileInfo(imagePath).birthTime()
-
     return datetime
 
 

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 QWidget
+from PySide6.QtWidgets import QButtonGroup, QWidget
 
 from ui.designer.components.ocrQueue_ui import Ui_OcrQueue
 from ui.extends.components.ocrQueue import (
@@ -13,7 +13,6 @@ 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):
@@ -27,9 +26,6 @@ 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)
@@ -45,6 +41,13 @@ 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)
@@ -90,10 +93,9 @@ class OcrQueue(Ui_OcrQueue, QWidget):
         self.ocr_acceptAllButton.setEnabled(__bool)
         self.ocr_ignoreValidateCheckBox.setEnabled(__bool)
 
-    @Slot(int)
+    def updateIccOption(self):
-    def setIccOption(self, option):
         if self.model():
-            self.model().iccOption = option
+            self.model().iccOption = self.iccOptionButtonGroup.checkedId()
 
     def showStatusMessage(self, message: str):
         self.statusLabel.setText(message)
@@ -129,10 +131,6 @@ 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

@@ -1,48 +0,0 @@
-from PySide6.QtCore import Signal
-from PySide6.QtWidgets import QButtonGroup, QDialog
-
-from ui.designer.components.ocrQueueOptionsDialog_ui import Ui_OcrQueueOptionsDialog
-from ui.extends.shared.settings import Settings
-
-
-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
-        )
-
-        self.settings = Settings()
-        self.settings.updated.connect(self.syncCheckboxesFromSettings)
-        self.syncCheckboxesFromSettings()
-
-    def syncCheckboxesFromSettings(self):
-        scoreDateSource = self.settings.scoreDateSource()
-        if scoreDateSource == "lastModified":
-            self.dateUseModifyDateRadioButton.setChecked(True)
-        else:
-            self.dateUseCreationDateRadioButton.setChecked(True)
-
-    def on_scoreDateSourceButtonGroup_buttonClicked(self, button):
-        buttonId = self.scoreDateSourceButtonGroup.id(button)
-        if buttonId == 1:
-            self.settings.setScoreDateSource("lastModified")
-        else:
-            self.settings.setScoreDateSource("birthTime")

ui/implements/components/ratingClassSelector.py

@@ -1,4 +1,3 @@
-import logging
 from typing import Type
 
 from PySide6.QtCore import Signal
@@ -7,8 +6,6 @@ from PySide6.QtWidgets import QHBoxLayout, QSizePolicy, QVBoxLayout, QWidget
 
 from ui.implements.components.ratingClassRadioButton import RatingClassRadioButton
 
-logger = logging.getLogger(__name__)
-
 
 class RatingClassSelector(QWidget):
     valueChanged = Signal()
@@ -44,30 +41,16 @@ class RatingClassSelector(QWidget):
         self.bydButton.setAutoExclusive(False)
         self.preferredLayout.addWidget(self.bydButton)
 
-        self.etrButton = RatingClassRadioButton(self)
+        self.buttons = [self.pstButton, self.prsButton, self.ftrButton, self.bydButton]
-        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([])
 
@@ -123,10 +106,9 @@ class RatingClassSelector(QWidget):
 
         if ratingClass is None or isinstance(ratingClass, bool):
             button = self.sender()
-        elif ratingClass in range(len(self.buttons)):
+        elif ratingClass in range(4):
             button = self.buttons[ratingClass]
         else:
-            logger.debug(f"Cannot select {ratingClass=}, condition check failed")
             return
 
         if not button.isEnabled():

ui/implements/tabs/tabDb/tabDb_Manage.py

@@ -14,10 +14,9 @@ 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 QDateTime, QDir, Slot
+from PySide6.QtCore import QDir, Slot
 from PySide6.QtWidgets import QFileDialog, QMessageBox, QWidget
 
 from ui.designer.tabs.tabDb.tabDb_Manage_ui import Ui_TabDb_Manage
@@ -58,29 +57,6 @@ 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:
@@ -232,14 +208,14 @@ class TabDb_Manage(Ui_TabDb_Manage, QWidget):
 
     @Slot()
     def on_exportScoresButton_clicked(self):
-        scores = Database().export_scores_def_v2()
+        scores = Database().export_scores()
-        timestamp = QDateTime.currentMSecsSinceEpoch()
+        version = Database().version()
         content = json.dumps(scores, ensure_ascii=False)
 
         exportLocation, _filter = QFileDialog.getSaveFileName(
             self,
             "Save your scores to...",
-            QDir.current().filePath(f"arcaea-offline-def-v2-scores-{timestamp}.json"),
+            QDir.current().filePath(f"arcaea-offline-scores-v{version}.json"),
             "JSON (*.json);;*",
         )
         with open(exportLocation, "w", encoding="utf-8") as f:

ui/navigation/navhost.py

@@ -0,0 +1,151 @@
+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

@@ -0,0 +1,17 @@
+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

@@ -0,0 +1,84 @@
+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

@@ -0,0 +1,190 @@
+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/resources/icons/back.svg

@@ -0,0 +1,59 @@
+<?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="122"/>
+        <location filename="../../startup/databaseChecker.py" line="117"/>
         <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="138"/>
+        <location filename="../../startup/databaseChecker.py" line="133"/>
         <source>dialog.confirmNewDatabase</source>
         <translation>Database file does not exist. Create now?</translation>
     </message>
@@ -224,118 +224,85 @@
     </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="38"/>
+        <location filename="../../designer/components/ocrQueue.ui" line="71"/>
         <source>queue.removeSelected</source>
         <translation>Remove Selected</translation>
     </message>
     <message>
-        <location filename="../../designer/components/ocrQueue.ui" line="48"/>
+        <location filename="../../designer/components/ocrQueue.ui" line="81"/>
         <source>queue.removeAll</source>
         <translation>Remove All</translation>
     </message>
     <message>
-        <location filename="../../designer/components/ocrQueue.ui" line="68"/>
+        <location filename="../../designer/components/ocrQueue.ui" line="101"/>
-        <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="127"/>
+        <location filename="../../designer/components/ocrQueue.ui" line="153"/>
         <source>results</source>
         <translation>Results</translation>
     </message>
     <message>
-        <location filename="../../designer/components/ocrQueue.ui" line="136"/>
+        <location filename="../../designer/components/ocrQueue.ui" line="162"/>
         <source>results.acceptSelectedButton</source>
         <translation>Accept Selected</translation>
     </message>
     <message>
-        <location filename="../../designer/components/ocrQueue.ui" line="143"/>
+        <location filename="../../designer/components/ocrQueue.ui" line="169"/>
         <source>results.acceptAllButton</source>
         <translation>Accept All</translation>
     </message>
     <message>
-        <location filename="../../designer/components/ocrQueue.ui" line="163"/>
+        <location filename="../../designer/components/ocrQueue.ui" line="189"/>
         <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="348"/>
+        <location filename="../../extends/components/ocrQueue.py" line="347"/>
         <source>horizontalHeader.title.select</source>
         <translation>Select</translation>
     </message>
     <message>
-        <location filename="../../extends/components/ocrQueue.py" line="351"/>
+        <location filename="../../extends/components/ocrQueue.py" line="348"/>
         <source>horizontalHeader.title.imagePreview</source>
         <translation>Image Preview</translation>
     </message>
     <message>
-        <location filename="../../extends/components/ocrQueue.py" line="352"/>
+        <location filename="../../extends/components/ocrQueue.py" line="349"/>
         <source>horizontalHeader.title.chart</source>
         <translation>Chart</translation>
     </message>
     <message>
-        <location filename="../../extends/components/ocrQueue.py" line="353"/>
+        <location filename="../../extends/components/ocrQueue.py" line="350"/>
         <source>horizontalHeader.title.score</source>
         <translation>Score</translation>
     </message>
@@ -705,127 +672,92 @@ validation</translation>
 <context>
     <name>TabDb_Manage</name>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="78"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="23"/>
         <source>syncArcSongDbButton</source>
         <translation>Sync arcsong.db</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="85"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="30"/>
         <source>syncArcSongDb.description</source>
         <translation>Update chart info</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="98"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="37"/>
-        <source>importScoreGroup</source>
-        <translation>Import Score</translation>
-    </message>
-    <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="105"/>
         <source>importSt3Button</source>
-        <translation>Game Save Database</translation>
+        <translation>Import from Game Save</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="112"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="44"/>
         <source>importSt3.description</source>
-        <translation>Import scores from your game save database</translation>
+        <translation>Import scores from your game save</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="139"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="58"/>
-        <source>exportScoreGroup</source>
+        <source>exportScoresButton</source>
         <translation>Export Scores</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="146"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="65"/>
-        <source>exportScoresButton</source>
-        <translation>D.E.F. V2</translation>
-    </message>
-    <message>
-        <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>
+        <translation>Export all your scores to a JSON file</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="186"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="79"/>
-        <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="37"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="86"/>
         <source>importSonglistButton</source>
         <translation>Import songlist</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="30"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="93"/>
         <source>importPacklist.description</source>
         <translation>Import packlist file</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="44"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="100"/>
         <source>importSonglist.description</source>
         <translation>Import songlist file</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="193"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="107"/>
         <source>exportArcsongJsonButton</source>
         <translation>Export arcsong.json</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="200"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="114"/>
         <source>exportArcsongJson.description</source>
-        <translation>Export arcsong.json file based on the information in database</translation>
+        <translation>Export arcsong.json file</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="51"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="121"/>
         <source>importApkButton</source>
         <translation>Import from APK</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="213"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="128"/>
-        <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="71"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="135"/>
-        <source>chartInfoGroup</source>
-        <translation>Chart Info</translation>
-    </message>
-    <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="119"/>
         <source>importOnlineButton</source>
-        <translation>Arcaea Online</translation>
+        <translation>Import from Arcaea Online</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="126"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="142"/>
         <source>importOnline.description</source>
-        <translation>Import scores from the Arcaea Online API result</translation>
+        <translation>Import scores from the result of Arcaea Online API</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="160"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="149"/>
         <source>exportSmartRteB30Button</source>
-        <translation>SmartRTE B30</translation>
+        <translation>Export Scores (CSV, SmartRTE B30)</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="167"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="156"/>
         <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>
@@ -908,27 +840,27 @@ validation</translation>
         <translation>Delete Selected Scores</translation>
     </message>
     <message>
-        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="158"/>
+        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="142"/>
         <source>quickSelectComboBox.idEarlier</source>
         <translation>Earlier ID</translation>
     </message>
     <message>
-        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="164"/>
+        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="148"/>
         <source>quickSelectComboBox.dateEarlier</source>
         <translation>Earlier date</translation>
     </message>
     <message>
-        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="170"/>
+        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="154"/>
         <source>quickSelectComboBox.columnsIntegral</source>
         <translation>More complete data</translation>
     </message>
     <message>
-        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="295"/>
+        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="279"/>
         <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="317"/>
+        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="301"/>
         <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="122"/>
+        <location filename="../../startup/databaseChecker.py" line="117"/>
         <source>dialog.tryInitExistingDatabase</source>
         <translation>现有的数据库似乎没有正确初始化，是否尝试再次初始化？</translation>
     </message>
     <message>
-        <location filename="../../startup/databaseChecker.py" line="138"/>
+        <location filename="../../startup/databaseChecker.py" line="133"/>
         <source>dialog.confirmNewDatabase</source>
         <translation>数据库文件不存在，是否创建？</translation>
     </message>
@@ -224,117 +224,84 @@
     </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="38"/>
+        <location filename="../../designer/components/ocrQueue.ui" line="71"/>
         <source>queue.removeSelected</source>
         <translation>移除选中</translation>
     </message>
     <message>
-        <location filename="../../designer/components/ocrQueue.ui" line="48"/>
+        <location filename="../../designer/components/ocrQueue.ui" line="81"/>
         <source>queue.removeAll</source>
         <translation>移除所有</translation>
     </message>
     <message>
-        <location filename="../../designer/components/ocrQueue.ui" line="68"/>
+        <location filename="../../designer/components/ocrQueue.ui" line="101"/>
-        <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="127"/>
+        <location filename="../../designer/components/ocrQueue.ui" line="153"/>
         <source>results</source>
         <translation>结果</translation>
     </message>
     <message>
-        <location filename="../../designer/components/ocrQueue.ui" line="136"/>
+        <location filename="../../designer/components/ocrQueue.ui" line="162"/>
         <source>results.acceptSelectedButton</source>
         <translation>提交选中</translation>
     </message>
     <message>
-        <location filename="../../designer/components/ocrQueue.ui" line="143"/>
+        <location filename="../../designer/components/ocrQueue.ui" line="169"/>
         <source>results.acceptAllButton</source>
         <translation>提交所有</translation>
     </message>
     <message>
-        <location filename="../../designer/components/ocrQueue.ui" line="163"/>
+        <location filename="../../designer/components/ocrQueue.ui" line="189"/>
         <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="348"/>
+        <location filename="../../extends/components/ocrQueue.py" line="347"/>
         <source>horizontalHeader.title.select</source>
         <translation>选择</translation>
     </message>
     <message>
-        <location filename="../../extends/components/ocrQueue.py" line="351"/>
+        <location filename="../../extends/components/ocrQueue.py" line="348"/>
         <source>horizontalHeader.title.imagePreview</source>
         <translation>图像预览</translation>
     </message>
     <message>
-        <location filename="../../extends/components/ocrQueue.py" line="352"/>
+        <location filename="../../extends/components/ocrQueue.py" line="349"/>
         <source>horizontalHeader.title.chart</source>
         <translation>谱面</translation>
     </message>
     <message>
-        <location filename="../../extends/components/ocrQueue.py" line="353"/>
+        <location filename="../../extends/components/ocrQueue.py" line="350"/>
         <source>horizontalHeader.title.score</source>
         <translation>分数</translation>
     </message>
@@ -704,127 +671,92 @@
 <context>
     <name>TabDb_Manage</name>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="78"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="23"/>
         <source>syncArcSongDbButton</source>
         <translation>同步 arcsong.db</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="85"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="30"/>
         <source>syncArcSongDb.description</source>
         <translation>更新谱面信息</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="98"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="37"/>
-        <source>importScoreGroup</source>
-        <translation>导入分数</translation>
-    </message>
-    <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="105"/>
         <source>importSt3Button</source>
-        <translation>存档文件</translation>
+        <translation>导入本地存档</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="112"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="44"/>
         <source>importSt3.description</source>
         <translation>遏卡抑五年，天降飞龙，姿容极度美艳。白衣仙女以妙法擒之，与之相恋。&lt;br&gt;来年，恶人携联结万邦之力来袭，仙女龙妃以根源之术，呼唤神通叁式之威，退敌千里，永护宝库安宁。</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="139"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="58"/>
-        <source>exportScoreGroup</source>
+        <source>exportScoresButton</source>
         <translation>导出分数</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="146"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="65"/>
-        <source>exportScoresButton</source>
-        <translation>数据交换格式 V2</translation>
-    </message>
-    <message>
-        <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>
+        <translation>将所有分数导出为 JSON 文件</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="186"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="79"/>
-        <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="37"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="86"/>
         <source>importSonglistButton</source>
         <translation>导入 songlist</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="30"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="93"/>
         <source>importPacklist.description</source>
         <translation>导入 packlist 文件</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="44"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="100"/>
         <source>importSonglist.description</source>
         <translation>导入 songlist 文件</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="193"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="107"/>
         <source>exportArcsongJsonButton</source>
         <translation>导出 arcsong.json</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="200"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="114"/>
         <source>exportArcsongJson.description</source>
-        <translation>基于数据库信息导出 arcsong.json 文件</translation>
+        <translation>导出 arcsong.json 文件</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="51"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="121"/>
         <source>importApkButton</source>
         <translation>从 APK 导入</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="213"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="128"/>
-        <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="71"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="135"/>
-        <source>chartInfoGroup</source>
-        <translation>谱面信息</translation>
-    </message>
-    <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="119"/>
         <source>importOnlineButton</source>
-        <translation>Arcaea Online</translation>
+        <translation>从 Arcaea Online 导入</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="126"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="142"/>
         <source>importOnline.description</source>
         <translation>从 Arcaea Online 的 API 结果导入分数</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="160"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="149"/>
         <source>exportSmartRteB30Button</source>
-        <translation>SmartRTE B30</translation>
+        <translation>导出分数（CSV，SmartRTE B30）</translation>
     </message>
     <message>
-        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="167"/>
+        <location filename="../../designer/tabs/tabDb/tabDb_Manage.ui" line="156"/>
         <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>
@@ -907,27 +839,27 @@
         <translation>删除已选分数</translation>
     </message>
     <message>
-        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="158"/>
+        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="142"/>
         <source>quickSelectComboBox.idEarlier</source>
         <translation>ID 更早</translation>
     </message>
     <message>
-        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="164"/>
+        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="148"/>
         <source>quickSelectComboBox.dateEarlier</source>
         <translation>时间更早</translation>
     </message>
     <message>
-        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="170"/>
+        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="154"/>
         <source>quickSelectComboBox.columnsIntegral</source>
         <translation>数据更完整</translation>
     </message>
     <message>
-        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="295"/>
+        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="279"/>
         <source>deleteSelectionDialog.content {}</source>
         <translation>将从数据库中删除 {} 个分数。此操作无法撤销！&lt;br&gt;确认吗？</translation>
     </message>
     <message>
-        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="317"/>
+        <location filename="../../implements/tabs/tabDb/tabDb_RemoveDuplicateScores.py" line="301"/>
         <source>scan_noColumnsDialog.content</source>
         <translation>还未选择任何字段！确定继续吗？</translation>
     </message>

ui/resources/resources.qrc

@@ -8,6 +8,8 @@
 
     <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>

ui/startup/databaseChecker.py

@@ -3,7 +3,7 @@ import traceback
 from enum import IntEnum
 
 from arcaea_offline.database import Database
-from PySide6.QtCore import QCoreApplication, QDir, QFileInfo, QSysInfo, Qt, QUrl, Slot
+from PySide6.QtCore import QCoreApplication, QDir, QFileInfo, Qt, QUrl, Slot
 from PySide6.QtWidgets import QDialog, QMessageBox
 
 from ui.extends.shared.database import create_engine
@@ -59,13 +59,8 @@ class DatabaseChecker(Ui_DatabaseChecker, QDialog):
         return QUrl.fromLocalFile(self.dbFileInfo().filePath())
 
     def dbSqliteUrl(self):
-        kernelType = QSysInfo.kernelType()
+        # dbSqliteUrl.setScheme("sqlite")
-        # the slash count varies depending on the kernel
+        return QUrl(self.dbFileUrl().toString().replace("file://", "sqlite://"))
-        # https://docs.sqlalchemy.org/en/20/core/engines.html#sqlite
-        if kernelType == "winnt":
-            return QUrl(self.dbFileUrl().toString().replace("file://", "sqlite://"))
-        else:
-            return QUrl(self.dbFileUrl().toString().replace("file://", "sqlite:///"))
 
     def confirmDb(self) -> DatabaseCheckerResult:
         flags = 0x000

ui/widgets/slidingstackedwidget.py

@@ -0,0 +1,231 @@
+"""
+Adapted from https://github.com/Qt-Widgets/SlidingStackedWidget-1
+
+    MIT License
+    Copyright (c) 2020 Tim Schneeberger (ThePBone) <tim.schneeberger(at)outlook.de>
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+"""
+
+
+from enum import IntEnum
+
+from PySide6.QtCore import (
+    QAbstractAnimation,
+    QEasingCurve,
+    QParallelAnimationGroup,
+    QPoint,
+    QPropertyAnimation,
+    Signal,
+)
+from PySide6.QtWidgets import (
+    QGraphicsEffect,
+    QGraphicsOpacityEffect,
+    QStackedWidget,
+    QWidget,
+)
+
+
+class SlidingDirection(IntEnum):
+    Auto = 0
+    LeftToRight = 1
+    RightToLeft = 2
+    TopToBottom = 3
+    BottomToTop = 4
+
+
+class SlidingStackedWidget(QStackedWidget):
+    slidingDirection = SlidingDirection
+
+    animationFinished = Signal()
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+
+        self.vertical = False
+        self.speedMs = 300
+        self.animationEasingCurve = QEasingCurve.Type.OutQuart
+        self.animationCurrentIndex = 0
+        self.animationNextIndex = 0
+        self.animationCurrentPoint = QPoint(0, 0)
+        self.animationRunning = False
+
+        self.wrap = False
+        self.opacityAnimation = False
+
+    def setVertical(self, vertical: bool):
+        self.vertical = vertical
+
+    def setSpeedMs(self, speedMs: int):
+        self.speedMs = speedMs
+
+    def setAnimationEasingCurve(self, easingCurve: QEasingCurve.Type):
+        self.animationEasingCurve = easingCurve
+
+    def setWrap(self, wrap: bool):
+        self.wrap = wrap
+
+    def setOpacityAnimation(self, value: bool):
+        self.opacityAnimation = value
+
+    def slideInNext(self) -> bool:
+        currentIndex = self.currentIndex()
+        if self.wrap or (currentIndex < self.count() - 1):
+            self.slideInIdx(currentIndex + 1)
+        else:
+            return False
+        return True
+
+    def slideInPrev(self) -> bool:
+        currentIndex = self.currentIndex()
+        if self.wrap or (currentIndex > 0):
+            self.slideInIdx(currentIndex - 1)
+        else:
+            return False
+        return True
+
+    def slideInIdx(self, idx: int, direction: SlidingDirection = SlidingDirection.Auto):
+        if idx > self.count() - 1:
+            direction = (
+                SlidingDirection.TopToBottom
+                if self.vertical
+                else SlidingDirection.RightToLeft
+            )
+            idx %= self.count()
+        elif idx < 0:
+            direction = (
+                SlidingDirection.BottomToTop
+                if self.vertical
+                else SlidingDirection.LeftToRight
+            )
+            idx = (idx + self.count()) % self.count()
+
+        self.slideInWgt(self.widget(idx), direction)
+
+    def slideInWgt(self, newwidget: QWidget, direction: SlidingDirection):
+        if self.animationRunning:
+            return
+
+        self.animationRunning = True
+
+        autoDirection = SlidingDirection.LeftToRight
+
+        currentIndex = self.currentIndex()
+        nextIndex = self.indexOf(newwidget)
+        if currentIndex == nextIndex:
+            self.animationRunning = False
+            return
+        elif currentIndex < nextIndex:
+            autoDirection = (
+                SlidingDirection.TopToBottom
+                if self.vertical
+                else SlidingDirection.RightToLeft
+            )
+        else:
+            autoDirection = (
+                SlidingDirection.BottomToTop
+                if self.vertical
+                else SlidingDirection.LeftToRight
+            )
+
+        if direction == SlidingDirection.Auto:
+            direction = autoDirection
+
+        offsetX = self.frameRect().width()
+        offsetY = self.frameRect().height()
+
+        self.widget(nextIndex).setGeometry(0, 0, offsetX, offsetY)
+        if direction == SlidingDirection.BottomToTop:
+            offsetX = 0
+            offsetY = -offsetY
+        elif direction == SlidingDirection.TopToBottom:
+            offsetX = 0
+        elif direction == SlidingDirection.RightToLeft:
+            offsetX = -offsetX
+            offsetY = 0
+        elif direction == SlidingDirection.LeftToRight:
+            offsetY = 0
+
+        nextPoint = self.widget(nextIndex).pos()
+        currentPoint = self.widget(currentIndex).pos()
+        self.animationCurrentPoint = currentPoint
+        self.widget(nextIndex).move(nextPoint.x() - offsetX, nextPoint.y() - offsetY)
+
+        self.widget(nextIndex).show()
+        self.widget(nextIndex).raise_()
+
+        currentWidgetAnimation = self.widgetPosAnimation(currentIndex)
+        currentWidgetAnimation.setStartValue(QPoint(currentPoint.x(), currentPoint.y()))
+        currentWidgetAnimation.setEndValue(
+            QPoint(offsetX + currentPoint.x(), offsetY + currentPoint.y())
+        )
+
+        nextWidgetAnimation = self.widgetPosAnimation(nextIndex)
+        nextWidgetAnimation.setStartValue(
+            QPoint(-offsetX + nextPoint.x(), offsetY + nextPoint.y())
+        )
+        nextWidgetAnimation.setEndValue(QPoint(nextPoint.x(), nextPoint.y()))
+
+        animationGroup = QParallelAnimationGroup(self)
+        animationGroup.addAnimation(currentWidgetAnimation)
+        animationGroup.addAnimation(nextWidgetAnimation)
+
+        if self.opacityAnimation:
+            currentWidgetOpacityEffect = QGraphicsOpacityEffect()
+            currentWidgetOpacityEffectAnimation = self.widgetOpacityAnimation(
+                currentIndex, currentWidgetOpacityEffect, 1, 0
+            )
+
+            nextWidgetOpacityEffect = QGraphicsOpacityEffect()
+            nextWidgetOpacityEffect.setOpacity(0)
+            nextWidgetOpacityEffectAnimation = self.widgetOpacityAnimation(
+                nextIndex, nextWidgetOpacityEffect, 0, 1
+            )
+
+            animationGroup.addAnimation(currentWidgetOpacityEffectAnimation)
+            animationGroup.addAnimation(nextWidgetOpacityEffectAnimation)
+
+        animationGroup.finished.connect(self.animationDoneSlot)
+        self.animationNextIndex = nextIndex
+        self.animationCurrentIndex = currentIndex
+        self.animationRunning = True
+        animationGroup.start(QAbstractAnimation.DeletionPolicy.DeleteWhenStopped)
+
+    def widgetPosAnimation(self, widgetIndex: int):
+        result = QPropertyAnimation(self.widget(widgetIndex), b"pos")
+        result.setDuration(self.speedMs)
+        result.setEasingCurve(self.animationEasingCurve)
+        return result
+
+    def widgetOpacityAnimation(
+        self, widgetIndex: int, graphicEffect: QGraphicsEffect, startValue, endValue
+    ):
+        self.widget(widgetIndex).setGraphicsEffect(graphicEffect)
+        result = QPropertyAnimation(graphicEffect, b"opacity")
+        result.setDuration(round(self.speedMs / 2))
+        result.setStartValue(startValue)
+        result.setEndValue(endValue)
+        result.finished.connect(
+            lambda: graphicEffect.deleteLater() if graphicEffect is not None else ...
+        )
+        return result
+
+    def animationDoneSlot(self):
+        self.setCurrentIndex(self.animationNextIndex)
+        self.widget(self.animationCurrentIndex).hide()
+        self.widget(self.animationCurrentIndex).move(self.animationCurrentPoint)
+        self.animationRunning = False
+        self.animationFinished.emit()