Changeset 75480 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 15, 2018 12:26:08 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699. Misc. improvements in guest control file manager

Location:

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl

Files:

• UIGuestControlFileManager.cpp (modified) (5 diffs)
• UIGuestControlFileManager.h (modified) (1 diff)
• UIGuestControlFileManagerOperationsPanel.cpp (modified) (1 diff)
• UIGuestControlFileManagerOperationsPanel.h (modified) (1 diff)
• UIGuestControlFileManagerSettingsPanel.cpp (modified) (5 diffs)
• UIGuestControlFileManagerSettingsPanel.h (modified) (3 diffs)
• UIGuestControlFileModel.cpp (modified) (3 diffs)
• UIGuestControlFileModel.h (modified) (2 diffs)
• UIGuestControlFileTable.cpp (modified) (6 diffs)
• UIGuestControlFileTable.h (modified) (6 diffs)
• UIGuestFileTable.cpp (modified) (1 diff)
• UIHostFileTable.cpp (modified) (1 diff)

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

@@ -113 +113 @@
     : bListDirectoriesOnTop(true)
     , bAskDeleteConfirmation(false)
+    , bShowHumanReadableSizes(true)
 {
 }
@@ -255 +256 @@
     }
 
-    // m_pFileOperationsList = new UIFileOperationsList;
-    // if (m_pFileOperationsList)
-    // {
-    //     m_pTabWidget->addTab(m_pFileOperationsList, "File Operatiions");
-    //     m_pFileOperationsList->header()->hide();
-    // }
     pTopLayout->addLayout(pFileTableContainerLayout);
     m_pSessionPanel = new UIGuestControlFileManagerSessionPanel(this /* manager dialog */, 0 /*parent */);
@@ -277 +272 @@
         m_pSettingsPanel->hide();
         m_panelActionMap.insert(m_pSettingsPanel, m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_T_Settings));
-        connect(m_pSettingsPanel, &UIGuestControlFileManagerSettingsPanel::sigListDirectoriesFirstChanged,
+        connect(m_pSettingsPanel, &UIGuestControlFileManagerSettingsPanel::sigSettingsChanged,
                 this, &UIGuestControlFileManager::sltListDirectoriesBeforeChanged);
         pTopLayout->addWidget(m_pSettingsPanel);
     }
+
+    m_pVerticalSplitter->addWidget(pTopWidget);
 
     m_pOperationsPanel =
@@ -288 +285 @@
         m_pOperationsPanel->hide();
         m_panelActionMap.insert(m_pOperationsPanel, m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_T_FileOperations));
-        pTopLayout->addWidget(m_pOperationsPanel);
-    }
-
-    m_pVerticalSplitter->addWidget(pTopWidget);
+    }
 
     m_pLogPanel = new UIGuestControlFileManagerLogPanel(this /* manager dialog */, 0 /*parent */);
@@ -299 +293 @@
         m_panelActionMap.insert(m_pLogPanel, m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_T_Log));
     }
+
     m_pVerticalSplitter->addWidget(pTopWidget);
+    m_pVerticalSplitter->addWidget(m_pOperationsPanel);
     m_pVerticalSplitter->addWidget(m_pLogPanel);
     m_pVerticalSplitter->setCollapsible(m_pVerticalSplitter->indexOf(pTopWidget), false);
+    m_pVerticalSplitter->setCollapsible(m_pVerticalSplitter->indexOf(m_pOperationsPanel), false);
     m_pVerticalSplitter->setCollapsible(m_pVerticalSplitter->indexOf(m_pLogPanel), false);
     m_pVerticalSplitter->setStretchFactor(0, 3);
     m_pVerticalSplitter->setStretchFactor(1, 1);
+    m_pVerticalSplitter->setStretchFactor(2, 1);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.h

@@ -69 +69 @@
     bool bListDirectoriesOnTop;
     bool bAskDeleteConfirmation;
+    bool bShowHumanReadableSizes;
 
 private:

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerOperationsPanel.cpp

@@ -169 +169 @@
     if (m_pTableWidget)
     {
-        m_pTableWidget->setColumnCount(1);
+        m_pTableWidget->setColumnCount(TableColumn_Max);
+        QStringList headers;
+        headers << "Progress" << "Information";
+        m_pTableWidget->setHorizontalHeaderLabels(headers);
         mainLayout()->addWidget(m_pTableWidget);
     }

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerOperationsPanel.h

