Changeset 3805 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 24, 2007 10:30:02 AM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

23148

Message:

2124: VirtualBox LogViewer search mechanism:

LogViewer search mechanism improvements done:

1. [Help]...[Find][Save][Refresh][Close] dialog button's configuration.
2. Standard Help button.
3. Find button for toggling search-panel visibility on/off.
4. Name filter for log files added (*.log *.log.*).
5. Search mechanism starts by any alpha-numeric key (w/o modifiers).

Location:

trunk/src/VBox/Frontends/VirtualBox/ui

Files:

• VBoxVMLogViewer.ui (modified) (4 diffs)
• VBoxVMLogViewer.ui.h (modified) (7 diffs)

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

@@ -63 +63 @@
                     <cstring>unnamed</cstring>
                 </property>
+                <widget class="QPushButton">
+                    <property name="name">
+                        <cstring>mHelpButton</cstring>
+                    </property>
+                    <property name="text">
+                        <string>&amp;Help</string>
+                    </property>
+                    <property name="accel">
+                        <string>Alt+H</string>
+                    </property>
+                </widget>
                 <spacer>
                     <property name="name">
@@ -80 +91 @@
                     </property>
                 </spacer>
+                <widget class="QPushButton">
+                    <property name="name">
+                        <cstring>mFindButton</cstring>
+                    </property>
+                    <property name="text">
+                        <string>&amp;Find</string>
+                    </property>
+                    <property name="accel">
+                        <string>Alt+F</string>
+                    </property>
+                </widget>
                 <widget class="QPushButton">
                     <property name="name">
@@ -127 +149 @@
 <connections>
     <connection>
+        <sender>mHelpButton</sender>
+        <signal>clicked()</signal>
+        <receiver>&amp;vboxProblem()</receiver>
+        <slot>showHelpHelpDialog()</slot>
+    </connection>
+    <connection>
+        <sender>mFindButton</sender>
+        <signal>clicked()</signal>
+        <receiver>VBoxVMLogViewer</receiver>
+        <slot>search()</slot>
+    </connection>
+    <connection>
+        <sender>mSaveButton</sender>
+        <signal>clicked()</signal>
+        <receiver>VBoxVMLogViewer</receiver>
+        <slot>save()</slot>
+    </connection>
+    <connection>
+        <sender>mRefreshButton</sender>
+        <signal>clicked()</signal>
+        <receiver>VBoxVMLogViewer</receiver>
+        <slot>refresh()</slot>
+    </connection>
+    <connection>
         <sender>mCloseButton</sender>
         <signal>clicked()</signal>
         <receiver>VBoxVMLogViewer</receiver>
         <slot>close()</slot>
-    </connection>
-    <connection>
-        <sender>mSaveButton</sender>
-        <signal>clicked()</signal>
-        <receiver>VBoxVMLogViewer</receiver>
-        <slot>save()</slot>
-    </connection>
-    <connection>
-        <sender>mRefreshButton</sender>
-        <signal>clicked()</signal>
-        <receiver>VBoxVMLogViewer</receiver>
-        <slot>refresh()</slot>
     </connection>
 </connections>
 <includes>
     <include location="local" impldecl="in declaration">VBoxGlobal.h</include>
+    <include location="local" impldecl="in implementation">VBoxProblemReporter.h</include>
     <include location="global" impldecl="in implementation">qsizegrip.h</include>
     <include location="global" impldecl="in implementation">qstatusbar.h</include>
@@ -183 +218 @@
     <slot access="pritave">refresh()</slot>
     <slot access="private">save()</slot>
+    <slot access="private">search()</slot>
 </slots>
 <functions>

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

@@ -138 +138 @@
             tr ("Perform case sensitive search (when checked)"));
         mWarningString->setText (tr ("String not found"));
+    }
+
+    void setText (const QString &aText)
+    {
+        mSearchString->setText (aText);
     }
 
@@ -248 +253 @@
         qApp->installEventFilter (this);
         mSearchString->setFocus();
+        mSearchString->selectAll();
     }
 
@@ -334 +340 @@
 
     /* fix the tab order to ensure the dialog keys are always the last */
-    setTabOrder (mSearchPanel->focusProxy(), mSaveButton);
+    setTabOrder (mSearchPanel->focusProxy(), mHelpButton);
+    setTabOrder (mHelpButton, mFindButton);
+    setTabOrder (mFindButton, mSaveButton);
     setTabOrder (mSaveButton, mRefreshButton);
     setTabOrder (mRefreshButton, mCloseButton);
@@ -470 +478 @@
             }
         }
+        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 &&
@@ -529 +544 @@
     {
         /* reading log files folder */
+        logFilesDir.setNameFilter ("*.log *.log.*");
         QStringList logList = logFilesDir.entryList (QDir::Files);
         if (!logList.empty()) isAnyLogPresent = true;
@@ -556 +572 @@
 
     /* enable/disable save button & tab widget according log presence */
+    mFindButton->setEnabled (isAnyLogPresent);
     mSaveButton->setEnabled (isAnyLogPresent);
     mLogList->setEnabled (isAnyLogPresent);
@@ -639 +656 @@
 }
 
+void VBoxVMLogViewer::search()
+{
+    mSearchPanel->isHidden() ? mSearchPanel->show() : mSearchPanel->hide();
+}
+
 #include "VBoxVMLogViewer.ui.moc"