Changeset 74947 in vbox

Timestamp:

Oct 19, 2018 3:03:34 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699. Improving sort/filter functionality of the guest control file manager

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• guestctrl/UIGuestControlFileManager.cpp (modified) (5 diffs)
• guestctrl/UIGuestControlFileManager.h (modified) (3 diffs)
• guestctrl/UIGuestControlFileModel.cpp (modified) (2 diffs)
• guestctrl/UIGuestControlFileModel.h (modified) (1 diff)
• guestctrl/UIGuestFileTable.cpp (modified) (1 diff)
• guestctrl/UIGuestFileTable.h (modified) (2 diffs)
• guestctrl/UIHostFileTable.h (modified) (2 diffs)
• information/UIVMInformationDialog.cpp (modified) (1 diff)

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

@@ -58 +58 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
+UIGuestControlFileManagerSettings *UIGuestControlFileManagerSettings::m_pInstance = 0;
+
+UIGuestControlFileManagerSettings* UIGuestControlFileManagerSettings::instance()
+{
+    return m_pInstance;
+}
+
+void UIGuestControlFileManagerSettings::create()
+{
+    if (m_pInstance)
+        return;
+    m_pInstance = new UIGuestControlFileManagerSettings;
+}
+
+void UIGuestControlFileManagerSettings::destroy()
+{
+    delete m_pInstance;
+}
+
+UIGuestControlFileManagerSettings::UIGuestControlFileManagerSettings()
+    : bListDirectoriesOnTop(true)
+{
+}
+
 /*********************************************************************************************************************************
 *   UIFileOperationsList definition.                                                                                   *
@@ -284 +308 @@
     retranslateUi();
     loadSettings();
+    UIGuestControlFileManagerSettings::create();
 }
 
@@ -293 +318 @@
         cleanupListener(m_pQtSessionListener, m_comSessionListener, m_comGuestSession.GetEventSource());
     saveSettings();
+    UIGuestControlFileManagerSettings::destroy();
 }
 
@@ -364 +390 @@
             m_pFileTableContainerLayout->setSpacing(0);
             m_pFileTableContainerLayout->setContentsMargins(0, 0, 0, 0);
-            m_pGuestFileTable = new UIGuestFileTable;
+            m_pGuestFileTable = new  UIGuestFileTable;
             m_pGuestFileTable->setEnabled(false);
 
@@ -713 +739 @@
 
 #include "UIGuestControlFileManager.moc"
-

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

@@ -48 +48 @@
 class UIToolBar;
 
+class UIGuestControlFileManagerSettings
+{
+public:
+    static UIGuestControlFileManagerSettings* instance();
+    static void create();
+    static void destroy();
+
+    bool bListDirectoriesOnTop;
+private:
+    UIGuestControlFileManagerSettings();
+
+
+    static UIGuestControlFileManagerSettings *m_pInstance;
+};
 
 /** A QWidget extension. it includes a QWidget extension for initiating a guest session
@@ -60 +74 @@
     UIGuestControlFileManager(QWidget *pParent, const CGuest &comGuest);
     ~UIGuestControlFileManager();
+    //const UIGuestControlFileManagerSettings& settings() const;
 
 protected:
@@ -127 +142 @@
     CEventListener m_comSessionListener;
     CEventListener m_comGuestListener;
+    //UIGuestControlFileManagerSettings m_settings;
 };
 

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

@@ -28 +28 @@
 # include "UIGuestControlFileModel.h"
 # include "UIGuestControlFileTable.h"
+# include "UIGuestControlFileManager.h"
 
 
@@ -41 +42 @@
 bool UIGuestControlFileProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
 {
-    QVariant leftData = sourceModel()->data(left);
-    QVariant rightData = sourceModel()->data(right);
-
-    if (leftData.canConvert(QMetaType::QString) && rightData.canConvert(QMetaType::QString))
-    {
-
-        if (leftData == UIGuestControlFileModel::strUpDirectoryString)
+    UIFileTableItem *pLeftItem = static_cast<UIFileTableItem*>(left.internalPointer());
+    UIFileTableItem *pRightItem = static_cast<UIFileTableItem*>(right.internalPointer());
+
+    UIGuestControlFileManagerSettings *settings = UIGuestControlFileManagerSettings::instance();
+
+    if (pLeftItem && pRightItem)
+    {
+        /* List the directories before the files if settings say so: */
+        if (settings && settings->bListDirectoriesOnTop)
+        {
+            if (pLeftItem->isDirectory() && !pRightItem->isDirectory())
+                return true && (sortOrder() == Qt::AscendingOrder);
+            if (!pLeftItem->isDirectory() && pRightItem->isDirectory())
+                return false && (sortOrder() == Qt::AscendingOrder);
+        }
+        /* Up directory item should be always the first item: */
+        if (pLeftItem->isUpDirectory())
             return true && (sortOrder() == Qt::AscendingOrder);
