Changeset 70519 in vbox for trunk/src

Timestamp:

Jan 10, 2018 2:27:17 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9072 Synchronize actions' checked state with panel hide event

Location:

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

Files:

• UIVMLogViewerPanel.cpp (modified) (1 diff)
• UIVMLogViewerPanel.h (modified) (1 diff)
• UIVMLogViewerSearchPanel.cpp (modified) (1 diff)
• UIVMLogViewerWidget.cpp (modified) (10 diffs)
• UIVMLogViewerWidget.h (modified) (2 diffs)

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

@@ -120 +120 @@
     if (pFocus && pFocus->parent() == this)
         focusNextPrevChild(true);
+    if(m_pViewer)
+        m_pViewer->hidePanel(this);
 
     QWidget::hideEvent(pEvent);
-    emit sigHide();
 }

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

@@ -40 +40 @@
 {
     Q_OBJECT;
-
-signals:
-
-    void sigHide();
 
 public:

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

@@ -336 +336 @@
     m_pNextPrevButtons->setToolTip(1, UIVMLogViewerWidget::tr("Search for the next occurrence of the string"));
 
-    m_pCaseSensitiveCheckBox->setText(UIVMLogViewerWidget::tr("C&ase\nSensitive"));
+    m_pCaseSensitiveCheckBox->setText(UIVMLogViewerWidget::tr("C&ase Sensitive"));
     m_pCaseSensitiveCheckBox->setToolTip(UIVMLogViewerWidget::tr("Perform case sensitive search (when checked)"));
 
-    m_pMatchWholeWordCheckBox->setText(UIVMLogViewerWidget::tr("Ma&tch\nWhole Word"));
+    m_pMatchWholeWordCheckBox->setText(UIVMLogViewerWidget::tr("Ma&tch Whole Word"));
     m_pMatchWholeWordCheckBox->setToolTip(UIVMLogViewerWidget::tr("Search matches only complete words when checked"));
 
-    m_pHighlightAllCheckBox->setText(UIVMLogViewerWidget::tr("&Highlight\nAll"));
+    m_pHighlightAllCheckBox->setText(UIVMLogViewerWidget::tr("&Highlight All"));
     m_pHighlightAllCheckBox->setToolTip(UIVMLogViewerWidget::tr("All occurence of the search text are highlighted"));
 

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

@@ -181 +181 @@
     QString m_logFileName;
 };
+
 
 UIVMLogViewerWidget::UIVMLogViewerWidget(EmbedTo enmEmbedding, QWidget *pParent /* = 0 */, const CMachine &machine /* = CMachine() */)
@@ -238 +239 @@
 void UIVMLogViewerWidget::sltPanelActionTriggered(bool checked)
 {
-    RT_NOREF(checked);
-
     QAction *pSenderAction = qobject_cast<QAction*>(sender());
     if(!pSenderAction)
         return;
+    UIVMLogViewerPanel* pPanel = 0;
     /* Look for the sender() within the m_panelActionMap's values: */
-    for(QMap<UIVMLogViewerPanel**, QAction**>::const_iterator iterator = m_panelActionMap.begin();
+    for(QMap<UIVMLogViewerPanel*, QAction*>::const_iterator iterator = m_panelActionMap.begin();
         iterator != m_panelActionMap.end(); ++iterator)
     {
-        if(iterator.value() == &pSenderAction)
-            continue;
-    }
+        if(iterator.value() == pSenderAction)
+            pPanel = iterator.key();
+    }
+    if(!pPanel)
+        return;
+    if(checked)
+        showPanel(pPanel);
+    else
+        hidePanel(pPanel);
 }
 
@@ -452 +458 @@
     m_pMainLayout = new QVBoxLayout(this);
 
+    /* Prepare widgets: */
+    prepareWidgets();
+
+
     prepareActions();
 
@@ -457 +467 @@
     prepareMenu();
 
-    /* Prepare widgets: */
-    prepareWidgets();
-
     /* Reading log files: */
     sltRefresh();
@@ -465 +472 @@
     /* Loading language constants: */
     retranslateUi();
+
+    m_panelActionMap.insert(m_pBookmarksPanel, m_pActionBookmark);
+    m_panelActionMap.insert(m_pSearchPanel, m_pActionFind);
+    m_panelActionMap.insert(m_pFilterPanel, m_pActionFilter);
 }
 
