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

List:       kde-commits
Subject:    KDE/kdeedu/kalzium/src/calculator
From:       Etienne Rebetez <etienne.rebetez () oberwallis ! ch>
Date:       2011-03-18 20:28:01
Message-ID: 20110318202801.7D316AC8CA () svn ! kde ! org
[Download RAW message or body]

SVN commit 1225253 by erebetez:

fixing combobox items not beeing cleared, when they got repopulated.

 M  +28 -15    gasCalculator.cpp  
 M  +1 -0      gasCalculator.h  


--- trunk/KDE/kdeedu/kalzium/src/calculator/gasCalculator.cpp #1225252:1225253
@@ -27,6 +27,8 @@
 {
     ui.setupUi(this);
 
+    setupUnitComboboxes();
+
     init();
 
     connect(ui.temp , SIGNAL(valueChanged(double)),
@@ -78,6 +80,30 @@
     ui.mass     -> setValue(2.016);
     ui.moles    -> setValue(1.0);
 
+    ui.mass_unit->setCurrentIndex(0);
+    ui.pressure_unit->setCurrentIndex(0);
+    ui.temp_unit->setCurrentIndex(0);
+    ui.volume_unit->setCurrentIndex(0);
+    ui.b_unit->setCurrentIndex(0);
+
+    m_temp = Value(273.0, KUnitConversion::Kelvin);
+    m_molarMass = 2.016;
+    m_pressure = Value(1.0, KUnitConversion::Atmosphere);
+    m_mass = Value(2.016, KUnitConversion::Gram);
+    m_moles = 1.0;
+    m_Vand_a = 0.0;
+    m_Vand_b = Value(0.0, KUnitConversion::Liter);
+    m_vol = Value(22.4, KUnitConversion::Liter);
+
+    if (Prefs::ideal()) {
+        ui.non_ideal->hide();
+    }
+
+    setMode(VOLUME);
+}
+
+void gasCalculator::setupUnitComboboxes()
+{
     QList<int> units;
     units << Gram << Milligram << Kilogram << Ton;
     populateUnitCombobox( ui.mass_unit, units );
@@ -97,25 +123,12 @@
     units.clear();
     units << Liter << Milliliter << CubicMeter << KUnitConversion::GallonUS;
     populateUnitCombobox( ui.b_unit, units );
-
-    m_temp = Value(273.0, KUnitConversion::Kelvin);
-    m_molarMass = 2.016;
-    m_pressure = Value(1.0, KUnitConversion::Atmosphere);
-    m_mass = Value(2.016, KUnitConversion::Gram);
-    m_moles = 1.0;
-    m_Vand_a = 0.0;
-    m_Vand_b = Value(0.0, KUnitConversion::Liter);
-    m_vol = Value(22.4, KUnitConversion::Liter);
-
-    if (Prefs::ideal()) {
-        ui.non_ideal->hide();
     }
 
-    setMode(VOLUME);
-}
-
 void gasCalculator::populateUnitCombobox(QComboBox *comboBox, const QList< int > &unitList)
 {
+    comboBox->clear();
+
     foreach( int unit, unitList) {
         comboBox->addItem( KUnitConversion::Converter().unit(unit).data()->description(), unit);
     }
--- trunk/KDE/kdeedu/kalzium/src/calculator/gasCalculator.h #1225252:1225253
@@ -142,6 +142,7 @@
     void init();
 
 private:
+    void setupUnitComboboxes();
     void populateUnitCombobox(QComboBox *comboBox, const QList<int> &unitList);
 
     int getCurrentUnitId(QComboBox *comboBox);
[prev in list] [next in list] [prev in thread] [next in thread]