Rearrange the buttons in the TortoiseGitMerge ribbon
commit54f313983229cdba6957e7ba3d0581cd109bcba2
authorSven Strickroth <email@cs-ware.de>
Sun, 2 Aug 2015 09:58:02 +0000 (2 11:58 +0200)
committerSven Strickroth <email@cs-ware.de>
Sun, 2 Aug 2015 12:38:34 +0000 (2 14:38 +0200)
treeb66ec253b5131a546a10487662f7a9568e4696f9
parent69b8329cca03090e92d32c7b1e46f05b772a93da
Rearrange the buttons in the TortoiseGitMerge ribbon

Move all view related commands to a separate tab, and expand the 'block' commands so they're accessible with one click and add missing view commands.

Based on TortoiseSVN revisions 25061 and 26635.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
60 files changed:
src/Resources/ribbon.mfcribbon-ms
src/Resources/ribbon/About.png
src/Resources/ribbon/Check.png
src/Resources/ribbon/Collapse.png
src/Resources/ribbon/Copy.png
src/Resources/ribbon/DownGreen.png
src/Resources/ribbon/DownGreenDots.png
src/Resources/ribbon/DownRed.png
src/Resources/ribbon/Exit.png
src/Resources/ribbon/FileList.png
src/Resources/ribbon/Goto.png
src/Resources/ribbon/Help.png
src/Resources/ribbon/InlineDiff.png
src/Resources/ribbon/InlineDiffWord.png
src/Resources/ribbon/LeftGreen.png
src/Resources/ribbon/LeftGreenDots.png
src/Resources/ribbon/LeftRed.png
src/Resources/ribbon/OneWayDiff.png
src/Resources/ribbon/Open.png
src/Resources/ribbon/OrangeDotDown.png
src/Resources/ribbon/OrangeDotLeft.png
src/Resources/ribbon/OrangeDotRight.png
src/Resources/ribbon/OrangeDotUp.png
src/Resources/ribbon/Paste.png
src/Resources/ribbon/Pilcrow.png
src/Resources/ribbon/Refresh.png
src/Resources/ribbon/RightGreen.png
src/Resources/ribbon/RightGreenDots.png
src/Resources/ribbon/RightRed.png
src/Resources/ribbon/Save.png
src/Resources/ribbon/SaveAs.png
src/Resources/ribbon/Search.png
src/Resources/ribbon/Switch.png
src/Resources/ribbon/TortoiseMerge.png
src/Resources/ribbon/Undo.png
src/Resources/ribbon/UniDiff.png
src/Resources/ribbon/UpGreen.png
src/Resources/ribbon/UpGreenDots.png
src/Resources/ribbon/UpRed.png
src/Resources/ribbon/UseLeftBlock.png [new file with mode: 0644]
src/Resources/ribbon/UseLeftFile.png [new file with mode: 0644]
src/Resources/ribbon/UseLeftRight.png [new file with mode: 0644]
src/Resources/ribbon/UseMine.png [new file with mode: 0644]
src/Resources/ribbon/UseMineTheirs.png [new file with mode: 0644]
src/Resources/ribbon/UseRightLeft.png [new file with mode: 0644]
src/Resources/ribbon/UseTheirs.png [new file with mode: 0644]
src/Resources/ribbon/UseTheirsMine.png [new file with mode: 0644]
src/Resources/ribbon/ViewBars.png [new file with mode: 0644]
src/Resources/ribbon/WhiteSpace1.png
src/Resources/ribbon/WhiteSpace2.png
src/Resources/ribbon/WhiteSpace3.png
src/Resources/ribbon/WrapLines.png
src/Resources/ribbon/ribbonimagelist.txt
src/Resources/ribbon/ribbonlarge.png
src/Resources/ribbon/ribbonlargehdpi.png
src/Resources/ribbon/ribbonsmall.png
src/Resources/ribbon/ribbonsmallhdpi.png
src/TortoiseMerge/MainFrm.cpp
src/TortoiseMerge/MainFrm.h
src/TortoiseMerge/resource.h