Changeset 71269 in vbox

Timestamp:

Mar 8, 2018 10:50:12 AM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699 Implementing GUI for 'create new directory' in guest control file manager

Location:

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

Files:

• UIGuestControlFileTable.cpp (modified) (18 diffs)
• UIGuestControlFileTable.h (modified) (8 diffs)

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

@@ -27 +27 @@
 # include <QItemDelegate>
 # include <QGridLayout>
+# include <QPushButton>
 
 /* GUI includes: */
+# include "QIDialog.h"
+# include "QIDialogButtonBox.h"
 # include "QILabel.h"
 # include "QILineEdit.h"
@@ -44 +47 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
+
+/*********************************************************************************************************************************
+*   UIFileDelegate definition.                                                                                                   *
+*********************************************************************************************************************************/
+/** A QItemDelegate child class to disable dashed lines drawn around selected cells in QTableViews */
 class UIFileDelegate : public QItemDelegate
 {
@@ -52 +60 @@
         virtual void drawFocus ( QPainter * /*painter*/, const QStyleOptionViewItem & /*option*/, const QRect & /*rect*/ ) const {}
 };
+
+
+/*********************************************************************************************************************************
+*   UIFileStringInputDialog definition.                                                                                          *
+*********************************************************************************************************************************/
+/** A QIDialog child including a line edit whose text exposed when the dialog is accepted */
+class UIStringInputDialog : public QIDialog
+{
+
+    Q_OBJECT;
+
+public:
+
+    UIStringInputDialog(QWidget *pParent = 0, Qt::WindowFlags flags = 0);
+    QString getString() const;
+
+private:
+
+    QILineEdit      *m_pLineEdit;
+
+    // virtual void accept() /* override */;
+    // virtual void reject() /* override */;
+
+};
+
 
 
@@ -106 +139 @@
 
 
+/*********************************************************************************************************************************
+*   UIFileStringInputDialog implementation.                                                                                      *
+*********************************************************************************************************************************/
+UIStringInputDialog::UIStringInputDialog(QWidget *pParent /* = 0 */, Qt::WindowFlags flags /* = 0 */)
+    :QIDialog(pParent, flags)
+{
+    QVBoxLayout *layout = new QVBoxLayout(this);
+    m_pLineEdit = new QILineEdit(this);
+    layout->addWidget(m_pLineEdit);
+
+    QIDialogButtonBox *pButtonBox =
+        new QIDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, this);
+    layout->addWidget(pButtonBox);
+        // {
+        //     /* Configure button-box: */
+    connect(pButtonBox, &QIDialogButtonBox::accepted, this, &UIStringInputDialog::accept);
+    connect(pButtonBox, &QIDialogButtonBox::rejected, this, &UIStringInputDialog::reject);
+
+}
+
+QString UIStringInputDialog::getString() const
+{
+    if (!m_pLineEdit)
+        return QString();
+    return m_pLineEdit->text();
+}
+
+
+/*********************************************************************************************************************************
+*   UIFileTableItem implementation.                                                                                              *
+*********************************************************************************************************************************/
+
+
 UIFileTableItem::UIFileTableItem(const QList<QVariant> &data, bool isDirectory, UIFileTableItem *parent)
     : m_itemData(data)
@@ -306 +372 @@
         if (item->isUpDirectory() && index.column() != 0)
             return QVariant();
+        /* Format date/time column: */
+        if (item->data(index.column()).canConvert(QMetaType::QDateTime))
+        {
+            QDateTime dateTime = item->data(index.column()).toDateTime();
+            if (dateTime.isValid())
+                return dateTime.toString("dd.MM.yyyy hh:mm:ss");
+        }
         return item->data(index.column());
     }
@@ -430 +503 @@
 {
     endResetModel();
+}
+
+bool UIGuestControlFileModel::insertRows(int position, int rows, const QModelIndex &parent)
+{
+    UIFileTableItem *parentItem = static_cast<UIFileTableItem*>(parent.internalPointer());
+
+    if (!parentItem)
+        return false;
+    beginInsertRows(parent, position, position + rows -1);
+
+    QList<QVariant> data;
+    data << "New Item" << 0 << QDateTime::currentDateTime();
+    UIFileTableItem *newItem = new UIFileTableItem(data, true, parentItem);
+    parentItem->appendChild(newItem);
+    endInsertRows();
+
+    return true;
 }
 
