diff options
author | Alexander Lantsev <aunsane@gmail.com> | 2015-04-24 13:24:33 +0000 |
---|---|---|
committer | Alexander Lantsev <aunsane@gmail.com> | 2015-04-24 13:24:33 +0000 |
commit | 6fb6adb873fdf453a9c712c5ec8cdfa3182d1973 (patch) | |
tree | 744d6c14da3f90cb03a2730b7de4e5f3ceba3e78 /protocols/Tox/res | |
parent | 90fae1963c8236f5fb8c73f490286539a7e061a7 (diff) |
Tox: work commit
- multimedia dialogs are reworked
- some fixes
git-svn-id: http://svn.miranda-ng.org/main/trunk@13081 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Tox/res')
-rw-r--r-- | protocols/Tox/res/resource.rc | 70 |
1 files changed, 60 insertions, 10 deletions
diff --git a/protocols/Tox/res/resource.rc b/protocols/Tox/res/resource.rc index 0e19a4ecbf..5009436e01 100644 --- a/protocols/Tox/res/resource.rc +++ b/protocols/Tox/res/resource.rc @@ -173,7 +173,7 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,156,97,50,14
END
-IDD_OPTIONS_AV DIALOGEX 0, 0, 310, 230
+IDD_OPTIONS_MULTIMEDIA DIALOGEX 0, 0, 310, 230
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 400, 0, 0x1
@@ -183,7 +183,6 @@ BEGIN COMBOBOX IDC_AUDIOINPUT,12,26,138,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Audio output device",-1,12,42,65,8
COMBOBOX IDC_AUDIOOUTPUT,12,52,138,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- CONTROL "Filter audio",IDC_AUDIOFILTER,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,157,28,51,10
LTEXT "Video input device",-1,15,68,59,8,NOT WS_VISIBLE
COMBOBOX IDC_COMBO_VIDEOINPUT,12,78,138,30,CBS_DROPDOWN | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
END
@@ -199,14 +198,49 @@ BEGIN CONTROL "",IDC_CCLIST,"CListControl",WS_TABSTOP | 0x16f,7,7,176,145,WS_EX_CLIENTEDGE
END
-IDD_AUDIO DIALOGEX 0, 0, 119, 28
+IDD_CALL DIALOGEX 0, 0, 185, 119
STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_TOPMOST
-CAPTION "Audio call"
+CAPTION "Call"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
- DEFPUSHBUTTON "OK",IDOK,7,7,50,14
- PUSHBUTTON "Cancel",IDCANCEL,62,7,50,14
+ DEFPUSHBUTTON "End",IDCANCEL,67,97,50,15
+END
+
+IDD_CALL_RECEIVE DIALOGEX 0, 0, 239, 111
+STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_TOPMOST
+CAPTION "Incoming call"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+ DEFPUSHBUTTON "Answer",IDOK,64,89,50,15
+ PUSHBUTTON "Reject",IDCANCEL,127,90,50,14
+ LTEXT "From:",IDC_STATIC,8,22,24,9,SS_CENTERIMAGE
+ CONTROL "",IDC_FROM,"Static",SS_SIMPLE | SS_NOPREFIX | WS_GROUP,41,23,191,9
+ LTEXT "Date:",IDC_STATIC,8,37,28,9,SS_CENTERIMAGE
+ CONTROL "",IDC_DATE,"Static",SS_SIMPLE | SS_NOPREFIX | WS_GROUP,41,36,191,9
+ CONTROL "&User menu",IDC_USERMENU,"MButtonClass",NOT WS_VISIBLE | WS_TABSTOP,178,7,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "User &details",IDC_DETAILS,"MButtonClass",NOT WS_VISIBLE | WS_TABSTOP,197,7,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "&History",IDC_HISTORY,"MButtonClass",NOT WS_VISIBLE | WS_TABSTOP,216,7,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "",IDC_PROTOCOL,"Button",BS_OWNERDRAW | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,7,9,12,12
+ LTEXT "",IDC_NAME2,21,9,137,9,SS_NOPREFIX | SS_CENTERIMAGE
+END
+
+IDD_CALL_SEND DIALOGEX 0, 0, 239, 95
+STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_TOPMOST
+CAPTION "Outgoing call"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+ DEFPUSHBUTTON "Call",IDOK,64,73,50,15
+ PUSHBUTTON "Cancel",IDCANCEL,127,74,50,14
+ LTEXT "To:",-1,8,22,24,9,SS_CENTERIMAGE
+ CONTROL "",IDC_FROM,"Static",SS_SIMPLE | SS_NOPREFIX | WS_GROUP,41,23,191,9
+ CONTROL "&User menu",IDC_USERMENU,"MButtonClass",NOT WS_VISIBLE | WS_TABSTOP,178,7,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "User &details",IDC_DETAILS,"MButtonClass",NOT WS_VISIBLE | WS_TABSTOP,197,7,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "&History",IDC_HISTORY,"MButtonClass",NOT WS_VISIBLE | WS_TABSTOP,216,7,16,14,WS_EX_NOACTIVATE | 0x10000000L
+ CONTROL "",IDC_PROTOCOL,"Button",BS_OWNERDRAW | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,7,9,12,12
+ LTEXT "",IDC_NAME2,21,9,137,9,SS_NOPREFIX | SS_CENTERIMAGE
END
@@ -272,7 +306,7 @@ BEGIN HORZGUIDE, 67
END
- IDD_OPTIONS_AV, DIALOG
+ IDD_OPTIONS_MULTIMEDIA, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 303
@@ -295,12 +329,28 @@ BEGIN HORZGUIDE, 158
END
- IDD_AUDIO, DIALOG
+ IDD_CALL, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 178
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 112
+ END
+
+ IDD_CALL_RECEIVE, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 232
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 104
+ END
+
+ IDD_CALL_SEND, DIALOG
BEGIN
LEFTMARGIN, 7
- RIGHTMARGIN, 112
+ RIGHTMARGIN, 232
TOPMARGIN, 7
- BOTTOMMARGIN, 21
+ BOTTOMMARGIN, 88
END
END
#endif // APSTUDIO_INVOKED
|