From 39b34e1a708830dcb4757dc39fc17effe1a9969f Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Fri, 28 Sep 2012 18:52:04 +0200 Subject: [PATCH] Fixed issue #1418: Submodule Diff Dialog labels disappeared Signed-off-by: Sven Strickroth --- src/Changelog.txt | 1 + src/Resources/TortoiseProcENG.rc | 8 ++++---- src/TortoiseProc/SubmoduleDiffDlg.cpp | 6 ++++++ src/TortoiseProc/resource.h | 6 +++++- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index ddc7be3f2..98cda0e80 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -55,6 +55,7 @@ Released: unreleased the Settings dialog -> Advanced and set TGitCacheCheckContent to "false". * Fixed issue #1300: TortoiseProc LogDialog might crash if tortoisegit.index or tortoisegit.data is broken * Fixed issue #1413: Submodule Diff Dialog: show log button should be right-aligned + * Fixed issue #1418: Submodule Diff Dialog labels disappeared = Release 1.7.12.0 = Released: 2012-08-10 diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index 1150029bc..e7e7e41a0 100644 --- a/src/Resources/TortoiseProcENG.rc +++ b/src/Resources/TortoiseProcENG.rc @@ -1581,16 +1581,16 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Submodule",IDC_SUBMODULEDIFFTITLE,7,7,287,8 GROUPBOX "From",IDC_FROMGROUP,7,20,288,45 - LTEXT "Revision:",IDC_STATIC,15,32,33,8 + LTEXT "Revision:",IDC_STATIC_REVISION,15,32,33,8 EDITTEXT IDC_FROMHASH,52,32,168,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER PUSHBUTTON "Show log",IDC_LOG,226,32,60,12 - LTEXT "Subject:",IDC_STATIC,15,49,33,8 + LTEXT "Subject:",IDC_STATIC_SUBJECT,15,49,33,8 EDITTEXT IDC_FROMSUBJECT,52,49,234,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER GROUPBOX "To",IDC_TOGROUP,7,69,288,45 - LTEXT "Revision:",IDC_STATIC,15,82,33,8 + LTEXT "Revision:",IDC_STATIC_REVISION2,15,82,33,8 EDITTEXT IDC_TOHASH,52,82,168,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER PUSHBUTTON "Show log",IDC_LOG2,226,82,60,12 - LTEXT "Subject:",IDC_STATIC,15,96,33,8 + LTEXT "Subject:",IDC_STATIC_SUBJECT2,15,96,33,8 EDITTEXT IDC_TOSUBJECT,52,96,234,12,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER END diff --git a/src/TortoiseProc/SubmoduleDiffDlg.cpp b/src/TortoiseProc/SubmoduleDiffDlg.cpp index 1d3586f4e..bee19e099 100644 --- a/src/TortoiseProc/SubmoduleDiffDlg.cpp +++ b/src/TortoiseProc/SubmoduleDiffDlg.cpp @@ -53,6 +53,12 @@ BOOL CSubmoduleDiffDlg::OnInitDialog() GetWindowText(sWindowTitle); CAppUtils::SetWindowTitle(m_hWnd, g_Git.m_CurrentDir, sWindowTitle); + AddAnchor(IDC_SUBMODULEDIFFTITLE, TOP_LEFT, TOP_RIGHT); + AddAnchor(IDC_STATIC_REVISION, TOP_LEFT); + AddAnchor(IDC_STATIC_REVISION2, TOP_LEFT); + AddAnchor(IDC_STATIC_SUBJECT, TOP_LEFT); + AddAnchor(IDC_STATIC_SUBJECT2, TOP_LEFT); + AddAnchor(IDC_FROMGROUP, TOP_LEFT, TOP_RIGHT); AddAnchor(IDC_TOGROUP, TOP_LEFT, TOP_RIGHT); diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h index 4c12ca943..84cc5ca4f 100644 --- a/src/TortoiseProc/resource.h +++ b/src/TortoiseProc/resource.h @@ -1178,6 +1178,10 @@ #define IDC_CHECKDELETED 1709 #define IDC_BUTTON_UPDATE 1710 #define IDC_LIST_DOWNLOADS 1711 +#define IDC_STATIC_REVISION 1712 +#define IDC_STATIC_REVISION2 1713 +#define IDC_STATIC_SUBJECT 1714 +#define IDC_STATIC_SUBJECT2 1715 #define IDS_DLGTITLE_ADD_DIFF_TOOL 1750 #define IDS_DLGTITLE_ADD_MERGE_TOOL 1751 #define IDS_DLGTITLE_EDIT_DIFF_TOOL 1752 @@ -1554,7 +1558,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 343 #define _APS_NEXT_COMMAND_VALUE 32840 -#define _APS_NEXT_CONTROL_VALUE 1712 +#define _APS_NEXT_CONTROL_VALUE 1716 #define _APS_NEXT_SYMED_VALUE 201 #endif #endif -- 2.11.4.GIT