fix: shortcuts while editing text item

- while editing a text item, secondary shortcuts like
  Shift+Ins have not been processed properly
- instead they have been routed to the board controller
- add UBApplication::enableEditingShortcuts to enable/disable
  global action shortcuts for cut/copy/paste
- disable these shortcuts while a text item is selected
- reorder and cleanup includes in UBGraphicsTextItemDelegate

Signed-off-by: letsfindaway <me@letsfindaway.de>

Author: letsfindaway

src/core/UBApplication.cpp

@@ -321,9 +321,7 @@ int UBApplication::exec(const QString& pFileToImport)
 
     mainWindow->setAttribute(Qt::WA_NativeWindow, true);
 
-    mainWindow->actionCopy->setShortcuts(QKeySequence::Copy);
-    mainWindow->actionPaste->setShortcuts(QKeySequence::Paste);
-    mainWindow->actionCut->setShortcuts(QKeySequence::Cut);
+    enableEditingShortcuts(true);
 
     UBThumbnailUI::_private::initCatalog();
 
@@ -745,6 +743,22 @@ void UBApplication::cleanup()
     documentController = NULL;
 }
 
+void UBApplication::enableEditingShortcuts(bool enable)
+{
+    if (enable)
+    {
+        mainWindow->actionCopy->setShortcuts(QKeySequence::Copy);
+        mainWindow->actionPaste->setShortcuts(QKeySequence::Paste);
+        mainWindow->actionCut->setShortcuts(QKeySequence::Cut);
+    }
+    else
+    {
+        mainWindow->actionCopy->setShortcuts({});
+        mainWindow->actionPaste->setShortcuts({});
+        mainWindow->actionCut->setShortcuts({});
+    }
+}
+
 QString UBApplication::urlFromHtml(QString html)
 {
     QString _html;

src/core/UBApplication.h

@@ -68,6 +68,8 @@ class UBApplication : public SingleApplication
 
         void cleanup();
 
+        void enableEditingShortcuts(bool enable);
+
         static QPointer<QUndoStack> undoStack;
 
         static UBDisplayManager* displayManager;

src/domain/UBGraphicsTextItemDelegate.cpp

@@ -30,19 +30,20 @@
 #include <QtGui>
 #include <QtSvg>
 
-#include "core/UBApplication.h"
-#include "UBGraphicsGroupContainerItem.h"
 #include "UBGraphicsTextItemDelegate.h"
 #include "UBGraphicsScene.h"
-#include "gui/UBResources.h"
 
-#include "domain/UBGraphicsTextItem.h"
-#include "domain/UBGraphicsDelegateFrame.h"
+#include "core/UBApplication.h"
 #include "core/UBSettings.h"
 
 #include "board/UBBoardController.h"
 #include "board/UBBoardView.h"
 
+#include "domain/UBGraphicsTextItem.h"
+#include "domain/UBGraphicsDelegateFrame.h"
+
+#include "gui/UBResources.h"
+
 #include "core/memcheck.h"
 
 const int UBGraphicsTextItemDelegate::sMinPixelSize = 8;
@@ -849,6 +850,10 @@ QVariant UBGraphicsTextItemDelegate::itemChange(QGraphicsItem::GraphicsItemChang
                 saveTextCursorFormats();
             }
         }
+
+        // disable global editing shortcuts while text item is selected
+        // so that they are passed to the item
+        UBApplication::app()->enableEditingShortcuts(!value.toBool());
     }
 
     return UBGraphicsItemDelegate::itemChange(change, value);