OSDN Git Service

(root) / winmerge-jp / winmerge-jp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9524372)
Improve Options > Color > Differences dialog layout
authorGreyMerlin <GreyMerlin7@gmail.com>
Sun, 17 Jun 2018 00:19:44 +0000 (17:19 -0700)
committerGreyMerlin <GreyMerlin7@gmail.com>
Sun, 17 Jun 2018 00:19:44 +0000 (17:19 -0700)
- Allow more room for the various lines of caption test by sliding the
various controls slightly to the right.

Src/Merge.rc patch | blob | history

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 93da220..e6ab5b1 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1101,56 +1101,56 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
 CAPTION "Colors"\r
 FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
 BEGIN\r
-    RTEXT           "Difference:",IDC_STATIC,7,29,90,20\r
-    CONTROL         "",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,113,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
-    RTEXT           "Selected Difference:",IDC_STATIC,7,49,90,20\r
-    CONTROL         "",IDC_SEL_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,113,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
-    CTEXT           "Background",IDC_STATIC,96,15,50,10\r
-    CTEXT           "Deleted",IDC_STATIC,145,15,38,10\r
-    CONTROL         "",IDC_DIFFERENCE_DELETED_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,156,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
-    CONTROL         "",IDC_SEL_DIFFERENCE_DELETED_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,156,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
-    CONTROL         "",IDC_DIFFERENCE_USE_TEXT_COLOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,29,10,14\r
-    CONTROL         "",IDC_DIFFERENCE_TEXT_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,199,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
-    CONTROL         "",IDC_SEL_DIFFERENCE_USE_TEXT_COLOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,49,10,14\r
-    CONTROL         "",IDC_SEL_DIFFERENCE_TEXT_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,199,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
-    CTEXT           "Text",IDC_STATIC,193,15,29,10\r
-    CONTROL         "",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,113,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
-    RTEXT           "Ignored Difference:",IDC_STATIC,7,69,90,20\r
-    CONTROL         "",IDC_TRIVIAL_DIFF_DELETED_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,156,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
-    CONTROL         "",IDC_TRIVIAL_DIFF_USE_TEXT_COLOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,69,10,14\r
-    CONTROL         "",IDC_TRIVIAL_DIFF_TEXT_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,199,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
-    CONTROL         "",IDC_MOVEDBLOCK_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,113,89,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
-    RTEXT           "Moved:",IDC_STATIC,7,89,90,20\r
-    CONTROL         "",IDC_MOVEDBLOCK_DELETED_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,156,89,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
-    CONTROL         "",IDC_MOVEDBLOCK_USE_TEXT_COLOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,89,10,14\r
-    CONTROL         "",IDC_MOVEDBLOCK_TEXT_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,199,89,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
-    CONTROL         "",IDC_SEL_MOVEDBLOCK_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,113,109,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
-    RTEXT           "Selected Moved:",IDC_STATIC,7,109,90,20\r
-    CONTROL         "",IDC_SEL_MOVEDBLOCK_DELETED_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,156,109,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
-    CONTROL         "",IDC_SEL_MOVEDBLOCK_USE_TEXT_COLOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,109,10,14\r
-    CONTROL         "",IDC_SEL_MOVEDBLOCK_TEXT_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,199,109,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
-    RTEXT           "Same As The Next(3 panes):",IDC_STATIC,7,129,90,20\r
-    CONTROL         "",IDC_SNP_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,113,129,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
-    CONTROL         "",IDC_SNP_DELETED_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,156,129,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
-    CONTROL         "",IDC_SNP_USE_TEXT_COLOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,129,10,14\r
-    CONTROL         "",IDC_SNP_TEXT_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,199,129,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
-    RTEXT           "Same As The Next(Selected):",IDC_STATIC,7,149,90,20\r
-    CONTROL         "",IDC_SEL_SNP_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,113,149,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
-    CONTROL         "",IDC_SEL_SNP_DELETED_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,156,149,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
-    CONTROL         "",IDC_SEL_SNP_USE_TEXT_COLOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,149,10,14\r
-    CONTROL         "",IDC_SEL_SNP_TEXT_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,199,149,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
-    RTEXT           "Word Difference:",IDC_STATIC,7,169,90,20\r
-    CONTROL         "",IDC_WORDDIFF_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,113,169,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
-    CONTROL         "",IDC_WORDDIFF_DELETED_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,156,169,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
-    CONTROL         "",IDC_WORDDIFF_USE_TEXT_COLOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,169,10,14\r
-    CONTROL         "",IDC_WORDDIFF_TEXT_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,199,169,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
-    RTEXT           "Selected Word Diff:",IDC_STATIC,7,189,90,20\r
-    CONTROL         "",IDC_SEL_WORDDIFF_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,113,189,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
-    CONTROL         "",IDC_SEL_WORDDIFF_DELETED_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,156,189,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
-    CONTROL         "",IDC_SEL_WORDDIFF_USE_TEXT_COLOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,189,189,10,14\r
-    CONTROL         "",IDC_SEL_WORDDIFF_TEXT_COLOR,"Button",BS_OWNERDRAW | WS_TABSTOP,199,189,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
-    PUSHBUTTON      "GitHub/Bitbucket",IDC_COLORSCHEME_GITHUBBITBUCKET,76,208,70,14\r
-    PUSHBUTTON      "Defaults",IDC_COLORDEFAULTS_BTN,146,208,70,14\r
+    CTEXT           "Background",IDC_STATIC,114,15,50,10\r
+    CTEXT           "Deleted",IDC_STATIC,163,15,38,10\r
+    CTEXT           "Text",IDC_STATIC,207,15,29,10\r
+    RTEXT           "Difference:",IDC_STATIC,4,29,112,20\r
+    CONTROL         "",IDC_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW,132,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
+    CONTROL         "",IDC_DIFFERENCE_DELETED_COLOR,"Button",BS_OWNERDRAW,174,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
+    CONTROL         "",IDC_DIFFERENCE_USE_TEXT_COLOR,"Button",BS_AUTOCHECKBOX,204,29,10,14\r
+    CONTROL         "",IDC_DIFFERENCE_TEXT_COLOR,"Button",BS_OWNERDRAW,214,29,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
+    RTEXT           "Selected Difference:",IDC_STATIC,4,49,112,20\r
+    CONTROL         "",IDC_SEL_DIFFERENCE_COLOR,"Button",BS_OWNERDRAW,132,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
+    CONTROL         "",IDC_SEL_DIFFERENCE_DELETED_COLOR,"Button",BS_OWNERDRAW,174,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
+    CONTROL         "",IDC_SEL_DIFFERENCE_USE_TEXT_COLOR,"Button",BS_AUTOCHECKBOX,204,49,10,14\r
+    CONTROL         "",IDC_SEL_DIFFERENCE_TEXT_COLOR,"Button",BS_OWNERDRAW,214,49,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
+    RTEXT           "Ignored Difference:",IDC_STATIC,4,69,112,20\r
+    CONTROL         "",IDC_TRIVIAL_DIFF_COLOR,"Button",BS_OWNERDRAW,132,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
+    CONTROL         "",IDC_TRIVIAL_DIFF_DELETED_COLOR,"Button",BS_OWNERDRAW,174,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
+    CONTROL         "",IDC_TRIVIAL_DIFF_USE_TEXT_COLOR,"Button",BS_AUTOCHECKBOX,204,69,10,14\r
+    CONTROL         "",IDC_TRIVIAL_DIFF_TEXT_COLOR,"Button",BS_OWNERDRAW,214,69,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
+    RTEXT           "Moved:",IDC_STATIC,4,89,112,20\r
+    CONTROL         "",IDC_MOVEDBLOCK_COLOR,"Button",BS_OWNERDRAW,132,89,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
+    CONTROL         "",IDC_MOVEDBLOCK_DELETED_COLOR,"Button",BS_OWNERDRAW,174,89,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
+    CONTROL         "",IDC_MOVEDBLOCK_USE_TEXT_COLOR,"Button",BS_AUTOCHECKBOX,204,89,10,14\r
+    CONTROL         "",IDC_MOVEDBLOCK_TEXT_COLOR,"Button",BS_OWNERDRAW,214,89,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
+    RTEXT           "Selected Moved:",IDC_STATIC,4,109,112,20\r
+    CONTROL         "",IDC_SEL_MOVEDBLOCK_COLOR,"Button",BS_OWNERDRAW,132,109,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
+    CONTROL         "",IDC_SEL_MOVEDBLOCK_DELETED_COLOR,"Button",BS_OWNERDRAW,174,109,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
+    CONTROL         "",IDC_SEL_MOVEDBLOCK_USE_TEXT_COLOR,"Button",BS_AUTOCHECKBOX,204,109,10,14\r
+    CONTROL         "",IDC_SEL_MOVEDBLOCK_TEXT_COLOR,"Button",BS_OWNERDRAW,214,109,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
+    RTEXT           "Same As The Next (3 panes):",IDC_STATIC,4,129,112,20\r
+    CONTROL         "",IDC_SNP_COLOR,"Button",BS_OWNERDRAW,132,129,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
+    CONTROL         "",IDC_SNP_DELETED_COLOR,"Button",BS_OWNERDRAW,174,129,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
+    CONTROL         "",IDC_SNP_USE_TEXT_COLOR,"Button",BS_AUTOCHECKBOX,204,129,10,14\r
+    CONTROL         "",IDC_SNP_TEXT_COLOR,"Button",BS_OWNERDRAW,214,129,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
+    RTEXT           "Same As The Next (Selected):",IDC_STATIC,4,149,112,20\r
+    CONTROL         "",IDC_SEL_SNP_COLOR,"Button",BS_OWNERDRAW,132,149,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
+    CONTROL         "",IDC_SEL_SNP_DELETED_COLOR,"Button",BS_OWNERDRAW,174,149,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
+    CONTROL         "",IDC_SEL_SNP_USE_TEXT_COLOR,"Button",BS_AUTOCHECKBOX,204,149,10,14\r
+    CONTROL         "",IDC_SEL_SNP_TEXT_COLOR,"Button",BS_OWNERDRAW,214,149,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
+    RTEXT           "Word Difference:",IDC_STATIC,4,169,112,20\r
+    CONTROL         "",IDC_WORDDIFF_COLOR,"Button",BS_OWNERDRAW,132,169,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
+    CONTROL         "",IDC_WORDDIFF_DELETED_COLOR,"Button",BS_OWNERDRAW,174,169,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
+    CONTROL         "",IDC_WORDDIFF_USE_TEXT_COLOR,"Button",BS_AUTOCHECKBOX,204,169,10,14\r
+    CONTROL         "",IDC_WORDDIFF_TEXT_COLOR,"Button",BS_OWNERDRAW,214,169,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
+    RTEXT           "Selected Word Diff:",IDC_STATIC,4,189,112,20\r
+    CONTROL         "",IDC_SEL_WORDDIFF_COLOR,"Button",BS_OWNERDRAW,132,189,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
+    CONTROL         "",IDC_SEL_WORDDIFF_DELETED_COLOR,"Button",BS_OWNERDRAW,174,189,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
+    CONTROL         "",IDC_SEL_WORDDIFF_USE_TEXT_COLOR,"Button",BS_AUTOCHECKBOX,204,189,10,14\r
+    CONTROL         "",IDC_SEL_WORDDIFF_TEXT_COLOR,"Button",BS_OWNERDRAW,214,189,17,14,WS_EX_TRANSPARENT | WS_EX_CLIENTEDGE\r
+    PUSHBUTTON      "GitHub/Bitbucket",IDC_COLORSCHEME_GITHUBBITBUCKET,89,208,70,14\r
+    PUSHBUTTON      "Defaults",IDC_COLORDEFAULTS_BTN,161,208,70,14\r
 END\r
 \r
 IDD_PROPPAGE_SYSTEM DIALOGEX 0, 0, 235, 220\r
About OSDN
Find Software
Develop Software
Help