@@ -58 +58 @@
 private:
 
+    enum TableColumn
+    {
+        TableColumn_Progress,
+        TableColumn_Info,
+        TableColumn_Max
+    };
+
     /** @name Member variables.
       * @{ */

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerSettingsPanel.cpp

@@ -42 +42 @@
     , m_pListDirectoriesOnTopCheckBox(0)
     , m_pDeleteConfirmationCheckBox(0)
+    , m_pHumanReabableSizesCheckBox(0)
     , m_pFileManagerSettings(pFileManagerSettings)
 {
@@ -60 +61 @@
     if (m_pListDirectoriesOnTopCheckBox)
     {
-        m_pListDirectoriesOnTopCheckBox->setChecked(true);
         mainLayout()->addWidget(m_pListDirectoriesOnTopCheckBox, 0, Qt::AlignLeft);
     }
@@ -67 +67 @@
     if (m_pDeleteConfirmationCheckBox)
     {
-        m_pDeleteConfirmationCheckBox->setChecked(false);
         mainLayout()->addWidget(m_pDeleteConfirmationCheckBox, 0, Qt::AlignLeft);
     }
 
-
+    m_pHumanReabableSizesCheckBox = new QCheckBox;
+    if (m_pHumanReabableSizesCheckBox)
+    {
+        mainLayout()->addWidget(m_pHumanReabableSizesCheckBox, 0, Qt::AlignLeft);
+    }
+    /* Set initial checkbox status wrt. settings: */
+    if (m_pFileManagerSettings)
+    {
+        if (m_pListDirectoriesOnTopCheckBox)
+            m_pListDirectoriesOnTopCheckBox->setChecked(m_pFileManagerSettings->bListDirectoriesOnTop);
+        if (m_pDeleteConfirmationCheckBox)
+            m_pDeleteConfirmationCheckBox->setChecked(m_pFileManagerSettings->bAskDeleteConfirmation);
+        if (m_pHumanReabableSizesCheckBox)
+            m_pHumanReabableSizesCheckBox->setChecked(m_pFileManagerSettings->bShowHumanReadableSizes);
+    }
     retranslateUi();
     mainLayout()->addStretch(2);
 }
 
-void UIGuestControlFileManagerSettingsPanel::sltListDirectoryCheckBoxToogled(bool fChecked)
+void UIGuestControlFileManagerSettingsPanel::sltListDirectoryCheckBoxToogled(bool bChecked)
 {
     if (!m_pFileManagerSettings)
         return;
-    m_pFileManagerSettings->bListDirectoriesOnTop = fChecked;
-    emit sigListDirectoriesFirstChanged();
+    m_pFileManagerSettings->bListDirectoriesOnTop = bChecked;
+    emit sigSettingsChanged();
+}
+
+void UIGuestControlFileManagerSettingsPanel::sltDeleteConfirmationCheckBoxToogled(bool bChecked)
+{
+    if (!m_pFileManagerSettings)
+        return;
+    m_pFileManagerSettings->bAskDeleteConfirmation = bChecked;
+    emit sigSettingsChanged();
+}
+
+void UIGuestControlFileManagerSettingsPanel::sltHumanReabableSizesCheckBoxToogled(bool bChecked)
+{
+    if (!m_pFileManagerSettings)
+        return;
+    m_pFileManagerSettings->bShowHumanReadableSizes = bChecked;
+    emit sigSettingsChanged();
 }
 
@@ -89 +118 @@
         connect(m_pListDirectoriesOnTopCheckBox, &QCheckBox::toggled,
                 this, &UIGuestControlFileManagerSettingsPanel::sltListDirectoryCheckBoxToogled);
+    if (m_pDeleteConfirmationCheckBox)
+        connect(m_pDeleteConfirmationCheckBox, &QCheckBox::toggled,
+                this, &UIGuestControlFileManagerSettingsPanel::sltDeleteConfirmationCheckBoxToogled);
+    if (m_pHumanReabableSizesCheckBox)
+        connect(m_pHumanReabableSizesCheckBox, &QCheckBox::toggled,
+                this, &UIGuestControlFileManagerSettingsPanel::sltHumanReabableSizesCheckBoxToogled);
 }
 
