Index: /trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp	(revision 84591)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp	(revision 84592)
@@ -231,7 +231,13 @@
     AssertPtrReturnVoid(view());
 
-    /* Chooser-model connections: */
+    /* Abstract Chooser-model connections: */
+    connect(model(), &UIChooserModel::sigCloudMachineStateChange,
+            this, &UIChooser::sigCloudMachineStateChange);
     connect(model(), &UIChooserModel::sigGroupSavingStateChanged,
             this, &UIChooser::sigGroupSavingStateChanged);
+
+    /* Chooser-model connections: */
+    connect(model(), &UIChooserModel::sigToolMenuRequested,
+            this, &UIChooser::sltToolMenuRequested);
     connect(model(), &UIChooserModel::sigSelectionChanged,
             this, &UIChooser::sigSelectionChanged);
@@ -244,8 +250,4 @@
     connect(model(), &UIChooserModel::sigRootItemMinimumWidthHintChanged,
             view(), &UIChooserView::sltMinimumWidthHintChanged);
-    connect(model(), &UIChooserModel::sigToolMenuRequested,
-            this, &UIChooser::sltToolMenuRequested);
-    connect(model(), &UIChooserModel::sigCloudMachineStateChange,
-            this, &UIChooser::sigCloudMachineStateChange);
     connect(model(), &UIChooserModel::sigStartOrShowRequest,
             this, &UIChooser::sigStartOrShowRequest);
@@ -275,7 +277,13 @@
     AssertPtrReturnVoid(view());
 
-    /* Chooser-model connections: */
+    /* Abstract Chooser-model connections: */
+    disconnect(model(), &UIChooserModel::sigCloudMachineStateChange,
+               this, &UIChooser::sigCloudMachineStateChange);
     disconnect(model(), &UIChooserModel::sigGroupSavingStateChanged,
                this, &UIChooser::sigGroupSavingStateChanged);
+
+    /* Chooser-model connections: */
+    disconnect(model(), &UIChooserModel::sigToolMenuRequested,
+               this, &UIChooser::sltToolMenuRequested);
     disconnect(model(), &UIChooserModel::sigSelectionChanged,
                this, &UIChooser::sigSelectionChanged);
@@ -288,8 +296,4 @@
     disconnect(model(), &UIChooserModel::sigRootItemMinimumWidthHintChanged,
                view(), &UIChooserView::sltMinimumWidthHintChanged);
-    disconnect(model(), &UIChooserModel::sigToolMenuRequested,
-               this, &UIChooser::sltToolMenuRequested);
-    disconnect(model(), &UIChooserModel::sigCloudMachineStateChange,
-               this, &UIChooser::sigCloudMachineStateChange);
     disconnect(model(), &UIChooserModel::sigStartOrShowRequest,
                this, &UIChooser::sigStartOrShowRequest);
Index: /trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.h	(revision 84591)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.h	(revision 84592)
@@ -41,5 +41,23 @@
 signals:
 
-    /** @name General stuff.
+    /** @name Cloud machine stuff.
+      * @{ */
+        /** Notifies listeners about state change for cloud machine with certain @a uId. */
+        void sigCloudMachineStateChange(const QUuid &uId);
+    /** @} */
+
+    /** @name Group saving stuff.
+      * @{ */
+        /** Notifies listeners about group saving state change. */
+        void sigGroupSavingStateChanged();
+    /** @} */
+
+    /** @name Tool stuff.
+      * @{ */
+        /** Notifies listeners about tool popup-menu request for certain @a enmClass and @a position. */
+        void sigToolMenuRequested(UIToolClass enmClass, const QPoint &position);
+    /** @} */
+
+    /** @name Selection stuff.
       * @{ */
         /** Notifies listeners about selection changed. */
@@ -48,28 +66,13 @@
         void sigSelectionInvalidated();
 
-        /** Notifies listeners about toggling started. */
+        /** Notifies listeners about group toggling started. */
         void sigToggleStarted();
-        /** Notifies listeners about toggling finished. */
+        /** Notifies listeners about group toggling finished. */
         void sigToggleFinished();
-
-        /** Notifies listeners about tool popup-menu request for certain tool @a enmClass and in specified @a position. */
-        void sigToolMenuRequested(UIToolClass enmClass, const QPoint &position);
-    /** @} */
-
-    /** @name Cloud machine stuff.
-      * @{ */
-        /** Notifies about state change for cloud machine with certain @a uId. */
-        void sigCloudMachineStateChange(const QUuid &uId);
-    /** @} */
-
-    /** @name Group saving stuff.
-      * @{ */
-        /** Notifies listeners about group saving state change. */
-        void sigGroupSavingStateChanged();
     /** @} */
 
     /** @name Action stuff.
       * @{ */
-        /** Notify listeners about start or show request. */
+        /** Notifies listeners about start or show request. */
         void sigStartOrShowRequest();
         /** Notifies listeners about machine search widget visibility changed to @a fVisible. */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserAbstractModel.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserAbstractModel.h	(revision 84591)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserAbstractModel.h	(revision 84592)
@@ -47,5 +47,5 @@
     /** @name Cloud machine stuff.
       * @{ */
-        /** Notifies about state change for cloud machine with certain @a uId. */
+        /** Notifies listeners about state change for cloud machine with certain @a uId. */
         void sigCloudMachineStateChange(const QUuid &uId);
     /** @} */
@@ -55,5 +55,5 @@
         /** Commands to start group saving. */
         void sigStartGroupSaving();
-        /** Notifies about group saving state changed. */
+        /** Notifies listeners about group saving state changed. */
         void sigGroupSavingStateChanged();
     /** @} */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.h	(revision 84591)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.h	(revision 84592)
@@ -65,7 +65,7 @@
 signals:
 
-    /** @name General stuff.
-      * @{ */
-        /** Notify listeners about tool menu popup request for certain @a enmClass and @a position. */
+    /** @name Tool stuff.
+      * @{ */
+        /** Notifies listeners about tool popup-menu request for certain @a enmClass and @a position. */
         void sigToolMenuRequested(UIToolClass enmClass, const QPoint &position);
     /** @} */
@@ -73,12 +73,12 @@
     /** @name Selection stuff.
       * @{ */
-        /** Notifies about selection changed. */
+        /** Notifies listeners about selection changed. */
         void sigSelectionChanged();
-        /** Notifies about selection invalidated. */
+        /** Notifies listeners about selection invalidated. */
         void sigSelectionInvalidated();
 
-        /** Notifies about group toggling started. */
+        /** Notifies listeners about group toggling started. */
         void sigToggleStarted();
-        /** Notifies about group toggling finished. */
+        /** Notifies listeners about group toggling finished. */
         void sigToggleFinished();
     /** @} */
@@ -86,5 +86,5 @@
     /** @name Layout stuff.
       * @{ */
-        /** Notifies about root item minimum width @a iHint changed. */
+        /** Notifies listeners about root item minimum width @a iHint changed. */
         void sigRootItemMinimumWidthHintChanged(int iHint);
     /** @} */
@@ -92,5 +92,5 @@
     /** @name Action stuff.
       * @{ */
-        /** Notify listeners about start or show request. */
+        /** Notifies listeners about start or show request. */
         void sigStartOrShowRequest();
     /** @} */