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

List:       kde-commits
Subject:    KDE/kdeedu/kalzium/src
From:       Pino Toscano <toscano.pino () tiscali ! it>
Date:       2005-06-03 13:53:34
Message-ID: 1117806814.051396.11460.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 421584 by pino:

Give Kalzium a full-working Look menu.


 M  +7 -6      kalzium.cpp  
 M  +5 -0      pse.cpp  
 M  +2 -1      pse.h  


--- trunk/KDE/kdeedu/kalzium/src/kalzium.cpp #421583:421584
@@ -66,10 +66,6 @@
 	setupStatusBar();
 	setupActions();
 
-	m_info = new InformationWidget( m_PSE );
-	connect( m_info, SIGNAL( closed() ), m_PSE, SLOT(slotUnlock()) );
-	connect( m_info, SIGNAL( closed() ), this, SLOT(slotLearningmode()) );
-
 	m_PSE->repaint();
 }
 
@@ -154,9 +150,11 @@
 		m_pLearningmodeAction->setText(i18n("Enter &Learning Mode"));
 		m_PSE->setLearning( false );
 		emit tableLocked(false);
-		if ( m_info->isShown() )
+		if ( m_info && m_info->isShown() )
 		{
-			m_info->hide();
+			disconnect( m_info, SIGNAL( closed() ), m_PSE, SLOT(slotUnlock()) );
+			disconnect( m_info, SIGNAL( closed() ), this, SLOT(slotLearningmode()) );
+			m_info->close();
 		}
 	}
 	else
@@ -164,6 +162,9 @@
 		emit tableLocked(true);
 		m_pLearningmodeAction->setText(i18n("Leave &Learning Mode"));
 		m_PSE->setLearning( true );
+		m_info = new InformationWidget( m_PSE );
+		connect( m_info, SIGNAL( closed() ), m_PSE, SLOT(slotUnlock()) );
+		connect( m_info, SIGNAL( closed() ), this, SLOT(slotLearningmode()) );
 		m_info->show();
 	}
 }
--- trunk/KDE/kdeedu/kalzium/src/pse.cpp #421583:421584
@@ -1117,6 +1117,11 @@
 			setGradient( false );
 			break;
 		}
+		case CRYSTAL:
+		{
+			setGradient( false );
+			break;
+		}
 		case GRADIENT:
 		{
 			setGradient( true );
--- trunk/KDE/kdeedu/kalzium/src/pse.h #421583:421584
@@ -191,7 +191,8 @@
 		}
 
 		void setTimeline( bool timeline ){
-			m_timeline = timeline;
+			if ( m_timeline != timeline )
+				m_timeline = timeline;
 		}
 		
 		int date() const{
[prev in list] [next in list] [prev in thread] [next in thread]