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

List:       kde-commits
Subject:    kdebase/ksysguard/gui
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2003-01-01 18:37:58
[Download RAW message or body]

CVS commit by tokoe: 


handcoded TimerSettings


  A            ksgrd/TimerSettings.cc   1.1
  A            ksgrd/TimerSettings.h   1.1
  M +0 -4      .cvsignore   1.23
  M +21 -35    SensorDisplayLib/SensorDisplay.cc   1.11
  M +1 -6      SensorDisplayLib/SensorDisplay.h   1.3
  M +0 -4      ksgrd/.cvsignore   1.4
  M +2 -2      ksgrd/Makefile.am   1.8
  R            ksgrd/TimerSettings.ui   1.4


--- kdebase/ksysguard/gui/.cvsignore  #1.22:1.23
@@ -5,10 +5,6 @@
 ksysguard.kidl
 ksysguard_skel.cc
-TimerSettings.cc
-TimerSettings.h
 ksysguard_signals.cc
 ksysguard_signals.h
 kpm
 Makefile.rules.in
-KSGAppletSettingsWidget.cc
-KSGAppletSettingsWidget.h

--- kdebase/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc  #1.10:1.11
@@ -117,41 +117,27 @@ void
 SensorDisplay::setupTimer()
 {
-        ts = new TimerSettings(this, "TimerSettings", true);
-        Q_CHECK_PTR(ts);
-
-        connect(ts->useGlobalUpdate, SIGNAL(toggled(bool)), this, 
-                        SLOT(timerToggled(bool)));
-
-        ts->useGlobalUpdate->setChecked(globalUpdateInterval);
-        ts->interval->setValue(timerInterval);
+  TimerSettings dlg( this );
 
-    timerToggled( globalUpdateInterval );
+        dlg.setUseGlobalUpdate( globalUpdateInterval );
+  dlg.setInterval( timerInterval );
 
-        if (ts->exec()) {
-                if (ts->useGlobalUpdate->isChecked()) {
+  if ( dlg.exec() ) {
+    if ( dlg.useGlobalUpdate() ) {
                         globalUpdateInterval = true;
 
-                        SensorBoard* sb = dynamic_cast<SensorBoard*>(parentWidget());
-                        if (!sb) {
+      SensorBoard* sb = dynamic_cast<SensorBoard*>( parentWidget() );
+      if ( !sb ) {
                                 kdDebug(1215) << "dynamic cast lacks" << endl;
-                                setUpdateInterval(2);
+        setUpdateInterval( 2 );
                         } else {
-                                setUpdateInterval(sb->updateInterval());
+        setUpdateInterval( sb->updateInterval() );
                         }
                 } else {
                         globalUpdateInterval = false;
-                        setUpdateInterval(ts->interval->value());
-                }
-                setModified(true);
+      setUpdateInterval( dlg.interval() );
         }
 
-        delete ts;
-}
-
-void
-SensorDisplay::timerToggled(bool value)
-{
-        ts->interval->setEnabled(!value);
-        ts->TextLabel1->setEnabled(!value);
+    setModified( true );
+  }
 }
 

--- kdebase/ksysguard/gui/SensorDisplayLib/SensorDisplay.h  #1.2:1.3
@@ -39,5 +39,4 @@
 class QDomDocument;
 class QDomElement;
-class TimerSettings;
 
 namespace KSGRD {
@@ -153,6 +152,4 @@ public slots:
         virtual void applyStyle() { }
 
-        void timerToggled(bool);
-
         virtual void setModified(bool mfd);
                 
@@ -203,6 +200,4 @@ private:
 
         QWidget* plotterWdg;
-
-        TimerSettings* ts;
 };
 

--- kdebase/ksysguard/gui/ksgrd/.cvsignore  #1.3:1.4
@@ -3,8 +3,4 @@
 HostConnector.h
 HostConnector.cc
-KSysGuardAppletSettings.cc
-KSysGuardAppletSettings.h
-TimerSettings.cc
-TimerSettings.h
 *.o
 *.moc.cc

--- kdebase/ksysguard/gui/ksgrd/Makefile.am  #1.7:1.8
@@ -17,6 +17,6 @@
         StyleEngine.cc \
         StyleSettings.cc \
-        HostConnector.ui \
-        TimerSettings.ui
+        TimerSettings.cc \
+        HostConnector.ui
 
 ksgrdincludedir = $(includedir)/ksgrd


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