From 9c6381373b4654b8a17f6679dacda941538a50fb Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sun, 3 May 2015 18:31:57 +0000 Subject: fix for the option's page style pt. 2 git-svn-id: http://svn.miranda-ng.org/main/trunk@13401 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_modern/res/resource.rc | 63 ++++++++++++------------ plugins/Clist_nicer/res/resource.rc | 54 +++++++++++--------- plugins/ConnectionNotify/res/ConnectionNotify.rc | 6 +-- 3 files changed, 67 insertions(+), 56 deletions(-) (limited to 'plugins') diff --git a/plugins/Clist_modern/res/resource.rc b/plugins/Clist_modern/res/resource.rc index e8696ba0f9..17f2f887ca 100644 --- a/plugins/Clist_modern/res/resource.rc +++ b/plugins/Clist_modern/res/resource.rc @@ -120,7 +120,7 @@ BEGIN END IDD_OPT_CLIST_LISTBKG DIALOGEX 0, 0, 234, 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 @@ -145,9 +145,9 @@ BEGIN END IDD_OPT_SKIN DIALOGEX 0, 0, 303, 243 -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", 400, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Available skins",IDC_STATIC,0,25,173,182,WS_DISABLED PUSHBUTTON "Rescan",IDC_BUTTON_RESCAN,5,190,48,12 @@ -164,15 +164,16 @@ BEGIN END IDD_OPT_ITEMS DIALOGEX 0, 0, 315, 243 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | DS_CENTER | WS_CHILD +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 CONTROL "",IDC_TAB,"SysTabControl32",0x0,0,0,315,243 END IDD_OPT_VIEWMODES DIALOGEX 0, 0, 309, 295 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD +EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "",IDC_TAB,"SysTabControl32",0x0,4,4,301,264 @@ -232,7 +233,7 @@ BEGIN END IDD_OPT_SBAR DIALOGEX 0, 0, 308, 231 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | DS_CENTER | WS_CHILD +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -306,7 +307,7 @@ BEGIN END IDD_OPT_CLIST DIALOGEX 0, 0, 302, 202 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | DS_CENTER | WS_CHILD +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -335,7 +336,7 @@ BEGIN END IDD_OPT_CLUI_2 DIALOGEX 0, 0, 266, 224 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | DS_CENTER | WS_CHILD +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -382,7 +383,7 @@ BEGIN END IDD_OPT_CLC DIALOGEX 0, 0, 303, 225 -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 @@ -428,7 +429,7 @@ BEGIN END IDD_OPT_TRAY DIALOGEX 0, 0, 296, 200 -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 @@ -468,7 +469,7 @@ BEGIN END IDD_OPT_META_CLC DIALOGEX 0, 0, 225, 186 -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 @@ -494,7 +495,7 @@ BEGIN END IDD_OPT_ITEM_CONTACT_TIME DIALOGEX 0, 0, 243, 52 -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, 0x1 BEGIN @@ -504,7 +505,7 @@ BEGIN END IDD_OPT_CLUI DIALOGEX 0, 0, 307, 207 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | DS_CENTER | WS_CHILD +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -556,10 +557,9 @@ BEGIN END IDD_OPT_ITEM_ROW DIALOGEX 0, 0, 232, 218 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | DS_CENTER | WS_CHILD +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN +FONT 8, "MS Shell Dlg", 0, 0, 0x1 LISTBOX IDC_LIST_ORDER,7,26,175,52,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP LTEXT "Order of items:",IDC_STATIC,7,13,117,10 RTEXT "Minimum row height:",IDC_STATIC,7,90,101,8 @@ -588,9 +588,9 @@ BEGIN END IDD_OPT_ITEM_AVATAR DIALOGEX 0, 0, 260, 191 -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", 400, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "Draw border on avatar",IDC_AVATAR_DRAW_BORDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,50,246,9 CONTROL "Show avatars",IDC_SHOW_AVATARS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,14,246,8 @@ -623,9 +623,9 @@ BEGIN END IDD_OPT_ITEM_ICON DIALOGEX 0, 0, 260, 140 -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", 400, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "Hide icon when showing avatar",IDC_HIDE_ICON_ON_AVATAR, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,24,246,8 @@ -644,9 +644,9 @@ BEGIN END IDD_OPT_ITEM_TEXT DIALOGEX 0, 0, 260, 160 -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", 400, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "Right-to-left reading mode (mirror template)",IDC_RTL, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,42,246,8 @@ -667,9 +667,9 @@ BEGIN END IDD_OPT_ITEM_SECOND_LINE DIALOGEX 0, 0, 256, 231 -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", 400, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "Show second line",IDC_SHOW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,16,242,8 LTEXT "Top space:",IDC_STATIC_TOP,7,37,40,8 @@ -696,9 +696,9 @@ BEGIN END IDD_OPT_ITEM_THIRD_LINE DIALOGEX 0, 0, 256, 231 -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", 400, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "Show third line",IDC_SHOW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,16,242,8 LTEXT "Top space:",IDC_STATIC_TOP,7,37,40,8 @@ -725,9 +725,9 @@ BEGIN END IDD_OPT_EXTFRAMES DIALOGEX 0, 0, 304, 220 -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", 400, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN PUSHBUTTON "Up",IDC_BUTTON_UP,7,189,36,12,WS_DISABLED PUSHBUTTON "Down",IDC_BUTTON_DOWN,52,189,36,12,WS_DISABLED @@ -758,8 +758,9 @@ BEGIN END IDD_OPT_ROWTMPL DIALOGEX 0, 0, 299, 207 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD -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 "Row template",IDC_STATIC,0,7,295,194 CONTROL "",IDC_ROWTREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,3,18,131,140 diff --git a/plugins/Clist_nicer/res/resource.rc b/plugins/Clist_nicer/res/resource.rc index df8c9724a7..760316f211 100644 --- a/plugins/Clist_nicer/res/resource.rc +++ b/plugins/Clist_nicer/res/resource.rc @@ -71,16 +71,17 @@ BEGIN END IDD_OPTIONSDIALOG 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", 400, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "",IDC_OPTIONSTAB,"SysTabControl32",WS_TABSTOP,1,1,310,245,WS_EX_ACCEPTFILES END IDD_OPT_CLIST DIALOGEX 0, 0, 305, 226 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD -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 "Contact list",IDC_STCLISTGROUP,1,0,163,91 CONTROL "Hide offline users",IDC_HIDEOFFLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,12,147,10 @@ -120,8 +121,9 @@ BEGIN END IDD_OPT_DSPGROUPS DIALOGEX 0, 0, 305, 205 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD -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 "Groups",IDC_STATIC,1,0,299,109 CONTROL "Draw a line alongside group names",IDC_LINEWITHGROUPS, @@ -162,8 +164,9 @@ BEGIN END IDD_OPT_DSPITEMS DIALOGEX 0, 0, 305, 167 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD -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 "Contact list sorting",IDC_STATIC,1,0,142,145,WS_GROUP LTEXT "First by",IDC_STATIC,5,15,57,9 @@ -183,8 +186,9 @@ BEGIN END IDD_OPT_DSPADVANCED DIALOGEX 0, 0, 305, 175 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD -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 "Avatars",IDC_STATIC,1,0,300,100 CONTROL "Show avatars",IDC_CLISTAVATARS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,11,125,10 @@ -214,8 +218,9 @@ BEGIN END IDD_OPT_ICONS DIALOGEX 0, 0, 305, 110 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD -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 "Icons",IDC_STATIC,5,3,293,99 CONTROL "Show status icons",IDC_SHOWSTATUSICONS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,14,277,10 @@ -231,8 +236,9 @@ BEGIN END IDD_OPT_CLUI DIALOGEX 0, 0, 305, 226 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD -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 "Window",IDC_STWINDOWGROUP,1,0,302,165 CONTROL "Always on top",IDC_ONTOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,11,126,10 @@ -290,8 +296,9 @@ BEGIN END IDD_OPT_CLC DIALOGEX 0, 0, 305, 226 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD -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 "Items",IDC_STATIC,1,0,302,110 CONTROL "Show divider between online and offline contacts",IDC_DIVIDERONOFF, @@ -322,7 +329,7 @@ BEGIN END IDD_OPT_CLCBKG DIALOGEX 0, 0, 305, 226 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | DS_CENTER | WS_CHILD +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -343,7 +350,8 @@ BEGIN END IDD_OPT_SBAR DIALOGEX 0, 0, 303, 226 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | DS_CENTER | WS_CHILD +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD +EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Status bar",IDC_STATIC,3,4,297,214 @@ -364,7 +372,8 @@ BEGIN END IDD_OPT_VIEWMODES DIALOGEX 0, 0, 309, 295 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD +EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "",IDC_TAB,"SysTabControl32",0x0,4,4,301,264 @@ -407,7 +416,8 @@ BEGIN END IDD_OPT_SKIN DIALOGEX 0, 0, 303, 200 -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, 0x1 BEGIN LTEXT "Per contact skins:",IDC_STATIC,9,188,71,12,WS_DISABLED @@ -449,9 +459,9 @@ BEGIN END IDD_OPT 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", 400, 0, 0x1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "",IDC_OPTIONSTAB,"SysTabControl32",WS_TABSTOP,1,1,310,226,WS_EX_ACCEPTFILES PUSHBUTTON "Load from skin file",IDC_IMPORT,167,229,125,15 diff --git a/plugins/ConnectionNotify/res/ConnectionNotify.rc b/plugins/ConnectionNotify/res/ConnectionNotify.rc index 52b0b59c5a..03f7518c80 100644 --- a/plugins/ConnectionNotify/res/ConnectionNotify.rc +++ b/plugins/ConnectionNotify/res/ConnectionNotify.rc @@ -17,9 +17,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_OPT_DIALOG DIALOGEX 0, 0, 314, 239 -STYLE DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_POPUP | WS_SYSMENU -EXSTYLE WS_EX_WINDOWEDGE -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 { AUTOCHECKBOX "Set popup colors", IDC_SETCOLOURS, 20, 174, 132, 10, WS_GROUP | BS_PUSHLIKE -- cgit v1.2.3