Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.cpp (revision 75479) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.cpp (revision 75480) @@ -113,4 +113,5 @@ : bListDirectoriesOnTop(true) , bAskDeleteConfirmation(false) + , bShowHumanReadableSizes(true) { } @@ -255,10 +256,4 @@ } - // 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,8 +272,10 @@ 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,8 +285,5 @@ 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,10 +293,14 @@ 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); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.h (revision 75479) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.h (revision 75480) @@ -69,4 +69,5 @@ bool bListDirectoriesOnTop; bool bAskDeleteConfirmation; + bool bShowHumanReadableSizes; private: Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerOperationsPanel.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerOperationsPanel.cpp (revision 75479) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerOperationsPanel.cpp (revision 75480) @@ -169,5 +169,8 @@ 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); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerOperationsPanel.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerOperationsPanel.h (revision 75479) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerOperationsPanel.h (revision 75480) @@ -58,4 +58,11 @@ private: + enum TableColumn + { + TableColumn_Progress, + TableColumn_Info, + TableColumn_Max + }; + /** @name Member variables. * @{ */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerSettingsPanel.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerSettingsPanel.cpp (revision 75479) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerSettingsPanel.cpp (revision 75480) @@ -42,4 +42,5 @@ , m_pListDirectoriesOnTopCheckBox(0) , m_pDeleteConfirmationCheckBox(0) + , m_pHumanReabableSizesCheckBox(0) , m_pFileManagerSettings(pFileManagerSettings) { @@ -60,5 +61,4 @@ if (m_pListDirectoriesOnTopCheckBox) { - m_pListDirectoriesOnTopCheckBox->setChecked(true); mainLayout()->addWidget(m_pListDirectoriesOnTopCheckBox, 0, Qt::AlignLeft); } @@ -67,19 +67,48 @@ 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,4 +118,10 @@ 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,9 +129,20 @@ { 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")); + } } Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerSettingsPanel.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerSettingsPanel.h (revision 75479) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManagerSettingsPanel.h (revision 75480) @@ -42,5 +42,5 @@ signals: - void sigListDirectoriesFirstChanged(); + void sigSettingsChanged(); protected: @@ -54,5 +54,7 @@ private slots: - void sltListDirectoryCheckBoxToogled(bool fChecked); + void sltListDirectoryCheckBoxToogled(bool bChecked); + void sltDeleteConfirmationCheckBoxToogled(bool bChecked); + void sltHumanReabableSizesCheckBoxToogled(bool bChecked); private: @@ -60,4 +62,6 @@ QCheckBox *m_pListDirectoriesOnTopCheckBox; QCheckBox *m_pDeleteConfirmationCheckBox; + QCheckBox *m_pHumanReabableSizesCheckBox; + UIGuestControlFileManagerSettings *m_pFileManagerSettings; }; Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileModel.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileModel.cpp (revision 75479) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileModel.cpp (revision 75480) @@ -131,5 +131,5 @@ { /* 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,7 +140,20 @@ 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,19 +287,2 @@ endResetModel(); } - -bool UIGuestControlFileModel::insertRows(int position, int rows, const QModelIndex &parent) -{ - UIFileTableItem *parentItem = static_cast(parent.internalPointer()); - - if (!parentItem) - return false; - beginInsertRows(parent, position, position + rows -1); - - QList data; - data << "New Item" << 0 << QDateTime::currentDateTime(); - UIFileTableItem *newItem = new UIFileTableItem(data, parentItem, FileObjectType_Directory); - parentItem->appendChild(newItem); - endInsertRows(); - - return true; -} Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileModel.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileModel.h (revision 75479) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileModel.h (revision 75480) @@ -29,4 +29,14 @@ 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,5 +87,4 @@ void beginReset(); void endReset(); - bool insertRows(int position, int rows, const QModelIndex &parent); static const char* strUpDirectoryString; Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileTable.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileTable.cpp (revision 75479) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileTable.cpp (revision 75480) @@ -432,5 +432,5 @@ *********************************************************************************************************************************/ -UIFileTableItem::UIFileTableItem(const QList &data, +UIFileTableItem::UIFileTableItem(const QVector &data, UIFileTableItem *parent, FileObjectType type) : m_itemData(data) @@ -756,11 +756,15 @@ /* Root item: */ const QString startPath("/"); - QList headData; - headData << "Name" << "Size" << "Change Time" << "Owner" << "Permissions"; + QVector 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 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,8 +789,7 @@ for (int i = 0; i < m_driveLetterList.size(); ++i) { - QList 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,7 +811,8 @@ if (!map.contains(UIGuestControlFileModel::strUpDirectoryString) && !isStartDir) { - QList data; - data << UIGuestControlFileModel::strUpDirectoryString << 4096 << ""; - UIFileTableItem *item = new UIFileTableItem(data, parent, FileObjectType_Directory); + QVector data; + UIFileTableItem *item = new UIFileTableItem(createTreeItemData(UIGuestControlFileModel::strUpDirectoryString, 4096, + QDateTime(), QString(), QString()) + , parent, FileObjectType_Directory); item->setIsOpened(false); map.insert(UIGuestControlFileModel::strUpDirectoryString, item); @@ -1299,4 +1303,18 @@ } + +QVector UIGuestControlFileTable::createTreeItemData(const QString &strName, ULONG64 size, const QDateTime &changeTime, + const QString &strOwner, const QString &strPermissions) +{ + QVector 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,3 +1413,4 @@ m_pSearchLineEdit->blockSignals(false); } + #include "UIGuestControlFileTable.moc" Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileTable.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileTable.h (revision 75479) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileTable.h (revision 75480) @@ -168,5 +168,5 @@ * the name of the file object which is the file name including extension or name of the * directory */ - explicit UIFileTableItem(const QList &data, + explicit UIFileTableItem(const QVector &data, UIFileTableItem *parentItem, FileObjectType type); ~UIFileTableItem(); @@ -220,5 +220,5 @@ QMap m_childMap; /** It is required that m_itemData[0] is name (QString) of the file object */ - QList m_itemData; + QVector m_itemData; UIFileTableItem *m_parentItem; bool m_bIsOpened; @@ -263,4 +263,22 @@ 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,4 +314,7 @@ CGuestFsObjInfo guestFsObjectInfo(const QString& path, CGuestSession &comGuestSession) const; void setSelectionDependentActionsEnabled(bool fIsEnabled); + /** Creates a QList out of the parameters wrt. UIGuestControlFileModelColumn enum */ + QVector createTreeItemData(const QString &strName, ULONG64 size, const QDateTime &changeTime, + const QString &strOwner, const QString &strPermissions); UIFileTableItem *m_pRootItem; @@ -308,23 +329,4 @@ /** The set of actions which need some selection to work on. Like cut, copy etc. */ QSet 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,7 +355,6 @@ /* 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; Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestFileTable.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestFileTable.cpp (revision 75479) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestFileTable.cpp (revision 75480) @@ -197,5 +197,5 @@ while (fsInfo.isOk()) { - QList data; + QVector data; QDateTime changeTime = QDateTime::fromMSecsSinceEpoch(fsInfo.GetChangeTime()/1000000); Index: /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIHostFileTable.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIHostFileTable.cpp (revision 75479) +++ /trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIHostFileTable.cpp (revision 75480) @@ -221,9 +221,8 @@ const QFileInfo &fileInfo = entries.at(i); - QList 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;