Changeset 77308 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Feb 14, 2019 10:39:39 AM (6 years ago)

Author:

vboxsync

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

128834

Message:

FE/Qt: bugref:9080. Redesigning VISO creator by hiding the ugly tree viewer. part 1.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/globals/UIDialogPanel.cpp (modified) (1 diff)
• src/medium/viso/UIVisoBrowserBase.cpp (modified) (6 diffs)
• src/medium/viso/UIVisoBrowserBase.h (modified) (4 diffs)
• src/medium/viso/UIVisoConfigurationPanel.cpp (modified) (3 diffs)
• src/medium/viso/UIVisoContentBrowser.cpp (modified) (5 diffs)
• src/medium/viso/UIVisoCreator.cpp (modified) (5 diffs)
• src/medium/viso/UIVisoCreator.h (modified) (1 diff)
• src/medium/viso/UIVisoHostBrowser.cpp (modified) (6 diffs)
• src/medium/viso/UIVisoHostBrowser.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -978 +978 @@
         src/medium/viso/UIVisoContentBrowser.cpp \
         src/medium/viso/UIVisoHostBrowser.cpp \
+        src/medium/viso/UIVisoBrowserBase.cpp \
         src/settings/global/UIGlobalSettingsExtension.cpp \
         src/settings/global/UIGlobalSettingsInput.cpp \

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

