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

1 files changed, 13 insertions, 5 deletions

diff --git a/protocols/Tox/src/resource.h b/protocols/Tox/src/resource.h
index 5ffc062970..6bb9ffc284 100644
--- a/protocols/Tox/src/resource.h
+++ b/protocols/Tox/src/resource.h
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}

 // Microsoft Visual C++ generated include file.

-// Used by e:\Projects\C++\MirandaNG\protocols\Tox\res\resource.rc

+// Used by D:\Projects\MirandaNG\protocols\Tox\res\resource.rc

 //

 #define IDI_TOX                         100

 #define IDD_USER_INFO                   101

@@ -11,25 +11,29 @@
 #define IDD_OPTIONS_NODES               107

 #define IDD_ADDNODE                     108

 #define IDD_NODE_EDITOR                 109

-#define IDI_AUDIO_CALL                  109

-#define IDD_OPTIONS_AV                  110

-#define IDD_AUDIO                       111

+#define IDD_OPTIONS_MULTIMEDIA          110

+#define IDD_CALL                        111

 #define IDI_AUDIO_END                   112

 #define IDI_AUDIO_RING                  113

-#define IDI_ICON3                       114

 #define IDI_AUDIO_START                 114

+#define IDI_AUDIO_CALL                  115

 #define IDD_CHATROOM_INVITE             172

 #define IDC_CCLIST                      173

 #define IDC_EDITSCR                     174

+#define IDD_CALL_RECEIVE                175

+#define IDD_CALL_SEND                   176

 #define IDC_TOXID                       1001

 #define IDC_CLIPBOARD                   1002

 #define IDC_SEARCH                      1003

 #define IDC_PASSWORD                    1004

 #define IDC_NAME                        1005

+#define IDC_FROM                        1005

 #define IDC_GROUP                       1006

+#define IDC_DATE                        1006

 #define IDC_ENABLE_UDP                  1007

 #define IDC_ENABLE_IPV6                 1008

 #define IDC_PROFILE_EXPORT              1009

+#define IDC_NAME2                       1009

 #define IDC_DNS_ID                      1010

 #define IDC_PROFILE_NEW                 1011

 #define IDC_SAVEPERMANENT               1012

@@ -47,6 +51,10 @@
 #define IDC_AUDIOOUTPUT                 1022

 #define IDC_AUDIOFILTER                 1023

 #define IDC_COMBO_VIDEOINPUT            1024

+#define IDC_DETAILS                     1069

+#define IDC_USERMENU                    1071

+#define IDC_HISTORY                     1080

+#define IDC_PROTOCOL                    1580

 

 // Next default values for new objects

 //