Changeset 100300 in vbox

Timestamp:

Jun 27, 2023 2:44:16 PM (17 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9080. Build fix.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPool.cpp (modified) (2 diffs)
• globals/UIActionPool.h (modified) (1 diff)
• guestctrl/UIFileManagerTable.cpp (modified) (3 diffs)
• guestctrl/UIFileManagerTable.h (modified) (2 diffs)
• helpbrowser/UIHelpBrowserDialog.cpp (modified) (1 diff)
• medium/viso/UIVisoBrowserBase.cpp (modified) (1 diff)
• widgets/UIFileTableNavigationWidget.cpp (modified) (3 diffs)
• widgets/UIFileTableNavigationWidget.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp

@@ -1883 +1883 @@
 };
 
+/** Simple action extension, used as 'Perform GoForward' in file manager action class. */
+class UIActionMenuFileManagerGoForward : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuFileManagerGoForward(UIActionPool *pParent)
+        : UIActionSimple(pParent,
+                         ":/file_manager_go_home_24px.png", ":/file_manager_go_home_16px.png",
+                         ":/file_manager_go_home_disabled_24px.png", ":/file_manager_go_home_disabled_16px.png")
+    {}
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const RT_OVERRIDE
+    {
+        return QString("FileManagerGoForward");
+    }
+
+    /** Returns default shortcut. */
+    virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
+    {
+        return QKeySequence();
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() RT_OVERRIDE
+    {
+        setName(QApplication::translate("UIActionPool", "Go Forward"));
+        setShortcutScope(QApplication::translate("UIActionPool", "File Manager"));
+        setStatusTip(QApplication::translate("UIActionPool", "Go forward"));
+        setToolTip(  QApplication::translate("UIActionPool", "Go Forward")
+                   + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString())));
+    }
+};
+
+/** Simple action extension, used as 'Perform GoBackward' in file manager action class. */
+class UIActionMenuFileManagerGoBackward : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuFileManagerGoBackward(UIActionPool *pParent)
+        : UIActionSimple(pParent,
+                         ":/file_manager_go_home_24px.png", ":/file_manager_go_home_16px.png",
+                         ":/file_manager_go_home_disabled_24px.png", ":/file_manager_go_home_disabled_16px.png")
+    {}
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const RT_OVERRIDE
+    {
+        return QString("FileManagerGoBackward");
+    }
+
+    /** Returns default shortcut. */
+    virtual QKeySequence defaultShortcut(UIActionPoolType) const RT_OVERRIDE
+    {
+        return QKeySequence();
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() RT_OVERRIDE
+    {
+        setName(QApplication::translate("UIActionPool", "Go Backward"));
+        setShortcutScope(QApplication::translate("UIActionPool", "File Manager"));
+        setStatusTip(QApplication::translate("UIActionPool", "Go forward"));
+        setToolTip(  QApplication::translate("UIActionPool", "Go Backward")
+                   + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString())));
+    }
+};
+
 /** Simple action extension, used as 'Perform Delete' in file manager action class. */
 class UIActionMenuFileManagerDelete : public UIActionSimple
@@ -3196 +3274 @@
     m_pool[UIActionIndex_M_FileManager_S_Host_GoHome] = new UIActionMenuFileManagerGoHome(this);
     m_pool[UIActionIndex_M_FileManager_S_Guest_GoHome] = new UIActionMenuFileManagerGoHome(this);
+    m_pool[UIActionIndex_M_FileManager_S_Host_GoForward] = new UIActionMenuFileManagerGoForward(this);
+    m_pool[UIActionIndex_M_FileManager_S_Guest_GoForward] = new UIActionMenuFileManagerGoForward(this);
+    m_pool[UIActionIndex_M_FileManager_S_Host_GoBackward] = new UIActionMenuFileManagerGoBackward(this);
+    m_pool[UIActionIndex_M_FileManager_S_Guest_GoBackward] = new UIActionMenuFileManagerGoBackward(this);
     m_pool[UIActionIndex_M_FileManager_S_Host_Refresh] = new UIActionMenuFileManagerRefresh(this);
     m_pool[UIActionIndex_M_FileManager_S_Guest_Refresh] = new UIActionMenuFileManagerRefresh(this);

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h