@@ -124 +124 @@
 {
     QFrame *pSeparator = new QFrame();
+    if (!pSeparator)
+        return;
     pSeparator->setFrameShape(QFrame::VLine);
     pSeparator->setFrameShadow(QFrame::Sunken);

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

@@ -20 +20 @@
 #include <QGridLayout>
 #include <QLabel>
+#include <QLineEdit>
 #include <QSplitter>
 #include <QTableView>
@@ -26 +27 @@
 
 /* GUI includes: */
+#include "QIToolButton.h"
+#include "UIIconPool.h"
+#include "UIToolBar.h"
 #include "UIVisoBrowserBase.h"
-#include "UIToolBar.h"
+
+
+/*********************************************************************************************************************************
+*   UILocationSelector definition.                                                                                   *
+*********************************************************************************************************************************/
+
+class UILocationSelector : public QIWithRetranslateUI<QWidget>
+{
+    Q_OBJECT;
+public:
+
+    UILocationSelector(QWidget *pParent = 0);
+    int  lineEditWidth() const;
+    void updateLineEditText(const QString &strText);
+
+signals:
+
+    void sigExpandCollapseTreeView();
+
+protected:
+
+    virtual void retranslateUi() /* override */;
+    virtual void paintEvent(QPaintEvent *pEvent) /* override */;
+    virtual bool eventFilter(QObject *pObj, QEvent *pEvent) /* override */;
+
+private:
+
+    void prepareWidget();
+    QLineEdit   *m_pLineEdit;
+    QGridLayout *m_pMainLayout;
+    QIToolButton *m_pExpandButton;
+    bool          m_fExpanded;
+    QDialog           *m_pDialog;
+
+};
+
+/*********************************************************************************************************************************
+*   UILocationSelector implementation.                                                                                   *
+*********************************************************************************************************************************/
+
+UILocationSelector::UILocationSelector(QWidget *pParent /* = 0 */)
+    :QIWithRetranslateUI<QWidget>(pParent)
+    , m_pLineEdit(0)
+    , m_pMainLayout(0)
+    , m_pExpandButton(0)
+    , m_fExpanded(false)
+    , m_pDialog(0)
+{
+    prepareWidget();
+}
+
+int UILocationSelector::lineEditWidth() const
+{
+    if (!m_pLineEdit)
+        return 0;
+    return m_pLineEdit->width();
+}
+
+void UILocationSelector::updateLineEditText(const QString &strText)
+{
+    if (!m_pLineEdit)
+        return;
+    m_pLineEdit->setText(strText);
+}
+
+void UILocationSelector::paintEvent(QPaintEvent *pEvent)
+{
+    QIWithRetranslateUI<QWidget>::paintEvent(pEvent);
+}
+
+void UILocationSelector::retranslateUi()
+{
+}
+
+bool UILocationSelector::eventFilter(QObject *pObj, QEvent *pEvent)
+{
+    if (pObj == m_pLineEdit && pEvent->type() == QEvent::MouseButtonPress)
+    {
+        emit sigExpandCollapseTreeView();
+    }
+    /* Pass the events to event system for further processing: */
+    return false;
+}
+void UILocationSelector::prepareWidget()
+{
+    m_pMainLayout = new QGridLayout;
+    if (!m_pMainLayout)
+        return;
+    m_pMainLayout->setSpacing(0);
+    m_pMainLayout->setContentsMargins(0,0,0,0);
+
+    m_pLineEdit = new QLineEdit;
+    if (m_pLineEdit)
+    {
+        m_pMainLayout->addWidget(m_pLineEdit, 0, 0, 1, 4);
+        m_pLineEdit->setReadOnly(true);
+        m_pLineEdit->installEventFilter(this);
+    }
+
+    m_pExpandButton = new QIToolButton;
+    if (m_pExpandButton)
+    {
+        m_pMainLayout->addWidget(m_pExpandButton, 0, 4, 1, 1);
+        m_pExpandButton->setIcon(UIIconPool::iconSet(":/select_file_16px.png", ":/select_file_disabled_16px.png"));
+        connect(m_pExpandButton, &QIToolButton::clicked,
+                this, &UILocationSelector::sigExpandCollapseTreeView);
+
+    }
+    setLayout(m_pMainLayout);
+}
+
+/*********************************************************************************************************************************
+*   UIVisoBrowserBase implementation.                                                                                   *
+*********************************************************************************************************************************/
 
 UIVisoBrowserBase::UIVisoBrowserBase(QWidget *pParent /* = 0 */, QMenu *pMenu /*= 0*/)
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_pTreeView(0)
-    , m_pTitleLabel(0)
-    , m_pRightContainerWidget(0)
-    , m_pRightContainerLayout(0)
     , m_pVerticalToolBar(0)
     , m_pMenu(pMenu)
     , m_pMainLayout(0)
-    , m_pHorizontalSplitter(0)
+    , m_pLocationSelector(0)
 {
 }
@@ -51 +165 @@
     setLayout(m_pMainLayout);
 
-    QWidget *pLeftContainerWidget = new QWidget;
-    m_pRightContainerWidget = new QWidget;
-
-    QVBoxLayout *pLeftContainerLayout = new QVBoxLayout;
-    m_pRightContainerLayout = new QGridLayout;
-
-    pLeftContainerLayout->setSpacing(1);
-    pLeftContainerLayout->setContentsMargins(0, 0, 0, 0);
-    m_pRightContainerLayout->setSpacing(1);
-    m_pRightContainerLayout->setContentsMargins(0, 0, 0, 0);
-
-    if (!m_pMainLayout || !pLeftContainerLayout || !m_pRightContainerLayout)
-        return;
-    if (!pLeftContainerWidget || !m_pRightContainerWidget)
-        return;
-
-    pLeftContainerWidget->setLayout(pLeftContainerLayout);
-    m_pRightContainerWidget->setLayout(m_pRightContainerLayout);
-
-    m_pHorizontalSplitter = new QSplitter;
-    if (!m_pHorizontalSplitter)
-        return;
-
-    m_pMainLayout->addWidget(m_pHorizontalSplitter, 1, 0);
-    m_pHorizontalSplitter->setOrientation(Qt::Horizontal);
-    m_pHorizontalSplitter->setHandleWidth(2);
-
-    m_pTitleLabel = new QLabel;
-    if (m_pTitleLabel)
-    {
-        pLeftContainerLayout->addWidget(m_pTitleLabel);
-    }
-
-    m_pTreeView = new QTreeView;
+    if (!m_pMainLayout)
+        return;
+
+    m_pMainLayout->setRowStretch(1, 2);
+    m_pLocationSelector = new UILocationSelector;
+    if (m_pLocationSelector)
+    {
+        m_pMainLayout->addWidget(m_pLocationSelector, 0, 0, 1, 4);
+    }
+
+    m_pTreeView = new QTreeView(this);
     if (m_pTreeView)
     {
-        pLeftContainerLayout->addWidget(m_pTreeView);
+        m_pTreeView->hide();
         m_pTreeView->setSelectionMode(QAbstractItemView::SingleSelection);
-        m_pTreeView->setAlternatingRowColors(true);
+        //m_pTreeView->setAlternatingRowColors(true);
         m_pTreeView->header()->hide();
         m_pTreeView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
-    }
-
+        m_pTreeView->setFrameStyle(QFrame::Panel | QFrame::Plain);
+    }
 
     m_pVerticalToolBar = new UIToolBar;
