Changeset 92471 in vbox

Timestamp:

Nov 17, 2021 9:47:12 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10141. Using QGroupBox instead of QWidget as the base of the file browser controls.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso

Files:

• UIVisoBrowserBase.cpp (modified) (5 diffs)
• UIVisoBrowserBase.h (modified) (2 diffs)
• UIVisoCreator.cpp (modified) (11 diffs)
• UIVisoCreator.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoBrowserBase.cpp

@@ -150 +150 @@
 
 UIVisoBrowserBase::UIVisoBrowserBase(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QWidget>(pParent)
+    : QIWithRetranslateUI<QGroupBox>(pParent)
     , m_pTreeView(0)
     , m_pMainLayout(0)
@@ -225 +225 @@
 void UIVisoBrowserBase::resizeEvent(QResizeEvent *pEvent)
 {
-    QIWithRetranslateUI<QWidget>::resizeEvent(pEvent);
+    QIWithRetranslateUI<QGroupBox>::resizeEvent(pEvent);
     if (m_pTreeView)
         updateTreeViewGeometry(m_pTreeView->isVisible());
@@ -235 +235 @@
     /* Handle only events sent to m_pTreeView only: */
     if (pObj != m_pTreeView)
-        return QIWithRetranslateUI<QWidget>::eventFilter(pObj, pEvent);
+        return QIWithRetranslateUI<QGroupBox>::eventFilter(pObj, pEvent);
 
     if (pEvent->type() == QEvent::KeyPress)
@@ -253 +253 @@
 
     /* Call to base-class: */
-    return QIWithRetranslateUI<QWidget>::eventFilter(pObj, pEvent);
+    return QIWithRetranslateUI<QGroupBox>::eventFilter(pObj, pEvent);
 }
 
@@ -264 +264 @@
 
     }
-    QIWithRetranslateUI<QWidget>::keyPressEvent(pEvent);
+    QIWithRetranslateUI<QGroupBox>::keyPressEvent(pEvent);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoBrowserBase.h

@@ -24 +24 @@
 /* Qt includes: */
 #include <QModelIndex>
-#include <QWidget>
+#include <QGroupBox>
 
 /* GUI includes: */
@@ -36 +36 @@
 
 /** An abstract QWidget extension hosting a tree and table view. */
-class UIVisoBrowserBase : public QIWithRetranslateUI<QWidget>
+class UIVisoBrowserBase : public QIWithRetranslateUI<QGroupBox>
 {
     Q_OBJECT;

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp

@@ -58 +58 @@
     , m_pMainLayout(0)
     , m_pHostBrowser(0)
-    , m_pVisoBrowser(0)
+    , m_pVISOContentBrowser(0)
     , m_pToolBar(0)
     , m_pVerticalToolBar(0)
@@ -77 +77 @@
 QStringList UIVisoCreatorWidget::entryList() const
 {
-    if (!m_pVisoBrowser)
+    if (!m_pVISOContentBrowser)
         return QStringList();
-    return m_pVisoBrowser->entryList();
+    return m_pVISOContentBrowser->entryList();
 }
 
@@ -113 +113 @@
 void UIVisoCreatorWidget::retranslateUi()
 {
+    if (m_pHostBrowser)
+        m_pHostBrowser->setTitle(UIVisoCreatorWidget::tr("Host File System"));
+    if (m_pVISOContentBrowser)
+        m_pVISOContentBrowser->setTitle(UIVisoCreatorWidget::tr("VISO Content"));
 }
 
 void UIVisoCreatorWidget::sltHandleAddObjectsToViso(QStringList pathList)
 {
-    if (m_pVisoBrowser)
-        m_pVisoBrowser->addObjectsToViso(pathList);
+    if (m_pVISOContentBrowser)
+        m_pVISOContentBrowser->addObjectsToViso(pathList);
 }
 
@@ -147 +151 @@
         return;
     m_visoOptions.m_strVisoName = strVisoName;
-    if(m_pVisoBrowser)
-        m_pVisoBrowser->setVisoName(m_visoOptions.m_strVisoName);
+    if(m_pVISOContentBrowser)
+        m_pVISOContentBrowser->setVisoName(m_visoOptions.m_strVisoName);
 }
 
@@ -200 +204 @@
         menu.addAction(m_pAddAction);
     }
-    else if (sender() == m_pVisoBrowser)
+    else if (sender() == m_pVISOContentBrowser)
     {
         menu.addAction(m_pRemoveAction);
@@ -245 +249 @@
     {
         m_pMainLayout->addWidget(m_pHostBrowser, 1, 0, 1, 2);
+        m_pHostBrowser->setAlignment(Qt::AlignLeft);
+
         m_pMainLayout->setColumnStretch(m_pMainLayout->indexOf(m_pHostBrowser), 2);
     }
@@ -255 +261 @@
     }
 
