Changeset 11206 in vbox for trunk

Timestamp:

Aug 7, 2008 2:03:27 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

34247

Message:

Fe/Qt4: QILabel context menu rework: copy action now really available for focused QILabel through native copy shortcut without invoking context menu. Old menu creation method cause memory leak - fixed.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/QILabel_p.h (modified) (2 diffs)
• src/QILabel.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/QILabel_p.h

@@ -30 +30 @@
 /* Qt includes */
 #include <QLabel>
+
+class QAction;
 
 class QILabelPrivate: public QLabel
@@ -135 +137 @@
     QSize mOwnSizeHint;
     bool mStartDragging;
+    QAction *mCopyAction;
 };
 

trunk/src/VBox/Frontends/VirtualBox4/src/QILabel.cpp

@@ -360 +360 @@
     {
         /* Create a context menu for the copy to clipboard action. */
-        QMenu *menu = new QMenu();
-        menu->addAction (tr ("&Copy") + "\t" + QString (QKeySequence (QKeySequence::Copy)), this, SLOT (copy()));
-        menu->exec (aEvent->globalPos());
-    }else
+        QMenu menu;
+        mCopyAction->setText (tr ("&Copy"));
+        menu.addAction (mCopyAction);
+        menu.exec (aEvent->globalPos());
+    } else
         QLabel::contextMenuEvent (aEvent);
 }
@@ -416 +417 @@
     /* Open links with the QDesktopService */
     setOpenExternalLinks (true);
+
+    /* Create invisible copy action */
+    mCopyAction = new QAction (this);
+    addAction (mCopyAction);
+    mCopyAction->setShortcut (QKeySequence (QKeySequence::Copy));
+    mCopyAction->setShortcutContext (Qt::WidgetShortcut);
+    connect (mCopyAction, SIGNAL (triggered()), this, SLOT (copy()));
 }