TortoiseGitMerge: Use native ribbons
commit1fa991ae164d092ec10a02b706fa979841200db3
authorSven Strickroth <email@cs-ware.de>
Sun, 12 Nov 2017 19:42:12 +0000 (12 20:42 +0100)
committerSven Strickroth <email@cs-ware.de>
Mon, 13 Nov 2017 21:29:24 +0000 (13 22:29 +0100)
treea5dcc16c2b1552f01fafc70e287784b8f042edda
parentda0588ec671ea1302b81d84937f0d44ed103ac64
TortoiseGitMerge: Use native ribbons

The main reason for this is because using Native Ribbons significantly reduces the start time caused by using MFC Ribbons:
https://stackoverflow.com/questions/37215290/how-to-speed-up-load-time-for-mfc-ribbon-application

(fixes issue #1616)

Based on TortoiseSVN revs. 28025, 28026, 28027, 28031 and 28039.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
140 files changed:
Languages/TortoisePot.vcxproj
src/Changelog.txt
src/Resources/TortoiseGitMergeRibbon.xml [new file with mode: 0644]
src/Resources/TortoiseMerge.rc2
src/Resources/TortoiseMergeENG.rc
src/Resources/ribbon/About.bmp [new file with mode: 0644]
src/Resources/ribbon/About.png [deleted file]
src/Resources/ribbon/Check.bmp [new file with mode: 0644]
src/Resources/ribbon/Check.png [deleted file]
src/Resources/ribbon/Collapse.bmp [new file with mode: 0644]
src/Resources/ribbon/Collapse.png [deleted file]
src/Resources/ribbon/Comment.bmp [new file with mode: 0644]
src/Resources/ribbon/Comment.png [deleted file]
src/Resources/ribbon/Copy.bmp [new file with mode: 0644]
src/Resources/ribbon/Copy.png [deleted file]
src/Resources/ribbon/DownGreen.bmp [new file with mode: 0644]
src/Resources/ribbon/DownGreen.png [deleted file]
src/Resources/ribbon/DownGreenDots.bmp [new file with mode: 0644]
src/Resources/ribbon/DownGreenDots.png [deleted file]
src/Resources/ribbon/DownRed.bmp [new file with mode: 0644]
src/Resources/ribbon/DownRed.png [deleted file]
src/Resources/ribbon/EditEnabled.bmp [new file with mode: 0644]
src/Resources/ribbon/EditEnabled.png [deleted file]
src/Resources/ribbon/Exit.bmp [new file with mode: 0644]
src/Resources/ribbon/Exit.png [deleted file]
src/Resources/ribbon/FileList.bmp [new file with mode: 0644]
src/Resources/ribbon/FileList.png [deleted file]
src/Resources/ribbon/Filter16.bmp [new file with mode: 0644]
src/Resources/ribbon/Filter16.png [deleted file]
src/Resources/ribbon/FilterConfig16.bmp [new file with mode: 0644]
src/Resources/ribbon/FilterConfig16.png [deleted file]
src/Resources/ribbon/Goto.bmp [new file with mode: 0644]
src/Resources/ribbon/Goto.png [deleted file]
src/Resources/ribbon/Help.bmp [new file with mode: 0644]
src/Resources/ribbon/Help.png [deleted file]
src/Resources/ribbon/InlineDiff.bmp [new file with mode: 0644]
src/Resources/ribbon/InlineDiff.png [deleted file]
src/Resources/ribbon/InlineDiffWord.bmp [new file with mode: 0644]
src/Resources/ribbon/InlineDiffWord.png [deleted file]
src/Resources/ribbon/LeftGreen.bmp [new file with mode: 0644]
src/Resources/ribbon/LeftGreen.png [deleted file]
src/Resources/ribbon/LeftGreenDots.bmp [new file with mode: 0644]
src/Resources/ribbon/LeftGreenDots.png [deleted file]
src/Resources/ribbon/LeftRed.bmp [new file with mode: 0644]
src/Resources/ribbon/LeftRed.png [deleted file]
src/Resources/ribbon/OneWayDiff.bmp [new file with mode: 0644]
src/Resources/ribbon/OneWayDiff.png [deleted file]
src/Resources/ribbon/Open.bmp [new file with mode: 0644]
src/Resources/ribbon/Open.png [deleted file]
src/Resources/ribbon/OrangeDotDown.bmp [new file with mode: 0644]
src/Resources/ribbon/OrangeDotDown.png [deleted file]
src/Resources/ribbon/OrangeDotLeft.bmp [new file with mode: 0644]
src/Resources/ribbon/OrangeDotLeft.png [deleted file]
src/Resources/ribbon/OrangeDotRight.bmp [new file with mode: 0644]
src/Resources/ribbon/OrangeDotRight.png [deleted file]
src/Resources/ribbon/OrangeDotUp.bmp [new file with mode: 0644]
src/Resources/ribbon/OrangeDotUp.png [deleted file]
src/Resources/ribbon/Paste.bmp [new file with mode: 0644]
src/Resources/ribbon/Paste.png [deleted file]
src/Resources/ribbon/Pilcrow.bmp [new file with mode: 0644]
src/Resources/ribbon/Pilcrow.png [deleted file]
src/Resources/ribbon/Redo.bmp [new file with mode: 0644]
src/Resources/ribbon/Redo.png [deleted file]
src/Resources/ribbon/Refresh.bmp [new file with mode: 0644]
src/Resources/ribbon/Refresh.png [deleted file]
src/Resources/ribbon/RightGreen.bmp [new file with mode: 0644]
src/Resources/ribbon/RightGreen.png [deleted file]
src/Resources/ribbon/RightGreenDots.bmp [new file with mode: 0644]
src/Resources/ribbon/RightGreenDots.png [deleted file]
src/Resources/ribbon/RightRed.bmp [new file with mode: 0644]
src/Resources/ribbon/RightRed.png [deleted file]
src/Resources/ribbon/Save.bmp [new file with mode: 0644]
src/Resources/ribbon/Save.png [deleted file]
src/Resources/ribbon/SaveAs.bmp [new file with mode: 0644]
src/Resources/ribbon/SaveAs.png [deleted file]
src/Resources/ribbon/Search.bmp [new file with mode: 0644]
src/Resources/ribbon/Search.png [deleted file]
src/Resources/ribbon/Settings.bmp [new file with mode: 0644]
src/Resources/ribbon/Settings.png [deleted file]
src/Resources/ribbon/SmartTab.bmp [new file with mode: 0644]
src/Resources/ribbon/SmartTab.png [deleted file]
src/Resources/ribbon/Switch.bmp [new file with mode: 0644]
src/Resources/ribbon/Switch.png [deleted file]
src/Resources/ribbon/TabSpace.bmp [new file with mode: 0644]
src/Resources/ribbon/TabSpace.png [deleted file]
src/Resources/ribbon/Undo.bmp [new file with mode: 0644]
src/Resources/ribbon/Undo.png [deleted file]
src/Resources/ribbon/UniDiff.bmp [new file with mode: 0644]
src/Resources/ribbon/UniDiff.png [deleted file]
src/Resources/ribbon/UpGreen.bmp [new file with mode: 0644]
src/Resources/ribbon/UpGreen.png [deleted file]
src/Resources/ribbon/UpGreenDots.bmp [new file with mode: 0644]
src/Resources/ribbon/UpGreenDots.png [deleted file]
src/Resources/ribbon/UpRed.bmp [new file with mode: 0644]
src/Resources/ribbon/UpRed.png [deleted file]
src/Resources/ribbon/UseLeftBlock.bmp [new file with mode: 0644]
src/Resources/ribbon/UseLeftBlock.png [deleted file]
src/Resources/ribbon/UseLeftFile.bmp [new file with mode: 0644]
src/Resources/ribbon/UseLeftFile.png [deleted file]
src/Resources/ribbon/UseLeftRight.bmp [new file with mode: 0644]
src/Resources/ribbon/UseLeftRight.png [deleted file]
src/Resources/ribbon/UseMine.bmp [new file with mode: 0644]
src/Resources/ribbon/UseMine.png [deleted file]
src/Resources/ribbon/UseMineTheirs.bmp [new file with mode: 0644]
src/Resources/ribbon/UseMineTheirs.png [deleted file]
src/Resources/ribbon/UseRightLeft.bmp [new file with mode: 0644]
src/Resources/ribbon/UseRightLeft.png [deleted file]
src/Resources/ribbon/UseTheirs.bmp [new file with mode: 0644]
src/Resources/ribbon/UseTheirs.png [deleted file]
src/Resources/ribbon/UseTheirsMine.bmp [new file with mode: 0644]
src/Resources/ribbon/UseTheirsMine.png [deleted file]
src/Resources/ribbon/ViewBars.bmp [new file with mode: 0644]
src/Resources/ribbon/ViewBars.png [deleted file]
src/Resources/ribbon/WhiteSpace1.bmp [new file with mode: 0644]
src/Resources/ribbon/WhiteSpace1.png [deleted file]
src/Resources/ribbon/WhiteSpace2.bmp [new file with mode: 0644]
src/Resources/ribbon/WhiteSpace2.png [deleted file]
src/Resources/ribbon/WhiteSpace3.bmp [new file with mode: 0644]
src/Resources/ribbon/WhiteSpace3.png [deleted file]
src/Resources/ribbon/WrapLines.bmp [new file with mode: 0644]
src/Resources/ribbon/WrapLines.png [deleted file]
src/Resources/ribbon/createribbonimglist.bat [deleted file]
src/Resources/ribbon/ribbonimagelist.txt [deleted file]
src/Resources/ribbon/ribbonlarge.png [deleted file]
src/Resources/ribbon/ribbonlargehdpi.png [deleted file]
src/Resources/ribbon/ribbonsmall.png [deleted file]
src/Resources/ribbon/ribbonsmallhdpi.png [deleted file]
src/TortoiseMerge/CustomMFCRibbonButton.h [deleted file]
src/TortoiseMerge/MainFrm.cpp
src/TortoiseMerge/MainFrm.h
src/TortoiseMerge/NativeRibbonApp.cpp [new file with mode: 0644]
src/TortoiseMerge/NativeRibbonApp.h [new file with mode: 0644]
src/TortoiseMerge/TortoiseMerge.cpp
src/TortoiseMerge/TortoiseMerge.h
src/TortoiseMerge/TortoiseMerge.vcxproj
src/TortoiseMerge/TortoiseMerge.vcxproj.filters
src/TortoiseMerge/TortoiseMergeLang.vcxproj
src/TortoiseMerge/TortoiseMergeLang.vcxproj.filters
src/TortoiseMerge/resource.h
src/TortoiseMerge/stdafx.h