From ad0437acd3fbaa8f42249ef9bfb85c710602ae3d Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sun, 3 May 2015 18:56:50 +0000 Subject: fix for the option's page style pt. 3 git-svn-id: http://svn.miranda-ng.org/main/trunk@13403 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/CSList/res/cslist.rc | 5 +++-- plugins/Console/res/resource.rc | 2 +- plugins/CrashDumper/res/crshdmp.rc | 4 ++-- plugins/Db3x_mmap/res/db3x_mmap.rc | 4 ++-- plugins/DbEditorPP/res/resource.rc | 4 ++-- plugins/Db_autobackups/res/db_autobackups.rc | 4 ++-- plugins/Dbx_kv/res/dbx_kv.rc | 4 ++-- plugins/Dbx_kyoto/res/dbx_kyoto.rc | 4 ++-- plugins/Dbx_mdb/res/dbx_mdb.rc | 4 ++-- plugins/Dropbox/res/resource.rc | 4 ++-- plugins/Exchange/res/exchange.rc | 6 +++--- plugins/FTPFileYM/res/ftpfile.rc | 6 ++++-- plugins/FavContacts/res/resource.rc | 2 +- plugins/FileAsMessage/res/resources.rc | 4 ++-- plugins/FloatingContacts/res/fltcnt.rc | 4 ++-- plugins/Folders/res/folders.rc | 6 +++--- plugins/GmailNotifier/res/options.rc | 4 ++-- plugins/HTTPServer/res/resource.rc | 2 +- plugins/HistoryLinkListPlus/res/linklist.rc | 5 +++-- plugins/HistoryStats/res/resource.rc | 4 ++-- plugins/HistorySweeperLight/res/historysweeperlight.rc | 2 +- plugins/IEHistory/res/IEHistory.rc | 6 +++--- plugins/Import/res/resource.rc | 3 ++- plugins/KeyboardNotify/res/resources.rc | 4 ++-- plugins/ListeningTo/res/resource.rc | 2 +- plugins/LotusNotify/res/LotusNotify.rc | 5 +++-- plugins/MenuItemEx/res/resource.rc | 2 +- plugins/MirFox/res/resource.rc | 6 +++--- plugins/MirOTR/res/resource.rc | 8 ++++---- plugins/ModernOpt/res/resource.rc | 13 ++++++------- plugins/MsgPopup/res/MsgPopup.rc | 2 +- plugins/Msg_Export/res/resource.rc | 6 +++--- plugins/MyDetails/res/resource.rc | 2 +- plugins/NewEventNotify/res/resource.rc | 3 ++- plugins/NewXstatusNotify/res/resource.rc | 8 ++++---- 35 files changed, 80 insertions(+), 74 deletions(-) (limited to 'plugins') diff --git a/plugins/CSList/res/cslist.rc b/plugins/CSList/res/cslist.rc index 17a8d6a270..d8762aa19c 100644 --- a/plugins/CSList/res/cslist.rc +++ b/plugins/CSList/res/cslist.rc @@ -78,8 +78,9 @@ BEGIN END IDD_OPTIONS DIALOGEX 0, 0, 300, 107 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CLIPSIBLINGS -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 "List settings",IDC_STATIC,4,4,292,57 CONTROL "Confirm deletion of items",IDC_CONFIRM_DELETION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,20,253,10 diff --git a/plugins/Console/res/resource.rc b/plugins/Console/res/resource.rc index e1e457efa7..956346f601 100644 --- a/plugins/Console/res/resource.rc +++ b/plugins/Console/res/resource.rc @@ -63,7 +63,7 @@ BEGIN END IDD_OPTIONS DIALOGEX 0, 0, 314, 239 -STYLE DS_SETFONT | DS_MODALFRAME | 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/CrashDumper/res/crshdmp.rc b/plugins/CrashDumper/res/crshdmp.rc index bc761b6f40..f20caf5954 100644 --- a/plugins/CrashDumper/res/crshdmp.rc +++ b/plugins/CrashDumper/res/crshdmp.rc @@ -63,9 +63,9 @@ BEGIN END IDD_OPTIONS DIALOGEX 0, 0, 209, 195 -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 GROUPBOX "Support for vi.miranda-ng.org",IDC_STATIC,7,7,195,94 LTEXT "Username",IDC_STATIC,14,20,107,8 diff --git a/plugins/Db3x_mmap/res/db3x_mmap.rc b/plugins/Db3x_mmap/res/db3x_mmap.rc index de652ea2fa..3f12bcfe98 100644 --- a/plugins/Db3x_mmap/res/db3x_mmap.rc +++ b/plugins/Db3x_mmap/res/db3x_mmap.rc @@ -73,9 +73,9 @@ BEGIN END IDD_OPTIONS DIALOGEX 0, 0, 318, 176 -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 "Database encryption mode",IDC_STATIC,6,22,305,125 CONTROL "Standard",IDC_STANDARD,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,12,38,292,12 diff --git a/plugins/DbEditorPP/res/resource.rc b/plugins/DbEditorPP/res/resource.rc index 292794fb60..53daced5b7 100644 --- a/plugins/DbEditorPP/res/resource.rc +++ b/plugins/DbEditorPP/res/resource.rc @@ -55,9 +55,9 @@ BEGIN END IDD_OPTIONS DIALOGEX 0, 0, 314, 92 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE +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 "Restore last opened position",IDC_RESTORESETTINGS, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,13,283,10 diff --git a/plugins/Db_autobackups/res/db_autobackups.rc b/plugins/Db_autobackups/res/db_autobackups.rc index 56a29ca942..cced08540f 100644 --- a/plugins/Db_autobackups/res/db_autobackups.rc +++ b/plugins/Db_autobackups/res/db_autobackups.rc @@ -34,9 +34,9 @@ BEGIN END IDD_OPTIONS DIALOGEX 0, 0, 271, 220 -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 "Automatic backups",IDC_STATIC,6,4,258,205,WS_GROUP PUSHBUTTON "Backup NOW",IDC_BUT_NOW,173,19,75,14 diff --git a/plugins/Dbx_kv/res/dbx_kv.rc b/plugins/Dbx_kv/res/dbx_kv.rc index de652ea2fa..3f12bcfe98 100644 --- a/plugins/Dbx_kv/res/dbx_kv.rc +++ b/plugins/Dbx_kv/res/dbx_kv.rc @@ -73,9 +73,9 @@ BEGIN END IDD_OPTIONS DIALOGEX 0, 0, 318, 176 -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 "Database encryption mode",IDC_STATIC,6,22,305,125 CONTROL "Standard",IDC_STANDARD,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,12,38,292,12 diff --git a/plugins/Dbx_kyoto/res/dbx_kyoto.rc b/plugins/Dbx_kyoto/res/dbx_kyoto.rc index de652ea2fa..3f12bcfe98 100644 --- a/plugins/Dbx_kyoto/res/dbx_kyoto.rc +++ b/plugins/Dbx_kyoto/res/dbx_kyoto.rc @@ -73,9 +73,9 @@ BEGIN END IDD_OPTIONS DIALOGEX 0, 0, 318, 176 -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 "Database encryption mode",IDC_STATIC,6,22,305,125 CONTROL "Standard",IDC_STANDARD,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,12,38,292,12 diff --git a/plugins/Dbx_mdb/res/dbx_mdb.rc b/plugins/Dbx_mdb/res/dbx_mdb.rc index de652ea2fa..3f12bcfe98 100644 --- a/plugins/Dbx_mdb/res/dbx_mdb.rc +++ b/plugins/Dbx_mdb/res/dbx_mdb.rc @@ -73,9 +73,9 @@ BEGIN END IDD_OPTIONS DIALOGEX 0, 0, 318, 176 -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 "Database encryption mode",IDC_STATIC,6,22,305,125 CONTROL "Standard",IDC_STANDARD,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,12,38,292,12 diff --git a/plugins/Dropbox/res/resource.rc b/plugins/Dropbox/res/resource.rc index cff5586498..c685e85e80 100644 --- a/plugins/Dropbox/res/resource.rc +++ b/plugins/Dropbox/res/resource.rc @@ -25,9 +25,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL // IDD_OPTIONS_MAIN DIALOGEX 0, 0, 323, 256 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CLIPSIBLINGS +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 "Authorization",IDC_STATIC,5,5,313,103 LTEXT "To allow Miranda NG access in your Dropbox account:",IDC_STATIC,15,18,270,10 diff --git a/plugins/Exchange/res/exchange.rc b/plugins/Exchange/res/exchange.rc index adda08baa9..5d9b20bd61 100644 --- a/plugins/Exchange/res/exchange.rc +++ b/plugins/Exchange/res/exchange.rc @@ -28,9 +28,9 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 LANGUAGE LANG_NEUTRAL, SUBLANG_SYS_DEFAULT IDD_OPT_EXCHANGE DIALOGEX 0, 0, 187, 155 -STYLE DS_CONTROL | DS_MODALFRAME | DS_SHELLFONT | WS_CAPTION | WS_POPUP | WS_SYSMENU -CAPTION "Dialog" -FONT 8, "MS Shell Dlg", 400, 0, 1 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD +EXSTYLE WS_EX_CONTROLPARENT +FONT 8, "MS Shell Dlg", 0, 0, 0x1 { GROUPBOX "Connection", IDC_STATIC, 4, 4, 179, 65 LTEXT "Username:", IDC_STATIC, 7, 19, 58, 8, SS_LEFT diff --git a/plugins/FTPFileYM/res/ftpfile.rc b/plugins/FTPFileYM/res/ftpfile.rc index de8563fcba..5e3e9b1a9f 100644 --- a/plugins/FTPFileYM/res/ftpfile.rc +++ b/plugins/FTPFileYM/res/ftpfile.rc @@ -28,7 +28,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_OPT_FTPFILE DIALOGEX 0, 0, 268, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD -FONT 8, "MS Shell Dlg", 400, 0, 0x1 +EXSTYLE WS_EX_CONTROLPARENT +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "FTP accounts",IDC_STATIC,7,5,254,220 RTEXT "Host name",IDC_STATIC,14,70,89,8 @@ -56,7 +57,8 @@ END IDD_OPT_ADVANCED DIALOGEX 0, 0, 265, 225 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD -FONT 8, "MS Shell Dlg", 400, 0, 0x1 +EXSTYLE WS_EX_CONTROLPARENT +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "File download link",IDC_STATIC,5,12,254,42 CONTROL "Close dialog after upload is completed",IDC_CLOSEDLG, diff --git a/plugins/FavContacts/res/resource.rc b/plugins/FavContacts/res/resource.rc index c4dde40526..6943d0051c 100644 --- a/plugins/FavContacts/res/resource.rc +++ b/plugins/FavContacts/res/resource.rc @@ -37,7 +37,7 @@ IDI_REGULAR ICON "regular.ico" // IDD_OPTIONS 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 diff --git a/plugins/FileAsMessage/res/resources.rc b/plugins/FileAsMessage/res/resources.rc index d725d1935d..db9a10b5b3 100644 --- a/plugins/FileAsMessage/res/resources.rc +++ b/plugins/FileAsMessage/res/resources.rc @@ -42,9 +42,9 @@ BEGIN END IDD_OPTIONS DIALOGEX 0, 0, 241, 181 -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 CONTROL "",IDC_UNSENT,"ColourPicker",WS_GROUP | WS_TABSTOP,124, 106,39,12,WS_EX_NOPARENTNOTIFY diff --git a/plugins/FloatingContacts/res/fltcnt.rc b/plugins/FloatingContacts/res/fltcnt.rc index 789d4e02b1..0fdeef448c 100644 --- a/plugins/FloatingContacts/res/fltcnt.rc +++ b/plugins/FloatingContacts/res/fltcnt.rc @@ -53,7 +53,7 @@ END IDD_OPT_FLTCONT DIALOGEX 0, 0, 302, 219 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg", 400, 0, 0xCC +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Hiding contacts",IDC_STATIC,4,4,294,52 CONTROL "Hide offline contacts",IDC_CHK_HIDE_OFFLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,16,140,10,WS_EX_TRANSPARENT @@ -88,7 +88,7 @@ END IDD_OPT_SKIN DIALOGEX 0, 0, 303, 117 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg", 400, 0, 0xCC +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Border",IDC_STATIC,4,2,293,36 CONTROL "Draw border",IDC_DRAWBORDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,17,109,10,WS_EX_TRANSPARENT diff --git a/plugins/Folders/res/folders.rc b/plugins/Folders/res/folders.rc index 415c6274d8..219ff827df 100644 --- a/plugins/Folders/res/folders.rc +++ b/plugins/Folders/res/folders.rc @@ -53,9 +53,9 @@ END // IDD_OPT_FOLDERS DIALOGEX 0, 0, 314, 254 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTROL | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Dialog" -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 "Custom folders",IDC_FOLDERS_GROUPBOX,0,1,313,250 LISTBOX IDC_FOLDERS_SECTIONS_LIST,14,12,77,116,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP diff --git a/plugins/GmailNotifier/res/options.rc b/plugins/GmailNotifier/res/options.rc index 4394f5e706..d8a46c50d3 100644 --- a/plugins/GmailNotifier/res/options.rc +++ b/plugins/GmailNotifier/res/options.rc @@ -49,9 +49,9 @@ END // IDD_OPT DIALOGEX 0, 0, 309, 227 -STYLE DS_SETFONT | DS_CENTER | WS_CHILD +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "Tahoma", 0, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Gmail account",IDC_GROUPMAIN,4,2,291,56 LTEXT "Name:",IDC_STATIC,8,19,68,9,NOT WS_GROUP,WS_EX_RIGHT diff --git a/plugins/HTTPServer/res/resource.rc b/plugins/HTTPServer/res/resource.rc index ac7470f3b6..acc656b326 100644 --- a/plugins/HTTPServer/res/resource.rc +++ b/plugins/HTTPServer/res/resource.rc @@ -64,7 +64,7 @@ BEGIN END IDD_OPT_HTTP_SERVER DIALOGEX 0, 0, 314, 240 -STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | 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/HistoryLinkListPlus/res/linklist.rc b/plugins/HistoryLinkListPlus/res/linklist.rc index d9624c4e24..fb51feedb7 100644 --- a/plugins/HistoryLinkListPlus/res/linklist.rc +++ b/plugins/HistoryLinkListPlus/res/linklist.rc @@ -88,8 +88,9 @@ BEGIN END IDD_OPTIONS_DLG DIALOG 0, 0, 314, 240 -STYLE DS_SETFONT | WS_POPUP | WS_VISIBLE -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 GROUPBOX "Color select",IDC_STATIC,0,87,252,83 LTEXT "Incoming messages",IDC_TXTIN,17,101,85,9 diff --git a/plugins/HistoryStats/res/resource.rc b/plugins/HistoryStats/res/resource.rc index dcdbb364d3..36eb120a86 100644 --- a/plugins/HistoryStats/res/resource.rc +++ b/plugins/HistoryStats/res/resource.rc @@ -229,9 +229,9 @@ END // IDD_OPTIONS DIALOGEX 0, 0, 314, 240 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | 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 CONTROL "Band",IDC_BAND,"HistoryStatsBand",WS_TABSTOP,0,0,315,35 CTEXT "",IDC_MESSAGE,10,45,294,95,SS_NOPREFIX | NOT WS_VISIBLE, diff --git a/plugins/HistorySweeperLight/res/historysweeperlight.rc b/plugins/HistorySweeperLight/res/historysweeperlight.rc index 0c04d1d4ac..2c972d6d26 100644 --- a/plugins/HistorySweeperLight/res/historysweeperlight.rc +++ b/plugins/HistorySweeperLight/res/historysweeperlight.rc @@ -25,7 +25,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT // IDD_OPT_HISTORYSWEEPER 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 diff --git a/plugins/IEHistory/res/IEHistory.rc b/plugins/IEHistory/res/IEHistory.rc index eb3fe7a7cd..c7b154b747 100644 --- a/plugins/IEHistory/res/IEHistory.rc +++ b/plugins/IEHistory/res/IEHistory.rc @@ -66,9 +66,9 @@ BEGIN END IDD_OPT_HISTORY DIALOGEX 0, 0, 252, 119 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTROL | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Dialog" -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 "Number of events to load",IDC_EVENTSNO_GROUPBOX,7,7,238,68 CONTROL "Load all events",IDC_LOAD_ALL,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,15,22,224,10 diff --git a/plugins/Import/res/resource.rc b/plugins/Import/res/resource.rc index 1d253ff1de..fb7431839f 100644 --- a/plugins/Import/res/resource.rc +++ b/plugins/Import/res/resource.rc @@ -86,7 +86,8 @@ BEGIN END IDD_OPTIONS DIALOGEX 0, 0, 220, 120 -STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CONTROL | WS_CHILD +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD +EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "Import all settings, contacts and all messages",IDC_RADIO_COMPLETE, diff --git a/plugins/KeyboardNotify/res/resources.rc b/plugins/KeyboardNotify/res/resources.rc index 2a202150f5..abfe534e93 100644 --- a/plugins/KeyboardNotify/res/resources.rc +++ b/plugins/KeyboardNotify/res/resources.rc @@ -186,9 +186,9 @@ BEGIN END IDD_OPT_KN_ACTION DIALOGEX 0, 0, 194, 65 -STYLE DS_SETFONT | DS_3DLOOK | WS_CHILD +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN COMBOBOX IDC_CUSTOMTHEME,95,13,84,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Consider event opened after",IDC_STATIC,13,36,98,9 diff --git a/plugins/ListeningTo/res/resource.rc b/plugins/ListeningTo/res/resource.rc index a4f424ff9e..7c44894482 100644 --- a/plugins/ListeningTo/res/resource.rc +++ b/plugins/ListeningTo/res/resource.rc @@ -25,7 +25,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // IDD_OPTIONS DIALOGEX 0, 0, 288, 205 -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/LotusNotify/res/LotusNotify.rc b/plugins/LotusNotify/res/LotusNotify.rc index 3db8047907..2f964786c6 100644 --- a/plugins/LotusNotify/res/LotusNotify.rc +++ b/plugins/LotusNotify/res/LotusNotify.rc @@ -39,8 +39,9 @@ IDI_ICON2 ICON "icon2.ico" // IDD_OPT_DIALOG DIALOGEX 0, 0, 314, 239 -STYLE DS_SETFONT | DS_MODALFRAME | 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 EDITTEXT IDC_DATABASE,75,39,115,11,ES_AUTOHSCROLL EDITTEXT IDC_INTERVAL,250,17,21,12,ES_AUTOHSCROLL diff --git a/plugins/MenuItemEx/res/resource.rc b/plugins/MenuItemEx/res/resource.rc index 0f3cafeb30..4505a01511 100644 --- a/plugins/MenuItemEx/res/resource.rc +++ b/plugins/MenuItemEx/res/resource.rc @@ -55,7 +55,7 @@ BEGIN END IDD_OPTIONS DIALOGEX 0, 0, 280, 217 -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/MirFox/res/resource.rc b/plugins/MirFox/res/resource.rc index 3040680b80..016a7627ab 100644 --- a/plugins/MirFox/res/resource.rc +++ b/plugins/MirFox/res/resource.rc @@ -49,7 +49,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT IDD_OPT1 DIALOGEX 0, 0, 310, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Sans Serif", 0, 0, 0x0 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Send to contact action",IDC1_STATIC_G1,17,10,275,146 LTEXT "on left mouse button click",IDC1_LABEL2,26,25,256,10 @@ -67,7 +67,7 @@ END IDD_OPT2 DIALOGEX 0, 0, 310, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Sans Serif", 0, 0, 0x0 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Show these contacts in 'Send ... to' option in Firefox",IDC_STATIC,6,7,299,219 CONTROL "",IDC2_CONTACTS_LIST,"CListControl",WS_TABSTOP | 0x1d2,11,19,287,201,WS_EX_CLIENTEDGE @@ -76,7 +76,7 @@ END IDD_OPT3 DIALOGEX 0, 0, 310, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Sans Serif", 0, 0, 0x0 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Show these accounts in 'Set status message' option in Firefox",IDC3_STATIC_G1,17,18,275,191 CONTROL "",IDC3_PROTOCOLS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,33,35,243,164 diff --git a/plugins/MirOTR/res/resource.rc b/plugins/MirOTR/res/resource.rc index dbd66d1a7c..4dbd1c6289 100644 --- a/plugins/MirOTR/res/resource.rc +++ b/plugins/MirOTR/res/resource.rc @@ -49,7 +49,7 @@ BEGIN END IDD_OPT_GENERAL DIALOGEX 0, 0, 302, 184 -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 @@ -77,7 +77,7 @@ BEGIN END IDD_OPT_PROTO DIALOGEX 0, 0, 296, 226 -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 @@ -90,7 +90,7 @@ BEGIN END IDD_OPT_CONTACTS DIALOGEX 0, 0, 296, 223 -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 @@ -101,7 +101,7 @@ BEGIN END IDD_OPT_FINGER DIALOGEX 0, 0, 296, 226 -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/ModernOpt/res/resource.rc b/plugins/ModernOpt/res/resource.rc index a37b214477..6da0f60b3c 100644 --- a/plugins/ModernOpt/res/resource.rc +++ b/plugins/ModernOpt/res/resource.rc @@ -29,7 +29,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_MODERNOPT_SKINS 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 LISTBOX IDC_SKINLIST,0,115,260,95,LBS_OWNERDRAWVARIABLE | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP CONTROL "",IDC_PREVIEW1,"Static",SS_OWNERDRAW,0,0,260,110 @@ -38,7 +38,7 @@ END IDD_MODERNOPT_HOME 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 CONTROL "Visit official Miranda NG website",IDC_BTN_HELP, "Hyperlink",WS_TABSTOP,15,195,338,9 @@ -54,17 +54,16 @@ END IDD_MODERNOPT_EMPTY DIALOGEX 0, 0, 369, 210 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD -EXSTYLE WS_EX_CLIENTEDGE -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +EXSTYLE WS_EX_CONTROLPARENT +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN LTEXT "Sample page",IDC_STATIC,8,7,121,14 END IDD_MODERNOPT DIALOGEX 0, 0, 382, 286 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT -CAPTION "Miranda NG Options" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "Use arrow keys to choose category",IDC_ICOTABS,"MirandaIcoTabClass",WS_TABSTOP,0,0,382,42 CONTROL "",IDC_TV_SUBSECTIONS,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_FULLROWSELECT | TVS_INFOTIP | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,50,103,210 diff --git a/plugins/MsgPopup/res/MsgPopup.rc b/plugins/MsgPopup/res/MsgPopup.rc index c4a3406758..fded589a4c 100644 --- a/plugins/MsgPopup/res/MsgPopup.rc +++ b/plugins/MsgPopup/res/MsgPopup.rc @@ -25,7 +25,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT // IDD_OPTIONS DIALOGEX 0, 0, 295, 181 -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/Msg_Export/res/resource.rc b/plugins/Msg_Export/res/resource.rc index fddbf49949..fdb1471f81 100755 --- a/plugins/Msg_Export/res/resource.rc +++ b/plugins/Msg_Export/res/resource.rc @@ -50,7 +50,7 @@ END // IDD_OPT_MSGEXPORT DIALOGEX 0, 0, 310, 234 -STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_CHILD | WS_VISIBLE +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -103,9 +103,9 @@ BEGIN END IDD_OPT_MSGEXPORT2 DIALOGEX 0, 0, 302, 227 -STYLE DS_SETFONT | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "When filename changes",IDC_STATIC,8,9,138,56 CONTROL "Prompt for action",IDC_FC_PROMPT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,14,24,125,10 diff --git a/plugins/MyDetails/res/resource.rc b/plugins/MyDetails/res/resource.rc index 69ebb83128..63f8a2ebc8 100644 --- a/plugins/MyDetails/res/resource.rc +++ b/plugins/MyDetails/res/resource.rc @@ -37,7 +37,7 @@ BEGIN END IDD_OPTS DIALOGEX 0, 0, 323, 233 -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/NewEventNotify/res/resource.rc b/plugins/NewEventNotify/res/resource.rc index 8bab0afa10..80f95577cd 100644 --- a/plugins/NewEventNotify/res/resource.rc +++ b/plugins/NewEventNotify/res/resource.rc @@ -28,7 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_OPT DIALOGEX 0, 0, 314, 252 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +EXSTYLE WS_EX_CONTROLPARENT +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "General options",IDC_STATIC,6,2,199,43 CONTROL "Show entry in the Popups menu",IDC_CHKMENUITEM,"Button", diff --git a/plugins/NewXstatusNotify/res/resource.rc b/plugins/NewXstatusNotify/res/resource.rc index 46994e23b9..524a3129f0 100644 --- a/plugins/NewXstatusNotify/res/resource.rc +++ b/plugins/NewXstatusNotify/res/resource.rc @@ -176,7 +176,7 @@ END IDD_OPT_XPOPUP DIALOGEX 0, 0, 305, 230 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 "Notification",IDC_STATIC,3,6,299,50 CONTROL "Show Popups when I connect",IDC_XONCONNECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,18,285,8 @@ -246,7 +246,7 @@ END IDD_OPT_XLOG DIALOGEX 0, 0, 300, 234 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 "Log extra status changes",65534,3,3,294,69 CONTROL "Log extra status changes to file",IDC_XLOGTOFILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,14,280,8 @@ -286,7 +286,7 @@ END IDD_OPT_SMPOPUP DIALOGEX 0, 0, 300, 234 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 "General",IDC_STATIC,3,3,294,35 CONTROL "Show Popups when I connect",IDC_ONCONNECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,13,280,8 @@ -313,7 +313,7 @@ END IDD_OPT_LOG DIALOGEX 0, 0, 300, 234 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 "Log status changes",IDC_STATIC,3,3,294,69 CONTROL "Log status changes to file",IDC_LOGTOFILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,14,280,8 -- cgit v1.2.3