From bc772c77998f9f5084d01e8db9dcaee49173f661 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sun, 11 Nov 2012 21:37:19 +0100 Subject: [PATCH] Added "--all" parameter for stash save Signed-off-by: Sven Strickroth --- Languages/Tortoise.pot | 4 ++++ src/Resources/TortoiseProcENG.rc | 13 +++++++------ src/TortoiseProc/AppUtils.cpp | 9 +++++++-- src/TortoiseProc/StashSave.cpp | 20 ++++++++++++++++++++ src/TortoiseProc/StashSave.h | 3 +++ src/TortoiseProc/resource.h | 1 + 6 files changed, 42 insertions(+), 8 deletions(-) diff --git a/Languages/Tortoise.pot b/Languages/Tortoise.pot index 0701455de..a534574e9 100644 --- a/Languages/Tortoise.pot +++ b/Languages/Tortoise.pot @@ -1250,6 +1250,10 @@ msgstr "" msgid "- all -" msgstr "" +#. Resource IDs: (1131) +msgid "--&all" +msgstr "" + #. Resource IDs: (1007) msgid "-------------------------------------------------------------------------------------------" msgstr "" diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index c3d40ad60..2b8269426 100644 --- a/src/Resources/TortoiseProcENG.rc +++ b/src/Resources/TortoiseProcENG.rc @@ -1566,18 +1566,19 @@ BEGIN PUSHBUTTON "Help",IDHELP,255,44,50,14 END -IDD_STASH DIALOGEX 0, 0, 267, 97 +IDD_STASH DIALOGEX 0, 0, 267, 108 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Stash" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN GROUPBOX "Stash &Message",IDC_GROUP_STASHMESSAGE,7,7,253,32 EDITTEXT IDC_STASHMESSAGE,15,19,237,13,ES_AUTOHSCROLL - GROUPBOX "Options",IDC_GROUP_OPTION,7,42,253,29 + GROUPBOX "Options",IDC_GROUP_OPTION,7,42,253,38 CONTROL "include &untracked",IDC_CHECK_UNTRACKED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,54,236,10 - DEFPUSHBUTTON "OK",IDOK,99,76,50,14 - PUSHBUTTON "Cancel",IDCANCEL,154,76,50,14 - PUSHBUTTON "Help",IDHELP,210,76,50,14 + CONTROL "--&all",IDC_CHECK_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,66,236,10 + DEFPUSHBUTTON "OK",IDOK,99,87,50,14 + PUSHBUTTON "Cancel",IDCANCEL,154,87,50,14 + PUSHBUTTON "Help",IDHELP,210,87,50,14 END IDD_DIFFSUBMODULE DIALOGEX 0, 0, 381, 121 @@ -2406,7 +2407,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 260 TOPMARGIN, 7 - BOTTOMMARGIN, 90 + BOTTOMMARGIN, 101 END IDD_DIFFSUBMODULE, DIALOG diff --git a/src/TortoiseProc/AppUtils.cpp b/src/TortoiseProc/AppUtils.cpp index 3fabf73ef..95ecd8f32 100644 --- a/src/TortoiseProc/AppUtils.cpp +++ b/src/TortoiseProc/AppUtils.cpp @@ -81,8 +81,13 @@ bool CAppUtils::StashSave() CString cmd, out; cmd = _T("git.exe stash save"); - if (dlg.m_bIncludeUntracked && CAppUtils::GetMsysgitVersion() >= 0x01070700) - cmd += _T(" --include-untracked"); + if (CAppUtils::GetMsysgitVersion() >= 0x01070700) + { + if (dlg.m_bIncludeUntracked) + cmd += _T(" --include-untracked"); + else if (dlg.m_bAll) + cmd += _T(" --all"); + } if (!dlg.m_sMessage.IsEmpty()) { diff --git a/src/TortoiseProc/StashSave.cpp b/src/TortoiseProc/StashSave.cpp index 553a47743..5349cdec0 100644 --- a/src/TortoiseProc/StashSave.cpp +++ b/src/TortoiseProc/StashSave.cpp @@ -27,6 +27,7 @@ IMPLEMENT_DYNAMIC(CStashSaveDlg, CHorizontalResizableStandAloneDialog) CStashSaveDlg::CStashSaveDlg(CWnd* pParent /*=NULL*/) : CHorizontalResizableStandAloneDialog(CStashSaveDlg::IDD, pParent) , m_bIncludeUntracked(FALSE) + , m_bAll(FALSE) { } @@ -39,11 +40,14 @@ void CStashSaveDlg::DoDataExchange(CDataExchange* pDX) CHorizontalResizableStandAloneDialog::DoDataExchange(pDX); DDX_Text(pDX, IDC_STASHMESSAGE, m_sMessage); DDX_Check(pDX, IDC_CHECK_UNTRACKED, m_bIncludeUntracked); + DDX_Check(pDX, IDC_CHECK_ALL, m_bAll); } BEGIN_MESSAGE_MAP(CStashSaveDlg, CHorizontalResizableStandAloneDialog) ON_BN_CLICKED(IDOK, &CStashSaveDlg::OnBnClickedOk) ON_BN_CLICKED(IDHELP, &CStashSaveDlg::OnBnClickedHelp) + ON_BN_CLICKED(IDC_CHECK_UNTRACKED, &CStashSaveDlg::OnBnClickedCheckUntracked) + ON_BN_CLICKED(IDC_CHECK_ALL, &CStashSaveDlg::OnBnClickedCheckAll) END_MESSAGE_MAP() BOOL CStashSaveDlg::OnInitDialog() @@ -59,6 +63,7 @@ BOOL CStashSaveDlg::OnInitDialog() AddAnchor(IDC_GROUP_OPTION, TOP_LEFT, TOP_RIGHT); AdjustControlSize(IDC_CHECK_UNTRACKED); + AdjustControlSize(IDC_CHECK_ALL); CString sWindowTitle; GetWindowText(sWindowTitle); @@ -67,7 +72,10 @@ BOOL CStashSaveDlg::OnInitDialog() this->UpdateData(false); if (CAppUtils::GetMsysgitVersion() < 0x01070700) + { GetDlgItem(IDC_CHECK_UNTRACKED)->EnableWindow(FALSE); + GetDlgItem(IDC_CHECK_ALL)->EnableWindow(FALSE); + } return TRUE; } @@ -83,3 +91,15 @@ void CStashSaveDlg::OnBnClickedHelp() { OnHelp(); } + +void CStashSaveDlg::OnBnClickedCheckUntracked() +{ + UpdateData(); + DialogEnableWindow(IDC_CHECK_ALL, !m_bIncludeUntracked); +} + +void CStashSaveDlg::OnBnClickedCheckAll() +{ + UpdateData(); + DialogEnableWindow(IDC_CHECK_UNTRACKED, !m_bAll); +} diff --git a/src/TortoiseProc/StashSave.h b/src/TortoiseProc/StashSave.h index 47ec0d4c3..823080477 100644 --- a/src/TortoiseProc/StashSave.h +++ b/src/TortoiseProc/StashSave.h @@ -43,8 +43,11 @@ protected: afx_msg void OnBnClickedOk(); afx_msg void OnBnClickedHelp(); + afx_msg void OnBnClickedCheckUntracked(); + afx_msg void OnBnClickedCheckAll(); public: CString m_sMessage; BOOL m_bIncludeUntracked; + BOOL m_bAll; }; diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h index 027305ee6..1e8b8d8d7 100644 --- a/src/TortoiseProc/resource.h +++ b/src/TortoiseProc/resource.h @@ -397,6 +397,7 @@ #define IDS_PROC_GITCONFIG_NOMSYSGIT 1130 #define IDC_GRAPH 1131 #define IDS_PROC_CLONE_DIR 1131 +#define IDC_CHECK_ALL 1131 #define IDC_STATBUTTON 1132 #define IDC_PATCH_TO_CLIPBOARD 1132 #define IDC_SELECTOVERLAYSET 1132 -- 2.11.4.GIT