@@ -99 +190 @@
     {
         m_pVerticalToolBar->setOrientation(Qt::Vertical);
-        m_pRightContainerLayout->addWidget(m_pVerticalToolBar, 0, 5, 6, 1);
-    }
-
-    m_pHorizontalSplitter->addWidget(pLeftContainerWidget);
-    m_pHorizontalSplitter->addWidget(m_pRightContainerWidget);
-    m_pHorizontalSplitter->setCollapsible(m_pHorizontalSplitter->indexOf(pLeftContainerWidget), false);
-    m_pHorizontalSplitter->setCollapsible(m_pHorizontalSplitter->indexOf(m_pRightContainerWidget), false);
-    m_pHorizontalSplitter->setStretchFactor(0, 1);
-    m_pHorizontalSplitter->setStretchFactor(1, 3);
+        m_pMainLayout->addWidget(m_pVerticalToolBar, 0, 5, 6, 1);
+    }
 }
 
@@ -119 +203 @@
                 this, &UIVisoBrowserBase::sltHandleTreeItemClicked);
     }
+    if (m_pLocationSelector)
+        connect(m_pLocationSelector, &UILocationSelector::sigExpandCollapseTreeView,
+                this, &UIVisoBrowserBase::sltExpandCollapseTreeView);
+}
+
+void UIVisoBrowserBase::updateLocationSelectorText(const QString &strText)
+{
+    if (!m_pLocationSelector)
+        return;
+    m_pLocationSelector->updateLineEditText(strText);
+}
+
+void UIVisoBrowserBase::resizeEvent(QResizeEvent *pEvent)
+{
+    QIWithRetranslateUI<QWidget>::resizeEvent(pEvent);
+    if (m_pTreeView)
+        updateTreeViewGeometry(m_pTreeView->isVisible());
 }
 
@@ -142 +243 @@
         return;
     m_pTreeView->setExpanded(modelIndex, true);
-}
-
-
-//#include "UIVisoBrowserBase.moc"
+    m_pTreeView->hide();
+}
+
+void UIVisoBrowserBase::sltExpandCollapseTreeView()
+{
+    if (!m_pTreeView)
+        return;
+    updateTreeViewGeometry(!m_pTreeView->isVisible());
+}
+
+void UIVisoBrowserBase::updateTreeViewGeometry(bool fShow)
+{
+    if (!m_pTreeView)
+        return;
+
+    if (!fShow)
+    {
+        m_pTreeView->hide();
+        return;
+    }
+    if (!m_pLocationSelector)
+        return;
+
+    int iy = m_pLocationSelector->y() + m_pLocationSelector->height();
+    int ix = m_pLocationSelector->x();
+    int iWidth = m_pLocationSelector->lineEditWidth();
+
+    m_pTreeView-> move(ix, iy);
+    m_pTreeView->raise();
+    m_pTreeView->resize(iWidth, 0.75 * height());
+    m_pTreeView->show();
+
+    //m_pTreeView->scrollTo(m_pTreeView->currentIndex(), QAbstractItemView::PositionAtTop);
+}
+
+#include "UIVisoBrowserBase.moc"

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

@@ -38 +38 @@
 class QTableView;
 class QTreeView;
+class UILocationSelector;
 class UIToolBar;
 
@@ -59 +60 @@
     void prepareObjects();
     void prepareConnections();
+    void updateLocationSelectorText(const QString &strText);
 
     virtual void tableViewItemDoubleClick(const QModelIndex &index) = 0;
@@ -65 +67 @@
     virtual void setTreeCurrentIndex(QModelIndex index = QModelIndex()) = 0;
 
+    virtual void resizeEvent(QResizeEvent *pEvent) /* override */;
 
     QTreeView          *m_pTreeView;
-    QLabel             *m_pTitleLabel;
-    QWidget            *m_pRightContainerWidget;
-    QGridLayout        *m_pRightContainerLayout;
     UIToolBar          *m_pVerticalToolBar;
     QMenu              *m_pMenu;
+    QGridLayout       *m_pMainLayout;
+
 private:
-    QGridLayout    *m_pMainLayout;
-    QSplitter      *m_pHorizontalSplitter;
 
 private slots:
@@ -80 +80 @@
     void sltHandleTreeSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
     void sltHandleTreeItemClicked(const QModelIndex &modelIndex);
+    void sltExpandCollapseTreeView();
 
 private:
 
