From a26d5fe0dfebb92d6fa9caf6dabc8f50ac938385 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 20 Feb 2015 06:47:44 +0000 Subject: resource update git-svn-id: http://svn.miranda-ng.org/main/trunk@12213 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Tox/res/resource.rc | 42 +++++++++++++++++++++++++----------------- protocols/Tox/src/resource.h | 15 ++++++++++----- 2 files changed, 35 insertions(+), 22 deletions(-) diff --git a/protocols/Tox/res/resource.rc b/protocols/Tox/res/resource.rc index 4052639e78..57ce12b0fe 100644 --- a/protocols/Tox/res/resource.rc +++ b/protocols/Tox/res/resource.rc @@ -97,27 +97,35 @@ BEGIN LTEXT "Tox profile contains your ID and friend list.\r\nYou may import existing profile from other tox client.",IDC_STATIC,12,91,174,21 END -IDD_OPTIONS_MAIN DIALOGEX 0, 0, 312, 234 +IDD_OPTIONS_MAIN DIALOGEX 0, 0, 312, 255 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Name:",IDC_STATIC,12,35,69,11 - EDITTEXT IDC_NAME,81,33,219,12,ES_AUTOHSCROLL - LTEXT "Tox ID:",IDC_STATIC,12,19,69,11 - EDITTEXT IDC_TOXID,81,17,199,12,ES_AUTOHSCROLL | ES_READONLY - GROUPBOX "Connection settings",IDC_STATIC,7,134,298,45 + LTEXT "Name:",IDC_STATIC,12,33,69,11 + EDITTEXT IDC_NAME,81,31,219,12,ES_AUTOHSCROLL + LTEXT "Tox ID:",IDC_STATIC,12,17,69,11 + EDITTEXT IDC_TOXID,81,15,199,12,ES_AUTOHSCROLL | ES_READONLY + GROUPBOX "Connection settings",IDC_STATIC,7,123,298,40 CONTROL "Disable UDP (force Tox to use TCP)",IDC_DISABLE_UDP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,146,288,10 - CONTROL "Disable IPv6",IDC_DISABLE_IPV6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,161,288,10 - GROUPBOX "Tox",IDC_STATIC,7,7,298,124 - LTEXT "Default group:",IDC_STATIC,12,68,69,12 - EDITTEXT IDC_GROUP,81,65,219,12,ES_AUTOHSCROLL - PUSHBUTTON "C",IDC_CLIPBOARD,284,17,16,13 - LTEXT "Password:",IDC_STATIC,12,51,69,8,NOT WS_VISIBLE - EDITTEXT IDC_PASSWORD,81,49,219,12,ES_PASSWORD | ES_AUTOHSCROLL | NOT WS_VISIBLE - PUSHBUTTON "Import tox profile",IDC_IMPORT_PROFILE,81,83,100,14,WS_DISABLED - LTEXT "Tox profile contains your ID and friend list.\r\nYou may import existing profile from other tox client.",IDC_STATIC,81,100,219,27 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,135,288,10 + CONTROL "Disable IPv6",IDC_DISABLE_IPV6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,149,288,10 + GROUPBOX "Tox",IDC_STATIC,7,2,298,122 + LTEXT "Default group:",IDC_STATIC,12,66,69,12 + EDITTEXT IDC_GROUP,81,63,219,12,ES_AUTOHSCROLL + PUSHBUTTON "C",IDC_CLIPBOARD,284,15,16,13 + LTEXT "Password:",IDC_STATIC,12,49,69,8,NOT WS_VISIBLE + EDITTEXT IDC_PASSWORD,81,47,219,12,ES_PASSWORD | ES_AUTOHSCROLL | NOT WS_VISIBLE + PUSHBUTTON "Import tox profile",IDC_IMPORT_PROFILE,81,78,100,14,WS_DISABLED + LTEXT "Tox profile contains your ID and friend list.\r\nYou may import existing profile from other tox client.",IDC_STATIC,81,95,219,25 + GROUPBOX "Multimedia",IDC_STATIC,7,164,298,87,NOT WS_VISIBLE + LTEXT "Audio input device",IDC_STATIC,12,174,60,8,NOT WS_VISIBLE + COMBOBOX IDC_COMBO_AUDIOINPUT,12,184,138,30,CBS_DROPDOWN | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + LTEXT "Audio output device",IDC_STATIC,12,200,65,8,NOT WS_VISIBLE + COMBOBOX IDC_COMBO_AUDIOOUTPUT,12,209,138,30,CBS_DROPDOWN | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP + CONTROL "Filter audio",IDC_AUDIOFILTER,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,157,186,51,10 + LTEXT "Video input device",IDC_STATIC,15,225,59,8,NOT WS_VISIBLE + COMBOBOX IDC_COMBO_AUDIOOUTPUT2,12,235,138,30,CBS_DROPDOWN | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP END IDD_SEARCH DIALOGEX 0, 0, 109, 113 @@ -209,7 +217,7 @@ BEGIN VERTGUIDE, 284 VERTGUIDE, 300 TOPMARGIN, 7 - BOTTOMMARGIN, 227 + BOTTOMMARGIN, 254 END IDD_SEARCH, DIALOG diff --git a/protocols/Tox/src/resource.h b/protocols/Tox/src/resource.h index 044399e482..1b8a19fab3 100644 --- a/protocols/Tox/src/resource.h +++ b/protocols/Tox/src/resource.h @@ -24,11 +24,16 @@ #define IDC_SAVEPERMANENTLY 1013 #define IDC_NODESLIST 1014 #define IDC_ADDNODE 1015 -#define IDC_IPV4 1018 -#define IDC_IPV6 1019 -#define IDC_PORT 1020 -#define IDC_PKEY 1021 -#define IDC_IMPORT_PROFILE 1024 +#define IDC_IPV4 1016 +#define IDC_IPV6 1017 +#define IDC_PORT 1018 +#define IDC_PKEY 1019 +#define IDC_IMPORT_PROFILE 1020 +#define IDC_COMBO_AUDIOINPUT 1021 +#define IDC_COMBO_AUDIOOUTPUT 1022 +#define IDC_AUDIOFILTER 1023 +#define IDC_COMBO_VIDEOINPUT 1024 + // Next default values for new objects // -- cgit v1.2.3