From 5bf3fd51f1dcdd275d38f35d7aebe7bd063eb3db Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 16 Oct 2023 12:37:04 +0300 Subject: YAMN: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - fixes #3742 (YAMN: добавить опцию "игнорировать настройки всплывающих окон при ручной проверке"); - all manual calls of CreateThread() removed on behalf of mir_forkthread; - code cleaning --- protocols/YAMN/res/YAMN.rc | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'protocols/YAMN/res') diff --git a/protocols/YAMN/res/YAMN.rc b/protocols/YAMN/res/YAMN.rc index 4e8460b858..20338bf727 100644 --- a/protocols/YAMN/res/YAMN.rc +++ b/protocols/YAMN/res/YAMN.rc @@ -91,8 +91,6 @@ BEGIN IDD_POP3ACCOUNTPOPUP, DIALOG BEGIN - VERTGUIDE, 155 - VERTGUIDE, 236 END END #endif // APSTUDIO_INVOKED @@ -224,8 +222,8 @@ STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - COMBOBOX IDC_COMBOACCOUNT,4,4,140,65,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Mail Notifications",IDC_GBNEWMAIL,5,23,300,76 + COMBOBOX IDC_COMBOACCOUNT,2,4,140,65,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Mail Notifications",IDC_GBNEWMAIL,0,23,300,76 CONTROL "Popup",IDC_CHECKPOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,32,108,10 CONTROL "Single popup",IDC_RADIOPOP1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,23,43,95,10 CONTROL "Multi popup",IDC_RADIOPOPN,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,23,55,95,10 @@ -233,14 +231,14 @@ BEGIN CONTROL "",IDC_CPB,"ColourPicker",WS_TABSTOP,145,66,29,12 CONTROL "",IDC_CPT,"ColourPicker",WS_TABSTOP,145,83,29,12 EDITTEXT IDC_EDITPOPS,23,65,20,12,ES_AUTOHSCROLL - GROUPBOX "No new mail notifications",IDC_GBNONEWMAIL,5,152,300,62 + GROUPBOX "No new mail notifications",IDC_GBNONEWMAIL,0,152,300,62 CONTROL "Popup if no mail",IDC_CHECKNPOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,161,94,10 CONTROL "Persistent message",IDC_CHECKNMSGP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,188,110,10 CONTROL "Use custom color",IDC_CHECKNCOL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,201,107,10 CONTROL "",IDC_CPNB,"ColourPicker",WS_TABSTOP,145,181,29,12 CONTROL "",IDC_CPNT,"ColourPicker",WS_TABSTOP,145,198,29,12 EDITTEXT IDC_EDITNPOPS,23,173,20,12,ES_AUTOHSCROLL - GROUPBOX "Connection failure notifications",IDC_GBBADCONNECT,5,101,300,49 + GROUPBOX "Connection failure notifications",IDC_GBBADCONNECT,0,101,300,49 CONTROL "Popup notification if failed",IDC_CHECKFPOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,110,118,10 CONTROL "Use custom color",IDC_CHECKFCOL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,136,95,10 CONTROL "",IDC_CPFB,"ColourPicker",WS_TABSTOP,145,118,29,12 @@ -256,6 +254,8 @@ BEGIN LTEXT "Text color",IDC_STATIC,177,136,107,10 LTEXT "Background color",IDC_STATIC,177,69,108,10 LTEXT "Text color",IDC_STATIC,177,85,107,10 + CONTROL "Force popups for manual operations",IDC_FORCECHECK, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,218,231,10 END @@ -290,6 +290,11 @@ BEGIN 0 END +IDD_POP3ACCOUNTPOPUP AFX_DIALOG_LAYOUT +BEGIN + 0 +END + #endif // Neutral resources ///////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3