LabelCraft 2.1.5__tar.gz → 2.1.7__tar.gz

{labelcraft-2.1.5 → labelcraft-2.1.7}/LabelCraft.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: LabelCraft
-Version: 2.1.5
+Version: 2.1.7
 Summary: LabelCraft - A modern graphical image annotation tool based on labelImg
 Home-page: https://github.com/syd168/LabelCraft
 Author: LabelCraft Contributors
@@ -37,12 +37,12 @@ Dynamic: summary
 
 # LabelCraft - Intelligent Image Annotation Tool
 
-> **Version 2.1.5** - A modern image annotation tool with project management and cross-platform support, developed based on [labelImg](https://github.com/tzutalin/labelImg)
+> **Version 2.1.7** - A modern image annotation tool with project management and cross-platform support, developed based on [labelImg](https://github.com/tzutalin/labelImg)
 
 [![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
 [![Python Version](https://img.shields.io/badge/python-3.8+-blue.svg)](https://www.python.org/)
 [![PySide6](https://img.shields.io/badge/PySide6-6.5+-green.svg)](https://www.qt.io/)
-[![Version](https://img.shields.io/badge/version-2.1.5-orange.svg)](https://github.com/syd168/LabelCraft/releases)
+[![Version](https://img.shields.io/badge/version-2.1.7-orange.svg)](https://github.com/syd168/LabelCraft/releases)
 [![Downloads](https://pepy.tech/badge/labelcraft)](https://pepy.tech/project/labelcraft)
 [![PyPI](https://img.shields.io/pypi/v/labelcraft.svg)](https://pypi.org/project/LabelCraft/)
 

{labelcraft-2.1.5 → labelcraft-2.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: LabelCraft
-Version: 2.1.5
+Version: 2.1.7
 Summary: LabelCraft - A modern graphical image annotation tool based on labelImg
 Home-page: https://github.com/syd168/LabelCraft
 Author: LabelCraft Contributors
@@ -37,12 +37,12 @@ Dynamic: summary
 
 # LabelCraft - Intelligent Image Annotation Tool
 
-> **Version 2.1.5** - A modern image annotation tool with project management and cross-platform support, developed based on [labelImg](https://github.com/tzutalin/labelImg)
+> **Version 2.1.7** - A modern image annotation tool with project management and cross-platform support, developed based on [labelImg](https://github.com/tzutalin/labelImg)
 
 [![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
 [![Python Version](https://img.shields.io/badge/python-3.8+-blue.svg)](https://www.python.org/)
 [![PySide6](https://img.shields.io/badge/PySide6-6.5+-green.svg)](https://www.qt.io/)
-[![Version](https://img.shields.io/badge/version-2.1.5-orange.svg)](https://github.com/syd168/LabelCraft/releases)
+[![Version](https://img.shields.io/badge/version-2.1.7-orange.svg)](https://github.com/syd168/LabelCraft/releases)
 [![Downloads](https://pepy.tech/badge/labelcraft)](https://pepy.tech/project/labelcraft)
 [![PyPI](https://img.shields.io/pypi/v/labelcraft.svg)](https://pypi.org/project/LabelCraft/)
 

{labelcraft-2.1.5 → labelcraft-2.1.7}/README.md

@@ -1,11 +1,11 @@
 # LabelCraft - Intelligent Image Annotation Tool
 
-> **Version 2.1.5** - A modern image annotation tool with project management and cross-platform support, developed based on [labelImg](https://github.com/tzutalin/labelImg)
+> **Version 2.1.7** - A modern image annotation tool with project management and cross-platform support, developed based on [labelImg](https://github.com/tzutalin/labelImg)
 
 [![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
 [![Python Version](https://img.shields.io/badge/python-3.8+-blue.svg)](https://www.python.org/)
 [![PySide6](https://img.shields.io/badge/PySide6-6.5+-green.svg)](https://www.qt.io/)
-[![Version](https://img.shields.io/badge/version-2.1.5-orange.svg)](https://github.com/syd168/LabelCraft/releases)
+[![Version](https://img.shields.io/badge/version-2.1.7-orange.svg)](https://github.com/syd168/LabelCraft/releases)
 [![Downloads](https://pepy.tech/badge/labelcraft)](https://pepy.tech/project/labelcraft)
 [![PyPI](https://img.shields.io/pypi/v/labelcraft.svg)](https://pypi.org/project/LabelCraft/)
 

{labelcraft-2.1.5 → labelcraft-2.1.7}/labelcraft_ui.py

@@ -176,7 +176,10 @@ class MainWindow(QMainWindow, WindowMixin):
         # Create dock widget (remove title, will be hidden)
         self.dock = QDockWidget('', self)
         self.dock.setObjectName(self.get_str('labels'))
-        self.dock.setTitleBarWidget(QWidget())  # Hide the title bar
+        # Use zero-height title bar; a default QWidget reserves space on macOS
+        hidden_title_bar = QWidget()
+        hidden_title_bar.setFixedHeight(0)
+        self.dock.setTitleBarWidget(hidden_title_bar)
         
         # Create unified right panel with all sections
         right_panel_layout = QVBoxLayout()
@@ -261,8 +264,16 @@ class MainWindow(QMainWindow, WindowMixin):
         completed_layout.addWidget(self.file_list_widget)
         self.completed_group.setLayout(completed_layout)
         right_panel_layout.addWidget(self.completed_group)
-        
-        right_panel_layout.addStretch()
+
+        # Let list sections absorb extra height instead of leaving blank space below
+        right_panel_layout.setStretchFactor(self.output_group, 0)
+        right_panel_layout.setStretchFactor(self.filter_label_group, 0)
+        right_panel_layout.setStretchFactor(self.label_list_group, 1)
+        right_panel_layout.setStretchFactor(self.completed_group, 1)
+        self.label_list.setSizePolicy(
+            QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
+        self.file_list_widget.setSizePolicy(
+            QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
         
         label_list_container = QWidget()
         label_list_container.setLayout(right_panel_layout)
@@ -1049,6 +1060,8 @@ class MainWindow(QMainWindow, WindowMixin):
         unified_layout = QVBoxLayout()
         unified_layout.setContentsMargins(2, 2, 2, 2)
         unified_layout.setSpacing(3)
+        # Keep toolbar buttons at the top; macOS vertical toolbars stretch to window height
+        unified_layout.setAlignment(Qt.AlignmentFlag.AlignTop)
         
         # Check if project is loaded and image is available
         has_project = self.current_project is not None
@@ -1108,9 +1121,14 @@ class MainWindow(QMainWindow, WindowMixin):
         unified_layout.addWidget(zoom_widget_container)
         
         unified_container.setLayout(unified_layout)
+        unified_container.setSizePolicy(
+            QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Maximum)
         
         # Add the unified container to toolbar
         self.tools.addWidget(unified_container)
+        if self.os_name == 'Darwin':
+            self.tools.setSizePolicy(
+                QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Maximum)
         
         self.canvas.menus[0].clear()
         add_actions(self.canvas.menus[0], menu)
@@ -5306,6 +5324,12 @@ def get_main_app(argv=None):
     """
     if not argv:
         argv = []
+    argv = filter_platform_argv(argv)
+
+    # Required for proper Qt rendering when launched from macOS .app bundles
+    if platform.system() == 'Darwin':
+        os.environ.setdefault('QT_MAC_WANTS_LAYER', '1')
+
     app = QApplication(argv)
     app.setApplicationName(__appname__)
     app.setWindowIcon(new_icon("app"))

{labelcraft-2.1.5 → labelcraft-2.1.7}/libs/__init__.py

@@ -1,2 +1,2 @@
-__version_info__ = ('2', '1', '5')
+__version_info__ = ('2', '1', '7')
 __version__ = '.'.join(__version_info__)

{labelcraft-2.1.5 → labelcraft-2.1.7}/libs/colorDialog.py

@@ -16,9 +16,10 @@ class ColorDialog(QColorDialog):
         # The default is set at invocation time, so that it
         # works across dialogs for different elements.
         self.default = None
-        self.bb = self.layout().itemAt(1).widget()
-        self.bb.addButton(BB.RestoreDefaults)
-        self.bb.clicked.connect(self.check_restore)
+        self.bb = self._find_button_box()
+        if self.bb is not None:
+            self.bb.addButton(BB.RestoreDefaults)
+            self.bb.clicked.connect(self.check_restore)
         
         # Store parent reference for i18n
         self.parent_window = parent
@@ -27,6 +28,20 @@ class ColorDialog(QColorDialog):
         if parent and hasattr(parent, 'i18n'):
             parent.i18n.language_changed.connect(self.retranslate)
     
+    def _find_button_box(self):
+        """Locate the button box; layout index differs across platforms."""
+        layout = self.layout()
+        if layout is None:
+            return None
+        for i in range(layout.count()):
+            item = layout.itemAt(i)
+            if item is None:
+                continue
+            widget = item.widget()
+            if isinstance(widget, QDialogButtonBox):
+                return widget
+        return None
+
     def tr(self, key: str, default: str = None, **kwargs):
         """
         Translate a string - standard i18n method name (Qt convention).
@@ -57,6 +72,8 @@ class ColorDialog(QColorDialog):
         return self.currentColor() if self.exec() else None
 
     def check_restore(self, button):
+        if self.bb is None:
+            return
         # In PySide6/Qt6, buttonRole returns an enum, need to use .value for bitwise operation
         role = self.bb.buttonRole(button)
         role_value = role.value if hasattr(role, 'value') else role

{labelcraft-2.1.5 → labelcraft-2.1.7}/libs/theme_manager.py

@@ -195,8 +195,9 @@ def _detect_macos_dark_mode():
             text=True,
             timeout=2
         )
-        # If the command returns 'Dark', dark mode is enabled
-        return 'Dark' in result.stdout or result.returncode == 0
+        if result.returncode != 0:
+            return False
+        return 'dark' in result.stdout.strip().lower()
     except (FileNotFoundError, subprocess.TimeoutExpired, Exception):
         # If the command fails, assume light mode (default on macOS)
         return False

{labelcraft-2.1.5 → labelcraft-2.1.7}/libs/utils.py

@@ -9,6 +9,22 @@ from PySide6.QtCore import *
 from PySide6.QtWidgets import *
 
 
+def filter_platform_argv(argv):
+    """
+    Remove OS-injected launch arguments that break argparse.
+
+    macOS Finder/Dock injects -psn_* when launching GUI apps from .app bundles.
+    """
+    if not argv:
+        return argv
+    filtered = [argv[0]]
+    for arg in argv[1:]:
+        if arg.startswith('-psn_'):
+            continue
+        filtered.append(arg)
+    return filtered
+
+
 def new_icon(icon):
     return QIcon(':/' + icon)
 

{labelcraft-2.1.5 → labelcraft-2.1.7}/setup.py

@@ -2,7 +2,6 @@
 # -*- coding: utf-8 -*-
 
 from setuptools import setup, find_packages, Command
-from sys import platform as _platform
 from shutil import rmtree
 import sys
 import os
@@ -34,33 +33,8 @@ try:
 except FileNotFoundError:
     history = ''
 
-SET_REQUIRES = []
-if _platform == "darwin":
-   SET_REQUIRES.append('py2app')
-
 required_packages = find_packages(exclude=['tests', 'build', 'dist'])
 
-APP = ['main.py']
-OPTIONS = {
-    'argv_emulation': True,
-    'iconfile': 'resources/icons/app.icns',
-    'packages': [
-        'PySide6',
-        'lxml',
-        'xml',
-        'xml.etree',
-        'json',
-        'csv',
-        'io',
-        'codecs',
-    ],
-    'excludes': [
-        'PySide6.QtNetwork',
-        'PySide6.QtWebEngineCore',
-        'PySide6.QtWebEngineWidgets',
-    ]
-}
-
 class UploadCommand(Command):
     """Support setup.py upload."""
 
@@ -103,7 +77,6 @@ class UploadCommand(Command):
 
 
 setup(
-    app=APP if _platform == "darwin" else None,
     name=NAME,
     version=about['__version__'],
     description="LabelCraft - A modern graphical image annotation tool based on labelImg",
@@ -142,8 +115,6 @@ setup(
         'Topic :: Scientific/Engineering :: Artificial Intelligence',
         'Topic :: Multimedia :: Graphics',
     ],
-    options={'py2app': OPTIONS} if _platform == "darwin" else {},
-    setup_requires=SET_REQUIRES,
     # $ setup.py publish support.
     cmdclass={
         'upload': UploadCommand,