From 7bd0056248d748046b7a88d10522c8391c43f31c Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sun, 3 May 2015 20:52:34 +0000 Subject: fix for the option's page style pt. 10 git-svn-id: http://svn.miranda-ng.org/main/trunk@13413 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/core/stdaway/res/resource.rc | 4 ++-- src/core/stdchat/res/chat.rc | 6 +++--- src/core/stdclist/res/resource.rc | 18 +++++++++--------- src/core/stdfile/res/resource.rc | 2 +- src/core/stdidle/res/resource.rc | 4 ++-- src/core/stdmsg/res/resource.rc | 10 +++++----- src/resource.rc | 39 ++++++++++++++++++--------------------- 7 files changed, 40 insertions(+), 43 deletions(-) (limited to 'src') diff --git a/src/core/stdaway/res/resource.rc b/src/core/stdaway/res/resource.rc index 2b794d95eb..85efa99e84 100644 --- a/src/core/stdaway/res/resource.rc +++ b/src/core/stdaway/res/resource.rc @@ -37,7 +37,7 @@ BEGIN END IDD_OPT_AWAYMSG DIALOGEX 0, 0, 263, 151 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -57,7 +57,7 @@ END IDD_MODERNOPT_STATUS DIALOGEX 0, 0, 369, 113 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN COMBOBOX IDC_STATUS,2,54,16,97,CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP CONTROL "Do not reply to requests for this message",IDC_DONTREPLY, diff --git a/src/core/stdchat/res/chat.rc b/src/core/stdchat/res/chat.rc index c4fc84fc82..bae7f07e5f 100644 --- a/src/core/stdchat/res/chat.rc +++ b/src/core/stdchat/res/chat.rc @@ -135,7 +135,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT // IDD_OPTIONS1 DIALOGEX 0, 0, 300, 230 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -146,7 +146,7 @@ BEGIN END IDD_OPTIONS2 DIALOGEX 0, 0, 300, 200 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -196,7 +196,7 @@ BEGIN END IDD_OPTIONSPOPUP DIALOGEX 0, 0, 277, 177 -STYLE DS_FIXEDSYS | DS_SETFONT | WS_POPUP | WS_VISIBLE +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN diff --git a/src/core/stdclist/res/resource.rc b/src/core/stdclist/res/resource.rc index 66333c780b..562231512f 100644 --- a/src/core/stdclist/res/resource.rc +++ b/src/core/stdclist/res/resource.rc @@ -44,7 +44,7 @@ BEGIN END IDD_OPT_CLIST DIALOGEX 0, 0, 314, 204 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_CHILD +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -78,7 +78,7 @@ BEGIN END IDD_OPT_CLUI DIALOGEX 0, 0, 313, 245 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_CHILD +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -121,7 +121,7 @@ BEGIN END IDD_OPT_CLC DIALOGEX 0, 0, 314, 251 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -176,7 +176,7 @@ BEGIN END IDD_OPT_CLCBKG DIALOGEX 0, 0, 235, 154 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -198,7 +198,7 @@ BEGIN END IDD_OPT_SBAR DIALOGEX 0, 0, 203, 212 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_CHILD +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -218,7 +218,7 @@ END IDD_MODERNOPT_CLIST DIALOGEX 0, 0, 369, 51 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "Hide offline users",IDC_HIDEOFFLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,13,124,10 CONTROL "Hide empty groups",IDC_HIDEEMPTYGROUPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,25,124,10 @@ -250,7 +250,7 @@ END IDD_MODERNOPT_CLUI DIALOGEX 0, 0, 369, 100 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "Always on top",IDC_ONTOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,13,128,10 CONTROL "Tool style main window",IDC_TOOLWND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,25,128,10 @@ -291,7 +291,7 @@ END IDD_MODERNOPT_SBAR DIALOGEX 0, 0, 369, 53 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "Show status bar",IDC_SHOWSBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,0,0,369,10 CONTROL "Show icons",IDC_SHOWICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,15,142,10 @@ -308,7 +308,7 @@ END IDD_MODERNOPT_CLCBKG DIALOGEX 0, 0, 232, 143 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN LTEXT "Background color",IDC_STATIC,57,28,72,8,NOT WS_GROUP CONTROL "",IDC_BKGCOLOUR,"ColourPicker",WS_TABSTOP,20,28,32,10 diff --git a/src/core/stdfile/res/resource.rc b/src/core/stdfile/res/resource.rc index ed986fbaf2..caa64ce5c7 100644 --- a/src/core/stdfile/res/resource.rc +++ b/src/core/stdfile/res/resource.rc @@ -152,7 +152,7 @@ BEGIN END IDD_OPT_FILETRANSFER DIALOGEX 0, 0, 313, 232 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN diff --git a/src/core/stdidle/res/resource.rc b/src/core/stdidle/res/resource.rc index af7b53a1ce..bf68917cc7 100644 --- a/src/core/stdidle/res/resource.rc +++ b/src/core/stdidle/res/resource.rc @@ -26,7 +26,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // IDD_OPT_IDLE DIALOGEX 0, 0, 312, 193 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_BORDER +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -59,7 +59,7 @@ END IDD_MODERNOPT_IDLE DIALOGEX 0, 0, 369, 64 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "Become idle if computer is left unattended for:",IDC_IDLESHORT, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,13,171,9 diff --git a/src/core/stdmsg/res/resource.rc b/src/core/stdmsg/res/resource.rc index c8de828cc9..0d7d7d4593 100644 --- a/src/core/stdmsg/res/resource.rc +++ b/src/core/stdmsg/res/resource.rc @@ -27,7 +27,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // IDD_OPT_MSGDLG DIALOGEX 0, 0, 304, 234 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -100,7 +100,7 @@ BEGIN END IDD_OPT_MSGLOG DIALOGEX 0, 0, 311, 164 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -123,7 +123,7 @@ BEGIN END IDD_OPT_MSGTYPE DIALOGEX 0, 0, 283, 234 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -143,7 +143,7 @@ END IDD_MODERNOPT_MSGDLG DIALOGEX 0, 0, 369, 106 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "Close the message window on send",IDC_AUTOCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,13,174,10 CONTROL "Minimize the message window on send",IDC_AUTOMIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,25,174,10 @@ -181,7 +181,7 @@ END IDD_MODERNOPT_MSGLOG DIALOGEX 0, 0, 369, 103 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "Show icons",IDC_SHOWLOGICONS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,13,146,10 CONTROL "Show names",IDC_SHOWNAMES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,25,146,10 diff --git a/src/resource.rc b/src/resource.rc index f8323bfa23..a6867ae0b5 100644 --- a/src/resource.rc +++ b/src/resource.rc @@ -76,7 +76,7 @@ BEGIN END IDD_OPT_CONTACT DIALOGEX 0, 0, 313, 242 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -135,9 +135,8 @@ BEGIN END IDD_OPTIONS DIALOGEX 0, 0, 428, 303 -STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT -CAPTION "Options" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN COMBOBOX IDC_KEYWORD_FILTER,336,6,88,79,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP @@ -153,9 +152,8 @@ BEGIN END IDD_OPTIONSPAGE DIALOGEX 0, 0, 321, 303 -STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT -CAPTION "Options" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN COMBOBOX IDC_KEYWORD_FILTER,336,37,88,79,CBS_DROPDOWN | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP @@ -224,9 +222,8 @@ BEGIN END IDD_NETLIBLOGOPTS DIALOGEX 0, 0, 314, 259 -STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT -CAPTION "Netlib log options" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Show",IDC_STATIC,6,2,302,118 @@ -257,7 +254,7 @@ BEGIN END IDD_OPT_SOUND DIALOGEX 0, 0, 285, 240 -STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -275,7 +272,7 @@ BEGIN END IDD_OPT_ICONS DIALOGEX 0, 0, 257, 193 -STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -290,7 +287,7 @@ BEGIN END IDD_OPT_IGNORE DIALOGEX 0, 0, 313, 240 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -319,7 +316,7 @@ BEGIN END IDD_OPT_VISIBILITY DIALOGEX 0, 0, 313, 240 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -352,7 +349,7 @@ BEGIN END IDD_OPT_NETLIB DIALOGEX 0, 0, 313, 235 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -455,7 +452,7 @@ BEGIN END IDD_OPT_ICOLIB DIALOGEX 0, 0, 316, 251 -STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -534,7 +531,7 @@ BEGIN END IDD_OPT_HOTKEYS DIALOGEX 0, 0, 316, 251 -STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -599,7 +596,7 @@ END IDD_MODERNOPT_FONTS DIALOGEX 0, 0, 260, 210 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN LTEXT "Headers:",IDC_TXT_TITLE1,0,0,259,8 PUSHBUTTON "...",IDC_CHOOSEFONTHEADER,244,30,16,14 @@ -618,7 +615,7 @@ END IDD_MODERNOPT_ACCOUNTS DIALOGEX 0, 0, 368, 210 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN LISTBOX IDC_ACCLIST,0,0,162,192,LBS_SORT | LBS_OWNERDRAWVARIABLE | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP LTEXT "Account information:",IDC_TXT_ACCOUNT,167,0,201,8 @@ -636,7 +633,7 @@ END IDD_MODERNOPT_MODULES DIALOGEX 0, 0, 369, 210 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN EDITTEXT IDC_PLUGINLONGINFO,65,133,304,25,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | ES_WANTRETURN | NOT WS_BORDER EDITTEXT IDC_PLUGINAUTHOR,65,160,304,12,ES_AUTOHSCROLL | ES_READONLY | ES_WANTRETURN | NOT WS_BORDER @@ -654,7 +651,7 @@ END IDD_MODERNOPT_IGNORE DIALOGEX 0, 0, 369, 210 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "",IDC_LIST,"CListControl",WS_TABSTOP | 0x3da,10,13,358,135,WS_EX_CLIENTEDGE LTEXT "Event icon legend:",IDC_TXT_TITLE2,0,153,119,8 @@ -684,7 +681,7 @@ BEGIN END IDD_EI_OPTIONS DIALOGEX 0, 0, 276, 229 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -742,9 +739,9 @@ BEGIN END IDD_METAOPTIONS DIALOGEX 0, 0, 306, 226 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_CHILD +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Context menu",IDC_STATIC,4,7,297,109 CONTROL "Use contact's unique ID",IDC_RAD_UID,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,30,264,10 -- cgit v1.2.3