From af3b953de3500ccd0198c6f67e308a9036d3557a Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Sat, 3 Mar 2018 12:09:02 -0500 Subject: [PATCH] Fixed semantics of enabling alignment verbs. --- glabels/MainWindow.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/glabels/MainWindow.cpp b/glabels/MainWindow.cpp index f88d634..603e453 100644 --- a/glabels/MainWindow.cpp +++ b/glabels/MainWindow.cpp @@ -835,6 +835,10 @@ namespace glabels objectsCenterMenu->setEnabled( enabled ); objectsCenterHorizAction->setEnabled( enabled ); objectsCenterVertAction->setEnabled( enabled ); + + contextOrderMenu->setEnabled( enabled ); + contextXformMenu->setEnabled( enabled ); + contextCenterMenu->setEnabled( enabled ); } @@ -850,6 +854,8 @@ namespace glabels objectsAlignTopAction->setEnabled( enabled ); objectsAlignBottomAction->setEnabled( enabled ); objectsAlignVCenterAction->setEnabled( enabled ); + + contextAlignMenu->setEnabled( enabled ); } @@ -980,7 +986,7 @@ namespace glabels setDocVerbsEnabled( isEditorPage ); setSelectionVerbsEnabled( isEditorPage && !mModel->isSelectionEmpty() ); - setMultiSelectionVerbsEnabled( isEditorPage && !mModel->isSelectionAtomic() ); + setMultiSelectionVerbsEnabled( isEditorPage && !mModel->isSelectionEmpty() && !mModel->isSelectionAtomic() ); setPasteVerbsEnabled( isEditorPage && mModel->canPaste() ); } @@ -1514,7 +1520,7 @@ namespace glabels void MainWindow::onSelectionChanged() { setSelectionVerbsEnabled( !mModel->isSelectionEmpty() ); - setMultiSelectionVerbsEnabled( !mModel->isSelectionAtomic() ); + setMultiSelectionVerbsEnabled( !mModel->isSelectionEmpty() && !mModel->isSelectionAtomic() ); }