@@ -128 +128 @@
     UIActionIndex_M_FileManager_S_Host_GoHome,
     UIActionIndex_M_FileManager_S_Guest_GoHome,
+    UIActionIndex_M_FileManager_S_Host_GoForward,
+    UIActionIndex_M_FileManager_S_Guest_GoForward,
+    UIActionIndex_M_FileManager_S_Host_GoBackward,
+    UIActionIndex_M_FileManager_S_Guest_GoBackward,
     UIActionIndex_M_FileManager_S_Host_Refresh,
     UIActionIndex_M_FileManager_S_Guest_Refresh,

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

@@ -452 +452 @@
         connect(m_pNavigationWidget, &UIFileTableNavigationWidget::sigPathChanged,
                 this, &UIFileManagerTable::sltHandleNavigationWidgetPathChange);
+        connect(m_pNavigationWidget, &UIFileTableNavigationWidget::sigHistoryListChanged,
+                this, &UIFileManagerTable::sltHandleNavigationWidgetHistoryListChanged);
         m_pMainLayout->addWidget(m_pNavigationWidget, 1, 1, 1, 6);
         m_sessionWidgets << m_pNavigationWidget;
@@ -639 +641 @@
 }
 
+void UIFileManagerTable::sltGoForward()
+{
+}
+
+void UIFileManagerTable::sltGoBackward()
+{
+}
+
 void UIFileManagerTable::sltRefresh()
 {
@@ -904 +914 @@
 {
     goIntoDirectory(UIPathOperations::pathTrail(strPath));
+}
+
+void UIFileManagerTable::sltHandleNavigationWidgetHistoryListChanged()
+{
+    /* Check if forward/backward actions should be disabled/enabled: */
+    int iHistoryListCount = m_pNavigationWidget->historyItemCount();
+    int iCurrentHistoryIndex = m_pNavigationWidget->currentHistoryIndex();
 }
 

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

@@ -174 +174 @@
     void sltGoUp();
     void sltGoHome();
+    void sltGoForward();
+    void sltGoBackward();
     void sltRefresh();
     void sltDelete();
@@ -276 +278 @@
     void sltHandleItemRenameAttempt(UICustomFileSystemItem *pItem, QString strOldName, QString strNewName);
     void sltHandleNavigationWidgetPathChange(const QString& strPath);
+    void sltHandleNavigationWidgetHistoryListChanged();
 
 private:

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserDialog.cpp

@@ -45 +45 @@
 #endif
 
+/* Other VBox includes: */
 #include <iprt/assert.h>
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoBrowserBase.cpp

@@ -39 +39 @@
 #include "UIVisoBrowserBase.h"
 
+/* Other VBox includes: */
+#include <iprt/assert.h>
 
 /*********************************************************************************************************************************

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFileTableNavigationWidget.cpp

@@ -241 +241 @@
         }
         m_pHistoryComboBox->setCurrentIndex(itemIndex);
+        emit sigHistoryListChanged();
     }
 }
@@ -251 +252 @@
         m_pHistoryComboBox->clear();
         m_pHistoryComboBox->blockSignals(false);
+        emit sigHistoryListChanged();
     }
 
@@ -262 +264 @@
     if (m_pBreadCrumbs)
         m_pBreadCrumbs->setPathSeparator(m_pathSeparator);
+}
+
+int UIFileTableNavigationWidget::historyItemCount() const
+{
+    if (m_pHistoryComboBox)
+        return 0;
+    return m_pHistoryComboBox->count();
+}
+
+int UIFileTableNavigationWidget::currentHistoryIndex() const
+{
+    if (m_pHistoryComboBox)
+        return 0;
+    return m_pHistoryComboBox->currentIndex();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFileTableNavigationWidget.h

@@ -52 +52 @@
 
     void sigPathChanged(const QString &strPath);
+    void sigHistoryListChanged();
 
 public:
@@ -59 +60 @@
     void reset();
     void setPathSeparator(const QChar &separator);
+    int historyItemCount() const;
+    int currentHistoryIndex() const;
+
+protected:
+
     bool eventFilter(QObject *pObject, QEvent *pEvent) override;