Changeset 100304 in vbox

Timestamp:

Jun 27, 2023 7:44:47 PM (17 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699. Adding icons and slots to go forward and backward actions.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• VirtualBox1.qrc (modified) (2 diffs)
• VirtualBox1_x2.qrc (modified) (2 diffs)
• VirtualBox1_x3.qrc (modified) (2 diffs)
• VirtualBox1_x4.qrc (modified) (2 diffs)
• VirtualBox2.qrc (modified) (1 diff)
• VirtualBox2_x2.qrc (modified) (1 diff)
• VirtualBox2_x3.qrc (modified) (1 diff)
• VirtualBox2_x4.qrc (modified) (1 diff)
• images/x4/file_manager_go_backward_16px_x4.png (added)
• images/x4/file_manager_go_backward_24px_x4.png (added)
• images/x4/file_manager_go_backward_disabled_16px_x4.png (added)
• images/x4/file_manager_go_backward_disabled_24px_x4.png (added)
• images/x4/file_manager_go_forward_16px_x4.png (added)
• images/x4/file_manager_go_forward_24px_x4.png (added)
• images/x4/file_manager_go_forward_disabled_16px_x4.png (added)
• images/x4/file_manager_go_forward_disabled_24px_x4.png (added)
• src/globals/UIActionPool.cpp (modified) (2 diffs)
• src/guestctrl/UIFileManagerGuestTable.cpp (modified) (1 diff)
• src/guestctrl/UIFileManagerHostTable.cpp (modified) (1 diff)
• src/guestctrl/UIFileManagerTable.cpp (modified) (1 diff)
• src/widgets/UIFileTableNavigationWidget.cpp (modified) (1 diff)
• src/widgets/UIFileTableNavigationWidget.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc

@@ -289 +289 @@
         <file alias="file_manager_folder_16px.png">images/file_manager_folder_16px.png</file>
         <file alias="file_manager_folder_symlink_16px.png">images/file_manager_folder_symlink_16px.png</file>
+        <file alias="file_manager_go_backward_16px.png">images/file_manager_go_backward_16px.png</file>
+        <file alias="file_manager_go_backward_24px.png">images/file_manager_go_backward_24px.png</file>
+        <file alias="file_manager_go_backward_disabled_16px.png">images/file_manager_go_backward_disabled_16px.png</file>
+        <file alias="file_manager_go_backward_disabled_24px.png">images/file_manager_go_backward_disabled_24px.png</file>
+        <file alias="file_manager_go_forward_16px.png">images/file_manager_go_forward_16px.png</file>
+        <file alias="file_manager_go_forward_24px.png">images/file_manager_go_forward_24px.png</file>
+        <file alias="file_manager_go_forward_disabled_16px.png">images/file_manager_go_forward_disabled_16px.png</file>
+        <file alias="file_manager_go_forward_disabled_24px.png">images/file_manager_go_forward_disabled_24px.png</file>
         <file alias="file_manager_go_home_16px.png">images/file_manager_go_home_16px.png</file>
         <file alias="file_manager_go_home_24px.png">images/file_manager_go_home_24px.png</file>
@@ -502 +510 @@
         <file alias="log_viewer_filter_16px.png">images/log_viewer_filter_16px.png</file>
         <file alias="log_viewer_filter_32px.png">images/log_viewer_filter_32px.png</file>
-        <file alias="log_viewer_filter_add_16px.png">images/log_viewer_filter_add_16px.png</file>
-        <file alias="log_viewer_filter_disabled_16px.png">images/log_viewer_filter_disabled_16px.png</file>
-        <file alias="log_viewer_filter_disabled_32px.png">images/log_viewer_filter_disabled_32px.png</file>
-        <file alias="log_viewer_find_16px.png">images/log_viewer_find_16px.png</file>
     </qresource>
 </RCC>

trunk/src/VBox/Frontends/VirtualBox/VirtualBox1_x2.qrc

@@ -289 +289 @@
         <file alias="file_manager_folder_16px_x2.png">images/x2/file_manager_folder_16px_x2.png</file>
         <file alias="file_manager_folder_symlink_16px_x2.png">images/x2/file_manager_folder_symlink_16px_x2.png</file>
+        <file alias="file_manager_go_backward_16px_x2.png">images/x2/file_manager_go_backward_16px_x2.png</file>
+        <file alias="file_manager_go_backward_24px_x2.png">images/x2/file_manager_go_backward_24px_x2.png</file>
+        <file alias="file_manager_go_backward_disabled_16px_x2.png">images/x2/file_manager_go_backward_disabled_16px_x2.png</file>
+        <file alias="file_manager_go_backward_disabled_24px_x2.png">images/x2/file_manager_go_backward_disabled_24px_x2.png</file>
+        <file alias="file_manager_go_forward_16px_x2.png">images/x2/file_manager_go_forward_16px_x2.png</file>
+        <file alias="file_manager_go_forward_24px_x2.png">images/x2/file_manager_go_forward_24px_x2.png</file>
+        <file alias="file_manager_go_forward_disabled_16px_x2.png">images/x2/file_manager_go_forward_disabled_16px_x2.png</file>
+        <file alias="file_manager_go_forward_disabled_24px_x2.png">images/x2/file_manager_go_forward_disabled_24px_x2.png</file>
         <file alias="file_manager_go_home_16px_x2.png">images/x2/file_manager_go_home_16px_x2.png</file>
         <file alias="file_manager_go_home_24px_x2.png">images/x2/file_manager_go_home_24px_x2.png</file>
@@ -488 +496 @@
         <file alias="list_movedown_disabled_16px_x2.png">images/x2/list_movedown_disabled_16px_x2.png</file>
         <file alias="list_moveup_16px_x2.png">images/x2/list_moveup_16px_x2.png</file>
-        <file alias="list_moveup_disabled_16px_x2.png">images/x2/list_moveup_disabled_16px_x2.png</file>
-        <file alias="log_viewer_bookmark_16px_x2.png">images/x2/log_viewer_bookmark_16px_x2.png</file>
-        <file alias="log_viewer_bookmark_32px_x2.png">images/x2/log_viewer_bookmark_32px_x2.png</file>
-        <file alias="log_viewer_bookmark_disabled_16px_x2.png">images/x2/log_viewer_bookmark_disabled_16px_x2.png</file>
     </qresource>
 </RCC>

trunk/src/VBox/Frontends/VirtualBox/VirtualBox1_x3.qrc

@@ -289 +289 @@
         <file alias="file_manager_folder_16px_x3.png">images/x3/file_manager_folder_16px_x3.png</file>
         <file alias="file_manager_folder_symlink_16px_x3.png">images/x3/file_manager_folder_symlink_16px_x3.png</file>
+        <file alias="file_manager_go_backward_16px_x3.png">images/x3/file_manager_go_backward_16px_x3.png</file>
+        <file alias="file_manager_go_backward_24px_x3.png">images/x3/file_manager_go_backward_24px_x3.png</file>
+        <file alias="file_manager_go_backward_disabled_16px_x3.png">images/x3/file_manager_go_backward_disabled_16px_x3.png</file>
+        <file alias="file_manager_go_backward_disabled_24px_x3.png">images/x3/file_manager_go_backward_disabled_24px_x3.png</file>
+        <file alias="file_manager_go_forward_16px_x3.png">images/x3/file_manager_go_forward_16px_x3.png</file>
+        <file alias="file_manager_go_forward_24px_x3.png">images/x3/file_manager_go_forward_24px_x3.png</file>
+        <file alias="file_manager_go_forward_disabled_16px_x3.png">images/x3/file_manager_go_forward_disabled_16px_x3.png</file>
+        <file alias="file_manager_go_forward_disabled_24px_x3.png">images/x3/file_manager_go_forward_disabled_24px_x3.png</file>
         <file alias="file_manager_go_home_16px_x3.png">images/x3/file_manager_go_home_16px_x3.png</file>
         <file alias="file_manager_go_home_24px_x3.png">images/x3/file_manager_go_home_24px_x3.png</file>
@@ -489 +497 @@
         <file alias="list_moveup_16px_x3.png">images/x3/list_moveup_16px_x3.png</file>
         <file alias="list_moveup_disabled_16px_x3.png">images/x3/list_moveup_disabled_16px_x3.png</file>
-        <file alias="log_viewer_bookmark_16px_x3.png">images/x3/log_viewer_bookmark_16px_x3.png</file>
-        <file alias="log_viewer_bookmark_32px_x3.png">images/x3/log_viewer_bookmark_32px_x3.png</file>
-        <file alias="log_viewer_bookmark_disabled_16px_x3.png">images/x3/log_viewer_bookmark_disabled_16px_x3.png</file>
-        <file alias="log_viewer_bookmark_disabled_32px_x3.png">images/x3/log_viewer_bookmark_disabled_32px_x3.png</file>
     </qresource>
 </RCC>

trunk/src/VBox/Frontends/VirtualBox/VirtualBox1_x4.qrc

@@ -289 +289 @@
         <file alias="file_manager_folder_16px_x4.png">images/x4/file_manager_folder_16px_x4.png</file>
         <file alias="file_manager_folder_symlink_16px_x4.png">images/x4/file_manager_folder_symlink_16px_x4.png</file>
+        <file alias="file_manager_go_backward_16px_x4.png">images/x4/file_manager_go_backward_16px_x4.png</file>
+        <file alias="file_manager_go_backward_24px_x4.png">images/x4/file_manager_go_backward_24px_x4.png</file>
+        <file alias="file_manager_go_backward_disabled_16px_x4.png">images/x4/file_manager_go_backward_disabled_16px_x4.png</file>
+        <file alias="file_manager_go_backward_disabled_24px_x4.png">images/x4/file_manager_go_backward_disabled_24px_x4.png</file>
+        <file alias="file_manager_go_forward_16px_x4.png">images/x4/file_manager_go_forward_16px_x4.png</file>
+        <file alias="file_manager_go_forward_24px_x4.png">images/x4/file_manager_go_forward_24px_x4.png</file>
+        <file alias="file_manager_go_forward_disabled_16px_x4.png">images/x4/file_manager_go_forward_disabled_16px_x4.png</file>
+        <file alias="file_manager_go_forward_disabled_24px_x4.png">images/x4/file_manager_go_forward_disabled_24px_x4.png</file>
         <file alias="file_manager_go_home_16px_x4.png">images/x4/file_manager_go_home_16px_x4.png</file>
         <file alias="file_manager_go_home_24px_x4.png">images/x4/file_manager_go_home_24px_x4.png</file>
@@ -489 +497 @@
         <file alias="list_moveup_16px_x4.png">images/x4/list_moveup_16px_x4.png</file>
         <file alias="list_moveup_disabled_16px_x4.png">images/x4/list_moveup_disabled_16px_x4.png</file>
-        <file alias="log_viewer_bookmark_16px_x4.png">images/x4/log_viewer_bookmark_16px_x4.png</file>
-        <file alias="log_viewer_bookmark_32px_x4.png">images/x4/log_viewer_bookmark_32px_x4.png</file>
-        <file alias="log_viewer_bookmark_disabled_16px_x4.png">images/x4/log_viewer_bookmark_disabled_16px_x4.png</file>
-        <file alias="log_viewer_bookmark_disabled_32px_x4.png">images/x4/log_viewer_bookmark_disabled_32px_x4.png</file>
     </qresource>
 </RCC>

trunk/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc

@@ -1 +1 @@
 <RCC>
     <qresource suffix="/">
+        <file alias="log_viewer_filter_add_16px.png">images/log_viewer_filter_add_16px.png</file>
+        <file alias="log_viewer_filter_disabled_16px.png">images/log_viewer_filter_disabled_16px.png</file>
+        <file alias="log_viewer_filter_disabled_32px.png">images/log_viewer_filter_disabled_32px.png</file>
+        <file alias="log_viewer_find_16px.png">images/log_viewer_find_16px.png</file>
         <file alias="log_viewer_find_32px.png">images/log_viewer_find_32px.png</file>
         <file alias="log_viewer_find_disabled_16px.png">images/log_viewer_find_disabled_16px.png</file>

trunk/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc

@@ -1 +1 @@
 <RCC>
     <qresource suffix="/">
+        <file alias="list_moveup_disabled_16px_x2.png">images/x2/list_moveup_disabled_16px_x2.png</file>
+        <file alias="log_viewer_bookmark_16px_x2.png">images/x2/log_viewer_bookmark_16px_x2.png</file>
+        <file alias="log_viewer_bookmark_32px_x2.png">images/x2/log_viewer_bookmark_32px_x2.png</file>
+        <file alias="log_viewer_bookmark_disabled_16px_x2.png">images/x2/log_viewer_bookmark_disabled_16px_x2.png</file>
         <file alias="log_viewer_bookmark_disabled_32px_x2.png">images/x2/log_viewer_bookmark_disabled_32px_x2.png</file>
         <file alias="log_viewer_bookmark_off_16px_x2.png">images/x2/log_viewer_bookmark_off_16px_x2.png</file>

trunk/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc

@@ -1 +1 @@
 <RCC>
     <qresource suffix="/">
+        <file alias="log_viewer_bookmark_16px_x3.png">images/x3/log_viewer_bookmark_16px_x3.png</file>
+        <file alias="log_viewer_bookmark_32px_x3.png">images/x3/log_viewer_bookmark_32px_x3.png</file>
+        <file alias="log_viewer_bookmark_disabled_16px_x3.png">images/x3/log_viewer_bookmark_disabled_16px_x3.png</file>
+        <file alias="log_viewer_bookmark_disabled_32px_x3.png">images/x3/log_viewer_bookmark_disabled_32px_x3.png</file>
         <file alias="log_viewer_bookmark_off_16px_x3.png">images/x3/log_viewer_bookmark_off_16px_x3.png</file>
         <file alias="log_viewer_bookmark_on_16px_x3.png">images/x3/log_viewer_bookmark_on_16px_x3.png</file>

trunk/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc

@@ -1 +1 @@
 <RCC>
     <qresource suffix="/">
+        <file alias="log_viewer_bookmark_16px_x4.png">images/x4/log_viewer_bookmark_16px_x4.png</file>
+        <file alias="log_viewer_bookmark_32px_x4.png">images/x4/log_viewer_bookmark_32px_x4.png</file>
+        <file alias="log_viewer_bookmark_disabled_16px_x4.png">images/x4/log_viewer_bookmark_disabled_16px_x4.png</file>
+        <file alias="log_viewer_bookmark_disabled_32px_x4.png">images/x4/log_viewer_bookmark_disabled_32px_x4.png</file>
         <file alias="log_viewer_bookmark_off_16px_x4.png">images/x4/log_viewer_bookmark_off_16px_x4.png</file>
         <file alias="log_viewer_bookmark_on_16px_x4.png">images/x4/log_viewer_bookmark_on_16px_x4.png</file>

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

@@ -1893 +1893 @@
     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")
+                         ":/file_manager_go_forward_24px.png", ":/file_manager_go_forward_16px.png",
+                         ":/file_manager_go_forward_disabled_24px.png", ":/file_manager_go_forward_disabled_16px.png")
     {}
 
