Changeset 71201 in vbox for trunk

Timestamp:

Mar 5, 2018 1:20:48 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt bugref:6699 Implement 'refresh' 'go up' actions in file table

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl

Files:

• UIGuestControlFileManager.cpp (modified) (4 diffs)
• UIGuestControlFileTable.cpp (modified) (7 diffs)
• UIGuestControlFileTable.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl/UIGuestControlFileManager.cpp

@@ -77 +77 @@
 
     void retranslateUi();
+    void keyPressEvent(QKeyEvent * pEvent);
 
 private slots:
@@ -190 +191 @@
         m_pCloseButton->setText(UIVMInformationDialog::tr("Close Session"));
 
+}
+
+void UIGuestSessionCreateWidget::keyPressEvent(QKeyEvent * pEvent)
+{
+    /* Emit sigCreateSession upon enter press: */
+    if (pEvent->key() == Qt::Key_Enter || pEvent->key() == Qt::Key_Return)
+    {
+        if ((m_pUserNameEdit && m_pUserNameEdit->hasFocus()) ||
+            (m_pPasswordEdit && m_pPasswordEdit->hasFocus()))
+            sigCreateSession(m_pUserNameEdit->text(), m_pPasswordEdit->text());
+    }
+    QWidget::keyPressEvent(pEvent);
 }
 
@@ -458 +471 @@
     if (m_pSessionCreateWidget)
         m_pSessionCreateWidget->switchSessionCloseMode();
-    if(m_pGuestFileTable)
+    if (m_pGuestFileTable)
         m_pGuestFileTable->setEnabled(true);
-    if(m_pToolBar)
+    if (m_pToolBar)
         m_pToolBar->setEnabled(true);
 }
@@ -468 +481 @@
     if (m_pSessionCreateWidget)
         m_pSessionCreateWidget->switchSessionCreateMode();
-    if(m_pGuestFileTable)
+    if (m_pGuestFileTable)
         m_pGuestFileTable->setEnabled(false);
-    if(m_pToolBar)
+    if (m_pToolBar)
         m_pToolBar->setEnabled(false);
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl/UIGuestControlFileTable.cpp

@@ -81 +81 @@
     /** True if this is directory and name is ".." */
     bool isUpDirectory() const;
+    void clearChildren();
 
 private:
@@ -104 +105 @@
 {
     qDeleteAll(m_childItems);
+    m_childItems.clear();
 }
 
@@ -147 +149 @@
 {
     return m_bIsDirectory;
+}
+
+void UIFileTableItem::clearChildren()
+{
+    qDeleteAll(m_childItems);
+    m_childItems.clear();
 }
 
@@ -452 +460 @@
 
     m_pGoUp = new QAction(this);
-    m_pGoUp->setIcon(UIIconPool::iconSet(QString(":/arrow_up_10px_x2.png")));
-    m_pToolBar->addAction(m_pGoUp);
-
+    if (m_pGoUp)
+    {
+        connect(m_pGoUp, &QAction::triggered, this, &UIGuestControlFileTable::sltGoUp);
+        m_pGoUp->setIcon(UIIconPool::iconSet(QString(":/arrow_up_10px_x2.png")));
+        m_pToolBar->addAction(m_pGoUp);
+    }
 
     m_pRefresh = new QAction(this);
-    m_pRefresh->setIcon(UIIconPool::iconSet(QString(":/refresh_22px.png")));
-    m_pToolBar->addAction(m_pRefresh);
+    if (m_pRefresh)
+    {
+        connect(m_pRefresh, &QAction::triggered, this, &UIGuestControlFileTable::sltRefresh);
+        m_pRefresh->setIcon(UIIconPool::iconSet(QString(":/refresh_22px.png")));
+        m_pToolBar->addAction(m_pRefresh);
+    }
+
 
     m_pDelete = new QAction(this);
@@ -582 +598 @@
     changeLocation(index);
 }
+
+void UIGuestControlFileTable::sltGoUp()
+{
+    if (!m_pView || !m_pModel)
+        return;
+    QModelIndex currentRoot = m_pView->rootIndex();
+    if (!currentRoot.isValid())
+        return;
+    if (currentRoot != m_pModel->rootIndex())
+        m_pView->setRootIndex(currentRoot.parent());
+}
+
+void UIGuestControlFileTable::sltRefresh()
+{
+    if (!m_pView || !m_pModel)
+        return;
+    QModelIndex currentIndex = m_pView->rootIndex();
+    if (!currentIndex.isValid())
+        return;
+    UIFileTableItem *treeItem =
+        static_cast<UIFileTableItem*>(currentIndex.internalPointer());
+    if (!treeItem)
+        return;
+    m_pModel->beginReset();
+    /* For now we clear the whole subtree (that isrecursively) which is an overkill: */
+    treeItem->clearChildren();
+    readDirectory(treeItem->path(), treeItem, false);
+    m_pModel->endReset();
+    m_pView->setRootIndex(currentIndex);
+}
+
 
 void UIGuestControlFileTable::retranslateUi()
@@ -714 +761 @@
 }
 
+void UIGuestFileTable::refresh()
+{
+}
+
 
 /*********************************************************************************************************************************
@@ -774 +825 @@
 }
 
+void UIHostFileTable::refresh()
+{
+}
+
 #include "UIGuestControlFileTable.moc"

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl/UIGuestControlFileTable.h

@@ -100 +100 @@
                            bool isDirectoryMap, bool isStartDir);
     virtual void readDirectory(const QString& strPath, UIFileTableItem *parent, bool isStartDir = false) = 0;
-
+    virtual void refresh() = 0;
     UIFileTableItem         *m_pRootItem;
 
@@ -114 +114 @@
 
     void sltItemDoubleClicked(const QModelIndex &index);
+    void sltGoUp();
+    void sltRefresh();
 
 private:
@@ -148 +150 @@
     void retranslateUi() /* override */;
     virtual void readDirectory(const QString& strPath, UIFileTableItem *parent, bool isStartDir = false) /* override */;
+    virtual void refresh() /* override */;
 
 private:
@@ -168 +171 @@
     void retranslateUi() /* override */;
     virtual void readDirectory(const QString& strPath, UIFileTableItem *parent, bool isStartDir = false) /* override */;
+    virtual void refresh() /* override */;
 
 };