lannotex 0.1.1__tar.gz → 0.2.0__tar.gz

{lannotex-0.1.1 → lannotex-0.2.0}/CHANGELOG.md

@@ -6,6 +6,55 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [0.2.0] — 2026-10-14
+
+Viewing, speed and layout: sharp zoom on large images, instant navigation, and a
+workspace you can arrange yourself.
+
+### Added
+
+- **Full-resolution viewing.** Zooming in past the preview loads the original pixels in the
+  background, so large images stay sharp at any zoom. Only the visible region is drawn.
+  Detail decoding is capped at 64 MP to protect memory.
+- **Instant next/previous.** Neighbouring images are decoded ahead of time.
+- **Minimap** (`M`) for orientation and click-to-jump, and a **pixel grid** (`G`) from
+  1200% zoom upwards.
+- **Zoom controls:** actual pixels (`Ctrl+1`), zoom in/out (`Ctrl+=` / `Ctrl+-`) up to
+  6400%. The zoom readout now shows true pixel scale, so 100% means actual pixels.
+- **Image adjustments:** brightness, contrast and gamma in a new **Image view** panel. They
+  change the display only, never your files, and are applied just to the visible region, so
+  they stay fast on large images.
+- **Dockable panels:** Dataset, Inspector and Image view can be moved, tabbed, floated onto
+  another monitor, or closed. Your layout is remembered between sessions. Use
+  **View → Panels** to bring a panel back or apply a preset (default, or all panels on the
+  right). Focus mode hides every panel and restores your exact layout afterwards.
+- **Thumbnails in the image list**, generated in the background with the rows you can see
+  first. They're cached on disk in your user cache folder, not the project, so reopening a
+  project is instant. The cache is capped at 512 MB. Toggle them under **View → Show
+  thumbnails in image list**.
+- **Icons:** a consistent line-icon set for the toolbar, navigation and Home screen,
+  redrawn for light and dark themes, plus the Lannotex logo as the window icon. Icon-only
+  buttons have tooltips and screen-reader names.
+- **Command palette** (`Ctrl+K`): type part of any menu command, for example "zoom",
+  "export" or "layout", and press Enter to run it.
+- **Number keys 1–9** choose the drawing label, which relabels the selected shape, or
+  toggle classes in classification projects.
+- **Project → Import LabelMe folder…** imports a whole folder, including subfolders.
+
+### Changed
+
+- **LabelMe import keeps going.**
+  - Circles and rotated rectangles are converted to polygons.
+  - Points, lines and masks, which Lannotex can't draw yet, are skipped and counted in the
+    import summary instead of rejecting the whole file.
+  - Invalid shapes are dropped one at a time.
+  - A malformed JSON file no longer stops the rest of the folder.
+
+### Fixed
+
+- PySide6 6.12.0 is excluded. On Linux with Python 3.11 it over-releases references on every
+  background job, which made Lannotex abort on exit. Versions 6.8.3–6.11 are unaffected.
+
 ## [0.1.1] — 2026-10-14
 
 ### Changed

