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

Timestamp:

May 19, 2008, 6:17:02 PM (16 years ago)

Author:

dai_9181

Message:

Projectクラスをリファクタリング中。

Location:

trunk/ab5.0/abdev/abdev/src

Files:

• MainFrame.cpp (modified) (6 diffs)
• ProjectManager/ProjectManager.cpp (modified) (4 diffs)

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

@@ -446 +446 @@
         lstrcpy(temporary,NewFileName);
         if(!strstr(temporary,".")) lstrcat(temporary,".ab");
-        GetFullPath(temporary,projectInfo.dir);
+
+        lstrcpy( temporary, projectInfo.GetWorkDir().GetFullPath( temporary ).c_str() );
     }
     else bAddToProject=0;
@@ -521 +522 @@
 void MainFrame::OnCmdProjectFolderOpen( UINT uNotifyCode, int nID, CWindow wndCtl )
 {
-    ShellExecute(m_hWnd,"explore",projectInfo.dir,NULL,NULL,SW_SHOWNORMAL);
+    ShellExecute(m_hWnd,"explore",projectInfo.GetWorkDir().GetPath().c_str(),NULL,NULL,SW_SHOWNORMAL);
 }
 
@@ -952 +953 @@
         //出力ファイル名をtemp3へ
         lstrcpy(temp3,projectInfo.lpszOutput_Debug);
-        GetFullPath(temp3,projectInfo.dir);
+        lstrcpy( temp3, projectInfo.GetWorkDir().GetFullPath( temp3 ).c_str() );
 
         if(IsNeedCompileForProject(1))
@@ -1030 +1031 @@
         //出力ファイル名をtemp3へ
         lstrcpy(temp3,projectInfo.lpszOutput_Debug);
-        GetFullPath(temp3,projectInfo.dir);
+        lstrcpy( temp3, projectInfo.GetWorkDir().GetFullPath( temp3 ).c_str() );
 
         sprintf(temporary,"\"%s\" \"%s\" /debug /wnd:%08x",temp2,temp3,m_hWnd);
@@ -1144 +1145 @@
         //出力ファイル名をtemp3へ
         lstrcpy(temp3,projectInfo.lpszOutput_Release);
-        GetFullPath(temp3,projectInfo.dir);
+        lstrcpy( temp3, projectInfo.GetWorkDir().GetFullPath( temp3 ).c_str() );
 
         sprintf(temporary,"\"%s\" \"%s\" /wnd:%08x",temp2,temp3,m_hWnd);
@@ -1208 +1209 @@
         else{
             lstrcpy(temporary,projectInfo.lpszOutput_Debug);
-            GetFullPath(temporary,projectInfo.dir);
+            lstrcpy( temporary, projectInfo.GetWorkDir().GetFullPath( temporary ).c_str() );
         }
     }

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

@@ -18 +18 @@
 
     //プロジェクトの作業ディレクトリを取得
-    _splitpath(path,this->dir,temporary,0,0);
-    lstrcat(this->dir,temporary);
+    _splitpath(path,temporary,temp2,0,0);
+    lstrcat( temporary, temp2 );
+    this->workDir = Jenga::Common::Directory( temporary );
 
     //ファイルを開く、保存の初期ディレクトリをセット
-    lstrcpy(pobj_nv->DefSaveDir,this->dir);
+    lstrcpy(pobj_nv->DefSaveDir,this->GetWorkDir().GetPath().c_str());
 
 
@@ -253 +254 @@
         /////////////////////////////////////////////
         //ウィンドウ定義ファイル（*.wnd）をオープン
-        sprintf(temp2,"%s%s.wnd",this->dir,this->GetName().c_str());
+        sprintf(temp2,"%s%s.wnd",this->GetWorkDir().GetPath().c_str(),this->GetName().c_str());
         if(!OpenWindowFile(temp2)) return;
     }
@@ -263 +264 @@
     }
 
-    OpenWorkfile( this->dir + this->GetName() + ".wrk" );
+    OpenWorkfile( this->GetWorkDir().GetPath() + this->GetName() + ".wrk" );
 
     this->modify=0;
@@ -324 +325 @@
             for(i=0;this->res.NumberOfIconRes;i++){
                 lstrcpy(temporary,this->res.pIconResInfo[i].path);
-                GetFullPath(temporary,this->dir);
+                lstrcpy( temporary, this->GetWorkDir().GetFullPath( temporary ).c_str() );
                 if(lstrcmpi(MdiInfo[WndNum].path,temporary)==0){
                     SendMessage(hCloseChild,WM_CLOSE,0,0);