Menu
▾
▴
[Iaxclient-cvs] iaxclient/simpleclient/WinIAX WinIAX.cpp,1.3,1.4 resource.h,1.1,1.2 resource.rc,1.1,1.2
|
From: <st...@us...> - 2003-07-26 01:45:20
|
Update of /cvsroot/iaxclient/iaxclient/simpleclient/WinIAX
In directory sc8-pr-cvs1:/tmp/cvs-serv13293
Modified Files:
WinIAX.cpp resource.h resource.rc
Log Message:
More changes from Tili.
Index: WinIAX.cpp
===================================================================
RCS file: /cvsroot/iaxclient/iaxclient/simpleclient/WinIAX/WinIAX.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- WinIAX.cpp 16 Jul 2003 14:41:48 -0000 1.3
+++ WinIAX.cpp 25 Jul 2003 23:02:18 -0000 1.4
@@ -2,12 +2,12 @@
//
#include "stdafx.h"
-#include "mmsystem.h"
+#include "mmsystem.h"
#include "winiax.h"
#include "resource.h"
#include "iaxclient.h"
#include "commctrl.h"
-#include "Commdlg.h"
+#include "Commdlg.h"
[...1344 lines suppressed...]
+ iaxc_set_audio_output(0); // unmute output
+ }
+}
+
+void SelectColor(COLORREF *clr)
+{
+ CHOOSECOLOR chlr;
+ static COLORREF clrCust[16];
+ ZeroMemory(&chlr,sizeof(CHOOSECOLOR));
+ chlr.lStructSize=sizeof(CHOOSECOLOR);
+ chlr.Flags=CC_FULLOPEN|CC_RGBINIT;
+ chlr.lpCustColors=clrCust;
+
+// chlr.rgbResult=*clr;
+ if(ChooseColor(&chlr))
+ {
+ *clr=chlr.rgbResult;
+ }
+}
+
Index: resource.h
===================================================================
RCS file: /cvsroot/iaxclient/iaxclient/simpleclient/WinIAX/resource.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- resource.h 13 Jun 2003 22:32:00 -0000 1.1
+++ resource.h 25 Jul 2003 23:02:18 -0000 1.2
@@ -3,6 +3,13 @@
// Used by resource.rc
//
#define IDD_MAIN_DLG 101
+#define IDD_DLG_REGISTER 102
+#define IDR_MENU1 103
+#define IDR_RING 104
+#define IDI_ICON2 108
+#define IDI_ICON1 108
+#define IDD_DLG_SOUND 109
+#define IDD_DLG_PREFERENCES 112
#define IDC_BN_DIAL 1000
#define IDC_E_IAX_URI 1001
#define IDC_BN_HANGUP 1002
@@ -21,14 +28,37 @@
#define IDC_BN_HASH 1023
#define IDC_PROG_OUTPUT 1024
#define IDC_PROG_INPUT 1025
+#define IDC_E_GATEWAY 1026
+#define IDC_E_USER 1027
+#define IDC_E_PASS 1028
+#define IDC_ST_GATEWAY 1029
+#define IDC_ST_USER_NAME 1030
+#define IDC_ST_PASSWORD 1031
+#define IDC_RD_LINE_1 1032
+#define IDC_RD_LINE_2 1033
+#define IDC_RD_LINE_3 1034
+#define IDC_ST_STATE 1035
+#define IDC_CMB_PLAYBACK 1036
+#define IDC_CMB_RECORDING 1037
+#define IDC_CMB_RINGTONE 1038
+#define IDC_CHK_PTT 1040
+#define IDC_CHK_SILENCE 1042
+#define IDC_BN_BG 1044
+#define IDC_BN_TEXT 1045
+#define IDC_ST_TXTCLR 1046
+#define IDC_ST_BGCLR 1047
+#define ID_FILE_REGISTER 40001
+#define ID_FILE_EXIT 40002
+#define ID_TOOLS_SOUNDSETTINGS 40003
+#define ID_TOOLS_PREFERENCES 40004
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 102
-#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1026
+#define _APS_NEXT_RESOURCE_VALUE 113
+#define _APS_NEXT_COMMAND_VALUE 40006
+#define _APS_NEXT_CONTROL_VALUE 1048
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
Index: resource.rc
===================================================================
RCS file: /cvsroot/iaxclient/iaxclient/simpleclient/WinIAX/resource.rc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- resource.rc 13 Jun 2003 22:32:00 -0000 1.1
+++ resource.rc 25 Jul 2003 23:02:18 -0000 1.2
@@ -54,30 +54,52 @@
IDD_MAIN_DLG DIALOG DISCARDABLE 0, 0, 234, 175
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Dialog"
+CAPTION "WinIAX Client"
FONT 8, "MS Sans Serif"
BEGIN
- PUSHBUTTON "Dial",IDC_BN_DIAL,67,34,50,14
+ DEFPUSHBUTTON "Dial",IDC_BN_DIAL,56,103,50,14
EDITTEXT IDC_E_IAX_URI,50,7,177,14,ES_AUTOHSCROLL
LTEXT "IAX URI:",IDC_STATIC,17,10,29,8
- PUSHBUTTON "Hangup",IDC_BN_HANGUP,117,34,50,14
- LTEXT "Welcome to WinIAX Client",IDC_ST_STATUS,7,143,220,25
- PUSHBUTTON "1",IDC_BN_1,90,58,17,14
- PUSHBUTTON "2",IDC_BN_2,108,58,17,14
- PUSHBUTTON "3",IDC_BN_3,126,58,17,14
- PUSHBUTTON "4",IDC_BN_4,90,72,17,14
- PUSHBUTTON "5",IDC_BN_5,108,72,17,14
- PUSHBUTTON "6",IDC_BN_6,126,72,17,14
- PUSHBUTTON "7",IDC_BN_7,90,86,17,14
- PUSHBUTTON "8",IDC_BN_8,108,86,17,14
- PUSHBUTTON "9",IDC_BN_9,126,86,17,14
- PUSHBUTTON "*",IDC_BN_ASTERISK,90,100,17,14
- PUSHBUTTON "0",IDC_BN_0,108,100,17,14
- PUSHBUTTON "#",IDC_BN_HASH,126,100,17,14
+ PUSHBUTTON "Hangup",IDC_BN_HANGUP,126,104,50,14
+ LTEXT "Welcome to WinIAX Client",IDC_ST_STATUS,7,124,220,9
+ PUSHBUTTON "1",IDC_BN_1,90,45,17,14
+ PUSHBUTTON "2",IDC_BN_2,108,45,17,14
+ PUSHBUTTON "3",IDC_BN_3,126,45,17,14
+ PUSHBUTTON "4",IDC_BN_4,90,59,17,14
+ PUSHBUTTON "5",IDC_BN_5,108,59,17,14
+ PUSHBUTTON "6",IDC_BN_6,126,59,17,14
+ PUSHBUTTON "7",IDC_BN_7,90,73,17,14
+ PUSHBUTTON "8",IDC_BN_8,108,73,17,14
+ PUSHBUTTON "9",IDC_BN_9,126,73,17,14
+ PUSHBUTTON "*",IDC_BN_ASTERISK,90,87,17,14
+ PUSHBUTTON "0",IDC_BN_0,108,87,17,14
+ PUSHBUTTON "#",IDC_BN_HASH,126,87,17,14
CONTROL "Progress1",IDC_PROG_OUTPUT,"msctls_progress32",
- PBS_VERTICAL | WS_BORDER,204,49,8,73
+ PBS_VERTICAL | WS_BORDER,204,30,8,73
CONTROL "Progress2",IDC_PROG_INPUT,"msctls_progress32",
- PBS_VERTICAL | WS_BORDER,219,49,8,73
+ PBS_VERTICAL | WS_BORDER,219,30,8,73
+ CONTROL "Line 1",IDC_RD_LINE_1,"Button",BS_AUTORADIOBUTTON,47,31,
+ 35,10
+ CONTROL "Line 2",IDC_RD_LINE_2,"Button",BS_AUTORADIOBUTTON,99,31,
+ 35,10
+ CONTROL "Line 3",IDC_RD_LINE_3,"Button",BS_AUTORADIOBUTTON,151,
+ 31,35,10
+ LTEXT "State",IDC_ST_STATE,7,151,175,17
+END
+
+IDD_DLG_REGISTER DIALOG DISCARDABLE 0, 0, 286, 98
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Registration info"
+FONT 8, "MS Sans Serif"
+BEGIN
+ DEFPUSHBUTTON "OK",IDOK,65,77,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,149,77,50,14
+ EDITTEXT IDC_E_GATEWAY,59,52,210,14,ES_AUTOHSCROLL
+ LTEXT "IAX Server",IDC_ST_GATEWAY,21,54,35,8
+ EDITTEXT IDC_E_USER,59,10,111,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_E_PASS,59,31,111,14,ES_AUTOHSCROLL
+ LTEXT "Password",IDC_ST_PASSWORD,24,37,32,8
+ LTEXT "User",IDC_ST_USER_NAME,40,16,16,8
END
@@ -96,10 +118,152 @@
TOPMARGIN, 7
BOTTOMMARGIN, 168
END
+
+ IDD_DLG_REGISTER, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 279
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 91
+ END
END
#endif // APSTUDIO_INVOKED
#endif // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Dutch (Netherlands) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NLD)
+#ifdef _WIN32
+LANGUAGE LANG_DUTCH, SUBLANG_DUTCH
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Menu
+//
+
+IDR_MENU1 MENU DISCARDABLE
+BEGIN
+ POPUP "&File"
+ BEGIN
+ MENUITEM "&Register", ID_FILE_REGISTER
+ MENUITEM "E&xit", ID_FILE_EXIT
+ END
+ POPUP "&Tools"
+ BEGIN
+ MENUITEM "Sound Settings", ID_TOOLS_SOUNDSETTINGS
+ MENUITEM "Preferences", ID_TOOLS_PREFERENCES
+ END
+END
+
+#endif // Dutch (Netherlands) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.K.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_DLG_SOUND DIALOG DISCARDABLE 0, 0, 249, 129
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Sound Device Configuration"
+FONT 8, "MS Sans Serif"
+BEGIN
+ DEFPUSHBUTTON "Save",IDOK,72,108,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,127,108,50,14
+ LTEXT "Sound Playback:",IDC_STATIC,7,27,55,8
+ LTEXT "Sound Recording:",IDC_STATIC,7,52,58,8
+ LTEXT "Ring Tone Device:",IDC_STATIC,7,77,61,8
+ COMBOBOX IDC_CMB_PLAYBACK,71,28,171,38,CBS_DROPDOWN | WS_VSCROLL |
+ WS_TABSTOP
+ COMBOBOX IDC_CMB_RECORDING,71,51,171,42,CBS_DROPDOWN | WS_VSCROLL |
+ WS_TABSTOP
+ COMBOBOX IDC_CMB_RINGTONE,71,74,171,38,CBS_DROPDOWN | WS_VSCROLL |
+ WS_TABSTOP
+END
+
+IDD_DLG_PREFERENCES DIALOG DISCARDABLE 0, 0, 261, 135
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Dialog"
+FONT 8, "MS Sans Serif"
+BEGIN
+ DEFPUSHBUTTON "&Save",IDOK,74,114,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,134,114,50,14
+ CONTROL "Enable push to talk.",IDC_CHK_PTT,"Button",
+ BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,7,7,247,10
+ LTEXT "Your voice will be recorded and sent over network when you have \n Ctrl key pressed. ",
+ IDC_STATIC,7,17,264,17
+ CONTROL "Enable Silence Filter",IDC_CHK_SILENCE,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,7,40,80,10
+ LTEXT "This will automatically recognize when you are silent and will send voice data \nover internet according to that.",
+ IDC_STATIC,7,51,247,18
+ LTEXT "",IDC_ST_BGCLR,80,83,22,14,NOT WS_VISIBLE
+ PUSHBUTTON "Background",IDC_BN_BG,21,83,50,14,NOT WS_VISIBLE
+ PUSHBUTTON "Text",IDC_BN_TEXT,135,83,50,14,NOT WS_VISIBLE
+ LTEXT "",IDC_ST_TXTCLR,195,83,22,14,NOT WS_VISIBLE
+ GROUPBOX "Window Color Settings",IDC_STATIC,7,74,247,36,NOT
+ WS_VISIBLE
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE
+BEGIN
+ IDD_DLG_SOUND, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 242
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 122
+ END
+
+ IDD_DLG_PREFERENCES, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 254
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 128
+ END
+END
+#endif // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON1 ICON DISCARDABLE "icon1.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// 24
+//
+
+1 24 DISCARDABLE "default1.bin"
+#endif // English (U.K.) resources
/////////////////////////////////////////////////////////////////////////////
|
