SyncDlg show animate when press push button and hide input control.

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / SVNProgressDlg.cpp

diff --git a/src/TortoiseProc/SVNProgressDlg.cpp b/src/TortoiseProc/SVNProgressDlg.cpp
index 08b16bc..fb5eef1 100644 (file)
--- a/src/TortoiseProc/SVNProgressDlg.cpp
+++ b/src/TortoiseProc/SVNProgressDlg.cpp
@@ -306,6 +306,10 @@ BOOL CGitProgressDlg::Notify(const CTGitPath& path, git_wc_notify_action_t actio
                data->sActionColumnText.LoadString(IDS_SVNACTION_RESOLVE);\r
                break;\r
 \r
+       case git_wc_notify_revert:\r
+               data->sActionColumnText.LoadString(IDS_SVNACTION_REVERT);\r
+               break;\r
+\r
 #if 0\r
        case svn_wc_notify_commit_added:\r
                data->sActionColumnText.LoadString(IDS_SVNACTION_ADDING);\r
@@ -331,9 +335,7 @@ BOOL CGitProgressDlg::Notify(const CTGitPath& path, git_wc_notify_action_t actio
        case svn_wc_notify_restore:\r
                data->sActionColumnText.LoadString(IDS_SVNACTION_RESTORE);\r
                break;\r
-       case svn_wc_notify_revert:\r
-               data->sActionColumnText.LoadString(IDS_SVNACTION_REVERT);\r
-               break;\r
+\r
        case svn_wc_notify_update_replace:\r
        case svn_wc_notify_commit_replaced:\r
                data->sActionColumnText.LoadString(IDS_SVNACTION_REPLACED);\r
@@ -2457,24 +2459,30 @@ bool CGitProgressDlg::CmdResolve(CString& sWindowTitle, bool& localoperation)
 \r
 bool CGitProgressDlg::CmdRevert(CString& sWindowTitle, bool& localoperation)\r
 {\r
-#if 0\r
+\r
        localoperation = true;\r
        sWindowTitle.LoadString(IDS_PROGRS_TITLE_REVERT);\r
        SetWindowText(sWindowTitle);\r
        SetBackgroundImage(IDI_REVERT_BKG);\r
 \r
-       CTGitPathList delList = m_selectedPaths;\r
-       if (DWORD(CRegDWORD(_T("Software\\TortoiseGit\\RevertWithRecycleBin"), TRUE)))\r
-               delList.DeleteAllFiles(true);\r
+       //CTGitPathList delList = m_selectedPaths;\r
+       //if (DWORD(CRegDWORD(_T("Software\\TortoiseGit\\RevertWithRecycleBin"), TRUE)))\r
+       //      delList.DeleteAllFiles(true);\r
 \r
        ReportCmd(CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_REVERT)));\r
-       if (!Revert(m_targetPathList, CStringArray(), !!(m_options & ProgOptRecursive)))\r
+       for(int i=0;i<m_selectedPaths.GetCount();i++)\r
        {\r
-               ReportSVNError();\r
-               return false;\r
+               if(g_Git.Revert((CTGitPath&)m_selectedPaths[i],true))\r
+               {\r
+                       CMessageBox::Show(NULL,_T("Revert Fail"),_T("TortoiseGit"),MB_OK|MB_ICONERROR);\r
+                       m_bErrorsOccurred=true;\r
+                       return false;\r
+               }\r
+               Notify(m_selectedPaths[i],git_wc_notify_revert);\r
        }\r
-       CShellUpdater::Instance().AddPathsForUpdate(m_targetPathList);\r
-#endif\r
+\r
+       CShellUpdater::Instance().AddPathsForUpdate(m_selectedPaths);\r
+\r
        return true;\r
 }\r
 \r