@@ -1932 +1932 @@
     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")
+                         ":/file_manager_go_backward_24px.png", ":/file_manager_go_backward_16px.png",
+                         ":/file_manager_go_backward_disabled_24px.png", ":/file_manager_go_backward_disabled_16px.png")
     {}
 

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

@@ -1148 +1148 @@
     manageConnection(m_fIsCurrent, m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_GoUp), &UIFileManagerTable::sltGoUp);
     manageConnection(m_fIsCurrent, m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_GoHome), &UIFileManagerTable::sltGoHome);
+    manageConnection(m_fIsCurrent, m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_GoBackward), &UIFileManagerTable::sltGoBackward);
+    manageConnection(m_fIsCurrent, m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_GoForward), &UIFileManagerTable::sltGoForward);
     manageConnection(m_fIsCurrent, m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_Refresh), &UIFileManagerTable::sltRefresh);
     manageConnection(m_fIsCurrent, m_pActionPool->action(UIActionIndex_M_FileManager_S_Guest_Delete), &UIFileManagerTable::sltDelete);

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

@@ -544 +544 @@
     connect(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_GoHome), &QAction::triggered,
             this, &UIFileManagerTable::sltGoHome);
+    connect(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_GoForward), &QAction::triggered,
+            this, &UIFileManagerTable::sltGoForward);
+    connect(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_GoBackward), &QAction::triggered,
+            this, &UIFileManagerTable::sltGoBackward);
     connect(m_pActionPool->action(UIActionIndex_M_FileManager_S_Host_Refresh), &QAction::triggered,
             this, &UIFileManagerTable::sltRefresh);

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

