From 26d8cb61e84ff605a5b30d84f03f7d78764f6c21 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Sun, 14 Feb 2016 13:55:46 +0900 Subject: [PATCH] OpenDlg: Add Read-only checkbox to OpenDlg (2) --- Src/Merge.rc | 8 ++++---- Src/OpenView.cpp | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Src/Merge.rc b/Src/Merge.rc index ed8300815..1569604c3 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -446,7 +446,7 @@ BEGIN BEGIN MENUITEM "Zoom &In\tCtrl++", ID_VIEW_ZOOMIN MENUITEM "Zoom &Out\tCtrl+-", ID_VIEW_ZOOMOUT - MENUITEM "&Normal\tCtrl+*", ID_VIEW_ZOOMNORMAL + MENUITEM "&Normal\tCtrl+*", ID_VIEW_ZOOMNORMAL //#. Zoom to normal END POPUP "Syntax Highlight" BEGIN @@ -884,9 +884,9 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,342,242,50,14 PUSHBUTTON "Help",ID_HELP,402,242,50,14 GROUPBOX "Files or Folders to Compare",IDC_FILES_DIRS_GROUP,7,67,452,159 - CONTROL "Re&ad-only",IDC_PATH0_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,342,100,72,10 - CONTROL "Rea&d-only",IDC_PATH1_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,342,132,72,10 - CONTROL "Read-o&nly",IDC_PATH2_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,342,164,72,10 + CONTROL "Re&ad-only",IDC_PATH0_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,306,100,72,10 + CONTROL "Rea&d-only",IDC_PATH1_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,306,132,72,10 + CONTROL "Read-o&nly",IDC_PATH2_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,306,164,72,10 END IDD_VSS DIALOGEX 0, 0, 257, 166 diff --git a/Src/OpenView.cpp b/Src/OpenView.cpp index 884319e13..cd6ae1825 100644 --- a/Src/OpenView.cpp +++ b/Src/OpenView.cpp @@ -193,6 +193,9 @@ void COpenView::OnInitialUpdate() m_constraint.ConstrainItem(IDC_PATH0_BUTTON, 1, 0, 0, 0); // slides right m_constraint.ConstrainItem(IDC_PATH1_BUTTON, 1, 0, 0, 0); // slides right m_constraint.ConstrainItem(IDC_PATH2_BUTTON, 1, 0, 0, 0); // slides right + m_constraint.ConstrainItem(IDC_PATH0_READONLY, 1, 0, 0, 0); // slides right + m_constraint.ConstrainItem(IDC_PATH1_READONLY, 1, 0, 0, 0); // slides right + m_constraint.ConstrainItem(IDC_PATH2_READONLY, 1, 0, 0, 0); // slides right m_constraint.ConstrainItem(IDC_SWAP01_BUTTON, 1, 0, 0, 0); // slides right m_constraint.ConstrainItem(IDC_SWAP12_BUTTON, 1, 0, 0, 0); // slides right m_constraint.ConstrainItem(IDC_SWAP02_BUTTON, 1, 0, 0, 0); // slides right -- 2.11.0