Changeset 88658 in vbox

Timestamp:

Apr 22, 2021 3:25:31 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9930. Using a custom menu

Location:

trunk/src/VBox/Frontends/VirtualBox/src/logviewer

Files:

• UIVMLogViewerWidget.cpp (modified) (7 diffs)
• UIVMLogViewerWidget.h (modified) (1 diff)

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

@@ -17 +17 @@
 
 /* Qt includes: */
+#include <QCheckBox>
 #include <QDateTime>
 #include <QDir>
@@ -55 +56 @@
 const ULONG uAllowedLogSize = _256M;
 
+class UIMachineListCheckBox : public QCheckBox
+{
+
+    Q_OBJECT;
+
+public:
+
+    UIMachineListCheckBox(const QString &strText, QWidget *pParent = 0);
+    void setId(const QUuid &id);
+    const QUuid &id() const;
+private:
+    QUuid m_id;
+};
+
+UIMachineListCheckBox::UIMachineListCheckBox(const QString &strText, QWidget *pParent /* = 0 */)
+    :QCheckBox(strText, pParent)
+{
+}
+
+void UIMachineListCheckBox::setId(const QUuid &id)
+{
+    m_id = id;
+}
+
+const QUuid &UIMachineListCheckBox::id() const
+{
+    return m_id;
+}
+
 class UIMachineListMenu : public QWidget
 {
@@ -65 +95 @@
     /** Removes the actions and deletes them. */
     void clear();
-    QAction *addAction(const QString &strText);
+    void addListItem(const QString &strText, const QUuid &id);
+
+private:
+
+    void computeMinimumSize();
+    QVector<UIMachineListCheckBox*> m_checkboxes;
+    QVBoxLayout *m_pLayout;
 };
 
 UIMachineListMenu::UIMachineListMenu(QWidget *pParent /* = 0 */)
     :QWidget(pParent)
-{
+    , m_pLayout(0)
+{
+    m_pLayout = new QVBoxLayout(this);
 }
 
 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;
-}
+    qDeleteAll(m_checkboxes.begin(), m_checkboxes.end());
+    m_checkboxes.clear();
+}
+
+void UIMachineListMenu::addListItem(const QString &strText, const QUuid &id)
+{
+    UIMachineListCheckBox *pCheckBox = new UIMachineListCheckBox(strText, this);
+    m_checkboxes << pCheckBox;
+    pCheckBox->setId(id);
+    m_pLayout->addWidget(pCheckBox);
+    computeMinimumSize();
+}
+
+void UIMachineListMenu::computeMinimumSize()
+{
+    int iMaxTextLen = 0;
+    foreach(const UIMachineListCheckBox *pCheckBox, m_checkboxes)
+    {
+        if (!pCheckBox)
+            continue;
+        //iMaxTextLen = qMax(iMaxTextLen, fontMetrics().horizontalAdvance(pCheckBox->text()));
+        iMaxTextLen = qMax(iMaxTextLen, pCheckBox->width());
+    }
+    int iWidth = iMaxTextLen + 2 * qApp->style()->pixelMetric(QStyle::PM_ButtonIconSize);
+    int iHeight = m_checkboxes.size() * fontMetrics().height() +
+        qApp->style()->pixelMetric(QStyle::PM_LayoutBottomMargin) +
+        qApp->style()->pixelMetric(QStyle::PM_LayoutTopMargin);
+    //printf("%d %d\n", iWidth, iHeight);
+    setMinimumSize(iWidth, iHeight);
+    update();
+}
+
 
 UIVMLogViewerWidget::Machine::Machine(const QUuid &id, const QString &strName)
@@ -192 +248 @@
 }
 
+void UIVMLogViewerWidget::resizeEvent(QResizeEvent *pEvent)
+{
+    QIWithRetranslateUI<QWidget>::resizeEvent(pEvent);
+    if (m_pMachineSelectionMenu)
+        m_pMachineSelectionMenu->move(0, 40);
+}
+
 void UIVMLogViewerWidget::sltRefresh()
 {
@@ -486 +549 @@
 void UIVMLogViewerWidget::sltCornerButtonToggled(bool fToggle)
 {
-    printf("%d\n", fToggle);
+    if (m_pMachineSelectionMenu)
+        m_pMachineSelectionMenu->setVisible(fToggle);
 }
 
@@ -561 +625 @@
             if (m_pCornerButton)
             {
-                m_pTabWidget->setCornerWidget(m_pCornerButton, Qt::TopLeftCorner);
+                m_pTabWidget->setCornerWidget(m_pCornerButton);//, Qt::TopLeftCorner);
+                m_pCornerButton->setCheckable(true);
                 m_pCornerButton->setIcon(UIIconPool::iconSet(":/machine_16px.png"));
                 m_pCornerButton->setCheckable(true);
                 m_pMachineSelectionMenu = new UIMachineListMenu(this);
+                m_pMachineSelectionMenu->setAutoFillBackground(true);
+                m_pMachineSelectionMenu->setVisible(false);
                 connect(m_pCornerButton, &QIToolButton::toggled, this, &UIVMLogViewerWidget::sltCornerButtonToggled);
                 //m_pCornerButton->setMenu(m_pMachineSelectionMenu);
@@ -1008 +1075 @@
     foreach (const Machine &machine, m_machines)
     {
-        QAction *pAction = m_pMachineSelectionMenu->addAction(machine.m_strName);
-        pAction->setCheckable(true);
-        pAction->setData(machine.m_id);
+
+        m_pMachineSelectionMenu->addListItem(machine.m_strName, machine.m_id);
     }
 }

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

@@ -95 +95 @@
     /** Returns whether the window should be maximized when geometry being restored. */
     virtual bool shouldBeMaximized() const /* override */;
+    void resizeEvent(QResizeEvent *pEvent) /* override */;
 
 private slots: