Changeset 717 in dev for trunk/ab5.0/abdev/abdev/NonVolatile.cpp

Timestamp:

Aug 13, 2008, 10:33:58 PM (16 years ago)

Author:

dai

Message:

#188への対応。UserSettingディレクトリを廃止し、正規のユーザ空間ディレクトリを取り入れた。

File:

• trunk/ab5.0/abdev/abdev/NonVolatile.cpp (modified) (14 diffs)

trunk/ab5.0/abdev/abdev/NonVolatile.cpp

@@ -235 +235 @@
     char temporary[MAX_PATH];
 
+    std::string userAppDir = ActiveBasic::IDE::Program::GetUserAppDir();
+
 
     ///////////////////////////////////
     // 関連付け用の拡張子オブジェクト
     ///////////////////////////////////
-    sprintf(temporary,"%sUserSetting\\extlink.ini",pj_editor_Dir);
-    pobj_ExtLink->load(temporary);
-
-
-    //////////////////////////////////////
-    // Web検索用ドメイン管理オブジェクト
-    //////////////////////////////////////
-    pobj_DBDomain->load();
+    pobj_ExtLink->load( userAppDir + "\\extlink.ini" );
 
 
@@ -252 +247 @@
     // 「最近使ったファイル」オブジェクト
     ///////////////////////////////////////
-    sprintf(temporary,"%sUserSetting\\history.ini",pj_editor_Dir);
-    pobj_History->load(temporary);
+    pobj_History->load( userAppDir + "\\history.ini" );
 
 
@@ -259 +253 @@
     // 「最近使ったプロジェクト」オブジェクト
     ////////////////////////////////////////////
-    sprintf(temporary,"%sUserSetting\\pj_history.ini",pj_editor_Dir);
-    pobj_ProjectHistory->load(temporary);
+    pobj_ProjectHistory->load( userAppDir + "\\pj_history.ini" );
 
 
 
     //開く
-    sprintf(temporary,"%sUserSetting\\editor.ini",pj_editor_Dir);
-    buffer=ReadBuffer_NonErrMsg(temporary);
+    buffer=ReadBuffer_NonErrMsg( userAppDir + "\\editor.ini" );
     if(!buffer){
 
@@ -454 +446 @@
     int i2,i3;
 
-    sprintf(temporary,"%sUserSetting\\findstr.ini",pj_editor_Dir);
-    buffer=ReadBuffer_NonErrMsg(temporary);
+    buffer=ReadBuffer_NonErrMsg( userAppDir + "\\findstr.ini" );
     if(buffer){
         i2=0;
@@ -476 +467 @@
     // 置換文字列
     /////////////////
-    sprintf(temporary,"%sUserSetting\\permustr.ini",pj_editor_Dir);
-    buffer=ReadBuffer_NonErrMsg(temporary);
+    buffer=ReadBuffer_NonErrMsg( userAppDir + "\\permustr.ini" );
     if(buffer){
         i2=0;
@@ -498 +488 @@
     // Web検索文字列
     /////////////////
-    sprintf(temporary,"%sUserSetting\\webstr.ini",pj_editor_Dir);
-    buffer=ReadBuffer_NonErrMsg(temporary);
+    buffer=ReadBuffer_NonErrMsg( userAppDir + "webstr.ini" );
     if(buffer){
         i2=0;
@@ -678 +667 @@
 void CNonVolatile::save(){
     int i;
-    char temporary[MAX_PATH];
-
-    sprintf(temporary,"%sUserSetting",pj_editor_Dir);
-
-    HANDLE hFind;
-    WIN32_FIND_DATA wfd;
-    hFind=FindFirstFile(temporary,&wfd);
-    if(hFind==INVALID_HANDLE_VALUE){
-        //UserSettingディレクトリを作成
-        if(!CreateDirectory(temporary,NULL)){
-            MessageBox(hOwner,"UserSettingディレクトリの作成に失敗",APPLICATION_NAME,MB_OK|MB_ICONEXCLAMATION);
-            return;
-        }
-    }
+    
+    // ユーザ情報保存用のディレクトリを作成
+    Jenga::Common::Directory dir( ActiveBasic::IDE::Program::GetUserAppDir(), true );
+
 
     buffer=(char *)HeapAlloc(hHeap,0,65536);
@@ -827 +806 @@
 
 
+    std::string userAppDir = ActiveBasic::IDE::Program::GetUserAppDir();
+
     //保存
-    sprintf(temporary,"%sUserSetting\\editor.ini",pj_editor_Dir);
-    WriteBuffer(temporary,buffer,lstrlen(buffer));
+    WriteBuffer( userAppDir + "\\editor.ini", buffer,lstrlen(buffer));
 
 
@@ -845 +825 @@
 
     //保存
-    sprintf(temporary,"%sUserSetting\\findstr.ini",pj_editor_Dir);
-    WriteBuffer(temporary,buffer,lstrlen(buffer));
+    WriteBuffer( userAppDir + "\\findstr.ini", buffer,lstrlen(buffer));
 
 
@@ -862 +841 @@
 
     //保存
-    sprintf(temporary,"%sUserSetting\\permustr.ini",pj_editor_Dir);
-    WriteBuffer(temporary,buffer,lstrlen(buffer));
+    WriteBuffer( userAppDir + "\\permustr.ini", buffer,lstrlen(buffer));
 
 
@@ -879 +857 @@
 
     //保存
-    sprintf(temporary,"%sUserSetting\\webstr.ini",pj_editor_Dir);
-    WriteBuffer(temporary,buffer,lstrlen(buffer));
+    WriteBuffer( userAppDir + "\\webstr.ini", buffer,lstrlen(buffer));
 
     HeapDefaultFree(buffer);
@@ -889 +866 @@
     // 関連付け用の拡張子オブジェクト
     ///////////////////////////////////
-    sprintf(temporary,"%sUserSetting\\extlink.ini",pj_editor_Dir);
-    pobj_ExtLink->save(temporary);
-
-
-    //////////////////////////////////////
-    // Web検索用ドメイン管理オブジェクト
-    //////////////////////////////////////
-    pobj_DBDomain->save();
+    pobj_ExtLink->save( userAppDir + "\\extlink.ini" );
 
 
@@ -902 +872 @@
     // 「最近使ったファイル」オブジェクト
     ///////////////////////////////////////
-    sprintf(temporary,"%sUserSetting\\history.ini",pj_editor_Dir);
-    pobj_History->save(temporary);
+    pobj_History->save( userAppDir + "\\history.ini" );
 
     
@@ -909 +878 @@
     // 「最近使ったファイル」オブジェクト
     ///////////////////////////////////////
-    sprintf(temporary,"%sUserSetting\\pj_history.ini",pj_editor_Dir);
-    pobj_ProjectHistory->save(temporary);
-}
+    pobj_ProjectHistory->save( userAppDir + "\\pj_history.ini" );
+}