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

List:       kde-commits
Subject:    kalziumkde4: kdeedu/kalzium/src
From:       Carsten Niehaus <cniehaus () gmx ! de>
Date:       2005-02-01 20:34:39
Message-ID: 20050201203439.E1B261CEC4 () office ! kde ! org
[Download RAW message or body]

CVS commit by cniehaus: 

saving the status quo before loosing it again


  A            data/groups.xml   1.1.2.1
  A            data/periods.xml   1.1.2.1
  M +9 -0      informationdialog.ui   1.1.2.2
  M +7 -0      informationdialog_impl.cpp   1.1.2.2
  M +1 -0      informationdialog_impl.h   1.1.2.2
  M +4 -6      kalzium.cpp   1.158.2.19
  M +0 -2      kalzium.h   1.76.2.10
  M +7 -3      pse.h   1.14.4.11
  M +1 -1      data/Makefile.am   1.2.4.1


--- kdeedu/kalzium/src/informationdialog.ui  #1.1.2.1:1.1.2.2
@@ -239,5 +239,14 @@
         <slot>reject()</slot>
     </connection>
+    <connection>
+        <sender>buttonGroup</sender>
+        <signal>clicked(int)</signal>
+        <receiver>InformationDialog</receiver>
+        <slot>slotSelectionChanged(int)</slot>
+    </connection>
 </connections>
+<slots>
+    <slot>slotSelectionChanged(int)</slot>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>

--- kdeedu/kalzium/src/informationdialog_impl.cpp  #1.1.2.1:1.1.2.2
@@ -5,4 +5,6 @@
 #include <qlabel.h>
 
+#include <kdebug.h>
+
 
 InformationWidget::InformationWidget( QWidget *parent )
@@ -11,4 +13,9 @@ InformationWidget::InformationWidget( QW
 }
 
+void InformationWidget::slotSelectionChanged( int number )
+{
+}
+
+
 void InformationWidget::slotUpdate( QPoint point )
 {

--- kdeedu/kalzium/src/informationdialog_impl.h  #1.1.2.1:1.1.2.2
@@ -19,4 +19,5 @@ class InformationWidget : public Informa
         public slots:
                 void slotUpdate( QPoint point );
+                void slotSelectionChanged( int );
 };
 #endif // INFORMATIONDIALOG_IMPL_H

--- kdeedu/kalzium/src/kalzium.cpp  #1.158.2.18:1.158.2.19
@@ -21,4 +21,5 @@
 #include "detailinfodlg.h"
 #include "informationdialog_impl.h"
+#include "pse.h"
 
 #include <qinputdialog.h>
@@ -26,4 +27,5 @@
 #include <qslider.h>
 #include <qlcdnumber.h>
+#include <qbuttongroup.h>
 
 #include <kconfigdialog.h>
@@ -48,6 +50,4 @@ Kalzium::Kalzium()
         m_bShowTimeline = false;//TODO fix the som
 
-        m_Horizontal = false;
-        
         pd = new privatedata( this );
 
@@ -163,10 +163,8 @@ void Kalzium::setupActions()
 void Kalzium::slotLearningmode()
 {
-        m_Horizontal ? m_Horizontal = false : m_Horizontal = true;
-        m_PSE->setLearningMode( m_Horizontal );
-
-        InformationWidget *info = new InformationWidget( this );
+        InformationWidget *info = new InformationWidget( m_PSE );
         info->show( );
         connect( m_PSE, SIGNAL( tableClicked( QPoint ) ), info, SLOT( slotUpdate( QPoint ) ) );
+    connect( info->buttonGroup, SIGNAL( clicked(int) ), m_PSE , SLOT( setLearningMode(int) ) );
 }
 

--- kdeedu/kalzium/src/kalzium.h  #1.76.2.9:1.76.2.10
@@ -60,6 +60,4 @@ class Kalzium : public KMainWindow
                 void showSOMWidgets( bool show );
 
-                bool m_Horizontal;
-
                 /**
                  * the slider used for the State of Matter

--- kdeedu/kalzium/src/pse.h  #1.14.4.10:1.14.4.11
@@ -129,7 +129,4 @@ class PSE : public QWidget
                 }
 
-                void setLearningMode( bool horizontal ){
-                        m_Horizontal = horizontal;
-                }
 
         private:
@@ -183,4 +180,11 @@ class PSE : public QWidget
                 void setDate( int date );
                 
+         void setLearningMode( int horizontal ){
+                        if ( horizontal == 1 )
+                                m_Horizontal = true;
+                        else
+                                m_Horizontal = false;
+                }
+                
         protected:
   virtual void paintEvent( QPaintEvent *e );

--- kdeedu/kalzium/src/data/Makefile.am  #1.2:1.2.4.1
@@ -1,3 +1,3 @@
-xml_DATA = questions.xml
+xml_DATA = questions.xml periods.xml groups.xml
 
 xmldir = $(kde_datadir)/kalzium/data


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