Changeset 62205 in vbox for trunk/src

Timestamp:

Jul 12, 2016 6:31:33 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Selector UI: No need for status-bar show/hide message hack which is not working properly.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector

Files:

• UISelectorWindow.cpp (modified) (1 diff)
• graphics/chooser/UIGChooser.cpp (modified) (2 diffs)
• graphics/chooser/UIGChooser.h (modified) (2 diffs)
• graphics/chooser/UIGChooserModel.cpp (modified) (3 diffs)
• graphics/chooser/UIGChooserModel.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -1633 +1633 @@
     /* Prepare graphics VM list: */
     m_pPaneChooser = new UIGChooser(this);
-    m_pPaneChooser->setStatusBar(statusBar());
 
     /* Prepare graphics details: */

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooser.cpp

@@ -40 +40 @@
     , m_pChooserModel(0)
     , m_pChooserView(0)
-    , m_pStatusBar(0)
 {
     /* Prepare palette: */
@@ -90 +89 @@
 {
     return m_pChooserModel->isAllItemsOfOneGroupSelected();
-}
-
-void UIGChooser::setStatusBar(QStatusBar *pStatusBar)
-{
-    /* Old status-bar set? */
-    if (m_pStatusBar)
-       m_pChooserModel->disconnect(m_pStatusBar);
-
-    /* Connect new status-bar: */
-    m_pStatusBar = pStatusBar;
-    connect(m_pChooserModel, SIGNAL(sigClearStatusMessage()),
-            m_pStatusBar, SLOT(clearMessage()));
-    connect(m_pChooserModel, SIGNAL(sigShowStatusMessage(const QString&)),
-            m_pStatusBar, SLOT(showMessage(const QString&)));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooser.h

@@ -71 +71 @@
     bool isAllItemsOfOneGroupSelected() const;
 
-    /* API: Status-bar stuff: */
-    void setStatusBar(QStatusBar *pStatusBar);
-
     /* API: Group-saving stuff: */
     bool isGroupSavingInProgress() const;
@@ -97 +94 @@
     UIGChooserModel *m_pChooserModel;
     UIGChooserView *m_pChooserView;
-    QStatusBar *m_pStatusBar;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp

@@ -1144 +1144 @@
 }
 
-void UIGChooserModel::sltActionHovered(QAction *pAction)
-{
-    emit sigShowStatusMessage(pAction->statusTip());
-}
-
 void UIGChooserModel::sltEraseLookupTimer()
 {
@@ -1246 +1241 @@
     m_pContextMenuMachine->addSeparator();
     m_pContextMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_SortParent));
-
-    connect(m_pContextMenuGroup, SIGNAL(hovered(QAction*)), this, SLOT(sltActionHovered(QAction*)));
-    connect(m_pContextMenuMachine, SIGNAL(hovered(QAction*)), this, SLOT(sltActionHovered(QAction*)));
 
     connect(actionPool()->action(UIActionIndexST_M_Group_S_New), SIGNAL(triggered()),
@@ -1669 +1661 @@
         }
     }
-    /* Clear status-bar: */
-    emit sigClearStatusMessage();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.h

@@ -62 +62 @@
 signals:
 
-    /* Notifiers: Status-bar stuff: */
-    void sigShowStatusMessage(const QString &strStatusMessage);
-    void sigClearStatusMessage();
-
     /* Notifier: Current-item stuff: */
     void sigSelectionChanged();
@@ -196 +192 @@
     void sltCurrentDragObjectDestroyed();
 
-    /* Handler: Context-menu stuff: */
-    void sltActionHovered(QAction *pAction);
-
     /* Handler: Item lookup stuff: */
     void sltEraseLookupTimer();