diff --git a/labelme/app.py b/labelme/app.py index 045ac79bd..4182770f4 100644 --- a/labelme/app.py +++ b/labelme/app.py @@ -221,14 +221,14 @@ def __init__( self.tr("Quit application"), ) open_ = action( - self.tr("&Open"), + self.tr("&Open\n"), self.openFile, shortcuts["open"], "open", self.tr("Open image or label file"), ) opendir = action( - self.tr("&Open Dir"), + self.tr("Open Dir"), self.openDirDialog, shortcuts["open_dir"], "open", @@ -251,7 +251,7 @@ def __init__( enabled=False, ) save = action( - self.tr("&Save"), + self.tr("&Save\n"), self.saveFile, shortcuts["save"], "save", @@ -435,7 +435,7 @@ def __init__( ) undo = action( - self.tr("Undo"), + self.tr("Undo\n"), self.undoShapeEdit, shortcuts["undo"], "undo", @@ -467,10 +467,10 @@ def __init__( zoom = QtWidgets.QWidgetAction(self) zoomBoxLayout = QtWidgets.QVBoxLayout() - zoomBoxLayout.addWidget(self.zoomWidget) zoomLabel = QtWidgets.QLabel("Zoom") zoomLabel.setAlignment(Qt.AlignCenter) zoomBoxLayout.addWidget(zoomLabel) + zoomBoxLayout.addWidget(self.zoomWidget) zoom.setDefaultWidget(QtWidgets.QWidget()) zoom.defaultWidget().setLayout(zoomBoxLayout) self.zoomWidget.setWhatsThis( @@ -751,6 +751,11 @@ def __init__( selectAiModel = QtWidgets.QWidgetAction(self) selectAiModel.setDefaultWidget(QtWidgets.QWidget()) selectAiModel.defaultWidget().setLayout(QtWidgets.QVBoxLayout()) + # + selectAiModelLabel = QtWidgets.QLabel(self.tr("AI Model")) + selectAiModelLabel.setAlignment(QtCore.Qt.AlignCenter) + selectAiModel.defaultWidget().layout().addWidget(selectAiModelLabel) + # self._selectAiModelComboBox = QtWidgets.QComboBox() selectAiModel.defaultWidget().layout().addWidget( self._selectAiModelComboBox @@ -763,30 +768,25 @@ def __init__( name=self._selectAiModelComboBox.currentText() ) ) - selectAiModelLabel = QtWidgets.QLabel(self.tr("AI Model")) - selectAiModelLabel.setAlignment(QtCore.Qt.AlignCenter) - selectAiModel.defaultWidget().layout().addWidget(selectAiModelLabel) self.tools = self.toolbar("Tools") self.actions.tool = ( open_, opendir, - openNextImg, openPrevImg, + openNextImg, save, deleteFile, None, createMode, editMode, duplicate, - copy, - paste, delete, undo, brightnessContrast, None, + fitWindow, zoom, - fitWidth, None, selectAiModel, ) diff --git a/labelme/icons/color.png b/labelme/icons/color.png index 1a1e1ad03..2ac71840e 100644 Binary files a/labelme/icons/color.png and b/labelme/icons/color.png differ diff --git a/labelme/icons/copy.png b/labelme/icons/copy.png index a4c9bddc7..0df8ab15c 100644 Binary files a/labelme/icons/copy.png and b/labelme/icons/copy.png differ diff --git a/labelme/icons/delete.png b/labelme/icons/delete.png index a1a4074f0..c355eeb65 100644 Binary files a/labelme/icons/delete.png and b/labelme/icons/delete.png differ diff --git a/labelme/icons/edit.png b/labelme/icons/edit.png index 36775390f..4b5213eb1 100644 Binary files a/labelme/icons/edit.png and b/labelme/icons/edit.png differ diff --git a/labelme/icons/fit-width.png b/labelme/icons/fit-width.png index 0a5490748..117e6a0d8 100644 Binary files a/labelme/icons/fit-width.png and b/labelme/icons/fit-width.png differ diff --git a/labelme/icons/fit-window.png b/labelme/icons/fit-window.png index 585e97077..19925566a 100644 Binary files a/labelme/icons/fit-window.png and b/labelme/icons/fit-window.png differ diff --git a/labelme/icons/objects.png b/labelme/icons/objects.png index 593bb6d8a..1c7606a6f 100644 Binary files a/labelme/icons/objects.png and b/labelme/icons/objects.png differ