空白の入ったパスがDolphinで開けなかったバグを修正。

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/tpi/tpi@323 9df91469-1e22-0410-86e7-ea8537beb833

diff --git a/src/lychee/frm_main.cpp b/src/lychee/frm_main.cpp
index 1cb8112..fb6c6c8 100644 (file)
--- a/src/lychee/frm_main.cpp
+++ b/src/lychee/frm_main.cpp
@@ -294,7 +294,7 @@ void MainFrame::OnArcCreate(wxCommandEvent& e)
        if (mkDlg.cbOpenAfter->IsChecked())\r
        {\r
                // 作成先を開く。\r
-               ::wxExecute(DIR_APP + swInfo.fnDestinationDirectory.GetFullPath());\r
+               ::wxExecute(DIR_APP + QuoteString(swInfo.fnDestinationDirectory.GetFullPath()));\r
        }\r
 \r
        if (mkDlg.cbExitAfter->IsChecked())\r
@@ -582,7 +582,7 @@ void MainFrame::OnArcAdd(wxCommandEvent& e)
        if (mkDlg.cbOpenAfter->IsChecked())\r
        {\r
                // 作成先を開く。\r
-               ::wxExecute(DIR_APP + swInfo.fnDestinationDirectory.GetFullPath());\r
+               ::wxExecute(DIR_APP + QuoteString(swInfo.fnDestinationDirectory.GetFullPath()));\r
        }\r
 \r
        if (mkDlg.cbExitAfter->IsChecked())\r
@@ -719,7 +719,7 @@ void MainFrame::OnArcExtract(wxCommandEvent& e)
                if (mkDlg.cbOpenAfter->IsChecked())\r
                {\r
                        // 展開先を開く。\r
-                       ::wxExecute(DIR_APP + swInfo.fnDestinationDirectory.GetFullPath());\r
+                       ::wxExecute(DIR_APP + QuoteString(swInfo.fnDestinationDirectory.GetFullPath()));\r
                }\r
 \r
                if (mkDlg.cbExitAfter->IsChecked())\r
@@ -739,7 +739,7 @@ void MainFrame::OnArcExtract(wxCommandEvent& e)
                        {\r
 #ifdef __LINUX__\r
                                // Linuxでは引用符で囲む必要がある。\r
-                               ::wxExecute(ftFile->GetOpenCommand(wxT('"') + asFiles[0] + wxT('"')), wxEXEC_SYNC);\r
+                               ::wxExecute(ftFile->GetOpenCommand(QuoteString(asFiles[0])), wxEXEC_SYNC);\r
 #else\r
                                ::wxExecute(ftFile->GetOpenCommand(asFiles[0]), wxEXEC_SYNC);\r
 #endif\r

diff --git a/src/lychee/functions.cpp b/src/lychee/functions.cpp
index ca5e2b3..8d8dcef 100644 (file)
--- a/src/lychee/functions.cpp
+++ b/src/lychee/functions.cpp
@@ -254,3 +254,8 @@ wxIcon GetFileTypeIcon(wxFileName fn)
        }\r
        return icon;\r
 }\r
+\r
+wxString QuoteString(wxString s)\r
+{\r
+       return wxT('"') + s + wxT('"');\r
+}\r

diff --git a/src/lychee/functions.h b/src/lychee/functions.h
index 26ad2ae..e8564e8 100644 (file)
--- a/src/lychee/functions.h
+++ b/src/lychee/functions.h
@@ -38,5 +38,6 @@ wxArrayString MakeTargetFileList(MainFrame *, bool);
 bool WillMakeDirByArcName(MainFrame *, MakeDialog *);\r
 wxString GetFileTypeName(wxFileName);\r
 wxIcon GetFileTypeIcon(wxFileName);\r
+wxString QuoteString(wxString);\r
 \r
 #endif\r