diff --git a/engine/Client.cpp b/engine/Client.cpp index 6f6fe123..5f0dd0f7 100644 --- a/engine/Client.cpp +++ b/engine/Client.cpp @@ -22,6 +22,7 @@ #include "yatecbase.h" +#include "yateversn.h" #include @@ -424,7 +425,7 @@ void Client::run() initWindows(); initClient(); updateFrom(0); - setStatus(""); + setStatus(Engine::config().getValue("client","greeting","Yate " YATE_VERSION " " YATE_RELEASE)); m_initialized = true; msg.setParam("event","init"); Engine::dispatch(msg); @@ -1048,10 +1049,13 @@ bool Client::action(Window* wnd, const String& name) String target; Window* win = (wnd && hasElement("callto",wnd)) ? wnd : 0; if (getText("callto",target)) { - target += name.at(6); - if (setText("callto",target,win)) { - setFocus("callto",false,win); - return true; + String digits = name.at(6); + if (isE164(digits)) { + target += digits; + if (setText("callto",target,win)) { + setFocus("callto",false,win); + return true; + } } } } diff --git a/modules/help/0.yhlp b/modules/help/0.yhlp index c9917427..11f767c4 100644 --- a/modules/help/0.yhlp +++ b/modules/help/0.yhlp @@ -1,12 +1,18 @@ -Yate Help Contents +Help Contents Yate is a next-generation telephony engine; while currently focused on Voice over Internet - Protocol (VoIP) and PSTN, its power lies in - its ability to be easily extended. +Protocol (VoIP) and PSTN, its power lies in its +ability to be easily extended. + Voice, video, data and instant messaging can - all be unified under Yate's flexible routing - engine, maximizing communications efficiency - and minimizing infrastructure costs for - businesses. +all be unified under Yate's flexible routing +engine, maximizing communications efficiency +and minimizing infrastructure costs for +businesses. + +What you see now is the Client component of +Yate, a skinnable soft phone that uses the same +proved engine and protocol drivers as the server +version. diff --git a/modules/help/1.yhlp b/modules/help/1.yhlp index c6b9647a..13f7ae6a 100644 --- a/modules/help/1.yhlp +++ b/modules/help/1.yhlp @@ -1,4 +1,18 @@ -Yate Help Page 1 +Main Window -Page 1 text here +Click on the left side tabs to select the panel +with the functions you need: + - Calls contains tools to create and control a + call and also a keypad to enter numbers and + in-call navigation keys. + - Received contains a log of incoming calls, + answered or missed. + - Dialed contains a log of outgoing (placed) + calls. + - Contacts allows associating names to phone + numbers. + - Accounts creates and modifies any accounts + you may have with IP telephony providers. + - Settings to make changes to some global + attributes of the program. diff --git a/modules/help/2.yhlp b/modules/help/2.yhlp new file mode 100644 index 00000000..8935e946 --- /dev/null +++ b/modules/help/2.yhlp @@ -0,0 +1,13 @@ +Address Book + +The Contact window creates or changes +individual contact addresses. + +Each contact has a descriptive name that gets +displayed and a phone number used to place +new phone calls. + +You can create new contacts by hand or by using +the Contact button in either Received or +Dialed log panel. + diff --git a/modules/help/3.yhlp b/modules/help/3.yhlp new file mode 100644 index 00000000..432e7422 --- /dev/null +++ b/modules/help/3.yhlp @@ -0,0 +1,18 @@ +Account Setup + +You can set up or modify settings for accounts +you have with IP telephony providers or other +VoIP networks. + +You have to provide an unique Account name +that will identify the account when making calls. +The Username and Password are +credentials used to authenticate with the server. + +Specific provider settings can be applied from a +template file. These will not change the user +specific settings described above. + +It is also possible to set manually the protocol +and server details in the right hand column. + diff --git a/modules/help/4.yhlp b/modules/help/4.yhlp new file mode 100644 index 00000000..9275f0ba --- /dev/null +++ b/modules/help/4.yhlp @@ -0,0 +1,11 @@ +Help on Help + +Yate's help is just a quick source of information. +Help pages can be browsed by using the buttons +at the bottom of this window. + +In any Yate window you can press the F1 key +to get information specific to that window. + +For more details please visit http://yate.null.ro/ + diff --git a/modules/skin/tabbed/gtk2client.rc b/modules/skin/tabbed/gtk2client.rc index 72c39c9e..0024c2ae 100644 --- a/modules/skin/tabbed/gtk2client.rc +++ b/modules/skin/tabbed/gtk2client.rc @@ -61,11 +61,21 @@ binding "help_p2" { bind "F1" { "user-action" ("help_show:2") } } +binding "help_p3" { + bind "F1" { "user-action" ("help_show:3") } +} + +binding "help_help" { + bind "F1" { "user-action" ("help_show:4") } +} + widget "gtk-tooltips" style "tips" widget "gtk-tooltips*GtkLabel" style "tips" -widget "addrbook" binding "help_p1" -widget "account" binding "help_p2" +widget "tabbedwin" binding "help_p1" +widget "addrbook" binding "help_p2" +widget "account" binding "help_p3" +widget "help" binding "help_help" class "GtkWindow" binding "help_main" class "GtkWindow" style "window" class "GtkWidget" style "window" diff --git a/modules/skin/tabbed/gtk2client.ui b/modules/skin/tabbed/gtk2client.ui index 12cc0f0d..d9911325 100644 --- a/modules/skin/tabbed/gtk2client.ui +++ b/modules/skin/tabbed/gtk2client.ui @@ -12,16 +12,18 @@ tabbed=2,,,,> property:bool:homogeneous=yes tabname="phone.png" Calls vbox=> - property:int:border-width=2 + property:int:border-width=4 hbox=> vbox=,,,,> label=,,,,Protocol - option=2,,100,,protocol,--,sip,h323,iax + option=2,,128,,protocol,--,sip,h323,iax + tooltip=VoIP protocol used to make direct call leave=< label=1,,,, vbox=,,,,> label=,,,,Account - option=2,,100,,account,-- + option=2,,128,,account,-- + tooltip=Account used to call through a server leave=< leave=< label=,,,,Call address or number @@ -29,11 +31,24 @@ tabbed=2,,,,> combo=2,,,,callto, toggle=,,32,,display:keypad,K property:bool:active=yes - tooltip=Show/hide keypad + tooltip=Show or hide the Keypad leave=< hbox=,,,,keypad,> vbox=1,,,,> leave=< + vbox=,,,,> + button=2,,32,,digit:A,A + tooltip=Special tone A + button=2,,32,,digit:B,B + tooltip=Special tone B + button=2,,32,,digit:C,C + tooltip=Special tone C + button=2,,32,,digit:D,D + tooltip=Special tone D + leave=< + vbox=,,,,> + property:int:border-width=2 + leave=< vbox=,,,,> button=2,,32,,digit:1,1 button=2,,32,,digit:4,4 @@ -52,18 +67,15 @@ tabbed=2,,,,> button=2,,32,,digit:9,9 button=2,,32,,digit:#,# leave=< + vbox=,,,,> + property:int:border-width=2 + leave=< vbox=,,,,> button=2,,32,,back:callto,< tooltip=Delete last digit entered button=2,,32,,clear:callto,C tooltip=Clear entire number leave=< -; vbox=,,,,> -; button=2,,32,,digit:A,A -; button=2,,32,,digit:B,B -; button=2,,32,,digit:C,C -; button=2,,32,,digit:D,D -; leave=< vbox=1,,,,> leave=< leave=< @@ -100,8 +112,11 @@ tabbed=2,,,,> property:int:border-width=2 label=1,,,, button=,,68,30,log_in_call,Call + tooltip=Call back this number button=,,68,30,log_in_clear,Clear + tooltip=Clear all incoming calls log button=,,68,30,log_in_contact,Contact + tooltip=Turn the number into a contact leave= property:int:border-width=2 label=1,,,, button=,,68,30,log_out_call,Call + tooltip=Call again this number button=,,68,30,log_out_clear,Clear + tooltip=Clear all outgoing calls log button=,,68,30,log_out_contact,Contact + tooltip=Turn the number into a contact leave= property:int:border-width=2 label=1,,,, button=,,68,30,abk_call,Call + tooltip=Call this contact button=,,68,30,abk_new,New... + tooltip=Create new contact button=,,68,30,abk_del,Delete + tooltip=Delete this contact button=,,68,30,abk_edit,Edit + tooltip=Edit this contact leave= hbox=> property:int:border-width=2 label=1,,,, - button=,,68,30,acc_new,Add... + button=,,68,30,acc_new,New... + tooltip=Create new account button=,,68,30,acc_del,Delete + tooltip=Delete this account button=,,68,30,acc_edit,Modify + tooltip=Edit this account leave= property:int:xpad=4 property:align:yalign=50 check=,,,,help,? - accelerator=F1 tooltip=Show or hide the Help window leave=< @@ -205,47 +229,6 @@ tooltip=Show/hide Settings window toggle=303,84,58,30,channels, tooltip=Show/hide Channels window -[default] -enabled=no -title=Yate Client -master=yes -layout=fixed -width=350 -height=135 -boxed=0,0,350,,caption,> - hbox=,,0,-1 - label=10,5,100,20,title, -; check=,,20,20,channels, - button_icon=,,20,20,decoration, - button_hide=,,20,20,decoration, - leave=< -leave=< -label=12,30,80,20,Protocol -option=10,48,80,30,protocol,--,sip,h323,iax -label=95,30,160,20,Call address or number -combo=95,50,160,26,callto, -label=262,30,80,20,Account -option=260,48,80,30,account,-- -button=85,85,85,28,call,Call -button=180,85,85,28,hangup,Hangup -label=10,115,200,20,status,Initializing... -;toggle=135,5,20,20,browser, -;toggle=155,5,20,20,tools, -;toggle=5,78,,,settings,"stock_preferences_24.png" Settings -toggle=5,85,75,28,settings,Settings -tooltip=Show/hide Settings window -toggle=270,85,75,28,channels,Channels -tooltip=Show/hide Channels window - -[tools] -enabled=no -title=Tools -label=Tools Window -check=160,5,20,20,ctest,Test -button_hide=0,0,20,20,decoration, -x=608 -y=314 - [browser] enabled=no visible=no @@ -259,9 +242,7 @@ vbox=> button_max=,,20,20,decoration, button_hide=,,20,20,decoration, leave=< - mozilla=1,1,300,400,browser,file:///usr/src/yate/docs/api/index.html -;http://diana.null.ro/saymore/test.html -;file:///usr/share/gtk-doc/html/gtk/GtkWidget.html#gtk-widget-set-size-request + mozilla=1,1,300,400,browser,about:blank editor=,1,200,22,callto, hbox=,,0,-1 button=1,,100,30,call,Call @@ -275,7 +256,7 @@ y=40 [incoming] enabled=no -popup=on +popup=yes title=Incoming Call layout=framed vbox=> @@ -327,13 +308,16 @@ vbox=> tabname=Accounts vbox=> framed=> - list=,,,100,accounts,Acc1,Acc2 + list=,,,100,accounts, leave=< hbox=> property:int:border-width=2 - button=1,,75,30,acc_new,Add... + button=1,,75,30,acc_new,New... + tooltip=Create new account button=1,,75,30,acc_del,Delete + tooltip=Delete this account button=1,,75,30,acc_edit,Modify + tooltip=Edit this account leave= hbox=> property:int:border-width=2 button=1,,75,30,acc_accept,OK + tooltip=Update the account data button_hide=1,,75,30,Cancel + tooltip=Exit abandoning changes leave= hbox=> property:int:border-width=2 button=1,,75,30,abk_accept,OK + tooltip=Update the contact data button_hide=1,,75,30,Cancel + tooltip=Exit abandoning changes leave= property:int:border-width=2 button=1,,75,30,help_prev,Prev + tooltip=Go to previous help page button=1,,75,30,help_home,Home + tooltip=Go to the main help page button=1,,75,30,help_next,Next + tooltip=Go to next help page button_hide=1,,75,30,Close + tooltip=Close the help viewer leave=