Changeset 30196 in vbox for trunk

Timestamp:

Jun 15, 2010 1:22:05 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: try to use the host icon and change the button order

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMLogViewer.cpp (modified) (5 diffs)

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

@@ -363 +363 @@
 #ifndef Q_WS_MAC
     /* No icons on the Mac */
-    mButtonsNextPrev->setIcon(0, UIIconPool::iconSet(":/list_movedown_16px.png",
-                                                     ":/list_movedown_disabled_16px.png"));
-    mButtonsNextPrev->setIcon(1, UIIconPool::iconSet(":/list_moveup_16px.png",
-                                                     ":/list_moveup_disabled_16px.png"));
+    mButtonsNextPrev->setIcon(0, UIIconPool::defaultIcon(UIIconPool::ArrowBackIcon, this));
+    mButtonsNextPrev->setIcon(1, UIIconPool::defaultIcon(UIIconPool::ArrowForwardIcon, this));
 #endif /* !Q_WS_MAC */
     connect (mButtonsNextPrev, SIGNAL (clicked (int)), this, SLOT (find (int)));
@@ -420 +418 @@
     mSearchString->setToolTip (tr ("Enter a search string here"));
 
-    mButtonsNextPrev->setTitle (0, tr ("&Next"));
-    mButtonsNextPrev->setToolTip (0, tr ("Search for the next occurrence of "
+    mButtonsNextPrev->setTitle (0, tr ("&Previous"));
+    mButtonsNextPrev->setToolTip (0, tr ("Search for the previous occurrence "
+                                         "of the string"));
+
+    mButtonsNextPrev->setTitle (1, tr ("&Next"));
+    mButtonsNextPrev->setToolTip (1, tr ("Search for the next occurrence of "
                                          "the string"));
-
-    mButtonsNextPrev->setTitle (1, tr ("&Previous"));
-    mButtonsNextPrev->setToolTip (1, tr ("Search for the previous occurrence "
-                                         "of the string"));
-
 
     mCaseSensitive->setText (tr ("C&ase Sensitive"));
@@ -515 +512 @@
                 (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return))
             {
-                mButtonsNextPrev->animateClick (0);
+                mButtonsNextPrev->animateClick (1);
                 return true;
             }
@@ -522 +519 @@
             {
                 if (e->QInputEvent::modifiers() == 0)
+                    mButtonsNextPrev->animateClick (1);
+                else if (e->QInputEvent::modifiers() == Qt::ShiftModifier)
                     mButtonsNextPrev->animateClick (0);
-                else if (e->QInputEvent::modifiers() == Qt::ShiftModifier)
-                    mButtonsNextPrev->animateClick (1);
                 return true;
             }
@@ -592 +589 @@
 {
     if (aButton == 0)
+        findBack();
+    else
         findNext();
-    else
-        findBack();
-}
-
+}
+