-        else if (rightData == UIGuestControlFileModel::strUpDirectoryString)
+        else if (pRightItem->isUpDirectory())
             return false && (sortOrder() == Qt::AscendingOrder);
     }
-
     return QSortFilterProxyModel::lessThan(left, right);
 }

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

@@ -61 +61 @@
     ~UIGuestControlFileModel();
 
-    QVariant data(const QModelIndex &index, int role) const /* override */;
-    bool setData(const QModelIndex &index, const QVariant &value, int role);
+    QVariant       data(const QModelIndex &index, int role) const /* override */;
+    bool           setData(const QModelIndex &index, const QVariant &value, int role);
 
-    Qt::ItemFlags flags(const QModelIndex &index) const /* override */;
-    QVariant headerData(int section, Qt::Orientation orientation,
+    Qt::ItemFlags  flags(const QModelIndex &index) const /* override */;
+    QVariant       headerData(int section, Qt::Orientation orientation,
     int role = Qt::DisplayRole) const /* override */;
-    QModelIndex index(int row, int column,
+    QModelIndex    index(int row, int column,
                       const QModelIndex &parent = QModelIndex()) const /* override */;
-    QModelIndex index(UIFileTableItem* item);
-    QModelIndex parent(const QModelIndex &index) const /* override */;
-    int rowCount(const QModelIndex &parent = QModelIndex()) const /* override */;
-    int columnCount(const QModelIndex &parent = QModelIndex()) const /* override */;
-    void signalUpdate();
-    QModelIndex rootIndex() const;
-    void beginReset();
-    void endReset();
-    bool insertRows(int position, int rows, const QModelIndex &parent);
+    QModelIndex    index(UIFileTableItem* item);
+    QModelIndex    parent(const QModelIndex &index) const /* override */;
+    int            rowCount(const QModelIndex &parent = QModelIndex()) const /* override */;
+    int            columnCount(const QModelIndex &parent = QModelIndex()) const /* override */;
+    void           signalUpdate();
+    QModelIndex    rootIndex() const;
+    void           beginReset();
+    void           endReset();
+    bool           insertRows(int position, int rows, const QModelIndex &parent);
     static const char* strUpDirectoryString;
 

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIGuestControlFileTable class implementation.
+ * VBox Qt GUI - UIGuestFileTable class implementation.
  */
 

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIGuestControlFileTable class declaration.
+ * VBox Qt GUI - UIGuestFileTable class declaration.
  */
 
@@ -62 +62 @@
 };
 
-#endif /* !___UIGuestControlFileTable_h___ */
+#endif /* !___UIGuestFileTable_h___ */

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UIGuestControlFileTable class declaration.
+ * VBox Qt GUI - UIHostFileTable class declaration.
  */
 
@@ -51 +51 @@
 };
 
-#endif /* !___UIGuestControlFileTable_h___ */
+#endif /* !___UIHostFileTable_h___ */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.cpp

@@ -121 +121 @@
     m_pTabWidget->setTabText(0, tr("Configuration &Details"));
     m_pTabWidget->setTabText(1, tr("&Runtime Information"));
-    m_pTabWidget->setTabText(2, tr("&Guest Session Manager"));
-    m_pTabWidget->setTabText(3, tr("&Guest File Manager"));
+    m_pTabWidget->setTabText(2, tr("Guest &Session Manager"));
+    m_pTabWidget->setTabText(3, tr("Guest &File Manager"));
 }