fix: close dangling session, migration corrections

* fix: backup library before making any changes

* refactor: inline make_tables + minor cleanup

* refactor: remove unnecessary assurance

Bumping the auto increment value has been done since the original sql PR, so it doesn't need to be done on migrations.
See e5e7b8afc6.

* refactor: don't blindly create all tables in the beginning

The only table that has been added since DB version 6 (the earliest supported version), is the versions table in DB version 101.
This commit removes the "create all tables" statement, and instead creates the versions table in the 101 migration.
See 12e074b71d.

* refactor: don't require setting library_dir to create a backup

* refactor: move migrations to different file

* refactor: package each migration in a class

* fix: some syntax errors had slipped through

* fix: allow set_version to fail, but don't commit in that case

* refactor: condense imports

* fix: add override decorators

* refactor: move set_version to DBMigrations

* refactor: remove unnecessary assignment

* refactor: use _ instead of __

* fix: add missing field templates tables

.editorconfig

@@ -10,13 +10,11 @@ root = true
 [*]
 charset = utf-8
 end_of_line = lf
+indent_size = 4
 indent_style = space
 insert_final_newline = true
 max_line_length = 100
 trim_trailing_whitespace = true
 
-[*.{css,json,md}]
-indent_size = 4
-
-[*.{yaml,yml}]
+[*.{nix,yaml,yml}]
 indent_size = 2

.github/actions/setup-python/action.yml

@@ -0,0 +1,59 @@
+# SPDX-FileCopyrightText: (c) TagStudio Contributors
+# SPDX-License-Identifier: CC0-1.0
+---
+name: Setup Python
+description: Combination of Python setup actions
+
+inputs:
+  skip-setup:
+    default: 'false'
+    description: Whether to skip setup actions and only execute installs
+  groups:
+    description: Newline-separated list of dependency groups to install
+
+runs:
+  using: composite
+  steps:
+    - name: Setup Python install
+      if: inputs.skip-setup != 'true'
+      uses: actions/setup-python@v6
+      with:
+        python-version: '3.12'
+
+    - name: Setup uv install
+      if: inputs.skip-setup != 'true'
+      uses: astral-sh/setup-uv@v8.2.0
+
+    - name: Run pip install (Windows)
+      if: runner.os == 'Windows'
+      env:
+        INPUT_GROUPS: ${{ inputs.groups }}
+        UV_PYTHON_DOWNLOADS: never
+        UV_SYSTEM_PYTHON: '1'
+      shell: pwsh
+      run: |
+        if (![string]::IsNullOrEmpty(${env:INPUT_GROUPS})) {
+            $groupArgs = -split ${env:INPUT_GROUPS} -replace '^', '--group='
+        }
+
+        uv pip install . ${groupArgs}
+
+    - name: Run pip install (non-Windows)
+      if: runner.os != 'Windows'
+      env:
+        INPUT_GROUPS: ${{ inputs.groups }}
+        UV_PYTHON_DOWNLOADS: never
+        UV_SYSTEM_PYTHON: '1'
+      shell: bash
+      run: |
+        extra_args=()
+
+        if [ -n "${INPUT_GROUPS}" ]; then
+            while IFS= read -r group; do
+                if [ -n "${group}" ]; then
+                    extra_args+=("--group=${group}")
+                fi
+            done <<<"${INPUT_GROUPS}"
+        fi
+
+        uv pip install . "${extra_args[@]}"

.github/workflows/build.yml

@@ -0,0 +1,203 @@
+# SPDX-FileCopyrightText: (c) TagStudio Contributors
+# SPDX-License-Identifier: CC0-1.0
+
+# TODO: This will be invoked by a 'Release' workflow in the future.
+---
+name: Build
+
+on:
+  push:
+    tags:
+      - v*
+  schedule:
+    # From: https://docs.github.com/en/actions/reference/workflows-and-actions/events-that-trigger-workflows#schedule
+    # To decrease the chance of delay, schedule your workflow to run at a different time of the hour.
+    - cron: 42 3 * * *
+      timezone: America/Los_Angeles
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+defaults:
+  run:
+    shell: sh
+
+jobs:
+  meta:
+    name: Metadata
+    runs-on: ubuntu-latest
+    outputs:
+      type: ${{ steps.meta.outputs.type }}
+      version: ${{ steps.meta.outputs.version }}
+    steps:
+      - name: Set metadata
+        id: meta
+        run: |
+          type=Nightly
+          if [ "${GITHUB_REF_TYPE}" = tag ]; then
+              case ${GITHUB_REF_NAME} in
+              v*)
+                  type=Release
+                  case ${GITHUB_REF_NAME} in
+                  *-pr*) type=Pre-${type} ;;
+                  esac
+                  ;;
+              esac
+          fi
+
+          if [ ${type} = Nightly ]; then
+              version=dev+$(date --iso-8601 | tr -d -)
+          else
+              version=${GITHUB_REF_NAME}
+          fi
+
+          cat <<EOF >>"${GITHUB_OUTPUT}"
+          type=${type}
+          version=${version}
+          EOF
+
+  build:
+    strategy:
+      fail-fast: ${{ needs.meta.outputs.type != 'Nightly' }}
+      matrix:
+        include:
+          - os: ubuntu-22.04
+            os-label: Linux x86
+
+          - os: macos-15-intel
+            os-label: macOS x86
+
+          - os: macos-15
+            os-label: macOS ARM
+
+          - os: windows-2022
+            os-label: Windows x86
+
+    name: Build${{ needs.meta.outputs.type && format(' {0}', needs.meta.outputs.type) }}${{ matrix.os-label && format(' ({0})', matrix.os-label) }}
+    needs: meta
+    runs-on: ${{ matrix.os }}
+    env:
+      BUILD_PREFIX: tagstudio_${{ needs.meta.outputs.version }}
+    steps:
+      - name: Prepare build (Windows)
+        if: runner.os == 'Windows'
+        shell: pwsh
+        run: |
+          $dir = "${env:RUNNER_TEMP}/upload"
+          New-Item -Path ${dir} -ItemType Directory -Force
+
+          $os = ${env:RUNNER_OS}.ToLower()
+          $arch = uname -m
+
+          $commonPath = "${dir}/${env:BUILD_PREFIX}_${os}_${arch}"
+          Add-Content -Path ${env:GITHUB_ENV} -Value @"
+          BUILD_ARTIFACT_DEFAULT=${commonPath}.zip
+          BUILD_ARTIFACT_PORTABLE=${commonPath}_portable.zip
+          "@ -Encoding utf8
+
+      - name: Prepare build (non-Windows)
+        if: runner.os != 'Windows'
+        run: |
+          dir=${RUNNER_TEMP}/upload
+          mkdir -p "${dir}"
+          os=$(
+              tr '[:upper:]' '[:lower:]' <<EOF
+          ${RUNNER_OS}
+          EOF
+          )
+          arch=$(uname -m)
+
+          common_path=${dir}/${BUILD_PREFIX}_${os}_${arch}
+          artifact_default=${common_path}.tar.gz
+          if [ "${RUNNER_OS}" = macOS ]; then
+              artifact_portable=
+          else
+              artifact_portable=${common_path}_portable.tar.gz
+          fi
+          cat <<EOF >>"${GITHUB_ENV}"
+          BUILD_ARTIFACT_DEFAULT=${artifact_default}
+          ${artifact_portable:+BUILD_ARTIFACT_PORTABLE=${artifact_portable}}
+          EOF
+
+      - name: Checkout repository
+        uses: actions/checkout@v7
+
+      - name: Setup Python
+        uses: ./.github/actions/setup-python
+        with:
+          groups: build
+
+      - parallel:
+          - name: Run PyInstaller (Linux)
+            if: runner.os == 'Linux'
+            run: |
+              pyinstaller --distpath dist/default --workpath build/default scripts/tagstudio.spec
+              tar czf "${BUILD_ARTIFACT_DEFAULT}" -C dist/default/tagstudio .
+
+          - name: Run PyInstaller (Linux portable)
+            if: runner.os == 'Linux'
+            run: |
+              pyinstaller --distpath dist/portable --workpath build/portable scripts/tagstudio.spec -- --portable
+              tar czf "${BUILD_ARTIFACT_PORTABLE}" -C dist/portable tagstudio
+
+          - name: Run PyInstaller (macOS)
+            if: runner.os == 'macOS'
+            run: |
+              scripts/tagstudio.spec
+              tar czf "${BUILD_ARTIFACT_DEFAULT}" -C dist TagStudio.app
+
+          - name: Run PyInstaller (Windows)
+            if: runner.os == 'Windows'
+            shell: pwsh
+            run: |
+              PyInstaller --distpath dist/default --workpath build/default scripts/tagstudio.spec
+              Compress-Archive -Path dist/default/TagStudio -DestinationPath ${env:BUILD_ARTIFACT_DEFAULT}
+
+          - name: Run PyInstaller (Windows portable)
+            if: runner.os == 'Windows'
+            shell: pwsh
+            run: |
+              PyInstaller --distpath dist/portable --workpath build/portable scripts/tagstudio.spec -- --portable
+              Compress-Archive -Path dist/portable/TagStudio.exe -DestinationPath ${env:BUILD_ARTIFACT_PORTABLE}
+
+      - parallel:
+          - name: Upload build artifact
+            uses: actions/upload-artifact@v7
+            with:
+              path: ${{ env.BUILD_ARTIFACT_DEFAULT }}
+              if-no-files-found: error
+              # Short retention for 'Pre-Release' and 'Release' because they get uploaded to a GitHub release.
+              retention-days: &upload-artifact-retention-days ${{ case(needs.meta.outputs.type == 'Nightly', '7', '1') }}
+              archive: false
+
+          - name: Upload build artifact (portable)
+            if: env.BUILD_ARTIFACT_PORTABLE != ''
+            uses: actions/upload-artifact@v7
+            with:
+              path: ${{ env.BUILD_ARTIFACT_PORTABLE }}
+              if-no-files-found: error
+              retention-days: *upload-artifact-retention-days
+              archive: false
+
+  upload:
+    permissions:
+      contents: write
+
+    name: Upload Builds to Release
+    needs: [meta, build]
+    if: needs.meta.outputs.type != 'Nightly'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download build artifacts
+        uses: actions/download-artifact@v8
+        with:
+          path: ${{ runner.temp }}/download
+          merge-multiple: 'true'
+          skip-decompress: 'true'
+
+      - name: Upload build artifacts to release
+        uses: softprops/action-gh-release@v3
+        with:
+          files: ${{ runner.temp }}/download/*

.github/workflows/build_docs.yml

@@ -0,0 +1,54 @@
+# SPDX-FileCopyrightText: (c) TagStudio Contributors
+# SPDX-License-Identifier: CC0-1.0
+
+# TODO: In the future, docs will be built (but not published) for PRs.
+---
+name: Build Docs
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - .github/actions/setup-python/action.yml
+      - .github/workflows/build_docs.yml
+      - docs/**
+      - properdocs.yml
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+defaults:
+  run:
+    shell: sh
+
+jobs:
+  publish:
+    concurrency:
+      group: ${{ github.workflow }}
+      cancel-in-progress: true
+    permissions:
+      contents: write
+
+    name: Publish Docs
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v7
+
+      - name: Setup Python
+        uses: ./.github/actions/setup-python
+        with:
+          groups: docs
+
+      - name: Use cache
+        uses: actions/cache@v6
+        with:
+          key: mkdocs-material-${{ github.run_id }}
+          path: .cache
+          restore-keys: |
+            mkdocs-material-
+      - name: Run properdocs
+        run: properdocs gh-deploy --force

.github/workflows/checks_python.yml

@@ -0,0 +1,227 @@
+# SPDX-FileCopyrightText: (c) TagStudio Contributors
+# SPDX-License-Identifier: CC0-1.0
+---
+name: Checks (Python)
+
+on:
+  pull_request:
+    paths: &on_paths
+      - .github/actions/setup-python/action.yml
+      - .github/workflows/checks_python.yml
+      - src/**/resources/**
+      - src/**/*.json
+      - src/**/*.qrc
+      - tests/**
+      - .editorconfig
+      - pyproject.toml
+      - uv.lock
+      - '**.pyi?'
+  push:
+    branches-ignore:
+      - translations
+    paths: *on_paths
+  workflow_dispatch:
+
+defaults:
+  run:
+    shell: sh
+
+jobs:
+  run-conditions:
+    permissions:
+      pull-requests: read
+
+    name: Run Conditions
+    runs-on: ubuntu-latest
+    outputs:
+      pyright: ${{ steps.run-conditions.outputs.pyright }}
+      pytest: ${{ steps.run-conditions.outputs.pytest }}
+      ruff: ${{ steps.run-conditions.outputs.ruff }}
+    steps:
+      - name: Checkout repository
+        if: github.event_name != 'pull_request'
+        uses: actions/checkout@v7
+        with:
+          # Largest positive number; infinite depth.
+          # Using 0 would grab all branches.
+          # See: https://github.com/actions/checkout/issues/520
+          # See: https://stackoverflow.com/questions/6802145/how-to-convert-a-git-shallow-clone-to-a-full-clone/6802238#6802238
+          # `git fetch --unshallow` as suggested in later answers would be an extra operation.
+          fetch-depth: '2147483647'
+
+      - name: Check changed files
+        id: changed-files
+        uses: tj-actions/changed-files@v47.0.6
+        with:
+          fail_on_initial_diff_error: 'true'
+          fail_on_submodule_diff_error: 'true'
+          skip_initial_fetch: 'true'
+
+          # WARNING: Does not support `?` glob operand!
+          files_yaml: |
+            generic:
+              - .github/workflows/checks_python.yml
+              - pyproject.toml
+              - uv.lock
+              - '**.py'
+              - '**.pyi'
+            pyright:
+              - .github/actions/setup-python/action.yml
+            pytest:
+              - .github/actions/setup-python/action.yml
+              - src/**/resources/**
+              - src/**/*.json
+              - src/**/*.qrc
+              - tests/**
+            ruff:
+              - .editorconfig
+
+      - name: Set run conditions
+        id: run-conditions
+        env:
+          CHANGED_GENERIC: ${{ steps.changed-files.outputs.generic_any_changed }}
+          CHANGED_PYRIGHT: ${{ steps.changed-files.outputs.pyright_any_changed }}
+          CHANGED_PYTEST: ${{ steps.changed-files.outputs.pytest_any_changed }}
+          CHANGED_RUFF: ${{ steps.changed-files.outputs.ruff_any_changed }}
+        run: |
+          pyright=false
+          pytest=false
+          ruff=false
+          if [ "${CHANGED_GENERIC}" = true ]; then
+              pyright=true
+              pytest=true
+              ruff=true
+          else
+              if [ "${CHANGED_PYRIGHT}" = true ]; then
+                  pyright=true
+              fi
+              if [ "${CHANGED_PYTEST}" = true ]; then
+                  pytest=true
+              fi
+              if [ "${CHANGED_RUFF}" = true ]; then
+                  ruff=true
+              fi
+          fi
+
+          cat <<EOF >>"${GITHUB_OUTPUT}"
+          pyright=${pyright}
+          pytest=${pytest}
+          ruff=${ruff}
+          EOF
+
+  check-pyright:
+    concurrency:
+      group: pyright-${{ github.workflow }}-${{ github.ref }}
+      cancel-in-progress: true
+
+    name: Pyright
+    needs: run-conditions
+    if: needs.run-conditions.outputs.pyright == 'true'
+    runs-on: ubuntu-latest
+    steps:
+      - &checkout
+        name: Checkout repository
+        uses: actions/checkout@v7
+
+      - name: Setup Python
+        uses: ./.github/actions/setup-python
+        with:
+          groups: |
+            pyright
+            pytest
+
+      - name: Execute Pyright
+        run: pyright
+
+  check-pytest:
+    concurrency:
+      group: ${{ matrix.os }}-pytest-${{ github.workflow }}-${{ github.ref }}
+      cancel-in-progress: true
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-22.04
+            os-label: Linux
+
+          - os: windows-2022
+            os-label: Windows
+
+    name: pytest${{ matrix.os-label && format(' ({0})', matrix.os-label) }}
+    needs: run-conditions
+    if: needs.run-conditions.outputs.pytest == 'true'
+    runs-on: ${{ matrix.os }}
+    steps:
+      - *checkout
+
+      - name: Setup Python
+        uses: ./.github/actions/setup-python
+        with:
+          groups: pytest
+
+      - name: Install system dependencies (Linux)
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y --no-install-recommends \
+            libegl1 \
+            libgl1 \
+            libopengl0 \
+            libpulse0 \
+            libxcb-cursor0 \
+            libxcb-icccm4 \
+            libxcb-image0 \
+            libxcb-keysyms1 \
+            libxcb-randr0 \
+            libxcb-render-util0 \
+            libxcb-xinerama0 \
+            libxkbcommon-x11-0 \
+            libyaml-dev \
+            ripgrep \
+            x11-utils
+
+      - name: Install system dependencies (macOS)
+        if: runner.os == 'macOS'
+        run: brew install ripgrep
+
+      - name: Install system dependencies (Windows)
+        if: runner.os == 'Windows'
+        shell: pwsh
+        run: choco install ripgrep
+
+      - name: Execute pytest (Windows)
+        if: runner.os == 'Windows'
+        shell: pwsh
+        run: pytest
+
+      - name: Execute pytest (non-Windows)
+        if: runner.os != 'Windows'
+        run: pytest
+
+  check-ruff:
+    concurrency:
+      group: ruff-${{ github.workflow }}-${{ github.ref }}
+      cancel-in-progress: true
+
+    name: Ruff
+    needs: run-conditions
+    if: needs.run-conditions.outputs.ruff == 'true'
+    runs-on: ubuntu-latest
+    steps:
+      - *checkout
+
+      - name: Setup Ruff
+        uses: astral-sh/ruff-action@v4.0.0
+        with:
+          # No-op operation, since executing Ruff cannot be disabled for the action.
+          # Note that `--version` has different behavior than `version`, as the
+          # latter will fail if passed any extra args, even if that arg is empty.
+          args: --version
+          src: ''
+
+      - parallel:
+          - name: Run Ruff linter
+            run: ruff check
+
+          - name: Run Ruff formatter
+            run: ruff format --check

.github/workflows/publish_docs.yaml

@@ -1,51 +0,0 @@
-# SPDX-FileCopyrightText: (c) TagStudio Contributors
-# SPDX-License-Identifier: GPL-3.0-only
----
-name: Publish Docs
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - .github/workflows/publish_docs.yaml
-      - docs/**
-      - mkdocs.yml
-      - CHANGELOG.md
-
-permissions:
-  contents: write
-
-concurrency:
-  group: publish-docs
-  cancel-in-progress: true
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-          cache: pip
-
-      - name: Install Python dependencies
-        run: |
-          python -m pip install --upgrade uv
-          uv pip install --system .[mkdocs]
-
-      - run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV
-
-      - uses: actions/cache@v4
-        with:
-          key: mkdocs-material-${{ env.cache_id }}
-          path: .cache
-          restore-keys: |
-            mkdocs-material-
-
-      - name: Execute mkdocs
-        run: mkdocs gh-deploy --force

.github/workflows/pyright.yaml

@@ -1,31 +0,0 @@
-# SPDX-FileCopyrightText: (c) TagStudio Contributors
-# SPDX-License-Identifier: GPL-3.0-only
----
-name: Pyright
-
-on: [push, pull_request]
-
-jobs:
-  pyright:
-    name: Run Pyright
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-          cache: pip
-
-      - name: Install Python dependencies
-        run: |
-          python -m pip install --upgrade uv
-          uv pip install --system .[pyright,pytest]
-
-      - name: Execute Pyright
-        uses: jordemort/action-pyright@v1
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          reporter: ${{ github.event_name == 'pull_request' && 'github-pr-review' || 'github-check' }}

.github/workflows/pytest.yaml

@@ -1,70 +0,0 @@
-# SPDX-FileCopyrightText: (c) TagStudio Contributors
-# SPDX-License-Identifier: GPL-3.0-only
----
-name: pytest
-
-on: [push, pull_request]
-
-jobs:
-  pytest-linux:
-    name: Run pytest (Linux)
-    runs-on: ubuntu-24.04
-
-    steps:
-      - &checkout
-        name: Checkout repo
-        uses: actions/checkout@v4
-
-      - &setup-python
-        name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-          cache: pip
-
-      - &install-dependencies
-        name: Install Python dependencies
-        run: |
-          python -m pip install --upgrade uv
-          uv pip install --system .[pytest]
-
-      - name: Install system dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y --no-install-recommends \
-            libegl1 \
-            libgl1 \
-            libopengl0 \
-            libpulse0 \
-            libxcb-cursor0 \
-            libxcb-icccm4 \
-            libxcb-image0 \
-            libxcb-keysyms1 \
-            libxcb-randr0 \
-            libxcb-render-util0 \
-            libxcb-xinerama0 \
-            libxkbcommon-x11-0 \
-            libyaml-dev \
-            ripgrep \
-            x11-utils
-
-      - name: Execute pytest
-        run: |
-          xvfb-run pytest --cov-report xml --cov=tagstudio
-
-  pytest-windows:
-    name: Run pytest (Windows)
-    runs-on: windows-2025
-
-    steps:
-      - *checkout
-      - *setup-python
-      - *install-dependencies
-
-      - name: Install system dependencies
-        run: |
-          choco install ripgrep
-
-      - name: Execute pytest
-        run: |
-          pytest

.github/workflows/release.yml

@@ -1,156 +0,0 @@
-# SPDX-FileCopyrightText: (c) TagStudio Contributors
-# SPDX-License-Identifier: GPL-3.0-only
----
-name: Release
-
-on:
-  push:
-    tags:
-      - v[0-9]+.[0-9]+.[0-9]+*
-
-jobs:
-  linux:
-    strategy:
-      matrix:
-        build-type: ["", portable]
-        include:
-          - build-type: ""
-            build-flag: ""
-            suffix: ""
-          - build-type: portable
-            build-flag: --portable
-            suffix: _portable
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-          cache: pip
-
-      - name: Install Python dependencies
-        run: |
-          python -m pip install --upgrade uv
-          uv pip install --system .[pyinstaller]
-
-      - name: Execute PyInstaller
-        run: |
-          pyinstaller tagstudio.spec -- ${{ matrix.build-flag }}
-          tar czfC dist/tagstudio_linux_x86_64${{ matrix.suffix }}.tar.gz dist tagstudio
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: tagstudio_linux_x86_64${{ matrix.suffix }}
-          path: dist/tagstudio_linux_x86_64${{ matrix.suffix }}.tar.gz
-
-  macos:
-    strategy:
-      matrix:
-        os-version: ["14", "15"]
-        include:
-          - os-version: "14"
-            arch: x86_64
-          - os-version: "15"
-            arch: aarch64
-
-    runs-on: macos-${{ matrix.os-version }}
-
-    env:
-      # INFO: Even though we run on 14, target towards compatibility
-      MACOSX_DEPLOYMENT_TARGET: "11.0"
-
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-          cache: pip
-
-      - name: Install Python dependencies
-        run: |
-          python -m pip install --upgrade uv
-          uv pip install --system .[pyinstaller]
-
-      - name: Execute PyInstaller
-        run: |
-          pyinstaller tagstudio.spec
-          tar czfC dist/tagstudio_macos_${{ matrix.arch }}.tar.gz dist TagStudio.app
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: tagstudio_macos_${{ matrix.arch }}
-          path: dist/tagstudio_macos_${{ matrix.arch }}.tar.gz
-
-  windows:
-    strategy:
-      matrix:
-        build-type: ["", portable]
-        include:
-          - build-type: ""
-            build-flag: ""
-            suffix: ""
-            file-end: ""
-          - build-type: portable
-            build-flag: --portable
-            suffix: _portable
-            file-end: .exe
-
-    runs-on: windows-2022
-
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-          cache: pip
-
-      - name: Install Python dependencies
-        run: |
-          python -m pip install --upgrade uv
-          uv pip install --system .[pyinstaller]
-
-      - name: Execute PyInstaller
-        run: |
-          PyInstaller tagstudio.spec -- ${{ matrix.build-flag }}
-          Compress-Archive -Path dist/TagStudio${{ matrix.file-end }} -DestinationPath dist/tagstudio_windows_x86_64${{ matrix.suffix }}.zip
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: tagstudio_windows_x86_64${{ matrix.suffix }}
-          path: dist/tagstudio_windows_x86_64${{ matrix.suffix }}.zip
-
-  publish:
-    needs: [linux, macos, windows]
-
-    runs-on: ubuntu-latest
-
-    permissions:
-      contents: write
-
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-
-      - name: Fetch artifacts
-        uses: actions/download-artifact@v4
-
-      - name: Publish release
-        uses: softprops/action-gh-release@v2
-        with:
-          files: |
-            tagstudio_linux_x86_64/*
-            tagstudio_linux_x86_64_portable/*
-            tagstudio_macos_x86_64/*
-            tagstudio_macos_aarch64/*
-            tagstudio_windows_x86_64/*
-            tagstudio_windows_x86_64_portable/*

.github/workflows/reuse.yaml

@@ -1,12 +0,0 @@
-# SPDX-FileCopyrightText: 2020 Free Software Foundation Europe e.V.
-# SPDX-License-Identifier: CC0-1.0
-name: REUSE compliance check
-on: [push, pull_request]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5
-      - name: REUSE Compliance Check
-        uses: fsfe/reuse-action@v6

.github/workflows/reuse.yml

@@ -0,0 +1,30 @@
+# SPDX-FileCopyrightText: (c) TagStudio Contributors
+# SPDX-License-Identifier: CC0-1.0
+---
+name: REUSE Compliance Check
+
+on:
+  pull_request:
+  push:
+    branches-ignore:
+      - translations
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+defaults:
+  run:
+    shell: sh
+
+jobs:
+  check:
+    name: REUSE
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v7
+
+      - name: Run REUSE
+        uses: fsfe/reuse-action@v6

.github/workflows/ruff.yaml

@@ -1,33 +0,0 @@
-# SPDX-FileCopyrightText: (c) TagStudio Contributors
-# SPDX-License-Identifier: GPL-3.0-only
----
-name: Ruff
-
-on: [push, pull_request]
-
-jobs:
-  ruff-format:
-    name: Run Ruff format
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-
-      - name: Execute Ruff format
-        uses: astral-sh/ruff-action@v3
-        with:
-          version: 0.15.17
-          args: format --check
-
-  ruff-check:
-    name: Run Ruff check
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-
-      - name: Execute Ruff check
-        uses: astral-sh/ruff-action@v3
-        with:
-          version: 0.15.17
-          args: check

.pre-commit-config.yaml

@@ -1,3 +1,5 @@
+# SPDX-FileCopyrightText: (c) TagStudio Contributors
+# SPDX-License-Identifier: CC0-1.0
 ---
 repos:
   - repo: local

.prettierrc.toml

@@ -8,3 +8,8 @@ bracketSpacing = true
 objectWrap = "preserve"
 quoteProps = "as-needed"
 singleQuote = false
+
+[[overrides]]
+files = [".github/**/*.yml", ".github/**/*.yaml"]
+[overrides.options]
+singleQuote = true

README.md

@@ -3,11 +3,10 @@
 
 # TagStudio: A User-Focused Photo & File Management System
 
-[![Downloads](https://img.shields.io/github/downloads/TagStudioDev/TagStudio/total.svg?maxAge=2592001)](https://github.com/TagStudioDev/TagStudio/releases)
+[![Downloads](https://img.shields.io/github/downloads/TagStudioDev/TagStudio/total.svg)](https://github.com/TagStudioDev/TagStudio/releases)
 [![Translations](https://hosted.weblate.org/widget/tagstudio/strings/svg-badge.svg)](https://hosted.weblate.org/projects/tagstudio/strings/)
-[![PyTest](https://github.com/TagStudioDev/TagStudio/actions/workflows/pytest.yaml/badge.svg)](https://github.com/TagStudioDev/TagStudio/actions/workflows/pytest.yaml)
-[![MyPy](https://github.com/TagStudioDev/TagStudio/actions/workflows/mypy.yaml/badge.svg)](https://github.com/TagStudioDev/TagStudio/actions/workflows/mypy.yaml)
-[![Ruff](https://github.com/TagStudioDev/TagStudio/actions/workflows/ruff.yaml/badge.svg)](https://github.com/TagStudioDev/TagStudio/actions/workflows/ruff.yaml)
+[![REUSE Status](https://api.reuse.software/badge/github.com/TagStudioDev/TagStudio)](https://api.reuse.software/info/github.com/TagStudioDev/TagStudio)
+[![Python Checks](https://github.com/TagStudioDev/TagStudio/actions/workflows/checks_python.yml/badge.svg)](https://github.com/TagStudioDev/TagStudio/actions/workflows/checks_python.yml)
 
 <p align="center">
   <img width="60%" src="src/tagstudio/resources/qt/images/tagstudio_logo-text_color.png">

REUSE.toml

@@ -4,13 +4,11 @@ version = 1
 path = [
     "tests/fixtures/**",
 
-    "contrib/.envrc-nix",
-    "contrib/.envrc-uv",
     "contrib/.vscode/launch.json",
     "docs/CNAME",
     "docs/assets/**",
     "src/tagstudio/qt/resources.json",
-    "src/tagstudio/resources/icon.*",
+    "src/tagstudio/resources/icon*.*",
     "src/tagstudio/resources/tagstudio.desktop",
     "src/tagstudio/resources/templates/ts_ignore_template.txt",
     "src/tagstudio/resources/templates/ts_ignore_template_blank.txt",
@@ -23,7 +21,6 @@ path = [
     ".github/ISSUE_TEMPLATE/**",
     ".github/PULL_REQUEST_TEMPLATE.md",
     ".gitignore",
-    ".pre-commit-config.yaml",
     "flake.lock",
 ]
 SPDX-FileCopyrightText = "(c) TagStudio Contributors"

contrib/.envrc-nix

@@ -1,4 +1,7 @@
+# vi: ft=bash
 # shellcheck shell=bash
+# SPDX-FileCopyrightText: (c) TagStudio Contributors
+# SPDX-License-Identifier: CC0-1.0
 
 # If you wish to use this file, symlink or copy it to `.envrc` for direnv to read it.
 # This will use the Nix flake development shell.
@@ -15,5 +18,3 @@ use flake
 
 # Only watch now, or direnv will execute again if created or modified by itself.
 watch_file "${UV_PROJECT_ENVIRONMENT:-.venv}"/bin/activate
-
-# vi: ft=bash

contrib/.envrc-uv

@@ -1,4 +1,7 @@
+# vi: ft=sh
 # shellcheck shell=bash
+# SPDX-FileCopyrightText: (c) TagStudio Contributors
+# SPDX-License-Identifier: CC0-1.0
 
 # If you wish to use this file, symlink or copy it to `.envrc` for direnv to read it.
 # This will use a virtual environment created by uv.
@@ -23,10 +26,8 @@ source "${venv}"/bin/activate
 
 if [ ! -f "${venv}"/pyproject.toml ] || ! diff --brief pyproject.toml "${venv}"/pyproject.toml >/dev/null; then
     printf '%s\n' 'Installing dependencies, pyproject.toml changed...' >&2
-    uv pip install --quiet --editable '.[dev]'
+    uv pip install --quiet --editable . --group all
     cp pyproject.toml "${venv}"/pyproject.toml
 fi
 
 pre-commit install
-
-# vi: ft=bash

docs/changelog.md

@@ -9,6 +9,174 @@ toc_depth: 2
 
 # :material-script-text: Changelog
 
+## 9.6.2 <small>August 6th, 2026</small>
+
+### Added
+
+- feat(thumbs): render `.ai` (Adobe Illustrator) thumbnails by @purpletennisball in #1453
+
+### Changed
+
+#### Tag & Field Search/Create Bars (by @CyanVoxel in #1451)
+
+The tagging workflow has gotten a major overhaul! Clicking the "Add Tag" button or pressing <kbd>Ctrl</kbd>+<kbd>T</kbd> will now activate an inline tag search bar that you can also use to quickly create and apply new or existing tags! Creating new tags in an empty library is now as simple as clicking the "Add Tag" button, typing in the name of a tag you wish to create, and hitting <kbd>Enter</kbd>! The whole workflow was redone with both casual and power users in mind, and is entirely keyboard friendly. And fields have also gotten the same treatment!
+
+![Empty File Entry](assets/tag_field_bars/add_buttons_normal.png){ width=45% } ![Empty File Entry](assets/tag_field_bars/tag_bar_empty.png){ width=45% }
+![Empty File Entry](assets/tag_field_bars/tag_bar_search_match.png){ width=45% } ![Empty File Entry](assets/tag_field_bars/field_bar_search.png){ width=45% }
+
+You can read the brief feature overview below or read the updated [documentation](https://docs.tagstud.io/usage/#tagging) to see the full changes and features:
+
+- Open tagging bar clicking "Add Tag" or using <kbd>Ctrl</kbd>+<kbd>T</kbd>
+- Open field bar clicking "Add Field" or using <kbd>Ctrl</kbd>+<kbd>L</kbd>
+- When searching, the underlined tag/field template will be added on <kbd>Enter</kbd>
+- With no search results, a new tag or field template will be created on <kbd>Enter</kbd> and added to the selection
+- Holding <kbd>Shift</kbd> while pressing <kbd>Enter</kbd> will force create a new tag/field template, regardless of the search results
+- An option to always open an Edit window for new tags after creation is available by right-clicking the search bar or by going to the Settings (**off** by default)
+- An option to always open an Edit window for field content after applying a template is available by right-clicking the search bar or by going to the Settings (**on** by default)
+    - Field templates are _always_ edited after being created
+- The classic tag search panel can be accessed from **File -> Add Tag to Selected** / <kbd>Shift</kbd>+<kbd>Ctrl</kbd>+<kbd>T</kbd>
+
+#### Internal Changes
+
+- refactor: split out sql migrations from library by @Computerdores in #1432
+- refactor: remove dead folders table by @Computerdores in #1444
+- ci(docs): migrate from mkdocs to properdocs by @CyanVoxel in #1459
+- refactor(ui): refactor PanelModal and PanelWidget into MVC Modal, ModalView, and ModalContent classes by @CyanVoxel in #1454
+- refactor(ui): apply new MVC guidelines to search panels by @CyanVoxel in #1461
+- refactor: split ThumbRenderer class by @CyanVoxel in #1462
+
+#### Translations
+
+- **French** updated by @kitsumed
+- **Hungarian** updated by @smileyhead
+- **Chinese (Simplified Han Script)** updated by ？？？
+- **Spanish** updated by @2004milenadiaz-source, @JulArr22
+
+### Fixed
+
+- fix: thumbnail rendering for older pxd files by @purpletennisball in #1441
+- fix: correctly display duration statistic in preview panel by @ludvig-sandh in #1421
+- fix: fix new aliases not saving on new tags by @CyanVoxel in #1455
+- fix: don't update media playback when adding tags from menu modal by @CyanVoxel in f52e0fa56816ae43c4faf01b61d46ee8f49b206f
+
+---
+
+## 9.6.1 <small>July 9th, 2026</small>
+
+### Added
+
+- feat(ui): render .pxd thumbnails by @Sola-ris in #1430
+
+### Changed
+
+- feat(ui): organize settings into panels by @purpletennisball in #1425
+- feat(ui): left click to edit tag in tag manager by @purpletennisball in #1416
+
+### Fixed
+
+- fix: fix issues with updating tag aliases causing freezes by @CyanVoxel in #1412
+- fix: make TagStudio python package executable by @Computerdores in #1414
+- fix: use optimized SQL when selecting non-hidden entries by @racerand in #1240
+- fix: fix ripgrep not being located for macOS builds by @CyanVoxel in #1427
+- fix: remove invalid child_id relationships from tag_parents by @CyanVoxel in #1423
+- fix(ui): fix "search for tag" function in tag manager by @CyanVoxel in #1411
+- fix(ui): mouse down selects thumbnail instead of mouse up by @purpletennisball in #1420
+- fix(ui): thumbnail grid not resizing to fill width by @TheBobBobs in #1433
+
+#### Internal Changes
+
+- fix(nix): add pyright to devshell by @Computerdores in #1415
+- fix(deps): replace optional dependencies with dependency groups by @Xarvex in #1435
+- feat(ci)!: complete workflows revamp by @Xarvex in #1437
+
+#### Translations
+
+- **French** updated by @kitsumed
+- **Hungarian** updated by @smileyhead
+- **Russian** updated by @romandobra
+- **Spanish** updated by @JCC1998, @2004milenadiaz-source
+
+---
+
+## 9.6.0 <small>June 29th, 2026</small>
+
+<p align="center">
+    <img width="480" alt="aurora" src="https://github.com/user-attachments/assets/6103bb88-bc66-4222-9844-ed64d27dd2e7" />
+</p>
+
+### Added
+
+#### Customizable Fields
+
+[Fields](fields.md) are now fully customizable!
+
+- The built-in list of fields (now referred to as "field templates") has been reduced to a list of handy essential templates that can be fully modified or deleted
+- "Text Line" and "Text Box" field types have been combined into a single "Text" type with a "Multiline" option that can be configured on templates or toggled dynamically on existing text fields
+- You can now create your own field templates in with custom names, types, and other options
+- Fields applied to file entries can now have their names edited
+
+<img width="314" height="507" alt="field_template_manager" src="https://github.com/user-attachments/assets/523fac64-e0d6-4697-ba25-6ff89273d0cb" />
+<img width="494" height="342" alt="text_field_editor" src="https://github.com/user-attachments/assets/918956ee-647b-43ca-9843-e8acb67ee58f" />
+
+- refactor!: uncouple fields from hard-coded values by @CyanVoxel in #1354
+- fix: drop type_key column from text_fields and datetime_fields tables by @CyanVoxel in #1370
+- feat: field template manager by @TrigamDev in #1374
+- feat: add field template editor, editable field names by @CyanVoxel in #1396
+
+#### Other Additions
+
+- feat: add ability to configure automatic loading of new files over 10000 by @socalledtheraven in #1349
+- feat: dismiss update notification, change missing ffmpeg popup to banner by @CyanVoxel in #1400
+- feat: allow all raster images to be used as archive thumbnails. by @Sola-ris in #1373
+
+### Fixed
+
+- fix: Fix update notification crash by @Sola-ris in #1278
+- fix: correct ESCAPABLE_CHARS in query_lang tokenizer by @hieuit095 in #1334
+- fix: empty ORLists now return false by @TheBobBobs in #1297
+- fix: update thumb grid when adding tags from preview panel by @TheBobBobs in #1245
+- fix: match against the correct path in the ignore registry by @TrigamDev in #1382
+- fix: fix tag aliases by @CyanVoxel in #1399
+- fix: fix faulty progress bars by @ludvig-sandh in #1293
+- perf: Optimize searching tags with DB indexes by @TheBobBobs in #1129
+
+### Changed
+
+- ui: add v9.6 assets, update misc resources by @CyanVoxel in #1398
+
+#### Internal Changes
+
+- minor refactor: cleanup parameters of open_library and open_sqlite_library by @Computerdores in #1294
+- refactor: sql migrations by @Computerdores in #1295
+- fix: remove preferences table by @Computerdores in #1298
+- doc: add REUSE license information by @Computerdores in #1361
+- docs/chore: add .editorconfig and .prettierrc.toml configs by @CyanVoxel in #1362
+- refactor(docs): uniform formatting pass by @CyanVoxel in #1363
+- fix: pyright errors in ts_qt.py by @Computerdores in #1237
+- fix(ci): address remaining pyright errors by @CyanVoxel in #1368
+- ci: add pyright workflow by @Computerdores in #1232
+- refactor(ci): remove mypy by @CyanVoxel in #1371
+- chore(deps-dev): bump pytest from 8.3.5 to 9.0.3 by @dependabot[bot] in #1372
+- doc(install): add common error message help text by @Computerdores in #1369
+- chore(ci): bump ruff to 0.15.17 by @CyanVoxel in #1393
+- fix(pyproject): allow Python 3.13 to function by @xarvex in #1047
+
+#### Translations
+
+- **Amharic** added by @Birhant _(11%, can manually enable in settings file)_
+- **Hebrew** added by @JonathanGlixman _(2%, can manually enable in settings file)_
+- **French** updated by @SodiumBismuth, @kitsumed
+- **Russian** updated by @WerDei, @NikitaNik-of, @Dott-rus
+- **Hungarian** updated by @smileyhead
+- **Japanese** updated by wany-oh
+- **Italian** updated by @EdelFlosWeiss
+- **Spanish** updated by @JulArr22
+- **Toki Pona** updated by Cyborus
+- **Viossa** updated by @Nginearing
+- **Portuguese** updated by ssantos
+
+---
+
 ## 9.5.7 <small>May 5th, 2026</small>
 
 This update adds several bugfixes and additions that have been sitting on the main branch for quite some time.
@@ -68,12 +236,6 @@ This update adds several bugfixes and additions that have been sitting on the ma
 - **Tamil** updated by @TamilNeram
 - **Toki Pona** updated by @Math-Bee, Star Athendwyl
 
-### New Contributors
-
-- @Ambossmann made their first contribution in #1189
-- @CallMeHein made their first contribution in #1173
-- @terahidro2003 made their first contribution in #1328
-
 ---
 
 ## 9.5.6 <small>October 20th, 2025</small>
@@ -422,7 +584,9 @@ A new "Library Information" window has been added and is accessible under the "V
 
 ## 9.5.0 <small>March 3rd, 2025</small>
 
-<img width="500" src="https://github.com/user-attachments/assets/858f1494-216f-4521-aefe-d0aa4f754b9e" alt="TagStudio 9.5 Banner" />
+<p align="center">
+    <img width="480" alt="TagStudio 9.5 Banner" src="https://github.com/user-attachments/assets/858f1494-216f-4521-aefe-d0aa4f754b9e" />
+</p>
 
 ### Added
 

docs/contributing.md

@@ -117,7 +117,7 @@ Licensing is now accomplished using the [REUSE](https://reuse.software/spec-3.3/
 !!! tip "PR Scope"
     If you're unsure where to stop the scope of your PR, ask yourself: _"If I broke this up, could any parts of it still be used by the project in the meantime?"_
 
-### Workflow Checks
+### :material-check-circle: Workflow Checks
 
 When pushing your code, several automated [workflows](https://github.com/TagStudioDev/TagStudio/tree/main/.github/workflows) will check it against predefined tests and style checks. It's _highly recommended_ that you run these checks locally beforehand to avoid having to fight back-and-forth with the workflow checks inside your pull requests. These checks currently include:
 
@@ -126,7 +126,7 @@ When pushing your code, several automated [workflows](https://github.com/TagStud
 - [Pytest](developing.md#pytest) tests
 - REUSE [license compliance](#licenses)
 
-### Runtime Requirements
+## :material-timer-play: Runtime Requirements
 
 Code must function on all of the supported operating systems and versions:
 
@@ -134,18 +134,8 @@ Code must function on all of the supported operating systems and versions:
 - macOS 14.0+
 - Common Linux distributions and versions
 
-## :material-file-document: Documentation Guidelines
+Final submitted code must **_NOT:_**
 
-Documentation contributions include anything inside of the `docs/` folder as well as the `README.md`. Documentation inside the `docs/` folder is built and hosted on our static documentation site, [docs.tagstud.io](https://docs.tagstud.io/).
-
-- Use "[dash-case / kebab-case](https://developer.mozilla.org/en-US/docs/Glossary/Kebab_case)" for file and folder names
-- Follow the folder structure pattern
-- Don't add images or other media with excessively large file sizes
-- Provide alt text for embedded media
-- Use "[Title Case](https://apastyle.apa.org/style-grammar-guidelines/capitalization/title-case)" for title capitalization
-
-## :material-translate: Translation Guidelines
-
-Translations are performed on the TagStudio [Weblate project](https://hosted.weblate.org/projects/tagstudio/).
-
-_Translation guidelines coming soon._
+- Contain superfluous or unnecessary logging statements
+- Cause unreasonable slowdowns to the program outside of a progress-indicated task
+- Cause undesirable visual glitches or artifacts on screen

docs/developing.md

@@ -57,7 +57,7 @@ To install the required dependencies, you can use a dependency manager such as [
 If using [uv](https://docs.astral.sh/uv), you can install the dependencies for TagStudio with the following command:
 
 ```sh
-uv pip install -e ".[dev]"
+uv pip install -e . --group all
 ```
 
 TagStudio should now be runnable using the `tagstudio` command.
@@ -109,7 +109,7 @@ If you choose to manually set up a virtual environment and install dependencies
 3.  Use the following PIP command to create an editable installation and install the required development dependencies:
 
     ```sh
-    pip install -e ".[dev]"
+    pip install -e . --group all
     ```
 
 4.  TagStudio should now be runnable using the `tagstudio` command.
@@ -118,7 +118,7 @@ If you choose to manually set up a virtual environment and install dependencies
 !!! Warning "Linux Library Dependencies"
     If developing TagStudio on Linux, certain libraries are required that may not be included with your distribution. A full list of these can be found [here](install.md#linux).
 
-## Nix(OS)
+## Nix & NixOS
 
 If using [Nix](https://nixos.org/), there is a development environment already provided in the [flake](https://wiki.nixos.org/wiki/Flakes) that is accessible with the following command:
 
@@ -161,7 +161,7 @@ The entry point for TagStudio is `src/tagstudio/main.py`. You can target this fi
 
 [Ruff](https://github.com/astral-sh/ruff) is a Python linter and code formatter that helps enforce a consistent formatting style across our codebase.
 
-Ruff is installed alongside the `pip install -e ".[dev]"` command, but is also available as a VS Code [extension](https://marketplace.visualstudio.com/items?itemName=charliermarsh.ruff), PyCharm [plugin](https://plugins.jetbrains.com/plugin/20574-ruff), and [more](https://docs.astral.sh/ruff/integrations/).
+Ruff is installed alongside the `pip install -e . --group all` command, but is also available as a VS Code [extension](https://marketplace.visualstudio.com/items?itemName=charliermarsh.ruff), PyCharm [plugin](https://plugins.jetbrains.com/plugin/20574-ruff), and [more](https://docs.astral.sh/ruff/integrations/).
 
 ```sh title="Lint Code"
 ruff check
@@ -180,7 +180,7 @@ Ruff should automatically discover the configuration options inside the [pyproje
 
 [Pyright](https://github.com/microsoft/pyright) is a static type checker for Python that helps enforce type strictness and prevent easy-to-miss errors across our codebase.
 
-Pyright is installed alongside the `pip install -e ".[dev]"` command, but is also available as VS Code extensions (see the [Pyright](https://marketplace.visualstudio.com/items?itemName=ms-pyright.pyright), [Pylance](https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance), and [basedpyright](https://marketplace.visualstudio.com/items?itemName=detachhead.basedpyright) extensions), a PyCharm [setting](https://www.jetbrains.com/help/pycharm/lsp-tools.html#pyright), or in the form of forks such as [basedpyright](https://docs.basedpyright.com/latest/).
+Pyright is installed alongside the `pip install -e . --group all` command, but is also available as VS Code extensions (see the [Pyright](https://marketplace.visualstudio.com/items?itemName=ms-pyright.pyright), [Pylance](https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance), and [basedpyright](https://marketplace.visualstudio.com/items?itemName=detachhead.basedpyright) extensions), a PyCharm [setting](https://www.jetbrains.com/help/pycharm/lsp-tools.html#pyright), or in the form of forks such as [basedpyright](https://docs.basedpyright.com/latest/).
 
 ```sh title="Run Checks"
 pyright
@@ -192,7 +192,7 @@ Pyright/basedpyright should automatically discover the configuration options ins
 
 [Pytest](https://github.com/pytest-dev/pytest) runs our Python code against the tests inside the [`tests/`](https://github.com/TagStudioDev/TagStudio/tree/main/tests) directory.
 
-Pytest is installed alongside the `pip install -e ".[dev]"` command.
+Pytest is installed alongside the `pip install -e . --group all` command.
 
 ```sh title="Run Tests"
 pytest tests/
@@ -214,7 +214,7 @@ From there, Git will automatically run through the hooks during commit actions!
 
 You can automatically enter this development shell, and keep your user shell, with a tool like [direnv](https://direnv.net/). Some reference `.envrc` files are provided in the repository at [`contrib`](https://github.com/TagStudioDev/TagStudio/tree/main/contrib).
 
-Two currently available are for [Nix](#nixos) and [uv](#installing-with-uv), to use one:
+Two currently available are for [Nix](#nix-nixos) and [uv](#installing-with-uv), to use one:
 
 ```sh
 ln -s .envrc-$variant .envrc
@@ -236,13 +236,13 @@ direnv allow
 To build your own executables of TagStudio, first follow the steps in "[Installing Dependencies](#installing-dependencies)." Once that's complete, run the following PyInstaller command:
 
 ```
-pyinstaller tagstudio.spec
+pyinstaller scripts/tagstudio.spec
 ```
 
 If you're on Windows or Linux and wish to build a portable executable, then pass the following flag:
 
 ```
-pyinstaller tagstudio.spec -- --portable
+pyinstaller scripts/tagstudio.spec -- --portable
 ```
 
 The resulting executable file(s) will be located in a new folder named "dist".

docs/fields.md

@@ -10,6 +10,8 @@ icon: material/text-box
 
 Fields are extra pieces of information you can add to [file entries](./entries.md), similar to how [tags](tags.md) are added to entries. Fields are useful for storing information that doesn't nessisarily need to be a tag, such as titles, comments, notes, specific dates or times, etc.
 
+Unlike tags, fields are based on [templates](#templates) that contain pre-filled information such as the field type and title, and that information is _copied_ to fields when adding them to entries. Editing field information on entries **does not** modify the template it was created from.
+
 To add a field to an entry, click the "Add Field" button in the preview panel. From there you can search and/or select a [field template](#field-templates) to choose from, or create a new one from the search bar. Alternatively you can create new field templates from **Edit -> Manage Field Templates**.
 
 <figure markdown="span">

docs/index.md

@@ -27,12 +27,12 @@ hide:
 
 ![TagStudio screenshot](./assets/tag_bubbles.png)
 
-**TagStudio** is a photo & file organization application with an underlying tag-based system that focuses on giving freedom and flexibility to the user. No proprietary programs or formats, no sea of sidecar files, and no complete upheaval of your filesystem structure.
+<span style="font-family: Bai Jamjuree, Roboto, sans-serif; font-size: 1.1rem; letter-spacing: -0.05rem;"><span style="font-weight: 900;">Tag</span><span style="font-weight: 500;"><i>Studio</i></span></span> is a photo & file organization application with an underlying tag-based system that focuses on giving freedom and flexibility to the user. No proprietary programs or formats, no sea of sidecar files, and no complete upheaval of your filesystem structure.
 
 </div>
 
 <figure markdown="span">
-  [:material-download: Download Latest Release](https://github.com/TagStudioDev/TagStudio/releases){ .md-button .md-button--primary }
+  [:material-github: Download Latest Release](https://github.com/TagStudioDev/TagStudio/releases){ .md-button .md-button--primary }
 </figure>
 
 ## :material-star: Core Features

docs/install.md

@@ -1,12 +1,12 @@
 ---
-title: Installation
+title: Installing
 icon: material/download
 ---
 
 <!-- SPDX-FileCopyrightText: (c) TagStudio Contributors -->
 <!-- SPDX-License-Identifier: GPL-3.0-only -->
 
-# :material-download: Installation
+# :material-download: Installing
 
 TagStudio provides executable [releases](https://github.com/TagStudioDev/TagStudio/releases) as well as full access to its [source code](https://github.com/TagStudioDev/TagStudio) under the [GPLv3](https://github.com/TagStudioDev/TagStudio/blob/main/LICENSE) license.
 
@@ -17,8 +17,8 @@ To download executable builds of TagStudio, visit the [Releases](https://github.
 TagStudio has builds for :fontawesome-brands-windows: **Windows**, :fontawesome-brands-apple: **macOS** _(Apple Silicon & Intel)_, and :material-penguin: **Linux**. We also offer portable releases for Windows and Linux which are self-contained and easier to move around.
 
 <!-- prettier-ignore -->
-!!! info "Third-Party Dependencies"
-    You may need to install [third-party dependencies](#third-party-dependencies) such as [FFmpeg](https://ffmpeg.org/download.html) to use the full feature set of TagStudio.
+!!! info "Optional Dependencies"
+    You may need to install [optional third-party dependencies](#optional-dependencies) such as [FFmpeg](https://ffmpeg.org/download.html) to use the full feature set of TagStudio.
 
 <!-- prettier-ignore -->
 !!! warning ":fontawesome-brands-apple: macOS "Privacy & Security" Popup"
@@ -54,7 +54,7 @@ pip install .
 !!! note "Developer Dependencies"
     If you wish to create an editable install with the additional dependencies required for developing TagStudio, use this modified PIP command instead:
     ```sh
-    pip install -e ".[dev]"
+    pip install -e . --group all
     ```
     _See more under "[Developing](developing.md)"_
 
@@ -82,9 +82,22 @@ Some external dependencies are required for TagStudio to execute. Below is a tab
 | [qt-multimedia](https://repology.org/project/qt)                                 | required                                                                         |
 | [qt-wayland](https://repology.org/project/qt)                                    | Wayland support                                                                  |
 
-### :material-nix: Nix(OS)
+<!-- prettier-ignore -->
+!!! bug "Missing Linux Dependency Example"
+    An error message such as the following indicates that you're missing the `libxcb-cursor` or `xcb-util-cursor` library, depending on your distro:
+    ```
+    qt.qpa.plugin: From 6.5.0, xcb-cursor0 or libxcb-cursor0 is needed to load the Qt xcb platform plugin.
+    qt.qpa.plugin: Could not load the Qt platform plugin "xcb" in "/tmp/_MEIayuTiW/cv2/qt/plugins" even though it was found.
+    This application failed to start because no Qt platform plugin could be initialized. Reinstalling the application may fix this problem.
 
-For [Nix(OS)](https://nixos.org/), the TagStudio repository includes a [flake](https://wiki.nixos.org/wiki/Flakes) that provides some outputs such as a development shell and package.
+    Available platform plugins are: vnc, wayland-egl, offscreen, wayland, linuxfb, minimalegl, eglfs, minimal, vkkhrdisplay, xcb.
+
+    Aborted (core dumped)
+    ```
+
+### :material-nix: Nix & NixOS
+
+For [Nix](https://nixos.org/), the TagStudio repository includes a [flake](https://wiki.nixos.org/wiki/Flakes) that provides some outputs such as a development shell and package.
 
 Two packages are provided: `tagstudio` and `tagstudio-jxl`. The distinction was made because `tagstudio-jxl` has an extra compilation step for [JPEG-XL](https://jpeg.org/jpegxl) image support. To give either of them a test run, you can execute `nix run github:TagStudioDev/TagStudio#tagstudio`. If you are in a cloned repository and wish to run a package with the context of the repository, you can simply use `nix run` with no arguments.
 
@@ -212,7 +225,9 @@ Finally, `inputs` can be used in a module to add the package to your packages li
 
 Don't forget to rebuild!
 
-## Third-Party Dependencies
+## Optional Dependencies
+
+Some TagStudio functionality such as multimedia thumbnails and playback, RAR archive thumbnails, and improved directory scanning performance will require installing optional third-party dependencies. Depending on your system, you may already have one or more of these installed. To check
 
 <!-- prettier-ignore -->
 !!! tip
@@ -241,22 +256,4 @@ To generate thumbnails for RAR-based files (like `.cbr`) you'll need an extracto
 
 ### ripgrep
 
-A recommended tool to improve the performance of directory scanning is [`ripgrep`](https://github.com/BurntSushi/ripgrep), a Rust-based directory walker that natively integrates with our [`.ts_ignore`](ignore.md) (`.gitignore`-style) pattern matching system for excluding files and directories. Ripgrep is already pre-installed on some Linux distributions and also available from several package managers.
-
-## Common Error Messages
-
-### Could not load the Qt platform plugin "xcb"
-
-If you get an error message like this one:
-
-```
-qt.qpa.plugin: From 6.5.0, xcb-cursor0 or libxcb-cursor0 is needed to load the Qt xcb platform plugin.
-qt.qpa.plugin: Could not load the Qt platform plugin "xcb" in "/tmp/_MEIayuTiW/cv2/qt/plugins" even though it was found.
-This application failed to start because no Qt platform plugin could be initialized. Reinstalling the application may fix this problem.
-
-Available platform plugins are: vnc, wayland-egl, offscreen, wayland, linuxfb, minimalegl, eglfs, minimal, vkkhrdisplay, xcb.
-
-Aborted (core dumped)
-```
-
-Make sure you installed `libxcb-cursor` or `xcb-util-cursor`.
+A recommended tool to improve the performance of directory scanning is [ripgrep](https://github.com/BurntSushi/ripgrep), a Rust-based directory walker that natively integrates with our [`.ts_ignore`](ignore.md) (`.gitignore`-style) pattern matching system for excluding files and directories. Ripgrep is already pre-installed on some Linux distributions and also available from several package managers.

docs/library-changes.md

@@ -18,9 +18,9 @@ Legacy (JSON) library save format versions were tied to the release version of t
 
 ### Versions 1.0.0 - 9.4.2
 
-| Used From | Format | Location                                      |
-| --------- | ------ | --------------------------------------------- |
-| v1.0.0    | JSON   | `<Library Folder>`/.TagStudio/ts_library.json |
+| Used in Releases | Format | Location                                      |
+| ---------------- | ------ | --------------------------------------------- |
+| v1.0.0 - v9.4.2  | JSON   | `<Library Folder>`/.TagStudio/ts_library.json |
 
 The legacy database format for public TagStudio releases [v9.1](https://github.com/TagStudioDev/TagStudio/tree/Alpha-v9.1) through [v9.4.2](https://github.com/TagStudioDev/TagStudio/releases/tag/v9.4.2). Variations of this format had been used privately since v1.0.0.
 
@@ -30,7 +30,11 @@ Replaced by the new SQLite format introduced in TagStudio [v9.5.0 Pre-Release 1]
 
 ## SQLite <small>v9.5.0+</small>
 
-Starting with TagStudio [v9.5.0-pr1](https://github.com/TagStudioDev/TagStudio/releases/tag/v9.5.0-pr1), the library save format has been moved to a [SQLite](https://sqlite.org) format. Legacy JSON libraries are migrated (with the user's consent) to the new format when opening in current versions of the program. The save format versioning is now separate from the program's versioning number.
+Starting with TagStudio [v9.5.0-pr1](https://github.com/TagStudioDev/TagStudio/releases/tag/v9.5.0-pr1), the library save format has been moved to the [SQLite](https://sqlite.org) format. Legacy JSON libraries are migrated (with the user's consent) to the new format when opening in current versions of the program. The save format versioning is now separate from the program's versioning number.
+
+The database storage location of all SQLite versions to date is at:
+
+`<Library Folder>`/.TagStudio/ts_library.sqlite
 
 ### Versioning
 
@@ -38,12 +42,12 @@ Versions **1-100** stored the database version in a table called `preferences` i
 
 Versions **>101** store the database version in a table called `versions` in a row with the `key` column of `'CURRENT'` inside the corresponding `value` column. The `versions` table also stores the initial database version in which the file was created with under the `'INITIAL'` key. Databases created before this key was introduced will always have `'INITIAL'` value of `100`.
 
-#### "versions" Table
+#### `versions` Table
 
-| key (`VARCHAR`) | value (`INTEGER`)                             |
-| --------------- | --------------------------------------------- |
-| `'INITIAL'`     | <Version DB was created with, minimum `100`\> |
-| `'CURRENT'`     | <Current version of DB\>                      |
+| key (`VARCHAR`) | value (`INTEGER`)                          |
+| --------------- | ------------------------------------------ |
+| `'INITIAL'`     | Version DB was created with, minimum `100` |
+| `'CURRENT'`     | Current version of DB                      |
 
 #### Major and Minor Versioning
 
@@ -51,19 +55,23 @@ Version **100** came along with a major/minor versioning system built into to th
 
 For example, a database with version 204 would still be readable in an older version of TagStudio that understands version 200. A database with version 300, on the other hand, would no longer be readable in that same older version and an error message would display.
 
+<!-- prettier-ignore -->
+!!! note ""Version 0" Message"
+    If you see an message when opening a library along the lines of **"Found Version 0"**, this means that you're opening a library created with a newer version of TagStudio in an older version of TagStudio that does not recognize the future versioning system. To open your library, you should use a TagStudio version greater than or equal to the one the library was created or last used with.
+
 ---
 
 ### Versions 1 - 5
 
-These versions were used while developing the new SQLite file format, outside any official or recommended release. These versions **were never supported** in any official capacity and were actively warned against using for real libraries.
+These versions were used while developing the new SQLite file format, outside of any official or recommended release. These versions **were never supported** in any official capacity and were actively warned against using for real libraries.
 
 ---
 
 ### Version 6
 
-| Used From                                                                       | Format | Location                                        |
-| ------------------------------------------------------------------------------- | ------ | ----------------------------------------------- |
-| [v9.5.0-pr1](https://github.com/TagStudioDev/TagStudio/releases/tag/v9.5.0-pr1) | SQLite | `<Library Folder>`/.TagStudio/ts_library.sqlite |
+| Added in Commit                          | Introduced in Release                                                           | Format |
+| ---------------------------------------- | ------------------------------------------------------------------------------- | ------ |
+| d1b006a8978a7fa1b7f1a82243e490aca8a8355e | [v9.5.0-pr1](https://github.com/TagStudioDev/TagStudio/releases/tag/v9.5.0-pr1) | SQLite |
 
 The first public version of the SQLite save file format.
 
@@ -73,9 +81,9 @@ Migration from the legacy JSON format is provided via a walkthrough when opening
 
 ### Version 7
 
-| Used From                                                                       | Format | Location                                        |
-| ------------------------------------------------------------------------------- | ------ | ----------------------------------------------- |
-| [v9.5.0-pr2](https://github.com/TagStudioDev/TagStudio/releases/tag/v9.5.0-pr2) | SQLite | `<Library Folder>`/.TagStudio/ts_library.sqlite |
+| Added in Commit                          | Introduced in Release                                                           | Format |
+| ---------------------------------------- | ------------------------------------------------------------------------------- | ------ |
+| 480328b83bc1c69ab52a3eb11e2935337d3460ab | [v9.5.0-pr2](https://github.com/TagStudioDev/TagStudio/releases/tag/v9.5.0-pr2) | SQLite |
 
 - ~~Repairs "Description" fields to use a TEXT_LINE key instead of a TEXT_BOX key.~~ _See [Version 200](#version-200)_
 - Repairs tags that may have a disambiguation_id pointing towards a deleted tag.
@@ -84,9 +92,9 @@ Migration from the legacy JSON format is provided via a walkthrough when opening
 
 ### Version 8
 
-| Used From                                                                       | Format | Location                                        |
-| ------------------------------------------------------------------------------- | ------ | ----------------------------------------------- |
-| [v9.5.0-pr4](https://github.com/TagStudioDev/TagStudio/releases/tag/v9.5.0-pr4) | SQLite | `<Library Folder>`/.TagStudio/ts_library.sqlite |
+| Added in Commit                          | Introduced in Release                                                           | Format |
+| ---------------------------------------- | ------------------------------------------------------------------------------- | ------ |
+| 28de21ade757aa5b80e87f77a459f4a3af21ffe0 | [v9.5.0-pr4](https://github.com/TagStudioDev/TagStudio/releases/tag/v9.5.0-pr4) | SQLite |
 
 - Adds the `color_border` column to the `tag_colors` table. Used for instructing the [secondary color](colors.md#secondary-color) to apply to a tag's border as a new optional behavior.
 - Adds three new default colors: "Burgundy (TagStudio Shades)", "Dark Teal (TagStudio Shades)", and "Dark Lavender (TagStudio Shades)".
@@ -96,9 +104,9 @@ Migration from the legacy JSON format is provided via a walkthrough when opening
 
 ### Version 9
 
-| Used From                                                               | Format | Location                                        |
-| ----------------------------------------------------------------------- | ------ | ----------------------------------------------- |
-| [v9.5.2](https://github.com/TagStudioDev/TagStudio/releases/tag/v9.5.2) | SQLite | `<Library Folder>`/.TagStudio/ts_library.sqlite |
+| Added in Commit                          | Introduced in Release                                                   | Format |
+| ---------------------------------------- | ----------------------------------------------------------------------- | ------ |
+| 31833245a4d7a655dc4e66e6005a9dd78c36c04d | [v9.5.2](https://github.com/TagStudioDev/TagStudio/releases/tag/v9.5.2) | SQLite |
 
 - Adds the `filename` column to the `entries` table. Used for sorting entries by filename in search results.
 
@@ -108,9 +116,9 @@ Migration from the legacy JSON format is provided via a walkthrough when opening
 
 #### Version 100
 
-| Used From                                | Format | Location                                        |
-| ---------------------------------------- | ------ | ----------------------------------------------- |
-| 74383e3c3c12f72be1481ab0b86c7360b95c2d85 | SQLite | `<Library Folder>`/.TagStudio/ts_library.sqlite |
+| Added in Commit                          | Introduced in Release | Format |
+| ---------------------------------------- | --------------------- | ------ |
+| 74383e3c3c12f72be1481ab0b86c7360b95c2d85 | _None_                | SQLite |
 
 - Introduces built-in minor versioning
     - The version number divided by 100 (and floored) constitutes the **major** version. Major version indicate breaking changes that prevent libraries from being opened in TagStudio versions older than the ones they were created in.
@@ -119,9 +127,9 @@ Migration from the legacy JSON format is provided via a walkthrough when opening
 
 #### Version 101
 
-| Used From                                                                                                        | Format | Location                                        |
-| ---------------------------------------------------------------------------------------------------------------- | ------ | ----------------------------------------------- |
-| 12e074b71d8860282b44e49e0e1a41b7a2e4bae8/[v9.5.4](https://github.com/TagStudioDev/TagStudio/releases/tag/v9.5.4) | SQLite | `<Library Folder>`/.TagStudio/ts_library.sqlite |
+| Added in Commit                          | Introduced in Release                                                   | Format |
+| ---------------------------------------- | ----------------------------------------------------------------------- | ------ |
+| 12e074b71d8860282b44e49e0e1a41b7a2e4bae8 | [v9.5.4](https://github.com/TagStudioDev/TagStudio/releases/tag/v9.5.4) | SQLite |
 
 - Deprecates the `preferences` table, set to be removed in a [future](#version-104) TagStudio version.
 - Introduces the `versions` table
@@ -133,24 +141,26 @@ Migration from the legacy JSON format is provided via a walkthrough when opening
 
 #### Version 102
 
-| Used From                                | Format | Location                                        |
-| ---------------------------------------- | ------ | ----------------------------------------------- |
-| 71d04254cf87f4200bb7ffc81656e50dfb122e4d | SQLite | `<Library Folder>`/.TagStudio/ts_library.sqlite |
+| Added in Commit                          | Introduced in Release                                                   | Format |
+| ---------------------------------------- | ----------------------------------------------------------------------- | ------ |
+| 71d04254cf87f4200bb7ffc81656e50dfb122e4d | [v9.5.5](https://github.com/TagStudioDev/TagStudio/releases/tag/v9.5.5) | SQLite |
 
 - Applies repairs to the `tag_parents` table created in [version 100](#version-100), removing rows that reference tags that have been deleted.
 
-| Used From                                                                                                        | Format | Location                                        |
-| ---------------------------------------------------------------------------------------------------------------- | ------ | ----------------------------------------------- |
-| 88d0b47a86821ccfadba653f30a515abce5b24b0/[v9.5.7](https://github.com/TagStudioDev/TagStudio/releases/tag/v9.5.7) | SQLite | `<Library Folder>`/.TagStudio/ts_library.sqlite |
+#### Version 103
+
+| Added in Commit                          | Introduced in Release                                                   | Format |
+| ---------------------------------------- | ----------------------------------------------------------------------- | ------ |
+| 88d0b47a86821ccfadba653f30a515abce5b24b0 | [v9.5.7](https://github.com/TagStudioDev/TagStudio/releases/tag/v9.5.7) | SQLite |
 
 - Adds the `is_hidden` column to the `tags` table (default `0`). Used for excluding entries tagged with hidden tags from library searches.
 - Sets the `is_hidden` field on the built-in Archived tag to `1`, to match the Archived tag now being hidden by default.
 
 #### Version 104
 
-| Used From                                | Format | Location                                        |
-| ---------------------------------------- | ------ | ----------------------------------------------- |
-| ad2cbbca483018d245b44348e2c4f5a0e0bb28f1 | SQLite | `<Library Folder>`/.TagStudio/ts_library.sqlite |
+| Added in Commit                          | Introduced in Release | Format |
+| ---------------------------------------- | --------------------- | ------ |
+| ad2cbbca483018d245b44348e2c4f5a0e0bb28f1 | _None_                | SQLite |
 
 - Removes the `preferences` table, after migrating the contained extension list to the .ts_ignore file, if necessary.
 
@@ -160,9 +170,9 @@ Migration from the legacy JSON format is provided via a walkthrough when opening
 
 #### Version 200
 
-| Used From                                | Format | Location                                        |
-| ---------------------------------------- | ------ | ----------------------------------------------- |
-| c15e2b56eedd0a3c13391fa43571b8f8f7c7a91f | SQLite | `<Library Folder>`/.TagStudio/ts_library.sqlite |
+| Added in Commit                          | Introduced in Release | Format |
+| ---------------------------------------- | --------------------- | ------ |
+| c15e2b56eedd0a3c13391fa43571b8f8f7c7a91f | _None_                | SQLite |
 
 - Adds `text_field_templates` and `date_field_templates` tables.
 - Drops `boolean_fields` and `value_type` tables.
@@ -177,9 +187,17 @@ Migration from the legacy JSON format is provided via a walkthrough when opening
 
 #### Version 201
 
-| Used From                                | Format | Location                                        |
-| ---------------------------------------- | ------ | ----------------------------------------------- |
-| 38da7bb3a920a01d4d70fa065fd19c83ff6eecb1 | SQLite | `<Library Folder>`/.TagStudio/ts_library.sqlite |
+| Added in Commit                          | Introduced in Release                                                   | Format |
+| ---------------------------------------- | ----------------------------------------------------------------------- | ------ |
+| 38da7bb3a920a01d4d70fa065fd19c83ff6eecb1 | [v9.6.0](https://github.com/TagStudioDev/TagStudio/releases/tag/v9.6.0) | SQLite |
 
 - Drops `type_key` columns from `text_fields` and `datetime_fields` tables.
 - Enforces column positions for `text_fields` and `datetime_fields` tables.
+
+#### Version 202
+
+| Added in Commit                          | Introduced in Release                                                   | Format |
+| ---------------------------------------- | ----------------------------------------------------------------------- | ------ |
+| 95e2fe7b4449951c385e35a2e13f0c1925f1f98e | [v9.6.1](https://github.com/TagStudioDev/TagStudio/releases/tag/v9.6.1) | SQLite |
+
+- Applies repairs to the `tag_parents` table, removing rows that reference child tags that have been deleted.

docs/preview-support.md

@@ -47,7 +47,7 @@ Images will generate thumbnails the first time they are viewed or since the last
 
 ### :material-movie-open: Videos
 
-Video thumbnails will default to the closest viable frame from the middle of the video. Both thumbnail generation and video playback in the Preview Panel requires [FFmpeg](install.md#third-party-dependencies) installed on your system.
+Video thumbnails will default to the closest viable frame from the middle of the video. Both thumbnail generation and video playback in the Preview Panel requires [FFmpeg](install.md#optional-dependencies) installed on your system.
 
 | Filetype              | Extensions              | Dependencies |
 | --------------------- | ----------------------- | :----------: |
@@ -65,7 +65,7 @@ Video thumbnails will default to the closest viable frame from the middle of the
 
 ### :material-sine-wave: Audio
 
-Audio thumbnails will default to embedded cover art (if any) and fallback to generated waveform thumbnails. Audio file playback is supported in the Preview Panel if you have [FFmpeg](install.md#third-party-dependencies) installed on your system. Audio waveforms are currently not cached.
+Audio thumbnails will default to embedded cover art (if any) and fallback to generated waveform thumbnails. Audio file playback is supported in the Preview Panel if you have [FFmpeg](install.md#optional-dependencies) installed on your system. Audio waveforms are currently not cached.
 
 | Filetype            | Extensions               | Dependencies |
 | ------------------- | ------------------------ | :----------: |
@@ -82,23 +82,24 @@ Audio thumbnails will default to embedded cover art (if any) and fallback to gen
 
 Preview support for office documents or well-known project file formats varies by the format and whether or not embedded thumbnails are available to be read from. OpenDocument-based files are typically supported.
 
-| Filetype                             | Extensions            | Preview Type                                                               |
-| ------------------------------------ | --------------------- | -------------------------------------------------------------------------- |
-| Blender                              | `.blend`, `.blend<#>` | Embedded thumbnail :material-alert-circle:{ title="If available in file" } |
-| Clip Studio Paint                    | `.clip`               | Embedded thumbnail                                                         |
-| Keynote (Apple iWork)                | `.key`                | Embedded thumbnail                                                         |
-| Krita[^3]                            | `.kra`, `.krz`        | Embedded thumbnail :material-alert-circle:{ title="If available in file" } |
-| Mdipack (FireAlpaca, Medibang Paint) | `.mdp`                | Embedded thumbnail                                                         |
-| MuseScore                            | `.mscz`               | Embedded thumbnail :material-alert-circle:{ title="If available in file" } |
-| Numbers (Apple iWork)                | `.numbers`            | Embedded thumbnail                                                         |
-| OpenDocument Presentation            | `.odp`, `.fodp`       | Embedded thumbnail                                                         |
-| OpenDocument Spreadsheet             | `.ods`, `.fods`       | Embedded thumbnail                                                         |
-| OpenDocument Text                    | `.odt`, `.fodt`       | Embedded thumbnail                                                         |
-| Pages (Apple iWork)                  | `.pages`              | Embedded thumbnail                                                         |
-| Paint.NET                            | `.pdn`                | Embedded thumbnail                                                         |
-| PDF                                  | `.pdf`                | First page render                                                          |
-| Photoshop                            | `.psd`                | Flattened image render                                                     |
-| PowerPoint (Microsoft Office)        | `.pptx`, `.ppt`       | Embedded thumbnail :material-alert-circle:{ title="If available in file" } |
+| Filetype                              | Extensions            | Preview Type                                                               |
+| ------------------------------------- | --------------------- | -------------------------------------------------------------------------- |
+| Blender                               | `.blend`, `.blend<#>` | Embedded thumbnail :material-alert-circle:{ title="If available in file" } |
+| Clip Studio Paint                     | `.clip`               | Embedded thumbnail                                                         |
+| Keynote (Apple iWork)                 | `.key`                | Embedded thumbnail                                                         |
+| Krita[^3]                             | `.kra`, `.krz`        | Embedded thumbnail :material-alert-circle:{ title="If available in file" } |
+| Mdipack (FireAlpaca, Medibang Paint)  | `.mdp`                | Embedded thumbnail                                                         |
+| MuseScore                             | `.mscz`               | Embedded thumbnail :material-alert-circle:{ title="If available in file" } |
+| Numbers (Apple iWork)                 | `.numbers`            | Embedded thumbnail                                                         |
+| OpenDocument Presentation             | `.odp`, `.fodp`       | Embedded thumbnail                                                         |
+| OpenDocument Spreadsheet              | `.ods`, `.fods`       | Embedded thumbnail                                                         |
+| OpenDocument Text                     | `.odt`, `.fodt`       | Embedded thumbnail                                                         |
+| Pages (Apple iWork)                   | `.pages`              | Embedded thumbnail                                                         |
+| Paint.NET                             | `.pdn`                | Embedded thumbnail                                                         |
+| PDF                                   | `.pdf`                | First page render                                                          |
+| Photoshop                             | `.psd`                | Flattened image render                                                     |
+| Pixelmator Pro (Apple Creator Studio) | `.pxd`                | Embedded thumbnail                                                         |
+| PowerPoint (Microsoft Office)         | `.pptx`, `.ppt`       | Embedded thumbnail :material-alert-circle:{ title="If available in file" } |
 
 ### :material-archive: Archives
 

docs/roadmap.md

@@ -98,7 +98,7 @@ A detailed specification written for the TagStudio tag and/or library format. In
 - [x] Translations
 - [ ] Search Bar Rework :material-chevron-triple-up:{ .priority-high title="High Priority" } **[v9.6.x]**
     - [ ] Improved Tag Autocomplete :material-chevron-triple-up:{ .priority-high title="High Priority" }
-    - [ ] Tags appear as widgets in search bar :material-chevron-triple-up:{ .priority-high title="High Priority" }
+    - [ ] Tags appear as widgets in search bar _(similar to new tag search/create bar)_ :material-chevron-triple-up:{ .priority-high title="High Priority" }
 - [x] Unified Media Player
     - [x] Auto-Hiding Player Controls
     - [x] Play/Pause
@@ -116,13 +116,12 @@ A detailed specification written for the TagStudio tag and/or library format. In
     - [x] Basic Support
     - [ ] Full File Preview :material-chevron-triple-up:{ .priority-high title="High Priority" } **[v9.6.x]**
     - [ ] Syntax Highlighting :material-chevron-double-up:{ .priority-med title="Medium Priority" } **[v9.6.x]**
-- [ ] Toggleable Persistent Tagging Panel :material-chevron-triple-up:{ .priority-high title="High Priority" } **[v9.8.x]**
+- [ ] Toggleable Persistent Tagging Panel :material-chevron-triple-up:{ .priority-high title="High Priority" } **[v9.7.x]**
     - [ ] Top Tags
     - [ ] Recent Tags
     - [ ] Tag Search
     - [ ] Pinned Tags
 - [ ] New Tabbed Tag Building UI to Support New Tag Features :material-chevron-triple-up:{ .priority-high title="High Priority" } **[v9.8.x]**
-- [ ] Custom Thumbnail Overrides :material-chevron-double-up:{ .priority-med title="Medium Priority" } **[v9.7.x]**
 - [ ] Media Duration Labels :material-chevron-triple-up:{ .priority-high title="High Priority" } **[v9.6.x]**
 - [ ] Word/Line Count Labels :material-chevron-up:{ .priority-low title="Low Priority" }
 - [ ] Custom Tag Badges :material-chevron-up:{ .priority-low title="Low Priority" }
@@ -174,14 +173,14 @@ File or file-like [entries](entries.md) stored in the library.
     - [x] Datetimes **[[v9.5.4](changelog.md#954-september-1st-2025)]**
     - [ ] Numeric Fields :material-chevron-double-up:{ .priority-med title="Medium Priority" } **[v9.6.x]**
         - [ ] Optional Units (e.g. inches, cm, height notation, degrees, bytes, etc.) :material-chevron-double-up:{ .priority-med title="Medium Priority" }
-    - [ ] Custom Field Names :material-chevron-triple-up:{ .priority-high title="High Priority" } **[v9.6.x]**
-        - [x] Removal of Deprecated Fields **[v9.6.0]**
+    - [x] Custom Field Names **[[v9.6.0](changelog.md#960-june-29th-2026)]**
+        - [x] Removal of Deprecated Fields **[[v9.6.0](changelog.md#960-june-29th-2026)]**
+- [ ] Custom Thumbnail Overrides :material-chevron-double-up:{ .priority-med title="Medium Priority" } **[v9.7.x]**
 - [ ] Entry Groups :material-chevron-triple-up:{ .priority-high title="High Priority" } **[v9.7.x]**
     - [ ] Non-exclusive; Entries can be in multiple groups :material-chevron-triple-up:{ .priority-high title="High Priority" }
-    - [ ] Ability to number entries within group :material-chevron-triple-up:{ .priority-high title="High Priority" }
+    - [ ] Ability to number entries within group (i.e. page numbers) :material-chevron-triple-up:{ .priority-high title="High Priority" }
     - [ ] Ability to set sorting method for group :material-chevron-triple-up:{ .priority-high title="High Priority" }
-    - [ ] Ability to set custom thumbnail for group :material-chevron-triple-up:{ .priority-high title="High Priority" }
-    - [ ] Group is treated as entry with tags and metadata :material-chevron-double-up:{ .priority-med title="Medium Priority" }
+    - [ ] Ability to set custom thumbnail for group :material-chevron-double-up:{ .priority-med title="Medium Priority" }
     - [ ] Nested groups :material-chevron-double-up:{ .priority-med title="Medium Priority" }
 
 ### :material-tag-text: Tags

docs/style.md

@@ -6,116 +6,207 @@ icon: material/sign-text
 <!-- SPDX-FileCopyrightText: (c) TagStudio Contributors -->
 <!-- SPDX-License-Identifier: GPL-3.0-only -->
 
+<!-- prettier-ignore -->
+!!! abstract "Prerequisite Reading"
+    This guide assumes you've read the [Developing](developing.md) and [Contributing](contributing.md) pages first.
+
 # :material-sign-text: Style Guide
 
-## Formatting
+## :material-script-text: General Principles
 
-Most of the style guidelines can be checked, fixed, and enforced via Ruff. Older code may not be adhering to all of these guidelines, in which case _"do as I say, not as I do"..._
+- Write **clear**, **concise**, and **modular** code.
+- If the purpose of a peice of code is not obvious, a **short comment** should help explain it.
+- Remember to follow the rest of the [contribution guidelines](contributing.md)!
 
-- Do your best to write clear, concise, and modular code.
-    - This should include making methods private by default (e.g. `__method()`)
-    - Methods should only be protected (e.g. `_method()`) or public (e.g. `method()`) when needed and warranted
-- Keep a maximum column width of no more than **100** characters.
-- Code comments should be used to help describe sections of code that can't speak for themselves.
-- Use [Google style](https://google.github.io/styleguide/pyguide.html#s3.8-comments-and-docstrings) docstrings for any classes and functions you add.
-    - If you're modifying an existing function that does _not_ have docstrings, you don't _have_ to add docstrings to it... but it would be pretty cool if you did ;)
-- Imports should be ordered alphabetically.
-- Lists of values should be ordered using their [natural sort order](https://en.wikipedia.org/wiki/Natural_sort_order).
-    - Some files have their methods ordered alphabetically as well (i.e. [`thumb_renderer`](https://github.com/TagStudioDev/TagStudio/blob/main/src/tagstudio/qt/widgets/thumb_renderer.py)). If you're working in a file and notice this, please try and keep to the pattern.
-- When writing text for window titles or form titles, use "[Title Case](https://apastyle.apa.org/style-grammar-guidelines/capitalization/title-case)" capitalization. Your IDE may have a command to format this for you automatically, although some may incorrectly capitalize short prepositions. In a pinch you can use a website such as [capitalizemytitle.com](https://capitalizemytitle.com/) to check.
-- If it wasn't mentioned above, then stick to [**PEP-8**](https://peps.python.org/pep-0008/)!
+---
 
-### Modules & Implementations
+## :material-text-box-check: Formatting
 
-- **Do not** modify legacy library code in the `src/core/library/json/` directory
-- Avoid direct calls to `os`
-    - Use `Pathlib` library instead of `os.path`
-    - Use `platform.system()` instead of `os.name` and `sys.platform`
-- Don't prepend local imports with `tagstudio`, stick to `src`
-- Use the `logger` system instead of `print` statements
-- Avoid nested f-strings
-- Use HTML-like tags inside Qt widgets over stylesheets where possible
-
-Final submitted code must **_NOT:_**
-
-- Contain superfluous or unnecessary logging statements
-- Cause unreasonable slowdowns to the program outside of a progress-indicated task
-- Cause undesirable visual glitches or artifacts on screen
-
-### Formatter Configs
+Linting in Python files is mostly taken care of by [ruff](developing.md#ruff) and is based on the rules declared in `pyproject.toml` and `.editorconfig`.
 
 TagStudio provides an [EditorConfig](https://editorconfig.org/#example-file) file ([`.editorconfig`](https://github.com/TagStudioDev/TagStudio/blob/main/.editorconfig)) along with a [Prettier](https://prettier.io/) config file ([`.prettierrc.toml`](https://github.com/TagStudioDev/TagStudio/blob/main/.prettierrc.toml)) for formatting files other than .py files (Markdown, JSON, YAML, HTML, CSS, etc.). If editing these types of files it's recommended that you use a formatter that supports EditorConfig or has its settings matched to the EditorConfig and Prettier configs. Lastly, please pay attention to the `prettier-ignore` flags in present in some files if you are not using Prettier, as formatting these sections will break formatting used elsewhere such as the [MkDocs site](https://docs.tagstud.io/).
 
-## Qt
+### :material-code-braces-box: Syntax Guidelines
 
-As of writing this section, the QT part of the code base is quite unstructured and the View and Controller parts are completely intermixed[^1]. This makes maintenance, fixes and general understanding of the code base quite challenging, because the interesting parts you are looking for are entangled in a bunch of repetitive UI setup code. To address this we are aiming to more strictly separate the view and controller aspects of the QT frontend.
+- Python files should always follow the [**PEP 8**](https://peps.python.org/pep-0008/) style guide conventions, unless specifically allowed otherwise.
+    - The most notable exception in our project is the line length limit of **100** characters, which is enforced via ruff.
+    - Internal Qt methods also use `camelCase` instead of `snake_case`, so overrides of those are commonly seen in the codebase.
+- Classes and attributes considered to be "[private](https://docs.python.org/3/tutorial/classes.html#private-variables)" should be prepended with a **single underscore** (e.g. `_internal_method()`).
+    - If _functionally necessary_, an attribute name may be prepended with a double underscore to trigger "[name mangling](https://docs.python.org/3/reference/expressions.html#private-name-mangling)" (e.g. `__mangled_method()`).
+- Classes and methods should contain [Google style](https://google.github.io/styleguide/pyguide.html#s3.8-comments-and-docstrings) docstrings _(this style is enforced via ruff)_.
+- Lists and JSON keys should be ordered by their [natural sort order](https://en.wikipedia.org/wiki/Natural_sort_order) unless otherwise specified or readily indicated.
+- Some files have some or all of their attributes sorted. Please respect any established patterns like these in files you modify.
 
-The general structure of the QT code base should look like this:
+---
 
+## :material-filter-cog: Modules & Systems
+
+### :fontawesome-brands-python: Python Modules
+
+- Use `Pathlib` library instead of `os.path`
+- Use `platform.system()` instead of `os.name` or `sys.platform`
+- Avoid nested f-strings
+
+### :material-tag: TagStudio Systems
+
+- Translation keys can be accessed via bracket notation (e.g. `Translations["translation_key"]`) or with the `Translations.format()` method when a value needs to be passed to a placeholder in the translation.
+- Avoid passing around the `QtDriver` class where possible. Instead, pass only the necessary components such as the `Library` and `GlobalSettings` instances.
+- Use HTML-like tags inside strings over explicit stylesheets where possible. The `Style` class provides several handy methods for formatting text with these.
+- Use the `format` method in the stylesheets class to format text headers.
+
+---
+
+## :material-folder-file: Project Layout
+
+### :material-engine: Core <small>Backend</small>
+
+Code that is integral to the core functionality of TagStudio and is UI-independent belongs under the `core/` directory. It's possible that some code that serves the UI can go here, as long as its purpose is to serve _any_ UI and is independent from Qt (e.g. file preview rendering).
+
+```yaml title="Core Backend Directory Example"
+core/
+│
+├── library/ # The TagStudio library system
+│   │
+│   ├── alchemy/ # Current SQLite backend w/ SQLAlchemy ORM
+│   │
+│   ├── json/ # Read-only legacy JSON library system, kept for migrations
+│   │
+│   ├── query_lang/ # The query parser
+│   │
+│   │   # Library files that do not involve the SQLAlchemy ORM
+│   │   # NOTE: Future Non-SQLAlchemy library files will be placed here
+│   ├── refresh.py
+│   └── ...
+│
+└── utils/ # Utility classes and functions for the core
 ```
-qt
-├── controllers
-│   ├── widgets
-│   │   └── preview_panel_controller.py
-│   └── main_window_controller.py
-├── views
-│   ├── widgets
-│   │   └── preview_panel_view.py
-│   └── main_window_view.py
-├── ts_qt.py
-└── mixed.py
-```
-
-In this structure there are the `views` and `controllers` sub-directories. They have the exact same structure and for every `<component>_view.py` there is a `<component>_controller.py` at the same location in the other subdirectory and vice versa.
-
-Typically the classes should look like this:
-
-```py
-# my_cool_widget_view.py
-class MyCoolWidgetView(QWidget):
-    def __init__(self):
-        super().__init__()
-        self.__button = QPushButton()
-        self.__color_dropdown = QComboBox()
-        # ...
-        self.__connect_callbacks()
-
-    def __connect_callbacks(self):
-        self.__button.clicked.connect(self._button_click_callback)
-        self.__color_dropdown.currentIndexChanged.connect(
-            lambda idx: self._color_dropdown_callback(self.__color_dropdown.itemData(idx))
-        )
-
-    def _button_click_callback(self):
-        raise NotImplementedError()
-```
-
-```py
-# my_cool_widget_controller.py
-class MyCoolWidget(MyCoolWidgetView):
-    def __init__(self):
-        super().__init__()
-
-    def _button_click_callback(self):
-        print("Button was clicked!")
-
-    def _color_dropdown_callback(self, color: Color):
-        print(f"The selected color is now: {color}")
-```
-
-Observe the following key aspects of this example:
-
-- The Controller is just called `MyCoolWidget` instead of `MyCoolWidgetController` as it will be directly used by other code
-- The UI elements are in private variables
-    - This enforces that the controller shouldn't directly access UI elements
-    - Instead the view should provide a protected API (e.g. `_get_color()`) for things like setting/getting the value of a dropdown, etc.
-    - Instead of `_get_color()` there could also be a `_color` method marked with `@property`
-- The callback methods are already defined as protected methods with NotImplementedErrors
-    - Defines the interface the callbacks
-    - Enforces that UI events be handled
 
 <!-- prettier-ignore -->
-!!! tip
-    A good (non-exhaustive) rule of thumb is: If it requires a non-UI import, then it doesn't belong in the `*_view.py` file.
+!!! danger "Read-Only Legacy Code"
+    **Do not modify** legacy library code in the `src/core/library/json/` directory!
 
-[^1]: For an explanation of the Model-View-Controller (MVC) Model, checkout this article: [MVC Framework Introduction](https://www.geeksforgeeks.org/mvc-framework-introduction/).
+---
+
+### :material-button-cursor: App UI <small>Frontend</small>
+
+The application UI code is stored in the `qt/` directory, and contains all code specific to the Qt frontend. Qt widgets are built using an [MVC](https://www.geeksforgeeks.org/software-engineering/mvc-framework-introduction/) pattern, which is described in-depth below:
+
+#### MVC Pattern
+
+- **Models** are usually just objects from the [library](#core-backend).
+    - The **controller** interacts with these, the _view_ does **not**.
+- **Views** are Qt layout classes that **_only_** contain the **layout** and **styling** for one or more widgets.
+    - Class names are appended with `View`, and filenames appended with `_view`.
+    - Not to be used standalone, but as the layouts for one or more controllers.
+    - Some logic is acceptable in these classes if it serves to modularize the layout and allows controllers to influence how the layout is initialized.
+    - **Reusable Layouts**
+        - If a layout class is **_not meant_** to act as a view but instead be a generic layout, it belongs in the `views/layouts/` directory and the file should be appended with `_layout`.
+    - **Styling Classes**
+        - If a class is purely a source of reusable styling, it belongs in the `views/styles/` directory.
+
+- **Controllers** are complete widgets or base classes for complete widgets.
+    - Controller files simply take on the name of the final widget they create.
+        - This also creates naming parity with other widgets that simply extend existing Qt widgets with additional logic.
+
+```yaml title="Qt Frontend Directory Example"
+qt/
+│
+├── controllers/ # Widgets implementing views or extending other widgets
+│   ├── tag_suggest_box.py # Extends from `suggest_box.py`
+│   ├── suggest_box.py # Implements `suggest_box_view.py`
+│   ├── main_window.py
+│   └── ...
+│
+├── mixed/ # Files yet to be refactored into controllers and views
+│
+├── views/ # Everything related to widget layouts and appearances
+│   │
+│   ├── layouts/ # Layouts meant to be reused on their own inside other layouts
+│   │   ├── flow_layout.py
+│   │   └── ...
+│   │
+│   ├── styles/ # Classes specific for styling
+│   │   ├── palette.py
+│   │   ├── stylesheets.py
+│   │   └── ...
+│   │
+│   │   # Views (layouts) that get implemented by controllers (widgets)
+│   ├── main_window_view.py
+│   ├── suggest_box_view.py
+│   └── ...
+│
+│   # Frontend classes that aren't related to widgets, like managers
+├── resource_manager.py
+├── cache_manager.py
+├── ts_qt.py # Qt Driver
+└── ...
+```
+
+<!-- prettier-ignore -->
+!!! warning "Pre-MVC UI Code"
+    **Do not add** new files to the `qt/mixed/` directory! These files have yet to to be refactored per the current MVC style guidelines and the directory will be **removed** once those migrations have concluded.
+
+Observe the following key aspects of the example below:
+
+- The **view** extends from a Qt layout class, and the **controller** simply extends from QWidget.
+- The **controller** is just called `MyCoolWidget` instead of `MyCoolWidgetController` as it will be directly used by other code.
+- The **view's** widgets that are intended to be controlled by the controller are **public**, while the **controller's** methods are largely **private**.
+
+<!-- prettier-ignore -->
+!!! example "MVC-Separated Widget Example"
+
+    ```py title="views/my_cool_widget_view.py"
+    class MyCoolWidgetView(QVBoxLayout):
+        def __init__(self):
+            super().__init__()
+            self.button = QPushButton()
+            self.color_dropdown = QComboBox()
+
+            self.addWidget(self.button)
+            self.addWidget(self.color_dropdown)
+    ```
+
+    ```py title="controllers/my_cool_widget.py"
+    class MyCoolWidget(QWidget):
+        def __init__(self):
+            super().__init__()
+            self.setLayout(MyCoolWidgetView())
+            self._connect_callbacks()
+
+        def _connect_callbacks(self):
+            self.layout().button.clicked.connect(self._button_click_callback)
+            self.layout().color_dropdown.currentIndexChanged.connect(
+            lambda idx: self._color_dropdown_callback(self.color_dropdown.itemData(idx)))
+
+        def _button_click_callback(self):
+            print("Button was clicked!")
+
+        def _color_dropdown_callback(self, color: Color):
+            print(f"The selected color is now: {color}")
+    ```
+
+<!-- prettier-ignore -->
+!!! tip "Tip for Logic Placement"
+    A good rule of thumb is: If there's **conditional logic** after a widget has been created, it should probably go in a **controller**.
+
+---
+
+## :material-file-document: Documentation
+
+Documentation contributions include anything inside the `docs/` folder as well as the `README.md`. Documentation inside the `docs/` folder is built and hosted on our static documentation site, [docs.tagstud.io](https://docs.tagstud.io/). Some files such as the `CHANGELOG.md`, `CONTRIBUTING.md`, and `STYLE.md` are symlinked in the repo root from the `docs/` folder.
+
+- Use "[dash-case / kebab-case](https://developer.mozilla.org/en-US/docs/Glossary/Kebab_case)" for file and folder names
+- Follow the folder structure pattern
+- Don't add images or other media with excessively large file sizes
+- Provide alt text for embedded media
+- Use "[Title Case](https://apastyle.apa.org/style-grammar-guidelines/capitalization/title-case)" for title capitalization
+
+---
+
+## :material-translate: Translations
+
+Translations are performed on the TagStudio [Weblate project](https://hosted.weblate.org/projects/tagstudio/).
+
+- Do not change text inside placeholders
+- Do not change the style tags inside translations
+- Use the glossary for term definitions

docs/stylesheets/extra.css

@@ -3,11 +3,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 /* Dark Theme */
+
 [data-md-color-scheme="slate"] {
+    --md-primary-fg-color: rgb(197, 110, 255);
+    --md-accent-fg-color: rgb(92, 222, 255);
     --md-default-bg-color: #060617;
     --md-default-fg-color: #eae1ff;
-    --md-default-fg-color--light: #b898ff;
-    --md-code-fg-color: #eae1ffcc;
+    --md-default-fg-color--light: #c2a5ff;
+    --md-code-fg-color: #d8c7ffcc;
     --md-code-hl-string-color: rgb(92, 255, 228);
     --md-code-hl-keyword-color: rgb(61, 155, 255);
     --md-code-hl-constant-color: rgb(205, 78, 255);
@@ -17,6 +20,8 @@
 
 /* Light Theme */
 [data-md-color-scheme="default"] {
+    --md-primary-fg-color: #7758ff;
+    --md-accent-fg-color: rgb(22, 166, 255);
     --md-default-fg-color--light: #090a26;
 }
 
@@ -68,11 +73,20 @@
     border-color: #ffffff33;
 }
 
+img {
+    border-radius: 6px;
+}
+
 th,
 td {
     padding: 0.5em 1em 0.5em 1em !important;
 }
 
+hr {
+    border-bottom-width: 2px !important;
+    border-color: #9988ff50 !important;
+}
+
 .md-typeset ul li ul {
     margin-top: 0;
     margin-bottom: 0.1rem;
@@ -119,6 +133,18 @@ h2,
     margin-right: -0.8rem;
 }
 
+.md-code__nav,
+.md-content__button,
+.headerlink {
+    border-radius: 0.2rem;
+    background: none;
+    color: #9988ff50 !important;
+}
+
+.md-code__nav:hover {
+    background-color: #9988ff50;
+}
+
 figcaption {
     margin-top: 0 !important;
 }
@@ -149,6 +175,51 @@ td code {
     padding: 0 !important;
 }
 
+.admonition {
+    border-radius: 0.4rem !important;
+    border-width: 2px !important;
+}
+
+.highlight > .filename {
+    border-width: 2px !important;
+    border: solid;
+    border-color: #9988ff10 !important;
+    border-radius: 0.4rem 0.4rem 0 0 !important;
+}
+
+code {
+    border-radius: 0.4rem !important;
+    border-width: 2px !important;
+    border: solid;
+    border-color: #9988ff10;
+}
+
+:is(span, ul, li, td, p, a) > code {
+    border-width: 1px !important;
+    border-radius: 0.1rem !important;
+}
+
+.filename + pre > code {
+    border-top-width: 0 !important;
+    border-radius: 0 0 0.4rem 0.4rem !important;
+}
+
+.tabbed-labels.tabbed-labels--linked {
+    padding-left: 0.4rem;
+    padding-right: 0.4rem;
+    box-shadow: none !important;
+}
+
+.admonition-title {
+    font-size: 0.7rem;
+    font-family: "Bai Jamjuree", Roboto, sans-serif;
+    font-weight: 600 !important;
+}
+
+.admonition-title span {
+    margin-top: 0.05rem !important;
+}
+
 /* Matches the palette used by mkdocs-material */
 .priority-high {
     color: #f1185a;

docs/stylesheets/home.css

@@ -29,3 +29,30 @@ h2 {
         margin-right: 0;
     }
 }
+
+.grid.cards > ul > li {
+    border-radius: 0.4rem !important;
+    border-width: 2px !important;
+    border-color: #9988ff20 !important;
+}
+
+.md-button--primary {
+    margin: 1rem;
+    padding: 0.3rem 1.2rem !important;
+    border-radius: 0.4rem !important;
+    font-size: 1rem;
+    font-family: "Bai Jamjuree", Roboto, sans-serif;
+    background: linear-gradient(60deg, rgb(205, 78, 255) 0%, rgb(116, 123, 255) 100%);
+    border-style: solid;
+    border-width: 0 0 2px 0 !important;
+    border-color: #ffffff33 !important;
+}
+
+.md-button--primary:hover {
+    background: linear-gradient(60deg, rgb(205, 78, 255) 30%, rgb(116, 123, 255) 100%);
+    border-color: #ffffff55 !important;
+}
+
+.md-button--primary span {
+    margin-top: 0.1rem !important;
+}

docs/tags.md

@@ -116,12 +116,10 @@ Due to the nature of how tags and Tag Felids operated prior to v9.5, the organiz
 
 #### Is Hidden
 
-<!-- prettier-ignore -->
-!!! warning ""
-    **_Coming in version 9.6.x_**
-
 When the "Is Hidden" property is checked, any file entries tagged with this tag will not show up in searches by default. This property comes by default with the built-in "Archived" tag.
 
+---
+
 ## Tag Search Examples
 
 The following are examples of how a set of given tags will respond to various search queries.

docs/usage.md

@@ -17,47 +17,93 @@ To create or open a [library](libraries.md), go to **File -> Open/Create Library
 TagStudio automatically scans for new or updated files when opening a library by default. Manually refresh by going to **File -> Refresh Directories** in the menu or by using <kbd>Ctrl</kbd>+<kbd>R</kbd> (<kbd>⌘ Command </kbd>+<kbd>R</kbd> on macOS).
 
 <!-- prettier-ignore -->
-!!! tip "TagStudio Libraries"
+!!! abstract "TagStudio Libraries"
     To learn more about how TagStudio libraries work and how to use them, visit the **[Libraries](libraries.md)** page.
 
-## Adding Tags to File Entries
+---
 
-Access the "Add Tag" search box by either clicking on the "Add Tag" button at the bottom of the right sidebar, accessing the "Add Tags to Selected" option from the File menu, or by pressing <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>T</kbd>.
+## :material-tag-text: Tagging
 
-From here you can search for existing tags or create a new one if the one you're looking for doesn't exist. Click the "+" button next to any tags you want to the currently selected file entries. To quickly add the top result, press the <kbd>Enter</kbd>/<kbd>Return</kbd> key to add the topmost tag and reset the tag search. Press <kbd>Enter</kbd>/<kbd>Return</kbd> once more to close the dialog box. By using this method, you can quickly add various tags in quick succession just by using the keyboard!
+With one or more file entries selected, you can **search for** or **create a new tag** by clicking the "Add Tag" button at the bottom of the preview panel or by pressing <kbd>Ctrl</kbd>+<kbd>T</kbd>.
 
-To remove a tag from a file entry, hover over the tag in the preview panel and click on the "-" icon that appears.
+This will open the the **"Tag Bar"**, a combination search/creation bar that is designed to allow you to quickly create and apply tags that don't exist yet, find and apply existing tags in your library, and verify if certain tags already exist and/or are applied to your selection.
 
-## Adding Metadata to File Entries
+Every step is keyboard-friendly, allowing for an efficient tagging "flow state" when it comes to creating and applying tags.
 
-To add a metadata field to a file entry, start by clicking the "Add Field" button at the bottom of the preview panel. From the dropdown menu, select the type of metadata field you’d like to add to the entry
+<figure markdown="span">
+  ![Empty File Entry](assets/tag_field_bars/add_buttons_normal.png){ width=80% }
+  <br>
+  ![Empty File Entry](assets/tag_field_bars/tag_bar_empty.png){ width=80% }
+  <figcaption>Clicking "Add Tag" or pressing <kbd>Ctrl</kbd>+<kbd>T</kbd> replaces the "Add" buttons with a tag search bar. Pressing <kbd>Esc</kbd> (or <kbd>Enter</kbd> with a blank search) will close the bar and return the "Add" buttons.</figcaption>
+</figure>
 
-## Editing Metadata Fields
+<!-- prettier-ignore -->
+!!! note "Classic Tag Search Panel"
+    You can access the classic tag search panel by going to **File -> Add Tag to Selected** in the menu bar, or by pressing <kbd>Shift</kbd>+<kbd>Ctrl</kbd>+<kbd>T</kbd>. Note that this panel will change and move in the future, becoming part of a set of dockable side-panels for tagging that can stay open between making selections. See the [roadmap](./roadmap.md#uiux) for more info.
 
-### Text Line / Text Box
+### :material-tag-plus: Tag Bar: Creating Tags
 
-Hover over the field and click the pencil icon. From there, add or edit text in the dialog box popup.
+Type to search for an existing tag, or use that search term to quickly create and apply a new tag to your selection. Pressing <kbd>Enter</kbd> with **no results** will **create** a tag from your search query and apply it to the selected entries.
 
-## Creating Tags
+After applying a tag, the "Add Tag" button is now focused, allowing you to press <kbd>Enter</kbd> or <kbd>Space</kbd> to quickly reactivate the bar. Alternatively, you may edit your new tag by right-clicking the tag and selecting **"Edit"**.
 
-Create a new tag by accessing the "New Tag" option from the Edit menu or by pressing <kbd>Ctrl</kbd>+<kbd>T</kbd>. In the tag creation panel, enter a tag name, optional shorthand name, optional tag aliases, optional parent tags, and an optional color.
+Tags can be also viewed, created, edited, or deleted from the **Edit -> Manage Tags** window.
 
-- The tag **name** is the base name of the tag. **_This does NOT have to be unique!_**
-- The tag **shorthand** is a special type of alias that displays in situations where screen space is more valuable, notably with name disambiguation.
-- **Aliases** are alternate names for a tag. These let you search for terms other than the exact tag name in order to find the tag again.
-- **Parent Tags** are tags in which this tag can substitute for in searches. In other words, tags under this section are parents of this tag.
-    - Parent tags with the disambiguation check next to them will be used to help disambiguate tag names that may not be unique.
-    - For example: If you had a tag for "Freddy Fazbear", you might add "Five Nights at Freddy's" as one of the parent tags. If the disambiguation box is checked next to "Five Nights at Freddy's" parent tag, then the tag "Freddy Fazbear" will display as "Freddy Fazbear (Five Nights at Freddy's)". Furthermore, if the "Five Nights at Freddy's" tag has a shorthand like "FNAF", then the "Freddy Fazbear" tag will display as "Freddy Fazbear (FNAF)".
-- The **color** option lets you select an optional color palette to use for your tag.
-- The **"Is Category"** property lets you treat this tag as a category under which itself and any child tags inheriting from it will be sorted by inside the preview panel.
+<figure markdown="span">
+  ![Empty File Entry](assets/tag_field_bars/tag_bar_new.png){ width=80% }
+  <figcaption>A tag named "Cube" does not exist yet, and will be created and applied to the selection when <kbd>Enter</kbd> is pressed.</figcaption>
+  ![Empty File Entry](assets/tag_field_bars/tag_button_highlighted.png){ width=80% }
+  <figcaption>The new tag "Cube" has been created and applied to our selection.</figcaption>
+</figure>
 
-### Tag Manager
+<!-- prettier-ignore -->
+!!! tip "Optionally Always Edit New Tags"
+    If you prefer opening an "Edit" window for tags after creating them and before they get applied to your selection, you can toggle this option on by right-clicking the search bar and clicking **"Edit After Creating a New Tag"**, or by visiting the same setting in the **Settings** window. By default, this option is **off.**
 
-You can manage your library of tags by opening the "Tag Manager" panel from Edit -> "Manage Tags". From here you can create, search for, edit, and permanently delete any tags you've created in your library.
+### :material-tag-search: Tag Bar: Searching for Tags
 
-## Editing Tags
+Pressing <kbd>Enter</kbd> with **one or more results** will **apply the first tag** to your selection (assuming it's not already on your selection).
 
-To edit a tag, click on it inside the preview panel or right-click the tag and select "Edit Tag" from the context menu.
+Tags that are already present on your entries will be greyed out and ignored when pressing <kbd>Enter</kbd>. This lets you visually confirm that a tag already exists and has been applied to the selection.
+
+<figure markdown="span">
+  ![Empty File Entry](assets/tag_field_bars/tag_bar_search_match.png){ width=80% }
+  <figcaption>On a new selected entry, typing "Cube" will find our existing tag.</figcaption>
+  ![Empty File Entry](assets/tag_field_bars/tag_bar_search_match_greyed.png){ width=80% }
+  <figcaption>If the matched tag is already applied to the selected entries, it will be greyed out and ignored when pressing <kbd>Enter</kbd>.</figcaption>
+</figure>
+
+#### :material-tag-arrow-up: Force Create Tag
+
+Holding <kbd>Shift</kbd> while pressing <kbd>Enter</kbd> will **force create** a tag from the search bar text, regardless of the results. This is indicated by the first tag in the results becoming greyed out. This is especially useful when you need to create a new tag with a name that partially overlaps with an existing tag's name.
+
+<figure markdown="span">
+  ![Empty File Entry](assets/tag_field_bars/tag_bar_shift_off.png){ width=80% }
+  <figcaption>Pressing <kbd>Enter</kbd> will apply the underlined tag, "Cube".</figcaption>
+  ![Empty File Entry](assets/tag_field_bars/tag_bar_shift_on.png){ width=80% }
+  <figcaption>With <kbd>Shift</kbd> held, pressing <kbd>Enter</kbd> will <b>create a new tag</b> called "Cub".</figcaption>
+</figure>
+
+---
+
+## :material-text-box: Creating and Adding Fields
+
+[Fields](./fields.md) are extra pieces of information you can add to file entries, such as titles, comments, notes, specific dates or times. Unlike tags, fields are based on [templates](./fields.md#field-templates) that contain pre-filled information such as the field type and title, and that information is _copied_ to fields when adding them to entries. Editing field information on entries **does not** modify the template it was created from.
+
+Creating and adding fields to entries is extremely similar to [how it works for tags](#tagging), with a few notable differences:
+
+- Click "Add Field" or press <kbd>Ctrl</kbd>+<kbd>L</kbd> to open the field bar.
+- The same template can by applied to an entry any number of times.
+- New field templates are automatically edited after being created, since they have a type that must be chosen before they can be used.
+    - This is separate from the option to automatically edit a field's _contents_ once a field has been added to an entry
+- Editing a field's contents immediately after it's added to an entry is **enabled** by default, and can be toggled by right-clicking the search bar and clicking **"Edit After Adding a Field"**, or by visiting the same setting in the **Settings** window.
+
+<figure markdown="span">
+  ![Empty File Entry](assets/tag_field_bars/field_bar_search.png){ width=80% }
+  <figcaption>Searching for field templates inside the field bar.</figcaption>
+</figure>
+
+---
 
 ## Relinking Moved Files
 
@@ -71,9 +117,7 @@ Inevitably some of the files inside your library will be renamed, moved, or dele
 !!! warning
     If multiple matches for a moved file are found (matches are currently defined as files with a matching filename as the original), TagStudio will currently ignore the match groups. Adding a GUI for manual selection, as well as smarter automated relinking, are high priorities for future versions.
 
-### Saving the Library
-
-As of version 9.5, libraries are saved automatically as you go. To save a backup of your library, select File -> Save Library Backup from the menu bar.
+---
 
 ## Launch Arguments
 

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1763759067,
-        "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
+        "lastModified": 1782949081,
+        "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
+        "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1763835633,
-        "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=",
+        "lastModified": 1785571196,
+        "narHash": "sha256-KoTsyMQqnXQZq8deCEnu4QkyldkwH/bpMMhUcfMdGIw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "050e09e091117c3d7328c7b2b7b577492c43c134",
+        "rev": "148bab9c1c3c53136ecb44a6ea356a0ed5b39b06",
         "type": "github"
       },
       "original": {

flake.nix

@@ -1,7 +1,6 @@
 # SPDX-FileCopyrightText: (c) TagStudio Contributors
 # SPDX-License-Identifier: GPL-3.0-only
 
-
 {
   description = "TagStudio";
 

nix/package/default.nix

@@ -1,7 +1,6 @@
 # SPDX-FileCopyrightText: (c) TagStudio Contributors
 # SPDX-License-Identifier: GPL-3.0-only
 
-
 {
   ffmpeg-headless,
   lib,
@@ -84,8 +83,10 @@ python3Packages.buildPythonApplication {
     "py7zr"
     "pyside6"
     "rarfile"
+    "rawpy"
     "requests"
     "semver"
+    "Send2Trash"
     "structlog"
     "typing-extensions"
   ];
@@ -96,7 +97,7 @@ python3Packages.buildPythonApplication {
     with python3Packages;
     [
       audioop-lts
-      chardet
+      chardet_5
       ffmpeg-python
       humanfriendly
       mutagen
@@ -130,6 +131,7 @@ python3Packages.buildPythonApplication {
     "test_close_library" # TODO: Look into segfault.
     "test_flow_layout_happy_path"
     "test_get" # TODO: Look further into, might be possible to run.
+    "test_github_api_unavailable"
     "test_json_migration"
     "test_library_migrations"
     "test_update_tags"

nix/package/pillow-jxl-plugin.nix

@@ -1,7 +1,6 @@
 # SPDX-FileCopyrightText: (c) TagStudio Contributors
 # SPDX-License-Identifier: GPL-3.0-only
 
-
 {
   buildPythonPackage,
   cmake,

nix/package/pyexiv2.nix

@@ -1,7 +1,6 @@
 # SPDX-FileCopyrightText: (c) TagStudio Contributors
 # SPDX-License-Identifier: GPL-3.0-only
 
-
 {
   autoPatchelfHook,
   buildPythonPackage,

nix/shell.nix

@@ -1,7 +1,6 @@
 # SPDX-FileCopyrightText: (c) TagStudio Contributors
 # SPDX-License-Identifier: GPL-3.0-only
 
-
 {
   lib,
   pkgs,
@@ -28,11 +27,11 @@ let
         libdrm
         libpulseaudio
         libva
+        libx11
         libxkbcommon
+        libxrandr
         pipewire
         qt6.qtwayland
-        xorg.libX11
-        xorg.libXrandr
       ]
     );
 
@@ -74,18 +73,17 @@ let
   };
 in
 pkgs.mkShellNoCC {
-  nativeBuildInputs = with pkgs; [
-    coreutils
-    uv
-
-    ruff
-  ];
-  buildInputs = [
+  packages = [
     python3Wrapped
   ]
   ++ (with pkgs; [
+    coreutils
     ffmpeg-headless
     ripgrep
+    uv
+
+    pyright
+    ruff
   ]);
 
   env = {
@@ -120,7 +118,7 @@ pkgs.mkShellNoCC {
 
       if [ ! -f "''${venv}"/pyproject.toml ] || ! diff --brief pyproject.toml "''${venv}"/pyproject.toml >/dev/null; then
           printf '%s\n' 'Installing dependencies, pyproject.toml changed...' >&2
-          uv pip install --quiet --editable '.[mkdocs,mypy,pre-commit,pytest]'
+          uv pip install --quiet --editable . --group docs --group extra --group test
           cp pyproject.toml "''${venv}"/pyproject.toml
       fi
 

properdocs.yml

@@ -32,9 +32,8 @@ extra:
 nav:
   - Home:
       - index.md
-  - Getting Started:
+  - Installing:
       - install.md
-      - usage.md
       - Developers:
           - developing.md
           - contributing.md
@@ -42,6 +41,7 @@ nav:
       - Help:
           - help/ffmpeg.md
   - Using TagStudio:
+      - usage.md
       - libraries.md
       - entries.md
       - preview-support.md
@@ -70,16 +70,16 @@ theme:
     # Palette toggle for light mode
     - media: "(prefers-color-scheme: light)"
       scheme: default
-      primary: purple
-      accent: purple
+      primary: custom
+      accent: custom
       toggle:
         icon: material/lightbulb
         name: Switch to Dark Mode
     # Palette toggle for dark mode
     - media: "(prefers-color-scheme: dark)"
       scheme: slate
-      primary: purple
-      accent: purple
+      primary: custom
+      accent: custom
       toggle:
         icon: material/lightbulb-night-outline
         name: Switch to System Preference

pyproject.toml

@@ -9,7 +9,7 @@ build-backend = "hatchling.build"
 [project]
 name = "TagStudio"
 description = "A User-Focused Photo & File Management System."
-version = "9.6.0"
+version = "9.6.2"
 license = "GPL-3.0-only"
 readme = "README.md"
 requires-python = ">=3.12,<3.14"
@@ -30,7 +30,7 @@ dependencies = [
     "PySide6==6.8.0.*",
     "rarfile==4.2",
     "rawpy~=0.27",
-    "Send2Trash~=1.8",
+    "Send2Trash>=1.8,<3",
     "SQLAlchemy~=2.0",
     "srctools~=2.6",
     "structlog~=25.3",
@@ -42,12 +42,32 @@ dependencies = [
     "semver~=3.0.4",
 ]
 
-[project.optional-dependencies]
-dev = ["tagstudio[mkdocs,pyright,pre-commit,pyinstaller,pytest,ruff]"]
-mkdocs = ["mkdocs-material[imaging]>=9.7", "mkdocs-redirects~=1.2"]
-pyright = ["pyright~=1.1.409"]
+[project.gui-scripts]
+tagstudio = "tagstudio.main:main"
+
+[dependency-groups]
+all = [
+    { include-group = "check" },
+    { include-group = "build" },
+    { include-group = "docs" },
+    { include-group = "extra" },
+]
+check = [{ include-group = "lint" }, { include-group = "test" }]
+
+build = [{ include-group = "pyinstaller" }]
+docs = [{ include-group = "mkdocs" }]
+extra = [{ include-group = "pre-commit" }]
+lint = [{ include-group = "pyright" }, { include-group = "ruff" }]
+test = [{ include-group = "pytest" }]
+
+mkdocs = [
+    "mkdocs-material[imaging]>=9.7",
+    "mkdocs-redirects~=1.2",
+    "properdocs",
+]
 pre-commit = ["pre-commit~=4.2"]
 pyinstaller = ["Pyinstaller~=6.21"]
+pyright = ["pyright~=1.1.409"]
 pytest = [
     "pytest==9.0.3",
     "pytest-cov==6.1.1",
@@ -57,26 +77,26 @@ pytest = [
 ]
 ruff = ["ruff==0.15.17"]
 
-[project.gui-scripts]
-tagstudio = "tagstudio.main:main"
-
 [tool.hatch.build.targets.wheel]
 packages = ["src/tagstudio"]
 
-
-[tool.pytest.ini_options]
-#addopts = "-m 'not qt'"
+[tool.pytest]
 qt_api = "pyside6"
 pythonpath = ["src"]
+filterwarnings = [
+    "ignore:DISTINCT ON is currently supported only by the PostgreSQL dialect:sqlalchemy.exc.SADeprecationWarning",
+    'ignore:Invoking or_\(\) without arguments is deprecated:sqlalchemy.exc.SADeprecationWarning',
+]
 
 [tool.pyright]
 ignore = [
     ".venv/**",
     "src/tagstudio/core/library/json/",
-    "src/tagstudio/qt/previews/vendored/pydub/",
+    "src/tagstudio/renderers/vendored/pydub/",
 ]
 include = ["src/tagstudio", "tests"]
-# reference for the settings here: https://github.com/microsoft/pyright/blob/main/docs/configuration.md
+# Reference for the settings here: https://github.com/microsoft/pyright/blob/main/docs/configuration.md
+# Some rules exclusive to basedpyright: https://docs.basedpyright.com/latest/benefits-over-pyright/new-diagnostic-rules/
 reportAny = false
 reportIgnoreCommentWithoutRule = false
 reportImplicitStringConcatenation = false
@@ -101,7 +121,7 @@ ignore = ["D100", "D101", "D102", "D103", "D104", "D105", "D106", "D107"]
 
 [tool.ruff.lint.per-file-ignores]
 "tests/**" = ["D", "E402"]
-"src/tagstudio/qt/previews/vendored/**" = ["B", "E", "N", "UP", "SIM115"]
+"src/tagstudio/renderers/vendored/**" = ["B", "E", "N", "UP", "SIM115"]
 
 [tool.ruff.lint.pydocstyle]
 convention = "google"

scripts/semver-segments.pl

@@ -0,0 +1,14 @@
+#!/usr/bin/env perl
+# SPDX-FileCopyrightText: (c) TagStudio Contributors
+# SPDX-License-Identifier: CC0-1.0
+
+use strict;
+use warnings;
+use feature 'say';
+
+# From: https://regex101.com/r/vkijKf/1
+if (($ARGV[0] // <STDIN>) =~ /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/) {
+    foreach my $index (0 .. $#{^CAPTURE}) {
+        say ${^CAPTURE}[$index] // "";
+    }
+}

scripts/tagstudio.spec

@@ -1,16 +1,22 @@
+#!/usr/bin/env -S python -m PyInstaller
+# vi: ft=python
 # SPDX-FileCopyrightText: (c) TagStudio Contributors
 # SPDX-License-Identifier: GPL-3.0-only
 
 
+import argparse
 import platform
 from argparse import ArgumentParser
+from pathlib import Path
+from tomllib import load
 
 from PyInstaller.building.api import COLLECT, EXE, PYZ
 from PyInstaller.building.build_main import Analysis
 from PyInstaller.building.osx import BUNDLE
-from tomllib import load
 
 parser = ArgumentParser()
+# HACK: Without this, the script will fail if empty arguments are passed.
+parser.add_argument("_", nargs="*", help=argparse.SUPPRESS)
 parser.add_argument("--portable", action="store_true")
 options = parser.parse_args()
 
@@ -19,23 +25,24 @@ with open("pyproject.toml", "rb") as file:
 
 system = platform.system()
 
+project_root = Path("..", "src/tagstudio")
 name = pyproject["name"] if system == "Windows" else "tagstudio"
 icon = None
 if system == "Windows":
-    icon = "src/tagstudio/resources/icon.ico"
+    icon = Path(project_root, "resources/icon.ico")
 elif system == "Darwin":
-    icon = "src/tagstudio/resources/icon.icns"
+    icon = Path(project_root, "resources/icon.icns")
 
 
 datafiles = [
-    ("src/tagstudio/qt/*.json", "tagstudio/qt"),
-    ("src/tagstudio/qt/*.qrc", "tagstudio/qt"),
-    ("src/tagstudio/resources", "tagstudio/resources"),
+    (f"{project_root}/qt/*.json", "tagstudio/qt"),
+    (f"{project_root}/qt/*.qrc", "tagstudio/qt"),
+    (f"{project_root}/resources", "tagstudio/resources"),
 ]
 
 a = Analysis(
-    ["src/tagstudio/main.py"],
-    pathex=["src"],
+    [Path(project_root, "main.py")],
+    pathex=[],
     binaries=[],
     datas=datafiles,
     hiddenimports=[],
@@ -100,5 +107,3 @@ if system == "Darwin":
             "NSPrincipalClass": "NSApplication",
         },
     )
-
-# vi: ft=python

src/tagstudio/__main__.py

@@ -0,0 +1,9 @@
+#!/usr/bin/env python3
+# SPDX-FileCopyrightText: (c) TagStudio Contributors
+# SPDX-License-Identifier: GPL-3.0-only
+
+
+from tagstudio.main import main
+
+if __name__ == "__main__":
+    main()

src/tagstudio/core/constants.py

@@ -1,9 +1,10 @@
 # SPDX-FileCopyrightText: (c) TagStudio Contributors
 # SPDX-License-Identifier: GPL-3.0-only
 
+from importlib.metadata import version
 
-VERSION: str = "9.6.0"  # Major.Minor.Patch
-VERSION_BRANCH: str = ""  # Usually "" or "Pre-Release"
+VERSION: str = version("tagstudio")
+BUILD_TYPE: str = ""  # Usually "", "app.nightly", or "app.pre_release"
 COPYRIGHT_YEARS: str = "2021-2026"
 COPYRIGHT: str = f"© {COPYRIGHT_YEARS} Travis Abendshien & TagStudio Contributors"
 COPYRIGHT_COMPACT: str = f"© {COPYRIGHT_YEARS} Travis Abendshien\n& TagStudio Contributors"

src/tagstudio/core/library/alchemy/constants.py

@@ -4,12 +4,17 @@
 
 from sqlalchemy import text
 
+from tagstudio.core.library.alchemy.fields import (
+    DatetimeFieldTemplate,
+    TextFieldTemplate,
+)
+
 SQL_FILENAME: str = "ts_library.sqlite"
 JSON_FILENAME: str = "ts_library.json"
 
 DB_VERSION_CURRENT_KEY: str = "CURRENT"
 DB_VERSION_INITIAL_KEY: str = "INITIAL"
-DB_VERSION: int = 201
+DB_VERSION: int = 300
 
 TAG_CHILDREN_QUERY = text("""
 WITH RECURSIVE ChildTags AS (
@@ -32,3 +37,15 @@ WITH RECURSIVE ChildTags AS (
 )
 SELECT tag_id FROM ChildTags;
 """)
+
+
+DEFAULT_FIELD_TEMPLATES = (
+    TextFieldTemplate(name="Title"),
+    TextFieldTemplate(name="Author"),
+    TextFieldTemplate(name="Artist"),
+    TextFieldTemplate(name="URL"),
+    TextFieldTemplate(name="Description", is_multiline=True),
+    TextFieldTemplate(name="Notes", is_multiline=True),
+    TextFieldTemplate(name="Comments", is_multiline=True),
+    DatetimeFieldTemplate(name="Date"),
+)

src/tagstudio/core/library/alchemy/db.py

@@ -6,12 +6,9 @@ from pathlib import Path
 from typing import override
 
 import structlog
-from sqlalchemy import Dialect, Engine, String, TypeDecorator, create_engine, text
-from sqlalchemy.exc import OperationalError
+from sqlalchemy import Dialect, String, TypeDecorator
 from sqlalchemy.orm import DeclarativeBase
 
-from tagstudio.core.constants import RESERVED_TAG_END
-
 logger = structlog.getLogger(__name__)
 
 
@@ -34,34 +31,3 @@ class PathType(TypeDecorator):
 
 class Base(DeclarativeBase):
     type_annotation_map = {Path: PathType}
-
-
-def make_engine(connection_string: str) -> Engine:
-    return create_engine(connection_string)
-
-
-def make_tables(engine: Engine) -> None:
-    logger.info("[Library] Creating DB tables...")
-    Base.metadata.create_all(engine)
-
-    # tag IDs < 1000 are reserved
-    # create tag and delete it to bump the autoincrement sequence
-    # TODO - find a better way
-    # is this the better way?
-    with engine.connect() as conn:
-        result = conn.execute(text("SELECT SEQ FROM sqlite_sequence WHERE name='tags'"))
-        autoincrement_val = result.scalar()
-        if not autoincrement_val or autoincrement_val <= RESERVED_TAG_END:
-            try:
-                conn.execute(
-                    text(
-                        "INSERT INTO tags "
-                        "(id, name, color_namespace, color_slug, is_category, is_hidden) VALUES "
-                        f"({RESERVED_TAG_END}, 'temp', NULL, NULL, false, false)"
-                    )
-                )
-                conn.execute(text(f"DELETE FROM tags WHERE id = {RESERVED_TAG_END}"))
-                conn.commit()
-            except OperationalError as e:
-                logger.error("Could not initialize built-in tags", error=e)
-                conn.rollback()

src/tagstudio/core/library/alchemy/library.py

@@ -2,11 +2,6 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
 
-# NOTE: This file contains necessary use of deprecated first-party code until that
-# code is removed in a future version (prefs).
-# pyright: reportDeprecated=false
-
-
 import re
 import shutil
 import sys
@@ -18,8 +13,6 @@ from datetime import UTC, datetime
 from os import makedirs
 from pathlib import Path
 from typing import TYPE_CHECKING
-from uuid import uuid4
-from warnings import catch_warnings
 
 import sqlalchemy
 import structlog
@@ -45,7 +38,7 @@ from sqlalchemy import (
     update,
 )
 from sqlalchemy.dialects import sqlite
-from sqlalchemy.exc import IntegrityError
+from sqlalchemy.exc import IntegrityError, OperationalError
 from sqlalchemy.orm import (
     InstanceState,
     Session,
@@ -73,16 +66,13 @@ from tagstudio.core.library.alchemy.constants import (
     DB_VERSION,
     DB_VERSION_CURRENT_KEY,
     DB_VERSION_INITIAL_KEY,
+    DEFAULT_FIELD_TEMPLATES,
     JSON_FILENAME,
     SQL_FILENAME,
     TAG_CHILDREN_QUERY,
 )
-from tagstudio.core.library.alchemy.db import make_tables
-from tagstudio.core.library.alchemy.enums import (
-    MAX_SQL_VARIABLES,
-    BrowsingState,
-    SortingModeEnum,
-)
+from tagstudio.core.library.alchemy.db import Base as ModelBase
+from tagstudio.core.library.alchemy.enums import MAX_SQL_VARIABLES, BrowsingState, SortingModeEnum
 from tagstudio.core.library.alchemy.fields import (
     LEGACY_FIELD_MAP,
     BaseField,
@@ -93,9 +83,9 @@ from tagstudio.core.library.alchemy.fields import (
     TextFieldTemplate,
 )
 from tagstudio.core.library.alchemy.joins import TagEntry, TagParent
+from tagstudio.core.library.alchemy.migrations import DBMigrations, MigrationError
 from tagstudio.core.library.alchemy.models import (
     Entry,
-    Folder,
     Namespace,
     Tag,
     TagAlias,
@@ -106,7 +96,6 @@ from tagstudio.core.library.alchemy.visitors import SQLBoolExpressionBuilder
 from tagstudio.core.library.ignore import migrate_ext_list
 from tagstudio.core.library.json.library import Library as JsonLibrary
 from tagstudio.core.utils.types import unwrap
-from tagstudio.qt.translations import Translations
 
 if TYPE_CHECKING:
     from sqlalchemy import Select
@@ -172,20 +161,6 @@ def get_default_tags() -> tuple[Tag, ...]:
     return archive_tag, favorite_tag, meta_tag
 
 
-def get_default_field_templates() -> tuple[BaseFieldTemplate, ...]:
-    """Return the default field templates for a new TagStudio library."""
-    title = TextFieldTemplate(name="Title")
-    author = TextFieldTemplate(name="Author")
-    artist = TextFieldTemplate(name="Artist")
-    url = TextFieldTemplate(name="URL")
-    description = TextFieldTemplate(name="Description", is_multiline=True)
-    notes = TextFieldTemplate(name="Notes", is_multiline=True)
-    comments = TextFieldTemplate(name="Comments", is_multiline=True)
-    date = DatetimeFieldTemplate(name="Date")
-
-    return title, author, artist, url, description, notes, comments, date
-
-
 # The difference in the number of default JSON tags vs default tags in the current version.
 DEFAULT_TAG_DIFF: int = len(get_default_tags()) - len([TAG_ARCHIVED, TAG_FAVORITE])
 
@@ -234,7 +209,6 @@ class Library:
 
     library_dir: Path | None = None
     engine: Engine | None = None
-    folder: Folder | None = None
     included_files: set[Path] = set()
 
     def __init__(self) -> None:
@@ -247,7 +221,6 @@ class Library:
         if self.engine:
             self.engine.dispose()
         self.library_dir = None
-        self.folder = None
         self.included_files = set()
 
         self.dupe_entries_count = -1
@@ -259,7 +232,6 @@ class Library:
         """Migrate JSON library data to the SQLite database."""
         logger.info("Starting Library Conversion...")
         start_time = time.time()
-        folder: Folder = Folder(path=self.library_dir, uuid=str(uuid4()))
 
         # Tags
         for tag in json_lib.tags:
@@ -312,7 +284,6 @@ class Library:
             [
                 Entry(
                     path=entry.path / entry.filename,
-                    folder=folder,
                     fields=[],
                     id=entry.id + 1,  # NOTE: JSON IDs start at 0 instead of 1
                     date_added=datetime.now(),
@@ -381,20 +352,19 @@ class Library:
             return tag.name
 
     def open_library(self, library_dir: Path, in_memory: bool = False) -> LibraryStatus:
-        """Wrapper for open_sqlite_library.
+        """Wrapper for open_sqlite_library and create_sqlite_library.
 
         Handles in-memory storage and checks whether a JSON-migration is necessary.
         """
         assert isinstance(library_dir, Path)
 
-        if in_memory:
-            return self.open_sqlite_library(library_dir, is_new=True, storage_path=":memory:")
-
-        is_new = True
         sql_path = library_dir / TS_FOLDER_NAME / SQL_FILENAME
-        if self.verify_ts_folder(library_dir) and (is_new := not sql_path.exists()):
-            json_path = library_dir / TS_FOLDER_NAME / JSON_FILENAME
-            if json_path.exists():
+        json_path = library_dir / TS_FOLDER_NAME / JSON_FILENAME
+
+        is_new = not sql_path.exists()
+        if not in_memory:
+            self.verify_ts_folder(library_dir)  # ensure .TagStudio directory exists
+            if is_new and json_path.exists():
                 return LibraryStatus(
                     success=False,
                     library_path=library_dir,
@@ -402,14 +372,17 @@ class Library:
                     json_migration_req=True,
                 )
 
-        return self.open_sqlite_library(library_dir, is_new, str(sql_path))
+        if is_new:
+            return self.create_sqlite_library(library_dir, in_memory)
 
-    def open_sqlite_library(
-        self, library_dir: Path, is_new: bool, storage_path: str
-    ) -> LibraryStatus:
+        return self.open_sqlite_library(library_dir, in_memory)
+
+    def _get_engine(self, library_dir: Path, in_memory: bool, sql_filename: str):
         connection_string = URL.create(
             drivername="sqlite",
-            database=storage_path,
+            database=(
+                ":memory:" if in_memory else str(library_dir / TS_FOLDER_NAME / sql_filename)
+            ),
         )
         # NOTE: File-based databases should use NullPool to create new DB connection in order to
         # keep connections on separate threads, which prevents the DB files from being locked
@@ -418,165 +391,92 @@ class Library:
         # More info can be found on the SQLAlchemy docs:
         # https://docs.sqlalchemy.org/en/20/changelog/migration_07.html
         # Under -> sqlite-the-sqlite-dialect-now-uses-nullpool-for-file-based-databases
-        poolclass = None if storage_path == ":memory:" else NullPool
-        loaded_db_version: int = 0
-        initial_db_version: int = DB_VERSION
+        poolclass = None if in_memory else NullPool
+
+        logger.info(
+            "[Library] Creating SQLAlchemy Engine",
+            connection_string=connection_string,
+            poolclass=poolclass,
+        )
+        return create_engine(
+            connection_string, poolclass=poolclass, connect_args={"autocommit": False}
+        )
+
+    def create_sqlite_library(
+        self, library_dir: Path, in_memory: bool, sql_filename: str = SQL_FILENAME
+    ) -> LibraryStatus:
+        self.engine = self._get_engine(library_dir, in_memory, sql_filename)
 
         logger.info(
             "[Library] Opening SQLite Library",
             library_dir=library_dir,
-            connection_string=connection_string,
         )
-        self.engine = create_engine(connection_string, poolclass=poolclass)
-        with Session(self.engine) as session:
-            # Don't check DB version when creating new library
-            if not is_new:
-                loaded_db_version = self.get_version(DB_VERSION_CURRENT_KEY)
-                initial_db_version = self.get_version(DB_VERSION_INITIAL_KEY)
 
-                # ======================== Library Database Version Checking =======================
-                # DB_VERSION 6 is the first supported SQLite DB version.
-                # If the DB_VERSION is >= 100, that means it's a compound major + minor version.
-                #   - Dividing by 100 and flooring gives the major (breaking changes) version.
-                #   - If a DB has major version higher than the current program, don't load it.
-                #   - If only the minor version is higher, it's still allowed to load.
-                if loaded_db_version < 6 or (
-                    loaded_db_version >= 100 and loaded_db_version // 100 > DB_VERSION // 100
-                ):
-                    mismatch_text = Translations["status.library_version_mismatch"]
-                    found_text = Translations["status.library_version_found"]
-                    expected_text = Translations["status.library_version_expected"]
-                    return LibraryStatus(
-                        success=False,
-                        message=(
-                            f"{mismatch_text}\n"
-                            f"{found_text} v{loaded_db_version}, "
-                            f"{expected_text} v{DB_VERSION}"
-                        ),
+        logger.info("[Library] Creating DB tables...")
+        with self.engine.connect() as conn:
+            ModelBase.metadata.create_all(conn)
+            conn.commit()
+
+            # TODO - find a better way
+            # is this the better way?
+            # Could we perhaps update the row we are reading from here?
+            result = conn.execute(text("SELECT SEQ FROM sqlite_sequence WHERE name='tags'"))
+            autoincrement_val = result.scalar()
+            if not autoincrement_val or autoincrement_val <= RESERVED_TAG_END:
+                try:
+                    conn.execute(
+                        text(
+                            "INSERT INTO tags "
+                            "(id, name, color_namespace, color_slug, is_category, is_hidden) "
+                            f"VALUES ({RESERVED_TAG_END}, 'temp', NULL, NULL, false, false)"
+                        )
                     )
+                    conn.execute(text(f"DELETE FROM tags WHERE id = {RESERVED_TAG_END}"))
+                    conn.commit()
+                except OperationalError as e:
+                    logger.error("Could not initialize built-in tags", error=e)
+                    conn.rollback()
 
-            logger.info(f"[Library] Library DB version: {loaded_db_version}")
-            make_tables(self.engine)
+        with Session(self.engine) as session:
+            # Add default tag color namespaces.
+            namespaces = default_color_groups.namespaces()
 
-            if is_new:
-                # Add default tag color namespaces.
-                namespaces = default_color_groups.namespaces()
-                try:
-                    session.add_all(namespaces)
-                    session.commit()
-                except IntegrityError as e:
-                    logger.error("[Library] Couldn't add default tag color namespaces", error=e)
-                    session.rollback()
+            session.add_all(namespaces)
+            session.flush()
 
-                # Add default tag colors.
-                tag_colors: list[TagColorGroup] = default_color_groups.standard()
-                tag_colors += default_color_groups.pastels()
-                tag_colors += default_color_groups.shades()
-                tag_colors += default_color_groups.grayscale()
-                tag_colors += default_color_groups.earth_tones()
-                tag_colors += default_color_groups.neon()
-                if is_new:
-                    try:
-                        session.add_all(tag_colors)
-                        session.commit()
-                    except IntegrityError as e:
-                        logger.error("[Library] Couldn't add default tag colors", error=e)
-                        session.rollback()
+            # Add default tag colors.
+            tag_colors: list[TagColorGroup] = default_color_groups.standard()
+            tag_colors += default_color_groups.pastels()
+            tag_colors += default_color_groups.shades()
+            tag_colors += default_color_groups.grayscale()
+            tag_colors += default_color_groups.earth_tones()
+            tag_colors += default_color_groups.neon()
 
-                # Add default tags.
-                tags = get_default_tags()
-                try:
-                    session.add_all(tags)
-                    session.commit()
-                except IntegrityError:
-                    session.rollback()
+            session.add_all(tag_colors)
+            session.flush()
+
+            # Add default tags.
+            session.add_all(get_default_tags())
+            session.flush()
 
             # Add default field templates
-            if is_new:
-                for template in get_default_field_templates():
-                    try:
-                        session.add(template)
-                        session.commit()
-                    except IntegrityError:
-                        logger.info(
-                            "[Library] FieldTemplate already exists", field_template=template
-                        )
-                        session.rollback()
+            for template in DEFAULT_FIELD_TEMPLATES:
+                session.add(template)
+            session.flush()
 
             # Ensure version rows are present
-            with catch_warnings(record=True):
-                try:
-                    initial = DB_VERSION if is_new else 100
-                    session.add(Version(key=DB_VERSION_INITIAL_KEY, value=initial))
-                    session.commit()
-                except IntegrityError:
-                    session.rollback()
-
-                try:
-                    session.add(Version(key=DB_VERSION_CURRENT_KEY, value=DB_VERSION))
-                    session.commit()
-                except IntegrityError:
-                    session.rollback()
-
-            # check if folder matching current path exists already
-            self.folder = session.scalar(select(Folder).where(Folder.path == library_dir))
-            if not self.folder:
-                folder = Folder(
-                    path=library_dir,
-                    uuid=str(uuid4()),
-                )
-                session.add(folder)
-                session.expunge(folder)
-                session.commit()
-                self.folder = folder
+            session.add(Version(key=DB_VERSION_INITIAL_KEY, value=DB_VERSION))
+            session.add(Version(key=DB_VERSION_CURRENT_KEY, value=DB_VERSION))
+            session.flush()
 
             # Generate default .ts_ignore file
-            if is_new:
-                try:
-                    ts_ignore_template = (
-                        Path(__file__).parents[3] / "resources/templates/ts_ignore_template.txt"
-                    )
-                    shutil.copy2(ts_ignore_template, library_dir / TS_FOLDER_NAME / IGNORE_NAME)
-                except Exception as e:
-                    logger.error("[ERROR][Library] Could not generate '.ts_ignore' file!", error=e)
-
-            # Apply any post-SQL migration patches.
-            if not is_new:
-                assert loaded_db_version >= 6
-
-                # save backup if patches will be applied
-                if loaded_db_version < DB_VERSION:
-                    self.library_dir = library_dir
-                    self.save_library_backup_to_disk()
-                    self.library_dir = None
-
-                # migrate DB step by step from one version to the next
-                if loaded_db_version < 7:
-                    # changes: value_type, tags
-                    self.__apply_db7_migration(session)
-                if loaded_db_version < 8:
-                    # changes: tag_colors
-                    self.__apply_db8_migration(session)
-                if loaded_db_version < 9:
-                    # changes: entries
-                    self.__apply_db9_migration(session)
-                if loaded_db_version < 100:
-                    # changes: tag_parents
-                    self.__apply_db100_migration(session)
-                if loaded_db_version < 102:
-                    # changes: tag_parents
-                    self.__apply_db102_migration(session)
-                if loaded_db_version < 103:
-                    # changes: tags
-                    self.__apply_db103_migration(session)
-                if loaded_db_version < 104:
-                    # changes: deletes preferences
-                    self.__apply_db104_migrations(session, library_dir)
-                if loaded_db_version < 200:
-                    self.__apply_db200_migrations(session)
-                    # changes: field tables
-                if initial_db_version < 200 and loaded_db_version < 201:
-                    self.__apply_db201_migrations(session)
+            try:
+                ts_ignore_template = (
+                    Path(__file__).parents[3] / "resources/templates/ts_ignore_template.txt"
+                )
+                shutil.copy2(ts_ignore_template, library_dir / TS_FOLDER_NAME / IGNORE_NAME)
+            except Exception as e:
+                logger.error("[ERROR][Library] Could not generate '.ts_ignore' file!", error=e)
 
             session.execute(
                 text("CREATE INDEX IF NOT EXISTS idx_tags_name_shorthand ON tags (name, shorthand)")
@@ -592,330 +492,33 @@ class Library:
                 )
             )
 
-            # Update DB_VERSION
-            if loaded_db_version < DB_VERSION:
-                logger.info(f"[Library] Library migrated to DB version {DB_VERSION}")
-                self.set_version(DB_VERSION_CURRENT_KEY, DB_VERSION)
+            session.commit()
 
         # everything is fine, set the library path
         self.library_dir = library_dir
         return LibraryStatus(success=True, library_path=library_dir)
 
-    def __apply_db7_migration(self, session: Session):
-        """Migrate DB from DB_VERSION 6 to 7."""
-        logger.info("[Library][Migration] Applying patches to DB_VERSION: 6 library...")
-        with session:
-            # Repair tags that may have a disambiguation_id pointing towards a deleted tag.
-            all_tag_ids = session.scalars(text("SELECT DISTINCT id FROM tags")).all()
-            disam_stmt = (
-                update(Tag)
-                .where(Tag.disambiguation_id.not_in(all_tag_ids))
-                .values(disambiguation_id=None)
-            )
-            session.execute(disam_stmt)
-            session.commit()
+    def open_sqlite_library(
+        self, library_dir: Path, in_memory: bool, sql_filename: str = SQL_FILENAME
+    ) -> LibraryStatus:
+        logger.info("[Library] Opening SQLite Library", library_dir=library_dir)
+
+        self.engine = self._get_engine(library_dir, in_memory, sql_filename)
+        self.library_dir = library_dir
 
-    def __apply_db8_migration(self, session: Session):
-        """Migrate DB from DB_VERSION 7 to 8."""
-        # Add the missing color_border column to the TagColorGroups table.
-        color_border_stmt = text(
-            "ALTER TABLE tag_colors ADD COLUMN color_border BOOLEAN DEFAULT FALSE NOT NULL"
-        )
         try:
-            session.execute(color_border_stmt)
-            session.commit()
-            logger.info("[Library][Migration] Added color_border column to tag_colors table")
-        except Exception as e:
-            logger.error(
-                "[Library][Migration] Could not create color_border column in tag_colors table!",
-                error=e,
-            )
-            session.rollback()
+            migrations = DBMigrations(self)
 
-        # collect new default tag colors
-        tag_colors: list[TagColorGroup] = default_color_groups.standard()
-        tag_colors += default_color_groups.pastels()
-        tag_colors += default_color_groups.shades()
-        tag_colors += default_color_groups.grayscale()
-        tag_colors += default_color_groups.earth_tones()
-        # tag_colors += default_color_groups.neon() # NOTE: Neon is handled separately
+            # save backup if patches will be applied
+            if migrations.required:
+                self.save_library_backup_to_disk()
 
-        # Add any new default colors introduced in DB_VERSION 8
-        for color in tag_colors:
-            try:
-                session.add(color)
-                logger.info(
-                    "[Library][Migration] Migrated tag color to DB_VERSION 8+",
-                    color_name=color.name,
-                )
-                session.commit()
-            except IntegrityError:
-                session.rollback()
+            migrations.run()
+        except MigrationError as e:
+            self.library_dir = None
+            return LibraryStatus(success=False, message=e.args[0])
 
-        # Update Neon colors to use the the color_border property
-        for color in default_color_groups.neon():
-            try:
-                neon_stmt = (
-                    update(TagColorGroup)
-                    .where(
-                        and_(
-                            TagColorGroup.namespace == color.namespace,
-                            TagColorGroup.slug == color.slug,
-                        )
-                    )
-                    .values(
-                        slug=color.slug,
-                        namespace=color.namespace,
-                        name=color.name,
-                        primary=color.primary,
-                        secondary=color.secondary,
-                        color_border=color.color_border,
-                    )
-                )
-                session.execute(neon_stmt)
-                session.commit()
-            except IntegrityError as e:
-                logger.error(
-                    "[Library] Could not migrate Neon colors to DB_VERSION 8+!",
-                    error=e,
-                )
-                session.rollback()
-
-    def __apply_db9_migration(self, session: Session):
-        """Migrate DB from DB_VERSION 8 to 9."""
-        # Apply database schema changes
-        add_filename_column = text(
-            "ALTER TABLE entries ADD COLUMN filename TEXT NOT NULL DEFAULT ''"
-        )
-        try:
-            session.execute(add_filename_column)
-            session.commit()
-            logger.info("[Library][Migration] Added filename column to entries table")
-        except Exception as e:
-            logger.error(
-                "[Library][Migration] Could not create filename column in entries table!",
-                error=e,
-            )
-            session.rollback()
-
-        # Populate the new filename column.
-        for entry in self.all_entries():
-            session.merge(entry).filename = entry.path.name
-        session.commit()
-        logger.info("[Library][Migration] Populated filename column in entries table")
-
-    def __apply_db100_migration(self, session: Session):
-        """Migrate DB to DB_VERSION 100."""
-        with session:
-            # Repair parent-child tag relationships that are the wrong way around.
-            stmt = update(TagParent).values(
-                parent_id=TagParent.child_id,
-                child_id=TagParent.parent_id,
-            )
-            session.execute(stmt)
-            session.commit()
-            logger.info("[Library][Migration] Refactored TagParent table")
-
-    def __apply_db102_migration(self, session: Session):
-        """Migrate DB to DB_VERSION 102."""
-        with session:
-            all_tag_ids = session.scalars(text("SELECT DISTINCT id FROM tags")).all()
-            stmt = delete(TagParent).where(TagParent.parent_id.not_in(all_tag_ids))
-            session.execute(stmt)
-            session.commit()
-            logger.info("[Library][Migration] Verified TagParent table data")
-
-    def __apply_db103_migration(self, session: Session):
-        """Migrate DB from DB_VERSION 102 to 103."""
-        # add the new hidden column for tags
-        add_is_hidden_column = text(
-            "ALTER TABLE tags ADD COLUMN is_hidden BOOLEAN NOT NULL DEFAULT 0"
-        )
-        try:
-            session.execute(add_is_hidden_column)
-            session.commit()
-            logger.info("[Library][Migration] Added is_hidden column to tags table")
-        except Exception as e:
-            logger.error(
-                "[Library][Migration] Could not create is_hidden column in tags table!",
-                error=e,
-            )
-            session.rollback()
-
-        # mark the "Archived" tag as hidden
-        try:
-            session.query(Tag).filter(Tag.id == TAG_ARCHIVED).update({"is_hidden": True})
-            session.commit()
-            logger.info("[Library][Migration] Updated archived tag to be hidden")
-        except Exception as e:
-            logger.error(
-                "[Library][Migration] Could not update archived tag to be hidden!",
-                error=e,
-            )
-            session.rollback()
-
-    def __apply_db104_migrations(self, session: Session, library_dir: Path):
-        """Migrate DB from DB_VERSION 103 to 104."""
-        # Convert file extension list to ts_ignore file, if a .ts_ignore file does not exist
-        self.__migrate_sql_to_ts_ignore(library_dir)
-        session.execute(text("DROP TABLE preferences"))
-        session.commit()
-
-    def __migrate_sql_to_ts_ignore(self, library_dir: Path):
-        # Do not continue if existing '.ts_ignore' file is found
-        ts_ignore = library_dir / TS_FOLDER_NAME / IGNORE_NAME
-        if Path(ts_ignore).exists():
-            return
-
-        # Load legacy extension data
-        with Session(self.engine) as session:
-            extensions: list[str] = unwrap(
-                session.scalar(text("SELECT value FROM preferences WHERE key = 'EXTENSION_LIST'"))
-            )
-            is_exclude_list: bool = unwrap(
-                session.scalar(text("SELECT value FROM preferences WHERE key = 'IS_EXCLUDE_LIST'"))
-            )
-
-        with open(ts_ignore, "w") as f:
-            f.write(migrate_ext_list(extensions, is_exclude_list))
-
-    def __apply_db200_migrations(self, session: Session):
-        """Migrate DB to DB_VERSION 200."""
-        with session:
-            # Drop unused 'boolean_fields' and 'value_type' tables
-            logger.info(
-                "[Library][Migration][200] Dropping boolean_fields and value_type tables..."
-            )
-            session.execute(text("DROP TABLE boolean_fields"))
-            session.execute(text("DROP TABLE value_type"))
-
-            # Add 'name' column to text_fields and datetime_fields tables
-            logger.info("[Library][Migration][200] Adding name columns to field tables...")
-            stmt = text('ALTER TABLE text_fields ADD COLUMN name VARCHAR DEFAULT ""')
-            session.execute(stmt)
-            stmt = text('ALTER TABLE datetime_fields ADD COLUMN name VARCHAR DEFAULT ""')
-            session.execute(stmt)
-
-            # Drop unnecessary 'position' columns
-            logger.info("[Library][Migration][200] Dropping position columns to field tables...")
-            session.execute(text("ALTER TABLE datetime_fields DROP COLUMN position"))
-            session.execute(text("ALTER TABLE text_fields DROP COLUMN position"))
-
-            # Add 'is_multiline' column to text_fields table
-            logger.info("[Library][Migration][200] Adding is_multiline column to text_fields...")
-            stmt = text(
-                "ALTER TABLE text_fields ADD COLUMN is_multiline BOOLEAN NOT NULL DEFAULT 0"
-            )
-            session.execute(stmt)
-            session.flush()
-
-            # Move values from old `type_key` columns into new `name` columns
-            logger.info("[Library][Migration][200] Moving values from type_key columns to name...")
-            session.execute(text("UPDATE text_fields SET name = type_key"))
-            session.execute(text("UPDATE datetime_fields SET name = type_key"))
-            session.flush()
-
-            # Change `name` values to title case
-            logger.info("[Library][Migration][200] Normalizing TextField names...")
-            for text_field in session.execute(select(TextField)).scalars():
-                # NOTE: The only exception to the "Title Case" conversion is the "URL" field.
-                text_field.name = text_field.name.title().replace("Url", "URL").replace("_", " ")
-            logger.info("[Library][Migration][200] Normalizing DatetimeField names...")
-            for datetime_field in session.execute(select(DatetimeField)).scalars():
-                datetime_field.name = datetime_field.name.title().replace("_", " ")
-            session.flush()
-
-            # Add correct `is_multiline` values to text_fields table
-            logger.info("[Library][Migration][200] Updating is_multiline for legacy TEXT_BOXes...")
-            text_boxes = [
-                x.get("name") for x in LEGACY_FIELD_MAP.values() if x.get("is_multiline") is True
-            ]
-            update_stmt = (
-                update(TextField).where(TextField.name.in_(text_boxes)).values(is_multiline=True)
-            )
-            session.execute(update_stmt)
-            session.flush()
-
-            # Repair legacy "Description" fields to use is_multiline = True
-            logger.info("[Library][Migration][200] Repairing legacy Description fields...")
-            desc_stmt = (
-                update(TextField)
-                .where(TextField.name == "Description" and TextField.is_multiline == False)  # noqa: E712
-                .values(is_multiline=True)
-            )
-            session.execute(desc_stmt)
-
-            # Repair legacy "Comments" fields to use is_multiline = True
-            logger.info("[Library][Migration][200] Repairing legacy Comment fields...")
-            comm_stmt = (
-                update(TextField)
-                .where(TextField.name == "Comments" and TextField.is_multiline == False)  # noqa: E712
-                .values(is_multiline=True)
-            )
-            session.execute(comm_stmt)
-
-            # Add default field templates
-            logger.info("[Library][Migration][200] Adding default field templates...")
-            for template in get_default_field_templates():
-                try:
-                    session.add(template)
-                    session.flush()
-                except IntegrityError:
-                    logger.error("[Library] FieldTemplate already exists", field_template=template)
-                    session.rollback()
-
-            session.commit()
-
-    def __apply_db201_migrations(self, session: Session):
-        """Migrate DB to DB_VERSION 201."""
-        with session:
-            create_text_fields_table = text("""
-            CREATE TABLE text_fields_new (
-                id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-                name VARCHAR NOT NULL,
-                entry_id INTEGER NOT NULL,
-                value VARCHAR,
-                is_multiline BOOLEAN NOT NULL,
-                FOREIGN KEY(entry_id) REFERENCES entries (id)
-            )
-            """)
-            create_datetime_fields_table = text("""
-            CREATE TABLE datetime_fields_new (
-                id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-                name VARCHAR NOT NULL,
-                entry_id INTEGER NOT NULL,
-                value VARCHAR,
-                FOREIGN KEY(entry_id) REFERENCES entries (id)
-            )
-            """)
-
-            logger.info("[Library][Migration][201] Dropping type_key from text_fields table...")
-            session.execute(create_text_fields_table)
-            session.flush()
-            session.execute(
-                text("""
-                    INSERT INTO text_fields_new (id, name, entry_id, value, is_multiline)
-                    SELECT id, name, entry_id, value, is_multiline
-                    FROM text_fields
-                """)
-            )
-            session.execute(text("DROP TABLE text_fields"))
-            session.execute(text("ALTER TABLE text_fields_new RENAME TO text_fields"))
-
-            logger.info("[Library][Migration][201] Dropping type_key from datetime_fields table...")
-            session.execute(create_datetime_fields_table)
-            session.flush()
-            session.execute(
-                text("""
-                    INSERT INTO datetime_fields_new (id, name, entry_id, value)
-                    SELECT id, name, entry_id, value
-                    FROM datetime_fields
-                """)
-            )
-            session.execute(text("DROP TABLE datetime_fields"))
-            session.execute(text("ALTER TABLE datetime_fields_new RENAME TO datetime_fields"))
-
-            session.commit()
+        return LibraryStatus(success=True, library_path=library_dir)
 
     @property
     def field_templates(self) -> Sequence[BaseFieldTemplate]:
@@ -1117,11 +720,12 @@ class Library:
             raise ValueError("Invalid library directory.")
 
         full_ts_path = library_dir / TS_FOLDER_NAME
-        if not full_ts_path.exists():
-            logger.info("creating library directory", dir=full_ts_path)
-            full_ts_path.mkdir(parents=True, exist_ok=True)
-            return False
-        return True
+        if full_ts_path.exists():
+            return True
+
+        logger.info("creating library directory", dir=full_ts_path)
+        full_ts_path.mkdir(parents=True, exist_ok=True)
+        return False
 
     def add_entries(self, items: list[Entry]) -> list[int]:
         """Add multiple Entry records to the Library."""
@@ -1193,7 +797,11 @@ class Library:
             ast = search.ast
 
             if not search.show_hidden_entries:
-                statement = statement.where(~Entry.tags.any(Tag.is_hidden))
+                hidden_tag_ids = select(Tag.id).where(Tag.is_hidden)
+                hidden_entry_ids = select(TagEntry.entry_id).where(
+                    TagEntry.tag_id.in_(hidden_tag_ids)
+                )
+                statement = statement.where(Entry.id.not_in(hidden_entry_ids))
 
             if ast:
                 start_time = time.time()
@@ -1719,9 +1327,13 @@ class Library:
 
                 if parent_ids is not None:
                     self.update_parent_tags(tag, parent_ids, session)
+                    session.flush()
 
                 if aliases is not None:
-                    self.update_aliases(tag, aliases)
+                    for a in aliases:
+                        a.tag_id = tag.id
+                    self.update_aliases(tag, aliases, session)
+                    session.flush()
 
                 session.commit()
                 session.expunge(tag)
@@ -2053,48 +1665,45 @@ class Library:
             else:
                 self.add_color(new_color_group)
 
-    def update_aliases(self, tag: Tag, aliases: Iterable[TagAlias]) -> bool:
+    def update_aliases(self, tag: Tag, aliases: Iterable[TagAlias], session: Session) -> bool:
         """Update TagAliases for a given Tag."""
-        with Session(self.engine) as session:
-            # Remove aliases that are no longer on the Tag
+        unique_alias_names: set[str] = set()
+        # Remove aliases that are no longer on the Tag
+        try:
+            old_aliases = session.scalars(select(TagAlias).where(TagAlias.tag_id == tag.id)).all()
+            unique_alias_names = set([x.name for x in old_aliases])
+            old_alias_ids: list[int] = [a.id for a in old_aliases]
+            for old_alias in old_aliases:
+                if old_alias.id not in [a.id for a in aliases] or not old_alias.name:
+                    logger.warning(
+                        "[Library] Deleting removed alias", id=old_alias.id, name=old_alias.name
+                    )
+                    session.delete(old_alias)
+            session.commit()
+        except IntegrityError as e:
+            session.rollback()
+            logger.error("[Library] Could not update aliases", error=e)
+            return False
+
+        # Update or Add aliases
+        for alias in aliases:
+            # Sanitize alias names
+            alias.name = alias.name.strip()
+            if not alias.name or alias.name in unique_alias_names:
+                continue
+
             try:
-                old_aliases = session.scalars(
-                    select(TagAlias).where(TagAlias.tag_id == tag.id)
-                ).all()
-                old_alias_ids: list[int] = [a.id for a in old_aliases]
-                for old_alias in old_aliases:
-                    if old_alias.id not in [a.id for a in aliases] or not old_alias.name:
-                        logger.warning(
-                            "[Library] Deleting removed alias", id=old_alias.id, name=old_alias.name
-                        )
-                        session.delete(old_alias)
-                session.commit()
+                if alias.id in old_alias_ids:
+                    stmt = update(TagAlias).where(TagAlias.id == alias.id).values(name=alias.name)
+                    session.execute(stmt)
+                else:
+                    session.add(alias)
             except IntegrityError as e:
                 session.rollback()
-                logger.error("[Library] Could not update aliases", error=e)
+                logger.error("[Library] Could not update or add alias", error=e)
                 return False
 
-            # Update or Add aliases
-            for alias in aliases:
-                # Sanitize alias names
-                alias.name = alias.name.strip()
-                if not alias.name:
-                    continue
-
-                try:
-                    if alias.id in old_alias_ids:
-                        stmt = (
-                            update(TagAlias).where(TagAlias.id == alias.id).values(name=alias.name)
-                        )
-                        session.execute(stmt)
-                    else:
-                        session.add(alias)
-                except IntegrityError as e:
-                    session.rollback()
-                    logger.error("[Library] Could not update or add alias", error=e)
-                    return False
-
-            session.commit()
+        session.commit()
 
         return True
 
@@ -2153,24 +1762,6 @@ class Library:
             except Exception:
                 return 0
 
-    def set_version(self, key: str, value: int) -> None:
-        """Set a version value to the DB.
-
-        Args:
-            key(str): The key for the name of the version type to set.
-            value(int): The version value to set.
-        """
-        with Session(self.engine) as session:
-            try:
-                version = session.scalar(select(Version).where(Version.key == key))
-                assert version
-                version.value = value
-                session.add(version)
-                session.commit()
-            except (IntegrityError, AssertionError) as e:
-                logger.error("[Library][ERROR] Couldn't add default tag color namespaces", error=e)
-                session.rollback()
-
     def mirror_entry_fields(self, entries: list[Entry]) -> None:
         """Mirror fields among multiple Entry items."""
         all_fields: set[BaseField] = set()

src/tagstudio/core/library/alchemy/migrations.py

@@ -0,0 +1,572 @@
+# SPDX-FileCopyrightText: (c) TagStudio Contributors
+# SPDX-License-Identifier: MIT
+
+
+from collections.abc import Callable
+from pathlib import Path
+from typing import TYPE_CHECKING, override
+
+import structlog
+import ujson
+from sqlalchemy import and_, delete, select, text, update
+from sqlalchemy.orm import Session
+
+from tagstudio.core.constants import IGNORE_NAME, TAG_ARCHIVED, TS_FOLDER_NAME
+from tagstudio.core.library.alchemy import default_color_groups
+from tagstudio.core.library.alchemy.constants import (
+    DB_VERSION,
+    DB_VERSION_CURRENT_KEY,
+    DB_VERSION_INITIAL_KEY,
+    DEFAULT_FIELD_TEMPLATES,
+)
+from tagstudio.core.library.alchemy.fields import LEGACY_FIELD_MAP, DatetimeField, TextField
+from tagstudio.core.library.alchemy.joins import TagParent
+from tagstudio.core.library.alchemy.models import Entry, Tag, TagColorGroup, Version
+from tagstudio.core.library.ignore import migrate_ext_list
+from tagstudio.core.utils.types import unwrap
+from tagstudio.qt.translations import Translations
+
+if TYPE_CHECKING:
+    from tagstudio.core.library.alchemy.library import Library
+
+logger = structlog.get_logger(__name__)
+
+
+class MigrationError(Exception):
+    pass
+
+
+class DBMigration:
+    version: int
+    initial_version: int | None = None
+
+    @classmethod
+    def run(cls, session: Session, library: "Library", fmt_log: Callable[[str], str]) -> None:  # pyright: ignore[reportUnusedParameter]
+        raise NotImplementedError
+
+
+class DBMigrations:
+    def __init__(self, library: "Library") -> None:
+
+        self.lib = library
+        self.engine = self.lib.engine
+
+        # Don't check DB version when creating new library
+        self.loaded_db_version = self.lib.get_version(DB_VERSION_CURRENT_KEY)
+        self.initial_db_version = self.lib.get_version(DB_VERSION_INITIAL_KEY)
+
+        # ======================== Library Database Version Checking =======================
+        # DB_VERSION 6 is the first supported SQLite DB version.
+        # If the DB_VERSION is >= 100, that means it's a compound major + minor version.
+        #   - Dividing by 100 and flooring gives the major (breaking changes) version.
+        #   - If a DB has major version higher than the current program, don't load it.
+        #   - If only the minor version is higher, it's still allowed to load.
+        if self.loaded_db_version < 6 or (
+            self.loaded_db_version >= 100 and self.loaded_db_version // 100 > DB_VERSION // 100
+        ):
+            mismatch_text = Translations["status.library_version_mismatch"]
+            found_text = Translations["status.library_version_found"]
+            expected_text = Translations["status.library_version_expected"]
+            raise MigrationError(
+                f"{mismatch_text}\n"
+                f"{found_text} v{self.loaded_db_version}, "
+                f"{expected_text} v{DB_VERSION}"
+            )
+
+        logger.info(
+            f"[Library][Migration] Starting with library DB version: {self.loaded_db_version}"
+        )
+
+    @property
+    def required(self) -> bool:
+        return self.loaded_db_version < DB_VERSION
+
+    def run(self):
+
+        # migrate DB step by step from one version to the next
+        # (migration_method, db_version, initial_db_version)
+        migrations: list[type[DBMigration]] = [
+            MigrationTo7,  # changes: value_type, tags
+            MigrationTo8,  # changes: tag_colors
+            MigrationTo9,  # changes: entries
+            MigrationTo100,  # changes: tag_parents
+            MigrationTo101,  # changes: versions
+            MigrationTo102,  # changes: tag_parents
+            MigrationTo103,  # changes: tags
+            MigrationTo104,  # changes: deletes preferences
+            MigrationTo200,  # changes: field tables
+            MigrationTo201,  # changes: field tables
+            MigrationTo202,  # changes: tag_parents
+            MigrationTo300,  # changes: deletes folders
+        ]
+        with Session(self.engine) as session:
+            for migration in migrations:
+                if self.loaded_db_version < migration.version and (
+                    migration.initial_version is None
+                    or self.initial_db_version < migration.initial_version
+                ):
+                    logger.info(f"[Library][Migration][{migration.version}] Starting DB Migration")
+                    # any error causes transaction to rollback
+                    migration.run(
+                        session,
+                        self.lib,
+                        lambda msg, v=migration.version: f"[Library][Migration][{v}] {msg}",
+                    )
+                    self.loaded_db_version = migration.version
+                    try:
+                        self._set_version(session, DB_VERSION_CURRENT_KEY, migration.version)
+                    except Exception as e:
+                        logger.info(
+                            f"[Library][Migration][{migration.version}] "
+                            "Couldn't update version, continuing without commit",
+                            error=e,
+                        )
+                        session.flush()
+                    else:
+                        session.commit()
+                logger.info(f"[Library][Migration][{migration.version}] Completed DB Migration")
+
+        assert self.loaded_db_version >= DB_VERSION, (
+            "Ran all migrations, but the DB is still not on the newest version"
+        )
+        logger.info(f"[Library][Migration] Library migrated to DB version {DB_VERSION}")
+
+    def _set_version(self, session: Session, key: str, value: int) -> None:
+        """Set a version value to the DB.
+
+        Args:
+            session(Session): The SQLAlchemy DB Session to use.
+            key(str): The key for the name of the version type to set.
+            value(int): The version value to set.
+        """
+        # Insert if key has no value yet, otherwise update the value
+        session.merge(Version(key=key, value=value))
+
+
+class MigrationTo7(DBMigration):
+    version = 7
+
+    @override
+    @classmethod
+    def run(cls, session: Session, library: "Library", fmt_log: Callable[[str], str]):
+        """Migrate DB from DB_VERSION 6 to 7."""
+        logger.info(fmt_log("Applying patches to DB_VERSION: 6 library..."))
+        # Repair tags that may have a disambiguation_id pointing towards a deleted tag.
+        # TODO: combine into single sql statement
+        all_tag_ids = session.scalars(text("SELECT DISTINCT id FROM tags")).all()
+        disam_stmt = (
+            update(Tag)
+            .where(Tag.disambiguation_id.not_in(all_tag_ids))
+            .values(disambiguation_id=None)
+        )
+        session.execute(disam_stmt)
+        session.flush()
+
+
+class MigrationTo8(DBMigration):
+    version = 8
+
+    @override
+    @classmethod
+    def run(cls, session: Session, library: "Library", fmt_log: Callable[[str], str]):
+        """Migrate DB from DB_VERSION 7 to 8."""
+        # Add the missing color_border column to the TagColorGroups table.
+        session.execute(
+            text("ALTER TABLE tag_colors ADD COLUMN color_border BOOLEAN DEFAULT FALSE NOT NULL")
+        )
+        session.flush()
+        logger.info(fmt_log("Added color_border column to tag_colors table"))
+
+        # collect new default tag colors
+        tag_colors: list[TagColorGroup] = [
+            color
+            for color in default_color_groups.shades()
+            if color.slug in ["burgundy", "dark-teal", "dark_lavender"]
+        ]
+
+        # Add any new default colors introduced in DB_VERSION 8
+        for color in tag_colors:
+            session.add(color)
+        session.flush()
+        logger.info(
+            fmt_log("Migrated tag colors to DB_VERSION 8+"),
+            color_name=tag_colors,
+        )
+
+        # Update Neon colors to use the the color_border property
+        for color in default_color_groups.neon():
+            neon_stmt = (
+                update(TagColorGroup)
+                .where(
+                    and_(
+                        TagColorGroup.namespace == color.namespace,
+                        TagColorGroup.slug == color.slug,
+                    )
+                )
+                .values(
+                    slug=color.slug,
+                    namespace=color.namespace,
+                    name=color.name,
+                    primary=color.primary,
+                    secondary=color.secondary,
+                    color_border=color.color_border,
+                )
+            )
+            session.execute(neon_stmt)
+        session.flush()
+
+
+class MigrationTo9(DBMigration):
+    version = 9
+
+    @override
+    @classmethod
+    def run(cls, session: Session, library: "Library", fmt_log: Callable[[str], str]):
+        """Migrate DB from DB_VERSION 8 to 9."""
+        # Apply database schema changes
+        add_filename_column = text(
+            "ALTER TABLE entries ADD COLUMN filename TEXT NOT NULL DEFAULT ''"
+        )
+        session.execute(add_filename_column)
+        session.flush()
+        logger.info(fmt_log("Added filename column to entries table"))
+
+        # Populate the new filename column.
+        entries = session.execute(select(Entry).distinct()).scalars()
+        for entry in entries:
+            entry.filename = entry.path.name
+            session.merge(entry)
+        session.flush()
+        logger.info(fmt_log("Populated filename column in entries table"))
+
+
+class MigrationTo100(DBMigration):
+    version = 100
+
+    @override
+    @classmethod
+    def run(cls, session: Session, library: "Library", fmt_log: Callable[[str], str]):
+        """Migrate DB to DB_VERSION 100."""
+        # Repair parent-child tag relationships that are the wrong way around.
+        stmt = update(TagParent).values(
+            parent_id=TagParent.child_id,
+            child_id=TagParent.parent_id,
+        )
+        session.execute(stmt)
+        session.flush()
+        logger.info(fmt_log("Refactored TagParent table"))
+
+
+class MigrationTo101(DBMigration):
+    version = 101
+
+    @override
+    @classmethod
+    def run(cls, session: Session, library: "Library", fmt_log: Callable[[str], str]):
+        """Migrate DB to DB_VERSION 101."""
+        # Create versions table
+        session.execute(
+            text("""
+        CREATE TABLE versions (
+            "key" VARCHAR NOT NULL PRIMARY KEY,
+            value INTEGER NOT NULL
+        )
+        """)
+        )
+        session.flush()
+        # Ensure version rows are present
+        session.add(Version(key=DB_VERSION_INITIAL_KEY, value=100))
+        session.flush()
+        logger.info(fmt_log("Created versions table"))
+
+
+class MigrationTo102(DBMigration):
+    version = 102
+
+    @override
+    @classmethod
+    def run(cls, session: Session, library: "Library", fmt_log: Callable[[str], str]):
+        """Migrate DB to DB_VERSION 102."""
+        # delete TagParents with a dangling parent reference
+        stmt = delete(TagParent).where(TagParent.parent_id.not_in(select(Tag.id).distinct()))
+        session.execute(stmt)
+        session.flush()
+        logger.info(fmt_log("Verified TagParent table data"))
+
+
+class MigrationTo103(DBMigration):
+    version = 103
+
+    @override
+    @classmethod
+    def run(cls, session: Session, library: "Library", fmt_log: Callable[[str], str]):
+        """Migrate DB from DB_VERSION 102 to 103."""
+        # add the new hidden column for tags
+        session.execute(text("ALTER TABLE tags ADD COLUMN is_hidden BOOLEAN NOT NULL DEFAULT 0"))
+        session.flush()
+        logger.info(fmt_log("Added is_hidden column to tags table"))
+
+        # mark the "Archived" tag as hidden
+        session.query(Tag).filter(Tag.id == TAG_ARCHIVED).update({"is_hidden": True})
+        session.flush()
+        logger.info(fmt_log("Updated archived tag to be hidden"))
+
+
+class MigrationTo104(DBMigration):
+    version = 104
+
+    @override
+    @classmethod
+    def run(cls, session: Session, library: "Library", fmt_log: Callable[[str], str]):
+        """Migrate DB from DB_VERSION 103 to 104."""
+        # Convert file extension list to ts_ignore file, if a .ts_ignore file does not exist
+        cls.__migrate_sql_to_ts_ignore(session, library)
+        session.execute(text("DROP TABLE preferences"))
+        session.flush()
+
+    @classmethod
+    def __migrate_sql_to_ts_ignore(cls, session: Session, library: "Library"):
+        # Do not continue if existing '.ts_ignore' file is found
+        ts_ignore = unwrap(library.library_dir) / TS_FOLDER_NAME / IGNORE_NAME
+        if Path(ts_ignore).exists():
+            return
+
+        # Load legacy extension data
+        extensions: list[str] = ujson.loads(
+            unwrap(
+                session.scalar(text("SELECT value FROM preferences WHERE key = 'EXTENSION_LIST'"))
+            )
+        )
+        is_exclude_list: bool = unwrap(
+            session.scalar(text("SELECT value FROM preferences WHERE key = 'IS_EXCLUDE_LIST'"))
+        )
+
+        with open(ts_ignore, "w") as f:
+            f.write(migrate_ext_list(extensions, is_exclude_list))
+
+
+class MigrationTo200(DBMigration):
+    version = 200
+
+    @override
+    @classmethod
+    def run(cls, session: Session, library: "Library", fmt_log: Callable[[str], str]):
+        """Migrate DB to DB_VERSION 200."""
+        # Drop unused 'boolean_fields' and 'value_type' tables
+        logger.info(fmt_log("Dropping boolean_fields and value_type tables..."))
+        session.execute(text("DROP TABLE boolean_fields"))
+        session.execute(text("DROP TABLE value_type"))
+
+        # Add 'name' column to text_fields and datetime_fields tables
+        logger.info(fmt_log("Adding name columns to field tables..."))
+        stmt = text('ALTER TABLE text_fields ADD COLUMN name VARCHAR DEFAULT ""')
+        session.execute(stmt)
+        stmt = text('ALTER TABLE datetime_fields ADD COLUMN name VARCHAR DEFAULT ""')
+        session.execute(stmt)
+
+        # Drop unnecessary 'position' columns
+        logger.info(fmt_log("Dropping position columns to field tables..."))
+        session.execute(text("ALTER TABLE datetime_fields DROP COLUMN position"))
+        session.execute(text("ALTER TABLE text_fields DROP COLUMN position"))
+
+        # Add 'is_multiline' column to text_fields table
+        logger.info(fmt_log("Adding is_multiline column to text_fields..."))
+        stmt = text("ALTER TABLE text_fields ADD COLUMN is_multiline BOOLEAN NOT NULL DEFAULT 0")
+        session.execute(stmt)
+        session.flush()
+
+        # Move values from old `type_key` columns into new `name` columns
+        logger.info(fmt_log("Moving values from type_key columns to name..."))
+        session.execute(text("UPDATE text_fields SET name = type_key"))
+        session.execute(text("UPDATE datetime_fields SET name = type_key"))
+        session.flush()
+
+        # Change `name` values to title case
+        logger.info(fmt_log("Normalizing TextField names..."))
+        for text_field in session.execute(select(TextField)).scalars():
+            # NOTE: The only exception to the "Title Case" conversion is the "URL" field.
+            text_field.name = text_field.name.title().replace("Url", "URL").replace("_", " ")
+        logger.info(fmt_log("Normalizing DatetimeField names..."))
+        for datetime_field in session.execute(select(DatetimeField)).scalars():
+            datetime_field.name = datetime_field.name.title().replace("_", " ")
+        session.flush()
+
+        # Add correct `is_multiline` values to text_fields table
+        logger.info(fmt_log("Updating is_multiline for legacy TEXT_BOXes..."))
+        text_boxes = [
+            x.get("name") for x in LEGACY_FIELD_MAP.values() if x.get("is_multiline") is True
+        ]
+        update_stmt = (
+            update(TextField).where(TextField.name.in_(text_boxes)).values(is_multiline=True)
+        )
+        session.execute(update_stmt)
+        session.flush()
+
+        # Repair legacy "Description" fields to use is_multiline = True
+        logger.info(fmt_log("Repairing legacy Description fields..."))
+        desc_stmt = (
+            update(TextField)
+            .where(TextField.name == "Description" and TextField.is_multiline == False)  # noqa: E712
+            .values(is_multiline=True)
+        )
+        session.execute(desc_stmt)
+
+        # Repair legacy "Comments" fields to use is_multiline = True
+        logger.info(fmt_log("Repairing legacy Comment fields..."))
+        comm_stmt = (
+            update(TextField)
+            .where(TextField.name == "Comments" and TextField.is_multiline == False)  # noqa: E712
+            .values(is_multiline=True)
+        )
+        session.execute(comm_stmt)
+
+        # Add field templates tables
+        session.execute(
+            text("""
+        CREATE TABLE text_field_templates (
+            id INTEGER NOT NULL PRIMARY KEY,
+            is_multiline BOOLEAN NOT NULL,
+            name VARCHAR NOT NULL
+        )
+        """)
+        )
+        session.execute(
+            text("""
+        CREATE TABLE datetime_field_templates (
+            id INTEGER NOT NULL PRIMARY KEY,
+            name VARCHAR NOT NULL
+        )
+        """)
+        )
+        session.flush()
+
+        # Add default field templates
+        logger.info(fmt_log("Adding default field templates..."))
+        for template in DEFAULT_FIELD_TEMPLATES:
+            session.add(template)
+        session.flush()
+
+        # DB indices for improved performance
+        session.execute(
+            text("CREATE INDEX IF NOT EXISTS idx_tags_name_shorthand ON tags (name, shorthand)")
+        )
+        session.execute(
+            text("CREATE INDEX IF NOT EXISTS idx_tag_parents_child_id ON tag_parents (child_id)")
+        )
+        session.execute(
+            text("CREATE INDEX IF NOT EXISTS idx_tag_entries_entry_id ON tag_entries (entry_id)")
+        )
+
+
+class MigrationTo201(DBMigration):
+    version = 201
+    initial_version = 200
+
+    @override
+    @classmethod
+    def run(cls, session: Session, library: "Library", fmt_log: Callable[[str], str]):
+        """Migrate DB to DB_VERSION 201."""
+        create_text_fields_table = text("""
+        CREATE TABLE text_fields_new (
+            id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+            name VARCHAR NOT NULL,
+            entry_id INTEGER NOT NULL,
+            value VARCHAR,
+            is_multiline BOOLEAN NOT NULL,
+            FOREIGN KEY(entry_id) REFERENCES entries (id)
+        )
+        """)
+        create_datetime_fields_table = text("""
+        CREATE TABLE datetime_fields_new (
+            id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+            name VARCHAR NOT NULL,
+            entry_id INTEGER NOT NULL,
+            value VARCHAR,
+            FOREIGN KEY(entry_id) REFERENCES entries (id)
+        )
+        """)
+
+        logger.info(fmt_log("Dropping type_key from text_fields table..."))
+        session.execute(create_text_fields_table)
+        session.flush()
+        session.execute(
+            text("""
+                INSERT INTO text_fields_new (id, name, entry_id, value, is_multiline)
+                SELECT id, name, entry_id, value, is_multiline
+                FROM text_fields
+            """)
+        )
+        session.execute(text("DROP TABLE text_fields"))
+        session.execute(text("ALTER TABLE text_fields_new RENAME TO text_fields"))
+
+        logger.info(fmt_log("Dropping type_key from datetime_fields table..."))
+        session.execute(create_datetime_fields_table)
+        session.flush()
+        session.execute(
+            text("""
+                INSERT INTO datetime_fields_new (id, name, entry_id, value)
+                SELECT id, name, entry_id, value
+                FROM datetime_fields
+            """)
+        )
+        session.execute(text("DROP TABLE datetime_fields"))
+        session.execute(text("ALTER TABLE datetime_fields_new RENAME TO datetime_fields"))
+
+        session.flush()
+
+
+class MigrationTo202(DBMigration):
+    version = 202
+
+    @override
+    @classmethod
+    def run(cls, session: Session, library: "Library", fmt_log: Callable[[str], str]):
+        """Migrate DB to DB_VERSION 202."""
+        stmt = delete(TagParent).where(TagParent.child_id.not_in(select(Tag.id).distinct()))
+        session.execute(stmt)
+        session.flush()
+        logger.info(fmt_log("Verified TagParent table data"))
+
+
+class MigrationTo300(DBMigration):
+    version = 300
+
+    @override
+    @classmethod
+    def run(cls, session: Session, library: "Library", fmt_log: Callable[[str], str]):
+        ## remove folder_id column from entries table
+        # create new table in the desired scheme (without folder_id column)
+        session.execute(
+            text("""
+        CREATE TABLE entries_new (
+            id INTEGER NOT NULL,
+            path VARCHAR NOT NULL,
+            suffix VARCHAR NOT NULL,
+            date_created DATETIME,
+            date_modified DATETIME,
+            date_added DATETIME,
+            filename TEXT NOT NULL DEFAULT '',
+            PRIMARY KEY (id),
+            UNIQUE (path)
+        )
+        """)
+        )
+        session.flush()
+        # transfer data to new table
+        session.execute(
+            text("""
+            INSERT INTO entries_new (id, path, suffix, date_created, date_modified, date_added,
+                                     filename)
+            SELECT id, path, suffix, date_created, date_modified, date_added, filename
+            FROM entries
+        """)
+        )
+        # delete old table
+        session.execute(text("DROP TABLE entries"))
+        # rename new table to old table
+        session.execute(text("ALTER TABLE entries_new RENAME TO entries"))
+        session.flush()
+
+        ## drop table "folders"
+        session.execute(text("DROP TABLE folders"))
+        session.flush()

src/tagstudio/core/library/alchemy/models.py

@@ -182,23 +182,11 @@ class Tag(Base):
         return self.name >= other.name
 
 
-class Folder(Base):
-    __tablename__ = "folders"
-
-    # TODO - implement this
-    id: Mapped[int] = mapped_column(primary_key=True)
-    path: Mapped[Path] = mapped_column(PathType, unique=True)
-    uuid: Mapped[str] = mapped_column(unique=True)
-
-
 class Entry(Base):
     __tablename__ = "entries"
 
     id: Mapped[int] = mapped_column(primary_key=True)
 
-    folder_id: Mapped[int] = mapped_column(ForeignKey("folders.id"))
-    folder: Mapped[Folder] = relationship("Folder")
-
     path: Mapped[Path] = mapped_column(PathType, unique=True)
     filename: Mapped[str] = mapped_column()
     suffix: Mapped[str] = mapped_column()
@@ -235,7 +223,6 @@ class Entry(Base):
     def __init__(
         self,
         path: Path,
-        folder: Folder,
         fields: list[BaseField],
         id: int | None = None,
         date_created: dt | None = None,
@@ -244,7 +231,6 @@ class Entry(Base):
     ) -> None:
         super().__init__()
         self.path = path
-        self.folder = folder
         self.id = id  # pyright: ignore[reportAttributeAccessIssue]
         self.filename = path.name
         self.suffix = path.suffix.lstrip(".").lower()

src/tagstudio/core/library/refresh.py

@@ -16,7 +16,6 @@ from tagstudio.core.library.alchemy.library import Library
 from tagstudio.core.library.alchemy.models import Entry
 from tagstudio.core.library.ignore import PATH_GLOB_FLAGS, Ignore, ignore_to_glob
 from tagstudio.core.utils.silent_subprocess import silent_run  # pyright: ignore
-from tagstudio.core.utils.types import unwrap
 
 logger = structlog.get_logger(__name__)
 
@@ -41,7 +40,6 @@ class RefreshTracker:
             entries = [
                 Entry(
                     path=entry_path,
-                    folder=unwrap(self.library.folder),
                     fields=[],
                     date_added=dt.now(),
                 )

src/tagstudio/core/media_types.py

@@ -12,14 +12,14 @@ import structlog
 logger = structlog.get_logger(__name__)
 
 FILETYPE_EQUIVALENTS = [
-    set(["aif", "aiff", "aifc"]),
-    set(["html", "htm", "xhtml", "shtml", "dhtml"]),
-    set(["jfif", "jpeg_large", "jpeg", "jpg_large", "jpg"]),
-    set(["json", "jsonc", "json5"]),
-    set(["md", "markdown", "mkd", "rmd"]),
-    set(["tar.gz", "tgz"]),
-    set(["xml", "xul"]),
-    set(["yaml", "yml"]),
+    {"aif", "aiff", "aifc"},
+    {"html", "htm", "xhtml", "shtml", "dhtml"},
+    {"jfif", "jpeg_large", "jpeg", "jpg_large", "jpg"},
+    {"json", "jsonc", "json5"},
+    {"md", "markdown", "mkd", "rmd"},
+    {"tar.gz", "tgz"},
+    {"xml", "xul"},
+    {"yaml", "yml"},
 ]
 
 
@@ -75,7 +75,7 @@ class MediaCategory:
         extensions (set[str]): The set of file extensions associated with this category.
             Includes leading ".", all lowercase, and does not need to be unique to this category.
 
-        is_iana (bool): Represents whether or not this is an IANA registered category.
+        is_iana (bool): Represents whether this is an IANA registered category.
     """
 
     media_type: MediaType
@@ -105,6 +105,7 @@ class MediaCategories:
     # These sets are used either individually or together to form the final sets
     # for the MediaCategory(s).
     # These sets may be combined and are NOT 1:1 with the final categories.
+    _ADOBE_ILLUSTRATOR_SET: set[str] = {".ai"}
     _ADOBE_PHOTOSHOP_SET: set[str] = {
         ".pdd",
         ".psb",
@@ -257,6 +258,7 @@ class MediaCategories:
         ".odt",
         ".pages",
         ".pdf",
+        ".pxd",
         ".rtf",
         ".tex",
         ".wpd",
@@ -303,6 +305,7 @@ class MediaCategories:
         ".nef",
         ".nrw",
         ".orf",
+        ".r3d",
         ".raf",
         ".raw",
         ".rw2",
@@ -336,7 +339,7 @@ class MediaCategories:
         ".webp",
     }
     _INSTALLER_SET: set[str] = {".appx", ".msi", ".msix"}
-    _IWORK_SET: set[str] = {".key", ".pages", ".numbers"}
+    _IWORK_SET: set[str] = {".key", ".numbers", ".pages"}
     _MATERIAL_SET: set[str] = {".mtl"}
     _MDIPACK_SET: set[str] = {".mdp"}
     _MODEL_SET: set[str] = {".3ds", ".fbx", ".obj", ".stl"}
@@ -579,7 +582,7 @@ class MediaCategories:
     )
     PDF_TYPES = MediaCategory(
         media_type=MediaType.PDF,
-        extensions=_PDF_SET,
+        extensions=_PDF_SET | _ADOBE_ILLUSTRATOR_SET,
         is_iana=False,
         name="pdf",
     )

src/tagstudio/core/utils/ffmpeg_status.py

@@ -0,0 +1,59 @@
+# SPDX-FileCopyrightText: (c) TagStudio Contributors
+# SPDX-License-Identifier: MIT
+
+
+import contextlib
+from typing import override
+
+import structlog
+
+from tagstudio.core.utils.module_status import ModuleStatus
+from tagstudio.core.utils.silent_subprocess import (
+    silent_run,  # pyright: ignore[reportUnknownVariableType]
+)
+
+logger = structlog.get_logger(__name__)
+
+
+class _FfModuleStatus(ModuleStatus):
+    """A base class that implements common logic for reading FFmpeg/FFprobe version output."""
+
+    _FFMPEG = "ffmpeg"
+    _FFPROBE = "ffprobe"
+
+    @classmethod
+    def ff_version(cls, command: str):
+        ff_cmd = cls._which(command)
+        if ff_cmd:
+            out = silent_run([ff_cmd, "-version"], shell=False, capture_output=True, text=True)
+            if out.returncode == 0:
+                with contextlib.suppress(Exception):
+                    return str(out.stdout).split(" ")[2]
+
+
+class FfmpegStatus(_FfModuleStatus):
+    """Class for getting the location and version of FFmpeg, if it exists."""
+
+    @override
+    @classmethod
+    def which(cls):
+        return cls._which(cls._FFMPEG)
+
+    @override
+    @classmethod
+    def _version(cls):
+        return cls.ff_version(cls._FFMPEG)
+
+
+class FfprobeStatus(_FfModuleStatus):
+    """Class for getting the location and version of FFprobe, if it exists."""
+
+    @override
+    @classmethod
+    def which(cls):
+        return cls._which(cls._FFPROBE)
+
+    @override
+    @classmethod
+    def _version(cls):
+        return cls.ff_version(cls._FFPROBE)

src/tagstudio/core/utils/module_status.py

@@ -0,0 +1,75 @@
+# SPDX-FileCopyrightText: (c) TagStudio Contributors
+# SPDX-License-Identifier: MIT
+
+import os
+import platform
+from shutil import which
+
+import structlog
+
+logger = structlog.get_logger(__name__)
+user = os.environ.get("USER", None)
+
+# NOTE: macOS does not make its PATH variable available to processes started outside the terminal.
+# The following is a list of common directories to search for binaries in.
+# TODO: Use a library for XDG compliance
+_MACOS_BIN_LOCATIONS: list[str] = [
+    "",  # Equates to PATH itself
+    # User level
+    "~/.local/share/bin/",  # XDG-compliant user-created bin
+    "~/.local/bin/",  # Fallback user-created bin
+    "~/.local/state/nix/profile/bin/",  # XDG-compliant home Nix bin
+    "~/.nix-profile/bin/",  # Fallback home Nix bin
+    # System level
+    f"/etc/profiles/per-user/{user}/bin/",  # Per-user Nix bin
+    "/nix/var/nix/profiles/default/bin/",  # Inherited Nix bin
+    "/opt/homebrew/bin/",  # Homebrew bin
+    "/usr/local/bin/",  # Administrator-configured bin
+    "/usr/bin/",  # System bin
+    "/bin/",  # Core system bin
+]
+
+
+class ModuleStatus:
+    """An abstract base class for module status logic including the binary location and version."""
+
+    __cached_location: str | None = None
+    __cached_version: str | None = None
+
+    @classmethod
+    def which(cls) -> str | None:
+        raise NotImplementedError()
+
+    @classmethod
+    def _cache_location(cls) -> str | None:
+        raise NotImplementedError()
+
+    @classmethod
+    def version(cls) -> str | None:
+        if cls.__cached_version is None:
+            cls.__cached_version = cls._version()
+        return cls.__cached_version
+
+    @classmethod
+    def _version(cls) -> str | None:
+        raise NotImplementedError()
+
+    @classmethod
+    def _which(cls, cmd: str) -> str | None:
+        """Internal method for determining the correct location for which().
+
+        Args:
+            cmd (str): The process command to search for.
+        """
+        if cls.__cached_location:
+            return cls.__cached_location
+
+        if platform.system() == "Darwin":
+            for loc in _MACOS_BIN_LOCATIONS:
+                full_command = which(loc + cmd)
+                if full_command:
+                    cls.__cached_location = full_command
+                    return full_command
+
+        cls.__cached_location = which(cmd)
+        return cls.__cached_location

src/tagstudio/core/utils/ripgrep_status.py

@@ -0,0 +1,34 @@
+# SPDX-FileCopyrightText: (c) TagStudio Contributors
+# SPDX-License-Identifier: MIT
+
+
+import contextlib
+from typing import override
+
+import structlog
+
+from tagstudio.core.utils.module_status import ModuleStatus
+from tagstudio.core.utils.silent_subprocess import (
+    silent_run,  # pyright: ignore[reportUnknownVariableType]
+)
+
+logger = structlog.get_logger(__name__)
+
+
+class RipgrepStatus(ModuleStatus):
+    """Class for getting the location and version of ripgrep, if it exists."""
+
+    @override
+    @classmethod
+    def which(cls):
+        return cls._which("rg")
+
+    @override
+    @classmethod
+    def _version(cls):
+        ripgrep_cmd = cls.which()
+        if ripgrep_cmd:
+            out = silent_run([ripgrep_cmd, "-V"], shell=False, capture_output=True, text=True)
+            if out.returncode == 0:
+                with contextlib.suppress(Exception):
+                    return str(out.stdout).split(" ")[1].rstrip("\n")

src/tagstudio/core/utils/str_formatting.py

@@ -49,3 +49,14 @@ def is_version_outdated(current: str, latest: str) -> bool:
         return vcur.patch < vlat.patch
     else:
         return vcur.prerelease is not None or vcur.build is not None
+
+
+def format_duration(duration: int | float) -> str:
+    """Format a duration in seconds as M:SS or H:MM:SS."""
+    try:
+        seconds = int(float(duration))
+        hours, seconds = divmod(seconds, 3600)
+        minutes, seconds = divmod(seconds, 60)
+        return f"{hours}:{minutes:02}:{seconds:02}" if hours else f"{minutes}:{seconds:02}"
+    except (OverflowError, ValueError):
+        return "-:--"

src/tagstudio/main.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # SPDX-FileCopyrightText: (c) TagStudio Contributors
 # SPDX-License-Identifier: GPL-3.0-only
 
@@ -10,7 +10,8 @@ import traceback
 
 import structlog
 
-from tagstudio.core.constants import VERSION, VERSION_BRANCH
+from tagstudio.core.constants import BUILD_TYPE, VERSION
+from tagstudio.qt.translations import Translations
 from tagstudio.qt.ts_qt import QtDriver
 
 logger = structlog.get_logger(__name__)
@@ -59,7 +60,7 @@ def main():
         "--version",
         action="version",
         help="Displays TagStudio version information.",
-        version=f"TagStudio v{VERSION} {VERSION_BRANCH}",
+        version=f"TagStudio v{VERSION} {Translations[BUILD_TYPE] if BUILD_TYPE else ''}",
     )
     args = parser.parse_args()
 

src/tagstudio/qt/controllers/autofill_line_edit.py

@@ -0,0 +1,61 @@
+# SPDX-FileCopyrightText: (c) TagStudio Contributors
+# SPDX-License-Identifier: GPL-3.0-only
+
+from typing import override
+
+import structlog
+from PySide6 import QtCore, QtGui
+from PySide6.QtCore import Signal
+from PySide6.QtWidgets import (
+    QLineEdit,
+    QWidget,
+)
+
+from tagstudio.qt.views.stylesheets.stylesheets import (
+    autofill_scroll_top_focus_style,
+    autofill_scroll_top_style,
+)
+
+logger = structlog.get_logger(__name__)
+
+
+class AutofillLineEdit(QLineEdit):
+    return_pressed = Signal()
+    shift_return_pressed = Signal()
+    shift_holding = Signal(bool)
+
+    def __init__(self, popup: QWidget) -> None:
+        super().__init__()
+        self._popup = popup
+
+    @override
+    def focusOutEvent(self, arg__1: QtGui.QFocusEvent) -> None:
+        self._popup.setStyleSheet(autofill_scroll_top_style("container"))
+        return super().focusOutEvent(arg__1)
+
+    @override
+    def focusInEvent(self, arg__1: QtGui.QFocusEvent) -> None:
+        self._popup.setStyleSheet(autofill_scroll_top_focus_style("container"))
+        return super().focusInEvent(arg__1)
+
+    @override
+    def keyPressEvent(self, arg__1: QtGui.QKeyEvent) -> None:
+        if arg__1.key() == QtCore.Qt.Key.Key_Shift:
+            self.shift_holding.emit(True)  # noqa: FBT003
+
+        if arg__1.key() == QtCore.Qt.Key.Key_Escape:
+            self.setText("")
+            self.clearFocus()
+        elif arg__1.key() == QtCore.Qt.Key.Key_Enter or arg__1.key() == QtCore.Qt.Key.Key_Return:
+            if arg__1.modifiers() and QtCore.Qt.KeyboardModifier.ShiftModifier:
+                self.shift_return_pressed.emit()
+            else:
+                self.return_pressed.emit()
+
+        return super().keyPressEvent(arg__1)
+
+    @override
+    def keyReleaseEvent(self, arg__1: QtGui.QKeyEvent) -> None:
+        if arg__1.key() == QtCore.Qt.Key.Key_Shift:
+            self.shift_holding.emit(False)  # noqa: FBT003
+        return super().keyReleaseEvent(arg__1)

src/tagstudio/qt/controllers/edit_field_template_modal.py

@@ -73,8 +73,8 @@ class EditFieldTemplateModal(EditFieldTemplateModalView):
 
         self.name_field.setStyleSheet(line_edit_style() if is_empty else "")
 
-        if self.panel_save_button is not None:
-            self.panel_save_button.setDisabled(is_empty)
+        if self.save_button is not None:
+            self.save_button.setDisabled(is_empty)
 
     def __on_type_changed(self, index: int):
         old_type = self.__field_type

src/tagstudio/qt/controllers/field_suggest_box.py

@@ -0,0 +1,151 @@
+# SPDX-FileCopyrightText: (c) TagStudio Contributors
+# SPDX-License-Identifier: GPL-3.0-only
+
+
+from typing import override
+from warnings import catch_warnings
+
+import structlog
+from PySide6.QtGui import QAction, Qt
+from PySide6.QtWidgets import QWidget
+
+from tagstudio.core.library.alchemy.fields import BaseFieldTemplate
+from tagstudio.core.library.alchemy.library import Library
+from tagstudio.qt.controllers.edit_field_template_modal import EditFieldTemplateModal
+from tagstudio.qt.controllers.field_template_widget_controller import FieldTemplateWidget
+from tagstudio.qt.controllers.modal import Modal
+from tagstudio.qt.controllers.modal_content import ModalContent
+from tagstudio.qt.controllers.suggest_box import SuggestBox
+from tagstudio.qt.controllers.underlined_widget import UnderlinedWidget
+from tagstudio.qt.global_settings import GlobalSettings
+from tagstudio.qt.translations import Translations
+
+logger = structlog.get_logger(__name__)
+
+
+class FieldSuggestBox(SuggestBox[BaseFieldTemplate]):
+    def __init__(self, library: Library, settings: GlobalSettings, placeholder_text: str = ""):
+        super().__init__(library, settings, placeholder_text)
+
+        # Context Menu Actions
+        edit_field_on_add_action = QAction(Translations["settings.edit_field_on_add"], self)
+        edit_field_on_add_action.setCheckable(True)
+        self.setContextMenuPolicy(Qt.ContextMenuPolicy.ActionsContextMenu)
+        self.addAction(edit_field_on_add_action)
+        self.layout().search_field.setContextMenuPolicy(Qt.ContextMenuPolicy.ActionsContextMenu)
+        self.layout().search_field.addAction(edit_field_on_add_action)
+        edit_field_on_add_action.setChecked(self._settings.edit_field_on_add)
+        edit_field_on_add_action.triggered.connect(
+            lambda checked: self.toggle_edit_on_field_add(checked)
+        )
+
+    def toggle_edit_on_field_add(self, checked: bool) -> None:
+        """Toggle the setting for opening the edit window after adding a field."""
+        self._settings.edit_field_on_add = checked
+        self._settings.save()
+
+    @override
+    def _on_item_create(self) -> None:
+        """Creates a new field template and adds it to the currently selected entries.
+
+        Optionally opens up an edit panel after creation and before adding to entries.
+        Populates name field using current search query.
+        """
+        # NOTE: Unlike tags, creating new field templates will ALWAYS spawn an edit window
+        # since the user needs to decide what type of field it should be before it's created.
+        query: str = self.layout().search_field.text()
+        panel = EditFieldTemplateModal()
+        modal = Modal(
+            panel,
+            Translations["field_template.new"],
+            Translations["field_template.new"],
+            is_savable=True,
+        )
+        if query.strip():
+            panel.name_field.setText(query)
+
+        modal.saved.connect(lambda: self._create_item_from_modal(panel))
+        modal.show()
+
+    @override
+    def _on_item_edit(self, item: BaseFieldTemplate) -> None:
+        panel: EditFieldTemplateModal = EditFieldTemplateModal(item)
+        modal: Modal = Modal(panel, item.name, Translations["field_template.edit"], is_savable=True)
+        modal.saved.connect(lambda: self._edit_item(panel))
+        modal.show()
+
+    @override
+    def _on_item_chosen(self, item: BaseFieldTemplate) -> None:
+        self.item_chosen.emit(item)
+        self.done.emit()
+
+    @override
+    def _search_items(self, query: str) -> tuple[list[BaseFieldTemplate], list[BaseFieldTemplate]]:
+        if query != "":
+            return self._lib.search_field_templates(name=query, limit=0), []
+        else:
+            return ([], [])
+
+    @override
+    def _set_item_widget(self, item: BaseFieldTemplate | None, index: int) -> None:
+        """Set the field template of a field template widget at a specific index."""
+        underlined_widget: UnderlinedWidget = self._get_item_widget(index, self._lib)
+        field_template_widget = underlined_widget.widget
+        assert isinstance(field_template_widget, FieldTemplateWidget)
+        field_template_widget.has_remove = False
+        field_template_widget.set_field_template(item)
+        underlined_widget.setHidden(item is None)
+
+        if item is None:
+            return
+
+        # TODO: Add tabbing to different items, and use underline to indicate which will be added
+        underlined_widget.toggle_underline(index != 0)
+
+        # Disconnect previous callbacks
+        with catch_warnings(record=True):
+            field_template_widget.on_edit.disconnect()
+            field_template_widget.on_remove.disconnect()
+            field_template_widget.on_click.disconnect()
+
+        # Connect callbacks
+        field_template_widget.on_edit.connect(lambda item_=item: self._on_item_edit(item_))
+        field_template_widget.on_click.connect(
+            lambda checked=False, item_=item: self._on_item_chosen(item_)
+        )
+
+    @override
+    def _create_item_from_modal(self, edit_item_panel: ModalContent) -> None:
+        if isinstance(edit_item_panel, EditFieldTemplateModal):
+            template: BaseFieldTemplate = edit_item_panel.build_field_template()
+            self._lib.add_field_template(template)
+            self._on_item_chosen(template)
+            self._clear_search_query()
+
+        edit_item_panel.hide()
+        self._on_search_query_changed(self.layout().search_field.text())
+
+    @override
+    def _edit_item(self, edit_item_panel: ModalContent) -> None:
+        if not isinstance(edit_item_panel, EditFieldTemplateModal):
+            return
+
+        self._lib.update_field_template(
+            edit_item_panel.old_field_type, edit_item_panel.build_field_template()
+        )
+        self._update_items(self.layout().search_field.text())
+
+    @override
+    def _get_item_widget(self, index: int, library: Library | None) -> UnderlinedWidget:
+        """Gets the item widget at a specific index."""
+        # Create any new item widgets needed up to the given index
+        if self.layout().content_layout.count() <= index:
+            while self.layout().content_layout.count() <= index:
+                field_template_widget = FieldTemplateWidget()
+                widget = UnderlinedWidget(field_template_widget)
+                widget.setHidden(True)
+                self.layout().content_layout.addWidget(widget)
+
+        widget_: QWidget = self.layout().content_layout.itemAt(index).widget()
+        assert isinstance(widget_, UnderlinedWidget)
+        return widget_

src/tagstudio/qt/controllers/field_template_search_panel_controller.py

@@ -7,57 +7,40 @@ from warnings import catch_warnings
 
 import structlog
 from PySide6.QtCore import Signal
-from PySide6.QtWidgets import QMessageBox
+from PySide6.QtWidgets import QMessageBox, QWidget
 
 from tagstudio.core.library.alchemy.fields import BaseFieldTemplate
 from tagstudio.core.library.alchemy.library import Library
 from tagstudio.qt.controllers.edit_field_template_modal import EditFieldTemplateModal
 from tagstudio.qt.controllers.field_template_widget_controller import FieldTemplateWidget
+from tagstudio.qt.controllers.modal import Modal
+from tagstudio.qt.controllers.modal_content import ModalContent
 from tagstudio.qt.controllers.search_panel_controller import SearchPanel
 from tagstudio.qt.translations import Translations
-from tagstudio.qt.views.field_template_search_panel_view import FieldTemplateSearchPanelView
-from tagstudio.qt.views.panel_modal import PanelModal, PanelWidget
+from tagstudio.qt.views.search_panel_view import SearchPanelView
 
 logger = structlog.get_logger(__name__)
 
 
-class FieldTemplateSearchModal(PanelModal):
-    def __init__(
-        self,
-        library: Library,
-        is_field_template_chooser: bool = True,
-        has_save: bool = False,
-    ) -> None:
-        self.search_panel: FieldTemplateSearchPanel = FieldTemplateSearchPanel(
-            library,
-            is_field_template_chooser,
-            view=FieldTemplateSearchPanelView(is_field_template_chooser),
-        )
-        super().__init__(
-            self.search_panel,
-            Translations["field.add.plural"],
-            is_savable=has_save,
-        )
-
-
 class FieldTemplateSearchPanel(SearchPanel[BaseFieldTemplate]):
     field_template_chosen = Signal(object)
 
     def __init__(
         self,
         library: Library,
-        is_field_template_chooser: bool = True,
-        view: FieldTemplateSearchPanelView | None = None,
+        is_chooser: bool = True,
+        view: SearchPanelView | None = None,
     ) -> None:
         super().__init__(
-            view=view or FieldTemplateSearchPanelView(is_field_template_chooser),
+            view=view
+            or SearchPanelView(Translations["home.search_field_templates"], is_chooser=is_chooser),
             exclude=[],
-            is_chooser=is_field_template_chooser,
+            is_chooser=is_chooser,
         )
         self.__lib = library
 
         self._unlimited_limit_item_label = Translations["field_template.all_field_templates"]
-        self._create_and_add_button_label_key = "field_template.create_add"
+        self._create_and_add_button_key = "field_template.create_add"
 
     @override
     def _get_max_limit(self) -> int:
@@ -76,7 +59,7 @@ class FieldTemplateSearchPanel(SearchPanel[BaseFieldTemplate]):
         logger.info("[FieldTemplateSearch] Create and Add Field Template", name=query)
 
         panel: EditFieldTemplateModal = EditFieldTemplateModal()
-        modal: PanelModal = PanelModal(
+        modal: Modal = Modal(
             panel,
             Translations["field_template.new"],
             Translations["field_template.new"],
@@ -93,7 +76,7 @@ class FieldTemplateSearchPanel(SearchPanel[BaseFieldTemplate]):
     def on_item_edit(self, item: BaseFieldTemplate) -> None:
 
         panel: EditFieldTemplateModal = EditFieldTemplateModal(item)
-        modal: PanelModal = PanelModal(
+        modal: Modal = Modal(
             panel,
             item.name,
             Translations["field_template.edit"],
@@ -105,7 +88,7 @@ class FieldTemplateSearchPanel(SearchPanel[BaseFieldTemplate]):
 
     @override
     def _on_item_remove(self, item: BaseFieldTemplate) -> None:
-        if self.is_chooser:
+        if self._is_chooser:
             return
 
         message_box = QMessageBox(
@@ -141,7 +124,7 @@ class FieldTemplateSearchPanel(SearchPanel[BaseFieldTemplate]):
         if item is None:
             return
 
-        field_template_widget.has_remove = not self.is_chooser
+        field_template_widget.has_remove = not self._is_chooser
 
         # Disconnect previous callbacks
         with catch_warnings(record=True):
@@ -157,7 +140,7 @@ class FieldTemplateSearchPanel(SearchPanel[BaseFieldTemplate]):
         )
 
     @override
-    def create_item(self, edit_item_panel: PanelWidget, choose_item: bool = False) -> None:
+    def create_item(self, edit_item_panel: ModalContent, choose_item: bool = False) -> None:
 
         if isinstance(edit_item_panel, EditFieldTemplateModal):
             template: BaseFieldTemplate = edit_item_panel.build_field_template()
@@ -171,11 +154,25 @@ class FieldTemplateSearchPanel(SearchPanel[BaseFieldTemplate]):
         self.on_search_query_changed(self.get_search_query())
 
     @override
-    def edit_item(self, edit_item_panel: PanelWidget) -> None:
+    def edit_item(self, edit_item_panel: ModalContent) -> None:
         if not isinstance(edit_item_panel, EditFieldTemplateModal):
             return
 
         self.__lib.update_field_template(
             edit_item_panel.old_field_type, edit_item_panel.build_field_template()
         )
-        self.update_items(self.search_field.text())
+        self.update_items(self.layout().search_field.text())
+
+    @override
+    def get_item_widget(self, index: int, library: Library | None) -> FieldTemplateWidget:
+        """Gets the item widget at a specific index."""
+        # Create any new item widgets needed up to the given index
+        if self.layout().scroll_layout.count() <= index:
+            while self.layout().scroll_layout.count() <= index:
+                pad_field_template_widget = FieldTemplateWidget()
+                pad_field_template_widget.setHidden(True)
+                self.layout().scroll_layout.addWidget(pad_field_template_widget)
+
+        field_template_widget: QWidget = self.layout().scroll_layout.itemAt(index).widget()
+        assert isinstance(field_template_widget, FieldTemplateWidget)
+        return field_template_widget

src/tagstudio/qt/controllers/modal.py

@@ -0,0 +1,85 @@
+# SPDX-FileCopyrightText: (c) TagStudio Contributors
+# SPDX-License-Identifier: GPL-3.0-only
+
+
+import contextlib
+from typing import Any, override
+
+import structlog
+from PySide6 import QtGui
+from PySide6.QtCore import Qt, Signal
+from PySide6.QtWidgets import QWidget
+
+from tagstudio.qt.controllers.modal_content import ModalContent
+from tagstudio.qt.views.modal_view import ModalView
+
+logger = structlog.get_logger(__name__)
+
+
+class Modal(QWidget):
+    """A generic modal window widget with common signals and styling."""
+
+    done = Signal()
+    saved = Signal()
+    saved_data = Signal(type(Any))
+
+    def __init__(
+        self,
+        content_widget: ModalContent,
+        title: str = "",
+        window_title: str | None = None,
+        is_savable: bool = False,
+        inline_title: bool = True,
+    ):
+        super().__init__()
+        self.setWindowTitle(title if window_title is None else window_title)
+        self.setWindowModality(Qt.WindowModality.ApplicationModal)
+        self.setLayout(
+            ModalView(
+                content_widget=content_widget,
+                title=title,
+                is_savable=is_savable,
+                inline_title=inline_title,
+            )
+        )
+
+        # [Done]
+        # - OR -
+        # [Cancel] [Save]
+        if not is_savable:
+            done_button = self.layout().content_widget.done_button
+            if done_button:
+                done_button.clicked.connect(self.hide)
+                done_button.clicked.connect(self.done.emit)
+        else:
+            cancel_button = self.layout().content_widget.cancel_button
+            if cancel_button:
+                cancel_button.clicked.connect(self.hide)
+                cancel_button.clicked.connect(content_widget.reset)
+
+            save_button = self.layout().content_widget.save_button
+            if save_button:
+                save_button.clicked.connect(self.hide)
+                save_button.clicked.connect(self.saved.emit)
+                save_button.clicked.connect(
+                    lambda: self.saved_data.emit(content_widget.saved_data())
+                )
+
+        content_widget.parent_post_init()
+
+    @override
+    def closeEvent(self, event: QtGui.QCloseEvent) -> None:
+        with contextlib.suppress(AttributeError):
+            cancel_button = self.layout().content_widget.cancel_button
+            if cancel_button:
+                cancel_button.click()
+        with contextlib.suppress(AttributeError):
+            done_button = self.layout().content_widget.done_button
+            if done_button:
+                done_button.click()
+        event.accept()
+
+    @override
+    def layout(self) -> ModalView:
+        """Return the typed layout for this widget."""
+        return super().layout()  # pyright: ignore[reportReturnType]

src/tagstudio/qt/controllers/modal_content.py

@@ -0,0 +1,47 @@
+# SPDX-FileCopyrightText: (c) TagStudio Contributors
+# SPDX-License-Identifier: GPL-3.0-only
+
+
+from typing import Any, override
+
+import structlog
+from PySide6 import QtCore, QtGui
+from PySide6.QtCore import Qt
+from PySide6.QtWidgets import QPushButton, QWidget
+
+logger = structlog.get_logger(__name__)
+
+
+class ModalContent(QWidget):
+    """Base class for widgets that go inside a Modal widget."""
+
+    save_button: QPushButton | None = None
+    cancel_button: QPushButton | None = None
+    done_button: QPushButton | None = None
+
+    def __init__(self):
+        super().__init__()
+
+    def saved_data(self) -> Any:  # pyright: ignore[reportExplicitAny]
+        return None
+
+    def reset(self) -> None:
+        pass
+
+    def parent_post_init(self) -> None:
+        pass
+
+    @override
+    def keyPressEvent(self, event: QtGui.QKeyEvent) -> None:
+        if event.key() == QtCore.Qt.Key.Key_Escape:
+            if self.cancel_button:
+                self.cancel_button.click()
+            elif self.done_button:
+                self.done_button.click()
+        elif event.key() == Qt.Key.Key_Return or event.key() == Qt.Key.Key_Enter:
+            if self.save_button:
+                self.save_button.click()
+            elif self.done_button:
+                self.done_button.click()
+        else:  # Other key presses
+            super().keyPressEvent(event)

src/tagstudio/qt/controllers/preview_panel_controller.py

@@ -1,62 +1,280 @@
 # SPDX-FileCopyrightText: (c) TagStudio Contributors
 # SPDX-License-Identifier: GPL-3.0-only
 
-
 import typing
-from shutil import which
+from datetime import datetime as dt
+from enum import IntEnum
+from functools import partial
+from pathlib import Path
+from typing import override
 from warnings import catch_warnings
 
-from tagstudio.core.library.alchemy.fields import BaseFieldTemplate
-from tagstudio.core.library.alchemy.library import Library
-from tagstudio.qt.controllers.field_template_search_panel_controller import FieldTemplateSearchModal
-from tagstudio.qt.controllers.tag_search_panel_controller import TagSearchModal
-from tagstudio.qt.previews.vendored.ffmpeg import FFMPEG_CMD, FFPROBE_CMD
+import structlog
+from PySide6 import QtCore
+from PySide6.QtGui import QShortcut
+from PySide6.QtWidgets import QWidget
+
+from tagstudio.core.library.alchemy.fields import (
+    BaseField,
+    BaseFieldTemplate,
+    DatetimeField,
+    DatetimeFieldTemplate,
+    TextField,
+    TextFieldTemplate,
+)
+from tagstudio.core.library.alchemy.models import Entry
+from tagstudio.core.utils.ffmpeg_status import FfmpegStatus, FfprobeStatus
+from tagstudio.core.utils.types import unwrap
+from tagstudio.qt.controllers.edit_text_controller import EditText
+from tagstudio.qt.controllers.modal import Modal
+from tagstudio.qt.mixed.datetime_picker import DatetimePicker
+from tagstudio.qt.mixed.field_containers import FieldContainers
+from tagstudio.qt.mixed.file_attributes import FileAttributeData
+from tagstudio.qt.translations import FIELD_TYPE_KEYS, Translations
 from tagstudio.qt.views.preview_panel_view import PreviewPanelView
 
 if typing.TYPE_CHECKING:
     from tagstudio.qt.ts_qt import QtDriver
 
+logger = structlog.get_logger(__name__)
 
-class PreviewPanel(PreviewPanelView):
-    def __init__(self, library: Library, driver: "QtDriver") -> None:
-        super().__init__(library, driver)
 
-        self.__add_field_modal = FieldTemplateSearchModal(self.lib, is_field_template_chooser=True)
-        self.__add_tag_modal = TagSearchModal(self.lib, is_tag_chooser=True)
-        self._thumb.check_ffmpeg.connect(self._toggle_ffmpeg_warning)
+class _ItemMode(IntEnum):
+    TAG = 1
+    FIELD = 2
 
-    @typing.override
-    def _add_field_button_callback(self) -> None:
-        self.__add_field_modal.show()
 
-    @typing.override
-    def _add_tag_button_callback(self) -> None:
-        self.__add_tag_modal.show()
+class PreviewPanel(QWidget):
+    def __init__(self, driver: "QtDriver") -> None:
+        super().__init__()
+        self._driver = driver
+        self._lib = self._driver.lib
+        self._selected: list[int]
+        self._current_stats: FileAttributeData | None = None
 
-    @typing.override
-    def _set_selection_callback(self) -> None:
-        with catch_warnings(record=True):
-            self.__add_field_modal.search_panel.field_template_chosen.disconnect()
-            self.__add_tag_modal.tsp.item_chosen.disconnect()
-
-        self.__add_field_modal.search_panel.field_template_chosen.connect(
-            self._add_field_to_selected
+        self._open_tag_search_action = QShortcut(
+            QtCore.QKeyCombination(
+                QtCore.Qt.KeyboardModifier(QtCore.Qt.KeyboardModifier.ControlModifier),
+                QtCore.Qt.Key.Key_T,
+            ),
+            self,
+        )
+        self._open_field_search_action = QShortcut(
+            QtCore.QKeyCombination(
+                QtCore.Qt.KeyboardModifier(QtCore.Qt.KeyboardModifier.ControlModifier),
+                QtCore.Qt.Key.Key_L,
+            ),
+            self,
         )
-        self.__add_tag_modal.tsp.item_chosen.connect(self._add_tag_to_selected)
 
-    def _add_field_to_selected(self, template: BaseFieldTemplate) -> None:
-        self._containers.add_field_to_selected(template)
-        if len(self._selected) == 1:
-            self._containers.update_from_entry(self._selected[0])
+        self.setLayout(PreviewPanelView(driver=driver, pixel_ratio=self.devicePixelRatio()))
+        self._set_item_mode(None)
+        self._connect_callbacks()
 
-    def _add_tag_to_selected(self, tag_id: int) -> None:
-        self._containers.add_tags_to_selected(tag_id)
-        if len(self._selected) == 1:
-            self._containers.update_from_entry(self._selected[0])
+    def _connect_callbacks(self) -> None:
+        # Tag Search
+        self.layout().add_tag_button.clicked.connect(lambda: self._set_item_mode(_ItemMode.TAG))
+        self._open_tag_search_action.activated.connect(self._open_tag_search_callback)
+        self.layout().tag_search_box.done.connect(self._tag_added_callback)
+        self.layout().containers.on_tags_update.connect(self._update_added_callback)
 
-    def _toggle_ffmpeg_warning(self, enable_warning: bool = True) -> None:
-        if enable_warning and (not which(FFMPEG_CMD) or not which(FFPROBE_CMD)):
-            self._ffmpeg_warning_widget.show()
+        # Field Search
+        self.layout().add_field_button.clicked.connect(lambda: self._set_item_mode(_ItemMode.FIELD))
+        self._open_field_search_action.activated.connect(self._open_field_search_callback)
+        self.layout().field_search_box.done.connect(self._field_added_callback)
+
+        # Previews
+        self.layout().preview_thumb.stats_updated.connect(self._thumb_stats_updated_callback)
+        self.layout().preview_thumb.check_ffmpeg.connect(self._toggle_ffmpeg_warning)
+
+    def _set_item_mode(self, mode: _ItemMode | None):
+        def hide_and_disable_buttons():
+            self.layout().add_tag_button.setHidden(True)
+            self.layout().add_tag_button.setEnabled(False)
+            self.layout().add_field_button.setHidden(True)
+            self.layout().add_field_button.setEnabled(False)
+
+        def restore_buttons():
+            self.layout().add_tag_button.setHidden(False)
+            self.layout().add_tag_button.setEnabled(True)
+            self.layout().add_field_button.setHidden(False)
+            self.layout().add_field_button.setEnabled(True)
+
+        if mode == _ItemMode.TAG:
+            self.layout().tag_search_box.added = self.layout().containers.tags
+            self.layout().field_search_box.hide_and_reset()
+            self.layout().tag_search_box.setHidden(False)
+            hide_and_disable_buttons()
+        elif mode == _ItemMode.FIELD:
+            self.layout().tag_search_box.hide_and_reset()
+            self.layout().field_search_box.setHidden(False)
+            hide_and_disable_buttons()
+        else:
+            self.layout().tag_search_box.hide_and_reset()
+            self.layout().field_search_box.hide_and_reset()
+            restore_buttons()
+
+    def _open_tag_search_callback(self) -> None:
+        self.layout().add_tag_button.setFocus()
+        self.layout().add_tag_button.click()
+
+    def _open_field_search_callback(self) -> None:
+        self.layout().add_field_button.setFocus()
+        self.layout().add_field_button.click()
+
+    def _tag_added_callback(self):
+        self._set_item_mode(None)
+        self.layout().add_tag_button.setFocus()
+
+    def _field_added_callback(self):
+        self._set_item_mode(None)
+        self.layout().add_field_button.setFocus()
+
+    def _update_added_callback(self):
+        self.layout().tag_search_box.added = self.layout().containers.tags
+
+    def _thumb_stats_updated_callback(self, filepath: Path, stats: FileAttributeData) -> None:
+        if len(self._selected) != 1:
             return
 
-        self._ffmpeg_warning_widget.hide()
+        if filepath != self.layout().preview_thumb.current_file:
+            return
+
+        if self._current_stats is None:
+            self._current_stats = FileAttributeData()
+
+        if stats.width is not None:
+            self._current_stats.width = stats.width
+        if stats.height is not None:
+            self._current_stats.height = stats.height
+        if stats.duration is not None:
+            self._current_stats.duration = stats.duration
+
+        self.layout().file_attrs.update_stats(filepath, self._current_stats)
+
+    def _set_selection_callback(self) -> None:
+        with catch_warnings(record=True):
+            self.layout().field_search_box.item_chosen.disconnect()
+            self.layout().tag_search_box.item_chosen.disconnect()
+
+        self.layout().field_search_box.item_chosen.connect(self._add_field_to_selected)
+        self.layout().tag_search_box.item_chosen.connect(self._add_tag_to_selected)
+
+    def _add_field_to_selected(self, template: BaseFieldTemplate) -> None:
+        self.layout().containers.add_field_to_selected(template)
+        # TODO: Allow editing of fields across multiple entries at once.
+        if len(self._selected) == 1:
+            if self._driver.settings.edit_field_on_add:
+                entry = unwrap(self._lib.get_entry_full(self._selected[0]))
+                entry_field = None
+                if isinstance(template, TextFieldTemplate):
+                    entry_field = entry.text_fields[-1]
+                elif isinstance(template, DatetimeFieldTemplate):
+                    entry_field = entry.datetime_fields[-1]
+                if entry_field is not None:
+                    self._edit_field(entry.id, entry_field)
+
+            self.layout().containers.update_from_entry(self._selected[0])
+
+    def _edit_field(self, entry_id: int, field: BaseField) -> None:
+        # TODO: A lot of this code is similar to or straight up shared with FieldContainers.
+        # It's possible to reuse it later, after a FieldContainers refactor.
+        field_name_key: str = FIELD_TYPE_KEYS.get(field.class_name, "field_type.unknown")
+
+        if type(field) is TextField:
+            edit_modal = Modal(
+                EditText(field.name, field.value, field.is_multiline),
+                window_title=f"{Translations['field.edit']} ({Translations[field_name_key]})",
+                is_savable=True,
+                inline_title=False,
+            )
+            edit_modal.saved_data.connect(
+                partial(self.layout().containers.update_text_field_callback, field, entry_id)
+            )
+            edit_modal.show()
+        elif type(field) is DatetimeField:
+            edit_modal = Modal(
+                DatetimePicker(self._driver, field.name, field.value or dt.now()),
+                window_title=f"{Translations['field.edit']} ({Translations[field_name_key]})",
+                is_savable=True,
+                inline_title=False,
+            )
+            edit_modal.saved_data.connect(
+                partial(self.layout().containers.update_datetime_field_callback, field, entry_id)
+            )
+            edit_modal.show()
+
+    def _add_tag_to_selected(self, tag_id: int) -> None:
+        self.layout().containers.add_tags_to_selected(tag_id)
+        if len(self._selected) == 1:
+            self.layout().containers.update_from_entry(self._selected[0])
+
+    def _toggle_ffmpeg_warning(self, enable_warning: bool = True) -> None:
+        if enable_warning and (not FfmpegStatus.which() or not FfprobeStatus.which()):
+            self.layout().warning_banner.show()
+            return
+
+        self.layout().warning_banner.hide()
+
+    def set_selection(self, selected: list[int], update_preview: bool = True) -> None:
+        """Render the panel widgets with the newest data from the Library.
+
+        Args:
+            selected  (list[int]): List of the IDs of the selected entries.
+            update_preview (bool): Should the file preview be updated?
+            (Only works with one or more items selected)
+        """
+        self._selected = selected
+        self._set_item_mode(None)
+        try:
+            # No Items Selected
+            if len(selected) == 0:
+                self.layout().preview_thumb.hide_preview()
+                self._current_stats = None
+                self.layout().file_attrs.update_stats()
+                self.layout().file_attrs.update_date_label()
+                self.layout().containers.hide_containers()
+                self.layout().add_tag_button.setEnabled(False)
+                self.layout().add_field_button.setEnabled(False)
+
+            # One Item Selected
+            elif len(selected) == 1:
+                entry_id = selected[0]
+                entry: Entry = unwrap(self._lib.get_entry(entry_id))
+
+                filepath: Path = unwrap(self._lib.library_dir) / entry.path
+                if filepath != self.layout().preview_thumb.current_file:
+                    self._current_stats = None
+
+                if update_preview:
+                    stats: FileAttributeData = self.layout().preview_thumb.display_file(filepath)
+                    self._current_stats = stats
+                    self.layout().file_attrs.update_stats(filepath, stats)
+                self.layout().file_attrs.update_date_label(filepath)
+                self.layout().containers.update_from_entry(entry_id)
+                self._set_selection_callback()
+
+            # Multiple Selected Items
+            elif len(selected) > 1:
+                # items: list[Entry] = [self.lib.get_entry_full(x) for x in self.driver.selected]
+                self.layout().preview_thumb.hide_preview()  # TODO: Render mixed selection
+                self._current_stats = None
+                self.layout().file_attrs.update_multi_selection(len(selected))
+                self.layout().file_attrs.update_date_label()
+                self.layout().containers.hide_containers()  # TODO: Allow for mixed editing
+                self._set_selection_callback()
+
+        except Exception as e:
+            logger.error("[Preview Panel] Error updating selection", error=e)
+
+    def stop_media_playback(self) -> None:
+        """Stop any media playback in the preview panel."""
+        self.layout().preview_thumb.media_player.stop()
+
+    @property
+    def containers(self) -> FieldContainers:
+        return self.layout().containers
+
+    @override
+    def layout(self) -> PreviewPanelView:
+        return super().layout()  # pyright: ignore[reportReturnType]

src/tagstudio/qt/controllers/preview_thumb_controller.py

@@ -32,8 +32,6 @@ Image.MAX_IMAGE_PIXELS = None
 
 
 class PreviewThumb(PreviewThumbView):
-    __current_file: Path
-
     def __init__(self, library: Library, driver: "QtDriver"):
         super().__init__(library, driver)
 
@@ -114,7 +112,7 @@ class PreviewThumb(PreviewThumbView):
 
     def display_file(self, filepath: Path) -> FileAttributeData:
         """Render a single file preview."""
-        self.__current_file = filepath
+        self._current_file = filepath
 
         ext = filepath.suffix.lower()
 
@@ -150,21 +148,26 @@ class PreviewThumb(PreviewThumbView):
 
     @override
     def _open_file_action_callback(self):
-        open_file(
-            self.__current_file, windows_start_command=self.__driver.settings.windows_start_command
-        )
+        if self._current_file:
+            open_file(
+                self._current_file,
+                windows_start_command=self.__driver.settings.windows_start_command,
+            )
 
     @override
     def _open_explorer_action_callback(self):
-        open_file(self.__current_file, file_manager=True)
+        if self._current_file:
+            open_file(self._current_file, file_manager=True)
 
     @override
     def _delete_action_callback(self):
-        if bool(self.__current_file):
-            self.__driver.delete_files_callback(self.__current_file)
+        if self._current_file:
+            self.__driver.delete_files_callback(self._current_file)
 
     @override
     def _button_wrapper_callback(self):
-        open_file(
-            self.__current_file, windows_start_command=self.__driver.settings.windows_start_command
-        )
+        if self._current_file:
+            open_file(
+                self._current_file,
+                windows_start_command=self.__driver.settings.windows_start_command,
+            )

src/tagstudio/qt/controllers/return_button.py

@@ -0,0 +1,27 @@
+# SPDX-FileCopyrightText: (c) TagStudio Contributors
+# SPDX-License-Identifier: GPL-3.0-only
+
+
+import typing
+from typing import override
+
+import structlog
+from PySide6 import QtCore, QtGui
+from PySide6.QtWidgets import QPushButton
+
+if typing.TYPE_CHECKING:
+    pass
+
+logger = structlog.get_logger(__name__)
+
+
+class ReturnButton(QPushButton):
+    def __init__(self, *args, **kwargs) -> None:  # pyright: ignore
+        super().__init__(*args, **kwargs)
+
+    @override
+    def keyPressEvent(self, arg__1: QtGui.QKeyEvent) -> None:
+        if self.hasFocus() and arg__1.key() in {QtCore.Qt.Key.Key_Enter, QtCore.Qt.Key.Key_Return}:
+            self.click()
+
+        super().keyPressEvent(arg__1)

src/tagstudio/qt/controllers/search_panel_controller.py

@@ -8,11 +8,11 @@ import structlog
 from PySide6 import QtCore, QtGui
 from PySide6.QtCore import Signal
 from PySide6.QtGui import QShowEvent
-from PySide6.QtWidgets import QVBoxLayout, QWidget
+from PySide6.QtWidgets import QWidget
 
 from tagstudio.core.library.alchemy.library import Library
+from tagstudio.qt.controllers.modal_content import ModalContent
 from tagstudio.qt.translations import Translations
-from tagstudio.qt.views.panel_modal import PanelWidget
 from tagstudio.qt.views.search_panel_view import SearchPanelView
 
 logger = structlog.get_logger(__name__)
@@ -40,7 +40,7 @@ def _item_name(item: object) -> str:
         raise AttributeError()
 
 
-class SearchPanel[T](PanelWidget):
+class SearchPanel[T](ModalContent):
     item_chosen = Signal(int)
 
     def __init__(
@@ -50,18 +50,18 @@ class SearchPanel[T](PanelWidget):
         is_chooser: bool = True,
     ) -> None:
         super().__init__()
-        self.view = view
-        self.is_chooser = is_chooser
-        self._layout = QVBoxLayout(self)
-        self._layout.setContentsMargins(0, 0, 0, 0)
-        self._layout.addWidget(self.view)
-        self.view.connect_callbacks(self)
         self._driver: QtDriver | None = None
-        self.exclude: list[int] = exclude or []
+        self._is_chooser = is_chooser
+        self._create_and_add_button_in_layout = False
+        self._create_and_add_button_key: str = ""
+
+        # Items
+        self._excluded: list[int] = exclude or []
+        self._search_results: list[T] = []
 
         # Limits
         self._unlimited_limit_item_label: str = "All Items"
-        self.__limit_items: list[tuple[str, int]] = [
+        self._limit_items: list[tuple[str, int]] = [
             ("25", 25),
             ("50", 50),
             ("100", 100),
@@ -69,66 +69,102 @@ class SearchPanel[T](PanelWidget):
             ("500", 500),
             (self._unlimited_limit_item_label, -1),
         ]
-        self.__default_limit_index: int = 0  # 25 Limit (Default)
-        self.__previous_limit_index: int = self.__default_limit_index
+        self._default_limit_index: int = 0  # 25 Limit (Default)
+        self._previous_limit_index: int = self._default_limit_index
 
-        self.view.set_limit_items(self.__limit_items)
-        self.view.set_limit_index(self.__default_limit_index)
+        self.setLayout(view)
+        self.set_limit_items(self._limit_items)
+        self.set_limit_index(self._default_limit_index)
+        self.setMinimumSize(300, 400)
+        self.connect_callbacks(self)
 
-        # Items
-        self._search_results: list[T] = []
+    def connect_callbacks(self, controller: "SearchPanel[Any]") -> None:  # pyright: ignore[reportExplicitAny]
+        self.layout().limit_combobox.currentIndexChanged.connect(controller.on_limit_changed)
+        self.layout().search_field.textChanged.connect(controller.on_search_query_changed)
+        self.layout().search_field.returnPressed.connect(
+            lambda: controller.on_search_query_submitted(self.get_search_query())
+        )
+        self.layout().create_button.clicked.connect(controller.on_item_create)
+        self.layout().create_and_add_button.clicked.connect(
+            lambda: controller.on_item_create(add_to_entry=True)
+        )
 
-        self._create_and_add_button_label_key: str = ""
+    def set_limit_items(self, limit_items: list[tuple[str, int]]) -> None:
+        # Remove existing limit items
+        for i in reversed(range(self.layout().limit_combobox.count())):
+            self.layout().limit_combobox.removeItem(i)
 
-    @property
-    def search_field(self):
-        return self.view.search_field
+        # Add new limit items
+        self.layout().limit_combobox.addItems([limit_item[0] for limit_item in limit_items])
 
-    @property
-    def create_and_add_button(self):
-        return self.view.create_and_add_button
+    def get_limit_index(self) -> int:
+        return self.layout().limit_combobox.currentIndex()
+
+    def set_limit_index(self, index: int) -> None:
+        self.layout().limit_combobox.setCurrentIndex(index)
+
+    def focus_search_box(self, select_all: bool = False) -> None:
+        self.layout().search_field.setFocus()
+        if select_all:
+            self.layout().search_field.selectAll()
 
     def get_search_query(self) -> str:
-        return self.view.get_search_query()
+        return self.layout().search_field.text()
 
     def clear_search_query(self) -> None:
-        self.view.clear_search_query()
+        self.layout().search_field.setText("")
+        self.focus_search_box()
 
-    def get_item_widget(self, index: int, library: Library):
-        return self.view.get_item_widget(index, library)
+    # Item list
+    def scroll_to(self, position: int) -> None:
+        self.layout().scroll_area.verticalScrollBar().setValue(position)
 
-    def set_driver(self, driver: "QtDriver") -> None:
-        self._driver = driver
+    def add_create_and_add_button(self) -> None:
+        if self._create_and_add_button_in_layout:
+            return
+        self.layout().scroll_layout.addWidget(self.layout().create_and_add_button)
+        self.layout().create_and_add_button.show()
+        self._create_and_add_button_in_layout = True
+
+    def remove_create_and_add_button(self) -> None:
+        if not self._create_and_add_button_in_layout:
+            return
+        self.layout().scroll_layout.removeWidget(self.layout().create_and_add_button)
+        self.layout().create_and_add_button.hide()
+        self._create_and_add_button_in_layout = False
+
+    def get_item_widget(self, index: int, library: Library) -> Any:  # pyright: ignore[reportExplicitAny]
+        return self.get_item_widget(index, library)
 
     def on_limit_changed(self, index: int) -> None:
         # Method was called outside the limit_combobox callback
-        if index != self.view.get_limit_index():
-            self.view.set_limit_index(index)
+        if index != self.get_limit_index():
+            self.set_limit_index(index)
 
-        if self.__previous_limit_index == index:
+        if self._previous_limit_index == index:
             return
 
-        self.update_items(self.search_field.text())
+        self.update_items(self.layout().search_field.text())
 
     def _get_limit(self) -> tuple[str, int]:
-        return self.__limit_items[self.view.get_limit_index()]
+        return self._limit_items[self.get_limit_index()]
 
     def _get_previous_limit(self) -> tuple[str, int]:
-        return self.__limit_items[self.__previous_limit_index]
+        return self._limit_items[self._previous_limit_index]
 
     def _get_max_limit(self) -> int:
         raise NotImplementedError()
 
     def on_search_query_changed(self, query: str) -> None:
-        self.create_and_add_button.setText(
-            Translations.format(self._create_and_add_button_label_key, query=query)
+        self.layout().create_and_add_button.setText(
+            Translations.format(self._create_and_add_button_key, query=query)
         )
         self.update_items(query)
 
     def on_search_query_submitted(self, query: str) -> None:
         # Focus search field if no query
         if not query:
-            self.search_field.setFocus()
+            self.layout().search_field.setFocus()
             parent: QWidget | None = self.parentWidget()
             if parent is not None:  # pyright: ignore[reportUnnecessaryComparison]
                 parent.hide()
@@ -137,7 +173,7 @@ class SearchPanel[T](PanelWidget):
         # Create and add item if no search results
         if len(self._search_results) <= 0:
             self.on_item_create(add_to_entry=True)
-        elif self.is_chooser:
+        elif self._is_chooser:
             self._on_item_chosen(self._search_results[0])
 
         self.clear_search_query()
@@ -156,14 +192,14 @@ class SearchPanel[T](PanelWidget):
         raise NotImplementedError()
 
     def _is_excluded(self, item: T) -> bool:
-        return _item_id(item) in self.exclude
+        return _item_id(item) in self._excluded
 
     def update_items(self, query: str | None = None) -> None:
         """Update the item list given a search query."""
         logger.info("[SearchPanel] Updating items", limit=self._get_limit()[1])
 
         # Remove the "Create & Add" button if one exists
-        self.view.remove_create_and_add_button()
+        self.remove_create_and_add_button()
 
         # Get results for the search query
         query_lower = "" if not query else query.lower()
@@ -205,11 +241,11 @@ class SearchPanel[T](PanelWidget):
             item: T | None = all_results[i] if i < len(all_results) else None
             self.set_item_widget(item=item, index=i)
 
-        self.__previous_limit_index = self.view.get_limit_index()
+        self._previous_limit_index = self.get_limit_index()
 
         # Add back the "Create & Add" button
         if query and query.strip():
-            self.view.add_create_and_add_button()
+            self.add_create_and_add_button()
 
     def search_items(self, query: str) -> tuple[list[T], list[T]]:  # pyright: ignore[reportUnusedParameter]
         raise NotImplementedError()
@@ -217,11 +253,16 @@ class SearchPanel[T](PanelWidget):
     def set_item_widget(self, item: T | None, index: int) -> None:  # pyright: ignore[reportUnusedParameter]
         raise NotImplementedError()
 
+    @override
+    def layout(self) -> SearchPanelView:
+        """Return the typed layout for this widget."""
+        return super().layout()  # pyright: ignore[reportReturnType]
+
     @override
     def showEvent(self, event: QShowEvent) -> None:  # noqa N802
         self.update_items()
-        self.view.scroll_to(0)
-        self.view.clear_search_query()
+        self.scroll_to(0)
+        self.clear_search_query()
         return super().showEvent(event)
 
     @override
@@ -229,13 +270,13 @@ class SearchPanel[T](PanelWidget):
         # When Escape is pressed, focus back on the search box.
         # If focus is already on the search box, close the modal.
         if event.key() == QtCore.Qt.Key.Key_Escape:
-            if self.search_field.hasFocus():
+            if self.layout().search_field.hasFocus():
                 super().keyPressEvent(event)
             else:
-                self.view.focus_search_box(select_all=True)
+                self.focus_search_box(select_all=True)
 
-    def create_item(self, edit_item_panel: PanelWidget, choose_item: bool = False) -> None:  # pyright: ignore[reportUnusedParameter]
+    def create_item(self, edit_item_panel: ModalContent, choose_item: bool = False) -> None:  # pyright: ignore[reportUnusedParameter]
         raise NotImplementedError()
 
-    def edit_item(self, edit_item_panel: PanelWidget) -> None:  # pyright: ignore[reportUnusedParameter]
+    def edit_item(self, edit_item_panel: ModalContent) -> None:  # pyright: ignore[reportUnusedParameter]
         raise NotImplementedError()

src/tagstudio/qt/controllers/suggest_box.py

@@ -0,0 +1,230 @@
+# SPDX-FileCopyrightText: (c) TagStudio Contributors
+# SPDX-License-Identifier: GPL-3.0-only
+
+from typing import Any, override
+
+import structlog
+from PySide6.QtCore import Signal
+from PySide6.QtGui import QShowEvent
+from PySide6.QtWidgets import QGraphicsOpacityEffect, QWidget
+
+from tagstudio.core.library.alchemy.library import Library
+from tagstudio.qt.controllers.autofill_line_edit import QtCore, QtGui
+from tagstudio.qt.controllers.modal_content import ModalContent
+from tagstudio.qt.controllers.underlined_widget import UnderlinedWidget
+from tagstudio.qt.global_settings import GlobalSettings
+from tagstudio.qt.views.stylesheets.stylesheets import (
+    autofill_line_edit_style,
+    autofill_line_edit_top_style,
+)
+from tagstudio.qt.views.suggest_box_view import SuggestBoxView
+
+logger = structlog.get_logger(__name__)
+
+
+def _item_id(item: object) -> int:
+    item_id: Any = getattr(item, "id")  # noqa: B009  # pyright: ignore[reportExplicitAny]
+
+    if isinstance(item_id, int):
+        return item_id
+    else:
+        raise AttributeError()
+
+
+def _item_name(item: object) -> str:
+    item_name: Any = getattr(item, "name")  # noqa: B009  # pyright: ignore[reportExplicitAny]
+
+    if isinstance(item_name, str):
+        return item_name
+    else:
+        raise AttributeError()
+
+
+class SuggestBox[T](QWidget):
+    item_chosen = Signal(object)
+    done = Signal()
+
+    def __init__(
+        self, library: Library, settings: GlobalSettings, placeholder_text: str = ""
+    ) -> None:
+        super().__init__()
+        self._lib = library
+        self._settings = settings
+        self._limit = 5
+        self._is_shift_held = False
+        self._search_results: list[T] = []
+        self.added: list[int] = []
+        self.excluded: list[int] = []
+
+        self.setLayout(SuggestBoxView(placeholder_text))
+        self._connect_callbacks()
+
+    def set_placeholder_text(self, text: str) -> None:
+        self.layout().search_field.setPlaceholderText(text)
+
+    def hide_and_reset(self) -> None:
+        self.hide()
+        self.layout().search_field.setDisabled(True)
+        self._on_shift_held(held=False)
+
+    def _connect_callbacks(self) -> None:
+        self.layout().search_field.textChanged.connect(self._on_search_query_changed)
+        self.layout().search_field.editingFinished.connect(self._editing_finished_callback)
+        self.layout().search_field.return_pressed.connect(
+            lambda: self._on_search_query_submitted(self.layout().search_field.text())
+        )
+        self.layout().search_field.shift_return_pressed.connect(
+            lambda: self._on_search_query_submitted(
+                self.layout().search_field.text(), always_create=True
+            )
+        )
+
+        self.layout().search_field.shift_holding.connect(lambda held: self._on_shift_held(held))
+
+    def _on_shift_held(self, held: bool) -> None:
+        if held:
+            self._is_shift_held = True
+            opacity_effect = QGraphicsOpacityEffect(self)
+            opacity_effect.setOpacity(0.3)
+            if self.layout().content_layout.count() > 0:
+                underlined_widget = self.layout().content_layout.itemAt(0).widget()
+                assert isinstance(underlined_widget, UnderlinedWidget)
+                underlined_widget.widget.setGraphicsEffect(opacity_effect)
+        else:
+            self._is_shift_held = False
+            if self.layout().content_layout.count() > 0:
+                underlined_widget = self.layout().content_layout.itemAt(0).widget()
+                assert isinstance(underlined_widget, UnderlinedWidget)
+                underlined_widget.widget.setGraphicsEffect(None)  # pyright: ignore[reportArgumentType]
+
+    def _clear_search_query(self) -> None:
+        self.layout().search_field.setText("")
+
+    def _get_item_widget(self, index: int, library: Library) -> Any:  # pyright: ignore
+        raise NotImplementedError()
+
+    def _on_search_query_changed(self, query: str) -> None:
+        self._update_items(query)
+
+    def _on_search_query_submitted(self, query: str, always_create: bool = False) -> None:
+        # Focus search field if no query
+        logger.info("Query submitted")
+        if not query:
+            self.done.emit()
+            self.hide_and_reset()
+            return
+        elif not self.isHidden():
+            self.layout().search_field.setFocus()
+
+        # Create and add item if no search results
+        if (len(self._search_results) <= 0) or always_create:
+            self._on_item_create()
+        else:
+            self._on_item_chosen(self._search_results[0])
+
+        self._clear_search_query()
+        self._update_items()
+
+    def _on_item_create(self) -> None:
+        raise NotImplementedError()
+
+    def _on_item_edit(self, item: T) -> None:  # pyright: ignore[reportUnusedParameter]
+        raise NotImplementedError()
+
+    def _on_item_chosen(self, item: T) -> None:  # pyright: ignore[reportUnusedParameter]
+        raise NotImplementedError()
+
+    def _is_excluded(self, item: T) -> bool:
+        return _item_id(item) in self.excluded
+
+    def _update_items(self, query: str | None = None) -> None:
+        """Update the item list given a search query."""
+        logger.info("[SearchPanel] Updating items", limit=self._limit)
+
+        # Get results for the search query
+        query_lower = "" if not query else query.lower()
+        search_results: tuple[list[T], list[T]] = self._search_items(query_lower)
+
+        # Sort and prioritize the results
+        direct_results = list({item for item in search_results[0] if not self._is_excluded(item)})
+        direct_results.sort(key=lambda item: _item_name(item).lower())
+
+        ancestor_results = list({item for item in search_results[1] if not self._is_excluded(item)})
+        ancestor_results.sort(key=lambda item: _item_name(item).lower())
+
+        raw_results = list(direct_results + ancestor_results)
+        priority_results: set[T] = set()
+
+        if query and query.strip():
+            for raw_item in raw_results:
+                if _item_name(raw_item).lower().startswith(query_lower):
+                    priority_results.add(raw_item)
+
+        all_results: list[T] = sorted(list(priority_results), key=lambda i: len(_item_name(i))) + [
+            item for item in raw_results if item not in priority_results
+        ]
+
+        # Target items already added to a selection and move them to the end of the list
+        already_added: list[T] = [i for i in all_results if _item_id(i) in self.added]
+        for item in already_added:
+            if item in all_results:
+                all_results.remove(item)
+        all_results = all_results + already_added
+
+        if self._limit > 0:
+            all_results = all_results[: self._limit]
+
+        self._search_results = all_results
+        logger.info("[SearchPanel] Search results", results=self._search_results)
+
+        for i in range(0, self._limit):
+            item: T | None = all_results[i] if i < len(all_results) else None
+            self._set_item_widget(item=item, index=i)
+
+        if self.layout().content_layout.isEmpty():
+            self.layout().scroll_area.setHidden(True)
+            self.layout().content_layout.setContentsMargins(0, 0, 0, 0)
+            self.layout().search_field.setStyleSheet(autofill_line_edit_style())
+        else:
+            self.layout().scroll_area.setHidden(False)
+            self.layout().content_layout.setContentsMargins(6, 6, 6, 6)
+            self.layout().search_field.setStyleSheet(autofill_line_edit_top_style())
+
+    def _search_items(self, query: str) -> tuple[list[T], list[T]]:  # pyright: ignore[reportUnusedParameter]
+        raise NotImplementedError()
+
+    def _set_item_widget(self, item: T | None, index: int) -> None:  # pyright: ignore[reportUnusedParameter]
+        raise NotImplementedError()
+
+    def _editing_finished_callback(self) -> None:
+        if self.layout().search_field.text() == "":
+            self.done.emit()
+            self.hide_and_reset()
+
+    def _create_item_from_modal(self, edit_item_panel: ModalContent) -> None:  # pyright: ignore[reportUnusedParameter]
+        raise NotImplementedError()
+
+    def _edit_item(self, edit_item_panel: ModalContent) -> None:  # pyright: ignore[reportUnusedParameter]
+        raise NotImplementedError()
+
+    @override
+    def showEvent(self, event: QShowEvent) -> None:
+        self._update_items()
+        self._on_shift_held(held=False)
+        self.layout().search_field.setDisabled(False)
+        self._clear_search_query()
+        return super().showEvent(event)
+
+    @override
+    def layout(self) -> SuggestBoxView:
+        return super().layout()  # pyright: ignore[reportReturnType]
+
+    @override
+    def keyPressEvent(self, event: QtGui.QKeyEvent) -> None:
+        # When Escape is pressed, focus back on the search box.
+        if event.key() in {
+            QtCore.Qt.Key.Key_Escape,
+            QtCore.Qt.Key.Key_Enter,
+            QtCore.Qt.Key.Key_Return,
+        }:
+            self.hide_and_reset()

src/tagstudio/qt/controllers/tag_box_controller.py

@@ -12,8 +12,8 @@ from tagstudio.core.enums import TagClickActionOption
 from tagstudio.core.library.alchemy.enums import BrowsingState
 from tagstudio.core.library.alchemy.models import Tag
 from tagstudio.core.utils.types import unwrap
+from tagstudio.qt.controllers.modal import Modal
 from tagstudio.qt.mixed.build_tag import BuildTagPanel
-from tagstudio.qt.views.panel_modal import PanelModal
 from tagstudio.qt.views.tag_box_view import TagBoxWidgetView
 
 if TYPE_CHECKING:
@@ -74,7 +74,7 @@ class TagBoxWidget(TagBoxWidgetView):
     def _on_edit(self, tag: Tag) -> None:
         build_tag_panel = BuildTagPanel(self.__driver.lib, tag=tag)
 
-        edit_modal = PanelModal(
+        edit_modal = Modal(
             build_tag_panel,
             self.__driver.lib.tag_display_name(tag),
             "Edit Tag",

src/tagstudio/qt/controllers/tag_search_panel_controller.py

@@ -2,73 +2,48 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
 
-from typing import TYPE_CHECKING, override
+from typing import override
 from warnings import catch_warnings
 
 import structlog
-from PySide6.QtWidgets import QMessageBox
+from PySide6.QtCore import Signal
+from PySide6.QtWidgets import QMessageBox, QWidget
 
 from tagstudio.core.constants import RESERVED_TAG_END, RESERVED_TAG_START
-from tagstudio.core.library.alchemy.enums import BrowsingState
 from tagstudio.core.library.alchemy.library import Library
 from tagstudio.core.library.alchemy.models import Tag
+from tagstudio.qt.controllers.modal import Modal
+from tagstudio.qt.controllers.modal_content import ModalContent
 from tagstudio.qt.controllers.search_panel_controller import SearchPanel
 from tagstudio.qt.mixed.tag_widget import TagWidget
 from tagstudio.qt.translations import Translations
-from tagstudio.qt.views.panel_modal import PanelModal, PanelWidget
-from tagstudio.qt.views.tag_search_panel_view import TagSearchPanelView
+from tagstudio.qt.views.search_panel_view import SearchPanelView
 
 logger = structlog.get_logger(__name__)
 
-# Only import for type checking/autocompletion, will not be imported at runtime.
-if TYPE_CHECKING:
-    pass
-
-
-class TagSearchModal(PanelModal):
-    tsp: "TagSearchPanel"
-
-    def __init__(
-        self,
-        library: Library,
-        exclude: list[int] | None = None,
-        is_tag_chooser: bool = True,
-        has_save: bool = False,
-    ):
-        self.tsp = TagSearchPanel(
-            library,
-            exclude,
-            is_tag_chooser,
-            view=TagSearchPanelView(is_tag_chooser),
-        )
-        super().__init__(
-            self.tsp,
-            Translations["tag.add.plural"],
-            is_savable=has_save,
-        )
-
 
 class TagSearchPanel(SearchPanel[Tag]):
+    search_for_tag = Signal(int)
+
     def __init__(
         self,
         library: Library,
         exclude: list[int] | None = None,
-        is_tag_chooser: bool = True,
-        view: TagSearchPanelView | None = None,
+        is_chooser: bool = True,
+        view: SearchPanelView | None = None,
     ):
         super().__init__(
-            view=view or TagSearchPanelView(is_tag_chooser),
+            view=view or SearchPanelView(Translations["home.search_tags"], is_chooser=is_chooser),
             exclude=exclude,
-            is_chooser=is_tag_chooser,
+            is_chooser=is_chooser,
         )
-        self.__lib = library
-
+        self._lib = library
         self._unlimited_limit_item_label = Translations["tag.all_tags"]
-        self._create_and_add_button_label_key = "tag.create_add"
+        self._create_and_add_button_key = "tag.create_add"
 
     @override
     def _get_max_limit(self) -> int:
-        return len(self.__lib.tags)
+        return len(self._lib.tags)
 
     @override
     def on_item_create(self, add_to_entry: bool = False) -> None:
@@ -83,9 +58,8 @@ class TagSearchPanel(SearchPanel[Tag]):
         from tagstudio.qt.mixed.build_tag import BuildTagPanel  # here due to circular imports
 
         query: str = self.get_search_query()
-
-        panel: BuildTagPanel = BuildTagPanel(self.__lib)
-        modal: PanelModal = PanelModal(
+        panel: BuildTagPanel = BuildTagPanel(self._lib)
+        modal: Modal = Modal(
             panel,
             Translations["tag.new"],
             Translations["tag.add"] if add_to_entry else Translations["tag.new"],
@@ -103,10 +77,10 @@ class TagSearchPanel(SearchPanel[Tag]):
         # TODO: Move this to a top-level import
         from tagstudio.qt.mixed.build_tag import BuildTagPanel  # here due to circular imports
 
-        edit_tag_panel: BuildTagPanel = BuildTagPanel(self.__lib, tag=item)
-        edit_tag_modal: PanelModal = PanelModal(
+        edit_tag_panel: BuildTagPanel = BuildTagPanel(self._lib, tag=item)
+        edit_tag_modal: Modal = Modal(
             edit_tag_panel,
-            self.__lib.tag_display_name(item),
+            self._lib.tag_display_name(item),
             Translations["tag.edit"],
             is_savable=True,
         )
@@ -115,7 +89,7 @@ class TagSearchPanel(SearchPanel[Tag]):
 
     @override
     def _on_item_remove(self, item: Tag) -> None:
-        if self.is_chooser:
+        if self._is_chooser:
             return
 
         if item.id in range(RESERVED_TAG_START, RESERVED_TAG_END):
@@ -124,7 +98,7 @@ class TagSearchPanel(SearchPanel[Tag]):
         message_box = QMessageBox(
             QMessageBox.Icon.Question,
             Translations["tag.remove"],
-            Translations.format("tag.confirm_delete", tag_name=self.__lib.tag_display_name(item)),
+            Translations.format("tag.confirm_delete", tag_name=self._lib.tag_display_name(item)),
             QMessageBox.StandardButton.Ok | QMessageBox.StandardButton.Cancel,
         )
 
@@ -133,7 +107,7 @@ class TagSearchPanel(SearchPanel[Tag]):
         if result != QMessageBox.StandardButton.Ok:
             return
 
-        self.__lib.remove_tag(item.id)
+        self._lib.remove_tag(item.id)
         self.update_items(self.get_search_query())
 
     @override
@@ -142,12 +116,12 @@ class TagSearchPanel(SearchPanel[Tag]):
 
     @override
     def search_items(self, query: str) -> tuple[list[Tag], list[Tag]]:
-        return self.__lib.search_tags(name=query, limit=self._get_limit()[1])
+        return self._lib.search_tags(name=query, limit=self._get_limit()[1])
 
     @override
     def set_item_widget(self, item: Tag | None, index: int) -> None:
         """Set the tag of a tag widget at a specific index."""
-        tag_widget: TagWidget = self.get_item_widget(index, self.__lib)
+        tag_widget: TagWidget = self.get_item_widget(index, self._lib)
         tag_widget.set_tag(item)
         tag_widget.setHidden(item is None)
 
@@ -155,7 +129,7 @@ class TagSearchPanel(SearchPanel[Tag]):
             return
         assert item is not None
 
-        tag_widget.has_remove = not self.is_chooser and item.id not in range(
+        tag_widget.has_remove = not self._is_chooser and item.id not in range(
             RESERVED_TAG_START, RESERVED_TAG_END
         )
 
@@ -169,27 +143,29 @@ class TagSearchPanel(SearchPanel[Tag]):
         # Connect callbacks
         tag_widget.on_edit.connect(lambda edit_tag=item: self.on_item_edit(edit_tag))
         tag_widget.on_remove.connect(lambda remove_tag=item: self._on_item_remove(remove_tag))
-        tag_widget.bg_button.clicked.connect(
-            lambda checked=False, tag=item: self._on_item_chosen(tag)
-        )
+        if self._is_chooser:
+            tag_widget.bg_button.clicked.connect(
+                lambda checked=False, tag=item: self._on_item_chosen(tag)
+            )
+        else:
+            tag_widget.bg_button.clicked.connect(
+                lambda checked=False, edit_tag=item: self.on_item_edit(edit_tag)
+            )
 
         # Connect search action
-        if self._driver is not None:
-            tag_widget.search_for_tag_action.triggered.connect(
-                lambda tag_id=item.id: self.search_for_tag(tag_id)
-            )
-            tag_widget.search_for_tag_action.setEnabled(True)
-        else:
-            tag_widget.search_for_tag_action.setEnabled(False)
+        tag_widget.search_for_tag_action.triggered.connect(
+            lambda checked=False, tag_id=item.id: self.search_for_tag.emit(tag_id)
+        )
+        tag_widget.search_for_tag_action.setEnabled(True)
 
     @override
-    def create_item(self, edit_item_panel: PanelWidget, choose_item: bool = False) -> None:
+    def create_item(self, edit_item_panel: ModalContent, choose_item: bool = False) -> None:
         # TODO: Move this to a top-level import
         from tagstudio.qt.mixed.build_tag import BuildTagPanel  # here due to circular imports
 
         if isinstance(edit_item_panel, BuildTagPanel):
             tag: Tag = edit_item_panel.build_tag()
-            self.__lib.add_tag(
+            self._lib.add_tag(
                 tag, parent_ids=edit_item_panel.parent_ids, aliases=edit_item_panel.aliases
             )
 
@@ -201,25 +177,32 @@ class TagSearchPanel(SearchPanel[Tag]):
         self.on_search_query_changed(self.get_search_query())
 
     @override
-    def edit_item(self, edit_item_panel: PanelWidget) -> None:
+    def edit_item(self, edit_item_panel: ModalContent) -> None:
         # TODO: Move this to a top-level import
         from tagstudio.qt.mixed.build_tag import BuildTagPanel  # here due to circular imports
 
         if not isinstance(edit_item_panel, BuildTagPanel):
             return
 
-        self.__lib.update_tag(
+        self._lib.update_tag(
             tag=edit_item_panel.build_tag(),
             parent_ids=edit_item_panel.parent_ids,
             aliases=edit_item_panel.aliases,
         )
-        self.update_items(self.search_field.text())
+        self.update_items(self.layout().search_field.text())
 
-    def search_for_tag(self, tag_id: int) -> None:
-        if self._driver is None:
-            return
+    @override
+    def get_item_widget(self, index: int, library: Library | None) -> TagWidget:
+        """Gets the item widget at a specific index."""
+        # Create any new item widgets needed up to the given index
+        if self.layout().scroll_layout.count() <= index:
+            while self.layout().scroll_layout.count() <= index:
+                pad_tag_widget = TagWidget(
+                    tag=None, has_edit=True, has_remove=True, library=library
+                )
+                pad_tag_widget.setHidden(True)
+                self.layout().scroll_layout.addWidget(pad_tag_widget)
 
-        self._driver.main_window.search_field.setText(f"tag_id:{tag_id}")
-        self._driver.update_browsing_state(
-            BrowsingState.from_tag_id(tag_id, self._driver.browsing_history.current)
-        )
+        tag_widget: QWidget = self.layout().scroll_layout.itemAt(index).widget()
+        assert isinstance(tag_widget, TagWidget)
+        return tag_widget

src/tagstudio/qt/controllers/tag_suggest_box.py

@@ -0,0 +1,178 @@
+# SPDX-FileCopyrightText: (c) TagStudio Contributors
+# SPDX-License-Identifier: GPL-3.0-only
+
+
+from typing import override
+from warnings import catch_warnings
+
+import structlog
+from PySide6.QtCore import Signal
+from PySide6.QtGui import QAction, Qt
+from PySide6.QtWidgets import QGraphicsOpacityEffect, QWidget
+
+from tagstudio.core.library.alchemy.library import Library
+from tagstudio.core.library.alchemy.models import Tag
+from tagstudio.qt.controllers.modal import Modal
+from tagstudio.qt.controllers.modal_content import ModalContent
+from tagstudio.qt.controllers.suggest_box import SuggestBox
+from tagstudio.qt.controllers.underlined_widget import UnderlinedWidget
+from tagstudio.qt.global_settings import GlobalSettings
+from tagstudio.qt.mixed.build_tag import BuildTagPanel
+from tagstudio.qt.mixed.tag_widget import TagWidget
+from tagstudio.qt.translations import Translations
+
+logger = structlog.get_logger(__name__)
+
+
+class TagSuggestBox(SuggestBox[Tag]):
+    search_for_tag = Signal(int)
+
+    def __init__(
+        self, library: Library, settings: GlobalSettings, placeholder_text: str = ""
+    ) -> None:
+        super().__init__(library, settings, placeholder_text)
+
+        # Context Menu Actions
+        edit_tag_on_create_action = QAction(Translations["settings.edit_tag_on_create"], self)
+        edit_tag_on_create_action.setCheckable(True)
+        self.setContextMenuPolicy(Qt.ContextMenuPolicy.ActionsContextMenu)
+        self.addAction(edit_tag_on_create_action)
+        self.layout().search_field.setContextMenuPolicy(Qt.ContextMenuPolicy.ActionsContextMenu)
+        self.layout().search_field.addAction(edit_tag_on_create_action)
+        edit_tag_on_create_action.setChecked(self._settings.edit_tag_on_create)
+        edit_tag_on_create_action.triggered.connect(
+            lambda checked: self.toggle_edit_on_tag_create(checked)
+        )
+
+    def toggle_edit_on_tag_create(self, checked: bool) -> None:
+        """Toggle the setting for opening the edit window after creating a tag."""
+        self._settings.edit_tag_on_create = checked
+        self._settings.save()
+
+    @override
+    def _on_item_create(self) -> None:
+        """Creates a new tag and adds it to the currently selected entries.
+
+        Optionally opens up an edit panel after creation and before adding to entries.
+        Populates name field using current search query.
+        """
+        query: str = self.layout().search_field.text()
+
+        if self._settings.edit_tag_on_create:
+            panel: BuildTagPanel = BuildTagPanel(self._lib)
+            modal: Modal = Modal(
+                panel, Translations["tag.new"], Translations["tag.new"], is_savable=True
+            )
+            if query.strip():
+                panel.name_field.setText(query)
+
+            modal.saved.connect(lambda: self._create_item_from_modal(panel))
+            modal.show()
+        else:
+            tag = Tag(name=query)
+            self._lib.add_tag(tag)
+            self._on_item_chosen(tag)
+            self._clear_search_query()
+
+    @override
+    def _on_item_edit(self, item: Tag) -> None:
+        edit_tag_panel: BuildTagPanel = BuildTagPanel(self._lib, tag=item)
+        edit_tag_modal: Modal = Modal(
+            edit_tag_panel,
+            self._lib.tag_display_name(item),
+            Translations["tag.edit"],
+            is_savable=True,
+        )
+        edit_tag_modal.saved.connect(lambda: self._edit_item(edit_tag_panel))
+        edit_tag_modal.show()
+
+    @override
+    def _on_item_chosen(self, item: Tag) -> None:
+        self.item_chosen.emit(item.id)
+        self.done.emit()
+
+    @override
+    def _search_items(self, query: str) -> tuple[list[Tag], list[Tag]]:
+        if query != "":
+            return self._lib.search_tags(name=query, limit=0)
+        else:
+            return ([], [])
+
+    @override
+    def _set_item_widget(self, item: Tag | None, index: int) -> None:
+        """Set the tag of a tag widget at a specific index."""
+        underlined_widget: UnderlinedWidget = self._get_item_widget(index, self._lib)
+        tag_widget = underlined_widget.widget
+        assert isinstance(tag_widget, TagWidget)
+        tag_widget.has_remove = False
+        tag_widget.set_tag(item)
+        underlined_widget.setHidden(item is None)
+        opacity_effect = QGraphicsOpacityEffect(self)
+        opacity_effect.setOpacity(0.3)
+        if item and item.id in self.added:
+            tag_widget.setGraphicsEffect(opacity_effect)
+        else:
+            tag_widget.setGraphicsEffect(None)  # pyright: ignore[reportArgumentType]
+
+        if item is None:
+            return
+
+        # TODO: Add tabbing to different items, and use underline to indicate which will be added
+        underlined_widget.toggle_underline(index != 0)
+
+        # Disconnect previous callbacks
+        with catch_warnings(record=True):
+            tag_widget.on_edit.disconnect()
+            tag_widget.bg_button.clicked.disconnect()
+            tag_widget.search_for_tag_action.triggered.disconnect()
+
+        # Connect callbacks
+        tag_widget.on_edit.connect(lambda edit_tag=item: self._on_item_edit(edit_tag))
+        tag_widget.bg_button.clicked.connect(
+            lambda checked=False, tag=item: self._on_item_chosen(tag)
+        )
+        tag_widget.search_for_tag_action.triggered.connect(
+            lambda checked=False, tag_id=item.id: self.search_for_tag.emit(tag_id)
+        )
+        tag_widget.search_for_tag_action.setEnabled(True)
+
+    @override
+    def _create_item_from_modal(self, edit_item_panel: ModalContent) -> None:
+        if isinstance(edit_item_panel, BuildTagPanel):
+            tag: Tag = edit_item_panel.build_tag()
+            self._lib.add_tag(
+                tag, parent_ids=edit_item_panel.parent_ids, aliases=edit_item_panel.aliases
+            )
+            self._on_item_chosen(tag)
+            self._clear_search_query()
+
+        edit_item_panel.hide()
+        self._on_search_query_changed(self.layout().search_field.text())
+
+    @override
+    def _edit_item(self, edit_item_panel: ModalContent) -> None:
+        if not isinstance(edit_item_panel, BuildTagPanel):
+            return
+
+        self._lib.update_tag(
+            tag=edit_item_panel.build_tag(),
+            parent_ids=edit_item_panel.parent_ids,
+            aliases=edit_item_panel.aliases,
+        )
+        self._update_items(self.layout().search_field.text())
+
+    @override
+    def _get_item_widget(self, index: int, library: Library | None) -> UnderlinedWidget:
+        """Gets the item widget at a specific index."""
+        # Create any new item widgets needed up to the given index
+        if self.layout().content_layout.count() <= index:
+            while self.layout().content_layout.count() <= index:
+                tag_widget = TagWidget(tag=None, has_edit=True, has_remove=True, library=library)
+                tag_widget.on_remove.connect(self._update_items)
+                widget = UnderlinedWidget(tag_widget)
+                widget.setHidden(True)
+                self.layout().content_layout.addWidget(widget)
+
+        widget_: QWidget = self.layout().content_layout.itemAt(index).widget()
+        assert isinstance(widget_, UnderlinedWidget)
+        return widget_

src/tagstudio/qt/controllers/underlined_widget.py

@@ -0,0 +1,26 @@
+# SPDX-FileCopyrightText: (c) TagStudio Contributors
+# SPDX-License-Identifier: GPL-3.0-only
+
+
+from typing import override
+
+from PySide6.QtWidgets import QWidget
+
+from tagstudio.qt.views.underlined_widget_view import UnderlinedWidgetView
+
+
+class UnderlinedWidget(QWidget):
+    def __init__(self, widget: QWidget) -> None:
+        super().__init__()
+        self.setLayout(UnderlinedWidgetView(widget))
+
+    def toggle_underline(self, is_hidden: bool) -> None:
+        self.layout().underline.setHidden(is_hidden)
+
+    @property
+    def widget(self) -> QWidget:
+        return self.layout().itemAt(0).widget()
+
+    @override
+    def layout(self) -> UnderlinedWidgetView:
+        return super().layout()  # pyright: ignore[reportReturnType]

src/tagstudio/qt/global_settings.py

@@ -74,6 +74,8 @@ class GlobalSettings(BaseModel):
     infinite_scroll: bool = Field(default=True)
     show_filepath: ShowFilepathOption = Field(default=ShowFilepathOption.DEFAULT)
     tag_click_action: TagClickActionOption = Field(default=TagClickActionOption.DEFAULT)
+    edit_tag_on_create: bool = Field(default=False)
+    edit_field_on_add: bool = Field(default=True)
     theme: Theme = Field(default=Theme.SYSTEM)
     splash: Splash = Field(default=Splash.DEFAULT)
     windows_start_command: bool = Field(default=False)

src/tagstudio/qt/helpers/file_tester.py

@@ -6,9 +6,7 @@ from pathlib import Path
 
 import ffmpeg
 
-from tagstudio.qt.previews.vendored.ffmpeg import (
-    probe,  # pyright: ignore[reportUnknownVariableType]
-)
+from tagstudio.renderers.vendored.probe import probe
 
 
 def is_readable_video(filepath: Path | str):
@@ -21,13 +19,11 @@ def is_readable_video(filepath: Path | str):
     """
     try:
         result = probe(Path(filepath))
+        if not result:
+            return False
         for stream in result["streams"]:
             # DRM check
-            if stream.get("codec_tag_string") in [
-                "drma",
-                "drms",
-                "drmi",
-            ]:
+            if stream.get("codec_tag_string") in ["drma", "drms", "drmi"]:
                 return False
     except ffmpeg.Error:
         return False

src/tagstudio/qt/mixed/about_modal.py

@@ -4,7 +4,6 @@
 
 import math
 from pathlib import Path
-from shutil import which
 
 from PIL import ImageQt
 from PySide6.QtCore import QSize, Qt
@@ -20,29 +19,35 @@ from PySide6.QtWidgets import (
 )
 
 from tagstudio.core.constants import (
+    BUILD_TYPE,
     COPYRIGHT,
     DISCORD_URL,
     DOCS_URL,
     GITHUB_REPO_URL,
     VERSION,
-    VERSION_BRANCH,
 )
 from tagstudio.core.ts_core import TagStudioCore
+from tagstudio.core.utils.ffmpeg_status import FfmpegStatus, FfprobeStatus
+from tagstudio.core.utils.ripgrep_status import RipgrepStatus
 from tagstudio.core.utils.str_formatting import is_version_outdated
 from tagstudio.core.utils.types import unwrap
 from tagstudio.qt.controllers.clickable_label import ClickableLabel
 from tagstudio.qt.models.palette import ColorType, UiColor, get_ui_color
-from tagstudio.qt.previews.vendored import ffmpeg
 from tagstudio.qt.resource_manager import ResourceManager
 from tagstudio.qt.translations import Translations
 from tagstudio.qt.utils.file_opener import open_file
-from tagstudio.qt.views.stylesheets.stylesheets import form_content_style
+from tagstudio.qt.views.stylesheets.stylesheets import form_content_style, header
 
 
 class AboutModal(QWidget):
     """Modal window showing information about the TagStudio application."""
 
-    VERSION_STR: str = f"{Translations['about.version']} {VERSION} {(' (' + VERSION_BRANCH + ')') if VERSION_BRANCH else ''}"  # noqa: E501
+    VERSION_STR: str = " ".join(
+        [
+            f"{Translations['about.version']}",
+            f"{VERSION} {(' (' + Translations[BUILD_TYPE] + ')') if BUILD_TYPE else ''}",
+        ]
+    )
 
     def __init__(self, config_path: Path | str):
         super().__init__()
@@ -66,6 +71,10 @@ class AboutModal(QWidget):
         self.content_layout.setContentsMargins(12, 12, 12, 12)
         self.content_layout.setSpacing(12)
 
+        red = get_ui_color(ColorType.PRIMARY, UiColor.RED)
+        green = get_ui_color(ColorType.PRIMARY, UiColor.GREEN)
+        amber = get_ui_color(ColorType.PRIMARY, UiColor.AMBER)
+
         # TagStudio Logo -------------------------------------------------------
         self.logo_widget = QLabel()
         self.logo_pixmap = QPixmap.fromImage(ImageQt.ImageQt(self.rm.ts_logo_text_color))
@@ -78,7 +87,7 @@ class AboutModal(QWidget):
         self.logo_widget.setAlignment(Qt.AlignmentFlag.AlignCenter)
 
         # Version --------------------------------------------------------------
-        self.version_label = QLabel(f"<h3>{AboutModal.VERSION_STR}</h3>")
+        self.version_label = QLabel(header(AboutModal.VERSION_STR, 3))
         self.version_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
 
         # Copyright ------------------------------------------------------------
@@ -94,31 +103,10 @@ class AboutModal(QWidget):
         self.desc_label.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
 
         # System Info ----------------------------------------------------------
-        ff_version = ffmpeg.version()
-        red = get_ui_color(ColorType.PRIMARY, UiColor.RED)
-        green = get_ui_color(ColorType.PRIMARY, UiColor.GREEN)
-        amber = get_ui_color(ColorType.PRIMARY, UiColor.AMBER)
-        missing = Translations["generic.missing"]
-        found = Translations["about.module.found"]
-
-        ffmpeg_status = f'<span style="color:{red}">{missing}</span>'
-        if ff_version["ffmpeg"] is not None:
-            ffmpeg_status = (
-                f'<span style="color:{green}">{found}</span> (' + ff_version["ffmpeg"] + ")"
-            )
-
-        ffprobe_status = f'<span style="color:{red}">{missing}</span>'
-        if ff_version["ffprobe"] is not None:
-            ffprobe_status = (
-                f'<span style="color:{green}">{found}</span> (' + ff_version["ffprobe"] + ")"
-            )
-
-        ripgrep_status = f'<span style="color:{amber}">{missing}</span>'
-        if which("rg") is not None:
-            ripgrep_status = f'<span style="color:{green}">{found}</span>'
 
         self.system_info_widget = QWidget()
         self.system_info_layout = QFormLayout(self.system_info_widget)
+        self.system_info_layout.setSpacing(4)
         self.system_info_layout.setLabelAlignment(Qt.AlignmentFlag.AlignRight)
 
         # Version
@@ -149,46 +137,84 @@ class AboutModal(QWidget):
 
         # TODO: Add row for "App Cache Path" (currently that TagStudio.ini file)
 
+        # Optional Modules -----------------------------------------------------
+
+        self.parent_optional_modules_widget = QWidget()
+        self.parent_optional_modules_layout = QVBoxLayout(self.parent_optional_modules_widget)
+        self.parent_optional_modules_layout.setContentsMargins(0, 0, 0, 0)
+        self.parent_optional_modules_layout.setSpacing(0)
+
+        # Subtitle
+        self.optional_modules_label = QLabel(header(Translations["about.modules.title"], 4))
+
+        self.optional_modules_widget = QWidget()
+        self.optional_modules_layout = QFormLayout(self.optional_modules_widget)
+        self.optional_modules_layout.setSpacing(4)
+        self.optional_modules_layout.setLabelAlignment(Qt.AlignmentFlag.AlignRight)
+
+        ffmpeg_ver = FfmpegStatus.version()
+        ffprobe_ver = FfprobeStatus.version()
+        ripgrep_ver = RipgrepStatus.version()
+
+        missing = Translations["generic.missing"]
+        found = Translations["about.module.found"]
+
+        ffmpeg_status = f'<span style="color:{red}">{missing}</span>'
+        if ffmpeg_ver is not None:
+            ffmpeg_status = f'<span style="color:{green}">{found}</span> (' + ffmpeg_ver + ")"
+
+        ffprobe_status = f'<span style="color:{red}">{missing}</span>'
+        if ffprobe_ver is not None:
+            ffprobe_status = f'<span style="color:{green}">{found}</span> (' + ffprobe_ver + ")"
+
+        ripgrep_status = f'<span style="color:{amber}">{missing}</span>'
+        if ripgrep_ver is not None:
+            ripgrep_status = f'<span style="color:{green}">{found}</span> (' + ripgrep_ver + ")"
+
         # FFmpeg Status
         ffmpeg_path_title = QLabel("FFmpeg")
         ffmpeg_path_content = ClickableLabel(f"{ffmpeg_status}")
-        ffmpeg_location = which(ffmpeg._get_ffmpeg_location())  # pyright: ignore[reportPrivateUsage]
+        ffmpeg_location = FfmpegStatus.which()
         if ffmpeg_location:
             ffmpeg_path_content.clicked.connect(
                 lambda: open_file(ffmpeg_location, file_manager=True)
             )
             ffmpeg_path_content.setCursor(Qt.CursorShape.PointingHandCursor)
+            ffmpeg_path_content.setToolTip(ffmpeg_location)
         ffmpeg_path_content.setStyleSheet(form_content_style())
-        self.system_info_layout.addRow(ffmpeg_path_title, ffmpeg_path_content)
+        self.optional_modules_layout.addRow(ffmpeg_path_title, ffmpeg_path_content)
         ffmpeg_path_content.setMaximumWidth(ffmpeg_path_content.sizeHint().width())
 
         # FFprobe Status
         ffprobe_path_title = QLabel("FFprobe")
         ffprobe_path_content = ClickableLabel(f"{ffprobe_status}")
-        ffprobe_location = which(ffmpeg._get_ffprobe_location())  # pyright: ignore[reportPrivateUsage]
+        ffprobe_location = FfprobeStatus.which()
         if ffprobe_location:
             ffprobe_path_content.clicked.connect(
                 lambda: open_file(ffprobe_location, file_manager=True)
             )
             ffprobe_path_content.setCursor(Qt.CursorShape.PointingHandCursor)
+            ffprobe_path_content.setToolTip(ffprobe_location)
         ffprobe_path_content.setStyleSheet(form_content_style())
-        self.system_info_layout.addRow(ffprobe_path_title, ffprobe_path_content)
+        self.optional_modules_layout.addRow(ffprobe_path_title, ffprobe_path_content)
         ffprobe_path_content.setMaximumWidth(ffprobe_path_content.sizeHint().width())
 
         # ripgrep Status
-        # TODO: Add a central class to find ripgrep info, similar to ffmpeg
         ripgrep_path_title = QLabel("ripgrep")  # NOTE: Don't localize
-        ripgrep_path_content = ClickableLabel()
-        ripgrep_path_content.setText(f"{ripgrep_status}")  # TODO: Pass in constructor after #1386
-        ripgrep_location = which("rg")
+        ripgrep_path_content = ClickableLabel(f"{ripgrep_status}")
+        ripgrep_location = RipgrepStatus.which()
         if ripgrep_location:
             ripgrep_path_content.clicked.connect(
                 lambda: open_file(ripgrep_location, file_manager=True)
             )
             ripgrep_path_content.setCursor(Qt.CursorShape.PointingHandCursor)
+            ripgrep_path_content.setToolTip(ripgrep_location)
         ripgrep_path_content.setStyleSheet(form_content_style())
         ripgrep_path_content.setMaximumWidth(ripgrep_path_content.sizeHint().width())
-        self.system_info_layout.addRow(ripgrep_path_title, ripgrep_path_content)
+        self.optional_modules_layout.addRow(ripgrep_path_title, ripgrep_path_content)
+
+        self.parent_optional_modules_layout.addWidget(self.optional_modules_label)
+        self.parent_optional_modules_layout.addWidget(self.optional_modules_widget)
 
         # Links ----------------------------------------------------------------
 
@@ -217,6 +243,7 @@ class AboutModal(QWidget):
         self.content_layout.addWidget(self.version_label)
         self.content_layout.addWidget(self.desc_label)
         self.content_layout.addWidget(self.system_info_widget)
+        self.content_layout.addWidget(self.parent_optional_modules_widget)
         self.content_layout.addStretch(1)
         self.content_layout.addWidget(self.links_label)
         self.content_layout.addWidget(self.copyright_label)

src/tagstudio/qt/mixed/add_field.py

@@ -1,98 +0,0 @@
-# SPDX-FileCopyrightText: (c) TagStudio Contributors
-# SPDX-License-Identifier: GPL-3.0-only
-
-
-from typing import override
-
-import structlog
-from PySide6 import QtCore, QtGui
-from PySide6.QtCore import Qt, Signal
-from PySide6.QtWidgets import (
-    QHBoxLayout,
-    QLabel,
-    QListWidget,
-    QListWidgetItem,
-    QPushButton,
-    QVBoxLayout,
-    QWidget,
-)
-
-from tagstudio.core.library.alchemy.library import Library
-from tagstudio.qt.translations import FIELD_TYPE_KEYS, Translations
-from tagstudio.qt.views.stylesheets.stylesheets import header
-
-logger = structlog.get_logger(__name__)
-
-
-# NOTE: This class doesn't inherit from PanelWidget? Seems like it predates that system?
-class AddFieldModal(QWidget):
-    done = Signal(list)
-
-    def __init__(self, library: Library):
-        # [Done]
-        # - OR -
-        # [Cancel] [Save]
-        super().__init__()
-        self.lib = library
-        self.setWindowTitle(Translations["field.add"])
-        self.setWindowModality(Qt.WindowModality.ApplicationModal)
-        self.setMinimumSize(400, 300)
-        self.root_layout = QVBoxLayout(self)
-        self.root_layout.setContentsMargins(6, 6, 6, 6)
-
-        self.title_widget = QLabel(header(Translations["field.add"], 3))
-        self.title_widget.setObjectName("fieldTitle")
-        self.title_widget.setWordWrap(True)
-        self.title_widget.setAlignment(Qt.AlignmentFlag.AlignCenter)
-
-        self.list_widget = QListWidget()
-
-        self.button_container = QWidget()
-        self.button_layout = QHBoxLayout(self.button_container)
-        self.button_layout.setContentsMargins(6, 6, 6, 6)
-        self.button_layout.addStretch(1)
-
-        self.cancel_button = QPushButton(Translations["generic.cancel"])
-        self.cancel_button.clicked.connect(self.hide)
-        self.button_layout.addWidget(self.cancel_button)
-
-        self.save_button = QPushButton(Translations["generic.add"])
-        self.save_button.setDefault(True)
-        self.save_button.clicked.connect(self.hide)
-        self.save_button.clicked.connect(
-            lambda: (
-                # get userData for each selected item
-                self.done.emit(self.list_widget.selectedItems())
-            )
-        )
-        self.button_layout.addWidget(self.save_button)
-
-        self.root_layout.addWidget(self.title_widget)
-        self.root_layout.addWidget(self.list_widget)
-        self.root_layout.addStretch(1)
-        self.root_layout.addWidget(self.button_container)
-
-    @override
-    def show(self):
-        self.list_widget.clear()
-        for field_template in self.lib.field_templates:
-            field_name_key: str = FIELD_TYPE_KEYS.get(
-                field_template.class_name, "field_type.unknown"
-            )
-            item = QListWidgetItem(f"{field_template.name} ({Translations[field_name_key]})")
-            item.setData(Qt.ItemDataRole.UserRole, field_template)
-            self.list_widget.addItem(item)
-        self.list_widget.setFocus()
-        self.list_widget.setCurrentRow(0)
-
-        super().show()
-
-    @override
-    def keyPressEvent(self, event: QtGui.QKeyEvent) -> None:  # noqa N802
-        if event.key() == QtCore.Qt.Key.Key_Escape:
-            self.cancel_button.click()
-        elif event.key() in (QtCore.Qt.Key.Key_Enter, QtCore.Qt.Key.Key_Return):
-            self.save_button.click()
-        else:  # Other key presses
-            pass
-        return super().keyPressEvent(event)

src/tagstudio/qt/mixed/build_color.py

@@ -24,10 +24,10 @@ from tagstudio.core.library.alchemy.enums import TagColorEnum
 from tagstudio.core.library.alchemy.library import Library, slugify
 from tagstudio.core.library.alchemy.models import TagColorGroup
 from tagstudio.core.utils.types import unwrap
+from tagstudio.qt.controllers.modal_content import ModalContent
 from tagstudio.qt.mixed.tag_color_preview import TagColorPreview
 from tagstudio.qt.models.palette import ColorType, get_tag_color
 from tagstudio.qt.translations import Translations
-from tagstudio.qt.views.panel_modal import PanelWidget
 from tagstudio.qt.views.stylesheets.stylesheets import (
     checkbox_style,
     line_edit_style,
@@ -37,7 +37,7 @@ from tagstudio.qt.views.stylesheets.stylesheets import (
 logger = structlog.get_logger(__name__)
 
 
-class BuildColorPanel(PanelWidget):
+class BuildColorPanel(ModalContent):
     on_edit = Signal(TagColorGroup)
 
     def __init__(self, library: Library, color_group: TagColorGroup):
@@ -254,8 +254,8 @@ class BuildColorPanel(PanelWidget):
         self.slug_field.setText(slug)
         self.update_preview_text()
 
-        if self.panel_save_button is not None:
-            self.panel_save_button.setDisabled(is_name_empty)
+        if self.save_button is not None:
+            self.save_button.setDisabled(is_name_empty)
 
     def build_color(self) -> tuple[TagColorGroup, TagColorGroup]:
         name = self.name_field.text()

src/tagstudio/qt/mixed/build_namespace.py

@@ -13,14 +13,14 @@ from PySide6.QtWidgets import QLabel, QLineEdit, QVBoxLayout, QWidget
 from tagstudio.core.constants import RESERVED_NAMESPACE_PREFIX
 from tagstudio.core.library.alchemy.library import Library, ReservedNamespaceError, slugify
 from tagstudio.core.library.alchemy.models import Namespace
+from tagstudio.qt.controllers.modal_content import ModalContent
 from tagstudio.qt.translations import Translations
-from tagstudio.qt.views.panel_modal import PanelWidget
 from tagstudio.qt.views.stylesheets.stylesheets import line_edit_style
 
 logger = structlog.get_logger(__name__)
 
 
-class BuildNamespacePanel(PanelWidget):
+class BuildNamespacePanel(ModalContent):
     on_edit = Signal(Namespace)
 
     def __init__(self, library: Library, namespace: Namespace | None = None):
@@ -118,8 +118,8 @@ class BuildNamespacePanel(PanelWidget):
 
         self.slug_field.setText(slug)
 
-        if self.panel_save_button is not None:
-            self.panel_save_button.setDisabled(is_name_empty)
+        if self.save_button is not None:
+            self.save_button.setDisabled(is_name_empty)
 
     def no_collide(self, slug: str) -> str:
         """Return a slug name that's verified not to collide with other known namespace slugs."""

src/tagstudio/qt/mixed/build_tag.py

@@ -28,12 +28,14 @@ from PySide6.QtWidgets import (
 from tagstudio.core.library.alchemy.library import Library
 from tagstudio.core.library.alchemy.models import Tag, TagAlias, TagColorGroup
 from tagstudio.core.utils.types import unwrap
-from tagstudio.qt.controllers.tag_search_panel_controller import TagSearchModal
+from tagstudio.qt.controllers.modal import Modal
+from tagstudio.qt.controllers.modal_content import ModalContent
+from tagstudio.qt.controllers.tag_search_panel_controller import TagSearchPanel
 from tagstudio.qt.mixed.tag_color_preview import TagColorPreview
 from tagstudio.qt.mixed.tag_color_selection import TagColorSelection
 from tagstudio.qt.mixed.tag_widget import TagWidget
 from tagstudio.qt.translations import Translations
-from tagstudio.qt.views.panel_modal import PanelModal, PanelWidget
+from tagstudio.qt.views.search_panel_view import SearchPanelView
 from tagstudio.qt.views.stylesheets.stylesheets import (
     checkbox_style,
     colored_radio_button_style,
@@ -73,12 +75,12 @@ class CustomTableItem(QLineEdit):
             super().keyPressEvent(arg__1)
 
 
-class BuildTagPanel(PanelWidget):
+class BuildTagPanel(ModalContent):
     on_edit = Signal(Tag)
 
     def __init__(self, library: Library, tag: Tag | None = None) -> None:
         super().__init__()
-        self.lib = library
+        self._lib = library
         self.tag: Tag  # NOTE: This gets set at the end of the init.
         self.tag_color_namespace: str | None
         self.tag_color_slug: str | None
@@ -153,7 +155,6 @@ class BuildTagPanel(PanelWidget):
 
         self.parent_tags_title = QLabel(Translations["tag.parent_tags"])
         self.parent_tags_layout.addWidget(self.parent_tags_title)
-
         self.scroll_contents = QWidget()
         self.parent_tags_scroll_layout = QVBoxLayout(self.scroll_contents)
         self.parent_tags_scroll_layout.setContentsMargins(6, 6, 6, 0)
@@ -176,8 +177,11 @@ class BuildTagPanel(PanelWidget):
         if tag is not None:
             exclude_ids.append(tag.id)
 
-        self.add_tag_modal = TagSearchModal(self.lib, exclude_ids)
-        self.add_tag_modal.tsp.item_chosen.connect(lambda x: self._add_parent_tag_callback(x))
+        tsp_view = SearchPanelView(placeholder_text=Translations["home.search_tags"])
+        tsp = TagSearchPanel(self._lib, exclude=exclude_ids, view=tsp_view)
+        self.add_tag_modal = Modal(tsp, title=Translations["tag.add.plural"])
+        tsp.item_chosen.connect(lambda x: self._add_parent_tag_callback(x))
+
         self.parent_tags_add_button.clicked.connect(self.add_tag_modal.show)
 
         # Color ----------------------------------------------------------------
@@ -192,14 +196,14 @@ class BuildTagPanel(PanelWidget):
         self.color_button: TagColorPreview
         try:
             assert tag is not None
-            self.color_button = TagColorPreview(self.lib, tag.color)
+            self.color_button = TagColorPreview(self._lib, tag.color)
         except Exception as e:
             # TODO: Investigate why this happens during tests
             logger.error("[BuildTag] Could not access Tag member attributes", error=e)
-            self.color_button = TagColorPreview(self.lib, None)
-        self.tag_color_selection = TagColorSelection(self.lib)
+            self.color_button = TagColorPreview(self._lib, None)
+        self.tag_color_selection = TagColorSelection(self._lib)
         chose_tag_color_title = Translations["tag.choose_color"]
-        self.choose_color_modal = PanelModal(
+        self.choose_color_modal = Modal(
             self.tag_color_selection, chose_tag_color_title, chose_tag_color_title
         )
         self.choose_color_modal.done.connect(
@@ -323,7 +327,7 @@ class BuildTagPanel(PanelWidget):
         next_tab: QWidget = last_tab
 
         for parent_id in self.parent_ids:
-            tag = self.lib.get_tag(parent_id)
+            tag = self._lib.get_tag(parent_id)
             if not tag:
                 continue
             is_disam = parent_id == self.disambiguation_id
@@ -361,7 +365,7 @@ class BuildTagPanel(PanelWidget):
             text_color = get_tag_text_color(primary_color, highlight_color)
 
         def update_parent_tag_callback(build_tag_panel: BuildTagPanel):
-            self.lib.update_tag(
+            self._lib.update_tag(
                 build_tag_panel.build_tag(),
                 parent_ids=set(build_tag_panel.parent_ids),
                 aliases=set(build_tag_panel.aliases),
@@ -369,10 +373,10 @@ class BuildTagPanel(PanelWidget):
             self.set_parent_tags()
 
         def on_parent_tag_edit(tag: Tag) -> None:
-            build_tag_panel = BuildTagPanel(self.lib, tag=tag)
-            edit_modal = PanelModal(
+            build_tag_panel = BuildTagPanel(self._lib, tag=tag)
+            edit_modal = Modal(
                 build_tag_panel,
-                self.lib.tag_display_name(tag),
+                self._lib.tag_display_name(tag),
                 "Edit Tag",
                 is_savable=True,
             )
@@ -380,7 +384,7 @@ class BuildTagPanel(PanelWidget):
             edit_modal.show()
 
         # Add Tag Widget
-        tag_widget = TagWidget(tag, library=self.lib, has_edit=True, has_remove=True)
+        tag_widget = TagWidget(tag, library=self._lib, has_edit=True, has_remove=True)
         tag_widget.on_remove.connect(lambda t=parent_id: self._remove_parent_tag_callback(t))
         tag_widget.on_edit.connect(partial(on_parent_tag_edit, tag))
 
@@ -420,7 +424,7 @@ class BuildTagPanel(PanelWidget):
         while self.aliases_table.rowCount() > 0:
             self.aliases_table.removeRow(0)
 
-        last: QWidget | None = self.panel_save_button
+        last: QWidget | None = self.save_button
         aliases = list(self.aliases)
         alias_names = [a.name for a in aliases]
         sorted_aliases = sorted(aliases, key=lambda x: alias_names[aliases.index(x)])
@@ -491,8 +495,8 @@ class BuildTagPanel(PanelWidget):
         is_empty = not self.name_field.text().strip()
         self.name_field.setStyleSheet(line_edit_style() if is_empty else "")
 
-        if self.panel_save_button is not None:
-            self.panel_save_button.setDisabled(is_empty)
+        if self.save_button is not None:
+            self.save_button.setDisabled(is_empty)
 
     def build_tag(self) -> Tag:
         tag = self.tag
@@ -513,8 +517,8 @@ class BuildTagPanel(PanelWidget):
         self.setTabOrder(self.shorthand_field, self.aliases_add_button)
         self.setTabOrder(self.aliases_add_button, self.parent_tags_add_button)
         self.setTabOrder(self.parent_tags_add_button, self.color_button)
-        self.setTabOrder(self.color_button, unwrap(self.panel_cancel_button))
-        self.setTabOrder(unwrap(self.panel_cancel_button), unwrap(self.panel_save_button))
-        self.setTabOrder(unwrap(self.panel_save_button), self.aliases_table.cellWidget(0, 1))
+        self.setTabOrder(self.color_button, unwrap(self.cancel_button))
+        self.setTabOrder(unwrap(self.cancel_button), unwrap(self.save_button))
+        self.setTabOrder(unwrap(self.save_button), self.aliases_table.cellWidget(0, 1))
         self.name_field.selectAll()
         self.name_field.setFocus()

src/tagstudio/qt/mixed/collage_icon.py

@@ -1,133 +0,0 @@
-# SPDX-FileCopyrightText: (c) TagStudio Contributors
-# SPDX-License-Identifier: GPL-3.0-only
-
-
-import math
-from pathlib import Path
-
-import cv2
-import structlog
-from PIL import Image, ImageChops, UnidentifiedImageError
-from PIL.Image import DecompressionBombError
-from PySide6.QtCore import QObject, Signal
-
-from tagstudio.core.library.alchemy.library import Library
-from tagstudio.core.media_types import MediaCategories
-from tagstudio.core.utils.types import unwrap
-from tagstudio.qt.helpers.file_tester import is_readable_video
-
-logger = structlog.get_logger(__name__)
-
-
-class CollageIconRenderer(QObject):
-    rendered = Signal(Image.Image)
-    done = Signal()
-
-    def __init__(self, library: Library):
-        QObject.__init__(self)
-        self.lib = library
-
-    def render(
-        self,
-        entry_id: int,
-        size: tuple[int, int],
-        data_tint_mode: bool,
-        data_only_mode: bool,
-        keep_aspect: bool,
-    ):
-        entry = unwrap(self.lib.get_entry(entry_id))
-        filepath = unwrap(self.lib.library_dir) / entry.path
-        color: str = ""
-
-        try:
-            if data_tint_mode or data_only_mode:
-                color = "#28bb48" if entry.tags else "#e22c3c"
-
-                if data_only_mode:
-                    pic = Image.new("RGB", size, color)
-                    # collage.paste(pic, (y*thumb_size, x*thumb_size))
-                    self.rendered.emit(pic)
-            if not data_only_mode:
-                logger.info(
-                    "Combining icons",
-                    entry=entry,
-                    color=self.get_file_color(filepath.suffix.lower()),
-                )
-
-                ext: str = filepath.suffix.lower()
-                if MediaCategories.is_ext_in_category(ext, MediaCategories.IMAGE_TYPES):
-                    try:
-                        with Image.open(filepath) as pic:
-                            if keep_aspect:
-                                pic.thumbnail(size)
-                            else:
-                                pic = pic.resize(size)
-                            if data_tint_mode and color:
-                                pic = pic.convert(mode="RGB")
-                                pic = ImageChops.hard_light(pic, Image.new("RGB", size, color))
-                            self.rendered.emit(pic)
-                    except DecompressionBombError as e:
-                        logger.info(f"[ERROR] One of the images was too big ({e})")
-                elif MediaCategories.is_ext_in_category(
-                    ext, MediaCategories.VIDEO_TYPES
-                ) and is_readable_video(filepath):
-                    video = cv2.VideoCapture(str(filepath), cv2.CAP_FFMPEG)
-                    video.set(
-                        cv2.CAP_PROP_POS_FRAMES,
-                        (video.get(cv2.CAP_PROP_FRAME_COUNT) // 2),
-                    )
-                    success, frame = video.read()
-                    # NOTE: Depending on the video format, compression, and
-                    # frame count, seeking halfway does not work and the thumb
-                    # must be pulled from the earliest available frame.
-                    max_frame_seek: int = 10
-                    for i in range(
-                        0,
-                        min(
-                            max_frame_seek,
-                            math.floor(video.get(cv2.CAP_PROP_FRAME_COUNT)),
-                        ),
-                    ):
-                        success, frame = video.read()
-                        if not success:
-                            video.set(cv2.CAP_PROP_POS_FRAMES, i)
-                        else:
-                            break
-                    frame = cv2.cvtColor(frame, cv2.COLOR_BGR2RGB)
-                    with Image.fromarray(frame, mode="RGB") as pic:
-                        if keep_aspect:
-                            pic.thumbnail(size)
-                        else:
-                            pic = pic.resize(size)
-                        if data_tint_mode and color:
-                            pic = ImageChops.hard_light(pic, Image.new("RGB", size, color))
-                        self.rendered.emit(pic)
-        except (UnidentifiedImageError, FileNotFoundError):
-            logger.error("Couldn't read entry", entry=entry.path)
-            with Image.open(
-                str(Path(__file__).parents[1] / "resources/qt/images/thumb_broken_512.png")
-            ) as pic:
-                pic.thumbnail(size)
-                if data_tint_mode and color:
-                    pic = pic.convert(mode="RGB")
-                    pic = ImageChops.hard_light(pic, Image.new("RGB", size, color))
-                # collage.paste(pic, (y*thumb_size, x*thumb_size))
-                self.rendered.emit(pic)
-        except KeyboardInterrupt:
-            logger.info("Collage operation cancelled.")
-        except Exception:
-            logger.exception("render failed", entry=entry.path)
-
-        self.done.emit()
-
-    def get_file_color(self, ext: str):
-        if ext.lower() == "gif":
-            return "\033[93m"
-        if MediaCategories.is_ext_in_category(ext, MediaCategories.IMAGE_TYPES):
-            return "\033[37m"
-        elif MediaCategories.is_ext_in_category(ext, MediaCategories.VIDEO_TYPES):
-            return "\033[96m"
-        elif MediaCategories.is_ext_in_category(ext, MediaCategories.PLAINTEXT_TYPES):
-            return "\033[92m"
-        else:
-            return "\033[97m"

src/tagstudio/qt/mixed/color_box.py

@@ -12,12 +12,12 @@ from PySide6.QtWidgets import QMessageBox, QPushButton
 from tagstudio.core.constants import RESERVED_NAMESPACE_PREFIX
 from tagstudio.core.library.alchemy.models import TagColorGroup
 from tagstudio.core.utils.types import unwrap
+from tagstudio.qt.controllers.modal import Modal
 from tagstudio.qt.mixed.build_color import BuildColorPanel
 from tagstudio.qt.mixed.field_widget import FieldWidget
 from tagstudio.qt.mixed.tag_color_label import TagColorLabel
 from tagstudio.qt.translations import Translations
 from tagstudio.qt.views.layouts.flow_layout import FlowLayout
-from tagstudio.qt.views.panel_modal import PanelModal
 from tagstudio.qt.views.stylesheets.stylesheets import add_button_style
 
 if typing.TYPE_CHECKING:
@@ -102,7 +102,7 @@ class ColorBoxWidget(FieldWidget):
     def edit_color(self, color_group: TagColorGroup):
         build_color_panel = BuildColorPanel(self.lib, color_group)
 
-        self.edit_modal = PanelModal(
+        self.edit_modal = Modal(
             build_color_panel,
             "Edit Color",
             is_savable=True,

src/tagstudio/qt/mixed/datetime_picker.py

@@ -9,7 +9,7 @@ from typing import cast, override
 from PySide6.QtCore import QDateTime
 from PySide6.QtWidgets import QDateTimeEdit, QLineEdit, QVBoxLayout
 
-from tagstudio.qt.views.panel_modal import PanelWidget
+from tagstudio.qt.controllers.modal_content import ModalContent
 from tagstudio.qt.views.stylesheets.stylesheets import title_line_edit_style
 
 if typing.TYPE_CHECKING:
@@ -39,7 +39,7 @@ def qdtf2dtf(dtf: str) -> str:
     return out
 
 
-class DatetimePicker(PanelWidget):
+class DatetimePicker(ModalContent):
     def __init__(self, driver: "QtDriver", name: str, datetime: dt | str):
         super().__init__()
         self.setMinimumSize(300, 60)

src/tagstudio/qt/mixed/field_containers.py

@@ -9,8 +9,7 @@ from functools import partial
 from warnings import catch_warnings
 
 import structlog
-from PySide6.QtCore import Qt
-from PySide6.QtGui import QGuiApplication
+from PySide6.QtCore import Qt, Signal
 from PySide6.QtWidgets import (
     QFrame,
     QHBoxLayout,
@@ -21,7 +20,6 @@ from PySide6.QtWidgets import (
     QWidget,
 )
 
-from tagstudio.core.enums import Theme
 from tagstudio.core.library.alchemy.fields import (
     BaseField,
     BaseFieldTemplate,
@@ -32,12 +30,13 @@ from tagstudio.core.library.alchemy.library import Library
 from tagstudio.core.library.alchemy.models import Entry, Tag
 from tagstudio.core.utils.types import unwrap
 from tagstudio.qt.controllers.edit_text_controller import EditText
+from tagstudio.qt.controllers.modal import Modal
 from tagstudio.qt.controllers.tag_box_controller import TagBoxWidget
 from tagstudio.qt.mixed.datetime_picker import DatetimePicker
 from tagstudio.qt.mixed.field_widget import FieldContainer
 from tagstudio.qt.mixed.text_field import TextContainerWidget
 from tagstudio.qt.translations import FIELD_TYPE_KEYS, Translations
-from tagstudio.qt.views.panel_modal import PanelModal
+from tagstudio.qt.views.stylesheets.stylesheets import inset_container_style
 
 if typing.TYPE_CHECKING:
     from tagstudio.qt.ts_qt import QtDriver
@@ -48,6 +47,8 @@ logger = structlog.get_logger(__name__)
 class FieldContainers(QWidget):
     """Widget for the tag and field containers displayed inside the Preview Panel."""
 
+    on_tags_update = Signal()
+
     def __init__(self, library: Library, driver: "QtDriver") -> None:
         super().__init__()
 
@@ -58,18 +59,12 @@ class FieldContainers(QWidget):
         self.common_fields: list = []
         self.mixed_fields: list = []
         self.cached_entries: list[Entry] = []
-        self.containers: list[FieldContainer] = []
-
-        self.panel_bg_color = (
-            Theme.COLOR_BG_DARK.value
-            if QGuiApplication.styleHints().colorScheme() is Qt.ColorScheme.Dark
-            else Theme.COLOR_BG_LIGHT.value
-        )
+        self._containers: list[FieldContainer] = []
 
         self.scroll_layout = QVBoxLayout()
         self.scroll_layout.setAlignment(Qt.AlignmentFlag.AlignTop)
         self.scroll_layout.setContentsMargins(3, 3, 3, 3)
-        self.scroll_layout.setSpacing(0)
+        self.scroll_layout.setSpacing(6)
 
         scroll_container: QWidget = QWidget()
         scroll_container.setObjectName("entryScrollContainer")
@@ -92,9 +87,7 @@ class FieldContainers(QWidget):
         # background and NOT the scroll container background, so that the
         # rounded corners are maintained when scrolling. I was unable to
         # find the right trick to only select that particular element.
-        self.scroll_area.setStyleSheet(
-            f"QWidget#entryScrollContainer{{background:{self.panel_bg_color};border-radius:6px;}}"
-        )
+        self.scroll_area.setStyleSheet(inset_container_style("entryScrollContainer"))
         self.scroll_area.setWidget(scroll_container)
 
         root_layout = QHBoxLayout(self)
@@ -137,8 +130,8 @@ class FieldContainers(QWidget):
             self.write_field_container(index, field, is_mixed=False)
 
         # Hide leftover container(s)
-        if len(self.containers) > container_len:
-            for i, c in enumerate(self.containers):
+        if len(self._containers) > container_len:
+            for i, c in enumerate(self._containers):
                 if i > (container_len - 1):
                     c.setHidden(True)
 
@@ -157,7 +150,7 @@ class FieldContainers(QWidget):
 
     def hide_containers(self) -> None:
         """Hide all field and tag containers."""
-        for c in self.containers:
+        for c in self._containers:
             c.setHidden(True)
 
     def get_tag_categories(self, tags: set[Tag]) -> dict[Tag | None, set[Tag]]:
@@ -251,6 +244,27 @@ class FieldContainers(QWidget):
         )
         self.driver.add_tags_to_selected_callback(tag_ids)
 
+    def update_text_field_callback(
+        self, field: TextField, entry_id: int, content: dict[str, str | bool]
+    ) -> None:
+        """Callback called when a text field has updated data."""
+        self._update_text_field(
+            field, str(content["name"]), str(content["value"]), bool(content["is_multiline"])
+        )
+        self.update_from_entry(entry_id)
+
+    def update_datetime_field_callback(
+        self, field: DatetimeField, entry_id: int, content: dict[str, str]
+    ) -> None:
+        """Callback called when a datetime field has updated data."""
+        self.update_datetime_field(field, str(content["name"]), str(content["value"]))
+        self.update_from_entry(entry_id)
+
+    def remove_field_callback(self, field: BaseField, entry_id: int) -> None:
+        """Callback called when a field needs to be removed from an entry."""
+        self._remove_field(field)
+        self.update_from_entry(entry_id)
+
     def write_field_container(self, index: int, field: BaseField, is_mixed: bool = False) -> None:
         """Update/Create data for a field FieldContainer.
 
@@ -261,27 +275,6 @@ class FieldContainers(QWidget):
                 If True, field is not present in all selected items.
         """
 
-        def update_text_field_callback(
-            field: TextField, entry_id: int, content: dict[str, str | bool]
-        ) -> None:
-            """Callback called when a text field has updated data."""
-            self._update_text_field(
-                field, str(content["name"]), str(content["value"]), bool(content["is_multiline"])
-            )
-            self.update_from_entry(entry_id)
-
-        def update_datetime_field_callback(
-            field: DatetimeField, entry_id: int, content: dict[str, str]
-        ) -> None:
-            """Callback called when a datetime field has updated data."""
-            self.update_datetime_field(field, str(content["name"]), str(content["value"]))
-            self.update_from_entry(entry_id)
-
-        def remove_field_callback(field: BaseField, entry_id: int) -> None:
-            """Callback called when a field needs to be removed from an entry."""
-            self._remove_field(field)
-            self.update_from_entry(entry_id)
-
         def write_text_container(
             container: FieldContainer, field: TextField, title: str, is_mixed: bool
         ):
@@ -298,21 +291,21 @@ class FieldContainers(QWidget):
             container.set_inner_widget(inner_widget)
 
             if not is_mixed:
-                edit_modal = PanelModal(
+                edit_modal = Modal(
                     EditText(field.name, field.value, field.is_multiline),
                     window_title=f"{Translations['field.edit']} ({Translations[field_name_key]})",
                     is_savable=True,
                     inline_title=False,
                 )
                 edit_modal.saved_data.connect(
-                    partial(update_text_field_callback, field, self.top_entry_id)
+                    partial(self.update_text_field_callback, field, self.top_entry_id)
                 )
 
                 container.set_edit_callback(edit_modal.show)
                 container.set_remove_callback(
                     lambda: self.remove_message_box(
                         prompt=self.remove_field_prompt(title),
-                        callback=partial(remove_field_callback, field, self.top_entry_id),
+                        callback=partial(self.remove_field_callback, field, self.top_entry_id),
                     )
                 )
 
@@ -336,21 +329,21 @@ class FieldContainers(QWidget):
             container.set_inner_widget(inner_widget)
 
             if not is_mixed:
-                edit_modal = PanelModal(
+                edit_modal = Modal(
                     DatetimePicker(self.driver, field.name, field.value or dt.now()),
                     window_title=f"{Translations['field.edit']} ({Translations[field_name_key]})",
                     is_savable=True,
                     inline_title=False,
                 )
                 edit_modal.saved_data.connect(
-                    partial(update_datetime_field_callback, field, self.top_entry_id)
+                    partial(self.update_datetime_field_callback, field, self.top_entry_id)
                 )
 
                 container.set_edit_callback(edit_modal.show)
                 container.set_remove_callback(
                     lambda: self.remove_message_box(
                         prompt=self.remove_field_prompt(field.name),
-                        callback=partial(remove_field_callback, field, self.top_entry_id),
+                        callback=partial(self.remove_field_callback, field, self.top_entry_id),
                     )
                 )
 
@@ -361,7 +354,7 @@ class FieldContainers(QWidget):
             container.set_remove_callback(
                 lambda: self.remove_message_box(
                     prompt=self.remove_field_prompt(field.name),
-                    callback=partial(remove_field_callback, field, self.top_entry_id),
+                    callback=partial(self.remove_field_callback, field, self.top_entry_id),
                 )
             )
 
@@ -373,12 +366,12 @@ class FieldContainers(QWidget):
         )
 
         # Create new containers if necessary
-        if len(self.containers) < (index + 1):
+        if len(self._containers) < (index + 1):
             container = FieldContainer()
-            self.containers.append(container)
+            self._containers.append(container)
             self.scroll_layout.addWidget(container)
         else:
-            container = self.containers[index]
+            container = self._containers[index]
 
         # Set field title
         field_name_key: str = FIELD_TYPE_KEYS.get(field.class_name, "field_type.unknown")
@@ -407,12 +400,12 @@ class FieldContainers(QWidget):
                 If True, field is not present in all selected items.
         """
         logger.info("[FieldContainers][write_tag_container]", index=index)
-        if len(self.containers) < (index + 1):
+        if len(self._containers) < (index + 1):
             container = FieldContainer()
-            self.containers.append(container)
+            self._containers.append(container)
             self.scroll_layout.addWidget(container)
         else:
-            container = self.containers[index]
+            container = self._containers[index]
 
         container.set_title(Translations["entries.tags"] if not category_tag else category_tag.name)
 
@@ -430,7 +423,10 @@ class FieldContainers(QWidget):
             inner_widget.set_tags(tags)
 
             inner_widget.on_update.connect(
-                lambda: self.update_from_entry(self.cached_entries[0].id, update_badges=True)
+                lambda: (
+                    self.update_from_entry(self.cached_entries[0].id, update_badges=True),
+                    self.on_tags_update.emit(),
+                )
             )
         else:
             text = f"<i>{Translations['field.mixed_data']}</i>"
@@ -480,3 +476,13 @@ class FieldContainers(QWidget):
         result = remove_mb.exec_()
         if result == QMessageBox.ButtonRole.ActionRole.value:
             callback()
+
+    @property
+    def tags(self) -> list[int]:
+        if len(self.cached_entries) <= 0:
+            return []
+        entry = self.cached_entries[0]
+        entry_ = self.lib.get_entry_full(entry.id, with_fields=False)
+        if not entry_:
+            return []
+        return [tag.id for tag in entry_.tags]

src/tagstudio/qt/mixed/field_widget.py

@@ -34,7 +34,9 @@ class FieldContainer(QWidget):
         self.copy_callback: Callable[[], None] | None = None
         self.edit_callback: Callable[[], None] | None = None
         self.remove_callback: Callable[[], None] | None = None
-        button_size = 24
+        button_size = 22
+        icon_margins = 4
+        icon_size = button_size - icon_margins
 
         self.root_layout = QVBoxLayout(self)
         self.root_layout.setObjectName("baseLayout")
@@ -42,7 +44,7 @@ class FieldContainer(QWidget):
 
         self.inner_layout = QVBoxLayout()
         self.inner_layout.setObjectName("innerLayout")
-        self.inner_layout.setContentsMargins(6, 0, 6, 6)
+        self.inner_layout.setContentsMargins(3, 0, 0, 3)
         self.inner_layout.setSpacing(0)
         self.field_container = QWidget()
         self.field_container.setObjectName("fieldContainer")
@@ -82,7 +84,7 @@ class FieldContainer(QWidget):
         self.edit_button.setMaximumSize(button_size, button_size)
         self.edit_button.setFlat(True)
         self.edit_button.setIcon(QPixmap.fromImage(ImageQt.ImageQt(FieldContainer.edit_icon)))
-        self.edit_button.setIconSize(QSize(20, 20))
+        self.edit_button.setIconSize(QSize(icon_size, icon_size))
         self.edit_button.setCursor(Qt.CursorShape.PointingHandCursor)
         self.title_layout.addWidget(self.edit_button)
         self.edit_button.setHidden(True)
@@ -93,7 +95,7 @@ class FieldContainer(QWidget):
         self.remove_button.setMaximumSize(button_size, button_size)
         self.remove_button.setFlat(True)
         self.remove_button.setIcon(QPixmap.fromImage(ImageQt.ImageQt(FieldContainer.trash_icon)))
-        self.remove_button.setIconSize(QSize(20, 20))
+        self.remove_button.setIconSize(QSize(icon_size, icon_size))
         self.remove_button.setCursor(Qt.CursorShape.PointingHandCursor)
         self.title_layout.addWidget(self.remove_button)
         self.remove_button.setHidden(True)

src/tagstudio/qt/mixed/file_attributes.py

@@ -7,7 +7,6 @@ import platform
 import typing
 from dataclasses import dataclass
 from datetime import datetime as dt
-from datetime import timedelta
 from pathlib import Path
 
 import structlog
@@ -20,6 +19,7 @@ from tagstudio.core.enums import ShowFilepathOption
 from tagstudio.core.library.alchemy.library import Library
 from tagstudio.core.library.ignore import Ignore
 from tagstudio.core.media_types import MediaCategories
+from tagstudio.core.utils.str_formatting import format_duration
 from tagstudio.core.utils.types import unwrap
 from tagstudio.qt.models.palette import ColorType, UiColor, get_ui_color
 from tagstudio.qt.translations import Translations
@@ -224,15 +224,7 @@ class FileAttributes(QWidget):
 
             if stats.duration is not None:
                 stats_label_text = add_newline(stats_label_text)
-                try:
-                    dur_str = str(timedelta(seconds=float(stats.duration)))[:-7]
-                    if dur_str.startswith("0:"):
-                        dur_str = dur_str[2:]
-                    if dur_str.startswith("0"):
-                        dur_str = dur_str[1:]
-                except OverflowError:
-                    dur_str = "-:--"
-                stats_label_text += f"{dur_str}"
+                stats_label_text += format_duration(stats.duration)
 
             if font_family:
                 stats_label_text = add_newline(stats_label_text)

src/tagstudio/qt/mixed/item_thumb.py

@@ -300,11 +300,25 @@ class ItemThumb(FlowWidget):
         # NOTE: self.item_id seems to act as a reference here and does not need to be updated inside
         # QtDriver.update_thumbs() while item_thumb.delete_action does.
         # If this behavior ever changes, move this method back to QtDriver.update_thumbs().
+        self.thumb_button.pressed.connect(
+            lambda: (
+                self.toggle_item_selection()
+                if (
+                    QGuiApplication.keyboardModifiers() == Qt.KeyboardModifier.ControlModifier
+                    or not self.thumb_button.selected
+                )
+                else None
+            )
+        )
+
         self.thumb_button.clicked.connect(
-            lambda: self.driver.toggle_item_selection(
-                self.item_id,
-                append=(QGuiApplication.keyboardModifiers() == Qt.KeyboardModifier.ControlModifier),
-                bridge=(QGuiApplication.keyboardModifiers() == Qt.KeyboardModifier.ShiftModifier),
+            lambda: (
+                self.toggle_item_selection()
+                if (
+                    QGuiApplication.keyboardModifiers() != Qt.KeyboardModifier.ControlModifier
+                    and self.thumb_button.selected
+                )
+                else None
             )
         )
         self.set_mode(mode)
@@ -317,6 +331,13 @@ class ItemThumb(FlowWidget):
     def is_archived(self) -> bool:
         return self.badge_active[BadgeType.ARCHIVED]
 
+    def toggle_item_selection(self):
+        self.driver.toggle_item_selection(
+            self.item_id,
+            append=(QGuiApplication.keyboardModifiers() == Qt.KeyboardModifier.ControlModifier),
+            bridge=(QGuiApplication.keyboardModifiers() == Qt.KeyboardModifier.ShiftModifier),
+        )
+
     def set_mode(self, mode: ItemType | None) -> None:
         if mode is None:
             self.setAttribute(Qt.WidgetAttribute.WA_TransparentForMouseEvents, on=True)
@@ -479,7 +500,7 @@ class ItemThumb(FlowWidget):
     ):
         selected = self.driver._selected
         if len(selected) == 1 and entry_id in selected:
-            self.driver.main_window.preview_panel.field_containers_widget.update_toggled_tag(
+            self.driver.main_window.preview_panel.containers.update_toggled_tag(
                 tag_id, toggle_value
             )
 

src/tagstudio/qt/mixed/migration_modal.py

@@ -16,6 +16,7 @@ from PySide6.QtWidgets import (
     QLabel,
     QMessageBox,
     QProgressDialog,
+    QPushButton,
     QSizePolicy,
     QVBoxLayout,
     QWidget,
@@ -47,7 +48,6 @@ from tagstudio.qt.translations import Translations
 from tagstudio.qt.utils.custom_runnable import CustomRunnable
 from tagstudio.qt.utils.function_iterator import FunctionIterator
 from tagstudio.qt.views.paged_body_wrapper import PagedBodyWrapper
-from tagstudio.qt.views.qbutton_wrapper import QPushButtonWrapper
 from tagstudio.qt.views.stylesheets.stylesheets import header
 
 logger = structlog.get_logger(__name__)
@@ -99,8 +99,8 @@ class JsonMigrationModal(QObject):
         body_wrapper.layout().addWidget(body_label)
         body_wrapper.layout().setContentsMargins(0, 36, 0, 0)
 
-        cancel_button = QPushButtonWrapper(Translations["generic.cancel"])
-        next_button = QPushButtonWrapper(Translations["generic.continue"])
+        cancel_button = QPushButton(Translations["generic.cancel"])
+        next_button = QPushButton(Translations["generic.continue"])
         cancel_button.clicked.connect(self.migration_cancelled.emit)
 
         self.stack.append(
@@ -289,14 +289,12 @@ class JsonMigrationModal(QObject):
         self.body_wrapper_01.layout().addWidget(desc_label)
         self.body_wrapper_01.layout().setSpacing(12)
 
-        back_button = QPushButtonWrapper(Translations["generic.navigation.back"])
-        start_button = QPushButtonWrapper(Translations["json_migration.start_and_preview"])
+        back_button = QPushButton(Translations["generic.navigation.back"])
+        start_button = QPushButton(Translations["json_migration.start_and_preview"])
         start_button.setMinimumWidth(120)
         start_button.clicked.connect(self.migrate)
         start_button.clicked.connect(lambda: start_button.setDisabled(True))
-        finish_button: QPushButtonWrapper = QPushButtonWrapper(
-            Translations["json_migration.finish_migration"]
-        )
+        finish_button = QPushButton(Translations["json_migration.finish_migration"])
         finish_button.setMinimumWidth(120)
         finish_button.setDisabled(True)
         finish_button.clicked.connect(self.finish_migration)
@@ -381,7 +379,7 @@ class JsonMigrationModal(QObject):
                     pb.setMinimum(1),
                     pb.setValue(1),
                     # Enable the finish button
-                    cast(QPushButtonWrapper, self.stack[1].buttons[4]).setDisabled(False),
+                    cast(QPushButton, self.stack[1].buttons[4]).setDisabled(False),
                 )
             )
             QThreadPool.globalInstance().start(r)
@@ -397,14 +395,15 @@ class JsonMigrationModal(QObject):
             # Convert JSON Library to SQLite
             yield Translations["json_migration.creating_database_tables"]
             self.sql_lib = SqliteLibrary()
-            self.temp_path: Path = (
-                self.json_lib.library_dir / TS_FOLDER_NAME / "migration_ts_library.sqlite"
-            )
+            temp_filename = "migration_ts_library.sqlite"
+            self.temp_path: Path = self.json_lib.library_dir / TS_FOLDER_NAME / temp_filename
             if self.temp_path.exists():
                 logger.info('Temporary migration file "temp_path" already exists. Removing...')
                 self.temp_path.unlink()
-            self.sql_lib.open_sqlite_library(
-                self.json_lib.library_dir, is_new=True, storage_path=str(self.temp_path)
+            self.sql_lib.create_sqlite_library(
+                self.json_lib.library_dir,
+                in_memory=False,
+                sql_filename=temp_filename,
             )
             yield Translations.format(
                 "json_migration.migrating_files_entries", entries=len(self.json_lib.entries)

src/tagstudio/qt/mixed/pagination.py

@@ -5,15 +5,15 @@
 """A pagination widget created for TagStudio."""
 
 from typing import cast, override
+from warnings import catch_warnings
 
 from PIL import Image, ImageQt
 from PySide6.QtCore import QSize, Signal
 from PySide6.QtGui import QIntValidator, QPixmap
-from PySide6.QtWidgets import QHBoxLayout, QLabel, QLineEdit, QSizePolicy, QWidget
+from PySide6.QtWidgets import QHBoxLayout, QLabel, QLineEdit, QPushButton, QSizePolicy, QWidget
 
 from tagstudio.qt.helpers.color_overlay import auto_theme_overlay
 from tagstudio.qt.resource_manager import ResourceManager
-from tagstudio.qt.views.qbutton_wrapper import QPushButtonWrapper
 
 
 class Pagination(QWidget):
@@ -21,8 +21,8 @@ class Pagination(QWidget):
 
     index = Signal(int)
 
-    def __init__(self, parent=None) -> None:
-        super().__init__(parent)
+    def __init__(self, parent: QWidget | None = None) -> None:
+        super().__init__(parent=parent)
         self.rm = ResourceManager()
         self.page_count: int = 0
         self.current_page_index: int = 0
@@ -43,7 +43,7 @@ class Pagination(QWidget):
         self.root_layout.setSpacing(3)
 
         # [<] ----------------------------------
-        self.prev_button = QPushButtonWrapper()
+        self.prev_button = QPushButton()
         prev_icon: Image.Image = self.rm.bxs_left_arrow
         prev_icon = auto_theme_overlay(prev_icon, use_alpha=False)
         self.prev_button.setIcon(QPixmap.fromImage(ImageQt.ImageQt(prev_icon)))
@@ -52,7 +52,7 @@ class Pagination(QWidget):
         self.prev_button.setMaximumSize(self.button_size)
 
         # --- [1] ------------------------------
-        self.start_button = QPushButtonWrapper()
+        self.start_button = QPushButton()
         self.start_button.setMinimumSize(self.button_size)
         self.start_button.setMaximumSize(self.button_size)
 
@@ -91,12 +91,12 @@ class Pagination(QWidget):
         self.end_ellipses.setText(". . .")
 
         # ----------------------------- [42] ---
-        self.end_button = QPushButtonWrapper()
+        self.end_button = QPushButton()
         self.end_button.setMinimumSize(self.button_size)
         self.end_button.setMaximumSize(self.button_size)
 
         # ---------------------------------- [>]
-        self.next_button = QPushButtonWrapper()
+        self.next_button = QPushButton()
         next_icon: Image.Image = self.rm.bxs_right_arrow
         next_icon = auto_theme_overlay(next_icon, use_alpha=False)
         self.next_button.setIcon(QPixmap.fromImage(ImageQt.ImageQt(next_icon)))
@@ -223,7 +223,7 @@ class Pagination(QWidget):
                         )
                         self._assign_click(
                             cast(
-                                QPushButtonWrapper,
+                                QPushButton,
                                 self.start_buffer_layout.itemAt(i - start_offset).widget(),
                             ),
                             i,
@@ -240,7 +240,7 @@ class Pagination(QWidget):
                         self.end_buffer_layout.itemAt(i - end_offset).widget().setText(str(i + 1))  # pyright: ignore[reportAttributeAccessIssue]
                         self._assign_click(
                             cast(
-                                QPushButtonWrapper,
+                                QPushButton,
                                 self.end_buffer_layout.itemAt(i - end_offset).widget(),
                             ),
                             i,
@@ -268,21 +268,20 @@ class Pagination(QWidget):
     def _goto_page(self, index: int):
         self.update_buttons(self.page_count, index)
 
-    def _assign_click(self, button: QPushButtonWrapper, index):
-        if button.is_connected:
+    def _assign_click(self, button: QPushButton, index: int):
+        with catch_warnings(record=True):
             button.clicked.disconnect()
         button.clicked.connect(lambda checked=False, i=index: self._goto_page(i))
-        button.is_connected = True
 
     def _populate_buffer_buttons(self):
         for _ in range(max(self.buffer_page_count * 2, 5)):
-            button = QPushButtonWrapper()
+            button = QPushButton()
             button.setMinimumSize(self.button_size)
             button.setMaximumSize(self.button_size)
             button.setHidden(True)
             self.start_buffer_layout.addWidget(button)
 
-            end_button = QPushButtonWrapper()
+            end_button = QPushButton()
             end_button.setMinimumSize(self.button_size)
             end_button.setMaximumSize(self.button_size)
             end_button.setHidden(True)

src/tagstudio/qt/mixed/settings_panel.py

@@ -20,6 +20,8 @@ from PySide6.QtWidgets import (
 )
 
 from tagstudio.core.enums import ShowFilepathOption, TagClickActionOption
+from tagstudio.qt.controllers.modal import Modal
+from tagstudio.qt.controllers.modal_content import ModalContent
 from tagstudio.qt.global_settings import (
     DEFAULT_CACHED_THUMB_RES,
     DEFAULT_THUMB_CACHE_SIZE,
@@ -30,7 +32,6 @@ from tagstudio.qt.global_settings import (
     Theme,
 )
 from tagstudio.qt.translations import DEFAULT_TRANSLATION, LANGUAGES, Translations
-from tagstudio.qt.views.panel_modal import PanelModal, PanelWidget
 
 if TYPE_CHECKING:
     from tagstudio.qt.ts_qt import QtDriver
@@ -38,7 +39,7 @@ if TYPE_CHECKING:
 logger = structlog.get_logger(__name__)
 
 
-class SettingsPanel(PanelWidget):
+class SettingsPanel(ModalContent):
     driver: "QtDriver"
 
     filepath_option_map: dict[ShowFilepathOption, str] = {
@@ -98,6 +99,9 @@ class SettingsPanel(PanelWidget):
         self.root_layout.setContentsMargins(0, 6, 0, 0)
 
         self.library_settings_container = QWidget()
+        self.appearance_settings_container = QWidget()
+        self.localization_settings_container = QWidget()
+        self.media_settings_container = QWidget()
 
         # Tabs
         self.tab_widget = QTabWidget()
@@ -105,6 +109,19 @@ class SettingsPanel(PanelWidget):
         self.__build_global_settings()
         self.tab_widget.addTab(self.global_settings_container, Translations["settings.global"])
 
+        self.__build_appearance_settings()
+        self.tab_widget.addTab(
+            self.appearance_settings_container, Translations["settings.appearance"]
+        )
+
+        self.__build_localization_settings()
+        self.tab_widget.addTab(
+            self.localization_settings_container, Translations["settings.localization"]
+        )
+
+        self.__build_media_settings()
+        self.tab_widget.addTab(self.media_settings_container, Translations["settings.media"])
+
         # self.__build_library_settings()
         # self.tab_widget.addTab(self.library_settings_container, Translations["settings.library"])
 
@@ -132,17 +149,6 @@ class SettingsPanel(PanelWidget):
         form_layout = QFormLayout(self.global_settings_container)
         form_layout.setContentsMargins(6, 6, 6, 6)
 
-        # Language
-        self.language_combobox = QComboBox()
-        for k in LANGUAGES:
-            self.language_combobox.addItem(k, LANGUAGES[k])
-        current_lang: str = self.driver.settings.language
-        if current_lang not in LANGUAGES.values():
-            current_lang = DEFAULT_TRANSLATION
-        self.language_combobox.setCurrentIndex(list(LANGUAGES.values()).index(current_lang))
-        self.language_combobox.currentIndexChanged.connect(self.__update_restart_label)
-        form_layout.addRow(Translations["settings.language"], self.language_combobox)
-
         # Open Last Library on Start
         self.open_last_lib_checkbox = QCheckBox()
         self.open_last_lib_checkbox.setChecked(self.driver.settings.open_last_loaded_on_startup)
@@ -150,54 +156,6 @@ class SettingsPanel(PanelWidget):
             Translations["settings.open_library_on_start"], self.open_last_lib_checkbox
         )
 
-        # Generate Thumbnails
-        self.generate_thumbs = QCheckBox()
-        self.generate_thumbs.setChecked(self.driver.settings.generate_thumbs)
-        form_layout.addRow(Translations["settings.generate_thumbs"], self.generate_thumbs)
-
-        # Thumbnail Cache Size
-        self.thumb_cache_size_container = QWidget()
-        self.thumb_cache_size_layout = QHBoxLayout(self.thumb_cache_size_container)
-        self.thumb_cache_size_layout.setContentsMargins(0, 0, 0, 0)
-        self.thumb_cache_size_layout.setSpacing(6)
-        self.thumb_cache_size = QLineEdit()
-        self.thumb_cache_size.setAlignment(Qt.AlignmentFlag.AlignRight)
-        self.thumb_cache_size_validator = QDoubleValidator(
-            MIN_THUMB_CACHE_SIZE, 1_000_000_000, 2
-        )  # High limit
-        self.thumb_cache_size.setValidator(self.thumb_cache_size_validator)
-        self.thumb_cache_size.setText(
-            str(max(self.driver.settings.thumb_cache_size, MIN_THUMB_CACHE_SIZE)).removesuffix(".0")
-        )
-        self.thumb_cache_size_layout.addWidget(self.thumb_cache_size)
-        self.thumb_cache_size_layout.setStretch(1, 2)
-        self.thumb_cache_size_layout.addWidget(QLabel("MiB"))
-        form_layout.addRow(
-            Translations["settings.thumb_cache_size.label"], self.thumb_cache_size_container
-        )
-
-        # Cached Thumbnail Resolution
-        self.cached_thumb_res_container = QWidget()
-        self.cached_thumb_res_layout = QHBoxLayout(self.cached_thumb_res_container)
-        self.cached_thumb_res_layout.setContentsMargins(0, 0, 0, 0)
-        self.cached_thumb_res_layout.setSpacing(6)
-        self.cached_thumb_res = QLineEdit()
-        self.cached_thumb_res.setAlignment(Qt.AlignmentFlag.AlignRight)
-        self.cached_thumb_res_validator = QIntValidator(MIN_CACHED_THUMB_RES, MAX_CACHED_THUMB_RES)
-        self.cached_thumb_res.setValidator(self.cached_thumb_res_validator)
-        self.cached_thumb_res.setText(str(self.driver.settings.cached_thumb_resolution))
-        self.cached_thumb_res_layout.addWidget(self.cached_thumb_res)
-        self.cached_thumb_res_layout.setStretch(1, 2)
-        self.cached_thumb_res_layout.addWidget(QLabel("px"))
-        form_layout.addRow(
-            Translations["settings.cached_thumb_resolution.label"], self.cached_thumb_res_container
-        )
-
-        # Autoplay
-        self.autoplay_checkbox = QCheckBox()
-        self.autoplay_checkbox.setChecked(self.driver.settings.autoplay)
-        form_layout.addRow(Translations["media_player.autoplay"], self.autoplay_checkbox)
-
         # Scan for new files when a library is opened
         self.scan_files_on_open_checkbox = QCheckBox()
         self.scan_files_on_open_checkbox.setChecked(self.driver.settings.scan_files_on_open)
@@ -259,26 +217,97 @@ class SettingsPanel(PanelWidget):
             Translations["settings.tag_click_action.label"], self.tag_click_action_combobox
         )
 
-        # Dark Mode
-        self.theme_combobox = QComboBox()
-        for k in SettingsPanel.theme_map:
-            self.theme_combobox.addItem(SettingsPanel.theme_map[k], k)
-        theme = self.driver.settings.theme
-        if theme not in SettingsPanel.theme_map:
-            theme = Theme.DEFAULT
-        self.theme_combobox.setCurrentIndex(list(SettingsPanel.theme_map.keys()).index(theme))
-        self.theme_combobox.currentIndexChanged.connect(self.__update_restart_label)
-        form_layout.addRow(Translations["settings.theme.label"], self.theme_combobox)
+        # Open Edit Window When Creating a Tag
+        self.edit_tag_on_create_checkbox = QCheckBox()
+        self.edit_tag_on_create_checkbox.setChecked(self.driver.settings.edit_tag_on_create)
+        form_layout.addRow(
+            Translations["settings.edit_tag_on_create"], self.edit_tag_on_create_checkbox
+        )
 
-        # Splash Screen
-        self.splash_combobox = QComboBox()
-        for k in SettingsPanel.splash_map:
-            self.splash_combobox.addItem(SettingsPanel.splash_map[k], k)
-        splash = self.driver.settings.splash
-        if splash not in SettingsPanel.splash_map:
-            splash = Splash.DEFAULT
-        self.splash_combobox.setCurrentIndex(list(SettingsPanel.splash_map.keys()).index(splash))
-        form_layout.addRow(Translations["settings.splash.label"], self.splash_combobox)
+        # Open Edit Window When Adding a Field
+        self.edit_field_on_add_checkbox = QCheckBox()
+        self.edit_field_on_add_checkbox.setChecked(self.driver.settings.edit_field_on_add)
+        form_layout.addRow(
+            Translations["settings.edit_field_on_add"], self.edit_field_on_add_checkbox
+        )
+
+    # TODO: Implement Library Settings
+    def __build_library_settings(self):  # pyright: ignore[reportUnusedFunction]
+        form_layout = QFormLayout(self.library_settings_container)
+        form_layout.setContentsMargins(6, 6, 6, 6)
+
+        todo_label = QLabel("TODO")
+        form_layout.addRow(todo_label)
+
+    def __build_media_settings(self):
+        form_layout = QFormLayout(self.media_settings_container)
+        form_layout.setContentsMargins(6, 6, 6, 6)
+
+        # Autoplay
+        self.autoplay_checkbox = QCheckBox()
+        self.autoplay_checkbox.setChecked(self.driver.settings.autoplay)
+        form_layout.addRow(Translations["media_player.autoplay"], self.autoplay_checkbox)
+
+        # Generate Thumbnails
+        self.generate_thumbs = QCheckBox()
+        self.generate_thumbs.setChecked(self.driver.settings.generate_thumbs)
+        form_layout.addRow(Translations["settings.generate_thumbs"], self.generate_thumbs)
+
+        # Thumbnail Cache Size
+        self.thumb_cache_size_container = QWidget()
+        self.thumb_cache_size_layout = QHBoxLayout(self.thumb_cache_size_container)
+        self.thumb_cache_size_layout.setContentsMargins(0, 0, 0, 0)
+        self.thumb_cache_size_layout.setSpacing(6)
+        self.thumb_cache_size = QLineEdit()
+        self.thumb_cache_size.setAlignment(Qt.AlignmentFlag.AlignRight)
+        self.thumb_cache_size_validator = QDoubleValidator(
+            MIN_THUMB_CACHE_SIZE, 1_000_000_000, 2
+        )  # High limit
+        self.thumb_cache_size.setValidator(self.thumb_cache_size_validator)
+        self.thumb_cache_size.setText(
+            str(max(self.driver.settings.thumb_cache_size, MIN_THUMB_CACHE_SIZE)).removesuffix(".0")
+        )
+        self.thumb_cache_size_layout.addWidget(self.thumb_cache_size)
+        self.thumb_cache_size_layout.setStretch(1, 2)
+        self.thumb_cache_size_layout.addWidget(QLabel("MiB"))
+        form_layout.addRow(
+            Translations["settings.thumb_cache_size.label"], self.thumb_cache_size_container
+        )
+
+        # Cached Thumbnail Resolution
+        self.cached_thumb_res_container = QWidget()
+        self.cached_thumb_res_layout = QHBoxLayout(self.cached_thumb_res_container)
+        self.cached_thumb_res_layout.setContentsMargins(0, 0, 0, 0)
+        self.cached_thumb_res_layout.setSpacing(6)
+        self.cached_thumb_res = QLineEdit()
+        self.cached_thumb_res.setAlignment(Qt.AlignmentFlag.AlignRight)
+        self.cached_thumb_res_validator = QIntValidator(MIN_CACHED_THUMB_RES, MAX_CACHED_THUMB_RES)
+        self.cached_thumb_res.setValidator(self.cached_thumb_res_validator)
+        self.cached_thumb_res.setText(str(self.driver.settings.cached_thumb_resolution))
+        self.cached_thumb_res_layout.addWidget(self.cached_thumb_res)
+        self.cached_thumb_res_layout.setStretch(1, 2)
+        self.cached_thumb_res_layout.addWidget(QLabel("px"))
+        form_layout.addRow(
+            Translations["settings.cached_thumb_resolution.label"], self.cached_thumb_res_container
+        )
+
+    def __build_localization_settings(self):
+        form_layout = QFormLayout(self.localization_settings_container)
+        form_layout.setContentsMargins(6, 6, 6, 6)
+
+        # Language
+        self.language_combobox = QComboBox()
+        translated_langs = [(Translations[f"language.{lang}"], lang) for lang in LANGUAGES]
+        translated_langs.sort(key=lambda x: x[0])
+
+        for lang in translated_langs:
+            self.language_combobox.addItem(lang[0], lang[1])
+        current_lang: str = self.driver.settings.language
+        if current_lang not in LANGUAGES:
+            current_lang = DEFAULT_TRANSLATION
+        self.language_combobox.setCurrentIndex([x[1] for x in translated_langs].index(current_lang))
+        self.language_combobox.currentIndexChanged.connect(self.__update_restart_label)
+        form_layout.addRow(Translations["settings.language"], self.language_combobox)
 
         # Date Format
         self.dateformat_combobox = QComboBox()
@@ -303,20 +332,34 @@ class SettingsPanel(PanelWidget):
         self.zeropadding_checkbox.setChecked(self.driver.settings.zero_padding)
         form_layout.addRow(Translations["settings.zeropadding.label"], self.zeropadding_checkbox)
 
-    # TODO: Implement Library Settings
-    def __build_library_settings(self):  # pyright: ignore[reportUnusedFunction]
-        form_layout = QFormLayout(self.library_settings_container)
+    def __build_appearance_settings(self):
+        form_layout = QFormLayout(self.appearance_settings_container)
         form_layout.setContentsMargins(6, 6, 6, 6)
 
-        todo_label = QLabel("TODO")
-        form_layout.addRow(todo_label)
+        # Dark Mode
+        self.theme_combobox = QComboBox()
+        for k in SettingsPanel.theme_map:
+            self.theme_combobox.addItem(SettingsPanel.theme_map[k], k)
+        theme = self.driver.settings.theme
+        if theme not in SettingsPanel.theme_map:
+            theme = Theme.DEFAULT
+        self.theme_combobox.setCurrentIndex(list(SettingsPanel.theme_map.keys()).index(theme))
+        self.theme_combobox.currentIndexChanged.connect(self.__update_restart_label)
+        form_layout.addRow(Translations["settings.theme.label"], self.theme_combobox)
 
-    def __get_language(self) -> str:
-        return list(LANGUAGES.values())[self.language_combobox.currentIndex()]
+        # Splash Screen
+        self.splash_combobox = QComboBox()
+        for k in SettingsPanel.splash_map:
+            self.splash_combobox.addItem(SettingsPanel.splash_map[k], k)
+        splash = self.driver.settings.splash
+        if splash not in SettingsPanel.splash_map:
+            splash = Splash.DEFAULT
+        self.splash_combobox.setCurrentIndex(list(SettingsPanel.splash_map.keys()).index(splash))
+        form_layout.addRow(Translations["settings.splash.label"], self.splash_combobox)
 
     def get_settings(self) -> dict[str, Any]:  # pyright: ignore[reportExplicitAny]
         return {
-            "language": self.__get_language(),
+            "language": self.language_combobox.currentData(),
             "open_last_loaded_on_startup": self.open_last_lib_checkbox.isChecked(),
             "generate_thumbs": self.generate_thumbs.isChecked(),
             "thumb_cache_size": max(
@@ -338,6 +381,8 @@ class SettingsPanel(PanelWidget):
             "show_filepath": self.filepath_combobox.currentData(),
             "theme": self.theme_combobox.currentData(),
             "tag_click_action": self.tag_click_action_combobox.currentData(),
+            "edit_tag_on_create": self.edit_tag_on_create_checkbox.isChecked(),
+            "edit_field_on_add": self.edit_field_on_add_checkbox.isChecked(),
             "date_format": self.dateformat_combobox.currentData(),
             "hour_format": self.hourformat_checkbox.isChecked(),
             "zero_padding": self.zeropadding_checkbox.isChecked(),
@@ -360,6 +405,8 @@ class SettingsPanel(PanelWidget):
         driver.settings.show_filepath = settings["show_filepath"]
         driver.settings.theme = settings["theme"]
         driver.settings.tag_click_action = settings["tag_click_action"]
+        driver.settings.edit_tag_on_create = settings["edit_tag_on_create"]
+        driver.settings.edit_field_on_add = settings["edit_field_on_add"]
         driver.settings.date_format = settings["date_format"]
         driver.settings.hour_format = settings["hour_format"]
         driver.settings.zero_padding = settings["zero_padding"]
@@ -381,15 +428,15 @@ class SettingsPanel(PanelWidget):
         )
 
     @classmethod
-    def build_modal(cls, driver: "QtDriver") -> PanelModal:
+    def build_modal(cls, driver: "QtDriver") -> Modal:
         settings_panel = cls(driver)
 
-        modal = PanelModal(
-            widget=settings_panel,
+        modal = Modal(
+            content_widget=settings_panel,
             window_title=Translations["settings.title"],
             is_savable=True,
         )
         modal.saved.connect(lambda: settings_panel.update_settings(driver))
-        modal.title_widget.setVisible(False)
+        modal.layout().title_label.setVisible(False)
 
         return modal

src/tagstudio/qt/mixed/tag_color_manager.py

@@ -23,11 +23,11 @@ from PySide6.QtWidgets import (
 
 from tagstudio.core.constants import RESERVED_NAMESPACE_PREFIX
 from tagstudio.core.enums import Theme
+from tagstudio.qt.controllers.modal import Modal
 from tagstudio.qt.mixed.build_namespace import BuildNamespacePanel
 from tagstudio.qt.mixed.color_box import ColorBoxWidget
 from tagstudio.qt.mixed.field_widget import FieldContainer
 from tagstudio.qt.translations import Translations
-from tagstudio.qt.views.panel_modal import PanelModal
 from tagstudio.qt.views.stylesheets.stylesheets import header
 
 logger = structlog.get_logger(__name__)
@@ -38,7 +38,7 @@ if TYPE_CHECKING:
 
 
 class TagColorManager(QWidget):
-    create_namespace_modal: PanelModal | None = None
+    create_namespace_modal: Modal | None = None
 
     def __init__(
         self,
@@ -125,7 +125,7 @@ class TagColorManager(QWidget):
                         self.setup_color_groups(),
                         ()
                         if len(self.driver.selected) < 1
-                        else self.driver.main_window.preview_panel.field_containers_widget.update_from_entry(  # noqa: E501
+                        else self.driver.main_window.preview_panel.containers.update_from_entry(  # noqa: E501
                             self.driver.selected[0], update_badges=False
                         ),
                     )
@@ -142,7 +142,7 @@ class TagColorManager(QWidget):
                                 self.setup_color_groups(),
                                 ()
                                 if len(self.driver.selected) < 1
-                                else self.driver.main_window.preview_panel.field_containers_widget.update_from_entry(  # noqa: E501
+                                else self.driver.main_window.preview_panel.containers.update_from_entry(  # noqa: E501
                                     self.driver.selected[0], update_badges=False
                                 ),
                             ),
@@ -174,7 +174,7 @@ class TagColorManager(QWidget):
     def create_namespace(self):
         build_namespace_panel = BuildNamespacePanel(self.lib)
 
-        self.create_namespace_modal = PanelModal(
+        self.create_namespace_modal = Modal(
             build_namespace_panel,
             Translations["namespace.create.title"],
             is_savable=True,

src/tagstudio/qt/mixed/tag_color_selection.py

@@ -20,21 +20,22 @@ from PySide6.QtWidgets import (
 from tagstudio.core.library.alchemy.enums import TagColorEnum
 from tagstudio.core.library.alchemy.library import Library
 from tagstudio.core.library.alchemy.models import TagColorGroup
-from tagstudio.qt.mixed.tag_widget import (
-    get_tag_border_color,
-    get_tag_highlight_color,
-    get_tag_text_color,
-)
+from tagstudio.qt.controllers.modal_content import ModalContent
 from tagstudio.qt.models.palette import ColorType, get_tag_color
 from tagstudio.qt.translations import Translations
 from tagstudio.qt.views.layouts.flow_layout import FlowLayout
-from tagstudio.qt.views.panel_modal import PanelWidget
-from tagstudio.qt.views.stylesheets.stylesheets import color_swatch_style, header
+from tagstudio.qt.views.stylesheets.stylesheets import (
+    color_swatch_style,
+    get_tag_border_color,
+    get_tag_highlight_color,
+    get_tag_text_color,
+    header,
+)
 
 logger = structlog.get_logger(__name__)
 
 
-class TagColorSelection(PanelWidget):
+class TagColorSelection(ModalContent):
     def __init__(self, library: Library):
         super().__init__()
         self.lib = library

src/tagstudio/qt/mixed/tag_widget.py

@@ -8,7 +8,7 @@ from typing import TYPE_CHECKING, override
 import structlog
 from PySide6.QtCore import QEvent, Qt, Signal
 from PySide6.QtGui import QAction, QColor, QEnterEvent, QFontMetrics
-from PySide6.QtWidgets import QHBoxLayout, QLineEdit, QPushButton, QVBoxLayout, QWidget
+from PySide6.QtWidgets import QHBoxLayout, QLineEdit, QPushButton, QSizePolicy, QVBoxLayout, QWidget
 
 from tagstudio.core.library.alchemy.enums import TagColorEnum
 from tagstudio.core.library.alchemy.models import Tag
@@ -141,30 +141,27 @@ class TagWidget(QWidget):
         self.search_for_tag_action = QAction(self)
         self.search_for_tag_action.setText(Translations["tag.search_for_tag"])
         self.bg_button.addAction(self.search_for_tag_action)
-        # add_to_search_action = QAction(self)
-        # add_to_search_action.setText(Translations.translate_formatted("tag.add_to_search"))
-        # self.bg_button.addAction(add_to_search_action)
 
         self.inner_layout = QHBoxLayout()
         self.inner_layout.setObjectName("innerLayout")
         self.inner_layout.setContentsMargins(0, 0, 0, 0)
+        self.inner_layout.setAlignment(Qt.AlignmentFlag.AlignLeft)
 
         self._delete_button = QPushButton(self)
         self._delete_button.setFlat(True)
         self._delete_button.setText("–")
         self._delete_button.setHidden(True)
-        self._delete_button.setMinimumSize(22, 22)
-        self._delete_button.setMaximumSize(22, 22)
+        self._delete_button.setFixedSize(22, 22)
         self._delete_button.clicked.connect(self.on_remove.emit)
         self._delete_button.setHidden(True)
         self.inner_layout.addWidget(self._delete_button)
-        self.inner_layout.addStretch(1)
 
         self.bg_button.setLayout(self.inner_layout)
         self.bg_button.setMinimumSize(44, 22)
 
-        self.bg_button.setMinimumHeight(22)
-        self.bg_button.setMaximumHeight(22)
+        self.bg_button.setFixedHeight(22)
+
+        self.setSizePolicy(QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Minimum)
 
         self.base_layout.addWidget(self.bg_button)