diff -r a9295db4dcbf -r c79486b7cb4b findwidget.cpp --- a/findwidget.cpp Thu Nov 26 14:55:23 2009 +0000 +++ b/findwidget.cpp Fri Nov 27 13:31:21 2009 +0000 @@ -6,6 +6,7 @@ extern QString vymName; +extern QString iconPath; FindWidget::FindWidget(QWidget *) { @@ -14,7 +15,8 @@ // Create Buttons cancelbutton = new QPushButton; - cancelbutton->setText(tr("Cancel")); + //cancelbutton->setText(tr("Cancel")); + cancelbutton->setIcon (QIcon (iconPath+"fileclose.png")); cancelbutton->setShortcut (Qt::Key_Escape); connect ( cancelbutton, SIGNAL( clicked() ), this, SLOT( cancelPressed() ) ); @@ -25,6 +27,9 @@ findcombo = new QComboBox; findcombo->setMinimumWidth(250); findcombo->setEditable(true); + + QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + findcombo->setSizePolicy(sizePolicy); connect ( findcombo, SIGNAL( highlighted(int) ), this, SLOT( nextPressed() ) ); connect ( findcombo, SIGNAL( textChanged(const QString &) ), @@ -45,7 +50,7 @@ mainLayout->addLayout (row2Layout); setLayout (mainLayout); - setStatus (Undefined); + status=Undefined; } void FindWidget::popup() @@ -53,6 +58,7 @@ show(); findcombo->lineEdit()->selectAll(); findcombo->setFocus(); + setStatus (Undefined); } void FindWidget::cancelPressed() @@ -67,17 +73,20 @@ void FindWidget::findTextChanged(const QString&) { - emit (somethingChanged() ); + setStatus (Undefined); } void FindWidget::setStatus (Status st) { + if (st==status) return; + + status=st; QPalette p=palette(); QColor c; switch (st) { - case Success: c=QColor (100,255,100); break; - case Failed: c=QColor (255,100,100); break; + case Success: c=QColor (120,255,120); break; + case Failed: c=QColor (255,120,120); break; default: c=QColor (255,255,255); } p.setColor(QPalette::Active, static_cast(9), c);