From 117cdefdfa201bbe9503b3657f6023350c600d58 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sun, 29 Jan 2017 21:19:01 +0100 Subject: [PATCH] Set default block icons which are shown when the blocks are collapsed Signed-off-by: Sven Strickroth --- src/Resources/ribbon.mfcribbon-ms | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Resources/ribbon.mfcribbon-ms b/src/Resources/ribbon.mfcribbon-ms index 22d9e47a3..a1fe6eba2 100644 --- a/src/Resources/ribbon.mfcribbon-ms +++ b/src/Resources/ribbon.mfcribbon-ms @@ -1 +1 @@ -
1
RibbonBarTRUETRUETRUETRUEFALSEIDB_RIBBONSMALL158Button_MainID_LOGOBUTTON32897TFALSEFALSE-1-1TRUEIDB_LOGO159Category_MainTortoiseGitMergeIDB_RIBBONSMALL158IDB_RIBBONLARGE157ButtonID_FILE_OPEN57601OpenOFALSEFALSE00TRUEFALSEButtonID_FILE_SAVE57603SaveSFALSEFALSE11TRUEFALSEButtonID_FILE_SAVE_AS57604Save asAFALSEFALSE4343TRUEFALSESeparatorTRUEButtonID_EDIT_CREATEUNIFIEDDIFFFILE32828Create patch filePFALSEFALSE2626TRUEFALSESeparatorTRUEButtonID_VIEW_SHOWFILELIST32817Hide/Show the patch file listHFALSEFALSE3030TRUEFALSEButtonID_VIEW_OPTIONS32782SettingsSFALSEFALSE4242TRUEFALSEButton_Main_PanelID_APP_EXIT57665ExitXFALSEFALSE40-1TRUEFALSE300GroupButtonIDC_STYLEBUTTON10000StyleFALSEFALSE-1-1FALSEFALSEButtonID_VIEW_APPLOOK_WIN_200010003Windows 2000FALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_OFF_XP10004Office XPFALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_WIN_XP10005Windows XPFALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_OFF_200310006Office 2003FALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_VS_200510007Visual Studio 2005FALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_VS_200810002Visual Studio 2008FALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_WIN710001Windows 7FALSEFALSE-1-1TRUEFALSEButtonID_OFFICE200710008Office 2007FALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_OFF_2007_BLUE10009Blue StyleFALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_OFF_2007_BLACK10010Black StyleFALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_OFF_2007_SILVER10011Silver StyleFALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_OFF_2007_AQUA10012Aqua StyleFALSEFALSE-1-1TRUEFALSEButtonID_HELP57670HelpFALSEFALSE41-1TRUEFALSEButtonID_APP_ABOUT57664AboutFALSEFALSE39-1TRUEFALSECategoryEditEIDB_RIBBONSMALL158IDB_RIBBONLARGE157PanelEditE-1FALSEFALSEButtonID_FILE_SAVE57603SaveSFALSEFALSE11TRUEFALSESeparatorFALSEButtonID_FILE_RELOAD32794ReloadRFALSEFALSE22FALSEFALSEButtonID_EDIT_UNDO57643UndoZFALSEFALSE3-1TRUEFALSEButtonID_EDIT_REDO57644RedoYFALSEFALSE58-1TRUEFALSEButtonID_EDIT_ENABLE32976Enable EditEFALSEFALSE44-1FALSEFALSESeparatorFALSEButtonID_EDIT_COPY57634CopyCFALSEFALSE2727TRUEFALSEButtonID_EDIT_PASTE57637PastePFALSEFALSE2828TRUEFALSESeparatorFALSEButtonID_EDIT_FIND57636FindFFALSEFALSE2424TRUEFALSEButtonID_EDIT_GOTOLINE32893Goto LineGFALSEFALSE2525TRUEFALSESeparatorFALSEButtonID_EDIT_MARKASRESOLVED32808Mark as resolvedFALSEFALSE2020TRUEFALSEPanelNavigateN-1TRUEFALSEButtonID_NAVIGATE_PREVIOUSDIFFERENCE32780Previous differencePDFALSEFALSE66FALSEFALSEButtonID_NAVIGATE_NEXTDIFFERENCE32779Next differenceNDFALSEFALSE44FALSEFALSEButtonID_NAVIGATE_PREVIOUSCONFLICT32802Previous conflictPCFALSEFALSE1414FALSEFALSEButtonID_NAVIGATE_NEXTCONFLICT32804Next conflictNCFALSEFALSE1212FALSEFALSEButtonID_NAVIGATE_PREVINLINEDIFF32876Previous inline differencePIFALSEFALSE99TRUEFALSEButtonID_NAVIGATE_NEXTINLINEDIFF32875Next inline differenceNIFALSEFALSE1111TRUEFALSEPanelBlocks-1FALSEFALSEButtonID_EDIT_USELEFTBLOCK32855Use left blockFALSEFALSE5050TRUEFALSEButtonID_EDIT_USELEFTFILE32856Use left fileFALSEFALSE51-1TRUEFALSEButtonID_EDIT_USEBLOCKFROMLEFTBEFORERIGHT32857Use block from left before rightFALSEFALSE52-1TRUEFALSEButtonID_EDIT_USEBLOCKFROMRIGHTBEFORELEFT32859Use block from right before leftFALSEFALSE53-1TRUEFALSEButtonID_EDIT_USETHEIRBLOCK32819Use 'theirs' text blockFALSEFALSE5555TRUEFALSEButtonID_EDIT_USETHEIRBLOCK32819Use 'theirs' text blockFALSEFALSE55-1TRUEFALSEButtonID_EDIT_USEMYBLOCK32820Use 'mine' text blockFALSEFALSE54-1TRUEFALSEButtonID_EDIT_USETHEIRTHENMYBLOCK32821Use 'theirs' text block then 'mine'FALSEFALSE57-1TRUEFALSEButtonID_EDIT_USEMINETHENTHEIRBLOCK32822Use 'mine' text block then 'theirs'FALSEFALSE56-1TRUEFALSEPanelWhitespaces-1FALSEFALSEButtonID_VIEW_WHITESPACES32774Show WhitespacesWFALSEFALSE2323TRUEFALSESeparatorFALSEButtonID_VIEW_COMPAREWHITESPACES32871Compare whitespacesFALSEFALSE3535TRUEFALSEButtonID_VIEW_IGNOREWHITESPACECHANGES32872Ignore whitespace changesFALSEFALSE3636TRUEFALSEButtonID_VIEW_IGNOREALLWHITESPACECHANGES32873Ignore all whitespace changesFALSEFALSE3737TRUEFALSEPanelDiff-1FALSEFALSEButtonID_VIEW_INLINEDIFF32889Inline diffFALSEFALSE3131TRUEFALSEButtonID_VIEW_INLINEDIFFWORD32825Inline diff word-wiseFALSEFALSE3232TRUEFALSEButton_GalleryID_REGEXFILTER500Regex FilterFALSEFALSE4747TRUEFALSETRUEFALSE00, 0ButtonID_VIEW_IGNORECOMMENTS32896Ignore CommentsFALSEFALSE4545TRUEFALSEPanelViewV-1FALSEFALSEButtonID_VIEW_BARS32898View BarsFALSEFALSE5959FALSEFALSEButtonID_VIEW_LINEDIFFBAR32853Line diff barFALSEFALSE-1-1TRUEFALSEButtonID_VIEW_LOCATORBAR32854Locator BarFALSEFALSE-1-1TRUEFALSEButtonID_VIEW_STATUS_BAR59393Status BarFALSEFALSE-1-1TRUEFALSEButtonID_VIEW_WRAPLONGLINES32881Wrap long linesLFALSEFALSE3838TRUEFALSESeparatorFALSEButtonID_VIEW_ONEWAYDIFF32775Switch between single and double pane viewFALSEFALSE3333TRUEFALSEButtonID_VIEW_SWITCHLEFT32811Switch left and right viewFALSEFALSE3434TRUEFALSEButtonID_VIEW_COLLAPSED32870CollapseFALSEFALSE2929TRUEFALSE
\ No newline at end of file +
1
RibbonBarTRUETRUETRUETRUEFALSEIDB_RIBBONSMALL158Button_MainID_LOGOBUTTON32897TFALSEFALSE-1-1TRUEIDB_LOGO159Category_MainTortoiseGitMergeIDB_RIBBONSMALL158IDB_RIBBONLARGE157ButtonID_FILE_OPEN57601OpenOFALSEFALSE00TRUEFALSEButtonID_FILE_SAVE57603SaveSFALSEFALSE11TRUEFALSEButtonID_FILE_SAVE_AS57604Save asAFALSEFALSE4343TRUEFALSESeparatorTRUEButtonID_EDIT_CREATEUNIFIEDDIFFFILE32828Create patch filePFALSEFALSE2626TRUEFALSESeparatorTRUEButtonID_VIEW_SHOWFILELIST32817Hide/Show the patch file listHFALSEFALSE3030TRUEFALSEButtonID_VIEW_OPTIONS32782SettingsSFALSEFALSE4242TRUEFALSEButton_Main_PanelID_APP_EXIT57665ExitXFALSEFALSE40-1TRUEFALSE300GroupButtonIDC_STYLEBUTTON10000StyleFALSEFALSE-1-1FALSEFALSEButtonID_VIEW_APPLOOK_WIN_200010003Windows 2000FALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_OFF_XP10004Office XPFALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_WIN_XP10005Windows XPFALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_OFF_200310006Office 2003FALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_VS_200510007Visual Studio 2005FALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_VS_200810002Visual Studio 2008FALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_WIN710001Windows 7FALSEFALSE-1-1TRUEFALSEButtonID_OFFICE200710008Office 2007FALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_OFF_2007_BLUE10009Blue StyleFALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_OFF_2007_BLACK10010Black StyleFALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_OFF_2007_SILVER10011Silver StyleFALSEFALSE-1-1TRUEFALSEButtonID_VIEW_APPLOOK_OFF_2007_AQUA10012Aqua StyleFALSEFALSE-1-1TRUEFALSEButtonID_HELP57670HelpFALSEFALSE41-1TRUEFALSEButtonID_APP_ABOUT57664AboutFALSEFALSE39-1TRUEFALSECategoryEditEIDB_RIBBONSMALL158IDB_RIBBONLARGE157PanelEditE43FALSEFALSEButtonID_FILE_SAVE57603SaveSFALSEFALSE11TRUEFALSESeparatorFALSEButtonID_FILE_RELOAD32794ReloadRFALSEFALSE22FALSEFALSEButtonID_EDIT_UNDO57643UndoZFALSEFALSE3-1TRUEFALSEButtonID_EDIT_REDO57644RedoYFALSEFALSE58-1TRUEFALSEButtonID_EDIT_ENABLE32976Enable EditEFALSEFALSE44-1FALSEFALSESeparatorFALSEButtonID_EDIT_COPY57634CopyCFALSEFALSE2727TRUEFALSEButtonID_EDIT_PASTE57637PastePFALSEFALSE2828TRUEFALSESeparatorFALSEButtonID_EDIT_FIND57636FindFFALSEFALSE2424TRUEFALSEButtonID_EDIT_GOTOLINE32893Goto LineGFALSEFALSE2525TRUEFALSESeparatorFALSEButtonID_EDIT_MARKASRESOLVED32808Mark as resolvedFALSEFALSE2020TRUEFALSEPanelNavigateN7TRUEFALSEButtonID_NAVIGATE_PREVIOUSDIFFERENCE32780Previous differencePDFALSEFALSE66FALSEFALSEButtonID_NAVIGATE_NEXTDIFFERENCE32779Next differenceNDFALSEFALSE44FALSEFALSEButtonID_NAVIGATE_PREVIOUSCONFLICT32802Previous conflictPCFALSEFALSE1414FALSEFALSEButtonID_NAVIGATE_NEXTCONFLICT32804Next conflictNCFALSEFALSE1212FALSEFALSEButtonID_NAVIGATE_PREVINLINEDIFF32876Previous inline differencePIFALSEFALSE99TRUEFALSEButtonID_NAVIGATE_NEXTINLINEDIFF32875Next inline differenceNIFALSEFALSE1111TRUEFALSEPanelBlocks50FALSEFALSEButtonID_EDIT_USELEFTBLOCK32855Use left blockFALSEFALSE5050TRUEFALSEButtonID_EDIT_USELEFTFILE32856Use left fileFALSEFALSE51-1TRUEFALSEButtonID_EDIT_USEBLOCKFROMLEFTBEFORERIGHT32857Use block from left before rightFALSEFALSE52-1TRUEFALSEButtonID_EDIT_USEBLOCKFROMRIGHTBEFORELEFT32859Use block from right before leftFALSEFALSE53-1TRUEFALSEButtonID_EDIT_USETHEIRBLOCK32819Use 'theirs' text blockFALSEFALSE5555TRUEFALSEButtonID_EDIT_USETHEIRBLOCK32819Use 'theirs' text blockFALSEFALSE55-1TRUEFALSEButtonID_EDIT_USEMYBLOCK32820Use 'mine' text blockFALSEFALSE54-1TRUEFALSEButtonID_EDIT_USETHEIRTHENMYBLOCK32821Use 'theirs' text block then 'mine'FALSEFALSE57-1TRUEFALSEButtonID_EDIT_USEMINETHENTHEIRBLOCK32822Use 'mine' text block then 'theirs'FALSEFALSE56-1TRUEFALSEPanelWhitespaces23FALSEFALSEButtonID_VIEW_WHITESPACES32774Show WhitespacesWFALSEFALSE2323TRUEFALSESeparatorFALSEButtonID_VIEW_COMPAREWHITESPACES32871Compare whitespacesFALSEFALSE3535TRUEFALSEButtonID_VIEW_IGNOREWHITESPACECHANGES32872Ignore whitespace changesFALSEFALSE3636TRUEFALSEButtonID_VIEW_IGNOREALLWHITESPACECHANGES32873Ignore all whitespace changesFALSEFALSE3737TRUEFALSEPanelDiff30FALSEFALSEButtonID_VIEW_INLINEDIFF32889Inline diffFALSEFALSE3131TRUEFALSEButtonID_VIEW_INLINEDIFFWORD32825Inline diff word-wiseFALSEFALSE3232TRUEFALSEButton_GalleryID_REGEXFILTER500Regex FilterFALSEFALSE4747TRUEFALSETRUEFALSE00, 0ButtonID_VIEW_IGNORECOMMENTS32896Ignore CommentsFALSEFALSE4545TRUEFALSEPanelViewV59FALSEFALSEButtonID_VIEW_BARS32898View BarsFALSEFALSE5959FALSEFALSEButtonID_VIEW_LINEDIFFBAR32853Line diff barFALSEFALSE-1-1TRUEFALSEButtonID_VIEW_LOCATORBAR32854Locator BarFALSEFALSE-1-1TRUEFALSEButtonID_VIEW_STATUS_BAR59393Status BarFALSEFALSE-1-1TRUEFALSEButtonID_VIEW_WRAPLONGLINES32881Wrap long linesLFALSEFALSE3838TRUEFALSESeparatorFALSEButtonID_VIEW_ONEWAYDIFF32775Switch between single and double pane viewFALSEFALSE3333TRUEFALSEButtonID_VIEW_SWITCHLEFT32811Switch left and right viewFALSEFALSE3434TRUEFALSEButtonID_VIEW_COLLAPSED32870CollapseFALSEFALSE2929TRUEFALSE
\ No newline at end of file -- 2.11.4.GIT