Changeset 622 in dev for trunk/ab5.0/abdev/abdev/src

Timestamp:

May 21, 2008, 1:16:21 PM (16 years ago)

Author:

dai_9181

Message:

ResourceManagerクラスを追加。既存のリソース管理モジュールの置き換えを行った。

File:

• trunk/ab5.0/abdev/abdev/src/ProjectManager/ProjectManager.cpp (modified) (7 diffs)

trunk/ab5.0/abdev/abdev/src/ProjectManager/ProjectManager.cpp

@@ -196 +196 @@
                     temporary[i2]=buffer[i];
                 }
-                if(temporary[0]!='\0'&&(!(temporary[0]=='0'&&temporary[1]=='\0'))){
-                    lstrcpy(this->ResourceFileName,temporary);
-                    GetResourceData();
-                }
-                else{
-                    sprintf(this->ResourceFileName,"%s.rc",this->GetName().c_str());
-                }
+
+                // このパラメータは使用しなくなった
             }
             else if(lstrcmpi(temporary,"SOURCE")==0&&buffer[i]=='\r'&&buffer[i+1]=='\n'){
@@ -244 +239 @@
         }
         sprintf(this->lpszOutput_Debug,".\\%s_debug.exe",this->GetName().c_str());
+    }
+
+    // リソースを読み込む
+    Jenga::Common::Path resourcePath( projectInfo.GetResourceFileFullPath() );
+    if( resourcePath.IsExistFile() )
+    {
+        GetResourceData();
     }
 
@@ -347 +349 @@
     sprintf(buffer+i2,"#DEBUG_EXE_PATH=%s\r\n\r\n",this->szExePath);
     i2+=lstrlen(buffer+i2);
-    if(this->ResourceFileName[0]){
-        sprintf(buffer+i2,"#RESOURCE=%s\r\n\r\n",this->ResourceFileName);
-        i2+=lstrlen(buffer+i2);
-    }
-    else{
-        lstrcpy(buffer+i2,"#RESOURCE=0\r\n\r\n");
-        i2+=lstrlen(buffer+i2);
-    }
     sprintf(buffer+i2,"#SOURCE\r\n");
     i2+=lstrlen(buffer+i2);
@@ -369 +363 @@
     //////////////////////////////////
     // リソースファイル（*.rc、resource.ab）を作成
-    if(this->ResourceFileName[0]){
+    {
         i2=0;
         i3=101;
@@ -392 +386 @@
 
         //保存（resource.ab）
-        lstrcpy(temporary,"resource.ab");
-        lstrcpy( temporary, this->GetWorkDir().GetFullPath( temporary ).c_str() );
-        WriteBuffer(temporary,buffer,i2);
+        WriteBuffer(this->GetWorkDir().GetFullPath( "resource.ab" ),buffer,i2);
 
         i2=0;
@@ -424 +416 @@
 
         //保存
-        lstrcpy(temporary,this->ResourceFileName);
-        lstrcpy( temporary, this->GetWorkDir().GetFullPath( temporary ).c_str() );
-        WriteBuffer(temporary,buffer,i2);
+        WriteBuffer(this->GetResourceFileFullPath(),buffer,i2);
     }
 
@@ -498 +488 @@
         i2+=lstrlen(buffer+i2);
     }
-    if(this->ResourceFileName[0]){
-        //リソースファイルが含まれる場合
-        lstrcpy(buffer+i2,"\r\n");
-        i2+=lstrlen(buffer+i2);
-        lstrcpy(buffer+i2,"'リソースファイル\r\n");
-        i2+=lstrlen(buffer+i2);
-        lstrcpy(buffer+i2,"#include \"resource.ab\"\r\n");
-        i2+=lstrlen(buffer+i2);
-        sprintf(buffer+i2,"#resource \"%s.rc\"\r\n",this->GetName().c_str());
-        i2+=lstrlen(buffer+i2);
-    }
+
+    //リソースファイル
+    lstrcpy(buffer+i2,"\r\n");
+    i2+=lstrlen(buffer+i2);
+    lstrcpy(buffer+i2,"'リソースファイル\r\n");
+    i2+=lstrlen(buffer+i2);
+    lstrcpy(buffer+i2,"#include \"resource.ab\"\r\n");
+    i2+=lstrlen(buffer+i2);
+    sprintf(buffer+i2,"#resource \"%s.rc\"\r\n",this->GetName().c_str());
+    i2+=lstrlen(buffer+i2);
 
     //保存