@@ -452 +542 @@
     , m_pDelete(0)
     , m_pRename(0)
-    , m_pNewFolder(0)
+    , m_pCreateNewDirectory(0)
     , m_pCopy(0)
     , m_pCut(0)
@@ -586 +676 @@
     }
 
-    m_pNewFolder = new QAction(this);
-    if (m_pNewFolder)
-    {
-        m_pNewFolder->setIcon(UIIconPool::iconSet(QString(":/sf_32px.png")));
-        m_pToolBar->addAction(m_pNewFolder);
-        m_pNewFolder->setEnabled(false);
+    m_pCreateNewDirectory = new QAction(this);
+    if (m_pCreateNewDirectory)
+    {
+        connect(m_pCreateNewDirectory, &QAction::triggered, this, &UIGuestControlFileTable::sltCreateNewDirectory);
+        m_pCreateNewDirectory->setIcon(UIIconPool::iconSet(QString(":/sf_32px.png")));
+        m_pToolBar->addAction(m_pCreateNewDirectory);
     }
 
@@ -812 +902 @@
         deleteByIndex(selectedItemIndices.at(i));
     }
+    /** @todo dont refresh here, just delete the rows and update the table view: */
     refresh();
 }
@@ -830 +921 @@
         return;
     m_pView->edit(selectedItemIndices.at(0));
-
-}
+}
+
+void UIGuestControlFileTable::sltCreateNewDirectory()
+{
+    if (!m_pModel || !m_pView)
+        return;
+    QModelIndex currentIndex = m_pView->rootIndex();
+    if (!currentIndex.isValid())
+        return;
+    UIFileTableItem *item = static_cast<UIFileTableItem*>(currentIndex.internalPointer());
+    if (!item)
+        return;
+
+    QString newDirectoryName = getNewDirectoryName();
+    if (newDirectoryName.isEmpty())
+        return;
+
+    if (createDirectory(item->path(), newDirectoryName))
+    {
+        /** @todo instead of refreshing here (an overkill) just add the
+           rows and update the tabel view: */
+        sltRefresh();
+    }
+
+}
+
 
 void UIGuestControlFileTable::deleteByIndex(const QModelIndex &itemIndex)
@@ -852 +967 @@
     if (m_pGoHome)
     {
-        m_pGoHome->setText(UIVMInformationDialog::tr("Go to home folder"));
-        m_pGoHome->setToolTip(UIVMInformationDialog::tr("Go to home folder"));
-        m_pGoHome->setStatusTip(UIVMInformationDialog::tr("Go to home folder"));
+        m_pGoHome->setText(UIVMInformationDialog::tr("Go to home directory"));
+        m_pGoHome->setToolTip(UIVMInformationDialog::tr("Go to home directory"));
+        m_pGoHome->setStatusTip(UIVMInformationDialog::tr("Go to home directory"));
     }
 
@@ -877 +992 @@
     }
 
-    if (m_pNewFolder)
-    {
-        m_pNewFolder->setText(UIVMInformationDialog::tr("Create a new folder"));
-        m_pNewFolder->setToolTip(UIVMInformationDialog::tr("Create a new folder"));
-        m_pNewFolder->setStatusTip(UIVMInformationDialog::tr("Create a new folder"));
+    if (m_pCreateNewDirectory)
+    {
+        m_pCreateNewDirectory->setText(UIVMInformationDialog::tr("Create a new directory"));
+        m_pCreateNewDirectory->setToolTip(UIVMInformationDialog::tr("Create a new directory"));
+        m_pCreateNewDirectory->setStatusTip(UIVMInformationDialog::tr("Create a new directory"));
 
     }
@@ -927 +1042 @@
         }
     }
-    else if(pEvent->key() == Qt::Key_Delete)
+    else if (pEvent->key() == Qt::Key_Delete)
     {
         sltDelete();
@@ -958 +1073 @@
 }
 
