Changeset 3818 in vbox for trunk/src

Timestamp:

Jul 25, 2007 8:24:03 AM (17 years ago)

Author:

vboxsync

Message:

2124: VirtualBox LogViewer search mechanism:

LogViewer search mechanism improvements/bugfixes done:

1. The [Save] button was the default one but was not focused by default (fixed).
2. The search shortcuts are now (F3/Shift-F3) work even if the search-panel is closed.
3. Own "ensure-found-string-is-visible" mechanism implemented.
4. Fixed bug when the clean (without any log files) logger become enabled after "Refresh".

File:

• trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMLogViewer.ui.h (modified) (13 diffs)

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMLogViewer.ui.h

@@ -63 +63 @@
                  this, SLOT (findCurrent (const QString &)));
 
+        mButtonNext = new QToolButton (this);
+        mButtonNext->setEnabled (false);
+        mButtonNext->setAutoRaise (true);
+        mButtonNext->setFocusPolicy (QWidget::TabFocus);
+        mButtonNext->setUsesTextLabel (true);
+        mButtonNext->setTextPosition (QToolButton::BesideIcon);
+        connect (mButtonNext, SIGNAL (clicked()), this, SLOT (findNext()));
+        mButtonNext->setIconSet (VBoxGlobal::iconSet ("list_movedown_16px.png",
+                                           "list_movedown_disabled_16px.png"));
+
         mButtonPrev = new QToolButton (this);
         mButtonPrev->setEnabled (false);
@@ -72 +82 @@
         mButtonPrev->setIconSet (VBoxGlobal::iconSet ("list_moveup_16px.png",
                                              "list_moveup_disabled_16px.png"));
-
-        mButtonNext = new QToolButton (this);
-        mButtonNext->setEnabled (false);
-        mButtonNext->setAutoRaise (true);
-        mButtonNext->setFocusPolicy (QWidget::TabFocus);
-        mButtonNext->setUsesTextLabel (true);
-        mButtonNext->setTextPosition (QToolButton::BesideIcon);
-        connect (mButtonNext, SIGNAL (clicked()), this, SLOT (findNext()));
-        mButtonNext->setIconSet (VBoxGlobal::iconSet ("list_movedown_16px.png",
-                                           "list_movedown_disabled_16px.png"));
 
         mCaseSensitive = new QCheckBox (this);
@@ -117 +117 @@
 
         setFocusProxy (mCaseSensitive);
+        qApp->installEventFilter (this);
 
         languageChange();
@@ -140 +141 @@
     }
 
-    void setText (const QString &aText)
-    {
-        mSearchString->setText (aText);
-    }
-
 private slots:
 
@@ -173 +169 @@
     {
         QTextBrowser *browser = mViewer->currentLogPage();
+        if (!browser) return;
+
         int startPrg = 0, endPrg = 0;
         int startInd = 0, endInd = 0;
@@ -196 +194 @@
                 browser->setSelection (paragraph, res, paragraph,
                                        res + mSearchString->text().length());
+                /* ensures the selected word visible */
+                int curPrg = 0, curInd = 0;
+                browser->getCursorPosition (&curPrg, &curInd);
+                QRect rect = browser->paragraphRect (curPrg);
+                QString string = browser->text (curPrg);
+                string.truncate (curInd);
+                int x = rect.x() + browser->fontMetrics().width (string);
+                int y = rect.y() + browser->pointSize() / 2;
+                browser->ensureVisible (x, y, 40, 40);
                 break;
             }
@@ -236 +243 @@
                 else if (e->state() == ControlButton && e->key() == Key_F)
                 {
-                    mSearchString->setFocus();
-                    return true;
+                    if (mViewer->currentLogPage())
+                    {
+                        if (isHidden()) show();
+                        mSearchString->setFocus();
+                        return true;
+                    }
+                }
+                /* processing the alpha-numeric keys as the shortcuts to the
+                 * search panel displaying and search activation */
+                else if (e->state() == 0 &&
+                         e->key() >= Qt::Key_Exclam &&
+                         e->key() <= Qt::Key_AsciiTilde)
+                {
+                    if (mViewer->currentLogPage())
+                    {
+                        if (isHidden()) show();
+                        mSearchString->setFocus();
+                        mSearchString->insert (e->text());
+                        return true;
+                    }
                 }
 
@@ -251 +276 @@
     {
         QWidget::showEvent (aEvent);
-        qApp->installEventFilter (this);
         mSearchString->setFocus();
         mSearchString->selectAll();
@@ -260 +284 @@
         if (focusData()->focusWidget()->parent() == this)
            focusNextPrevChild (true);
-        qApp->removeEventFilter (this);
         QWidget::hideEvent (aEvent);
     }
@@ -346 +369 @@
     setTabOrder (mRefreshButton, mCloseButton);
     setTabOrder (mCloseButton, mLogList);
+
+    /* make the [Save] button focused by default */
+    mSaveButton->setFocus();
 
     /* applying language settings */
@@ -478 +504 @@
             }
         }
-        if (aEvent->key() >= Qt::Key_Exclam &&
-            aEvent->key() <= Qt::Key_AsciiTilde &&
-            mLogList->isEnabled())
-        {
-            mSearchPanel->show();
-            mSearchPanel->setText (aEvent->text());
-        }
-    }
-    else if (aEvent->state() == Qt::ControlButton &&
-             aEvent->key() == Qt::Key_F)
-    {
-        if (mLogList->isEnabled())
-            mSearchPanel->show();
     }
     else
@@ -529 +542 @@
     /* clearing old data if any */
     mLogFilesList.clear();
+    mLogList->setEnabled (true);
     while (mLogList->count())
     {
@@ -624 +638 @@
 QTextBrowser* VBoxVMLogViewer::currentLogPage()
 {
-    return static_cast<QTextBrowser*> (mLogList->currentPage());
+    return mLogList->isEnabled() ?
+        static_cast<QTextBrowser*> (mLogList->currentPage()) : 0;
 }