Changeset 100952 in vbox for trunk/src/VBox/Frontends

Timestamp:

Aug 23, 2023 8:41:01 AM (20 months ago)

Author:

vboxsync

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

158890

Message:

FE/Qt: bugref:10496, bugref:9072. Removing a now-obsolete class.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIDialogPanel.cpp (modified) (2 diffs)
• globals/UIDialogPanel.h (modified) (1 diff)
• logviewer/UIVMLogViewerWidget.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDialogPanel.cpp

@@ -44 +44 @@
 /* Other VBox includes: */
 #include <iprt/assert.h>
-
-
 
 UIDialogPanelBase::UIDialogPanelBase(QWidget *pParent /* = 0 */)
@@ -118 +116 @@
     return m_pTabWidget->currentIndex();
 }
-
-UIDialogPanel::UIDialogPanel(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
-    , m_pMainLayout(0)
-    , m_pCloseButton(0)
-{
-    prepare();
-}
-
-void UIDialogPanel::setCloseButtonShortCut(QKeySequence shortCut)
-{
-    if (!m_pCloseButton)
-        return;
-    m_pCloseButton->setShortcut(shortCut);
-}
-
-QHBoxLayout* UIDialogPanel::mainLayout()
-{
-    return m_pMainLayout;
-}
-
-void UIDialogPanel::prepare()
-{
-    prepareWidgets();
-    prepareConnections();
-    retranslateUi();
-}
-
-void UIDialogPanel::prepareWidgets()
-{
-    m_pMainLayout = new QHBoxLayout(this);
-    if (m_pMainLayout)
-    {
-#ifdef VBOX_WS_MAC
-        m_pMainLayout->setContentsMargins(5 /* since there is always a button */, 0, 10 /* standard */, 0);
-        m_pMainLayout->setSpacing(10);
-#else
-        m_pMainLayout->setContentsMargins(qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) / 2, 0,
-                                          qApp->style()->pixelMetric(QStyle::PM_LayoutRightMargin) / 2,
-                                          qApp->style()->pixelMetric(QStyle::PM_LayoutBottomMargin) / 2);
-        m_pMainLayout->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing));
-#endif
-    }
-    m_pCloseButton = new QIToolButton;
-    if (m_pCloseButton)
-    {
-        m_pCloseButton->setIcon(UIIconPool::iconSet(":/close_16px.png"));
-        m_pMainLayout->addWidget(m_pCloseButton, 0, Qt::AlignLeft);
-    }
-}
-
-void UIDialogPanel::prepareConnections()
-{
-    if (m_pCloseButton)
-        connect(m_pCloseButton, &QIToolButton::clicked, this, &UIDialogPanel::hide);
-}
-
-void UIDialogPanel::retranslateUi()
-{
-    if (m_pCloseButton)
-        m_pCloseButton->setToolTip(tr("Close the pane"));
-}
-
-void UIDialogPanel::showEvent(QShowEvent *pEvent)
-{
-    QWidget::showEvent(pEvent);
-}
-
-void UIDialogPanel::hideEvent(QHideEvent *pEvent)
-{
-    /* Get focused widget: */
-    QWidget *pFocus = QApplication::focusWidget();
-    /* If focus-widget is valid and child-widget of search-panel,
-     * focus next child-widget in line: */
-    if (pFocus && pFocus->parent() == this)
-        focusNextPrevChild(true);
-    emit sigHidePanel(this);
-
-    QWidget::hideEvent(pEvent);
-}
-
-void UIDialogPanel::addVerticalSeparator()
-{
-    QFrame *pSeparator = new QFrame();
-    if (!pSeparator)
-        return;
-    pSeparator->setFrameShape(QFrame::VLine);
-    pSeparator->setFrameShadow(QFrame::Sunken);
-    mainLayout()->addWidget(pSeparator);
-}

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDialogPanel.h

@@ -70 +70 @@
 };
 
-/** QWidget extension acting as the base class for all the dialog panels like file manager, logviewer etc. */
-class SHARED_LIBRARY_STUFF UIDialogPanel : public QIWithRetranslateUI<QWidget>
-{
-    Q_OBJECT;
-
-public:
-
-    UIDialogPanel(QWidget *pParent = 0);
-    void setCloseButtonShortCut(QKeySequence shortCut);
-    virtual QString panelName() const = 0;
-
-signals:
-
-    void sigHidePanel(UIDialogPanel *pPanel);
-    void sigShowPanel(UIDialogPanel *pPanel);
-
-protected:
-
-    virtual void prepare();
-    virtual void prepareWidgets();
-    virtual void prepareConnections();
-
-    /* Access functions for children classes. */
-    QHBoxLayout*               mainLayout();
-
-    /** Handles the translation event. */
-    void retranslateUi() RT_OVERRIDE;
-
-    /** Handles the Qt show @a pEvent. */
-    void showEvent(QShowEvent *pEvent) RT_OVERRIDE;
-    /** Handles the Qt hide @a pEvent. */
-    void hideEvent(QHideEvent *pEvent) RT_OVERRIDE;
-    void addVerticalSeparator();
-
-private:
-
-    QHBoxLayout   *m_pMainLayout;
-    QIToolButton  *m_pCloseButton;
-};
-
 #endif /* !FEQT_INCLUDED_SRC_globals_UIDialogPanel_h */

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

@@ -1106 +1106 @@
 void UIVMLogViewerWidget::manageEscapeShortCut()
 {
-    /* if there is no visible panels give the escape shortcut to parent dialog: */
-    if (m_visiblePanelsList.isEmpty())
-    {
-        emit sigSetCloseButtonShortCut(QKeySequence(Qt::Key_Escape));
-        return;
-    }
-    /* Take the escape shortcut from the dialog: */
-    emit sigSetCloseButtonShortCut(QKeySequence());
-    /* Just loop thru the visible panel list and set the esc key to the
-       panel which made visible latest */
-    for (int i = 0; i < m_visiblePanelsList.size() - 1; ++i)
-    {
-        m_visiblePanelsList[i]->setCloseButtonShortCut(QKeySequence());
-    }
-    m_visiblePanelsList.back()->setCloseButtonShortCut(QKeySequence(Qt::Key_Escape));
+    // /* if there is no visible panels give the escape shortcut to parent dialog: */
+    // if (m_visiblePanelsList.isEmpty())
+    // {
+    //     emit sigSetCloseButtonShortCut(QKeySequence(Qt::Key_Escape));
+    //     return;
+    // }
+    // /* Take the escape shortcut from the dialog: */
+    // emit sigSetCloseButtonShortCut(QKeySequence());
+    // /* Just loop thru the visible panel list and set the esc key to the
+    //    panel which made visible latest */
+    // for (int i = 0; i < m_visiblePanelsList.size() - 1; ++i)
+    // {
+    //     m_visiblePanelsList[i]->setCloseButtonShortCut(QKeySequence());
+    // }
+    // m_visiblePanelsList.back()->setCloseButtonShortCut(QKeySequence(Qt::Key_Escape));
 }