@@ -515 +526 @@
     AssertPtrReturnVoid(m_pBookmarksPanel);
     {
-        //QMap<UIVMLogViewerPanel*&, QAction*&> m_panelActionMap;
-        m_panelActionMap.insert(reinterpret_cast<UIVMLogViewerPanel**>(&m_pBookmarksPanel), &m_pActionBookmark);
-        //connect(m_pBookmarksPanel, &UIVMLogViewerBookmarksPanel::sigHide, this, &UIVMLogViewerWidget::sltHidePanel);
         installEventFilter(m_pBookmarksPanel);
         m_pBookmarksPanel->hide();
         m_pMainLayout->insertWidget(4, m_pBookmarksPanel);
     }
+
 }
 
@@ -532 +541 @@
         m_pActionFind->setShortcut(QKeySequence("Ctrl+F"));
         m_pActionFind->setCheckable(true);
-        connect(m_pActionFind, &QAction::triggered, this, &UIVMLogViewerWidget::sltShowHideSearchPanel);
+        connect(m_pActionFind, &QAction::triggered, this, &UIVMLogViewerWidget::sltPanelActionTriggered);
     }
 
@@ -541 +550 @@
         m_pActionFilter->setShortcut(QKeySequence("Ctrl+T"));
         m_pActionFilter->setCheckable(true);
-        connect(m_pActionFilter, &QAction::triggered, this, &UIVMLogViewerWidget::sltShowHideFilterPanel);
+        connect(m_pActionFilter, &QAction::triggered, this, &UIVMLogViewerWidget::sltPanelActionTriggered);
+    }
+    /* Create and configure 'Bookmark' action: */
+    m_pActionBookmark = new QAction(this);
+    AssertPtrReturnVoid(m_pActionBookmark);
+    {
+        /* tie Ctrl+D to save only if we show this in a dialog since Ctrl+D is
+           already assigned to another action in the selector UI: */
+        if (m_enmEmbedding == EmbedTo_Dialog)
+            m_pActionBookmark->setShortcut(QKeySequence("Ctrl+D"));
+        m_pActionBookmark->setCheckable(true);
+        connect(m_pActionBookmark, &QAction::triggered, this, &UIVMLogViewerWidget::sltPanelActionTriggered);
     }
 
@@ -562 +582 @@
         connect(m_pActionSave, &QAction::triggered, this, &UIVMLogViewerWidget::sltSave);
      }
-
-    /* Create and configure 'Bookmark' action: */
-    m_pActionBookmark = new QAction(this);
-    AssertPtrReturnVoid(m_pActionBookmark);
-    {
-        /* tie Ctrl+D to save only if we show this in a dialog since Ctrl+D is
-           already assigned to another action in the selector UI: */
-        if (m_enmEmbedding == EmbedTo_Dialog)
-            m_pActionBookmark->setShortcut(QKeySequence("Ctrl+D"));
-        m_pActionBookmark->setCheckable(true);
-        connect(m_pActionBookmark, &QAction::triggered, this, &UIVMLogViewerWidget::sltShowHideBookmarkPanel);
-    }
 
     /* Update action icons: */
@@ -829 +837 @@
 void UIVMLogViewerWidget::hidePanel(UIVMLogViewerPanel* panel)
 {
-    if (!panel || panel->isHidden())
-        return;
-    panel->setVisible(false);
+    if (panel && panel->isVisible())
+        panel->setVisible(false);
+    QMap<UIVMLogViewerPanel*, QAction*>::iterator iterator = m_panelActionMap.find(panel);
+    if(iterator != m_panelActionMap.end())
+    {
+        if(iterator.value()->isChecked())
+            iterator.value()->setChecked(false);
+    }
 }
 
 void UIVMLogViewerWidget::showPanel(UIVMLogViewerPanel* panel)
 {
-    if (!panel || panel->isVisible())
-        return;
-    panel->setVisible(true);
+    if (panel && panel->isHidden())
+        panel->setVisible(true);
+    QMap<UIVMLogViewerPanel*, QAction*>::iterator iterator = m_panelActionMap.find(panel);
+    if(iterator != m_panelActionMap.end())
+    {
+        if(!iterator.value()->isChecked())
+            iterator.value()->setChecked(true);
+    }
 }
 

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

@@ -174 +174 @@
     UIVMLogViewerFilterPanel    *m_pFilterPanel;
     UIVMLogViewerBookmarksPanel *m_pBookmarksPanel;
-    QMap<UIVMLogViewerPanel**, QAction**> m_panelActionMap;
+    QMap<UIVMLogViewerPanel*, QAction*> m_panelActionMap;
 
     /** Holds the list of log file content. */
@@ -207 +207 @@
     friend class UIVMLogViewerFilterPanel;
     friend class UIVMLogViewerSearchPanel;
+    friend class UIVMLogViewerPanel;
 };