[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeedu/kmplot/kmplot
From:       Fredrik Edemar <f_edemar () linux ! se>
Date:       2005-02-11 20:58:18
Message-ID: 20050211205818.2DC931CFF8 () office ! kde ! org
[Download RAW message or body]

CVS commit by fedemar: 

Make the KMinMax dialog non-modal and solve a bug.

BUG: 98467


  M +1 -1      MainDlg.cpp   1.149
  M +8 -8      kminmax.cpp   1.39
  M +0 -1      kminmax.h   1.8


--- kdeedu/kmplot/kmplot/kminmax.cpp  #1.38:1.39
@@ -38,5 +38,5 @@
 
 KMinMax::KMinMax(View *v, QWidget *parent, const char *name)
-        : QMinMax(parent, name, true), m_view(v)
+        : QMinMax(parent, name), m_view(v)
 {
         m_mode=-1;
@@ -137,11 +137,9 @@ void KMinMax::updateFunctions()
 {
         QString const selected_item(list->currentText() );
-        
         list->clear();
 
-        //for ( uint index = 0; index < m_view->parser()->fktext.count(); ++index )
         for( QValueVector<Ufkt>::iterator it =  m_view->parser()->ufkt.begin(); it \
!=  m_view->parser()->ufkt.end(); ++it)  {
-                if( it->fname[0] != 'x' && it->fname[0] != 'y' && it->fname[0] != \
'r') +                if( it->fname[0] != 'x' && it->fname[0] != 'y' && it->fname[0] \
!= 'r' && !it->fname.isEmpty())  {
                         if ( it->f_mode )
@@ -173,10 +172,13 @@ void KMinMax::updateFunctions()
                 }
         }
+        list->sort();
+        if (list->count()==0) //empty list
+                cmdFind->setEnabled(false);
+        else
+                cmdFind->setEnabled(true);
         selectItem();
         QListBoxItem *found_item = list->findItem(selected_item,Qt::ExactMatch);
         if ( found_item && m_view->csmode < 0)
-        {
                 list->setSelected(found_item,true);
-        }
 }
 
@@ -382,6 +384,4 @@ void KMinMax::list_highlighted(QListBoxI
                 }
         }
-        
-
 }
 void KMinMax::cmdParameter_clicked()

--- kdeedu/kmplot/kmplot/kminmax.h  #1.7:1.8
@@ -38,5 +38,4 @@ class KMinMax : public QMinMax
 Q_OBJECT
 public:
-    //KMinMax(QWidget *parent = 0, const char *name = 0);
     KMinMax(View *, QWidget *parent = 0, const char *name = 0);
     /// called every time the dialog is opened

--- kdeedu/kmplot/kmplot/MainDlg.cpp  #1.148:1.149
@@ -88,5 +88,5 @@ MainDlg::MainDlg(QWidget *parentWidget, 
         setWidget( view );
         view->setFocusPolicy(QWidget::ClickFocus);
-        minmaxdlg = new KMinMax(view);
+        minmaxdlg = new KMinMax(view, m_parent);
         view->setMinMaxDlg(minmaxdlg);
         m_quickEdit = new KLineEdit( parentWidget );


[prev in list] [next in list] [prev in thread] [next in thread]