step6.diff.txt

使用symbian的s60实现的小游戏俄罗斯方块（第三步）

Binary files step5/aif/Icon.bmp and step6/aif/Icon.bmp differ
Binary files step5/aif/IconMask.bmp and step6/aif/IconMask.bmp differ
Binary files step5/aif/IconSmall.bmp and step6/aif/IconSmall.bmp differ
Binary files step5/aif/IconSmallMask.bmp and step6/aif/IconSmallMask.bmp differ
diff -urN step5/aif/S60TestAif.rss step6/aif/S60TestAif.rss
--- step5/aif/S60TestAif.rss	1970-01-01 01:00:00.000000000 +0100
+++ step6/aif/S60TestAif.rss	2004-06-22 18:26:17.000000000 +0200
@@ -0,0 +1,20 @@
+#include <aiftool.rh>
+
+
+RESOURCE AIF_DATA
+    {
+    app_uid=0x04545FF6;
+    caption_list=
+        {       
+        CAPTION
+            {
+            code = ELangEnglish;
+            caption = "Tetris";
+            }
+        };
+    num_icons=2;
+    embeddability=KAppNotEmbeddable;
+    newfile=KAppDoesNotSupportNewFile;
+    }
+
+// End of File
diff -urN step5/group/S60test.mmp step6/group/S60test.mmp
--- step5/group/S60test.mmp	2004-06-19 19:58:44.000000000 +0200
+++ step6/group/S60test.mmp	2004-06-20 13:37:42.000000000 +0200
@@ -1,7 +1,7 @@
-TARGET            Step5.app
+TARGET            Step6.app
 TARGETTYPE        app
-UID               0x100039CE 0x04545FF5
-TARGETPATH        \system\apps\Step5
+UID               0x100039CE 0x04545FF6
+TARGETPATH        \system\apps\Step6
 LANG              SC
 
 SOURCEPATH        ..\src
@@ -15,7 +15,7 @@
 SOURCE            Grid.cpp 
 
 SOURCEPATH        ..\group
-RESOURCE          Step5.rss
+RESOURCE          Step6.rss
 
 USERINCLUDE       ..\inc 
 
@@ -23,7 +23,7 @@
 
 START BITMAP      S60Test.mbm
 HEADER
-TARGETPATH        \system\apps\step5
+TARGETPATH        \system\apps\step6
 SOURCEPATH        ..\bitmaps
 SOURCE            c12  tlo.bmp
 END
@@ -35,3 +35,9 @@
 LIBRARY           eikcore.lib
 LIBRARY           eikcoctl.lib  
 LIBRARY           avkon.lib  
+
+// DEFFILE ?filename
+// AIF ?filename
+AIF Step6.aif ..\Aif S60TestAif.rss \
+    c12 Icon.bmp IconMask.bmp IconSmall.bmp IconSmallMask.bmp
+
diff -urN step5/src/s60testapplication.cpp step6/src/s60testapplication.cpp
--- step5/src/s60testapplication.cpp	2004-06-20 10:44:26.000000000 +0200
+++ step6/src/s60testapplication.cpp	2004-06-20 10:52:22.000000000 +0200
@@ -2,7 +2,7 @@
 #include "S60TestApplication.h"
 
 // UID for the application, this should correspond to the uid defined in the mmp file
-static const TUid KUidS60TestApp = {0x04545FF5};
+static const TUid KUidS60TestApp = {0x04545FF6};
 
 CApaDocument* CS60TestApplication::CreateDocumentL()
 {  
diff -urN step5/src/s60testappui.cpp step6/src/s60testappui.cpp
--- step5/src/s60testappui.cpp	2004-06-20 13:46:10.000000000 +0200
+++ step6/src/s60testappui.cpp	2004-06-20 10:53:52.000000000 +0200
@@ -7,7 +7,7 @@
 #include "S60TestAppUi.h"
 #include "S60TestAppView.h"
 #include "S60Test.hrh"
-#include "Step5.rsg"
+#include "Step6.rsg"
 
 void CS60TestAppUi::ConstructL()
 {
diff -urN step5/src/s60testappview.cpp step6/src/s60testappview.cpp
--- step5/src/s60testappview.cpp	2004-06-20 16:22:04.000000000 +0200
+++ step6/src/s60testappview.cpp	2004-06-22 18:28:49.000000000 +0200
@@ -5,7 +5,7 @@
 #include "S60TestDocument.h"
 #include "S60TestEngine.h"
 #include "S60Test.mbg"
-#include "Step5.rsg"
+#include "Step6.rsg"
 
 const TUint32 CS60TestAppView::KColors[10]=
   {0xffffff, 0xff0000, 0x00ff00, 0x0000ff, 0xff00ff,
@@ -42,7 +42,7 @@
 
 void CS60TestAppView::ConstructL(const TRect& aRect)
 {
-  _LIT(iPathName, "\\System\\Apps\\Step5\\S60Test.mbm");
+  _LIT(iPathName, "\\System\\Apps\\Step6\\S60Test.mbm");
   iBackground=CEikonEnv::Static()->CreateBitmapL(iPathName, EMbmS60testTlo);
   CreateWindowL();
   SetRect(aRect);
diff -urN step5/src/s60testengine.cpp step6/src/s60testengine.cpp
--- step5/src/s60testengine.cpp	2004-06-21 19:15:56.000000000 +0200
+++ step6/src/s60testengine.cpp	2004-06-22 15:06:16.000000000 +0200
@@ -4,7 +4,7 @@
 #include "s60testdocument.h"
 #include "s60testengine.h"
 #include "s60test.pan"
-#include "step5.rsg"
+#include "step6.rsg"
 
 CS60TestEngine *CS60TestEngine::NewLC(CS60TestDocument *aDoc)
 {