Changeset 85644 in vbox for trunk/src/VBox

Timestamp:

Aug 7, 2020 5:42:07 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9609: VirtualBox Manager: Search action should be available for both machine and group item types.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPoolManager.cpp (modified) (4 diffs)
• globals/UIActionPoolManager.h (modified) (1 diff)
• manager/UIVirtualBoxManager.cpp (modified) (3 diffs)
• manager/chooser/UIChooserModel.cpp (modified) (2 diffs)

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

@@ -882 +882 @@
         setName(QApplication::translate("UIActionPool", "&Sort"));
         setStatusTip(QApplication::translate("UIActionPool", "Sort group of first selected virtual machine alphabetically"));
-    }
-};
-
-/** Toggle action extension, used as 'Search' action class. */
-class UIActionToggleManagerMachineToggleSearch : public UIActionToggle
-{
-    Q_OBJECT;
-
-public:
-
-    /** Constructs action passing @a pParent to the base-class. */
-    UIActionToggleManagerMachineToggleSearch(UIActionPool *pParent)
-        : UIActionToggle(pParent,
-                         ":/search_16px.png", ":/search_16px.png",
-                         ":/search_16px.png", ":/search_16px.png") /// @todo use icons with check-boxes
-    {}
-
-protected:
-
-    /** Returns shortcut extra-data ID. */
-    virtual QString shortcutExtraDataID() const /* override */
-    {
-        return QString("SearchVM");
-    }
-
-    /** Returns default shortcut. */
-    virtual QKeySequence defaultShortcut(UIActionPoolType) const /* override */
-    {
-        return QKeySequence("Ctrl+F");
-    }
-
-    /** Handles translation event. */
-    virtual void retranslateUi() /* override */
-    {
-        setName(QApplication::translate("UIActionPool", "S&earch"));
-        setStatusTip(QApplication::translate("UIActionPool", "Search virtual machines with respect to a search term"));
     }
 };
@@ -1305 +1269 @@
         setStatusTip(QApplication::translate("UIActionPool", "Create shortcut files to the VirtualBox Machine Definition files on your desktop"));
 #endif
+    }
+};
+
+/** Toggle action extension, used as 'Search' action class. */
+class UIActionToggleManagerCommonToggleSearch : public UIActionToggle
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionToggleManagerCommonToggleSearch(UIActionPool *pParent)
+        : UIActionToggle(pParent,
+                         ":/search_16px.png", ":/search_16px.png",
+                         ":/search_16px.png", ":/search_16px.png") /// @todo use icons with check-boxes
+    {}
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const /* override */
+    {
+        return QString("SearchVM");
+    }
+
+    /** Returns default shortcut. */
+    virtual QKeySequence defaultShortcut(UIActionPoolType) const /* override */
+    {
+        return QKeySequence("Ctrl+F");
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */
+    {
+        setName(QApplication::translate("UIActionPool", "S&earch"));
+        setStatusTip(QApplication::translate("UIActionPool", "Search virtual machines with respect to a search term"));
     }
 };
@@ -3433 +3433 @@
     m_pool[UIActionIndexMN_M_Group_S_CreateShortcut] = new UIActionSimpleManagerCommonPerformCreateShortcut(this);
     m_pool[UIActionIndexMN_M_Group_S_Sort] = new UIActionSimpleManagerGroupPerformSort(this);
+    m_pool[UIActionIndexMN_M_Group_T_Search] = new UIActionToggleManagerCommonToggleSearch(this);
 
     /* 'Machine' actions: */
@@ -3475 +3476 @@
     m_pool[UIActionIndexMN_M_Machine_S_CreateShortcut] = new UIActionSimpleManagerCommonPerformCreateShortcut(this);
     m_pool[UIActionIndexMN_M_Machine_S_SortParent] = new UIActionSimpleManagerMachinePerformSortParent(this);
-    m_pool[UIActionIndexMN_M_Machine_T_Search] = new UIActionToggleManagerMachineToggleSearch(this);
+    m_pool[UIActionIndexMN_M_Machine_T_Search] = new UIActionToggleManagerCommonToggleSearch(this);
 
     /* Global Tools actions: */

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

@@ -90 +90 @@
     UIActionIndexMN_M_Group_S_CreateShortcut,
     UIActionIndexMN_M_Group_S_Sort,
+    UIActionIndexMN_M_Group_T_Search,
 
     /* 'Machine' menu actions: */

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -2181 +2181 @@
     connect(actionPool()->action(UIActionIndexMN_M_Group_S_Sort), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformGroupSorting);
+    connect(actionPool()->action(UIActionIndexMN_M_Group_T_Search), &UIAction::toggled,
+            this, &UIVirtualBoxManager::sltPerformMachineSearchWidgetVisibilityToggling);
+    connect(m_pWidget, &UIVirtualBoxManagerWidget::sigMachineSearchWidgetVisibilityChanged,
+            actionPool()->action(UIActionIndexMN_M_Group_T_Search), &QAction::setChecked);
 
     /* 'Machine' menu connections: */
@@ -2642 +2646 @@
         pMenu->addSeparator();
         pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Sort));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_T_Search));
     }
     else
@@ -2657 +2662 @@
         pMenu->addSeparator();
         pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Sort));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_T_Search));
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

@@ -1323 +1323 @@
         pMenuGroup->addSeparator();
         pMenuGroup->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Sort));
+        pMenuGroup->addAction(actionPool()->action(UIActionIndexMN_M_Group_T_Search));
     }
 
@@ -1367 +1368 @@
         pMenuGroup->addSeparator();
         pMenuGroup->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Sort));
+        pMenuGroup->addAction(actionPool()->action(UIActionIndexMN_M_Group_T_Search));
     }