{lannotex-0.1.1 → lannotex-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lannotex
-Version: 0.1.1
+Version: 0.2.0
 Summary: Fast, offline-first image annotation for classifications, boxes, and polygons.
 Author: Lourdhu Raju
 Maintainer: Lourdhu Raju
@@ -30,7 +30,7 @@ Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: LICENSES/THIRD_PARTY_NOTICES.md
-Requires-Dist: PySide6-Essentials<7,>=6.8.3
+Requires-Dist: PySide6-Essentials!=6.12.0,<7,>=6.8.3
 Requires-Dist: Pillow>=11.1
 Provides-Extra: dev
 Requires-Dist: pytest>=8.3; extra == "dev"
@@ -131,6 +131,7 @@ Every shortcut can be remapped. See the [annotating guide](https://lourdhu02.git
 | | |
 | --- | --- |
 | **Annotate** | Bounding boxes · polygons with vertex drag, insert, and delete · multi-label image classes · "no target" negatives · 100-step undo/redo · zoom under the pointer, pan, arrow-key nudging · focus mode · light and dark themes |
+| **View** | Sharp full-resolution zoom up to 6400% · next/previous images decoded ahead · minimap · pixel grid · brightness, contrast and gamma · thumbnails · dockable panels you can float onto a second monitor, with saved layouts · `Ctrl+K` command palette |
 | **Stay safe** | SQLite projects with versioned migrations · recovery drafts and 700 ms autosave · transactional saves · geometry validation · backup and restore · relinking for moved images · EXIF orientation handled |
 | **Scale** | Virtualized image list (at most 1,024 records in memory) · background import and decoding · 96 MB preview cache · coordinates normalized to the original resolution |
 | **Export** | Labelme JSON · ready-to-train YOLO (`images/`, `labels/`, `data.yaml`) · COCO JSON · classification CSV · lossless native JSONL · each export reports anything it skipped |
@@ -181,8 +182,8 @@ hashes. There is no telemetry, no external AI service, and no automatic upload.
 
 ## Roadmap
 
-Next up: more LabelMe shape types (points, lines, circles), VOC and YOLO-seg export, and
-number-key label selection. See the
+Next up: point, line, rotated-box, keypoint and brush-mask tools, per-object attributes,
+and VOC, YOLO-seg and YOLO-OBB export. See the
 [roadmap](https://lourdhu02.github.io/Lannotex/ROADMAP/) and the
 [measured performance](https://lourdhu02.github.io/Lannotex/PERFORMANCE/).
 

{lannotex-0.1.1 → lannotex-0.2.0}/README.md

@@ -89,6 +89,7 @@ Every shortcut can be remapped. See the [annotating guide](https://lourdhu02.git
 | | |
 | --- | --- |
 | **Annotate** | Bounding boxes · polygons with vertex drag, insert, and delete · multi-label image classes · "no target" negatives · 100-step undo/redo · zoom under the pointer, pan, arrow-key nudging · focus mode · light and dark themes |
+| **View** | Sharp full-resolution zoom up to 6400% · next/previous images decoded ahead · minimap · pixel grid · brightness, contrast and gamma · thumbnails · dockable panels you can float onto a second monitor, with saved layouts · `Ctrl+K` command palette |
 | **Stay safe** | SQLite projects with versioned migrations · recovery drafts and 700 ms autosave · transactional saves · geometry validation · backup and restore · relinking for moved images · EXIF orientation handled |
 | **Scale** | Virtualized image list (at most 1,024 records in memory) · background import and decoding · 96 MB preview cache · coordinates normalized to the original resolution |
 | **Export** | Labelme JSON · ready-to-train YOLO (`images/`, `labels/`, `data.yaml`) · COCO JSON · classification CSV · lossless native JSONL · each export reports anything it skipped |
@@ -139,8 +140,8 @@ hashes. There is no telemetry, no external AI service, and no automatic upload.
 
 ## Roadmap
 
-Next up: more LabelMe shape types (points, lines, circles), VOC and YOLO-seg export, and
-number-key label selection. See the
+Next up: point, line, rotated-box, keypoint and brush-mask tools, per-object attributes,
+and VOC, YOLO-seg and YOLO-OBB export. See the
 [roadmap](https://lourdhu02.github.io/Lannotex/ROADMAP/) and the
 [measured performance](https://lourdhu02.github.io/Lannotex/PERFORMANCE/).
 

{lannotex-0.1.1 → lannotex-0.2.0}/docs/guide/annotating.md

@@ -8,7 +8,10 @@
 | Box | ++b++ | Drag from one corner to the opposite corner. |
 | Polygon | ++p++ | Click to add vertices; ++enter++ finishes, ++escape++ cancels. |
 
-The label selected in the **Labels & annotations** panel is applied to new shapes.
+The label selected in the **Labels & annotations** panel is applied to new shapes. Press
+++1++–++9++ to choose the first nine labels, in alphabetical order. If a shape is selected,
+it is relabelled. In classification projects, the number keys toggle classes on the
+current image instead.
 
 ### Editing polygons
 
@@ -22,16 +25,38 @@ The label selected in the **Labels & annotations** panel is applied to new shape
 
 | Action | Control |
 | --- | --- |
-| Zoom | Mouse wheel (zooms under the pointer) |
-| Pan | Hold ++space++ and drag |
+| Zoom | Mouse wheel (zooms under the pointer), ++ctrl+equal++ / ++ctrl+minus++ |
+| Actual pixels (100%) | ++ctrl+1++ |
+| Pan | Hold ++space++ and drag, or click and drag in the minimap |
 | Fit to window | ++f++ |
+| Minimap on/off | ++m++ |
+| Pixel grid on/off (from 1200%) | ++g++ |
 | Nudge selection | Arrow keys (hold ++shift++ for a 10× step) |
 | Focus mode (hide panels) | ++ctrl+shift+f++ |
 
+## Image adjustments
+
+The **Image view** panel has brightness, contrast and gamma sliders for dark, washed-out or
+low-contrast images. They change only what you see, never your files or the exported data.
+**Reset adjustments**, or **View → Reset image adjustments**, returns to the original.
+
+## Arranging the workspace
+
+The **Dataset**, **Inspector** and **Image view** panels are dockable:
+
+- Drag a panel's title bar to move it to another side, or onto another panel to tab them.
+- Use the float button to detach a panel, for example onto a second monitor.
+- Close panels you don't need. **View → Panels** lists them all so you can bring them back.
+- **View → Panels → Default layout** and **All panels on the right** are one-click presets.
+- **Focus mode** (++ctrl+shift+f++) hides every panel. Press it again to restore your layout.
+
+Your layout is saved when you close Lannotex.
+
 ## Keyboard reference
 
 | Action | Default |
 | --- | --- |
+| Command palette: search and run any command | ++ctrl+k++ |
 | Save | ++ctrl+s++ |
 | Save & next | ++ctrl+enter++ |
 | Previous / next image | ++alt+left++ / ++alt+right++ |
@@ -57,9 +82,11 @@ dataset:
 
 ## Coordinates
 
-Geometry is stored **normalized** (0–1) relative to the original image size. Large
-images are displayed as a preview capped at 2,560 px on the longest side, but stored
-coordinates and exports always use the original resolution. EXIF orientation is
-respected.
+Geometry is stored **normalized** (0–1) relative to the original image size. Images open
+as a fast preview (up to 2,560 px). When you zoom in past that, Lannotex loads the
+original pixels in the background, so the image stays sharp up to 6400%. The zoom
+readout shows true scale: 100% means one image pixel per screen pixel. Full-resolution
+detail is available for images up to 64 megapixels; larger images stay on the preview.
+EXIF orientation is respected.
 
 Undo history keeps the last 100 changes for the image you're working on.

{lannotex-0.1.1 → lannotex-0.2.0}/docs/migrate-from-labelme.md

@@ -6,8 +6,9 @@ and still hand files back to LabelMe users.
 ## Import a LabelMe folder
 
 1. Create a project (**Combined pipeline** enables every tool).
-2. Choose **Project → Import annotations…** and select the folder that contains your
-   LabelMe `.json` files.
+2. Choose **Project → Import LabelMe folder…** and select the folder that contains your
+   LabelMe `.json` files. Subfolders are included. Use **Import annotations…** for a single
+   file.
 3. Lannotex reads each file, finds the image through its `imagePath`, checks that the
    dimensions match, and creates any missing labels.
 
@@ -19,16 +20,19 @@ Your LabelMe JSON files and images are left untouched.
 | --- | --- |
 | `rectangle` shapes | Bounding boxes |
 | `polygon` shapes | Polygons |
+| `circle` shapes | Polygons (32 points around the circle) |
+| `rotation` (rotated rectangle) shapes | Polygons with the four corners |
 | `flags` set to `true` | Image classes |
 | Image files via `imagePath` | Referenced in place, not copied |
 
 !!! warning "Current limitations"
-    - Files containing `circle`, `line`, `linestrip`, `point`, or `mask` shapes are
-      rejected **as a whole file**, and the error list names them. Support for these
-      shapes is planned.
+    - `point`, `line`, `linestrip` and `mask` shapes are **skipped**. The rest of each file
+      still imports, and the import summary lists how many of each were skipped. Support
+      for these shapes is planned.
+    - Shapes with invalid geometry, such as a polygon with fewer than 3 points, are skipped
+      and listed the same way.
     - `imageData` embedded in the JSON isn't used. The image file must exist on disk.
     - `group_id`, `description`, and per-shape `flags` aren't imported.
-    - Only JSON files directly inside the chosen folder are read, not subfolders.
 
 ## Export back to LabelMe
 

{lannotex-0.1.1 → lannotex-0.2.0}/pyproject.toml

@@ -32,7 +32,9 @@ classifiers = [
 ]
 # Ranges, not pins: exact pins break installs on newer Pythons. Release binaries pin
 # their full set in requirements-windows-build.txt.
-dependencies = ["PySide6-Essentials>=6.8.3,<7", "Pillow>=11.1"]
+# PySide6 6.12.0 over-releases None/True on every QThreadPool job and worker-thread signal,
+# which aborts Python 3.11 on Linux at exit ("bool_dealloc"); 6.8.3-6.11.0 are unaffected.
+dependencies = ["PySide6-Essentials>=6.8.3,<7,!=6.12.0", "Pillow>=11.1"]
 
 [project.optional-dependencies]
 dev = [

{lannotex-0.1.1 → lannotex-0.2.0}/src/lannotex/__init__.py

@@ -1,2 +1,2 @@
 """Lannotex: offline-first image annotation."""
-__version__ = "0.1.1"
+__version__ = "0.2.0"

{lannotex-0.1.1 → lannotex-0.2.0}/src/lannotex/app.py

@@ -6,18 +6,21 @@ import os
 from pathlib import Path
 import sys
 import uuid
-from PySide6.QtCore import QEvent, QModelIndex, QSettings, Qt, QThreadPool, QTimer, Slot
+from PySide6.QtCore import QEvent, QModelIndex, QSettings, QSize, Qt, QThreadPool, QTimer, Slot
 from PySide6.QtGui import QAction, QColor, QKeySequence
 from PySide6.QtWidgets import (QAbstractSpinBox, QApplication, QCheckBox, QComboBox,
-    QDialog, QDialogButtonBox, QDoubleSpinBox, QFileDialog, QFrame, QGridLayout,
+    QDialog, QDialogButtonBox, QDockWidget, QDoubleSpinBox, QFileDialog, QSlider, QFrame, QGridLayout,
     QHBoxLayout, QInputDialog, QKeySequenceEdit, QLabel, QLineEdit, QListView, QListWidget,
     QListWidgetItem, QMainWindow, QMessageBox, QProgressBar, QPushButton, QScrollArea,
-    QSplitter, QStackedWidget, QTableWidget, QTableWidgetItem, QTextEdit, QToolButton, QVBoxLayout, QWidget)
+    QStackedWidget, QTableWidget, QTableWidgetItem, QTextEdit, QToolButton, QVBoxLayout, QWidget)
 from . import __version__
 from .canvas import Canvas
 from .domain import Annotation, Document, validate_all
 from .exporters import analyze, export_project, import_annotations
 from .models import ImageListModel
+from .palette import CommandPalette, menu_commands
+from .thumbnails import Thumbnails
+from .icons import icon, logo
 from .storage import ConflictError, Project, atomic_text
 from .theme import apply_theme
 from .workers import ImageLoader, Job, import_images
@@ -28,7 +31,8 @@ COLORS = ['#37b8a5','#70a8f5','#d5a85a','#bf8bef','#ed8ca4','#74c9db','#9fbd68']
 DEFAULT_KEYS = {'save':'Ctrl+S','save_next':'Ctrl+Return','previous':'Alt+Left','next':'Alt+Right',
                 'undo':'Ctrl+Z','redo':'Ctrl+Shift+Z','delete':'Del','cancel':'Esc','finish':'Return',
                 'fit':'F','select':'V','box':'B','polygon':'P','duplicate':'Ctrl+D','redraw':'R',
-                'vertex':'Shift+Del','focus':'Ctrl+Shift+F','open':'Ctrl+O','import':'Ctrl+I'}
+                'vertex':'Shift+Del','focus':'Ctrl+Shift+F','open':'Ctrl+O','import':'Ctrl+I',
+                'zoom_in':'Ctrl+=','zoom_out':'Ctrl+-','actual':'Ctrl+1','minimap':'M','grid':'G','palette':'Ctrl+K'}
 
 
 def button(text, callback, primary=False):
@@ -59,7 +63,9 @@ class Main(QMainWindow):
         self.job = None; self.job_kind = ''; self.focus_mode = False
         self.pool = QThreadPool(self); self.pool.setMaxThreadCount(1)
         self.loader = ImageLoader(self)
+        self.thumbnails = Thumbnails(self); self.thumbnails.prune_later()
         self.loader.ready.connect(self.image_ready); self.loader.failed.connect(self.image_failed)
+        self.loader.detail_ready.connect(self.detail_ready); self.loader.detail_failed.connect(self.detail_failed)
         self.timer = QTimer(self); self.timer.setSingleShot(True); self.timer.timeout.connect(self.save)
         self.filter_timer = QTimer(self); self.filter_timer.setSingleShot(True); self.filter_timer.timeout.connect(self.filter_images)
         self.actions = {}; self._build_ui(); self._build_menus()
@@ -75,41 +81,57 @@ class Main(QMainWindow):
         QApplication.instance().installEventFilter(self)
         geometry = self.settings.value('geometry')
         if geometry: self.restoreGeometry(geometry)
-        sizes = self.settings.value('splitter')
-        if sizes: self.splitter.restoreState(sizes)
-        self.set_save_state('No project'); self.refresh_controls()
+        layout = self.settings.value('layout')
+        if layout: self.dock_host.restoreState(layout)
+        self.set_save_state('No project'); self.refresh_controls(); self.apply_icons()
+
+    def apply_icons(self):
+        palette=QApplication.palette(); color=palette.text().color().name(); on_accent=palette.highlightedText().color().name()
+        for widget,name in [(self.home_button,'home'),(self.new_button,'plus'),(self.open_button,'folder-open'),(self.team_button,'users'),
+                            (self.theme_button,'theme'),(self.analysis_button,'chart'),(self.import_button,'folder-plus'),(self.files_button,'file-plus'),
+                            (self.undo_button,'undo'),(self.redo_button,'redo'),(self.fit_button,'fit'),(self.prev_button,'prev'),
+                            (self.next_image_button,'next'),(self.save_button,'save')]:
+            widget.setIcon(icon(name,color)); widget.setIconSize(QSize(18,18))
+        self.export_button.setIcon(icon('export',on_accent)); self.export_button.setIconSize(QSize(18,18))
+        for mode,tool in self.tool_buttons.items():
+            tool.setIcon(icon(mode,color)); tool.setIconSize(QSize(18,18)); tool.setToolButtonStyle(Qt.ToolButtonTextBesideIcon)
+        self.home.set_icon_color(color)
+        self.setWindowIcon(logo())
 
     def _build_ui(self):
         root = QWidget(); outer = QVBoxLayout(root); outer.setContentsMargins(0,0,0,0); outer.setSpacing(0)
         header=QFrame(); header.setObjectName('header'); bar=QHBoxLayout(header); bar.setContentsMargins(20,14,20,14)
-        bar.addWidget(button('‹ Home',self.go_home))
+        self.home_button=button('Home',self.go_home); bar.addWidget(self.home_button)
         brand=QVBoxLayout(); brand.setSpacing(1); brand.addWidget(label('Lannotex','brand')); self.pipeline_title=label('ANNOTATION WORKSPACE'); brand.addWidget(self.pipeline_title)
         bar.addLayout(brand); bar.addSpacing(28)
         self.project_title=label('No project open'); bar.addWidget(self.project_title,1)
-        bar.addWidget(button('New project',self.new_project)); bar.addWidget(button('Open',self.open_project))
+        self.new_button=button('New project',self.new_project); bar.addWidget(self.new_button)
+        self.open_button=button('Open',self.open_project); bar.addWidget(self.open_button)
         self.team_button=button('Team',self.team_dialog); bar.addWidget(self.team_button)
         self.sync_button=button('Sync',self.sync_team); bar.addWidget(self.sync_button); self.sync_button.hide()
-        bar.addWidget(button('◐',self.toggle_theme))
+        self.theme_button=button('',self.toggle_theme); self.theme_button.setToolTip('Light / dark theme'); self.theme_button.setAccessibleName('Toggle theme'); bar.addWidget(self.theme_button)
         self.analysis_button=button('Analysis',self.show_analysis); bar.addWidget(self.analysis_button)
         self.export_button=button('Export',self.export_dialog,True); bar.addWidget(self.export_button)
         outer.addWidget(header)
-        self.splitter=QSplitter(); self.splitter.setChildrenCollapsible(False)
+        # Inner main window so panels dock, tab, float and persist within the workspace page only.
+        self.dock_host=QMainWindow(); self.dock_host.setWindowFlags(Qt.Widget); self.dock_host.setObjectName('dockHost')
+        self.dock_host.setDockOptions(QMainWindow.AnimatedDocks|QMainWindow.AllowTabbedDocks|QMainWindow.AllowNestedDocks)
         self.left=QFrame(); self.left.setObjectName('panel'); left=QVBoxLayout(self.left); left.setContentsMargins(12,10,12,10)
-        left.addWidget(label('DATASET','section'))
         self.dataset_count=label('0 images'); left.addWidget(self.dataset_count)
-        row=QHBoxLayout(); self.import_button=button('+ Folder',self.import_folder); row.addWidget(self.import_button)
-        self.files_button=button('+ Files',self.import_files); row.addWidget(self.files_button); left.addLayout(row)
+        row=QHBoxLayout(); self.import_button=button('Folder',self.import_folder); self.import_button.setToolTip('Import a folder of images (Ctrl+I)'); row.addWidget(self.import_button)
+        self.files_button=button('Files',self.import_files); self.files_button.setToolTip('Import image files'); row.addWidget(self.files_button); left.addLayout(row)
         self.search=QLineEdit(); self.search.setPlaceholderText('Search image names…'); self.search.setClearButtonEnabled(True)
         self.search.textChanged.connect(lambda:self.filter_timer.start(180)); left.addWidget(self.search)
         self.filter=QComboBox()
         for text,data in [('All images','all'),('Unlabeled','new'),('Labeled','done'),('No targets','empty')]: self.filter.addItem(text,data)
         self.filter.currentIndexChanged.connect(self.filter_images); left.addWidget(self.filter)
-        self.model=ImageListModel(self); self.images=QListView(); self.images.setModel(self.model)
+        self.model=ImageListModel(self,self.thumbnails); self.images=QListView(); self.images.setModel(self.model)
+        self.images.setIconSize(QSize(56,42)); self.model.set_show_thumbnails(self.settings.value('thumbnails',True,type=bool))
         self.images.setUniformItemSizes(True); self.images.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
         self.images.setAccessibleName('Project images'); self.images.selectionModel().currentChanged.connect(self.select_index)
         left.addWidget(self.images,1)
         self.left_hint=label('Images stay on your disk.\nNothing is uploaded.'); left.addWidget(self.left_hint)
-        self.left.setMinimumWidth(220); self.splitter.addWidget(self.left)
+        self.left.setMinimumWidth(220)
         center=QWidget(); middle=QVBoxLayout(center); middle.setContentsMargins(8,0,8,0); middle.setSpacing(8)
         top=QHBoxLayout(); self.image_title=label('Annotation studio','section'); top.addWidget(self.image_title,1)
         self.save_badge=label('No project','save'); top.addWidget(self.save_badge); middle.addLayout(top)
@@ -118,20 +140,26 @@ class Main(QMainWindow):
             tool=QToolButton(); tool.setText(f'{text}  {key}'); tool.setCheckable(True); tool.setToolTip(f'{text} tool ({key})')
             tool.clicked.connect(lambda checked=False,m=mode:self.set_tool(m)); tools.addWidget(tool); self.tool_buttons[mode]=tool
         self.tool_buttons['select'].setChecked(True)
-        tools.addStretch(); self.undo_button=button('↶',self.undo); self.undo_button.setToolTip('Undo (Ctrl+Z)'); tools.addWidget(self.undo_button)
-        self.redo_button=button('↷',self.redo); self.redo_button.setToolTip('Redo (Ctrl+Shift+Z)'); tools.addWidget(self.redo_button)
-        self.zoom_label=label('100%'); tools.addWidget(self.zoom_label); tools.addWidget(button('Fit',lambda:self.canvas.fit()))
+        tools.addStretch(); self.undo_button=button('',self.undo); self.undo_button.setToolTip('Undo (Ctrl+Z)'); self.undo_button.setAccessibleName('Undo'); tools.addWidget(self.undo_button)
+        self.redo_button=button('',self.redo); self.redo_button.setToolTip('Redo (Ctrl+Shift+Z)'); self.redo_button.setAccessibleName('Redo'); tools.addWidget(self.redo_button)
+        self.zoom_label=label('100%'); tools.addWidget(self.zoom_label)
+        self.fit_button=button('Fit',lambda:self.canvas.fit()); self.fit_button.setToolTip('Fit image (F)'); tools.addWidget(self.fit_button)
         middle.addLayout(tools)
         self.canvas=Canvas(); self.canvas.edited.connect(self.commit); self.canvas.selected.connect(self.selection_changed)
         self.canvas.message.connect(self.notice); self.canvas.zoomed.connect(lambda n:self.zoom_label.setText(f'{n}%'))
+        self.canvas.detail_wanted.connect(self.request_detail)
+        self.canvas.show_minimap=self.settings.value('minimap',True,type=bool); self.canvas.show_grid=self.settings.value('pixel_grid',True,type=bool)
         middle.addWidget(self.canvas,1)
         self.canvas_hint=label('B  Draw box   ·   P  Draw polygon   ·   Space + drag  Pan   ·   F  Fit')
         self.canvas_hint.setWordWrap(True); middle.addWidget(self.canvas_hint)
-        footer=QHBoxLayout(); footer.addWidget(button('←',lambda:self.navigate(-1)))
-        self.position=label('— / —'); footer.addWidget(self.position); footer.addWidget(button('→',lambda:self.navigate(1)))
+        footer=QHBoxLayout(); self.prev_button=button('',lambda:self.navigate(-1)); self.prev_button.setToolTip('Previous image (Alt+Left)')
+        self.prev_button.setAccessibleName('Previous image'); footer.addWidget(self.prev_button)
+        self.position=label('— / —'); footer.addWidget(self.position)
+        self.next_image_button=button('',lambda:self.navigate(1)); self.next_image_button.setToolTip('Next image (Alt+Right)')
+        self.next_image_button.setAccessibleName('Next image'); footer.addWidget(self.next_image_button)
         footer.addStretch(); self.save_button=button('Save',self.save); footer.addWidget(self.save_button)
         self.next_button=button('Save && next→',self.save_next,True); footer.addWidget(self.next_button); middle.addLayout(footer)
-        self.splitter.addWidget(center)
+        self.dock_host.setCentralWidget(center)
         self.right=QScrollArea(); self.right.setWidgetResizable(True); self.right.setMinimumWidth(245)
         inspector=QWidget(); form=QVBoxLayout(inspector); form.setContentsMargins(14,10,14,14); form.setSpacing(9)
         self.inspector_heading=label('LABELS & ANNOTATIONS','section'); form.addWidget(self.inspector_heading)
@@ -160,14 +188,35 @@ class Main(QMainWindow):
         self.redraw_button=button('Redraw',lambda:self.canvas.redraw()); editrow.addWidget(self.redraw_button); form.addLayout(editrow)
         self.delete_button=button('Delete selected',self.delete_selected); self.delete_button.setObjectName('danger'); form.addWidget(self.delete_button)
         form.addWidget(button('Clear image annotations',self.clear_annotations))
-        from PySide6.QtWidgets import QSlider
         self.opacity_heading=label('OVERLAY OPACITY','section'); form.addWidget(self.opacity_heading); self.opacity=QSlider(Qt.Horizontal); self.opacity.setRange(0,70)
         self.opacity.setValue(self.settings.value('opacity',15,type=int)); self.canvas.opacity=self.opacity.value()/100
         self.opacity.valueChanged.connect(self.opacity_changed); form.addWidget(self.opacity)
         self.polygon_hint=label('Polygon: drag a vertex to edit. Double-click an edge to insert. Shift+Delete removes the selected vertex.'); self.polygon_hint.setWordWrap(True); form.addWidget(self.polygon_hint)
         form.addStretch(); form.addWidget(button('Keyboard && preferences',self.preferences))
-        self.right.setWidget(inspector); self.splitter.addWidget(self.right); self.splitter.setSizes([260,850,280])
-        wrap=QWidget(); layout=QVBoxLayout(wrap); layout.setContentsMargins(12,12,12,12); layout.addWidget(self.splitter)
+        self.right.setWidget(inspector)
+        self.view_panel=QWidget(); vp=QVBoxLayout(self.view_panel); vp.setContentsMargins(14,10,14,14); vp.setSpacing(4)
+        self.adjust_sliders={}
+        for key,title,low,high,default in [('brightness','Brightness',-100,100,0),('contrast','Contrast',-100,100,0),('gamma','Gamma',20,300,100)]:
+            row=QHBoxLayout(); row.addWidget(label(title)); row.addStretch(); value=label(''); row.addWidget(value); vp.addLayout(row)
+            slider=QSlider(Qt.Horizontal); slider.setRange(low,high); slider.setValue(default); slider.setAccessibleName(title)
+            slider.valueChanged.connect(self.adjustments_changed); vp.addWidget(slider); self.adjust_sliders[key]=(slider,value,default)
+        vp.addWidget(button('Reset adjustments',self.reset_adjustments)); vp.addSpacing(8)
+        self.minimap_check=QCheckBox('Minimap when zoomed in'); self.minimap_check.setChecked(self.canvas.show_minimap)
+        self.minimap_check.toggled.connect(self.minimap_checked); vp.addWidget(self.minimap_check)
+        self.grid_check=QCheckBox('Pixel grid from 1200%'); self.grid_check.setChecked(self.canvas.show_grid)
+        self.grid_check.toggled.connect(self.grid_checked); vp.addWidget(self.grid_check)
+        vp.addStretch(); self.adjustments_changed()
+        self.docks={}
+        for key,title,widget,area in [('dataset','Dataset',self.left,Qt.LeftDockWidgetArea),('inspector','Inspector',self.right,Qt.RightDockWidgetArea),
+                                      ('view','Image view',self.view_panel,Qt.RightDockWidgetArea)]:
+            dock=QDockWidget(title,self.dock_host); dock.setObjectName(f'dock-{key}'); dock.setWidget(widget)
+            dock.setFeatures(QDockWidget.DockWidgetMovable|QDockWidget.DockWidgetFloatable|QDockWidget.DockWidgetClosable)
+            self.dock_host.addDockWidget(area,dock); self.docks[key]=dock
+        self.dock_host.resizeDocks([self.docks['dataset'],self.docks['inspector']],[260,290],Qt.Horizontal)
+        # Image view shares a tab with the Inspector so the object list keeps full height on laptop screens.
+        self.dock_host.tabifyDockWidget(self.docks['inspector'],self.docks['view']); self.docks['inspector'].raise_()
+        self.default_layout=self.dock_host.saveState()
+        wrap=QWidget(); layout=QVBoxLayout(wrap); layout.setContentsMargins(8,8,8,8); layout.addWidget(self.dock_host)
         outer.addWidget(wrap,1); self.setCentralWidget(root)
         self.status=label('Ready · local-only workspace'); self.statusBar().addWidget(self.status,1)
         self.progress=QProgressBar(); self.progress.setMaximumWidth(180); self.progress.hide(); self.statusBar().addPermanentWidget(self.progress)
@@ -181,7 +230,8 @@ class Main(QMainWindow):
         file=self.menuBar().addMenu('Project')
         add(file,'New project…',self.new_project); add(file,'Open project…',self.open_project,'open')
         add(file,'Import image folder…',self.import_folder,'import'); add(file,'Import image files…',self.import_files)
-        add(file,'Import annotations…',self.import_annotation_dialog); file.addSeparator()
+        add(file,'Import annotations…',self.import_annotation_dialog)
+        add(file,'Import LabelMe folder…',lambda:self.import_annotation_dialog(folder=True)); file.addSeparator()
         add(file,'Save',self.save,'save'); add(file,'Save && next',self.save_next,'save_next')
         add(file,'Export…',self.export_dialog); add(file,'Backup project…',self.backup_dialog)
         add(file,'Restore backup…',self.restore_dialog); add(file,'Relink current image…',self.relink_dialog)
@@ -192,7 +242,18 @@ class Main(QMainWindow):
                               ('vertex','Delete polygon vertex',self.canvas.delete_vertex),('cancel','Cancel drawing',self.canvas.cancel),
                               ('finish','Finish polygon',self.canvas.finish_polygon)]: add(edit,text,slot,key)
         view=self.menuBar().addMenu('View')
-        add(view,'Fit image',self.canvas.fit,'fit'); add(view,'Focus mode',self.toggle_focus,'focus')
+        add(view,'Command palette…',self.open_palette,'palette'); view.addSeparator()
+        add(view,'Fit image',self.canvas.fit,'fit'); add(view,'Actual pixels (100%)',self.canvas.actual_pixels,'actual')
+        add(view,'Zoom in',lambda:self.canvas.zoom_by(1.25),'zoom_in'); add(view,'Zoom out',lambda:self.canvas.zoom_by(1/1.25),'zoom_out')
+        add(view,'Show minimap',self.toggle_minimap,'minimap'); add(view,'Show pixel grid',self.toggle_grid,'grid')
+        add(view,'Reset image adjustments',self.reset_adjustments)
+        add(view,'Show thumbnails in image list',self.toggle_thumbnails); view.addSeparator()
+        panels=view.addMenu('Panels')
+        for dock in self.docks.values(): panels.addAction(dock.toggleViewAction())
+        panels.addSeparator()
+        add(panels,'Default layout',lambda:self.apply_layout('default'))
+        add(panels,'All panels on the right',lambda:self.apply_layout('right'))
+        add(view,'Focus mode',self.toggle_focus,'focus')
         add(view,'Toggle light / dark',self.toggle_theme); add(view,'Analysis',self.show_analysis)
         add(view,'Previous image',lambda:self.navigate(-1),'previous'); add(view,'Next image',lambda:self.navigate(1),'next')
         for mode in ('select','box','polygon'): add(view,mode.title()+' tool',lambda checked=False,m=mode:self.set_tool(m),mode)
@@ -213,6 +274,8 @@ class Main(QMainWindow):
             if typing and key not in ('save','save_next'): return False
             if key in self.actions:
                 self.actions[key][2](); return True
+        if not typing and Qt.Key_1<=event.key()<=Qt.Key_9 and event.modifiers() in (Qt.NoModifier,Qt.KeypadModifier):
+            if self.pick_label(event.key()-Qt.Key_1): return True
         if not typing and event.key() in (Qt.Key_Left,Qt.Key_Right,Qt.Key_Up,Qt.Key_Down) and event.modifiers() in (Qt.NoModifier,Qt.ShiftModifier):
             self.nudge(event.key(), .01 if event.modifiers()==Qt.ShiftModifier else .001); return True
         return super().eventFilter(obj,event)
@@ -347,9 +410,45 @@ class Main(QMainWindow):
     @Slot(object,object)
     def image_ready(self,token,image):
         if token!=self.token: return
-        self.loading=False; self.canvas.set_image(image); self.refresh_controls()
+        source=(self.current['width'],self.current['height']) if self.current['width'] and self.current['height'] else None
+        self.loading=False; self.canvas.set_image(image,source); self.refresh_controls()
         self.notice(f"{self.current['width']} × {self.current['height']} px · full-resolution coordinates · local project")
         if self.dirty and self.settings.value('autosave',True,type=bool): self.timer.start(700)
+        self.prefetch_neighbors()
+
+    def prefetch_neighbors(self):
+        row=self.images.currentIndex().row(); paths=[]
+        for r in (row+1,row-1,row+2):
+            record=self.model.record(r)
+            if record:
+                path=self.project.resolve(record['path'])
+                if path.is_file(): paths.append(path)
+        self.loader.prefetch(paths)
+
+    def request_detail(self):
+        if self.current: self.loader.request_detail(self.token,self.project.resolve(self.current['path']))
+
+    @Slot(object,object)
+    def detail_ready(self,token,image):
+        if token==self.token: self.canvas.set_detail(image)
+
+    @Slot(object,str)
+    def detail_failed(self,token,error):
+        if token==self.token: self.notice(f'Showing the preview at this zoom: {error}')
+
+    def toggle_minimap(self):
+        self.canvas.toggle_minimap(); self.settings.setValue('minimap',self.canvas.show_minimap)
+        self.minimap_check.blockSignals(True); self.minimap_check.setChecked(self.canvas.show_minimap); self.minimap_check.blockSignals(False)
+
+    def minimap_checked(self,on):
+        if self.canvas.show_minimap!=on: self.toggle_minimap()
+
+    def grid_checked(self,on):
+        if self.canvas.show_grid!=on: self.toggle_grid()
+
+    def toggle_grid(self):
+        self.canvas.toggle_grid(); self.settings.setValue('pixel_grid',self.canvas.show_grid)
+        self.grid_check.blockSignals(True); self.grid_check.setChecked(self.canvas.show_grid); self.grid_check.blockSignals(False)
 
     @Slot(object,str)
     def image_failed(self,token,error):
@@ -565,9 +664,10 @@ class Main(QMainWindow):
         root=self.project.root
         self.start_job('import',lambda cancel,progress:import_images(root,paths,cancel,progress))
 
-    def import_annotation_dialog(self):
+    def import_annotation_dialog(self,folder=False):
         if not self.project or self.job or self.project.setting('team_remote'): return
-        path,_=QFileDialog.getOpenFileName(self,'Import Labelme JSON or native annotations.jsonl','','Annotations (*.json *.jsonl)')
+        if folder: path=QFileDialog.getExistingDirectory(self,'Import a LabelMe folder (subfolders included)')
+        else: path,_=QFileDialog.getOpenFileName(self,'Import Labelme JSON or native annotations.jsonl','','Annotations (*.json *.jsonl)')
         if path and self.save():
             root=self.project.root; self.start_job('annotations',lambda cancel,progress:import_annotations(root,path,cancel,progress))
 
@@ -589,7 +689,9 @@ class Main(QMainWindow):
         if self.job_kind in ('import','annotations'):
             self.refresh_images(); self.refresh_labels()
             text=f"Imported {result['added']:,} images"+(' · cancelled' if result.get('cancelled') else '')
-            if result.get('errors'): self.show_report('Import summary',text+'\n\n'+'\n'.join(result['errors']))
+            shapes=result.get('skipped_shapes') or {}
+            details=([('Shapes skipped:\n'+'\n'.join(f'  {n:,} × {reason}' for reason,n in sorted(shapes.items())))] if shapes else [])+(['\n'.join(result['errors'])] if result.get('errors') else [])
+            if details: self.show_report('Import summary',text+'\n\n'+'\n\n'.join(details))
             self.notice(text)
         elif self.job_kind=='export':
             self.show_report('Export summary',f"Included: {result['included']}\nUnlabeled included: {result['unlabeled']}\nSkipped images: {result['skipped']}\nAnnotations unsupported by this format: {result['unsupported_annotations']}\nCancelled: {result.get('cancelled',False)}\n\n{result['path']}\n\n"+'\n'.join(result['errors']))
@@ -703,7 +805,48 @@ class Main(QMainWindow):
             self.project.set_setting('tasks',tasks); self.set_tool('select'); self.refresh_controls()
 
     def toggle_focus(self):
-        self.focus_mode=not self.focus_mode; self.left.setVisible(not self.focus_mode); self.right.setVisible(not self.focus_mode)
+        self.focus_mode=not self.focus_mode
+        if self.focus_mode:
+            self.pre_focus=self.dock_host.saveState()
+            for dock in self.docks.values(): dock.hide()
+        else: self.dock_host.restoreState(self.pre_focus)
+
+    def pick_label(self,index):
+        """Number keys: toggle a class in classification projects, otherwise choose the drawing label
+        (which relabels the selected shape, like choosing it in the label box)."""
+        if not self.project or not self.current or self.loading: return False
+        if self.project.setting('tasks',['box','polygon','classification'])==['classification']:
+            if index>=self.classes.count() or not self.classes.isEnabled(): return False
+            item=self.classes.item(index); item.setCheckState(Qt.Unchecked if item.checkState()==Qt.Checked else Qt.Checked)
+            return True
+        if index>=self.label_combo.count(): return False
+        self.label_combo.setCurrentIndex(index); self.notice(f'Label {index+1}: {self.label_combo.currentText()}')
+        return True
+
+    def toggle_thumbnails(self):
+        self.model.set_show_thumbnails(not self.model.show_thumbnails); self.settings.setValue('thumbnails',self.model.show_thumbnails)
+
+    def open_palette(self):
+        commands=[c for c in menu_commands(self.menuBar()) if not c[0].startswith('Command palette')]
+        self.command_palette=CommandPalette(self,commands); self.command_palette.open()
+
+    def apply_layout(self,name):
+        self.focus_mode=False
+        self.dock_host.restoreState(self.default_layout)
+        for dock in self.docks.values(): dock.setFloating(False); dock.show()
+        if name=='right':
+            self.dock_host.addDockWidget(Qt.RightDockWidgetArea,self.docks['dataset'])
+            self.dock_host.tabifyDockWidget(self.docks['inspector'],self.docks['dataset'])
+        self.docks['inspector'].raise_()
+
+    def adjustments_changed(self,*_):
+        values={key:slider.value() for key,(slider,_,_) in self.adjust_sliders.items()}
+        for key,(slider,text,_) in self.adjust_sliders.items():
+            text.setText(f"{values[key]/100:.2f}" if key=='gamma' else f"{values[key]:+d}")
+        self.canvas.set_adjustments(values['brightness'],values['contrast'],values['gamma']/100)
+
+    def reset_adjustments(self):
+        for slider,_,default in self.adjust_sliders.values(): slider.setValue(default)
 
     def join_team(self):
         if self.job or self.sync_job or self.host or not self.save(): return
@@ -875,7 +1018,7 @@ class Main(QMainWindow):
         layout.addWidget(button('Close',dialog.accept)); dialog.exec()
 
     def toggle_theme(self):
-        self.dark=not self.dark; self.settings.setValue('dark',self.dark); apply_theme(QApplication.instance(),self.dark)
+        self.dark=not self.dark; self.settings.setValue('dark',self.dark); apply_theme(QApplication.instance(),self.dark); self.apply_icons()
 
     def preferences(self):
         dialog=QDialog(self); dialog.setWindowTitle('Keyboard & preferences'); dialog.resize(530,700); layout=QVBoxLayout(dialog)
@@ -898,12 +1041,13 @@ class Main(QMainWindow):
     def closeEvent(self,event):
         if self.sync_job:
             self.sync_job.cancel.set(); self.notice('Waiting for the current team request to finish.'); event.ignore(); return
-        if self.job or self.loader.active:
-            self.cancel_job(); self.loader.pending=None
+        if self.job:
+            self.cancel_job(); self.loader.stop()
             self.notice('Finishing the active file operation. Close again when it has stopped.'); event.ignore(); return
+        self.loader.stop(); self.thumbnails.pool.clear(); self.thumbnails.pool.waitForDone(3000)
         if not self.save():
             self.fail('Cannot close safely','Saving failed. Your edits remain in this window. Resolve disk space or permissions and try Save again.'); event.ignore(); return
-        self.settings.setValue('geometry',self.saveGeometry()); self.settings.setValue('splitter',self.splitter.saveState())
+        self.settings.setValue('geometry',self.saveGeometry()); self.settings.setValue('layout',self.pre_focus if self.focus_mode else self.dock_host.saveState())
         self.sync_timer.stop()
         if self.host: self.host.stop(); self.host=None
         if self.project: self.project.close(); self.project=None
@@ -912,7 +1056,7 @@ class Main(QMainWindow):
 
 def main():
     app=QApplication(sys.argv); app.setOrganizationName('Lannotex'); app.setApplicationName('Lannotex Desktop')
-    app.setStyle('Fusion')
+    app.setStyle('Fusion'); app.setWindowIcon(logo())
     window=Main(); window.show()
     # A bounded test must actually enter the Qt event loop and report completion.
     if '--smoke-test' in sys.argv: