Export Dialog Basic Finish

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index 64590c0..62935b5 100644 (file)
Binary files a/src/Resources/TortoiseProcENG.rc and b/src/Resources/TortoiseProcENG.rc differ

diff --git a/src/TortoiseProc/Commands/ExportCommand.cpp b/src/TortoiseProc/Commands/ExportCommand.cpp
index 21a7f3c..7128e98 100644 (file)
--- a/src/TortoiseProc/Commands/ExportCommand.cpp
+++ b/src/TortoiseProc/Commands/ExportCommand.cpp
@@ -37,6 +37,14 @@ bool ExportCommand::Execute()
        \r
        if (dlg.DoModal() == IDOK)\r
        {\r
+               CString cmd;\r
+               cmd.Format(_T("git.exe archive --format=zip --verbose %s >\"%s\""),\r
+                                       dlg.m_VersionName,\r
+                                       dlg.m_strExportDirectory);\r
+               CProgressDlg pro;\r
+               pro.m_GitCmd=cmd;\r
+               pro.DoModal();\r
+               return TRUE;\r
        }\r
        return bRet;\r
 }\r

diff --git a/src/TortoiseProc/ExportDlg.cpp b/src/TortoiseProc/ExportDlg.cpp
index 7858f24..d0e4fa5 100644 (file)
--- a/src/TortoiseProc/ExportDlg.cpp
+++ b/src/TortoiseProc/ExportDlg.cpp
@@ -111,8 +111,8 @@ void CExportDlg::OnOK()
        bool bAutoCreateTargetName = m_bAutoCreateTargetName;\r
        m_bAutoCreateTargetName = false;\r
 \r
-       m_URLCombo.SaveHistory();\r
-       m_URL = m_URLCombo.GetString();\r
+//     m_URLCombo.SaveHistory();\r
+//     m_URL = m_URLCombo.GetString();\r
 \r
 \r
        UpdateData(FALSE);\r
@@ -134,15 +134,14 @@ void CExportDlg::OnBnClickedCheckoutdirectoryBrowse()
        // directory from the browse folder, then restore the local values into the\r
        // dialog controls.\r
        //\r
-       CBrowseFolder browseFolder;\r
-       browseFolder.m_style = BIF_EDITBOX | BIF_NEWDIALOGSTYLE | BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;\r
-       CString strCheckoutDirectory = m_strExportDirectory;\r
-       if (browseFolder.Show(GetSafeHwnd(), strCheckoutDirectory) == CBrowseFolder::OK) \r
+       this->UpdateRevsionName();\r
+       CFileDialog dlg(FALSE,_T("Zip"),this->m_VersionName,OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,\r
+                                               _T("*.Zip"));\r
+       \r
+       if(dlg.DoModal()==IDOK)\r
        {\r
                UpdateData(TRUE);\r
-               m_strExportDirectory = strCheckoutDirectory;\r
-               m_sExportDirOrig = m_strExportDirectory;\r
-               m_bAutoCreateTargetName = !PathIsDirectoryEmpty(m_sExportDirOrig);\r
+               m_strExportDirectory = dlg.GetPathName();\r
                UpdateData(FALSE);\r
        }\r
 }\r

diff --git a/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user b/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
index 77fc5ca..4104e04 100644 (file)
--- a/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
+++ b/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
@@ -11,7 +11,7 @@
                        <DebugSettings\r
                                Command="$(TargetPath)"\r
                                WorkingDirectory="D:\Profiles\b20596\tortoisegit"\r
-                               CommandArguments="/command:switch /path:&quot;D:\\Profiles\\b20596\\buildtest\\TortoiseGit&quot;"\r
+                               CommandArguments="/command:export /path:&quot;D:\\Profiles\\b20596\\buildtest\\TortoiseGit&quot;"\r
                                Attach="false"\r
                                DebuggerType="3"\r
                                Remote="1"\r