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

Timestamp:

Feb 14, 2019 7:56:39 PM (6 years ago)

Author:

vboxsync

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

128850

Message:

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

Location:

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

Files:

• UIVisoBrowserBase.cpp (modified) (8 diffs)
• UIVisoBrowserBase.h (modified) (4 diffs)
• UIVisoContentBrowser.cpp (modified) (1 diff)
• UIVisoCreator.cpp (modified) (7 diffs)
• UIVisoCreator.h (modified) (3 diffs)

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

@@ -102 +102 @@
 bool UILocationSelector::eventFilter(QObject *pObj, QEvent *pEvent)
 {
-    if (pObj == m_pLineEdit && pEvent->type() == QEvent::MouseButtonPress)
-    {
-        emit sigExpandCollapseTreeView();
+    if (pObj == m_pLineEdit)
+    {
+        if(pEvent->type() == QEvent::MouseButtonPress)
+        {
+            QMouseEvent *pMouseEvent = dynamic_cast<QMouseEvent*>(pEvent);
+            if (pMouseEvent && pMouseEvent->button() == Qt::LeftButton)
+                emit sigExpandCollapseTreeView();
+        }
     }
     /* Pass the events to event system for further processing: */
     return false;
 }
+
 void UILocationSelector::prepareWidget()
 {
@@ -155 +161 @@
 }
 
+bool UIVisoBrowserBase::isTreeViewVisible() const
+{
+    if (!m_pTreeView)
+        return false;
+    return m_pTreeView->isVisible();
+}
+
+void UIVisoBrowserBase::hideTreeView()
+{
+    if (isTreeViewVisible())
+        sltExpandCollapseTreeView();
+}
+
 void UIVisoBrowserBase::prepareObjects()
 {
@@ -179 +198 @@
         m_pTreeView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
         m_pTreeView->setFrameStyle(QFrame::Panel | QFrame::Plain);
+        m_pTreeView->installEventFilter(this);
     }
 
@@ -217 +237 @@
 }
 
+/* Close the tree view when it recieves focus-out and enter key press event: */
+bool UIVisoBrowserBase::eventFilter(QObject *pObj, QEvent *pEvent)
+{
+    if (pObj == m_pTreeView)
+    {
+        if(pEvent->type() == QEvent::KeyPress)
+        {
+            QKeyEvent *pKeyEvent = dynamic_cast<QKeyEvent*>(pEvent);
+            if (pKeyEvent &&
+                (pKeyEvent->key() == Qt::Key_Return ||
+                 pKeyEvent->key() == Qt::Key_Enter))
+            {
+                sltExpandCollapseTreeView();
+            }
+        }
+        else if (pEvent->type() == QEvent::FocusOut)
+        {
+                sltExpandCollapseTreeView();
+        }
+    }
+    return false;
+}
+
+void UIVisoBrowserBase::keyPressEvent(QKeyEvent *pEvent)
+{
+    if (pEvent->key() == Qt::Key_Escape)
+    {
+        if (m_pTreeView->isVisible())
+            updateTreeViewGeometry(false);
+
+    }
+    QIWithRetranslateUI<QWidget>::keyPressEvent(pEvent);
+}
+
+
 void UIVisoBrowserBase::sltHandleTableViewItemDoubleClick(const QModelIndex &index)
 {
@@ -232 +287 @@
 }
 
-
 void UIVisoBrowserBase::sltHandleTreeItemClicked(const QModelIndex &modelIndex)
 {
@@ -239 +293 @@
     m_pTreeView->setExpanded(modelIndex, true);
     m_pTreeView->hide();
+    emit sigTreeViewVisibilityChanged(m_pTreeView->isVisible());
 }
 
@@ -256 +311 @@
     {
         m_pTreeView->hide();
-        return;
+        emit sigTreeViewVisibilityChanged(m_pTreeView->isVisible());
+        m_pTreeView->clearFocus();
+            return;
     }
     if (!m_pLocationSelector)
@@ -264 +321 @@
     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);
+    m_pTreeView->setFocus();
+    emit sigTreeViewVisibilityChanged(m_pTreeView->isVisible());
 }
 

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

@@ -45 +45 @@
     Q_OBJECT;
 
+signals:
+
+    void sigTreeViewVisibilityChanged(bool fVisible);
+
 public:
     /** @p pMenu is the pointer to the menu related to this browser widget.
@@ -51 +55 @@
     ~UIVisoBrowserBase();
     virtual void showHideHiddenObjects(bool bShow) = 0;
+    /* Returns true if tree view is currently visible: */
+    bool isTreeViewVisible() const;
+    void hideTreeView();
 
 public slots:
@@ -68 +75 @@
 
     virtual void resizeEvent(QResizeEvent *pEvent) /* override */;
+    virtual bool eventFilter(QObject *pObj, QEvent *pEvent) /* override */;
+    virtual void keyPressEvent(QKeyEvent *pEvent) /* override */;
 
     QTreeView          *m_pTreeView;
@@ -73 +82 @@
     QMenu              *m_pMenu;
     QGridLayout       *m_pMainLayout;
-
-private:
 
 private slots:

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

@@ -586 +586 @@
         {
             QString strPath = pItem->data(UICustomFileSystemModelColumn_Path).toString();
-            if (strPath == QDir::fromNativeSeparators("/"))
-                strPath += m_strVisoName;
             updateLocationSelectorText(strPath);
         }

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

@@ -120 +120 @@
 }
 
+// bool UIVisoCreator::event(QEvent *pEvent)
+// {
+
+//     if (pEvent->type() == QEvent::KeyPress)
+//     {
+//         printf("key press %d\n", pEvent->type());
+//     }
+//     return false;
+// }
+
+// bool UIVisoCreator::eventFilter(QObject *, QEvent *pEvent)
+// {
+//     if (pEvent->type() == QEvent::KeyPress)
+//     {
+//         printf("key press in filter %d\n", pEvent->type());
+//     }
+
+//     return false;
+// }
+
 void UIVisoCreator::sltHandleAddObjectsToViso(QStringList pathList)
 {
@@ -174 +194 @@
 {
     hidePanel(pPanel);
+}
+
+void UIVisoCreator::sltHandleBrowserTreeViewVisibilityChanged(bool fVisible)
+{
+    Q_UNUSED(fVisible);
+    manageEscapeShortCut();
 }
 
@@ -220 +246 @@
         if (m_pActionOptions)
             m_pToolBar->addAction(m_pActionOptions);
-
         m_pMainLayout->addWidget(m_pToolBar);
     }
@@ -240 +265 @@
         connect(m_pHostBrowser, &UIVisoHostBrowser::sigAddObjectsToViso,
                 this, &UIVisoCreator::sltHandleAddObjectsToViso);
+        connect(m_pHostBrowser, &UIVisoHostBrowser::sigTreeViewVisibilityChanged,
+                this, &UIVisoCreator::sltHandleBrowserTreeViewVisibilityChanged);
     }
 
@@ -275 +302 @@
         m_pButtonBox->button(QDialogButtonBox::Cancel)->setShortcut(Qt::Key_Escape);
         m_pMainLayout->addWidget(m_pButtonBox);
-
     }
     retranslateUi();
@@ -365 +391 @@
 }
 
-
-
 void UIVisoCreator::manageEscapeShortCut()
 {
+    /* Take the escape key from m_pButtonBox and from the panels in case treeview(s) in
+       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()))
+    {
+        if (m_pButtonBox && m_pButtonBox->button(QDialogButtonBox::Cancel))
+            m_pButtonBox->button(QDialogButtonBox::Cancel)->setShortcut(QKeySequence());
+        for (int i = 0; i < m_visiblePanelsList.size(); ++i)
+            m_visiblePanelsList[i]->setCloseButtonShortCut(QKeySequence());
+        return;
+    }
+
     /* if there are no visible panels then assign esc. key to cancel button of the button box: */
     if (m_visiblePanelsList.isEmpty())
@@ -382 +418 @@
        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));
 }

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

@@ -70 +70 @@
 protected:
 
-    void retranslateUi();
+    virtual void retranslateUi() /* override */;
+    // virtual bool event(QEvent *pEvent) /* override */;
+    // virtual bool eventFilter(QObject *pObj, QEvent *pEvent) /* override */;
 
 private slots:
@@ -80 +82 @@
     void sltHandleShowHiddenObjectsChange(bool fShow);
     void sltHandleHidePanel(UIDialogPanel *pPanel);
+    void sltHandleBrowserTreeViewVisibilityChanged(bool fVisible);
 
 private:
@@ -108 +111 @@
     /** Makes sure escape key is assigned to only a single widget. This is done by checking
         several things in the following order:
+        - when tree views of browser panes are visible esc. key used to close those. thus it is taken from the dialog and panels
         - when there are no more panels visible assign it to the parent dialog
         - grab it from the dialog as soon as a panel becomes visible again