Make echo application the default dialplan

diff --git a/src/ipypbx/controllers.py b/src/ipypbx/controllers.py
index 78d046a..c4e962e 100644 (file)
--- a/src/ipypbx/controllers.py
+++ b/src/ipypbx/controllers.py
@@ -387,3 +387,8 @@ class ExtensionController(ConnectionChangeListenerController):
         ('domain_id', 'Domain ID', 'domain', 'host_name'),
         ('endpoint_id', 'Endpoint ID', 'endpoint', 'user_id'))
         
+    def objectAdded(self, row, record):
+        record.setValue(
+            'xml_dialplan', '<action application="echo" data=""/>')
+        super(ExtensionController, self).objectAdded(row, record)
+        

diff --git a/src/ipypbx/http.py b/src/ipypbx/http.py
index 4de39d5..cc022cc 100644 (file)
--- a/src/ipypbx/http.py
+++ b/src/ipypbx/http.py
@@ -126,7 +126,6 @@ class HttpRequestParser(object):
         """
         for state in self.HTTP_STATES:
             if getattr(self, 'HTTP_%s' % state) == self.state:
-                print self.state, line
                 getattr(self, 'handle%s' % state.title())(line)
                 break
         else:

diff --git a/src/ipypbx/locale/ipypbx_fi.po b/src/ipypbx/locale/ipypbx_fi.po
index e0b500c..8beaabf 100644 (file)
--- a/src/ipypbx/locale/ipypbx_fi.po
+++ b/src/ipypbx/locale/ipypbx_fi.po
@@ -10,265 +10,265 @@ msgstr ""
 "X-Language: fi_FI\n"
 
 #. ts-context MainWindow
-#: src/ipypbx/ui.py:432
+#: src/ipypbx/ui.py:435
 #, fuzzy
 msgid "IPyPBX"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:338
+#: src/ipypbx/controllers.py:339
 #, fuzzy
 msgid "Name"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:198
+#: src/ipypbx/controllers.py:206
 #, fuzzy
 msgid "Local Port"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:198
+#: src/ipypbx/controllers.py:206
 #, fuzzy
 msgid "Freeswitch Port"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:198
+#: src/ipypbx/controllers.py:206
 #, fuzzy
 msgid "Freeswitch IP Address"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/ui.py:482
+#: src/ipypbx/ui.py:485
 #, fuzzy
 msgid "Add"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/ui.py:483
+#: src/ipypbx/ui.py:486
 #, fuzzy
 msgid "Save"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/ui.py:440
+#: src/ipypbx/ui.py:443
 #, fuzzy
 msgid "Connections"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:305
+#: src/ipypbx/controllers.py:306
 #, fuzzy
 msgid "External RTP IP"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:305
+#: src/ipypbx/controllers.py:306
 #, fuzzy
 msgid "External SIP IP"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:305
+#: src/ipypbx/controllers.py:306
 #, fuzzy
 msgid "RTP IP"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:305
+#: src/ipypbx/controllers.py:306
 #, fuzzy
 msgid "SIP IP"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:305
+#: src/ipypbx/controllers.py:306
 #, fuzzy
 msgid "SIP Port"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:305
+#: src/ipypbx/controllers.py:306
 #, fuzzy
 msgid "Accept Blind Registration"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:375
+#: src/ipypbx/controllers.py:376
 #, fuzzy
 msgid "Authenticate Calls"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:375
+#: src/ipypbx/controllers.py:376
 #, fuzzy
 msgid "Is Active"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/ui.py:452
+#: src/ipypbx/ui.py:455
 #, fuzzy
 msgid "SIP Profiles"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:324
+#: src/ipypbx/controllers.py:325
 #, fuzzy
 msgid "Host Name"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/ui.py:465
+#: src/ipypbx/ui.py:468
 #, fuzzy
 msgid "SIP Profile"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/ui.py:458
+#: src/ipypbx/ui.py:461
 #, fuzzy
 msgid "Domains"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:338
+#: src/ipypbx/controllers.py:339
 #, fuzzy
 msgid "Username"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:360
+#: src/ipypbx/controllers.py:361
 #, fuzzy
 msgid "Password"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:338
+#: src/ipypbx/controllers.py:339
 #, fuzzy
 msgid "Realm"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:338
+#: src/ipypbx/controllers.py:339
 #, fuzzy
 msgid "From Domain"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:338
+#: src/ipypbx/controllers.py:339
 #, fuzzy
 msgid "Expire In Seconds"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:338
+#: src/ipypbx/controllers.py:339
 #, fuzzy
 msgid "Retry In Seconds"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/ui.py:470
+#: src/ipypbx/ui.py:473
 #, fuzzy
 msgid "Caller ID In \"From\" Field"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/ui.py:474
+#: src/ipypbx/ui.py:477
 #, fuzzy
 msgid "Gateways"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:360
+#: src/ipypbx/controllers.py:361
 #, fuzzy
 msgid "User ID"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/ui.py:486
+#: src/ipypbx/ui.py:489
 #, fuzzy
 msgid "Domain"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/ui.py:481
+#: src/ipypbx/ui.py:484
 #, fuzzy
 msgid "Endpoints"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:375
+#: src/ipypbx/controllers.py:376
 #, fuzzy
 msgid "XML Dialplan"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:375
+#: src/ipypbx/controllers.py:376
 #, fuzzy
 msgid "Destination Match"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/ui.py:487
+#: src/ipypbx/ui.py:490
 #, fuzzy
 msgid "Endpoint"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/ui.py:490
+#: src/ipypbx/ui.py:493
 #, fuzzy
 msgid "Extensions"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:375
+#: src/ipypbx/controllers.py:376
 #, fuzzy
 msgid "ID"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:198
+#: src/ipypbx/controllers.py:206
 #, fuzzy
 msgid "Local IP Address"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:375
+#: src/ipypbx/controllers.py:376
 #, fuzzy
 msgid "Connection ID"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:338
+#: src/ipypbx/controllers.py:339
 #, fuzzy
 msgid "SIP Profile ID"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:338
+#: src/ipypbx/controllers.py:339
 #, fuzzy
 msgid "Caller ID In From Field"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:375
+#: src/ipypbx/controllers.py:376
 #, fuzzy
 msgid "Domain ID"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:375
+#: src/ipypbx/controllers.py:376
 #, fuzzy
 msgid "Endpoint ID"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:338
+#: src/ipypbx/controllers.py:339
 #, fuzzy
 msgid "Extension"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/ui.py:473
+#: src/ipypbx/ui.py:476
 #, fuzzy
 msgid "3600"
 msgstr ""

diff --git a/src/ipypbx/locale/ipypbx_fi.ts b/src/ipypbx/locale/ipypbx_fi.ts
index 5a8c2a8..6c130e5 100644 (file)
--- a/src/ipypbx/locale/ipypbx_fi.ts
+++ b/src/ipypbx/locale/ipypbx_fi.ts
@@ -3,222 +3,222 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/ipypbx/ui.py" line="432"/>
+        <location filename="src/ipypbx/ui.py" line="435"/>
         <source>IPyPBX</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="338"/>
+        <location filename="src/ipypbx/controllers.py" line="339"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="198"/>
+        <location filename="src/ipypbx/controllers.py" line="206"/>
         <source>Local Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="198"/>
+        <location filename="src/ipypbx/controllers.py" line="206"/>
         <source>Freeswitch Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="198"/>
+        <location filename="src/ipypbx/controllers.py" line="206"/>
         <source>Freeswitch IP Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/ui.py" line="482"/>
+        <location filename="src/ipypbx/ui.py" line="485"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/ui.py" line="483"/>
+        <location filename="src/ipypbx/ui.py" line="486"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/ui.py" line="440"/>
+        <location filename="src/ipypbx/ui.py" line="443"/>
         <source>Connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="305"/>
+        <location filename="src/ipypbx/controllers.py" line="306"/>
         <source>External RTP IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="305"/>
+        <location filename="src/ipypbx/controllers.py" line="306"/>
         <source>External SIP IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="305"/>
+        <location filename="src/ipypbx/controllers.py" line="306"/>
         <source>RTP IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="305"/>
+        <location filename="src/ipypbx/controllers.py" line="306"/>
         <source>SIP IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="305"/>
+        <location filename="src/ipypbx/controllers.py" line="306"/>
         <source>SIP Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="305"/>
+        <location filename="src/ipypbx/controllers.py" line="306"/>
         <source>Accept Blind Registration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="375"/>
+        <location filename="src/ipypbx/controllers.py" line="376"/>
         <source>Authenticate Calls</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="375"/>
+        <location filename="src/ipypbx/controllers.py" line="376"/>
         <source>Is Active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/ui.py" line="452"/>
+        <location filename="src/ipypbx/ui.py" line="455"/>
         <source>SIP Profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="324"/>
+        <location filename="src/ipypbx/controllers.py" line="325"/>
         <source>Host Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/ui.py" line="465"/>
+        <location filename="src/ipypbx/ui.py" line="468"/>
         <source>SIP Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/ui.py" line="458"/>
+        <location filename="src/ipypbx/ui.py" line="461"/>
         <source>Domains</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="338"/>
+        <location filename="src/ipypbx/controllers.py" line="339"/>
         <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="360"/>
+        <location filename="src/ipypbx/controllers.py" line="361"/>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="338"/>
+        <location filename="src/ipypbx/controllers.py" line="339"/>
         <source>Realm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="338"/>
+        <location filename="src/ipypbx/controllers.py" line="339"/>
         <source>From Domain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="338"/>
+        <location filename="src/ipypbx/controllers.py" line="339"/>
         <source>Expire In Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="338"/>
+        <location filename="src/ipypbx/controllers.py" line="339"/>
         <source>Retry In Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/ui.py" line="470"/>
+        <location filename="src/ipypbx/ui.py" line="473"/>
         <source>Caller ID In &quot;From&quot; Field</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/ui.py" line="474"/>
+        <location filename="src/ipypbx/ui.py" line="477"/>
         <source>Gateways</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="360"/>
+        <location filename="src/ipypbx/controllers.py" line="361"/>
         <source>User ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/ui.py" line="486"/>
+        <location filename="src/ipypbx/ui.py" line="489"/>
         <source>Domain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/ui.py" line="481"/>
+        <location filename="src/ipypbx/ui.py" line="484"/>
         <source>Endpoints</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="375"/>
+        <location filename="src/ipypbx/controllers.py" line="376"/>
         <source>XML Dialplan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="375"/>
+        <location filename="src/ipypbx/controllers.py" line="376"/>
         <source>Destination Match</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/ui.py" line="487"/>
+        <location filename="src/ipypbx/ui.py" line="490"/>
         <source>Endpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/ui.py" line="490"/>
+        <location filename="src/ipypbx/ui.py" line="493"/>
         <source>Extensions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="375"/>
+        <location filename="src/ipypbx/controllers.py" line="376"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="198"/>
+        <location filename="src/ipypbx/controllers.py" line="206"/>
         <source>Local IP Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="375"/>
+        <location filename="src/ipypbx/controllers.py" line="376"/>
         <source>Connection ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="338"/>
+        <location filename="src/ipypbx/controllers.py" line="339"/>
         <source>SIP Profile ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="338"/>
+        <location filename="src/ipypbx/controllers.py" line="339"/>
         <source>Caller ID In From Field</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="375"/>
+        <location filename="src/ipypbx/controllers.py" line="376"/>
         <source>Domain ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="375"/>
+        <location filename="src/ipypbx/controllers.py" line="376"/>
         <source>Endpoint ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="338"/>
+        <location filename="src/ipypbx/controllers.py" line="339"/>
         <source>Extension</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/ui.py" line="473"/>
+        <location filename="src/ipypbx/ui.py" line="476"/>
         <source>3600</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/src/ipypbx/locale/ipypbx_ru.po b/src/ipypbx/locale/ipypbx_ru.po
index 2bbffe0..5c2cd0c 100644 (file)
--- a/src/ipypbx/locale/ipypbx_ru.po
+++ b/src/ipypbx/locale/ipypbx_ru.po
@@ -10,22 +10,22 @@ msgstr ""
 "X-Language: ru_RU\n"
 
 #. ts-context MainWindow
-#: src/ipypbx/ui.py:432
+#: src/ipypbx/ui.py:435
 msgid "IPyPBX"
 msgstr "IPyPBX"
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:338
+#: src/ipypbx/controllers.py:339
 msgid "Name"
 msgstr "Имя"
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:198
+#: src/ipypbx/controllers.py:206
 msgid "Local Port"
 msgstr "Локальный порт"
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:198
+#: src/ipypbx/controllers.py:206
 msgid "Freeswitch Port"
 msgstr "Порт Freeswitch"
 
@@ -35,203 +35,203 @@ msgstr "Порт Freeswitch"
 #~ msgstr "Локальный IP-адрес"
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:198
+#: src/ipypbx/controllers.py:206
 msgid "Freeswitch IP Address"
 msgstr "IP-адрес Freeswitch"
 
 #. ts-context MainWindow
-#: src/ipypbx/ui.py:482
+#: src/ipypbx/ui.py:485
 msgid "Add"
 msgstr "Добавить"
 
 #. ts-context MainWindow
-#: src/ipypbx/ui.py:483
+#: src/ipypbx/ui.py:486
 msgid "Save"
 msgstr "Сохранить"
 
 #. ts-context MainWindow
-#: src/ipypbx/ui.py:440
+#: src/ipypbx/ui.py:443
 msgid "Connections"
 msgstr "Подключения"
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:305
+#: src/ipypbx/controllers.py:306
 msgid "External RTP IP"
 msgstr "Внешний RTP IP"
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:305
+#: src/ipypbx/controllers.py:306
 msgid "External SIP IP"
 msgstr "Внешний SIP IP"
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:305
+#: src/ipypbx/controllers.py:306
 msgid "RTP IP"
 msgstr "RTP IP"
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:305
+#: src/ipypbx/controllers.py:306
 msgid "SIP IP"
 msgstr "SIP IP"
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:305
+#: src/ipypbx/controllers.py:306
 msgid "SIP Port"
 msgstr "Порт SIP"
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:305
+#: src/ipypbx/controllers.py:306
 msgid "Accept Blind Registration"
 msgstr "Безусловная регистрация"
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:375
+#: src/ipypbx/controllers.py:376
 msgid "Authenticate Calls"
 msgstr "Аутентифицировать звонки"
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:375
+#: src/ipypbx/controllers.py:376
 msgid "Is Active"
 msgstr "Активен"
 
 #. ts-context MainWindow
-#: src/ipypbx/ui.py:452
+#: src/ipypbx/ui.py:455
 msgid "SIP Profiles"
 msgstr "Профили SIP"
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:324
+#: src/ipypbx/controllers.py:325
 msgid "Host Name"
 msgstr "Имя хоста"
 
 #. ts-context MainWindow
-#: src/ipypbx/ui.py:465
+#: src/ipypbx/ui.py:468
 msgid "SIP Profile"
 msgstr "Профиль SIP"
 
 #. ts-context MainWindow
-#: src/ipypbx/ui.py:458
+#: src/ipypbx/ui.py:461
 msgid "Domains"
 msgstr "Домены"
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:338
+#: src/ipypbx/controllers.py:339
 msgid "Username"
 msgstr "Имя пользователя"
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:360
+#: src/ipypbx/controllers.py:361
 msgid "Password"
 msgstr "Пароль"
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:338
+#: src/ipypbx/controllers.py:339
 msgid "Realm"
 msgstr "Realm"
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:338
+#: src/ipypbx/controllers.py:339
 msgid "From Domain"
 msgstr "Домен в поле \"From\""
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:338
+#: src/ipypbx/controllers.py:339
 msgid "Expire In Seconds"
 msgstr "Время регистрации в секундах"
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:338
+#: src/ipypbx/controllers.py:339
 msgid "Retry In Seconds"
 msgstr "Время повтора в секундах"
 
 #. ts-context MainWindow
-#: src/ipypbx/ui.py:470
+#: src/ipypbx/ui.py:473
 msgid "Caller ID In \"From\" Field"
 msgstr "Имя абонента в поле \"From\""
 
 #. ts-context MainWindow
-#: src/ipypbx/ui.py:474
+#: src/ipypbx/ui.py:477
 msgid "Gateways"
 msgstr "Сетевой шлюз"
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:360
+#: src/ipypbx/controllers.py:361
 msgid "User ID"
 msgstr "Идентификатор пользователя"
 
 #. ts-context MainWindow
-#: src/ipypbx/ui.py:486
+#: src/ipypbx/ui.py:489
 msgid "Domain"
 msgstr "Домен"
 
 #. ts-context MainWindow
-#: src/ipypbx/ui.py:481
+#: src/ipypbx/ui.py:484
 msgid "Endpoints"
 msgstr "Конечное оборудование"
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:375
+#: src/ipypbx/controllers.py:376
 msgid "XML Dialplan"
 msgstr "План нумерации XML"
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:375
+#: src/ipypbx/controllers.py:376
 msgid "Destination Match"
 msgstr "Совпадение направления"
 
 #. ts-context MainWindow
-#: src/ipypbx/ui.py:487
+#: src/ipypbx/ui.py:490
 msgid "Endpoint"
 msgstr "Конечное оборудование"
 
 #. ts-context MainWindow
-#: src/ipypbx/ui.py:490
+#: src/ipypbx/ui.py:493
 msgid "Extensions"
 msgstr "Номера"
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:375
+#: src/ipypbx/controllers.py:376
 msgid "ID"
 msgstr "Идентификатор"
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:198
+#: src/ipypbx/controllers.py:206
 msgid "Local IP Address"
 msgstr "Локальный IP-адрес"
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:375
+#: src/ipypbx/controllers.py:376
 msgid "Connection ID"
 msgstr "Идентификатор соединения"
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:338
+#: src/ipypbx/controllers.py:339
 msgid "SIP Profile ID"
 msgstr "Идентификатор SIP-профиля"
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:338
+#: src/ipypbx/controllers.py:339
 msgid "Caller ID In From Field"
 msgstr "Идентификатор вызывающего абонента в поле \"От\""
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:375
+#: src/ipypbx/controllers.py:376
 msgid "Domain ID"
 msgstr "Идентификатор домена"
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:375
+#: src/ipypbx/controllers.py:376
 msgid "Endpoint ID"
 msgstr "Идентификатор конечного оборудования"
 
 #. ts-context MainWindow
-#: src/ipypbx/controllers.py:338
+#: src/ipypbx/controllers.py:339
 #, fuzzy
 msgid "Extension"
 msgstr ""
 
 #. ts-context MainWindow
-#: src/ipypbx/ui.py:473
+#: src/ipypbx/ui.py:476
 #, fuzzy
 msgid "3600"
 msgstr ""

diff --git a/src/ipypbx/locale/ipypbx_ru.ts b/src/ipypbx/locale/ipypbx_ru.ts
index 9b4d1b5..c094396 100644 (file)
--- a/src/ipypbx/locale/ipypbx_ru.ts
+++ b/src/ipypbx/locale/ipypbx_ru.ts
@@ -3,22 +3,22 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/ipypbx/ui.py" line="432"/>
+        <location filename="src/ipypbx/ui.py" line="435"/>
         <source>IPyPBX</source>
         <translation>IPyPBX</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="338"/>
+        <location filename="src/ipypbx/controllers.py" line="339"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="198"/>
+        <location filename="src/ipypbx/controllers.py" line="206"/>
         <source>Local Port</source>
         <translation>Локальный порт</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="198"/>
+        <location filename="src/ipypbx/controllers.py" line="206"/>
         <source>Freeswitch Port</source>
         <translation>Порт Freeswitch</translation>
     </message>
@@ -28,202 +28,202 @@
         <translation type="obsolete">Локальный IP-адрес</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="198"/>
+        <location filename="src/ipypbx/controllers.py" line="206"/>
         <source>Freeswitch IP Address</source>
         <translation>IP-адрес Freeswitch</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/ui.py" line="482"/>
+        <location filename="src/ipypbx/ui.py" line="485"/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/ui.py" line="483"/>
+        <location filename="src/ipypbx/ui.py" line="486"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/ui.py" line="440"/>
+        <location filename="src/ipypbx/ui.py" line="443"/>
         <source>Connections</source>
         <translation>Подключения</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="305"/>
+        <location filename="src/ipypbx/controllers.py" line="306"/>
         <source>External RTP IP</source>
         <translation>Внешний RTP IP</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="305"/>
+        <location filename="src/ipypbx/controllers.py" line="306"/>
         <source>External SIP IP</source>
         <translation>Внешний SIP IP</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="305"/>
+        <location filename="src/ipypbx/controllers.py" line="306"/>
         <source>RTP IP</source>
         <translation>RTP IP</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="305"/>
+        <location filename="src/ipypbx/controllers.py" line="306"/>
         <source>SIP IP</source>
         <translation>SIP IP</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="305"/>
+        <location filename="src/ipypbx/controllers.py" line="306"/>
         <source>SIP Port</source>
         <translation>Порт SIP</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="305"/>
+        <location filename="src/ipypbx/controllers.py" line="306"/>
         <source>Accept Blind Registration</source>
         <translation>Безусловная регистрация</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="375"/>
+        <location filename="src/ipypbx/controllers.py" line="376"/>
         <source>Authenticate Calls</source>
         <translation>Аутентифицировать звонки</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="375"/>
+        <location filename="src/ipypbx/controllers.py" line="376"/>
         <source>Is Active</source>
         <translation>Активен</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/ui.py" line="452"/>
+        <location filename="src/ipypbx/ui.py" line="455"/>
         <source>SIP Profiles</source>
         <translation>Профили SIP</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="324"/>
+        <location filename="src/ipypbx/controllers.py" line="325"/>
         <source>Host Name</source>
         <translation>Имя хоста</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/ui.py" line="465"/>
+        <location filename="src/ipypbx/ui.py" line="468"/>
         <source>SIP Profile</source>
         <translation>Профиль SIP</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/ui.py" line="458"/>
+        <location filename="src/ipypbx/ui.py" line="461"/>
         <source>Domains</source>
         <translation>Домены</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="338"/>
+        <location filename="src/ipypbx/controllers.py" line="339"/>
         <source>Username</source>
         <translation>Имя пользователя</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="360"/>
+        <location filename="src/ipypbx/controllers.py" line="361"/>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="338"/>
+        <location filename="src/ipypbx/controllers.py" line="339"/>
         <source>Realm</source>
         <translation>Realm</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="338"/>
+        <location filename="src/ipypbx/controllers.py" line="339"/>
         <source>From Domain</source>
         <translation>Домен в поле &quot;From&quot;</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="338"/>
+        <location filename="src/ipypbx/controllers.py" line="339"/>
         <source>Expire In Seconds</source>
         <translation>Время регистрации в секундах</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="338"/>
+        <location filename="src/ipypbx/controllers.py" line="339"/>
         <source>Retry In Seconds</source>
         <translation>Время повтора в секундах</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/ui.py" line="470"/>
+        <location filename="src/ipypbx/ui.py" line="473"/>
         <source>Caller ID In &quot;From&quot; Field</source>
         <translation>Имя абонента в поле &quot;From&quot;</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/ui.py" line="474"/>
+        <location filename="src/ipypbx/ui.py" line="477"/>
         <source>Gateways</source>
         <translation>Сетевой шлюз</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="360"/>
+        <location filename="src/ipypbx/controllers.py" line="361"/>
         <source>User ID</source>
         <translation>Идентификатор пользователя</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/ui.py" line="486"/>
+        <location filename="src/ipypbx/ui.py" line="489"/>
         <source>Domain</source>
         <translation>Домен</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/ui.py" line="481"/>
+        <location filename="src/ipypbx/ui.py" line="484"/>
         <source>Endpoints</source>
         <translation>Конечное оборудование</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="375"/>
+        <location filename="src/ipypbx/controllers.py" line="376"/>
         <source>XML Dialplan</source>
         <translation>План нумерации XML</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="375"/>
+        <location filename="src/ipypbx/controllers.py" line="376"/>
         <source>Destination Match</source>
         <translation>Совпадение направления</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/ui.py" line="487"/>
+        <location filename="src/ipypbx/ui.py" line="490"/>
         <source>Endpoint</source>
         <translation>Конечное оборудование</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/ui.py" line="490"/>
+        <location filename="src/ipypbx/ui.py" line="493"/>
         <source>Extensions</source>
         <translation>Номера</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="375"/>
+        <location filename="src/ipypbx/controllers.py" line="376"/>
         <source>ID</source>
         <translation>Идентификатор</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="198"/>
+        <location filename="src/ipypbx/controllers.py" line="206"/>
         <source>Local IP Address</source>
         <translation>Локальный IP-адрес</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="375"/>
+        <location filename="src/ipypbx/controllers.py" line="376"/>
         <source>Connection ID</source>
         <translation>Идентификатор соединения</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="338"/>
+        <location filename="src/ipypbx/controllers.py" line="339"/>
         <source>SIP Profile ID</source>
         <translation>Идентификатор SIP-профиля</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="338"/>
+        <location filename="src/ipypbx/controllers.py" line="339"/>
         <source>Caller ID In From Field</source>
         <translation>Идентификатор вызывающего абонента в поле &quot;От&quot;</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="375"/>
+        <location filename="src/ipypbx/controllers.py" line="376"/>
         <source>Domain ID</source>
         <translation>Идентификатор домена</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="375"/>
+        <location filename="src/ipypbx/controllers.py" line="376"/>
         <source>Endpoint ID</source>
         <translation>Идентификатор конечного оборудования</translation>
     </message>
     <message>
-        <location filename="src/ipypbx/controllers.py" line="338"/>
+        <location filename="src/ipypbx/controllers.py" line="339"/>
         <source>Extension</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ipypbx/ui.py" line="473"/>
+        <location filename="src/ipypbx/ui.py" line="476"/>
         <source>3600</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/src/ipypbx/ui.py b/src/ipypbx/ui.py
index 21b7c0f..310df2c 100644 (file)
--- a/src/ipypbx/ui.py
+++ b/src/ipypbx/ui.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'ui/layout.ui'
 #
-# Created: Thu Apr 15 16:22:42 2010
+# Created: Thu Apr 15 18:22:21 2010
 #      by: PyQt4 UI code generator 4.7.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -361,7 +361,10 @@ class Ui_MainWindow(object):
         self.extensionEndpointId = QtGui.QComboBox(self.gridLayoutWidget_5)
         self.extensionEndpointId.setObjectName("extensionEndpointId")
         self.formLayout_4.setWidget(3, QtGui.QFormLayout.FieldRole, self.extensionEndpointId)
-        self.extensionXmlDialplan = QtGui.QTextEdit(self.gridLayoutWidget_5)
+        self.extensionXmlDialplan = QtGui.QPlainTextEdit(self.gridLayoutWidget_5)
+        self.extensionXmlDialplan.setWhatsThis("")
+        self.extensionXmlDialplan.setPlainText(" <action application=\"echo\" data=\"\"/>\n"
+"")
         self.extensionXmlDialplan.setObjectName("extensionXmlDialplan")
         self.formLayout_4.setWidget(1, QtGui.QFormLayout.FieldRole, self.extensionXmlDialplan)
         self.gridLayout_4.addLayout(self.formLayout_4, 0, 1, 1, 1)
@@ -372,7 +375,7 @@ class Ui_MainWindow(object):
         MainWindow.setCentralWidget(self.centralwidget)
 
         self.retranslateUi(MainWindow)
-        self.tabWidget.setCurrentIndex(0)
+        self.tabWidget.setCurrentIndex(5)
         QtCore.QMetaObject.connectSlotsByName(MainWindow)
         MainWindow.setTabOrder(self.tabWidget, self.connectionViewList)
         MainWindow.setTabOrder(self.connectionViewList, self.connectionName)

diff --git a/ui/layout.ui b/ui/layout.ui
index 0f4af93..eb6a8c7 100644 (file)
--- a/ui/layout.ui
+++ b/ui/layout.ui
@@ -30,7 +30,7 @@
      </size>
     </property>
     <property name="currentIndex">
-     <number>0</number>
+     <number>5</number>
     </property>
     <widget class="QWidget" name="connectionsTab">
      <attribute name="title">
@@ -699,7 +699,15 @@
           <widget class="QComboBox" name="extensionEndpointId"/>
          </item>
          <item row="1" column="1">
-          <widget class="QTextEdit" name="extensionXmlDialplan"/>
+          <widget class="QPlainTextEdit" name="extensionXmlDialplan">
+           <property name="whatsThis">
+            <string/>
+           </property>
+           <property name="plainText">
+            <string notr="true"> &lt;action application=&quot;echo&quot; data=&quot;&quot;/&gt;
+</string>
+           </property>
+          </widget>
          </item>
         </layout>
        </item>