From 71bd734efb7c6592b2b3a468e2b28359671eb031 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sun, 3 May 2015 19:19:45 +0000 Subject: fix for the option's page style pt. 4 git-svn-id: http://svn.miranda-ng.org/main/trunk@13404 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/New_GPG/res/new_gpg.rc | 12 ++++++++---- plugins/NoHistory/res/NoHistory.rc | 4 ++-- plugins/Non-IM Contact/res/resource.rc | 6 +++--- plugins/NotesAndReminders/res/resource.rc | 5 ++--- plugins/NotifyAnything/res/NotifyAnything.rc | 6 +++--- plugins/Nudge/res/resource.rc | 4 ++-- plugins/PasteIt/res/PasteIt.rc | 4 ++-- plugins/Ping/res/ping.rc | 4 ++-- plugins/QuickContacts/res/resource.rc | 4 ++-- plugins/QuickMessages/res/quickmessages.rc | 3 ++- plugins/QuickReplies/res/resources.rc | 5 +++-- plugins/Quotes/res/Forex.rc | 8 ++++---- plugins/RecentContacts/res/resource.rc | 2 +- plugins/Scriver/res/resource.rc | 16 ++++++++-------- plugins/SecureIM/res/resource.rc | 2 +- plugins/SeenPlugin/res/resource.rc | 6 +++--- 16 files changed, 48 insertions(+), 43 deletions(-) diff --git a/plugins/New_GPG/res/new_gpg.rc b/plugins/New_GPG/res/new_gpg.rc index eef6f2325b..c6495e83b4 100644 --- a/plugins/New_GPG/res/new_gpg.rc +++ b/plugins/New_GPG/res/new_gpg.rc @@ -215,7 +215,8 @@ END IDD_OPT_GPG DIALOGEX 0, 0, 286, 220 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD -FONT 8, "MS Shell Dlg", 400, 0, 0x0 +EXSTYLE WS_EX_CONTROLPARENT +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "",IDC_USERLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,17,272,112 CTEXT "User list:",IDC_STATIC,25,7,201,8 @@ -235,7 +236,8 @@ END IDD_OPT_GPG_BIN DIALOGEX 0, 0, 282, 71 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD -FONT 8, "MS Shell Dlg", 400, 0, 0x0 +EXSTYLE WS_EX_CONTROLPARENT +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN PUSHBUTTON "Browse",IDC_SET_BIN_PATH,216,17,60,14 PUSHBUTTON "Browse",IDC_SET_HOME_DIR,217,44,57,14 @@ -247,7 +249,8 @@ END IDD_OPT_GPG_MESSAGES DIALOGEX 0, 0, 302, 100 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD -FONT 8, "MS Shell Dlg", 400, 0, 0x0 +EXSTYLE WS_EX_CONTROLPARENT +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "Add tags to encoded and decoded messages",IDC_APPEND_TAGS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,65,243,10 @@ -267,7 +270,8 @@ END IDD_OPT_GPG_ADVANCED DIALOGEX 0, 0, 286, 50 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD -FONT 8, "MS Shell Dlg", 400, 0, 0x0 +EXSTYLE WS_EX_CONTROLPARENT +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "Turn on presence signing (Jabber) (required by XEP 0-27)",IDC_PRESCENSE_SUBSCRIPTION, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,9,268,10 diff --git a/plugins/NoHistory/res/NoHistory.rc b/plugins/NoHistory/res/NoHistory.rc index eb90de88bb..788c948596 100644 --- a/plugins/NoHistory/res/NoHistory.rc +++ b/plugins/NoHistory/res/NoHistory.rc @@ -62,9 +62,9 @@ END // IDD_OPT DIALOGEX 0, 0, 312, 235 -STYLE DS_FIXEDSYS | DS_CENTER | WS_CHILD +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "Custom1",IDC_LIST,"CListControl",WS_TABSTOP | 0x1d0,7,7, 298,192,WS_EX_CLIENTEDGE diff --git a/plugins/Non-IM Contact/res/resource.rc b/plugins/Non-IM Contact/res/resource.rc index f9bd164a57..e68f6a6215 100644 --- a/plugins/Non-IM Contact/res/resource.rc +++ b/plugins/Non-IM Contact/res/resource.rc @@ -91,9 +91,9 @@ BEGIN END IDD_OPTIONS DIALOG 0, 0, 291, 180 -STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Dialog" -FONT 8, "MS Sans Serif" +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD +EXSTYLE WS_EX_CONTROLPARENT +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "Away as another status",IDC_AWAYISNOTONLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,42,169,10 CONTROL "Disable timer",IDC_DISABLETIMER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,99,106,10 diff --git a/plugins/NotesAndReminders/res/resource.rc b/plugins/NotesAndReminders/res/resource.rc index 3087f9ceca..000e93a9d9 100644 --- a/plugins/NotesAndReminders/res/resource.rc +++ b/plugins/NotesAndReminders/res/resource.rc @@ -51,10 +51,9 @@ END // IDD_STNOTEOPTIONS DIALOGEX 47, 55, 301, 254 -STYLE DS_SETFONT | WS_CHILD | WS_VISIBLE | WS_CAPTION +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT -CAPTION "Sticky Notes Options" -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Default Note Size",IDC_STATIC,6,6,156,51 LTEXT "Width (Pixels)",IDC_STATIC,12,20,44,8 diff --git a/plugins/NotifyAnything/res/NotifyAnything.rc b/plugins/NotifyAnything/res/NotifyAnything.rc index 1d7b4dca19..6c1d8048a4 100644 --- a/plugins/NotifyAnything/res/NotifyAnything.rc +++ b/plugins/NotifyAnything/res/NotifyAnything.rc @@ -74,9 +74,9 @@ END // NA_OPTIONS DIALOGEX 0, 0, 236, 191 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_NOFAILCREATE | WS_CHILD | WS_CAPTION -CAPTION "Property Page" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD +EXSTYLE WS_EX_CONTROLPARENT +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Security",IDC_STATIC,7,7,222,77 CONTROL "Only listen to localhost",NA_LOCAL_CHECK,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,13,19,209,10 diff --git a/plugins/Nudge/res/resource.rc b/plugins/Nudge/res/resource.rc index b530012fe8..f4260d9efa 100644 --- a/plugins/Nudge/res/resource.rc +++ b/plugins/Nudge/res/resource.rc @@ -51,7 +51,7 @@ END // IDD_OPT_NUDGE DIALOGEX 0, 0, 309, 232 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -98,7 +98,7 @@ BEGIN END IDD_OPT_SHAKE DIALOGEX 0, 0, 309, 184 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | 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/plugins/PasteIt/res/PasteIt.rc b/plugins/PasteIt/res/PasteIt.rc index 622f257799..1b70850227 100644 --- a/plugins/PasteIt/res/PasteIt.rc +++ b/plugins/PasteIt/res/PasteIt.rc @@ -28,7 +28,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_OPT_MAIN DIALOGEX 0, 0, 285, 225 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg", 400, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Settings",IDC_STATIC,7,5,274,220 COMBOBOX IDC_WEBLIST,134,20,135,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -46,7 +46,7 @@ END IDD_OPT_PAGES DIALOGEX 0, 0, 285, 225 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg", 400, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Web page settings",IDC_STATIC,7,30,274,195 COMBOBOX IDC_WEBPAGE,145,7,135,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/plugins/Ping/res/ping.rc b/plugins/Ping/res/ping.rc index 8cd7a2a170..b23c807f29 100644 --- a/plugins/Ping/res/ping.rc +++ b/plugins/Ping/res/ping.rc @@ -65,7 +65,7 @@ IDI_ICON_TESTING ICON "yellow.ico" // IDD_DIALOG1 DIALOGEX 0, 0, 303, 227 -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 @@ -101,7 +101,7 @@ BEGIN END IDD_DIALOG2 DIALOGEX 0, 0, 285, 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 diff --git a/plugins/QuickContacts/res/resource.rc b/plugins/QuickContacts/res/resource.rc index 75b589855f..c01c88e081 100644 --- a/plugins/QuickContacts/res/resource.rc +++ b/plugins/QuickContacts/res/resource.rc @@ -27,9 +27,9 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // IDD_OPT DIALOGEX 0, 0, 257, 237 -STYLE DS_FIXEDSYS | WS_CHILD | WS_VISIBLE +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Last Sent",IDC_STATIC,0,0,257,58 CONTROL "Enable last-sent-to",IDC_LASTSENTTO,"Button", diff --git a/plugins/QuickMessages/res/quickmessages.rc b/plugins/QuickMessages/res/quickmessages.rc index 12d8158992..55915526fb 100644 --- a/plugins/QuickMessages/res/quickmessages.rc +++ b/plugins/QuickMessages/res/quickmessages.rc @@ -53,7 +53,8 @@ END // IDD_OPTIONS DIALOGEX 0, 0, 316, 257 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD +EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "",IDC_BUTTONSLIST,"SysTreeView32",TVS_EDITLABELS | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_NOTOOLTIPS | TVS_FULLROWSELECT | WS_TABSTOP,6,19,95,130,WS_EX_STATICEDGE diff --git a/plugins/QuickReplies/res/resources.rc b/plugins/QuickReplies/res/resources.rc index 12ca553352..259b45d481 100644 --- a/plugins/QuickReplies/res/resources.rc +++ b/plugins/QuickReplies/res/resources.rc @@ -27,8 +27,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL // IDD_OPTIONS_PAGE DIALOGEX 0, 0, 300, 241 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_SYSMENU -FONT 8, "MS Shell Dlg", 400, 0, 0x1 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD +EXSTYLE WS_EX_CONTROLPARENT +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Quick Replies",IDC_STATIC,7,7,286,227 CONTROL "Send replies immediately",IDC_IMMEDIATELY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,28,210,196,13 diff --git a/plugins/Quotes/res/Forex.rc b/plugins/Quotes/res/Forex.rc index 1342f118fc..58edb407b6 100644 --- a/plugins/Quotes/res/Forex.rc +++ b/plugins/Quotes/res/Forex.rc @@ -250,9 +250,9 @@ BEGIN END IDD_DIALOG_OPT_GOOGLE DIALOGEX 0, 0, 310, 233 -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", 400, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN LTEXT "&Convert:",IDC_STATIC,7,9,56,8 COMBOBOX IDC_COMBO_CONVERT_FROM,64,7,105,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -293,9 +293,9 @@ BEGIN END IDD_DIALOG_OPT_FINANCE DIALOGEX 0, 0, 310, 232 -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", 400, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN LTEXT "Type &Stock Name or Symbol:",IDC_STATIC,7,10,96,8 EDITTEXT IDC_EDIT_QUOTE,106,7,143,14,ES_AUTOHSCROLL diff --git a/plugins/RecentContacts/res/resource.rc b/plugins/RecentContacts/res/resource.rc index 92bab6d226..094dac0344 100644 --- a/plugins/RecentContacts/res/resource.rc +++ b/plugins/RecentContacts/res/resource.rc @@ -36,7 +36,7 @@ END IDD_LASTUC_OPT DIALOGEX 0, 0, 314, 122 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 "Plugin settings",IDC_STATIC,7,7,300,108 EDITTEXT IDC_SHOWNCONTACTS,161,27,28,12,ES_AUTOHSCROLL diff --git a/plugins/Scriver/res/resource.rc b/plugins/Scriver/res/resource.rc index 81b0aa2a09..ac83451263 100644 --- a/plugins/Scriver/res/resource.rc +++ b/plugins/Scriver/res/resource.rc @@ -25,7 +25,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL // IDD_OPT_MSGDLG DIALOGEX 2, 0, 304, 230 -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 @@ -52,7 +52,7 @@ BEGIN END IDD_OPT_MSGTABS DIALOGEX 2, 0, 304, 230 -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 @@ -80,7 +80,7 @@ BEGIN END IDD_OPT_LAYOUT DIALOGEX 2, 0, 304, 230 -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 @@ -107,7 +107,7 @@ BEGIN END IDD_OPT_MSGLOG DIALOGEX 2, 0, 304, 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 @@ -144,7 +144,7 @@ BEGIN END IDD_OPT_MSGTYPE DIALOGEX 0, 0, 283, 252 -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 @@ -272,7 +272,7 @@ BEGIN END IDD_OPTIONS1 DIALOGEX 2, 0, 304, 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 @@ -288,7 +288,7 @@ BEGIN END IDD_OPTIONS2 DIALOGEX 2, 0, 304, 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 @@ -321,7 +321,7 @@ BEGIN END IDD_OPTIONSPOPUP DIALOGEX 0, 0, 304, 232 -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 diff --git a/plugins/SecureIM/res/resource.rc b/plugins/SecureIM/res/resource.rc index 11eb02fe92..a24cc5dae9 100644 --- a/plugins/SecureIM/res/resource.rc +++ b/plugins/SecureIM/res/resource.rc @@ -25,7 +25,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT // IDD_OPTIONSTAB DIALOGEX 0, 0, 312, 247 -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/plugins/SeenPlugin/res/resource.rc b/plugins/SeenPlugin/res/resource.rc index 9ef86f0fec..ef7120a80d 100644 --- a/plugins/SeenPlugin/res/resource.rc +++ b/plugins/SeenPlugin/res/resource.rc @@ -49,7 +49,7 @@ END // IDD_SETTINGS DIALOGEX 0, 0, 315, 247 -STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -76,7 +76,7 @@ BEGIN END IDD_POPUPS DIALOGEX 0, 0, 280, 208 -STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | 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_USERINFO DIALOGEX 0, 0, 222, 132 -STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN -- cgit v1.2.3