Changeset 71509 in vbox

Timestamp:

Mar 26, 2018 12:16:37 PM (7 years ago)

Author:

vboxsync

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

121482

Message:

FE/Qt: bugref:6699 Replace 'current location line edit' with an combo box

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIComboBox.h (modified) (1 diff)
• runtime/guestctrl/UIGuestControlFileTable.cpp (modified) (7 diffs)
• runtime/guestctrl/UIGuestControlFileTable.h (modified) (3 diffs)
• runtime/guestctrl/UIGuestFileTable.cpp (modified) (1 diff)
• runtime/guestctrl/UIHostFileTable.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIComboBox.h

@@ -128 +128 @@
 
 #endif /* !___QIComboBox_h___ */
-

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

@@ -22 +22 @@
 /* Qt includes: */
 # include <QAction>
+# include <QComboBox>
 # include <QDateTime>
 # include <QDir>
@@ -649 +650 @@
     , m_pPaste(0)
     , m_pMainLayout(0)
-    , m_pCurrentLocationEdit(0)
+    , m_pLocationComboBox(0)
     , m_pToolBar(0)
     , m_pGoUp(0)
@@ -676 +677 @@
     if (m_pModel)
         m_pModel->endReset();
-    if (m_pCurrentLocationEdit)
-        m_pCurrentLocationEdit->clear();
+    if (m_pLocationComboBox)
+    {
+        disconnect(m_pLocationComboBox, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::currentIndexChanged),
+                   this, &UIGuestControlFileTable::sltLocationComboCurrentChange);
+        m_pLocationComboBox->clear();
+        connect(m_pLocationComboBox, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::currentIndexChanged),
+                this, &UIGuestControlFileTable::sltLocationComboCurrentChange);
+    }
 }
 
@@ -706 +713 @@
     }
 
-    m_pCurrentLocationEdit = new QILineEdit;
-    if (m_pCurrentLocationEdit)
-    {
-        m_pMainLayout->addWidget(m_pCurrentLocationEdit, 1, 1, 1, 4);
-        m_pCurrentLocationEdit->setReadOnly(true);
-    }
+    m_pLocationComboBox = new QComboBox;
+    if (m_pLocationComboBox)
+    {
+        m_pMainLayout->addWidget(m_pLocationComboBox, 1, 1, 1, 4);
+        m_pLocationComboBox->setEditable(false);
+        connect(m_pLocationComboBox, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::currentIndexChanged),
+                this, &UIGuestControlFileTable::sltLocationComboCurrentChange);
+    }
+
 
     m_pModel = new UIGuestControlFileModel(this);
@@ -860 +870 @@
 void UIGuestControlFileTable::updateCurrentLocationEdit(const QString& strLocation)
 {
-    if (!m_pCurrentLocationEdit)
-        return;
-    m_pCurrentLocationEdit->setText(strLocation);
+    if (!m_pLocationComboBox)
+        return;
+    int itemIndex = m_pLocationComboBox->findText(strLocation,
+                                                  Qt::MatchExactly | Qt::MatchCaseSensitive);
+    if (itemIndex == -1)
+    {
+        m_pLocationComboBox->insertItem(m_pLocationComboBox->count(), strLocation);
+        itemIndex = m_pLocationComboBox->count() - 1;
+    }
+    m_pLocationComboBox->setCurrentIndex(itemIndex);
 }
 
@@ -885 +902 @@
         reset();
 
+    const QString startPath("/");
     QList<QVariant> headData;
     headData << "Name" << "Size" << "Change Time" << "Owner";
     m_pRootItem = new UIFileTableItem(headData, 0, FileObjectType_Directory);
     QList<QVariant> startDirData;
-    startDirData << "/" << 4096 << QDateTime() << "";
+    startDirData << startPath << 4096 << QDateTime() << "";
     UIFileTableItem* startItem = new UIFileTableItem(startDirData, m_pRootItem, FileObjectType_Directory);
 
-    startItem->setPath("/");
+    startItem->setPath(startPath);
     m_pRootItem->appendChild(startItem);
 
     startItem->setIsOpened(false);
     /* Read the root directory and get the list: */
-    readDirectory("/", startItem, true);
+    readDirectory(startPath, startItem, true);
     m_pView->setRootIndex(m_pModel->rootIndex());
     m_pModel->signalUpdate();
-
+    updateCurrentLocationEdit(startPath);
 }
 
@@ -1151 +1169 @@
 }
 
+void UIGuestControlFileTable::sltLocationComboCurrentChange(const QString &strLocation)
+{
+    QString comboLocation(UIPathOperations::sanitize(strLocation));
+    if (comboLocation == currentDirectoryPath())
+        return;
+
+    QList<QString> pathList = comboLocation.split(UIPathOperations::delimiter, QString::SkipEmptyParts);
+    goIntoDirectory(pathList);
+}
+
 void UIGuestControlFileTable::deleteByIndex(const QModelIndex &itemIndex)
 {

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

@@ -35 +35 @@
 class QFileInfo;
 
+class QComboBox;
 class QILabel;
 class QILineEdit;
@@ -258 +259 @@
     void sltCreateNewDirectory();
     void sltSelectionChanged(const QItemSelection & selected, const QItemSelection & deselected);
+    void sltLocationComboCurrentChange(const QString &strLocation);
 
 private:
@@ -271 +273 @@
     void            disableSelectionDependentActions();
     QGridLayout     *m_pMainLayout;
-    QILineEdit      *m_pCurrentLocationEdit;
+    QComboBox       *m_pLocationComboBox;
     UIToolBar       *m_pToolBar;
     QAction         *m_pGoUp;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestFileTable.cpp

@@ -116 +116 @@
         insertItemsToTree(directories, parent, true, isStartDir);
         insertItemsToTree(files, parent, false, isStartDir);
-        updateCurrentLocationEdit(strPath);
+        //updateCurrentLocationEdit(strPath);
     }
     directory.Close();

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIHostFileTable.cpp

@@ -198 +198 @@
     insertItemsToTree(directories, parent, true, isStartDir);
     insertItemsToTree(files, parent, false, isStartDir);
-    updateCurrentLocationEdit(strPath);
+    //updateCurrentLocationEdit(strPath);
 }