From 3d411171eba820bffa2998f2442c197a553153f4 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Mon, 25 Mar 2013 16:44:51 +0000 Subject: - resource cosmetics (patch from person) git-svn-id: http://svn.miranda-ng.org/main/trunk@4189 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- langpacks/russian/Plugins/VersionInfo.txt | 4 +- plugins/StatusChange/res/resource.rc | 100 +++++++++++------------------- plugins/StatusChange/src/resource.h | 19 ++++-- plugins/VersionInfo/res/resource.rc | 2 +- 4 files changed, 55 insertions(+), 70 deletions(-) diff --git a/langpacks/russian/Plugins/VersionInfo.txt b/langpacks/russian/Plugins/VersionInfo.txt index 470c7b8141..d13f8d3f38 100644 --- a/langpacks/russian/Plugins/VersionInfo.txt +++ b/langpacks/russian/Plugins/VersionInfo.txt @@ -38,8 +38,8 @@ UUID плагина Показать окно в панели задач [Highlight version number using] Выделить номер версии -[Attempt to find unloadable plugins (doesn't work on Windows 98)] -Найти плагины, которые не загружаются (не работает в Windows 98) +[Attempt to find unloadable plugins] +Найти плагины, которые не загружаются [Ask everytime] Всегда спрашивать [Suppress header information] diff --git a/plugins/StatusChange/res/resource.rc b/plugins/StatusChange/res/resource.rc index 64dcfa21c3..bad2be6483 100644 --- a/plugins/StatusChange/res/resource.rc +++ b/plugins/StatusChange/res/resource.rc @@ -26,74 +26,48 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN // Dialog // -IDD_OPTIONS DIALOGEX 0, 0, 316, 234 -STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE +IDD_OPTIONS DIALOGEX 0, 0, 316, 242 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "",IDC_CHK_MESSAGESEND,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,165,27,10,8 - CONTROL "",IDC_CHK_MESSAGEREAD,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,200,27,10,8 - CONTROL "",IDC_CHK_URLSEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 165,38,10,8 - CONTROL "",IDC_CHK_URLREAD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 200,38,10,8 - CONTROL "",IDC_CHK_FILESEND,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,165,49,10,8 - CONTROL "",IDC_CHK_FILEREAD,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,200,49,10,8 - CONTROL "Offline",IDC_RAD_OFFLINE,"Button",BS_AUTORADIOBUTTON | - WS_GROUP | WS_TABSTOP,60,88,95,10 - CONTROL "Online",IDC_RAD_ONLINE,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,60,98,95,10 - CONTROL "Away",IDC_RAD_AWAY,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,60,108,95,10 - CONTROL "NA",IDC_RAD_NA,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP, - 60,118,95,10 - CONTROL "Occupied",IDC_RAD_OCCUPIED,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,60,128,95,10 - CONTROL "DND",IDC_RAD_DND,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,165,88,95,10 - CONTROL "Free for chat",IDC_RAD_FREECHAT,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,165,98,95,10 - CONTROL "Invisible",IDC_RAD_INVISIBLE,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,165,108,95,10 - CONTROL "On the phone",IDC_RAD_ONTHEPHONE,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,165,118,95,10 - CONTROL "Out to lunch",IDC_RAD_OUTTOLUNCH,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,165,128,95,10 - CONTROL "Offline",IDC_CHK_OFFLINE,"Button",BS_AUTOCHECKBOX | - WS_DISABLED | WS_TABSTOP,60,165,95,10 - CONTROL "Online",IDC_CHK_ONLINE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,60,175,95,10 - CONTROL "Away",IDC_CHK_AWAY,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,60,185,95,10 - CONTROL "NA",IDC_CHK_NA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60, - 195,95,10 - CONTROL "Occupied",IDC_CHK_OCCUPIED,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,60,204,95,10 - CONTROL "DND",IDC_CHK_DND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 165,165,95,10 - CONTROL "Free for chat",IDC_CHK_FREECHAT,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,165,175,95,10 - CONTROL "Invisible",IDC_CHK_INVISIBLE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,165,185,95,10 - CONTROL "On the phone",IDC_CHK_ONTHEPHONE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,165,195,95,10 - CONTROL "Out to lunch",IDC_CHK_OUTTOLUNCH,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,165,205,95,10 - GROUPBOX "On events...",-1,45,10,220,55,WS_GROUP + CONTROL "",IDC_CHK_MESSAGESEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,165,27,10,8 + CONTROL "",IDC_CHK_MESSAGEREAD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,200,27,10,8 + CONTROL "",IDC_CHK_URLSEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,165,46,10,8 + CONTROL "",IDC_CHK_URLREAD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,200,46,10,8 + CONTROL "",IDC_CHK_FILESEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,165,64,10,8 + CONTROL "",IDC_CHK_FILEREAD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,200,64,10,8 + CONTROL "Offline",IDC_RAD_OFFLINE,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,101,95,10 + CONTROL "Online",IDC_RAD_ONLINE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,111,95,10 + CONTROL "Away",IDC_RAD_AWAY,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,121,95,10 + CONTROL "NA",IDC_RAD_NA,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,131,95,10 + CONTROL "Occupied",IDC_RAD_OCCUPIED,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,141,95,10 + CONTROL "DND",IDC_RAD_DND,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,165,101,95,10 + CONTROL "Free for chat",IDC_RAD_FREECHAT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,165,111,95,10 + CONTROL "Invisible",IDC_RAD_INVISIBLE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,165,121,95,10 + CONTROL "On the phone",IDC_RAD_ONTHEPHONE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,165,131,95,10 + CONTROL "Out to lunch",IDC_RAD_OUTTOLUNCH,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,165,141,95,10 + CONTROL "Offline",IDC_CHK_OFFLINE,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,60,178,95,10 + CONTROL "Online",IDC_CHK_ONLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,188,95,10 + CONTROL "Away",IDC_CHK_AWAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,198,95,10 + CONTROL "NA",IDC_CHK_NA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,208,95,10 + CONTROL "Occupied",IDC_CHK_OCCUPIED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,217,95,10 + CONTROL "DND",IDC_CHK_DND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,165,178,95,10 + CONTROL "Free for chat",IDC_CHK_FREECHAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,165,188,95,10 + CONTROL "Invisible",IDC_CHK_INVISIBLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,165,198,95,10 + CONTROL "On the phone",IDC_CHK_ONTHEPHONE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,165,208,95,10 + CONTROL "Out to lunch",IDC_CHK_OUTTOLUNCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,165,218,95,10 + GROUPBOX "On events...",-1,45,10,220,73,WS_GROUP LTEXT "Send",-1,160,17,27,9,NOT WS_GROUP LTEXT "Receive",-1,190,17,42,9,NOT WS_GROUP LTEXT "Message",-1,73,27,85,8,NOT WS_GROUP - LTEXT "URL",-1,73,38,85,8,NOT WS_GROUP - LTEXT "File transfer",-1,73,49,85,8,NOT WS_GROUP - GROUPBOX "...change status to...",-1,45,73,220,68,WS_GROUP - GROUPBOX "... if status is...",-1,45,150,220,68,WS_GROUP - ICON "",IDC_MSGICON,51,20,20,20,SS_CENTERIMAGE - ICON "",IDC_URLICON,51,32,20,20,SS_CENTERIMAGE - ICON "",IDC_FILEICON,51,44,20,20,SS_CENTERIMAGE + LTEXT "URL",-1,73,46,85,8,NOT WS_GROUP + LTEXT "File transfer",-1,73,64,85,8,NOT WS_GROUP + GROUPBOX "...change status to...",-1,45,86,220,68,WS_GROUP + GROUPBOX "... if status is...",-1,45,163,220,68,WS_GROUP + ICON "",IDC_MSGICON,51,20,21,20,SS_CENTERIMAGE + ICON "",IDC_URLICON,51,40,21,20,SS_CENTERIMAGE + ICON "",IDC_FILEICON,51,59,21,20,SS_CENTERIMAGE END diff --git a/plugins/StatusChange/src/resource.h b/plugins/StatusChange/src/resource.h index 6d5cd3b318..9b48911f7c 100644 --- a/plugins/StatusChange/src/resource.h +++ b/plugins/StatusChange/src/resource.h @@ -1,5 +1,8 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by ..\res\resource.rc +// #define IDD_OPTIONS 10 - #define IDC_CHK_OFFLINE 1001 #define IDC_CHK_ONLINE 1002 #define IDC_CHK_AWAY 1003 @@ -10,7 +13,6 @@ #define IDC_CHK_INVISIBLE 1008 #define IDC_CHK_ONTHEPHONE 1009 #define IDC_CHK_OUTTOLUNCH 1010 - #define IDC_RAD_OFFLINE 2001 #define IDC_RAD_ONLINE 2002 #define IDC_RAD_AWAY 2003 @@ -21,14 +23,23 @@ #define IDC_RAD_INVISIBLE 2008 #define IDC_RAD_ONTHEPHONE 2009 #define IDC_RAD_OUTTOLUNCH 2010 - #define IDC_CHK_MESSAGEREAD 3001 #define IDC_CHK_MESSAGESEND 3002 #define IDC_CHK_URLREAD 3003 #define IDC_CHK_URLSEND 3004 #define IDC_CHK_FILEREAD 3005 #define IDC_CHK_FILESEND 3006 - #define IDC_MSGICON 4001 #define IDC_URLICON 4002 #define IDC_FILEICON 4003 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 101 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1000 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/plugins/VersionInfo/res/resource.rc b/plugins/VersionInfo/res/resource.rc index 9af9a50df0..58ed3ad245 100644 --- a/plugins/VersionInfo/res/resource.rc +++ b/plugins/VersionInfo/res/resource.rc @@ -77,7 +77,7 @@ BEGIN CONTROL "Highlight version number using",IDC_BOLDVERSION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,153,216,10 COMBOBOX IDC_BOLDCOMBOBOX,252,153,61,37,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Show disabled plugins too",IDC_DISABLEDTOO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,164,232,10 - CONTROL "Attempt to find unloadable plugins (doesn't work on Windows 98)",IDC_CHECKUNLOADABLE, + CONTROL "Attempt to find unloadable plugins",IDC_CHECKUNLOADABLE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,174,272,10 CONTROL "Suppress header information",IDC_SUPPRESSHEADER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,184,274,10 CONTROL "Enable debug messages",IDC_DEBUG,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,220,207,93,10 -- cgit v1.2.3