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

List:       kde-commits
Subject:    KDE/kdegames/ksame
From:       Henrique Pinto <henrique.pinto () kdemail ! net>
Date:       2006-11-14 0:47:20
Message-ID: 1163465240.770674.4140.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 604734 by henrique:

 * Remove the KNotification stuff, not used anymore


 M  +3 -3      CMakeLists.txt  
 M  +0 -30     KSameWidget.cpp  
 M  +0 -3      KSameWidget.h  
 D             ksame.notifyrc  
 M  +1 -2      ksameui.rc  


--- trunk/KDE/kdegames/ksame/CMakeLists.txt #604733:604734
@@ -23,9 +23,9 @@
 
 ########### install files ###############
 
-install( FILES ksame.desktop  DESTINATION  ${XDG_APPS_DIR} )
-install( FILES ksameui.rc ksame.notifyrc  DESTINATION  ${DATA_INSTALL_DIR}/ksame )
+install( FILES ksame.desktop      DESTINATION ${XDG_APPS_DIR} )
+install( FILES ksameui.rc         DESTINATION ${DATA_INSTALL_DIR}/ksame )
 install( FILES default_theme.svgz DESTINATION ${DATA_INSTALL_DIR}/ksame/pics/ )
 
-kde4_install_icons( ${ICON_INSTALL_DIR}   )
+kde4_install_icons( ${ICON_INSTALL_DIR} )
 
--- trunk/KDE/kdegames/ksame/KSameWidget.cpp #604733:604734
@@ -32,8 +32,6 @@
 #include <KAction>
 #include <KGlobal>
 #include <KToggleAction>
-#include <KNotification>
-#include <KNotifyConfigWidget>
 
 #include <kdebug.h>
 #include <kstdaction.h>
@@ -59,9 +57,6 @@
 	m_showNumberRemainingAction = new KToggleAction(i18n("&Show Number Remaining"), \
actionCollection(), "showNumberRemaining");  connect(m_showNumberRemainingAction, \
SIGNAL(triggered(bool) ), SLOT(showNumberRemainingToggled()));  
-	KStdAction::configureNotifications(this, SLOT(configureNotifications()),
-               actionCollection());
-
 	m_statusBar = statusBar();
 	m_statusBar->insertItem( i18n( "Colors: XX" ), 1, 1 );
 	m_statusBar->insertItem( i18n( "Board: XXXXXX" ), 2, 1 );
@@ -74,7 +69,6 @@
 	connect( m_board, SIGNAL( newCountOfMarkedStones( int ) ),     this, SLOT( \
setMarked( int ) ) );  connect( m_board, SIGNAL( gameOver() ),                        \
this, SLOT( gameover() ) );  connect( m_board, SIGNAL( newGameStarted( quint32, \
                quint8 ) ), this, SLOT( onNewGameStarted( quint32, quint8 ) ) );
-	connect( m_board, SIGNAL( stonesRemoved( int ) ),              this, SLOT( \
stonesRemoved( int ) ) );  
 	KSame::View* view = new KSame::View( m_board );
 	setCentralWidget( view );
@@ -191,12 +185,6 @@
 	m_statusBar->changeItem( ki18n( "Marked: %1" ).subs( markedStones, 6 ).toString(), \
3);  }
 
-void KSameWidget::stonesRemoved( int count )
-{
-	KNotification::event( "stones removed",
-	                      i18np( "One stone removed.","%n stones removed.", count ), \
                QPixmap(), this);
-}
-
 void KSameWidget::setScore( quint32 score )
 {
 	if ( m_showNumberRemainingAction->isChecked() )
@@ -216,19 +204,6 @@
 
 void KSameWidget::gameover()
 {
-	if ( m_board->won() )
-	{
-		KNotification::event( "game won",
-		                      i18n( "You even removed the last stone, great job! "
-		                      "This gave you a score of %1 in total.", m_board->score() ), \
                QPixmap(), this );
-	}
-	else
-	{
-		KNotification::event( "game over",
-		                      i18n( "There are no more removable stones. "
-		                      "You got a score of %1 in total.", m_board->score() ), \
                QPixmap(), this );
-	}
-
 	KScoreDialog d( KScoreDialog::Name | KScoreDialog::Score, this );
 	d.addField( KScoreDialog::Custom1, i18n( "Board" ), "Board" );
 
@@ -239,9 +214,4 @@
 		d.exec();
 }
 
-void KSameWidget::configureNotifications()
-{
-    KNotifyConfigWidget::configure( this );
-}
-
 #include "KSameWidget.moc"
--- trunk/KDE/kdegames/ksame/KSameWidget.h #604733:604734
@@ -44,12 +44,9 @@
 		void showHighScoreDialog();
 		void undo();
 
-		void configureNotifications();
-
 		void gameover();
 		void setScore(quint32 score);
 		void setMarked(int m);
-		void stonesRemoved( int count );
 
 		void showNumberRemainingToggled();
 
--- trunk/KDE/kdegames/ksame/ksameui.rc #604733:604734
@@ -1,12 +1,11 @@
 <!DOCTYPE kpartgui>
 <kpartgui name="ksame" version="11">
 <MenuBar>
-    <Menu name="settings" noMerge="1"><text>&amp;Settings</text>
+    <Menu name="settings"><text>&amp;Settings</text>
         <Action name="random_board"/>
         <Action name="showNumberRemaining"/>
         <Separator/>
         <Action name="options_configure_keybinding"/>
-        <Action name="options_configure_notifications"/>
     </Menu>
 </MenuBar>
 


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