Changeset 100302 in vbox for trunk

Timestamp:

Jun 27, 2023 5:27:44 PM (23 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

158017

Message:

FE/Qt: bugref:6699. Adding forward and backward navigation actions.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• guestctrl/UIFileManagerGuestTable.cpp (modified) (6 diffs)
• guestctrl/UIFileManagerHostTable.cpp (modified) (3 diffs)
• guestctrl/UIFileManagerTable.h (modified) (2 diffs)
• widgets/UIFileTableNavigationWidget.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestTable.cpp ¶

@@ -43 +43 @@
 #include "UIFileManagerHostTable.h"
 #include "UIFileManagerGuestTable.h"
+#include "UIFileTableNavigationWidget.h"
 #include "UIIconPool.h"
 #include "UIMessageCenter.h"
@@ -1050 +1051 @@
     if (m_pToolBar && m_pActionPool)
     {
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_GoBackward));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_GoForward));
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_GoUp));
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_GoHome));
@@ -1091 +1094 @@
 
     QMenu menu;
+    menu.addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_GoBackward));
+    menu.addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_GoForward));
     menu.addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_GoUp));
 
@@ -1153 +1158 @@
     manageConnection(m_fIsCurrent, m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_ShowProperties), &UIFileManagerTable::sltShowProperties);
     manageConnection(m_fIsCurrent, m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_CreateNewDirectory), &UIFileManagerTable::sltCreateNewDirectory);
+
+    /* Also disable/enable go forward/backward actions: */
+    toggleForwardBackwardActions();
 }
 
@@ -1478 +1486 @@
 void UIFileManagerGuestTable::toggleForwardBackwardActions()
 {
+    int iCount = m_pNavigationWidget->historyItemCount();
+    int iCurrent = m_pNavigationWidget->currentHistoryIndex();
+    if (m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_GoForward))
+        m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_GoForward)->setEnabled(iCurrent < iCount - 1);
+    if (m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_GoBackward))
+        m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_GoBackward)->setEnabled(iCurrent > 0);
 }
 
@@ -1646 +1660 @@
 }
 
-
 #include "UIFileManagerGuestTable.moc"

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerHostTable.cpp ¶

@@ -35 +35 @@
 #include "UIActionPool.h"
 #include "UIFileManager.h"
+#include "UIFileTableNavigationWidget.h"
 #include "UICustomFileSystemModel.h"
 #include "UIFileManagerHostTable.h"
@@ -191 +192 @@
     if (m_pToolBar && m_pActionPool)
     {
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_GoBackward));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_GoForward));
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_GoUp));
         m_pToolBar->addAction(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_GoHome));
@@ -249 +252 @@
 void UIFileManagerHostTable::toggleForwardBackwardActions()
 {
+    int iCount = m_pNavigationWidget->historyItemCount();
+    int iCurrent = m_pNavigationWidget->currentHistoryIndex();
+    if (m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_GoForward))
+        m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_GoForward)->setEnabled(iCurrent < iCount - 1);
+    if (m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_GoBackward))
+        m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_GoBackward)->setEnabled(iCurrent > 0);
 }
 

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

@@ -268 +268 @@
     /** This name is appended to the log messages which are shown in the log panel. */
     QString          m_strTableName;
+    /** Contains m_pBreadCrumbsWidget and m_pLocationComboBox. */
+    UIFileTableNavigationWidget   *m_pNavigationWidget;
 
 private slots:
@@ -311 +313 @@
     UIGuestControlFileView        *m_pView;
     UICustomFileSystemProxyModel  *m_pProxyModel;
-    /** Contains m_pBreadCrumbsWidget and m_pLocationComboBox. */
-    UIFileTableNavigationWidget   *m_pNavigationWidget;
 
     QILineEdit      *m_pSearchLineEdit;

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

@@ -268 +268 @@
 int UIFileTableNavigationWidget::historyItemCount() const
 {
-    if (m_pHistoryComboBox)
+    if (!m_pHistoryComboBox)
         return 0;
     return m_pHistoryComboBox->count();
@@ -275 +275 @@
 int UIFileTableNavigationWidget::currentHistoryIndex() const
 {
-    if (m_pHistoryComboBox)
+    if (!m_pHistoryComboBox)
         return 0;
     return m_pHistoryComboBox->currentIndex();