+QString UIGuestControlFileTable::mergePaths(const QString &path, const QString &baseName)
+{
+    QString newPath(path);
+    /* make sure we have a trailing '/': */
+    if (newPath.at(newPath.length() - 1) != QChar('/'))
+        newPath += QChar('/');
+    newPath += baseName;
+    return newPath;
+}
+
+QString UIGuestControlFileTable::getNewDirectoryName()
+{
+    UIStringInputDialog *dialog = new UIStringInputDialog();
+    if (dialog->execute())
+    {
+        QString strDialog = dialog->getString();
+        delete dialog;
+        return strDialog;
+    }
+    delete dialog;
+    return QString();
+}
+
 
 /*********************************************************************************************************************************
@@ -1012 +1150 @@
         {
             QList<QVariant> data;
-            QDateTime changeTime = QDateTime::fromMSecsSinceEpoch(fsInfo.GetChangeTime()/1000);
+            QDateTime changeTime = QDateTime::fromMSecsSinceEpoch(fsInfo.GetChangeTime()/1000000);
+
             data << fsInfo.GetName() << static_cast<qulonglong>(fsInfo.GetObjectSize()) << changeTime;
             bool isDirectory = (fsInfo.GetType() == KFsObjType_Directory);
@@ -1081 +1220 @@
 }
 
+bool UIGuestFileTable::createDirectory(const QString &path, const QString &directoryName)
+{
+    if (!m_comGuestSession.isOk())
+        return false;
+
+    QString newDirectoryPath = mergePaths(path, directoryName);
+    QVector<KDirectoryCreateFlag> flags(KDirectoryCreateFlag_None);
+
+    m_comGuestSession.DirectoryCreate(newDirectoryPath, 777/*aMode*/, flags);
+    if (!m_comGuestSession.isOk())
+    {
+        emit sigLogOutput(newDirectoryPath.append(" could not be created"));
+        return false;
+    }
+    emit sigLogOutput(newDirectoryPath.append(" has been created"));
+    return true;
+}
+
 
 /*********************************************************************************************************************************
@@ -1160 +1317 @@
 void UIHostFileTable::goToHomeDirectory()
 {
-    if(!m_pRootItem || m_pRootItem->childCount() <= 0)
+    if (!m_pRootItem || m_pRootItem->childCount() <= 0)
         return;
     UIFileTableItem *startDirItem = m_pRootItem->child(0);
@@ -1187 +1344 @@
 }
 
+bool UIHostFileTable::createDirectory(const QString &path, const QString &directoryName)
+{
+    QDir parentDir(path);
+    if (!parentDir.mkdir(directoryName))
+    {
+        emit sigLogOutput(mergePaths(path, directoryName).append(" could not be created"));
+        return false;
+    }
+
+    return true;
+}
 
 #include "UIGuestControlFileTable.moc"

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

@@ -72 +72 @@
     void beginReset();
     void endReset();
+    bool insertRows(int position, int rows, const QModelIndex &parent);
 
 private:
@@ -115 +116 @@
     virtual void goToHomeDirectory() = 0;
     virtual bool renameItem(UIFileTableItem *item, QString newBaseName) = 0;
+    virtual bool createDirectory(const QString &path, const QString &directoryName) = 0;
     void             goIntoDirectory(const QModelIndex &itemIndex);
     /** Follow the path trail, open directories as we go and descend */
@@ -125 +127 @@
     /** Replace the last part of the @p previusPath with newBaseName */
     QString constructNewItemPath(const QString &previousPath, const QString &newBaseName);
+    QString mergePaths(const QString &Path, const QString &baseName);
 
     UIFileTableItem         *m_pRootItem;
@@ -144 +147 @@
     void sltDelete();
     void sltRename();
+    void sltCreateNewDirectory();
 
 private:
@@ -152 +156 @@
     /** Return the UIFileTableItem for path / which is a direct (and single) child of m_pRootItem */
     UIFileTableItem *getStartDirectoryItem();
-
+    /** Shows a modal dialog with a line edit for user to enter a new directory name and return the entered string*/
+    QString         getNewDirectoryName();
     QGridLayout     *m_pMainLayout;
     QILineEdit      *m_pCurrentLocationEdit;
@@ -161 +166 @@
     QAction         *m_pDelete;
     QAction         *m_pRename;
-    QAction         *m_pNewFolder;
+    QAction         *m_pCreateNewDirectory;
 
     QAction         *m_pCopy;
@@ -188 +193 @@
     virtual void goToHomeDirectory() /* override */;
     virtual bool renameItem(UIFileTableItem *item, QString newBaseName);
+    virtual bool createDirectory(const QString &path, const QString &directoryName);
 
 private:
@@ -213 +219 @@
     virtual void goToHomeDirectory() /* override */;
     virtual bool renameItem(UIFileTableItem *item, QString newBaseName);
+    virtual bool createDirectory(const QString &path, const QString &directoryName);
 };