+    void updateTreeViewGeometry(bool fShow);
+    UILocationSelector    *m_pLocationSelector;
 };
 

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

@@ -89 +89 @@
     addVerticalSeparator();
 
-
     /* Cutom Viso options stuff: */
     m_pCustomOptionsLabel = new QILabel(QApplication::translate("UIVisoCreator", "Custom VISO options:"));
@@ -123 +122 @@
     {
         /* Process key press only: */
-    case QEvent::KeyPress:
+        case QEvent::KeyPress:
         {
             /* Cast to corresponding key press event: */
@@ -133 +132 @@
             break;
         }
-    default:
+        default:
         break;
     }

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

@@ -246 +246 @@
 void UIVisoContentBrowser::retranslateUi()
 {
-    if (m_pTitleLabel)
-        m_pTitleLabel->setText(QApplication::translate("UIVisoCreator", "VISO content"));
     if (m_pRemoveAction)
     {
@@ -418 +416 @@
     if (m_pTableView)
     {
-        m_pRightContainerLayout->addWidget(m_pTableView, 0, 0, 6, 4);
+        m_pMainLayout->addWidget(m_pTableView, 1, 0, 6, 4);
         m_pTableView->setSelectionMode(QAbstractItemView::ContiguousSelection);
         m_pTableView->setShowGrid(false);
@@ -559 +557 @@
     if (!m_pTableView)
         return;
+
+    QModelIndex tableIndex;
     if (index.isValid())
     {
-        QModelIndex tableIndex = convertIndexToTableIndex(index);
+        tableIndex = convertIndexToTableIndex(index);
         if (tableIndex.isValid())
             m_pTableView->setRootIndex(tableIndex);
-        return;
-    }
-    QItemSelectionModel *selectionModel = m_pTreeView->selectionModel();
-    if (selectionModel)
-    {
-        if (!selectionModel->selectedIndexes().isEmpty())
+    }
+    else
+    {
+        QItemSelectionModel *selectionModel = m_pTreeView->selectionModel();
+        if (selectionModel)
         {
-            QModelIndex treeIndex = selectionModel->selectedIndexes().at(0);
-            QModelIndex tableIndex = convertIndexToTableIndex(treeIndex);
-            if (tableIndex.isValid())
-                m_pTableView->setRootIndex(tableIndex);
+            if (!selectionModel->selectedIndexes().isEmpty())
+            {
+                QModelIndex treeIndex = selectionModel->selectedIndexes().at(0);
+                tableIndex = convertIndexToTableIndex(treeIndex);
+                if (tableIndex.isValid())
+                    m_pTableView->setRootIndex(tableIndex);
+            }
+        }
+    }
+    if (tableIndex.isValid())
+    {
+        UICustomFileSystemItem *pItem =
+            static_cast<UICustomFileSystemItem*>(m_pTableProxyModel->mapToSource(tableIndex).internalPointer());
+        if (pItem)
+        {
+            QString strPath = pItem->data(UICustomFileSystemModelColumn_Path).toString();
+            if (strPath == QDir::fromNativeSeparators("/"))
+                strPath += m_strVisoName;
+            updateLocationSelectorText(strPath);
         }
     }
@@ -613 +627 @@
         m_pTreeProxyModel->invalidate();
     }
-
     pSelectionModel->blockSignals(false);
     m_pTreeView->blockSignals(false);
@@ -728 +741 @@
     if (!rootItem() || !rootItem()->child(0))
         return;
-    const QString strName = QString("/%1").arg(m_strVisoName);
+    const QString strName = QString("%1%2").arg(QDir::toNativeSeparators("/")).arg(m_strVisoName);
 
     rootItem()->child(0)->setData(strName, UICustomFileSystemModelColumn_Name);
+    /* If the table root index is the start item then we have to update the location selector text here: */
+    if (m_pTableProxyModel->mapToSource(m_pTableView->rootIndex()).internalPointer() == rootItem()->child(0))
+        updateLocationSelectorText(strName);
     m_pTreeProxyModel->invalidate();
     m_pTableProxyModel->invalidate();

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

@@ -37 +37 @@
     : QIWithRetranslateUI<QIMainDialog>(pParent)
     , m_pMainLayout(0)
-    , m_pVerticalSplitter(0)
+    , m_pHorizontalSplitter(0)
     , m_pHostBrowser(0)
     , m_pVisoBrowser(0)
@@ -197 +197 @@
     m_pMainLayout->setSpacing(10);
 #else
-    m_pMainLayout->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2);
+    m_pMainLayout->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing) / 2);
 #endif
 
