diff src/findwidget.cpp @ 558:d932ce55c364 find

Remove the single find widget from top, add one to each tab at the bottom instead. (Turns out you don't usually want to search for the same text in both types of widget.) Also provide sensible no-results text.
author Chris Cannam
date Mon, 27 Feb 2012 17:08:26 +0000
parents 57a7f95ef400
children 533519ebc0cb
line wrap: on
line diff
--- a/src/findwidget.cpp	Thu Feb 23 15:28:29 2012 +0000
+++ b/src/findwidget.cpp	Mon Feb 27 17:08:26 2012 +0000
@@ -26,25 +26,26 @@
     QWidget(parent)
 {
     QGridLayout *layout = new QGridLayout;
+    layout->setMargin(0);
     setLayout(layout);
 
     QToolButton *button = new QToolButton();
     layout->addWidget(button, 0, 0);
     button->setText(tr("Find..."));
     button->setToolButtonStyle(Qt::ToolButtonTextOnly);
-    button->setAutoRaise(true);
+//    button->setAutoRaise(true);
     connect(button, SIGNAL(clicked()), this, SLOT(buttonPressed()));
 
-/*
-    QLabel *label = new QLabel(tr("Find:"));
-    layout->addWidget(label, 0, 0);
-*/
     m_lineEdit = new QLineEdit();
     layout->addWidget(m_lineEdit, 0, 1);
 
     m_lineEdit->setFixedWidth(100);
     m_lineEdit->hide();
 
+    int h = m_lineEdit->sizeHint().height();
+    int h0 = button->sizeHint().height();
+    if (h > h0) button->setFixedHeight(h);
+
     connect(m_lineEdit, SIGNAL(textChanged(const QString &)),
 	    this, SIGNAL(findTextChanged(QString)));
 }
@@ -66,6 +67,7 @@
         }
     } else {
 	m_lineEdit->show();
+        m_lineEdit->setFocus(Qt::OtherFocusReason);
 	button->setText(tr("Find:"));
         if (m_lineEdit->text() != "") {
             emit findTextChanged(m_lineEdit->text());