From 2f8ead5c2de8b30272f6d47b4402957a97f3c106 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 13 Nov 2023 18:42:14 +0300
Subject: =?UTF-8?q?fixes=20#3835=20(=D0=A8=D0=B8=D1=84=D1=80=D0=BE=D0=B2?=
=?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B1=D0=B0=D0=B7=D1=8B:=20=D1=80?=
=?UTF-8?q?=D0=B0=D0=B7=D1=80=D0=B5=D1=88=D0=B8=D1=82=D1=8C=20=D0=BF=D0=BE?=
=?UTF-8?q?=D0=BA=D0=B0=D0=B7=20=D0=B2=D0=B2=D0=BE=D0=B4=D0=B8=D0=BC=D1=8B?=
=?UTF-8?q?=D1=85=20=D1=81=D0=B8=D0=BC=D0=B2=D0=BE=D0=BB=D0=BE=D0=B2)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/mir_app/res/eye.ico | Bin 0 -> 894 bytes
src/mir_app/res/resource.rc | 41 ++++++++++++++++++++++++++++++++++-------
2 files changed, 34 insertions(+), 7 deletions(-)
create mode 100644 src/mir_app/res/eye.ico
(limited to 'src/mir_app/res')
diff --git a/src/mir_app/res/eye.ico b/src/mir_app/res/eye.ico
new file mode 100644
index 0000000000..c996bb179f
Binary files /dev/null and b/src/mir_app/res/eye.ico differ
diff --git a/src/mir_app/res/resource.rc b/src/mir_app/res/resource.rc
index 574a132eb3..60737ba47c 100644
--- a/src/mir_app/res/resource.rc
+++ b/src/mir_app/res/resource.rc
@@ -7,7 +7,6 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#include <windows.h>
#include <winres.h>
#include "../../include/statusmodes.h"
@@ -752,7 +751,7 @@ BEGIN
CONTROL "User &details",IDC_DETAILS,"MButtonClass",WS_TABSTOP,248,29,16,14,WS_EX_NOACTIVATE | 0x10000000L
LTEXT "Reason:",IDC_STATIC,7,39,101,10,SS_CENTERIMAGE
EDITTEXT IDC_REASON,7,50,257,54,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL | WS_HSCROLL,WS_EX_STATICEDGE
- LTEXT "Denial reason:",IDC_STATIC,7,111,89,10,SS_CENTERIMAGE | SS_REALSIZECONTROL
+ LTEXT "Denial reason:",IDC_STATIC,7,111,89,10,SS_CENTERIMAGE | 0x40
EDITTEXT IDC_DENYREASON,7,124,257,32,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | NOT WS_BORDER,WS_EX_STATICEDGE
CONTROL "Add to contact list if authorized",IDC_ADDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,162,239,10
END
@@ -937,12 +936,13 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
CONTROL "Please enter your new password",IDC_HEADERBAR,
"MHeaderbarCtrl",0x0,0,0,190,26
- CTEXT "",IDC_LANG,158,34,13,13,SS_CENTERIMAGE | NOT WS_GROUP
- EDITTEXT IDC_USERPASS1,21,34,128,14,ES_PASSWORD | ES_AUTOHSCROLL
- EDITTEXT IDC_USERPASS2,21,54,128,14,ES_PASSWORD | ES_AUTOHSCROLL
+ CTEXT "",IDC_LANG,144,34,13,13,SS_CENTERIMAGE | NOT WS_GROUP
+ EDITTEXT IDC_USERPASS1,10,34,128,14,ES_PASSWORD | ES_AUTOHSCROLL
+ EDITTEXT IDC_USERPASS2,10,54,128,14,ES_PASSWORD | ES_AUTOHSCROLL
DEFPUSHBUTTON "OK",IDOK,36,84,50,14
PUSHBUTTON "Cancel",IDCANCEL,100,84,50,14
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDFRAME,0,77,190,1
+ CONTROL "",IDC_SHOWPASSWORD,"MButtonClass",0x0,163,34,16,14
END
IDD_CHANGEPASS DIALOGEX 0, 0, 190, 148
@@ -962,6 +962,7 @@ BEGIN
LTEXT "New password",IDC_STATIC,11,66,163,10,0,WS_EX_TRANSPARENT
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDFRAME,0,119,190,1
LTEXT "Old password",IDC_STATIC,11,31,140,10,0,WS_EX_TRANSPARENT
+ CTEXT "",IDC_LANG2,155,78,13,13,SS_CENTERIMAGE | NOT WS_GROUP
END
IDD_OPT_DATABASE DIALOGEX 0, 0, 318, 176
@@ -1344,6 +1345,10 @@ BEGIN
BOTTOMMARGIN, 63
END
+ IDD_OPT_ERRORS, DIALOG
+ BEGIN
+ END
+
IDD_CHOOSE_FONT_EFFECT, DIALOG
BEGIN
END
@@ -1415,6 +1420,18 @@ BEGIN
BOTTOMMARGIN, 194
END
+ IDD_NEWPASS, DIALOG
+ BEGIN
+ END
+
+ IDD_CHANGEPASS, DIALOG
+ BEGIN
+ END
+
+ IDD_OPT_DATABASE, DIALOG
+ BEGIN
+ END
+
IDD_OPT_FILEGENERAL, DIALOG
BEGIN
END
@@ -1439,7 +1456,6 @@ END
2 TEXTINCLUDE
BEGIN
- "#include <windows.h>\r\n"
"#include <winres.h>\r\n"
"#include ""../../include/statusmodes.h""\r\n"
"\0"
@@ -1589,6 +1605,8 @@ IDI_EXIT ICON "Icon_exit.ico"
IDI_MOVETOGROUP ICON "contact_groups.ico"
+IDI_EYE ICON "eye.ico"
+
IDI_ON ICON "On.ico"
IDI_OFF ICON "Off.ico"
@@ -1651,7 +1669,6 @@ IDI_STATUS4 ICON "chat/5.ico"
IDI_STATUS5 ICON "chat/6.ico"
-
/////////////////////////////////////////////////////////////////////////////
//
// Cursor
@@ -1846,6 +1863,16 @@ BEGIN
0
END
+IDD_NEWPASS AFX_DIALOG_LAYOUT
+BEGIN
+ 0
+END
+
+IDD_CHANGEPASS AFX_DIALOG_LAYOUT
+BEGIN
+ 0
+END
+
#endif // English (United States) resources
/////////////////////////////////////////////////////////////////////////////
--
cgit v1.2.3