Handle the Access.nonPackageDuplicate && Access.packageText annotations.

OpenModelica · Dec 1, 2017 · cbb329b · cbb329b
1 parent af64b7e
commit cbb329b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/OMEdit/OMEditGUI/Editors/BaseEditor.cpp b/OMEdit/OMEditGUI/Editors/BaseEditor.cpp
@@ -1628,16 +1628,11 @@ void PlainTextEdit::keyPressEvent(QKeyEvent *pEvent)
     // ctrl+k is pressed.
     mpBaseEditor->toggleCommentSelection();
     return;
-  } else if (pEvent->matches(QKeySequence::Cut)) {
-    // ctrl+x is pressed.
-    if (mpBaseEditor->getModelWidget()->getLibraryTreeItem() &&
-        mpBaseEditor->getModelWidget()->getLibraryTreeItem()->getAccess() <= LibraryTreeItem::nonPackageText) {
-      return;
-    }
-  } else if (pEvent->matches(QKeySequence::Copy)) {
-    // ctrl+c is pressed.
-    if (mpBaseEditor->getModelWidget()->getLibraryTreeItem() &&
-        mpBaseEditor->getModelWidget()->getLibraryTreeItem()->getAccess() <= LibraryTreeItem::nonPackageText) {
+  } else if (pEvent->matches(QKeySequence::Cut) || pEvent->matches(QKeySequence::Copy)) {
+    // ctrl+x/ctrl+c is pressed.
+    if (mpBaseEditor->getModelWidget()->getLibraryTreeItem()
+        && ((mpBaseEditor->getModelWidget()->getLibraryTreeItem()->getAccess() <= LibraryTreeItem::nonPackageText)
+            || (mpBaseEditor->getModelWidget()->getLibraryTreeItem()->getAccess() == LibraryTreeItem::packageText))) {
       return;
     }
   } else if (pEvent->matches(QKeySequence::Undo)) {
@@ -2100,7 +2095,10 @@ QMenu* BaseEditor::createStandardContextMenu()
     pSelectAllAction->setShortcut(QKeySequence::SelectAll);
     pMenu->addSeparator();
   }
-  if (mpModelWidget->getLibraryTreeItem() && mpModelWidget->getLibraryTreeItem()->getAccess() <= LibraryTreeItem::nonPackageText) {
+  // disable the cut & copy buttons based on Access annotation.
+  if (mpModelWidget->getLibraryTreeItem()
+      && ((mpModelWidget->getLibraryTreeItem()->getAccess() <= LibraryTreeItem::nonPackageText)
+          || (mpModelWidget->getLibraryTreeItem()->getAccess() == LibraryTreeItem::packageText))) {
     pCutAction->setEnabled(false);
     pCopyAction->setEnabled(false);
   }

diff --git a/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp b/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp
@@ -4563,6 +4563,7 @@ void ModelWidget::updateViewButtonsBasedOnAccess()
         mpTextViewToolButton->setEnabled(false);
         break;
       case LibraryTreeItem::nonPackageText:
+      case LibraryTreeItem::nonPackageDuplicate:
         if (mpLibraryTreeItem->getRestriction() == StringHandler::Package) {
           if (mpTextViewToolButton->isChecked()) {
             mpDiagramViewToolButton->setChecked(true);