From f4f112fe8de1fe1e9037438defe9d891294a1bf0 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Fri, 21 Nov 2014 19:49:13 +0100 Subject: [PATCH] Show filename in DeleteConflictDlg and fix optics Signed-off-by: Sven Strickroth --- src/Resources/TortoiseProcENG.rc | 32 ++++++++++++++++++-------------- src/TortoiseProc/DeleteConflictDlg.cpp | 4 +++- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index 30bba57de..84c81dda5 100644 --- a/src/Resources/TortoiseProcENG.rc +++ b/src/Resources/TortoiseProcENG.rc @@ -1468,23 +1468,24 @@ BEGIN PUSHBUTTON "Button3",IDC_REBASE_POST_BUTTON,6,217,75,14,NOT WS_VISIBLE END -IDD_RESOLVE_CONFLICT DIALOGEX 0, 0, 285, 118 +IDD_RESOLVE_CONFLICT DIALOGEX 0, 0, 285, 129 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Conflict" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - GROUPBOX "Deleted merge conflict",IDC_DEL_GROUP,7,7,271,83 - LTEXT "Local:",IDC_STATIC,22,24,42,8 - LTEXT "Static",IDC_LOCAL_STATUS,58,24,167,8 - EDITTEXT IDC_FROMHASH,21,36,188,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER - PUSHBUTTON "Show log",IDC_LOG,218,35,60,12 - LTEXT "Remote:",IDC_STATIC,22,55,32,8 - LTEXT "Static",IDC_REMOTE_STATUS,58,55,164,8 - EDITTEXT IDC_TOHASH,21,67,188,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER - PUSHBUTTON "Show log",IDC_LOG2,218,63,60,12 - DEFPUSHBUTTON "OK",IDC_MODIFY,55,97,50,14 - PUSHBUTTON "Delete",IDC_DELETE,116,97,50,14 - PUSHBUTTON "Abort",IDCANCEL,179,97,50,14 + GROUPBOX "Deleted merge conflict",IDC_DEL_GROUP,7,7,271,95 + LTEXT "",IDC_INFOLABEL,19,21,251,8,SS_PATHELLIPSIS + LTEXT "Local:",IDC_STATIC,19,39,42,8 + LTEXT "Static",IDC_LOCAL_STATUS,58,39,167,8 + EDITTEXT IDC_FROMHASH,19,51,188,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + PUSHBUTTON "Show log",IDC_LOG,218,51,52,12 + LTEXT "Remote:",IDC_STATIC,19,70,40,8 + LTEXT "Static",IDC_REMOTE_STATUS,58,70,164,8 + EDITTEXT IDC_TOHASH,19,82,188,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + PUSHBUTTON "Show log",IDC_LOG2,218,82,52,12 + DEFPUSHBUTTON "OK",IDC_MODIFY,55,108,50,14 + PUSHBUTTON "Delete",IDC_DELETE,116,108,50,14 + PUSHBUTTON "Abort",IDCANCEL,179,108,50,14 END IDD_REFLOG DIALOGEX 0, 0, 356, 196 @@ -2726,8 +2727,11 @@ BEGIN BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 278 + VERTGUIDE, 19 + VERTGUIDE, 218 + VERTGUIDE, 270 TOPMARGIN, 7 - BOTTOMMARGIN, 111 + BOTTOMMARGIN, 122 END IDD_REFLOG, DIALOG diff --git a/src/TortoiseProc/DeleteConflictDlg.cpp b/src/TortoiseProc/DeleteConflictDlg.cpp index a3167593c..673ca3fe8 100644 --- a/src/TortoiseProc/DeleteConflictDlg.cpp +++ b/src/TortoiseProc/DeleteConflictDlg.cpp @@ -1,6 +1,6 @@ // TortoiseGit - a Windows shell extension for easy version control -// Copyright (C) 2009-2012 - TortoiseGit +// Copyright (C) 2009-2012, 2014 - TortoiseGit // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -78,6 +78,8 @@ BOOL CDeleteConflictDlg::OnInitDialog() GetWindowText(sWindowTitle); CAppUtils::SetWindowTitle(m_hWnd, this->m_File, sWindowTitle); + GetDlgItem(IDC_INFOLABEL)->SetWindowText(m_File); + return TRUE; } // CDeleteConflictDlg message handlers -- 2.11.4.GIT