@@ -94 +129 @@
 {
     UIGuestControlFileManagerPanel::retranslateUi();
+    if (m_pListDirectoriesOnTopCheckBox)
+    {
+        m_pListDirectoriesOnTopCheckBox->setText(UIGuestControlFileManager::tr("List directories on top"));
+        m_pListDirectoriesOnTopCheckBox->setToolTip(UIGuestControlFileManager::tr("List directories before files"));
+    }
 
-    m_pListDirectoriesOnTopCheckBox->setText(UIGuestControlFileManager::tr("List directories on top"));
-    m_pListDirectoriesOnTopCheckBox->setToolTip(UIGuestControlFileManager::tr("List directories before files"));
+    if (m_pDeleteConfirmationCheckBox)
+    {
+        m_pDeleteConfirmationCheckBox->setText(UIGuestControlFileManager::tr("Ask before delete"));
+        m_pDeleteConfirmationCheckBox->setToolTip(UIGuestControlFileManager::tr("List directories before files"));
+    }
 
-    m_pDeleteConfirmationCheckBox->setText(UIGuestControlFileManager::tr("Ask before delete"));
-    m_pDeleteConfirmationCheckBox->setToolTip(UIGuestControlFileManager::tr("List directories before files"));
+    if (m_pHumanReabableSizesCheckBox)
+    {
+        m_pHumanReabableSizesCheckBox->setText(UIGuestControlFileManager::tr("Human readable sizes"));
+        m_pHumanReabableSizesCheckBox->setToolTip(UIGuestControlFileManager::tr("List directories before files"));
+    }
 }

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerSettingsPanel.h

@@ -42 +42 @@
 signals:
 
-    void sigListDirectoriesFirstChanged();
+    void sigSettingsChanged();
 
 protected:
@@ -54 +54 @@
 private slots:
 
-    void sltListDirectoryCheckBoxToogled(bool fChecked);
+    void sltListDirectoryCheckBoxToogled(bool bChecked);
+    void sltDeleteConfirmationCheckBoxToogled(bool bChecked);
+    void sltHumanReabableSizesCheckBoxToogled(bool bChecked);
 
 private:
@@ -60 +62 @@
     QCheckBox                         *m_pListDirectoriesOnTopCheckBox;
     QCheckBox                         *m_pDeleteConfirmationCheckBox;
+    QCheckBox                         *m_pHumanReabableSizesCheckBox;
+
     UIGuestControlFileManagerSettings *m_pFileManagerSettings;
 };

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileModel.cpp

@@ -131 +131 @@
     {
         /* dont show anything but the name for up directories: */
-        if (item->isUpDirectory() && index.column() != 0)
+        if (item->isUpDirectory() && index.column() != UIGuestControlFileModelColumn_Name)
             return QVariant();
         /* Format date/time column: */
@@ -140 +140 @@
                 return dateTime.toString("dd.MM.yyyy hh:mm:ss");
         }
+        /* Decide whether to show human-readable file object sizes: */
+        if (index.column() == UIGuestControlFileModelColumn_Size)
+        {
+            UIGuestControlFileManagerSettings* pSettings =
+                UIGuestControlFileManagerSettings::instance();
+            if (pSettings && pSettings->bShowHumanReadableSizes)
+            {
+                qulonglong size = item->data(index.column()).toULongLong();
+                return UIGuestControlFileTable::humanReadableSize(size);
+            }
+            else
+                return item->data(index.column());
+        }
         return item->data(index.column());
     }
-
+    /* Show the up directory array: */
     if (role == Qt::DecorationRole && index.column() == 0)
     {
@@ -274 +287 @@
     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, parentItem, FileObjectType_Directory);
-    parentItem->appendChild(newItem);
-    endInsertRows();
-
-    return true;
-}

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileModel.h

@@ -29 +29 @@
 class UIFileTableItem;
 class UIGuestControlFileTable;
+
+enum UIGuestControlFileModelColumn
+{
+    UIGuestControlFileModelColumn_Name = 0,
+    UIGuestControlFileModelColumn_Size,
+    UIGuestControlFileModelColumn_ChangeTime,
+    UIGuestControlFileModelColumn_Owner,
+    UIGuestControlFileModelColumn_Permissions,
+    UIGuestControlFileModelColumn_Max
+};
 
 /** A QSortFilterProxyModel extension used in file tables. Modifies some
@@ -77 +87 @@
     void           beginReset();
     void           endReset();
-    bool           insertRows(int position, int rows, const QModelIndex &parent);
     static const char* strUpDirectoryString;
 

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

@@ -432 +432 @@
 *********************************************************************************************************************************/
 
