[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-12-30 14:42:15
Message-ID: 1167489735.479998.9287.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 617908 by henrique:

 * Rename KSameWidget to KSame::MainWindow


 M  +3 -2      CMakeLists.txt  
 D             KSameWidget.cpp  
 D             KSameWidget.h  
 M  +8 -9      board.cpp  
 M  +1 -0      ksameui.rc  
 M  +8 -8      main.cpp  
 A             mainwindow.cpp   KSameWidget.cpp#617778 [License: GPL (v2+)]
 A             mainwindow.h   KSameWidget.h#617778 [License: GPL (v2+)]


--- trunk/KDE/kdegames/ksame/CMakeLists.txt #617907:617908
@@ -7,10 +7,11 @@
 
 set(ksame_SRCS 
     main.cpp 
-    KSameWidget.cpp
+    mainwindow.cpp
     board.cpp
     view.cpp
-    renderer.cpp )
+    renderer.cpp
+   )
 
 kde4_automoc(${ksame_SRCS})
 
--- trunk/KDE/kdegames/ksame/board.cpp #617907:617908
@@ -303,15 +303,6 @@
 		m_score += 1000;
 	}
 
-
-	if ( isGameOver() )
-	{
-		m_undoList.clear();
-		generateGameOverPixmap( won() );
-		m_gameOverOverlay->show();
-		emit gameOver();
-	}
-
 	emit scoreChanged( m_score );
 	emit stonesRemoved( m_markedStones.count() );
 
@@ -320,6 +311,14 @@
 	m_changed = true;
 
 	createItems();
+
+	if ( isGameOver() )
+	{
+		m_undoList.clear();
+		generateGameOverPixmap( won() );
+		m_gameOverOverlay->show();
+		emit gameOver();
+	}
 }
 
 bool KSame::Board::isGameOver() const
--- trunk/KDE/kdegames/ksame/ksameui.rc #617907:617908
@@ -4,6 +4,7 @@
     <Menu name="settings"><text>&amp;Settings</text>
         <Action name="random_board"/>
         <Action name="showNumberRemaining"/>
+        <Action name="select_theme"/>
         <Separator/>
         <Action name="options_configure_keybinding"/>
     </Menu>
--- trunk/KDE/kdegames/ksame/main.cpp #617907:617908
@@ -21,13 +21,13 @@
 
 #include <QWidget>
 
-#include <kapplication.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <KApplication>
+#include <KLocale>
+#include <KCmdLineArgs>
+#include <KAboutData>
+#include <KGlobal>
 
-#include "KSameWidget.h"
-#include <kaboutdata.h>
-#include <kglobal.h>
+#include "mainwindow.h"
 
 static const char description[] = I18N_NOOP("Same Game\nA little game about balls \
and how to get rid of them");  static const char copyright[] = "(c) 1997-1998 Marcus \
Kreutzberger"; @@ -48,11 +48,11 @@
 
 	if ( app.isSessionRestored() )
 	{
-		RESTORE( KSameWidget );
+		RESTORE( KSame::MainWindow );
 	}
 	else
 	{
-		KSameWidget *w = new KSameWidget;
+		KSame::MainWindow *w = new KSame::MainWindow;
 		w->show();
 	}
 


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