From 49129b23f64e79d46e10f53f01d6f52a2c731dfb Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 20 Feb 2024 11:27:49 +0300 Subject: stduserinfo: fix for missing AVS plugin --- src/core/stduserinfo/res/resource.rc | 61 +++++++++++++++++++++++------------- src/core/stduserinfo/src/resource.h | 5 ++- 2 files changed, 41 insertions(+), 25 deletions(-) diff --git a/src/core/stduserinfo/res/resource.rc b/src/core/stduserinfo/res/resource.rc index e38dfb5c83..cc83b665fe 100644 --- a/src/core/stduserinfo/res/resource.rc +++ b/src/core/stduserinfo/res/resource.rc @@ -25,14 +25,23 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // Icon // +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. IDI_FOLDER ICON "folder.ico" + IDI_ITEM ICON "item.ico" + IDI_CONTACT ICON "contact.ico" + IDI_NOTES ICON "notes.ico" + IDI_SUMMARY ICON "summary.ico" + IDI_WORK ICON "work.ico" + IDI_LOCATION ICON "location.ico" + ///////////////////////////////////////////////////////////////////////////// // // Cursor @@ -94,28 +103,27 @@ STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CONTROL | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - EDITTEXT IDC_NICK,74,0,146,8,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER - LTEXT "First name:",IDC_STATIC,0,72,46,8 - EDITTEXT IDC_FIRSTNAME,48,72,74,8,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER - LTEXT "Gender:",IDC_STATIC,126,72,44,8 - EDITTEXT IDC_GENDER,168,72,53,8,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER - LTEXT "Last name:",IDC_STATIC,0,84,46,8 - EDITTEXT IDC_LASTNAME,48,84,74,8,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER - LTEXT "Age:",IDC_STATIC,126,84,44,8 - EDITTEXT IDC_AGE,168,84,53,8,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER - LTEXT "E-mail:",IDC_STATIC,0,96,46,8 - CONTROL "",IDC_EMAIL,"Hyperlink",WS_TABSTOP,49,96,160,8 - LTEXT "Date of birth:",IDC_STATIC,0,108,59,8 - EDITTEXT IDC_DOBDAY,78,108,8,8,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER - EDITTEXT IDC_DOBMONTH,96,108,16,8,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER - EDITTEXT IDC_DOBYEAR,114,108,20,8,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER - LTEXT "Marital status:",IDC_STATIC,0,120,76,8 - EDITTEXT IDC_MARITAL,76,120,87,8,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER - CONTROL "",IDC_AVA,"MAvatarControlClass",WS_TABSTOP,0,0,66,60 - EDITTEXT IDC_ADDR,72,12,124,8,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER - PUSHBUTTON "Copy",IDC_CPADDR,197,10,24,12,BS_ICON - EDITTEXT IDC_FN,72,24,146,8,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER - CONTROL "",IDC_HORLINE,"Static",SS_ETCHEDHORZ,0,66,221,1 + EDITTEXT IDC_NICK,3,0,146,8,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + LTEXT "First name:",IDC_STATIC,0,44,46,8 + EDITTEXT IDC_FIRSTNAME,48,44,74,8,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + LTEXT "Gender:",IDC_STATIC,126,44,44,8 + EDITTEXT IDC_GENDER,168,44,53,8,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + LTEXT "Last name:",IDC_STATIC,0,56,46,8 + EDITTEXT IDC_LASTNAME,48,56,74,8,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + LTEXT "Age:",IDC_STATIC,126,56,44,8 + EDITTEXT IDC_AGE,168,56,53,8,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + LTEXT "E-mail:",IDC_STATIC,0,68,46,8 + CONTROL "",IDC_EMAIL,"Hyperlink",WS_TABSTOP,49,68,160,8 + LTEXT "Date of birth:",IDC_STATIC,0,80,59,8 + EDITTEXT IDC_DOBDAY,78,80,8,8,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + EDITTEXT IDC_DOBMONTH,96,80,16,8,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + EDITTEXT IDC_DOBYEAR,114,80,20,8,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + LTEXT "Marital status:",IDC_STATIC,0,92,76,8 + EDITTEXT IDC_MARITAL,76,92,87,8,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + EDITTEXT IDC_ADDR,1,12,124,8,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + PUSHBUTTON "Copy",IDC_CPADDR,138,10,83,12,BS_ICON + EDITTEXT IDC_FN,1,24,146,8,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER + CONTROL "",IDC_HORLINE,"Static",SS_ETCHEDHORZ,0,38,221,1 END IDD_INFO_CONTACT DIALOGEX 0, 0, 222, 132 @@ -234,6 +242,10 @@ BEGIN BEGIN END + IDD_INFO_SUMMARY, DIALOG + BEGIN + END + IDD_INFO_CONTACT, DIALOG BEGIN LEFTMARGIN, 5 @@ -334,6 +346,11 @@ BEGIN 0 END +IDD_INFO_SUMMARY AFX_DIALOG_LAYOUT +BEGIN + 0 +END + #endif // English (United States) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/src/core/stduserinfo/src/resource.h b/src/core/stduserinfo/src/resource.h index a2eb8ce824..a27e50d8a3 100644 --- a/src/core/stduserinfo/src/resource.h +++ b/src/core/stduserinfo/src/resource.h @@ -1,8 +1,7 @@ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. -// Used by w:\miranda-ng\src\mir_app\res\resource.rc +// Used by W:\miranda-ng\src\core\stduserinfo\res\resource.rc // - #define IDI_FOLDER 101 #define IDI_ITEM 102 #define IDI_CONTACT 103 @@ -69,7 +68,7 @@ // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_RESOURCE_VALUE 103 #define _APS_NEXT_COMMAND_VALUE 40001 #define _APS_NEXT_CONTROL_VALUE 1004 #define _APS_NEXT_SYMED_VALUE 101 -- cgit v1.2.3