-UIFileTableItem::UIFileTableItem(const QList<QVariant> &data,
+UIFileTableItem::UIFileTableItem(const QVector<QVariant> &data,
                                  UIFileTableItem *parent, FileObjectType type)
     : m_itemData(data)
@@ -756 +756 @@
     /* Root item: */
     const QString startPath("/");
-    QList<QVariant> headData;
-    headData << "Name" << "Size" << "Change Time" << "Owner" << "Permissions";
+    QVector<QVariant> headData;
+    headData.resize(UIGuestControlFileModelColumn_Max);
+    headData[UIGuestControlFileModelColumn_Name] = "Name";
+    headData[UIGuestControlFileModelColumn_Size] = "Size";
+    headData[UIGuestControlFileModelColumn_ChangeTime] = "Change Time";
+    headData[UIGuestControlFileModelColumn_Owner] = "Owner";
+    headData[UIGuestControlFileModelColumn_Permissions] = "Permissions";
     m_pRootItem = new UIFileTableItem(headData, 0, FileObjectType_Directory);
-    QList<QVariant> startDirData;
-    startDirData << startPath << 4096 << QDateTime() << "" << "";
-    UIFileTableItem* startItem = new UIFileTableItem(startDirData, m_pRootItem, FileObjectType_Directory);
-
+    UIFileTableItem* startItem = new UIFileTableItem(createTreeItemData(startPath, 4096, QDateTime(),
+                                                                        "" /* owner */, "" /* permissions */),
+                                                     m_pRootItem, FileObjectType_Directory);
     startItem->setPath(startPath);
     m_pRootItem->appendChild(startItem);
@@ -785 +789 @@
         for (int i = 0; i < m_driveLetterList.size(); ++i)
         {
-            QList<QVariant> data;
-
-            data << m_driveLetterList[i] << 4096 << QDateTime() << "";
-            UIFileTableItem* driveItem = new UIFileTableItem(data, startItem, FileObjectType_Directory);
+            UIFileTableItem* driveItem = new UIFileTableItem(createTreeItemData(m_driveLetterList[i], 4096,
+                                                                                QDateTime(), QString(), QString()),
+                                                             startItem, FileObjectType_Directory);
             driveItem->setPath(m_driveLetterList[i]);
             startItem->appendChild(driveItem);
@@ -808 +811 @@
         if (!map.contains(UIGuestControlFileModel::strUpDirectoryString)  && !isStartDir)
         {
-            QList<QVariant> data;
-            data << UIGuestControlFileModel::strUpDirectoryString << 4096 << "";
-            UIFileTableItem *item = new UIFileTableItem(data, parent, FileObjectType_Directory);
+            QVector<QVariant> data;
+            UIFileTableItem *item = new UIFileTableItem(createTreeItemData(UIGuestControlFileModel::strUpDirectoryString, 4096,
+                                                                           QDateTime(), QString(), QString())
+                                                        , parent, FileObjectType_Directory);
             item->setIsOpened(false);
             map.insert(UIGuestControlFileModel::strUpDirectoryString, item);
@@ -1299 +1303 @@
 }
 
+
+QVector<QVariant> UIGuestControlFileTable::createTreeItemData(const QString &strName, ULONG64 size, const QDateTime &changeTime,
+                                                            const QString &strOwner, const QString &strPermissions)
+{
+    QVector<QVariant> data;
+    data.resize(UIGuestControlFileModelColumn_Max);
+    data[UIGuestControlFileModelColumn_Name]        = strName;
+    data[UIGuestControlFileModelColumn_Size]        = (qulonglong)size;
+    data[UIGuestControlFileModelColumn_ChangeTime]  = changeTime;
+    data[UIGuestControlFileModelColumn_Owner]       = strOwner;
+    data[UIGuestControlFileModelColumn_Permissions] = strPermissions;
+    return data;
+}
+
 QString UIGuestControlFileTable::fileTypeString(FileObjectType type)
 {
@@ -1395 +1413 @@
     m_pSearchLineEdit->blockSignals(false);
 }
+
 #include "UIGuestControlFileTable.moc"

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

@@ -168 +168 @@
      *  the name of the file object which is the file name including extension or name of the
      *  directory */
-    explicit UIFileTableItem(const QList<QVariant> &data,
+    explicit UIFileTableItem(const QVector<QVariant> &data,
                              UIFileTableItem *parentItem, FileObjectType type);
     ~UIFileTableItem();
@@ -220 +220 @@
     QMap<QString, UIFileTableItem*> m_childMap;
     /** It is required that m_itemData[0] is name (QString) of the file object */
-    QList<QVariant>  m_itemData;
+    QVector<QVariant>  m_itemData;
     UIFileTableItem *m_parentItem;
     bool             m_bIsOpened;
@@ -263 +263 @@
     static QString humanReadableSize(ULONG64 size);
 
+public slots:
+
+    void sltReceiveDirectoryStatistics(UIDirectoryStatistics statictics);
+    void sltCreateNewDirectory();
+    /* index is passed by the item view and represents the double clicked object's 'proxy' model index */
+    void sltItemDoubleClicked(const QModelIndex &index);
+    void sltItemClicked(const QModelIndex &index);
+    void sltGoUp();
+    void sltGoHome();
+    void sltRefresh();
+    void sltDelete();
+    void sltRename();
+    void sltCopy();
+    void sltCut();
+    void sltPaste();
+    void sltShowProperties();
+    void sltSelectAll();
+    void sltInvertSelection();
 
 protected:
@@ -296 +314 @@
     CGuestFsObjInfo  guestFsObjectInfo(const QString& path, CGuestSession &comGuestSession) const;
     void             setSelectionDependentActionsEnabled(bool fIsEnabled);
+    /** Creates a QList out of the parameters wrt. UIGuestControlFileModelColumn enum */
+    QVector<QVariant>  createTreeItemData(const QString &strName, ULONG64 size, const QDateTime &changeTime,
+                                        const QString &strOwner, const QString &strPermissions);
 
     UIFileTableItem         *m_pRootItem;
@@ -308 +329 @@
     /** The set of actions which need some selection to work on. Like cut, copy etc. */
     QSet<QAction*> m_selectionDependentActions;
-
-public slots:
-
-    void sltReceiveDirectoryStatistics(UIDirectoryStatistics statictics);
-    void sltCreateNewDirectory();
-    /* index is passed by the item view and represents the double clicked object's 'proxy' model index */
-    void sltItemDoubleClicked(const QModelIndex &index);
-    void sltItemClicked(const QModelIndex &index);
-    void sltGoUp();
-    void sltGoHome();
-    void sltRefresh();
-    void sltDelete();
-    void sltRename();
-    void sltCopy();
-    void sltCut();
-    void sltPaste();
-    void sltShowProperties();
-    void sltSelectAll();
-    void sltInvertSelection();
 
 private slots:
@@ -353 +355 @@
     /* Searches the content of m_pSearchLineEdit within the current items' names and selects the item if found. */
     void            performSelectionSearch(const QString &strSearchText);
-    /* Clears the m_pSearchLineEdit and hides it. */
+    /** Clears the m_pSearchLineEdit and hides it. */
     void            disableSelectionSearch();
-
     UIGuestControlFileModel      *m_pModel;
     UIGuestControlFileView       *m_pView;

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

@@ -197 +197 @@
         while (fsInfo.isOk())
         {
-            QList<QVariant> data;
+            QVector<QVariant> data;
             QDateTime changeTime = QDateTime::fromMSecsSinceEpoch(fsInfo.GetChangeTime()/1000000);
 

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

@@ -221 +221 @@
 
         const QFileInfo &fileInfo = entries.at(i);
-        QList<QVariant> data;
-        data << fileInfo.fileName() << fileInfo.size()
-             << fileInfo.lastModified() << fileInfo.owner() <<
-            permissionString(fileInfo.permissions());
-        UIFileTableItem *item = new UIFileTableItem(data, parent, fileType(fileInfo));
+        UIFileTableItem *item = new UIFileTableItem(createTreeItemData(fileInfo.fileName(), fileInfo.size(),
+                                                                       fileInfo.lastModified(), fileInfo.owner(),
+                                                                       permissionString(fileInfo.permissions())),
+                                                    parent, fileType(fileInfo));
         if (!item)
             continue;