Changeset 77919 in vbox for trunk/src

Timestamp:

Mar 27, 2019 1:27:07 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9241: VirtualBox Manager: Chooser pane: Cleanup for UIChooserModel class: Wipe out old search func.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser

Files:

• UIChooserHandlerKeyboard.cpp (modified) (2 diffs)
• UIChooserModel.cpp (modified) (6 diffs)
• UIChooserModel.h (modified) (5 diffs)

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

@@ -278 +278 @@
         case Qt::Key_Space:
         {
-            /* If model is performing lookup: */
-            if (model()->isLookupInProgress())
-            {
-                /* Continue lookup: */
-                QString strText = pEvent->text();
-                if (!strText.isEmpty())
-                    model()->lookFor(strText);
-            }
             /* If there is a focus item: */
-            else if (UIChooserItem *pFocusItem = model()->focusItem())
+            if (UIChooserItem *pFocusItem = model()->focusItem())
             {
                 /* Of the group type: */
@@ -314 +306 @@
         {
             /* Start lookup: */
-            QString strText = pEvent->text();
+            const QString strText = pEvent->text();
             if (!strText.isEmpty())
                 model()->lookFor(strText);

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

@@ -66 +66 @@
     , m_iScrollingTokenSize(30)
     , m_fIsScrollingInProgress(false)
-    , m_pLookupTimer(0)
 {
     prepare();
@@ -565 +564 @@
 }
 
-void UIChooserModel::lookFor(const QString &strLookupSymbol)
+void UIChooserModel::lookFor(const QString &strLookupText)
 {
     if (view())
     {
         view()->setSearchWidgetVisible(true);
-        view()->appendToSearchString(strLookupSymbol);
-    }
-}
-
-bool UIChooserModel::isLookupInProgress() const
-{
-    return m_pLookupTimer->isActive();
+        view()->appendToSearchString(strLookupText);
+    }
 }
 
@@ -1147 +1141 @@
 }
 
-void UIChooserModel::sltEraseLookupTimer()
-{
-    m_pLookupTimer->stop();
-    m_strLookupString = QString();
-}
-
 void UIChooserModel::prepare()
 {
     prepareScene();
-    prepareLookup();
     prepareContextMenu();
     prepareHandlers();
@@ -1167 +1154 @@
     if (m_pScene)
         m_pScene->installEventFilter(this);
-}
-
-void UIChooserModel::prepareLookup()
-{
-    m_pLookupTimer = new QTimer(this);
-    if (m_pLookupTimer)
-    {
-        m_pLookupTimer->setInterval(1000);
-        m_pLookupTimer->setSingleShot(true);
-        connect(m_pLookupTimer, SIGNAL(timeout()), this, SLOT(sltEraseLookupTimer()));
-    }
 }
 
@@ -1357 +1333 @@
 }
 
-void UIChooserModel::cleanupLookup()
-{
-    delete m_pLookupTimer;
-    m_pLookupTimer = 0;
-}
-
 void UIChooserModel::cleanupScene()
 {
@@ -1373 +1343 @@
     cleanupHandlers();
     cleanupContextMenu();
-    cleanupLookup();
     cleanupScene();
 }

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

@@ -205 +205 @@
         void setCurrentDragObject(QDrag *pDragObject);
 
-        /** Looks for item with certain @a strLookupSymbol. */
-        void lookFor(const QString &strLookupSymbol);
-        /** Returns whether looking is in progress. */
-        bool isLookupInProgress() const;
+        /** Looks for item with certain @a strLookupText. */
+        void lookFor(const QString &strLookupText);
     /** @} */
 
@@ -285 +283 @@
         /** Handles machine search widget show/hide request. */
         void sltShowHideSearchWidget();
-        /** Handles request to erase lookup timer. */
-        void sltEraseLookupTimer();
     /** @} */
 
@@ -297 +293 @@
         /** Prepares scene. */
         void prepareScene();
-        /** Prepares lookup. */
-        void prepareLookup();
         /** Prepares context-menu. */
         void prepareContextMenu();
@@ -314 +308 @@
         /** Cleanups context-menu. */
         void cleanupContextMenu();
-        /** Cleanups lookup. */
-        void cleanupLookup();
         /** Cleanups scene. */
         void cleanupScene();
@@ -408 +400 @@
         /** Holds whether drag scrolling is in progress. */
         bool             m_fIsScrollingInProgress;
-
-        /** Holds the item lookup timer instance. */
-        QTimer  *m_pLookupTimer;
-        /** Holds the item lookup string. */
-        QString  m_strLookupString;
     /** @} */
 };