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

List:       kde-commits
Subject:    kdeedu/kalzium
From:       Anne-Marie Mahfouf <annma () kde ! org>
Date:       2004-06-29 19:50:50
Message-ID: 20040629195050.C5B739449 () office ! kde ! org
[Download RAW message or body]

CVS commit by annma: 

simplify code


  M +10 -0     ChangeLog   1.31
  M +14 -11    src/kalzium.cpp   1.147


--- kdeedu/kalzium/ChangeLog  #1.30:1.31
@@ -1,2 +1,12 @@
+- move the legend out of pse.cpp/h and put it where it belongs: in the 
+CentralWidget (which as been renamed)
+- hide the timeline and the som at first startup
+- save all settings at quit and load them at start (didn't work before)
+- fix all known issues with the SOM
+- fixes some strings and puts some comments in i18n()-calls
+- uses KGlobalSettings instead of "times"
+- Add/improves the documentation in the .cpp and .h-files
+- removes some unused methods and connect()
+
 Version 0.6.1:
 - codecleanup

--- kdeedu/kalzium/src/kalzium.cpp  #1.146:1.147
@@ -298,5 +298,9 @@ void Kalzium::slotUpdateSettings()
         displayTemperature();
         displayEnergie();
-        slotTempChanged(Prefs::temperaturevalue() );
+        slotTempChanged( Prefs::temperaturevalue());
+        //if (m_bShowSOM )
+        //m_pCurrentPSE->setTemperature(Prefs::temperaturevalue());
+        //else
+        //m_pCurrentPSE->activateColorScheme(Prefs::colorschemebox());
 }
 
@@ -374,21 +378,20 @@ void Kalzium::slotTempChanged( int tempe
 {
         kdDebug() << "Kalzium::slotTempChanged()" << endl;
+        double tempTemp;
         switch (Prefs::temperature()) {
                 case 0:
-                        m_pCurrentPSE->setTemperature( (double) temperature );
-                        slotStatusBar( i18n( "the argument %1 is the unit of the \
                temperature (K, C or F)","Temperature: %1" ).arg( temperature ), \
                IDS_TEMPERATURE );
-                        m_pSOMSlider->value->display(temperature);
+                        tempTemp = temperature;
                         break;
                 case 1:
-                        m_pCurrentPSE->setTemperature( (double) temperature + 273.15 \
                );
-                        slotStatusBar( i18n( "the argument %1 is the unit of the \
temperature (K, C or F)","Temperature: %1" ).arg( temperature + 273.15 ), \
                IDS_TEMPERATURE );
-                        m_pSOMSlider->value->display((int) (temperature + 273.15));
+                        tempTemp = temperature + 273.15;
                         break;
                 case 2:
-                        m_pCurrentPSE->setTemperature( (double) (temperature - \
                32)*5/9 + 273.15);
-                        slotStatusBar( i18n( "the argument %1 is the unit of the \
temperature (K, C or F)","Temperature: %1" ).arg( (temperature - 32)*5/9 + 273.15 ), \
                IDS_TEMPERATURE );
-                        m_pSOMSlider->value->display((int) (( temperature - 32)*5/9 \
+ 273.15)); +                        tempTemp = (temperature - 32)*5/9 + 273.15 ;
                         break;
         }
+        m_pCurrentPSE->setTemperature( tempTemp);
+        slotStatusBar( i18n( "the argument %1 is the unit of the temperature (K, C \
or F)","Temperature: %1" ).arg(tempTemp), IDS_TEMPERATURE ); +        \
m_pSOMSlider->value->display((int) tempTemp); +                        
         Prefs::setTemperaturevalue(temperature);
         Prefs::writeConfig();


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