Changeset 749 in dev for trunk

Timestamp:

Sep 15, 2008, 6:06:34 PM (16 years ago)

Author:

dai

Message:

「フォルダを開く」コマンドで、ファイル選択を可能にした。

Location:

trunk/ab5.0

Files:

• abdev/abdev/include/MainFrame.h (modified) (1 diff)
• abdev/abdev/src/MainFrame.cpp (modified) (8 diffs)
• abdev/compiler_x64/MakePeHdr.cpp (modified) (1 diff)
• abdev/compiler_x86/MakePeHdr.cpp (modified) (1 diff)
• jenga/include/common/Path.h (modified) (2 diffs)
• jenga/src/common/FileSystem.cpp (modified) (1 diff)
• jenga/src/common/Path.cpp (modified) (1 diff)

trunk/ab5.0/abdev/abdev/include/MainFrame.h

@@ -31 +31 @@
 
     // Explorerでパスを開く
-    void OpenExplorer( const std::string &path );
+    void OpenExplorer( const std::string &filepath );
 
     // 生成された

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

@@ -7 +7 @@
 void SetupWindow(HWND hwnd);
 void ResetTextEditFont(HWND hwnd);
+
+void CreateProcessWithStdHandle( const std::string &appPath, const std::string &cmdLine, bool isShowWindow = true )
+{
+    std::string argsStr = "\"" + appPath + "\" " + cmdLine;
+    STARTUPINFO si;
+    PROCESS_INFORMATION pi;
+    memset(&si,0,sizeof(STARTUPINFO));
+    si.cb=sizeof(STARTUPINFO);
+    si.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW;
+    si.wShowWindow = isShowWindow ? SW_SHOW : SW_HIDE;
+    si.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
+    si.hStdInput = GetStdHandle(STD_INPUT_HANDLE);
+    si.hStdError = GetStdHandle(STD_ERROR_HANDLE);
+    
+    char args[8192];
+    lstrcpy( args, argsStr.c_str() );
+
+    CreateProcess( NULL, args, NULL, NULL, FALSE, NORMAL_PRIORITY_CLASS, NULL, NULL, &si, &pi );
+    CloseHandle( pi.hProcess );
+    CloseHandle( pi.hThread );
+}
 
 void MainFrame::Resized()
@@ -166 +187 @@
 }
 
-void MainFrame::OpenExplorer( const std::string &path )
-{
-    ShellExecute(m_hWnd,"explore",path.c_str(),NULL,NULL,SW_SHOWNORMAL);
+void MainFrame::OpenExplorer( const std::string &filepath )
+{
+    CreateProcessWithStdHandle( "explorer", "/select,\"" + filepath + "\"" );
 }
 
@@ -1098 +1119 @@
 }
 
-void CreateProcessWithStdHandle( const std::string &appPath, const std::string &cmdLine)
-{
-    std::string argsStr = "\"" + appPath + "\" " + cmdLine;
-    STARTUPINFO si;
-    PROCESS_INFORMATION pi;
-    memset(&si,0,sizeof(STARTUPINFO));
-    si.cb=sizeof(STARTUPINFO);
-    si.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW;
-    si.wShowWindow = SW_HIDE;
-    si.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
-    si.hStdInput = GetStdHandle(STD_INPUT_HANDLE);
-    si.hStdError = GetStdHandle(STD_ERROR_HANDLE);
-    
-    char args[8192];
-    lstrcpy( args, argsStr.c_str() );
-
-    CreateProcess( NULL, args, NULL, NULL, FALSE, NORMAL_PRIORITY_CLASS, NULL, NULL, &si, &pi );
-    CloseHandle( pi.hProcess );
-    CloseHandle( pi.hThread );
-}
-
 #ifndef THETEXT
 void MainFrame::OnCmdDebug( UINT uNotifyCode, int nID, CWindow wndCtl )
@@ -1213 +1213 @@
 
     extern ActiveBasic::Common::Platform::EnumType selectingPlatform;