-    m_pVisoBrowser = new UIVisoContentBrowser;
-    if (m_pVisoBrowser)
-    {
-        m_pMainLayout->addWidget(m_pVisoBrowser, 1, 3, 1, 2);
-        m_pVisoBrowser->setVisoName(m_visoOptions.m_strVisoName);
-        m_pMainLayout->setColumnStretch(m_pMainLayout->indexOf(m_pVisoBrowser), 2);
+    m_pVISOContentBrowser = new UIVisoContentBrowser;
+    if (m_pVISOContentBrowser)
+    {
+        m_pMainLayout->addWidget(m_pVISOContentBrowser, 1, 3, 1, 2);
+        m_pVISOContentBrowser->setVisoName(m_visoOptions.m_strVisoName);
+        m_pMainLayout->setColumnStretch(m_pMainLayout->indexOf(m_pVISOContentBrowser), 2);
     }
 
@@ -295 +301 @@
     }
 
-    if (m_pVisoBrowser)
-    {
-        connect(m_pVisoBrowser, &UIVisoContentBrowser::sigTableSelectionChanged,
+    if (m_pVISOContentBrowser)
+    {
+        connect(m_pVISOContentBrowser, &UIVisoContentBrowser::sigTableSelectionChanged,
                 this, &UIVisoCreatorWidget::sltHandleContentBrowserTableSelectionChanged);
-        connect(m_pVisoBrowser, &UIVisoContentBrowser::sigCreateFileTableViewContextMenu,
+        connect(m_pVISOContentBrowser, &UIVisoContentBrowser::sigCreateFileTableViewContextMenu,
                 this, &UIVisoCreatorWidget::sltHandleShowContextMenu);
     }
@@ -334 +340 @@
     if (m_pCreateNewDirectoryAction)
         connect(m_pCreateNewDirectoryAction, &QAction::triggered,
-                m_pVisoBrowser, &UIVisoContentBrowser::sltHandleCreateNewDirectory);
+                m_pVISOContentBrowser, &UIVisoContentBrowser::sltHandleCreateNewDirectory);
     if (m_pRemoveAction)
         connect(m_pRemoveAction, &QAction::triggered,
-                m_pVisoBrowser, &UIVisoContentBrowser::sltHandleRemoveItems);
+                m_pVISOContentBrowser, &UIVisoContentBrowser::sltHandleRemoveItems);
     if (m_pResetAction)
         connect(m_pResetAction, &QAction::triggered,
-                m_pVisoBrowser, &UIVisoContentBrowser::sltHandleResetAction);
+                m_pVISOContentBrowser, &UIVisoContentBrowser::sltHandleResetAction);
     if (m_pRenameAction)
         connect(m_pRenameAction, &QAction::triggered,
-                m_pVisoBrowser,&UIVisoContentBrowser::sltHandleItemRenameAction);
+                m_pVISOContentBrowser,&UIVisoContentBrowser::sltHandleItemRenameAction);
 }
 
@@ -440 +446 @@
     //    host and/or content browser is open. We use the escape key to close those first: */
     // if ((m_pHostBrowser && m_pHostBrowser->isTreeViewVisible()) ||
-    //     (m_pVisoBrowser && m_pVisoBrowser->isTreeViewVisible()))
+    //     (m_pVISOContentBrowser && m_pVISOContentBrowser->isTreeViewVisible()))
     // {
     //     if (m_pButtonBox && m_pButtonBox->button(QDialogButtonBox::Cancel))
@@ -590 +596 @@
 {
     if (!m_strMachineName.isEmpty())
-        setWindowTitle(QString("%1 - %2").arg(m_strMachineName).arg(tr("VISO Creator")));
+        setWindowTitle(QString("%1 - %2").arg(m_strMachineName).arg(UIVisoCreatorWidget::tr("VISO Creator")));
     else
-        setWindowTitle(QString("%1").arg(tr("VISO Creator")));
+        setWindowTitle(QString("%1").arg(UIVisoCreatorWidget::tr("VISO Creator")));
     if (m_pButtonBox && m_pButtonBox->button(QDialogButtonBox::Ok))
     {
-        m_pButtonBox->button(QDialogButtonBox::Ok)->setText(QApplication::translate("UIVisoCreator", "C&reate"));
-        m_pButtonBox->button(QDialogButtonBox::Ok)->setToolTip(QApplication::translate("UIVisoCreator", "Creates VISO file with the selected content"));
+        m_pButtonBox->button(QDialogButtonBox::Ok)->setText(UIVisoCreatorWidget::tr("C&reate"));
+        m_pButtonBox->button(QDialogButtonBox::Ok)->setToolTip(UIVisoCreatorWidget::tr("Creates VISO file with the selected content"));
     }
     if (m_pButtonBox && m_pButtonBox->button(QDialogButtonBox::Help))
-        m_pButtonBox->button(QDialogButtonBox::Help)->setToolTip(QApplication::translate("UIVisoCreator", "Opens the help browser and navigates to the related section"));
-}
+        m_pButtonBox->button(QDialogButtonBox::Help)->setToolTip(UIVisoCreatorWidget::tr("Opens the help browser and navigates to the related section"));
+}

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.h

@@ -152 +152 @@
     QGridLayout          *m_pMainLayout;
     UIVisoHostBrowser    *m_pHostBrowser;
-    UIVisoContentBrowser *m_pVisoBrowser;
+    UIVisoContentBrowser *m_pVISOContentBrowser;
 
     QIToolBar            *m_pToolBar;