Changeset 91328 in vbox

Timestamp:

Sep 22, 2021 3:15:09 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6143. Using QITableView in VISO creator. I will have to refactor data structure to accommodate row/cell objects of the accessibility infrastruture.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• guestctrl/UIFileManagerTable.h (modified) (1 diff)
• medium/viso/UIVisoContentBrowser.cpp (modified) (7 diffs)
• medium/viso/UIVisoCreator.cpp (modified) (1 diff)
• medium/viso/UIVisoHostBrowser.cpp (modified) (3 diffs)
• medium/viso/UIVisoHostBrowser.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerTable.h

@@ -128 +128 @@
  *  and a host version are derived from this base. Each of these children
  *  populates the UICustomFileSystemModel by scanning the file system
- *  differently. The file structre kept in this class as a tree. */
+ *  differently. The file structure kept in this class as a tree. */
 class UIFileManagerTable : public QIWithRetranslateUI<QWidget>
 {

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

@@ -23 +23 @@
 #include <QHeaderView>
 #include <QMimeData>
-#include <QTableView>
 #include <QTreeView>
 
@@ -30 +29 @@
 #include "UIPathOperations.h"
 #include "UIVisoContentBrowser.h"
+#include "QITableView.h"
 
 /*********************************************************************************************************************************
@@ -36 +36 @@
 
 /** An QTableView extension mainly used to handle dropeed file objects from the host browser. */
-class UIVisoContentTableView : public QTableView
+class UIVisoContentTableView : public QITableView
 {
     Q_OBJECT;
@@ -77 +77 @@
 *********************************************************************************************************************************/
 UIVisoContentTableView::UIVisoContentTableView(QWidget *pParent /* = 0 */)
-    :QTableView(pParent)
+    :QITableView(pParent)
 {
 }
@@ -481 +481 @@
     else
     {
-        QItemSelectionModel *selectionModel = m_pTreeView->selectionModel();
-        if (selectionModel)
-        {
+        if (m_pTreeView && m_pTreeView->selectionModel())
+        {
+            QItemSelectionModel *selectionModel = m_pTreeView->selectionModel();
             if (!selectionModel->selectedIndexes().isEmpty())
             {
@@ -579 +579 @@
     else if (index.model() == m_pModel)
         return m_pTableProxyModel->mapFromSource(index);
-    /* else if (index.model() == m_pTreeProxyModel): */
-    return m_pTableProxyModel->mapFromSource(m_pTreeProxyModel->mapToSource(index));
+    else if (index.model() == m_pTreeProxyModel)
+        return m_pTableProxyModel->mapFromSource(m_pTreeProxyModel->mapToSource(index));
+    return QModelIndex();
 }
 
@@ -592 +593 @@
     else if (index.model() == m_pModel)
         return m_pTreeProxyModel->mapFromSource(index);
-    /* else if (index.model() == m_pTableProxyModel): */
-    return m_pTreeProxyModel->mapFromSource(m_pTableProxyModel->mapToSource(index));
+    else if (index.model() == m_pTableProxyModel)
+        return m_pTreeProxyModel->mapFromSource(m_pTableProxyModel->mapToSource(index));
+    return QModelIndex();
 }
 

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

@@ -145 +145 @@
         m_pRenameAction->setToolTip(QApplication::translate("UIVisoCreator", "Rename the selected object"));
     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"));
+    }
+    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"));
 }
 

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

@@ -20 +20 @@
 #include <QHeaderView>
 #include <QMimeData>
-#include <QTableView>
 #include <QTextEdit>
 #include <QTreeView>
 
 /* GUI includes: */
+#include "QITableView.h"
 #include "UIVisoHostBrowser.h"
 
@@ -36 +36 @@
 
 public:
+
     virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const /* override */;
     UIVisoHostBrowserModel(QObject *pParent);
@@ -149 +150 @@
     }
 
-    m_pTableView = new QTableView;
+    m_pTableView = new QITableView;
     if (m_pTableView)
     {

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

@@ -27 +27 @@
 /* Forward declarations: */
 class QItemSelection;
-class QTableView;
+class QITableView;
 class UIVisoHostBrowserModel;
 
@@ -72 +72 @@
     UIVisoHostBrowserModel *m_pTreeModel;
     UIVisoHostBrowserModel *m_pTableModel;
-    QTableView             *m_pTableView;
+    QITableView            *m_pTableView;
 };