@@ -643 +643 @@
 void UIFileManagerTable::sltGoForward()
 {
+    if (m_pNavigationWidget)
+        m_pNavigationWidget->goForwardInHistory();
 }
 
 void UIFileManagerTable::sltGoBackward()
 {
+    if (m_pNavigationWidget)
+        m_pNavigationWidget->goBackwardInHistory();
 }
 

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

@@ -278 +278 @@
         return 0;
     return m_pHistoryComboBox->currentIndex();
+}
+
+void UIFileTableNavigationWidget::goForwardInHistory()
+{
+    if (!m_pHistoryComboBox || m_pHistoryComboBox->currentIndex() >= m_pHistoryComboBox->count() - 1)
+        return;
+    m_pHistoryComboBox->setCurrentIndex(m_pHistoryComboBox->currentIndex() + 1);
+}
+
+void UIFileTableNavigationWidget::goBackwardInHistory()
+{
+    if (!m_pHistoryComboBox || m_pHistoryComboBox->currentIndex() <= 0)
+        return;
+    m_pHistoryComboBox->setCurrentIndex(m_pHistoryComboBox->currentIndex() - 1);
 }
 

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

@@ -62 +62 @@
     int historyItemCount() const;
     int currentHistoryIndex() const;
+    void goForwardInHistory();
+    void goBackwardInHistory();
 
 protected: