From 913e0f5d6a7e8cfb1505787a729148e98744d88e Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sun, 12 Nov 2017 21:36:30 +0100 Subject: [PATCH] Remove the visual style switching stuff - not needed anymore with the native ribbon (fixes issue #1767) Inspired by TortoiseSVN rev. 28030 and 28033. Signed-off-by: Sven Strickroth --- src/Changelog.txt | 2 +- src/Resources/TortoiseMergeENG.rc | 43 ++---------- src/TortoiseMerge/MainFrm.cpp | 89 ------------------------- src/TortoiseMerge/MainFrm.h | 2 - src/TortoiseMerge/TortoiseMerge.cpp | 2 - src/TortoiseMerge/TortoiseMerge.h | 3 - src/TortoiseMerge/TortoiseMerge.vcxproj | 3 + src/TortoiseMerge/TortoiseMerge.vcxproj.filters | 5 ++ src/TortoiseMerge/resource.h | 14 ---- 9 files changed, 13 insertions(+), 150 deletions(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index 70d149b1f..35c559c98 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -5,7 +5,7 @@ Released: unreleased * Fixed issue #3089: Show parent SHA1 on cherry picking a merge commit * Fixed issue #3052: Filename autocomplete in commit dialog ignores filenames starting with underscores * TortoiseGitMerge no uses native ribbon instead of MFC wrapped - This results in a noticeable speed up (cf. issue #1616) + This results in a noticeable speed up (cf. issue #1616) and also fixes issues with rounded corners for maximized windows (cf. issue #1767) == Bug Fixes == * Fixed issue #3029: LogDlg: Action column icons painted over Graph or message columns when turned off or resized diff --git a/src/Resources/TortoiseMergeENG.rc b/src/Resources/TortoiseMergeENG.rc index 142ba60be..16f986cdf 100644 --- a/src/Resources/TortoiseMergeENG.rc +++ b/src/Resources/TortoiseMergeENG.rc @@ -569,23 +569,6 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Hide/Show the patch file list", ID_VIEW_SHOWFILELIST MENUITEM SEPARATOR - POPUP "Style" - BEGIN - MENUITEM "Windows 2000", ID_VIEW_APPLOOK_WIN_2000 - MENUITEM "Office XP", ID_VIEW_APPLOOK_OFF_XP - MENUITEM "Windows XP", ID_VIEW_APPLOOK_WIN_XP - MENUITEM "Office 2003", ID_VIEW_APPLOOK_OFF_2003 - MENUITEM "Visual Studio 2005", ID_VIEW_APPLOOK_VS_2005 - MENUITEM "Visual Studio 2008", ID_VIEW_APPLOOK_VS_2008 - MENUITEM "Windows 7", ID_VIEW_APPLOOK_WIN7 - POPUP "Office 2007 colors" - BEGIN - MENUITEM "Blue Style", ID_VIEW_APPLOOK_OFF_2007_BLUE - MENUITEM "Black Style", ID_VIEW_APPLOOK_OFF_2007_BLACK - MENUITEM "Silver Style", ID_VIEW_APPLOOK_OFF_2007_SILVER - MENUITEM "Aqua Style", ID_VIEW_APPLOOK_OFF_2007_AQUA - END - END END POPUP "&Help" BEGIN @@ -701,6 +684,10 @@ BEGIN IDS_MSGBOX_YES "&Yes" IDS_MSGBOX_NO "&No" IDS_MSGBOX_CANCEL "Cancel" +END + +STRINGTABLE +BEGIN ID_REGEX_NO_FILTER "No filter" END @@ -1045,23 +1032,6 @@ END STRINGTABLE BEGIN - IDC_STYLEBUTTON "Change the style of the application\nChange Style" - ID_VIEW_APPLOOK_WIN7 "Windows 7" - ID_VIEW_APPLOOK_VS_2008 "Visual Studio 2008" - ID_VIEW_APPLOOK_WIN_2000 "Windows 2000" - ID_VIEW_APPLOOK_OFF_XP "Office XP" - ID_VIEW_APPLOOK_WIN_XP "Windows XP" - ID_VIEW_APPLOOK_OFF_2003 "Office 2003" - ID_VIEW_APPLOOK_VS_2005 "Visual Studio 2005" - ID_OFFICE2007 "Office 2007 colors" - ID_VIEW_APPLOOK_OFF_2007_BLUE "Blue Style" - ID_VIEW_APPLOOK_OFF_2007_BLACK "Black Style" - ID_VIEW_APPLOOK_OFF_2007_SILVER "Silver Style" - ID_VIEW_APPLOOK_OFF_2007_AQUA "Aqua Style" -END - -STRINGTABLE -BEGIN ID_VIEW_LINEDIFFBAR "Show or hide the line diff bar\nToggle LineDiffBar" ID_VIEW_LOCATORBAR "Show or hide the locator bar\nToggle LocatorBar" ID_EDIT_USELEFTBLOCK "Use text block from the left view\nUse left block" @@ -1154,11 +1124,6 @@ END STRINGTABLE BEGIN - ID_APPLOOK "Changes the style of the application" -END - -STRINGTABLE -BEGIN ID_USEBLOCKS "Click to see commands to move blocks of text\nUse text blocks" END diff --git a/src/TortoiseMerge/MainFrm.cpp b/src/TortoiseMerge/MainFrm.cpp index 0ba731b3b..65fb8a280 100644 --- a/src/TortoiseMerge/MainFrm.cpp +++ b/src/TortoiseMerge/MainFrm.cpp @@ -48,8 +48,6 @@ IMPLEMENT_DYNCREATE(CMainFrame, CFrameWndEx) BEGIN_MESSAGE_MAP(CMainFrame, CFrameWndEx) ON_WM_CREATE() ON_WM_DESTROY() - ON_COMMAND_RANGE(ID_VIEW_APPLOOK_WIN7, ID_VIEW_APPLOOK_OFF_2007_AQUA, &CMainFrame::OnApplicationLook) - ON_UPDATE_COMMAND_UI_RANGE(IDC_STYLEBUTTON, ID_VIEW_APPLOOK_OFF_2007_AQUA, &CMainFrame::OnUpdateApplicationLook) // Global help commands ON_COMMAND(ID_HELP_FINDER, CFrameWndEx::OnHelpFinder) ON_COMMAND(ID_HELP, CFrameWndEx::OnHelp) @@ -221,13 +219,11 @@ CMainFrame::CMainFrame() , m_regexIndex(-1) { m_bOneWay = (0 != ((DWORD)m_regOneWay)); - theApp.m_nAppLook = theApp.GetInt(L"ApplicationLook", ID_VIEW_APPLOOK_VS_2005); m_bCollapsed = !!(DWORD)m_regCollapsed; m_bViewMovedBlocks = !!(DWORD)m_regViewModedBlocks; m_bWrapLines = !!(DWORD)m_regWrapLines; m_bInlineDiff = !!m_regInlineDiff; m_bUseRibbons = !!m_regUseRibbons; - CMFCVisualManagerWindows::m_b3DTabsXPTheme = TRUE; } CMainFrame::~CMainFrame() @@ -246,8 +242,6 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct) if (CFrameWndEx::OnCreate(lpCreateStruct) == -1) return -1; - OnApplicationLook(theApp.m_nAppLook); - if (m_bUseRibbons) { HRESULT hr; @@ -391,89 +385,6 @@ BOOL CMainFrame::PreCreateWindow(CREATESTRUCT& cs) return TRUE; } -void CMainFrame::OnApplicationLook(UINT id) -{ - if (m_bUseRibbons) - { - CMFCVisualManager::SetDefaultManager(RUNTIME_CLASS(CMFCVisualManagerWindows)); - return; - } - - CWaitCursor wait; - - theApp.m_nAppLook = id; - - switch (theApp.m_nAppLook) - { - case ID_VIEW_APPLOOK_WIN_2000: - CMFCVisualManager::SetDefaultManager(RUNTIME_CLASS(CMFCVisualManager)); - break; - - case ID_VIEW_APPLOOK_OFF_XP: - CMFCVisualManager::SetDefaultManager(RUNTIME_CLASS(CMFCVisualManagerOfficeXP)); - break; - - case ID_VIEW_APPLOOK_WIN_XP: - CMFCVisualManagerWindows::m_b3DTabsXPTheme = TRUE; - CMFCVisualManager::SetDefaultManager(RUNTIME_CLASS(CMFCVisualManagerWindows)); - break; - - case ID_VIEW_APPLOOK_OFF_2003: - CMFCVisualManager::SetDefaultManager(RUNTIME_CLASS(CMFCVisualManagerOffice2003)); - CDockingManager::SetDockingMode(DT_SMART); - break; - - case ID_VIEW_APPLOOK_VS_2005: - CMFCVisualManager::SetDefaultManager(RUNTIME_CLASS(CMFCVisualManagerVS2005)); - CDockingManager::SetDockingMode(DT_SMART); - break; - - case ID_VIEW_APPLOOK_VS_2008: - CMFCVisualManager::SetDefaultManager(RUNTIME_CLASS(CMFCVisualManagerVS2008)); - CDockingManager::SetDockingMode(DT_SMART); - break; - - case ID_VIEW_APPLOOK_WIN7: - CMFCVisualManager::SetDefaultManager(RUNTIME_CLASS(CMFCVisualManagerWindows7)); - CDockingManager::SetDockingMode(DT_SMART); - break; - - default: - switch (theApp.m_nAppLook) - { - case ID_VIEW_APPLOOK_OFF_2007_BLUE: - CMFCVisualManagerOffice2007::SetStyle(CMFCVisualManagerOffice2007::Office2007_LunaBlue); - break; - - case ID_VIEW_APPLOOK_OFF_2007_BLACK: - CMFCVisualManagerOffice2007::SetStyle(CMFCVisualManagerOffice2007::Office2007_ObsidianBlack); - break; - - case ID_VIEW_APPLOOK_OFF_2007_SILVER: - CMFCVisualManagerOffice2007::SetStyle(CMFCVisualManagerOffice2007::Office2007_Silver); - break; - - case ID_VIEW_APPLOOK_OFF_2007_AQUA: - CMFCVisualManagerOffice2007::SetStyle(CMFCVisualManagerOffice2007::Office2007_Aqua); - break; - } - - CMFCVisualManager::SetDefaultManager(RUNTIME_CLASS(CMFCVisualManagerOffice2007)); - CDockingManager::SetDockingMode(DT_SMART); - } - - RedrawWindow(nullptr, nullptr, RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_UPDATENOW | RDW_FRAME | RDW_ERASE); - - theApp.WriteInt(L"ApplicationLook", theApp.m_nAppLook); -} - -void CMainFrame::OnUpdateApplicationLook(CCmdUI* pCmdUI) -{ - pCmdUI->Enable(); - pCmdUI->SetRadio(theApp.m_nAppLook == pCmdUI->m_nID); -} - - // CMainFrame diagnostics #ifdef _DEBUG diff --git a/src/TortoiseMerge/MainFrm.h b/src/TortoiseMerge/MainFrm.h index 1c9a5cc53..ee64bfb9d 100644 --- a/src/TortoiseMerge/MainFrm.h +++ b/src/TortoiseMerge/MainFrm.h @@ -81,8 +81,6 @@ protected: void RecalcLayout(BOOL bNotify = TRUE) override; afx_msg LRESULT OnTaskbarButtonCreated(WPARAM wParam, LPARAM lParam); - afx_msg void OnApplicationLook(UINT id); - afx_msg void OnUpdateApplicationLook(CCmdUI* pCmdUI); afx_msg LRESULT OnIdleUpdateCmdUI(WPARAM wParam, LPARAM); afx_msg void OnFileSave(); diff --git a/src/TortoiseMerge/TortoiseMerge.cpp b/src/TortoiseMerge/TortoiseMerge.cpp index 3001d479f..5988a15d8 100644 --- a/src/TortoiseMerge/TortoiseMerge.cpp +++ b/src/TortoiseMerge/TortoiseMerge.cpp @@ -66,7 +66,6 @@ public: CTortoiseMergeApp::CTortoiseMergeApp() - : m_nAppLook(0) { EnableHtmlHelp(); git_libgit2_init(); @@ -196,7 +195,6 @@ BOOL CTortoiseMergeApp::InitInstance() // visual styles. Otherwise, any window creation will fail. InitCommonControls(); - CMFCVisualManager::SetDefaultManager(RUNTIME_CLASS(CMFCVisualManagerWindows)); CMFCButton::EnableWindowsTheming(); EnableTaskbarInteraction(FALSE); diff --git a/src/TortoiseMerge/TortoiseMerge.h b/src/TortoiseMerge/TortoiseMerge.h index 289b943f0..72afbc831 100644 --- a/src/TortoiseMerge/TortoiseMerge.h +++ b/src/TortoiseMerge/TortoiseMerge.h @@ -40,9 +40,6 @@ public: virtual BOOL InitInstance(); virtual int ExitInstance(); -// Implementation - UINT m_nAppLook; - protected: afx_msg void OnAppAbout(); DECLARE_MESSAGE_MAP() diff --git a/src/TortoiseMerge/TortoiseMerge.vcxproj b/src/TortoiseMerge/TortoiseMerge.vcxproj index 6e17f55d5..926b4e2ad 100644 --- a/src/TortoiseMerge/TortoiseMerge.vcxproj +++ b/src/TortoiseMerge/TortoiseMerge.vcxproj @@ -451,6 +451,9 @@ Designer + + + diff --git a/src/TortoiseMerge/TortoiseMerge.vcxproj.filters b/src/TortoiseMerge/TortoiseMerge.vcxproj.filters index 808a204c0..e3d54078c 100644 --- a/src/TortoiseMerge/TortoiseMerge.vcxproj.filters +++ b/src/TortoiseMerge/TortoiseMerge.vcxproj.filters @@ -648,4 +648,9 @@ Resource Files + + + Resource Files + + \ No newline at end of file diff --git a/src/TortoiseMerge/resource.h b/src/TortoiseMerge/resource.h index b8efed9d9..eada3aac6 100644 --- a/src/TortoiseMerge/resource.h +++ b/src/TortoiseMerge/resource.h @@ -301,19 +301,6 @@ #define IDS_EDIT_TAB2SPACE 8003 #define IDS_EDIT_SPACE2TAB 8004 #define IDS_EDIT_TRIM 8005 -#define IDC_STYLEBUTTON 10000 -#define ID_VIEW_APPLOOK_WIN7 10001 -#define ID_VIEW_APPLOOK_VS_2008 10002 -#define ID_VIEW_APPLOOK_WIN_2000 10003 -#define ID_VIEW_APPLOOK_OFF_XP 10004 -#define ID_VIEW_APPLOOK_WIN_XP 10005 -#define ID_VIEW_APPLOOK_OFF_2003 10006 -#define ID_VIEW_APPLOOK_VS_2005 10007 -#define ID_OFFICE2007 10008 -#define ID_VIEW_APPLOOK_OFF_2007_BLUE 10009 -#define ID_VIEW_APPLOOK_OFF_2007_BLACK 10010 -#define ID_VIEW_APPLOOK_OFF_2007_SILVER 10011 -#define ID_VIEW_APPLOOK_OFF_2007_AQUA 10012 #define ID_VIEW_WHITESPACES 32774 #define ID_VIEW_ONEWAYDIFF 32775 #define ID_NAVIGATE_NEXTDIFFERENCE 32779 @@ -367,7 +354,6 @@ #define ID_LOGOBUTTON 32897 #define ID_VIEW_BARS 32898 #define ID_USEBLOCKS 32914 -#define ID_APPLOOK 32956 #define ID_EDIT_ENABLE 32976 #define ID_FILE_ENABLEEDIT 32978 #define ID_EDIT_REGEXFILTER 32992 -- 2.11.4.GIT