Changeset 88647 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Apr 22, 2021 8:51:50 AM (4 years ago)

Author:

vboxsync

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

143961

Message:

FE/Qt: bugref:9830. Not using QMenu

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/logviewer/UIVMLogViewerWidget.cpp (modified) (6 diffs)
• src/logviewer/UIVMLogViewerWidget.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -1009 +1009 @@
         src/logviewer/UIVMLogViewerFilterPanel.cpp \
         src/logviewer/UIVMLogViewerTextEdit.cpp \
+        src/logviewer/UIVMLogViewerWidget.cpp \
         src/activity/vmactivity/UIVMActivityMonitor.cpp \
         src/medium/UIMediumEnumerator.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.cpp

@@ -55 +55 @@
 const ULONG uAllowedLogSize = _256M;
 
+class UIMachineListMenu : public QWidget
+{
+
+    Q_OBJECT;
+
+public:
+
+    UIMachineListMenu(QWidget *pParent = 0);
+    /** Removes the actions and deletes them. */
+    void clear();
+    QAction *addAction(const QString &strText);
+};
+
+UIMachineListMenu::UIMachineListMenu(QWidget *pParent /* = 0 */)
+    :QWidget(pParent)
+{
+}
+
+void UIMachineListMenu::clear()
+{
+    QList<QAction*> actionList = actions();
+    for (int i = 0; i < actionList.size(); ++i)
+    {
+        removeAction(actionList[i]);
+        delete actionList[i];
+    }
+}
+
+QAction *UIMachineListMenu::addAction(const QString &strText)
+{
+    QAction *pAction = new QAction(strText, this);
+    QWidget::addAction(pAction);
+    return pAction;
+}
+
 UIVMLogViewerWidget::Machine::Machine(const QUuid &id, const QString &strName)
     : m_id(id)
@@ -60 +95 @@
 {
 }
+
+UIVMLogViewerWidget::Machine::Machine()
+{}
 
 UIVMLogViewerWidget::UIVMLogViewerWidget(EmbedTo enmEmbedding,
@@ -446 +484 @@
 }
 
+void UIVMLogViewerWidget::sltCornerButtonToggled(bool fToggle)
+{
+    printf("%d\n", fToggle);
+}
+
 void UIVMLogViewerWidget::prepare()
 {
@@ -520 +563 @@
                 m_pTabWidget->setCornerWidget(m_pCornerButton, Qt::TopLeftCorner);
                 m_pCornerButton->setIcon(UIIconPool::iconSet(":/machine_16px.png"));
-                m_pMachineSelectionMenu = new QMenu(this);
-                m_pCornerButton->setMenu(m_pMachineSelectionMenu);
-                m_pCornerButton->setPopupMode(QToolButton::InstantPopup);
+                m_pCornerButton->setCheckable(true);
+                m_pMachineSelectionMenu = new UIMachineListMenu(this);
+                connect(m_pCornerButton, &QIToolButton::toggled, this, &UIVMLogViewerWidget::sltCornerButtonToggled);
+                //m_pCornerButton->setMenu(m_pMachineSelectionMenu);
+                //m_pCornerButton->setPopupMode(QToolButton::InstantPopup);
             }
         }
@@ -958 +1003 @@
 {
     if (!m_pMachineSelectionMenu)
-    {
-        m_pMachineSelectionMenu = new QMenu(this);
-        if (m_pCornerButton)
-            m_pCornerButton->setMenu(m_pMachineSelectionMenu);
-    }
+        return;
     m_pMachineSelectionMenu->clear();
 
@@ -972 +1013 @@
     }
 }
+
+#include "UIVMLogViewerWidget.moc"

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.h

@@ -44 +44 @@
 class QIToolBar;
 class QIToolButton;
+class UIMachineListMenu;
 class UIVirtualMachineItem;
 class UIVMLogPage;
@@ -137 +138 @@
         void sltResetOptionsToDefault();
     /** @} */
-
+    void sltCornerButtonToggled(bool fToggle);
 private:
         struct Machine
         {
             Machine(const QUuid &id, const QString &strName);
+            Machine();
             QUuid   m_id;
             QString m_strName;
@@ -245 +247 @@
     /** @} */
     QIToolButton *m_pCornerButton;
-    QMenu *m_pMachineSelectionMenu;
+    UIMachineListMenu *m_pMachineSelectionMenu;
     friend class UIVMLogViewerFilterPanel;
     friend class UIVMLogViewerPanel;