-    CreateProcessWithStdHandle( ActiveBasic::Common::Environment::GetCompilerExePath( selectingPlatform ), temporary );
+    CreateProcessWithStdHandle( ActiveBasic::Common::Environment::GetCompilerExePath( selectingPlatform ), temporary, false );
 }
 
@@ -1281 +1281 @@
 
     extern ActiveBasic::Common::Platform::EnumType selectingPlatform;
-    CreateProcessWithStdHandle( ActiveBasic::Common::Environment::GetCompilerExePath( selectingPlatform ), temporary );
-
+    CreateProcessWithStdHandle( ActiveBasic::Common::Environment::GetCompilerExePath( selectingPlatform ), temporary, false );
 }
 
@@ -1333 +1332 @@
 
     extern ActiveBasic::Common::Platform::EnumType selectingPlatform;
-    CreateProcessWithStdHandle( ActiveBasic::Common::Environment::GetCompilerExePath( platform ), temporary );
+    CreateProcessWithStdHandle( ActiveBasic::Common::Environment::GetCompilerExePath( platform ), temporary, false );
 }
 
@@ -1401 +1400 @@
 
     extern ActiveBasic::Common::Platform::EnumType selectingPlatform;
-    CreateProcessWithStdHandle( ActiveBasic::Common::Environment::GetCompilerExePath( selectingPlatform ), temporary );
+    CreateProcessWithStdHandle( ActiveBasic::Common::Environment::GetCompilerExePath( selectingPlatform ), temporary, false );
 }
 
@@ -1642 +1641 @@
     int WndNum=GetWndNum(hChild);
 
-    char temporary[1024], temp2[1024];
-    _splitpath(MdiInfo[WndNum]->path.c_str(),temporary,temp2,NULL,NULL);
-    lstrcat(temporary,temp2);
-
-    OpenExplorer( temporary );
+    OpenExplorer( MdiInfo[WndNum]->path );
 }
 

trunk/ab5.0/abdev/compiler_x64/MakePeHdr.cpp

@@ -481 +481 @@
         // 格納先ディレクトリを作る
         Jenga::Common::Path path( program.GetOutputFilePath() );
-        Jenga::Common::Directory dir( path.GetDriveName() + path.GetDirName(), true );
+        Jenga::Common::Directory dir( path.GetDirPath(), true );
 
         // 書き込む

trunk/ab5.0/abdev/compiler_x86/MakePeHdr.cpp

@@ -511 +511 @@
         // 格納先ディレクトリを作る
         Jenga::Common::Path path( program.GetOutputFilePath() );
-        Jenga::Common::Directory dir( path.GetDriveName() + path.GetDirName(), true );
+        Jenga::Common::Directory dir( path.GetDirPath(), true );
 
         // 書き込む

trunk/ab5.0/jenga/include/common/Path.h

@@ -39 +39 @@
         return driveName;
     }
-    const std::string &GetDirName() const
+    const std::string GetDirPath() const
     {
-        return dirName;
+        return driveName + dirName;
     }
     const std::string &GetFileName() const
@@ -50 +50 @@
     {
         return ext;
+    }
+    const std::string GetFullFileName() const
+    {
+        return fileName + ext;
     }
     const std::string &GetFullPath() const

trunk/ab5.0/jenga/src/common/FileSystem.cpp

@@ -11 +11 @@
 
     Jenga::Common::Path path( tempFindStr );
-    std::string dirPath = path.GetDriveName() + path.GetDirName();
+    std::string dirPath = path.GetDirPath();
     if( !dirPath.empty() && dirPath[dirPath.size()-1] == '\\' )
     {

trunk/ab5.0/jenga/src/common/Path.cpp

@@ -79 +79 @@
 std::string Jenga::Common::Path::ExtractDirPath( const std::string &filepath )
 {
-    Path path( filepath );
-    std::string result = path.GetDriveName() + path.GetDirName();
-    return result;
+    return Path( filepath ).GetDirPath();
 }