From 877406bcab13e3c698c218e152b9da4533e03c34 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Wed, 30 Nov 2016 16:27:23 +0100 Subject: [PATCH] Refactor: Drop "2" postfix Signed-off-by: Sven Strickroth --- Languages/Tortoise.pot | 6 +++--- src/Resources/TortoiseProcENG.rc | 4 ++-- src/TortoiseProc/RebaseDlg.cpp | 32 ++++++++++++++++---------------- src/TortoiseProc/RebaseDlg.h | 4 ++-- src/TortoiseProc/resource.h | 4 +--- 5 files changed, 24 insertions(+), 26 deletions(-) diff --git a/Languages/Tortoise.pot b/Languages/Tortoise.pot index 886c8b6fc..f4afe0602 100644 --- a/Languages/Tortoise.pot +++ b/Languages/Tortoise.pot @@ -1356,7 +1356,7 @@ msgstr "" msgid "&Unknown drives" msgstr "" -#. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1383) +#. Resource IDs: (Dialog IDD_APPLY_PATCH_LIST: Control id 1386) msgid "&Up" msgstr "" @@ -4056,7 +4056,7 @@ msgstr "" msgid "Done" msgstr "" -#. Resource IDs: (Dialog IDD_REBASE: Control id 1385) +#. Resource IDs: (Dialog IDD_REBASE: Control id 1384) msgid "Down" msgstr "" @@ -10243,7 +10243,7 @@ msgstr "" msgid "Unversioning %s" msgstr "" -#. Resource IDs: (Dialog IDD_REBASE: Control id 1384) +#. Resource IDs: (Dialog IDD_REBASE: Control id 1386) msgid "Up" msgstr "" diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index d47e910e4..06d105186 100644 --- a/src/Resources/TortoiseProcENG.rc +++ b/src/Resources/TortoiseProcENG.rc @@ -1466,8 +1466,8 @@ BEGIN CONTROL "&Onto",IDC_BUTTON_ONTO,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,377,7,32,14 CONTROL "",IDC_COMMIT_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP,7,25,402,85 PUSHBUTTON "Button1",IDC_SPLITALLOPTIONS,7,113,102,14 - PUSHBUTTON "Up",IDC_BUTTON_UP2,116,113,33,14 - PUSHBUTTON "Down",IDC_BUTTON_DOWN2,156,113,33,14 + PUSHBUTTON "Up",IDC_BUTTON_UP,116,113,33,14 + PUSHBUTTON "Down",IDC_BUTTON_DOWN,156,113,33,14 CONTROL "&Preserve merges",IDC_REBASE_CHECK_PRESERVEMERGES, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,195,115,96,10 CONTROL "&Force Rebase",IDC_REBASE_CHECK_FORCE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,293,115,116,10 diff --git a/src/TortoiseProc/RebaseDlg.cpp b/src/TortoiseProc/RebaseDlg.cpp index dec65e5e8..378da127a 100644 --- a/src/TortoiseProc/RebaseDlg.cpp +++ b/src/TortoiseProc/RebaseDlg.cpp @@ -101,8 +101,8 @@ BEGIN_MESSAGE_MAP(CRebaseDlg, CResizableStandAloneDialog) ON_BN_CLICKED(IDC_REBASE_CHECK_PRESERVEMERGES, &CRebaseDlg::OnBnClickedRebaseCheckForce) ON_BN_CLICKED(IDC_CHECK_CHERRYPICKED_FROM, &CRebaseDlg::OnBnClickedCheckCherryPickedFrom) ON_BN_CLICKED(IDC_REBASE_POST_BUTTON, &CRebaseDlg::OnBnClickedRebasePostButton) - ON_BN_CLICKED(IDC_BUTTON_UP2, &CRebaseDlg::OnBnClickedButtonUp2) - ON_BN_CLICKED(IDC_BUTTON_DOWN2, &CRebaseDlg::OnBnClickedButtonDown2) + ON_BN_CLICKED(IDC_BUTTON_UP, &CRebaseDlg::OnBnClickedButtonUp) + ON_BN_CLICKED(IDC_BUTTON_DOWN, &CRebaseDlg::OnBnClickedButtonDown) ON_REGISTERED_MESSAGE(TaskBarButtonCreated, OnTaskbarBtnCreated) ON_NOTIFY(LVN_ITEMCHANGED, IDC_COMMIT_LIST, OnLvnItemchangedLoglist) ON_REGISTERED_MESSAGE(CGitLogListBase::m_RebaseActionMessage, OnRebaseActionMessage) @@ -132,8 +132,8 @@ void CRebaseDlg::AddRebaseAnchor() AddAnchor(IDC_REBASE_ABORT, BOTTOM_RIGHT); AddAnchor(IDC_REBASE_PROGRESS,BOTTOM_LEFT, BOTTOM_RIGHT); AddAnchor(IDC_SPLITALLOPTIONS, TOP_LEFT); - AddAnchor(IDC_BUTTON_UP2,TOP_LEFT); - AddAnchor(IDC_BUTTON_DOWN2,TOP_LEFT); + AddAnchor(IDC_BUTTON_UP, TOP_LEFT); + AddAnchor(IDC_BUTTON_DOWN, TOP_LEFT); AddAnchor(IDC_REBASE_COMBOXEX_UPSTREAM, TOP_CENTER, TOP_RIGHT); AddAnchor(IDC_REBASE_COMBOXEX_BRANCH, TOP_LEFT, TOP_CENTER); AddAnchor(IDC_BUTTON_REVERSE, TOP_CENTER); @@ -395,8 +395,8 @@ void CRebaseDlg::DoSize(int delta) CSplitterControl::ChangeHeight(GetDlgItem(IDC_REBASE_TAB), -delta, CW_BOTTOMALIGN); //CSplitterControl::ChangeHeight(GetDlgItem(), -delta, CW_BOTTOMALIGN); CSplitterControl::ChangePos(GetDlgItem(IDC_SPLITALLOPTIONS), 0, delta); - CSplitterControl::ChangePos(GetDlgItem(IDC_BUTTON_UP2),0,delta); - CSplitterControl::ChangePos(GetDlgItem(IDC_BUTTON_DOWN2),0,delta); + CSplitterControl::ChangePos(GetDlgItem(IDC_BUTTON_UP), 0, delta); + CSplitterControl::ChangePos(GetDlgItem(IDC_BUTTON_DOWN), 0, delta); CSplitterControl::ChangePos(GetDlgItem(IDC_REBASE_CHECK_FORCE),0,delta); CSplitterControl::ChangePos(GetDlgItem(IDC_REBASE_CHECK_PRESERVEMERGES), 0, delta); CSplitterControl::ChangePos(GetDlgItem(IDC_CHECK_CHERRYPICKED_FROM), 0, delta); @@ -421,8 +421,8 @@ void CRebaseDlg::DoSize(int delta) GetDlgItem(IDC_REBASE_CHECK_FORCE)->Invalidate(); GetDlgItem(IDC_REBASE_CHECK_PRESERVEMERGES)->Invalidate(); GetDlgItem(IDC_CHECK_CHERRYPICKED_FROM)->Invalidate(); - GetDlgItem(IDC_BUTTON_UP2)->Invalidate(); - GetDlgItem(IDC_BUTTON_DOWN2)->Invalidate(); + GetDlgItem(IDC_BUTTON_UP)->Invalidate(); + GetDlgItem(IDC_BUTTON_DOWN)->Invalidate(); } void CRebaseDlg::SetSplitterRange() @@ -838,14 +838,14 @@ BOOL CRebaseDlg::PreTranslateMessage(MSG*pMsg) case 'U': if (LogListHasFocus(pMsg->hwnd)) { - OnBnClickedButtonDown2(); + OnBnClickedButtonDown(); return TRUE; } break; case 'D': if (LogListHasFocus(pMsg->hwnd)) { - OnBnClickedButtonUp2(); + OnBnClickedButtonUp(); return TRUE; } break; @@ -1661,8 +1661,8 @@ void CRebaseDlg::SetControlEnable() case CHOOSE_COMMIT_PICK_MODE: this->GetDlgItem(IDC_SPLITALLOPTIONS)->EnableWindow(TRUE); - this->GetDlgItem(IDC_BUTTON_UP2)->EnableWindow(TRUE); - this->GetDlgItem(IDC_BUTTON_DOWN2)->EnableWindow(TRUE); + this->GetDlgItem(IDC_BUTTON_UP)->EnableWindow(TRUE); + this->GetDlgItem(IDC_BUTTON_DOWN)->EnableWindow(TRUE); if(!m_IsCherryPick) { @@ -1694,8 +1694,8 @@ void CRebaseDlg::SetControlEnable() this->GetDlgItem(IDC_BUTTON_REVERSE)->EnableWindow(FALSE); this->GetDlgItem(IDC_REBASE_CHECK_FORCE)->EnableWindow(FALSE); this->GetDlgItem(IDC_REBASE_CHECK_PRESERVEMERGES)->EnableWindow(FALSE); - this->GetDlgItem(IDC_BUTTON_UP2)->EnableWindow(FALSE); - this->GetDlgItem(IDC_BUTTON_DOWN2)->EnableWindow(FALSE); + this->GetDlgItem(IDC_BUTTON_UP)->EnableWindow(FALSE); + this->GetDlgItem(IDC_BUTTON_DOWN)->EnableWindow(FALSE); if( m_RebaseStage == REBASE_DONE && (this->m_PostButtonTexts.GetCount() != 0) ) { @@ -2479,7 +2479,7 @@ void CRebaseDlg::Refresh() } } -void CRebaseDlg::OnBnClickedButtonUp2() +void CRebaseDlg::OnBnClickedButtonUp() { POSITION pos; pos = m_CommitList.GetFirstSelectedItemPosition(); @@ -2519,7 +2519,7 @@ void CRebaseDlg::OnBnClickedButtonUp2() } } -void CRebaseDlg::OnBnClickedButtonDown2() +void CRebaseDlg::OnBnClickedButtonDown() { if (m_CommitList.GetSelectedCount() == 0) return; diff --git a/src/TortoiseProc/RebaseDlg.h b/src/TortoiseProc/RebaseDlg.h index 0d5b6bbb7..dc0d11258 100644 --- a/src/TortoiseProc/RebaseDlg.h +++ b/src/TortoiseProc/RebaseDlg.h @@ -257,8 +257,8 @@ protected: afx_msg void OnBnClickedCheckCherryPickedFrom(); afx_msg void OnBnClickedRebasePostButton(); afx_msg void OnBnClickedSplitAllOptions(); - afx_msg void OnBnClickedButtonUp2(); - afx_msg void OnBnClickedButtonDown2(); + afx_msg void OnBnClickedButtonUp(); + afx_msg void OnBnClickedButtonDown(); afx_msg void OnHelp(); afx_msg LRESULT OnTaskbarBtnCreated(WPARAM wParam, LPARAM lParam); diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h index 15d1f7f5b..1ac1daaf4 100644 --- a/src/TortoiseProc/resource.h +++ b/src/TortoiseProc/resource.h @@ -811,7 +811,6 @@ #define IDC_REPOGROUP 1383 #define IDC_CLONE_DIR_BROWSE 1383 #define IDC_BUTTON_TO 1383 -#define IDC_BUTTON_UP 1383 #define IDC_REBASE_POST_BUTTON 1383 #define IDC_BUTTON_REMOTE_BRANCH 1383 #define IDC_EDITLOCALGITCONFIG 1383 @@ -821,16 +820,15 @@ #define IDC_BUTTON_DIR 1384 #define IDC_BUTTON_DOWN 1384 #define IDC_PUTTYKEYFILE_BROWSE 1384 -#define IDC_BUTTON_UP2 1384 #define IDC_BUTTON_STASH 1384 #define IDC_EDITSYSTEMGITCONFIG 1384 #define IDS_SETTINGS_SYMBOLIZEREFNAMES_TT 1384 #define IDC_FROMGROUP 1385 #define IDC_BUTTON_REMOVE 1385 -#define IDC_BUTTON_DOWN2 1385 #define IDC_CONFIG 1385 #define IDC_BUTTON_UNIFIEDDIFF 1385 #define IDS_PROC_SYNC_PUSHNOTES 1385 +#define IDC_BUTTON_UP 1386 #define IDS_PROC_REPOCREATED 1386 #define IDC_FILTER 1387 #define IDS_PROC_BROWSEREFS_DELETEALLTAGS 1387 -- 2.11.4.GIT