fixes #3839 (VoiceService: добавить единицы измерения в длительность вспл. окон)

2 files changed, 18 insertions, 10 deletions

diff --git a/plugins/VoiceService/res/resource.rc b/plugins/VoiceService/res/resource.rc
index d9f357424d..0b1bbb13af 100644
--- a/plugins/VoiceService/res/resource.rc
+++ b/plugins/VoiceService/res/resource.rc
@@ -64,16 +64,18 @@ BEGIN
     CONTROL         "Default",IDC_DELAYFROMPU,"Button",BS_AUTORADIOBUTTON | WS_GROUP,175,38,122,10
     CONTROL         "Custom",IDC_DELAYCUSTOM,"Button",BS_AUTORADIOBUTTON,175,52,54,10
     CONTROL         "Permanent",IDC_DELAYPERMANENT,"Button",BS_AUTORADIOBUTTON,175,66,122,10
-    EDITTEXT        IDC_DELAY,233,50,31,14,ES_AUTOHSCROLL | ES_NUMBER
-    CONTROL         "Spin1",IDC_DELAY_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,268,51,11,11
+    EDITTEXT        IDC_DELAY,233,52,31,12,ES_AUTOHSCROLL | ES_NUMBER
+    CONTROL         "Spin1",IDC_DELAY_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,253,53,11,11
     GROUPBOX        "Actions",IDC_ACTIONS_G,3,103,308,47
     RTEXT           "On right click:",IDC_RIGHT_ACTION_L,13,118,62,9
     COMBOBOX        IDC_RIGHT_ACTION,83,116,156,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     RTEXT           "On left click:",IDC_LEFT_ACTION_L,13,132,62,9
     COMBOBOX        IDC_LEFT_ACTION,83,132,156,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "Preview",IDC_PREV,131,161,50,14
-    CONTROL         "Show incoming call dialog immediately",IDC_IMMDIALOG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,180,308,12
+    CONTROL         "Show incoming call dialog immediately",IDC_IMMDIALOG,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,180,308,12
     CONTROL         "Catch focus on this dialog",IDC_IMMDIALOG_FOCUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,200,308,12
+    LTEXT           "sec",IDC_STATIC,270,54,12,8
 END
 
 IDD_NEW_CALL DIALOG 0, 0, 229, 87
@@ -84,7 +86,8 @@ BEGIN
     CTEXT           "%s wants to start a voice call with you. What you want to do?\n\nIf you answer the call, the current call will be put on hold.",IDC_TEXT,7,7,215,36
     DEFPUSHBUTTON   "Answer",ID_ANSWER,58,47,50,14
     PUSHBUTTON      "Drop",ID_DROP,121,47,50,14
-    CONTROL         "From now on, repeat this action for this contact",IDC_AUTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,67,215,12
+    CONTROL         "From now on, repeat this action for this contact",IDC_AUTO,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,67,215,12
 END
 
 IDD_OPTS DIALOGEX 0, 0, 233, 41
@@ -124,7 +127,7 @@ BEGIN
 END
 
 IDD_VOICECALL DIALOGEX 0, 0, 160, 119
-STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | NOT WS_VISIBLE | WS_CAPTION
+STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_CAPTION
 CAPTION "Voice call"
 FONT 8, "Ms Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -266,6 +269,11 @@ BEGIN
     0
 END
 
+IDD_POPUPS AFX_DIALOG_LAYOUT
+BEGIN
+    0
+END
+
 #endif    // English (United States) resources
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/plugins/VoiceService/src/resource.h b/plugins/VoiceService/src/resource.h
index 5acd8de97c..e68439d86c 100644
--- a/plugins/VoiceService/src/resource.h
+++ b/plugins/VoiceService/src/resource.h
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by resource.rc
+// Microsoft Visual C++ generated include file.
+// Used by W:\miranda-ng\plugins\VoiceService\res\resource.rc
 //
 #define IDR_MENUS                       101
 #define IDD_CALLS                       102
@@ -71,8 +71,8 @@
 #define IDC_LIST                        1079
 #define IDC_ANSWERBTN                   1204
 #define IDC_DROPBTN                     1205
-#define IDC_IMMDIALOG					1206
-#define IDC_IMMDIALOG_FOCUS				1207
+#define IDC_IMMDIALOG                   1206
+#define IDC_IMMDIALOG_FOCUS             1207
 #define ID_FRAMEPOPUP_ANSWERCALL        40001
 #define ID_FRAMEPOPUP_DROPCALL          40002
 #define ID_FRAMEPOPUP_HOLDCALL          40003
@@ -92,7 +92,7 @@
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        115
+#define _APS_NEXT_RESOURCE_VALUE        116
 #define _APS_NEXT_COMMAND_VALUE         40004
 #define _APS_NEXT_CONTROL_VALUE         1013
 #define _APS_NEXT_SYMED_VALUE           101