1.1 --- a/findwidget.cpp	Thu Nov 26 14:55:23 2009 +0000
     1.2 +++ b/findwidget.cpp	Fri Nov 27 13:31:21 2009 +0000
     1.3 @@ -6,6 +6,7 @@
     1.4  
     1.5  
     1.6  extern QString vymName;
     1.7 +extern QString iconPath;
     1.8  
     1.9  FindWidget::FindWidget(QWidget *)
    1.10  {
    1.11 @@ -14,7 +15,8 @@
    1.12      
    1.13  	// Create Buttons
    1.14  	cancelbutton = new QPushButton;
    1.15 -	cancelbutton->setText(tr("Cancel"));
    1.16 +	//cancelbutton->setText(tr("Cancel"));
    1.17 +	cancelbutton->setIcon (QIcon (iconPath+"fileclose.png"));
    1.18  	cancelbutton->setShortcut (Qt::Key_Escape);
    1.19  	connect ( cancelbutton, SIGNAL( clicked() ), this, SLOT( cancelPressed() ) );
    1.20  	
    1.21 @@ -25,6 +27,9 @@
    1.22      findcombo = new QComboBox;
    1.23  	findcombo->setMinimumWidth(250);
    1.24  	findcombo->setEditable(true);
    1.25 +
    1.26 +	QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
    1.27 +    findcombo->setSizePolicy(sizePolicy);
    1.28  	connect ( findcombo, SIGNAL( highlighted(int) ), 
    1.29  		this, SLOT( nextPressed() ) );
    1.30  	connect ( findcombo, SIGNAL( textChanged(const QString &) ), 
    1.31 @@ -45,7 +50,7 @@
    1.32  	mainLayout->addLayout (row2Layout);
    1.33  
    1.34  	setLayout (mainLayout);
    1.35 -	setStatus (Undefined);
    1.36 +	status=Undefined;
    1.37  }
    1.38  
    1.39  void FindWidget::popup()
    1.40 @@ -53,6 +58,7 @@
    1.41  	show();
    1.42  	findcombo->lineEdit()->selectAll();
    1.43  	findcombo->setFocus();
    1.44 +	setStatus (Undefined);
    1.45  }
    1.46  
    1.47  void FindWidget::cancelPressed()
    1.48 @@ -67,17 +73,20 @@
    1.49  
    1.50  void FindWidget::findTextChanged(const QString&)
    1.51  {
    1.52 -	emit (somethingChanged() );
    1.53 +	setStatus (Undefined);
    1.54  }
    1.55  
    1.56  void FindWidget::setStatus (Status st)
    1.57  {
    1.58 +	if (st==status) return;
    1.59 +
    1.60 +	status=st;
    1.61  	QPalette p=palette();
    1.62  	QColor c;
    1.63  	switch (st)
    1.64  	{
    1.65 -		case Success: c=QColor (100,255,100); break;
    1.66 -		case Failed:  c=QColor (255,100,100); break;
    1.67 +		case Success: c=QColor (120,255,120); break;
    1.68 +		case Failed:  c=QColor (255,120,120); break;
    1.69  		default:  c=QColor (255,255,255); 
    1.70  	}
    1.71      p.setColor(QPalette::Active, static_cast<QPalette::ColorRole>(9), c);