@@ -224 +224 @@
     }
 
-    m_pVerticalSplitter = new QSplitter;
-    if (!m_pVerticalSplitter)
-        return;
-
-    m_pMainLayout->addWidget(m_pVerticalSplitter);
-    m_pVerticalSplitter->setOrientation(Qt::Vertical);
-    m_pVerticalSplitter->setHandleWidth(1);
+    m_pHorizontalSplitter = new QSplitter;
+    if (!m_pHorizontalSplitter)
+        return;
+
+    m_pMainLayout->addWidget(m_pHorizontalSplitter);
+    /* Make sure m_pHorizontalSplitter takes all the extra space: */
+    m_pMainLayout->setStretch(m_pMainLayout->indexOf(m_pHorizontalSplitter), 2);
+    m_pHorizontalSplitter->setOrientation(Qt::Horizontal);
+    m_pHorizontalSplitter->setHandleWidth(1);
 
     m_pHostBrowser = new UIVisoHostBrowser(0 /* parent */, m_pHostBrowserMenu);
     if (m_pHostBrowser)
     {
-        m_pVerticalSplitter->addWidget(m_pHostBrowser);
+        m_pHorizontalSplitter->addWidget(m_pHostBrowser);
         connect(m_pHostBrowser, &UIVisoHostBrowser::sigAddObjectsToViso,
                 this, &UIVisoCreator::sltHandleAddObjectsToViso);
@@ -243 +245 @@
     if (m_pVisoBrowser)
     {
-        m_pVerticalSplitter->addWidget(m_pVisoBrowser);
+        m_pHorizontalSplitter->addWidget(m_pVisoBrowser);
         m_pVisoBrowser->setVisoName(m_visoOptions.m_strVisoName);
     }
@@ -250 +252 @@
     if (m_pConfigurationPanel)
     {
-        m_pVerticalSplitter->addWidget(m_pConfigurationPanel);
+        m_pMainLayout->addWidget(m_pConfigurationPanel);
         m_panelActionMap.insert(m_pConfigurationPanel, m_pActionConfiguration);
         m_pConfigurationPanel->hide();

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

@@ -114 +114 @@
 
     QVBoxLayout          *m_pMainLayout;
-    QSplitter            *m_pVerticalSplitter;
+    QSplitter            *m_pHorizontalSplitter;
     UIVisoHostBrowser    *m_pHostBrowser;
     UIVisoContentBrowser *m_pVisoBrowser;

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

@@ -18 +18 @@
 #include <QAction>
 #include <QAbstractItemModel>
+#include <QDialog>
 #include <QDir>
 #include <QFileSystemModel>
@@ -23 +24 @@
 #include <QHeaderView>
 #include <QLabel>
+#include <QLineEdit>
 #include <QListView>
 #include <QMenu>
 #include <QMimeData>
 #include <QTableView>
+#include <QTextEdit>
 #include <QTreeView>
 
@@ -34 +37 @@
 #include "UIToolBar.h"
 #include "UIVisoHostBrowser.h"
+
 
 
@@ -133 +137 @@
 void UIVisoHostBrowser::retranslateUi()
 {
-    if (m_pTitleLabel)
-        m_pTitleLabel->setText(QApplication::translate("UIVisoCreator", "Host file system"));
     if (m_pAddAction)
     {
@@ -169 +171 @@
     if (m_pTableView)
     {
-        m_pRightContainerLayout->addWidget(m_pTableView, 0, 0, 6, 4);
+        m_pMainLayout->addWidget(m_pTableView, 1, 0, 8, 4);
         m_pTableView->setSelectionMode(QAbstractItemView::ContiguousSelection);
         m_pTableView->setShowGrid(false);
@@ -320 +322 @@
     if (!strCurrentTreePath.isEmpty())
         m_pTableView->setRootIndex(m_pTableModel->index(strCurrentTreePath));
+    updateLocationSelectorText(strCurrentTreePath);
 }
 

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

@@ -31 +31 @@
 /* Forward declarations: */
 class QItemSelection;
+class UIFileTreeContainer;
 class UIVisoHostBrowserModel;
 
@@ -72 +73 @@
     QAction                *m_pAddAction;
     QTableView             *m_pTableView;
-
 };