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

List:       kde-commits
Subject:    KDE/kdeedu/kbruch/src
From:       Jeremy Paul Whiting <jeremy () scitools ! com>
Date:       2007-11-03 15:08:52
Message-ID: 1194102532.694871.28757.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 732343 by whiting:

keep maxMainDenominator when changing the number of terms, etc.

 M  +8 -17     mainqtwidget.cpp  


--- trunk/KDE/kdeedu/kbruch/src/mainqtwidget.cpp #732342:732343
@@ -381,6 +381,7 @@
 #ifdef DEBUG
 	kDebug() << "MainQtWidget::NrOfTermsBoxSlot()";
 #endif
+	int currentMaxDenom = m_MaxMainDenominatorBox->currentText().toInt();
 	QString curr_nr = m_NrOfTermsBox->currentText();
 	m_MaxMainDenominatorBox->clear();
 
@@ -392,40 +393,30 @@
 			m_MaxMainDenominatorBox->addItem("20");
 			m_MaxMainDenominatorBox->addItem("30");
 			m_MaxMainDenominatorBox->addItem("50");
-			m_nrRatios = 2;
-			m_maxMainDenominator = 10;
 		} else if (curr_nr == "3") {
 			m_MaxMainDenominatorBox->addItem("20");
 			m_MaxMainDenominatorBox->addItem("30");
 			m_MaxMainDenominatorBox->addItem("50");
-			m_nrRatios = 3;
-			m_maxMainDenominator = 20;
 		} else if (curr_nr == "4") {
 			m_MaxMainDenominatorBox->addItem("20");
 			m_MaxMainDenominatorBox->addItem("30");
 			m_MaxMainDenominatorBox->addItem("50");
-			m_nrRatios = 4;
-			m_maxMainDenominator = 20;
 		} else {
 			m_MaxMainDenominatorBox->addItem("50");
-			m_nrRatios = 5;
-			m_maxMainDenominator = 50;
 		}
-		m_MaxMainDenominatorBox->setCurrentIndex(0);
+		m_nrRatios = curr_nr.toInt();
+		int index = m_MaxMainDenominatorBox->findText(QString::number(currentMaxDenom));
+		m_MaxMainDenominatorBox->setCurrentIndex(index > -1 ? index : 0);
+		m_maxMainDenominator = m_MaxMainDenominatorBox->currentText().toInt();
 	} else {
 		/* no multiplication or division allowed, so we add the default values */
 		m_MaxMainDenominatorBox->addItem("10");
 		m_MaxMainDenominatorBox->addItem("20");
 		m_MaxMainDenominatorBox->addItem("30");
 		m_MaxMainDenominatorBox->addItem("50");
-		if (curr_nr == "2")
-			m_nrRatios = 2;
-		else if (curr_nr == "3")
-			m_nrRatios = 3;
-		else if (curr_nr == "4")
-			m_nrRatios = 4;
-		else
-			m_nrRatios = 5;
+		int index = m_MaxMainDenominatorBox->findText(QString::number(currentMaxDenom));
+		m_MaxMainDenominatorBox->setCurrentIndex(index > -1 ? index : 0);
+		m_nrRatios = curr_nr.toInt();
 	} // if (m_mulDiv == true)
 
 	// set the new task parameters
[prev in list] [next in list] [prev in thread] [next in thread]