Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve dock feature configuration #1482

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Improve dock feature configuration #1482

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 22 additions & 11 deletions labelme/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,17 +191,10 @@ def __init__(

self.setCentralWidget(scrollArea)

features = QtWidgets.QDockWidget.DockWidgetFeatures()
for dock in ["flag_dock", "label_dock", "shape_dock", "file_dock"]:
if self._config[dock]["closable"]:
features = features | QtWidgets.QDockWidget.DockWidgetClosable
if self._config[dock]["floatable"]:
features = features | QtWidgets.QDockWidget.DockWidgetFloatable
if self._config[dock]["movable"]:
features = features | QtWidgets.QDockWidget.DockWidgetMovable
getattr(self, dock).setFeatures(features)
if self._config[dock]["show"] is False:
getattr(self, dock).setVisible(False)
self._configure_dock("flag_dock", self.flag_dock)
self._configure_dock("label_dock", self.label_dock)
self._configure_dock("shape_dock", self.shape_dock)
self._configure_dock("file_dock", self.file_dock)

self.addDockWidget(Qt.RightDockWidgetArea, self.flag_dock)
self.addDockWidget(Qt.RightDockWidgetArea, self.label_dock)
Expand Down Expand Up @@ -906,6 +899,24 @@ def __init__(
# if self.firstStart:
# QWhatsThis.enterWhatsThisMode()

def _configure_dock(self, dock_name: str, dock_obj: QtWidgets.QDockWidget) -> None:
dock_config = self._config.get(dock_name, None)
if dock_config is None:
# Missing configuration? Never mind then...
return

features = QtWidgets.QDockWidget.DockWidgetFeatures()

if dock_config.get("closable"):
features = features | QtWidgets.QDockWidget.DockWidgetClosable
if dock_config.get("floatable"):
features = features | QtWidgets.QDockWidget.DockWidgetFloatable
if dock_config.get("movable"):
features = features | QtWidgets.QDockWidget.DockWidgetMovable
dock_obj.setFeatures(features)
if dock_config.get("show") is False:
dock_obj.setVisible(False)

def menu(self, title, actions=None):
menu = self.menuBar().addMenu(title)
if actions:
Expand Down