From 64936f74bfffb55b36e0a33d9968bf04ceffd044 Mon Sep 17 00:00:00 2001 From: Stas Shtin Date: Thu, 15 Apr 2010 22:17:22 +0400 Subject: [PATCH] Hide extension.endpoint_id display for now --- src/ipypbx/controllers.py | 28 ++++++------ src/ipypbx/http.py | 6 ++- src/ipypbx/locale/ipypbx_fi.po | 92 +++++++++++++++++++--------------------- src/ipypbx/locale/ipypbx_fi.ts | 91 +++++++++++++++++++-------------------- src/ipypbx/locale/ipypbx_ru.po | 90 +++++++++++++++++++-------------------- src/ipypbx/locale/ipypbx_ru.qm | Bin 3474 -> 3385 bytes src/ipypbx/locale/ipypbx_ru.ts | 88 +++++++++++++++++++------------------- src/ipypbx/ui.py | 51 ++++++++++------------ ui/layout.ui | 60 ++++++++++++-------------- 9 files changed, 240 insertions(+), 266 deletions(-) diff --git a/src/ipypbx/controllers.py b/src/ipypbx/controllers.py index 43d7322..2063db9 100644 --- a/src/ipypbx/controllers.py +++ b/src/ipypbx/controllers.py @@ -195,7 +195,9 @@ class BaseController(QtCore.QObject): """ Save to database. """ + index = self.view_list.currentIndex() self.view_display.submit() + self.view_list.setCurrentIndex(index) self.getFieldWidget('Add').setEnabled(True) @@ -216,9 +218,6 @@ class ConnectionController(BaseController): def __init__(self, parent=None, views=None): super(ConnectionController, self).__init__(parent, views) - # We track last selected row because Qt deselects in on submit. - self.last_row = -1 - for row in range(self.model.rowCount()): # Get local IP address and port from the table for each row. server = http.FreeswitchConfigServer(self) @@ -238,17 +237,16 @@ class ConnectionController(BaseController): def connectionChange(self, index): """ Restart config server on connection change if necessary. - """ + """ current_row = index.row() if current_row != -1: - self.last_row = current_row # Select the new row. connection_id, _ok = index.model().data( - index.sibling(index.row(), 0)).toInt() + index.sibling(current_row, 0)).toInt() - # Apply new socket location. - self.servers[self.last_row].setSocketData( - *self.getSocketData(self.last_row)) + # Apply new socket location. + self.servers[current_row].setSocketData( + *self.getSocketData(current_row)) def objectAdded(self, row, record): """ @@ -265,10 +263,6 @@ class ConnectionController(BaseController): server.startServer() self.servers.append(server) - def save(self): - super(ConnectionController, self).save() - self.view_list.selectRow(self.last_row) - class ConnectionChangeListenerController(BaseController): """ @@ -281,7 +275,9 @@ class ConnectionChangeListenerController(BaseController): Filters table by a new connection ID and stores last connection ID locally. """ - if index.row() != -1: + index_row = index.row() + if index_row != -1: + # Get connection_id field value. connection_id, _ok = index.model().data( index.sibling(index.row(), 0)).toInt() self.connection_id = connection_id @@ -391,9 +387,11 @@ class ExtensionController(ConnectionChangeListenerController): QtCore.QT_TRANSLATE_NOOP('MainWindow', 'Authenticate Calls'), QtCore.QT_TRANSLATE_NOOP('MainWindow', 'Is Active')) view_list_fields = 'Destination Match', + view_display_fields_hidden = 'ID', 'Connection ID', 'Endpoint ID' relations = ( ('domain_id', 'Domain ID', 'domain', 'host_name'), - ('endpoint_id', 'Endpoint ID', 'endpoint', 'user_id')) +# ('endpoint_id', 'Endpoint ID', 'endpoint', 'user_id'), + ) def objectAdded(self, row, record): record.setValue( diff --git a/src/ipypbx/http.py b/src/ipypbx/http.py index 3be3b8f..3dfe0b8 100644 --- a/src/ipypbx/http.py +++ b/src/ipypbx/http.py @@ -178,8 +178,10 @@ class HttpRequestParser(object): for generator in self.parent.generators: if generator.canHandle(self.headers): self.state += 1 - return generator.generateConfig(self.headers) - + print generator.generateConfig(self.headers) + else: + print 'No generator found' + class FreeswitchConfigGenerator(object): diff --git a/src/ipypbx/locale/ipypbx_fi.po b/src/ipypbx/locale/ipypbx_fi.po index 8beaabf..19a5540 100644 --- a/src/ipypbx/locale/ipypbx_fi.po +++ b/src/ipypbx/locale/ipypbx_fi.po @@ -10,265 +10,259 @@ msgstr "" "X-Language: fi_FI\n" #. ts-context MainWindow -#: src/ipypbx/ui.py:435 +#: src/ipypbx/ui.py:429 #, fuzzy msgid "IPyPBX" msgstr "" #. ts-context MainWindow -#: src/ipypbx/controllers.py:339 +#: src/ipypbx/controllers.py:357 #, fuzzy msgid "Name" msgstr "" #. ts-context MainWindow -#: src/ipypbx/controllers.py:206 +#: src/ipypbx/controllers.py:215 #, fuzzy msgid "Local Port" msgstr "" #. ts-context MainWindow -#: src/ipypbx/controllers.py:206 +#: src/ipypbx/controllers.py:215 #, fuzzy msgid "Freeswitch Port" msgstr "" #. ts-context MainWindow -#: src/ipypbx/controllers.py:206 +#: src/ipypbx/controllers.py:215 #, fuzzy msgid "Freeswitch IP Address" msgstr "" #. ts-context MainWindow -#: src/ipypbx/ui.py:485 +#: src/ipypbx/ui.py:479 #, fuzzy msgid "Add" msgstr "" #. ts-context MainWindow -#: src/ipypbx/ui.py:486 +#: src/ipypbx/ui.py:480 #, fuzzy msgid "Save" msgstr "" #. ts-context MainWindow -#: src/ipypbx/ui.py:443 +#: src/ipypbx/ui.py:437 #, fuzzy msgid "Connections" msgstr "" #. ts-context MainWindow -#: src/ipypbx/controllers.py:306 +#: src/ipypbx/controllers.py:324 #, fuzzy msgid "External RTP IP" msgstr "" #. ts-context MainWindow -#: src/ipypbx/controllers.py:306 +#: src/ipypbx/controllers.py:324 #, fuzzy msgid "External SIP IP" msgstr "" #. ts-context MainWindow -#: src/ipypbx/controllers.py:306 +#: src/ipypbx/controllers.py:324 #, fuzzy msgid "RTP IP" msgstr "" #. ts-context MainWindow -#: src/ipypbx/controllers.py:306 +#: src/ipypbx/controllers.py:324 #, fuzzy msgid "SIP IP" msgstr "" #. ts-context MainWindow -#: src/ipypbx/controllers.py:306 +#: src/ipypbx/controllers.py:324 #, fuzzy msgid "SIP Port" msgstr "" #. ts-context MainWindow -#: src/ipypbx/controllers.py:306 +#: src/ipypbx/controllers.py:324 #, fuzzy msgid "Accept Blind Registration" msgstr "" #. ts-context MainWindow -#: src/ipypbx/controllers.py:376 +#: src/ipypbx/controllers.py:394 #, fuzzy msgid "Authenticate Calls" msgstr "" #. ts-context MainWindow -#: src/ipypbx/controllers.py:376 +#: src/ipypbx/controllers.py:394 #, fuzzy msgid "Is Active" msgstr "" #. ts-context MainWindow -#: src/ipypbx/ui.py:455 +#: src/ipypbx/ui.py:449 #, fuzzy msgid "SIP Profiles" msgstr "" #. ts-context MainWindow -#: src/ipypbx/controllers.py:325 +#: src/ipypbx/controllers.py:343 #, fuzzy msgid "Host Name" msgstr "" #. ts-context MainWindow -#: src/ipypbx/ui.py:468 +#: src/ipypbx/ui.py:462 #, fuzzy msgid "SIP Profile" msgstr "" #. ts-context MainWindow -#: src/ipypbx/ui.py:461 +#: src/ipypbx/ui.py:455 #, fuzzy msgid "Domains" msgstr "" #. ts-context MainWindow -#: src/ipypbx/controllers.py:339 +#: src/ipypbx/controllers.py:357 #, fuzzy msgid "Username" msgstr "" #. ts-context MainWindow -#: src/ipypbx/controllers.py:361 +#: src/ipypbx/controllers.py:379 #, fuzzy msgid "Password" msgstr "" #. ts-context MainWindow -#: src/ipypbx/controllers.py:339 +#: src/ipypbx/controllers.py:357 #, fuzzy msgid "Realm" msgstr "" #. ts-context MainWindow -#: src/ipypbx/controllers.py:339 +#: src/ipypbx/controllers.py:357 #, fuzzy msgid "From Domain" msgstr "" #. ts-context MainWindow -#: src/ipypbx/controllers.py:339 +#: src/ipypbx/controllers.py:357 #, fuzzy msgid "Expire In Seconds" msgstr "" #. ts-context MainWindow -#: src/ipypbx/controllers.py:339 +#: src/ipypbx/controllers.py:357 #, fuzzy msgid "Retry In Seconds" msgstr "" #. ts-context MainWindow -#: src/ipypbx/ui.py:473 +#: src/ipypbx/ui.py:467 #, fuzzy msgid "Caller ID In \"From\" Field" msgstr "" #. ts-context MainWindow -#: src/ipypbx/ui.py:477 +#: src/ipypbx/ui.py:471 #, fuzzy msgid "Gateways" msgstr "" #. ts-context MainWindow -#: src/ipypbx/controllers.py:361 +#: src/ipypbx/controllers.py:379 #, fuzzy msgid "User ID" msgstr "" #. ts-context MainWindow -#: src/ipypbx/ui.py:489 +#: src/ipypbx/ui.py:483 #, fuzzy msgid "Domain" msgstr "" #. ts-context MainWindow -#: src/ipypbx/ui.py:484 +#: src/ipypbx/ui.py:478 #, fuzzy msgid "Endpoints" msgstr "" #. ts-context MainWindow -#: src/ipypbx/controllers.py:376 +#: src/ipypbx/controllers.py:394 #, fuzzy msgid "XML Dialplan" msgstr "" #. ts-context MainWindow -#: src/ipypbx/controllers.py:376 +#: src/ipypbx/controllers.py:394 #, fuzzy msgid "Destination Match" msgstr "" #. ts-context MainWindow -#: src/ipypbx/ui.py:490 -#, fuzzy -msgid "Endpoint" -msgstr "" - -#. ts-context MainWindow -#: src/ipypbx/ui.py:493 +#: src/ipypbx/ui.py:486 #, fuzzy msgid "Extensions" msgstr "" #. ts-context MainWindow -#: src/ipypbx/controllers.py:376 +#: src/ipypbx/controllers.py:394 #, fuzzy msgid "ID" msgstr "" #. ts-context MainWindow -#: src/ipypbx/controllers.py:206 +#: src/ipypbx/controllers.py:215 #, fuzzy msgid "Local IP Address" msgstr "" #. ts-context MainWindow -#: src/ipypbx/controllers.py:376 +#: src/ipypbx/controllers.py:394 #, fuzzy msgid "Connection ID" msgstr "" #. ts-context MainWindow -#: src/ipypbx/controllers.py:339 +#: src/ipypbx/controllers.py:357 #, fuzzy msgid "SIP Profile ID" msgstr "" #. ts-context MainWindow -#: src/ipypbx/controllers.py:339 +#: src/ipypbx/controllers.py:357 #, fuzzy msgid "Caller ID In From Field" msgstr "" #. ts-context MainWindow -#: src/ipypbx/controllers.py:376 +#: src/ipypbx/controllers.py:394 #, fuzzy msgid "Domain ID" msgstr "" #. ts-context MainWindow -#: src/ipypbx/controllers.py:376 +#: src/ipypbx/controllers.py:394 #, fuzzy msgid "Endpoint ID" msgstr "" #. ts-context MainWindow -#: src/ipypbx/controllers.py:339 +#: src/ipypbx/controllers.py:357 #, fuzzy msgid "Extension" msgstr "" #. ts-context MainWindow -#: src/ipypbx/ui.py:476 +#: src/ipypbx/ui.py:470 #, fuzzy msgid "3600" msgstr "" diff --git a/src/ipypbx/locale/ipypbx_fi.ts b/src/ipypbx/locale/ipypbx_fi.ts index 6c130e5..0d04b53 100644 --- a/src/ipypbx/locale/ipypbx_fi.ts +++ b/src/ipypbx/locale/ipypbx_fi.ts @@ -3,222 +3,217 @@ MainWindow - + IPyPBX - + Name - + Local Port - + Freeswitch Port - + Freeswitch IP Address - + Add - + Save - + Connections - + External RTP IP - + External SIP IP - + RTP IP - + SIP IP - + SIP Port - + Accept Blind Registration - + Authenticate Calls - + Is Active - + SIP Profiles - + Host Name - + SIP Profile - + Domains - + Username - + Password - + Realm - + From Domain - + Expire In Seconds - + Retry In Seconds - + Caller ID In "From" Field - + Gateways - + User ID - + Domain - + Endpoints - + XML Dialplan - + Destination Match - - Endpoint - - - - + Extensions - + ID - + Local IP Address - + Connection ID - + SIP Profile ID - + Caller ID In From Field - + Domain ID - + Endpoint ID - + Extension - + 3600 diff --git a/src/ipypbx/locale/ipypbx_ru.po b/src/ipypbx/locale/ipypbx_ru.po index 5c2cd0c..835220e 100644 --- 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:435 +#: src/ipypbx/ui.py:429 msgid "IPyPBX" msgstr "IPyPBX" #. ts-context MainWindow -#: src/ipypbx/controllers.py:339 +#: src/ipypbx/controllers.py:357 msgid "Name" msgstr "Имя" #. ts-context MainWindow -#: src/ipypbx/controllers.py:206 +#: src/ipypbx/controllers.py:215 msgid "Local Port" msgstr "Локальный порт" #. ts-context MainWindow -#: src/ipypbx/controllers.py:206 +#: src/ipypbx/controllers.py:215 msgid "Freeswitch Port" msgstr "Порт Freeswitch" @@ -35,203 +35,203 @@ msgstr "Порт Freeswitch" #~ msgstr "Локальный IP-адрес" #. ts-context MainWindow -#: src/ipypbx/controllers.py:206 +#: src/ipypbx/controllers.py:215 msgid "Freeswitch IP Address" msgstr "IP-адрес Freeswitch" #. ts-context MainWindow -#: src/ipypbx/ui.py:485 +#: src/ipypbx/ui.py:479 msgid "Add" msgstr "Добавить" #. ts-context MainWindow -#: src/ipypbx/ui.py:486 +#: src/ipypbx/ui.py:480 msgid "Save" msgstr "Сохранить" #. ts-context MainWindow -#: src/ipypbx/ui.py:443 +#: src/ipypbx/ui.py:437 msgid "Connections" msgstr "Подключения" #. ts-context MainWindow -#: src/ipypbx/controllers.py:306 +#: src/ipypbx/controllers.py:324 msgid "External RTP IP" msgstr "Внешний RTP IP" #. ts-context MainWindow -#: src/ipypbx/controllers.py:306 +#: src/ipypbx/controllers.py:324 msgid "External SIP IP" msgstr "Внешний SIP IP" #. ts-context MainWindow -#: src/ipypbx/controllers.py:306 +#: src/ipypbx/controllers.py:324 msgid "RTP IP" msgstr "RTP IP" #. ts-context MainWindow -#: src/ipypbx/controllers.py:306 +#: src/ipypbx/controllers.py:324 msgid "SIP IP" msgstr "SIP IP" #. ts-context MainWindow -#: src/ipypbx/controllers.py:306 +#: src/ipypbx/controllers.py:324 msgid "SIP Port" msgstr "Порт SIP" #. ts-context MainWindow -#: src/ipypbx/controllers.py:306 +#: src/ipypbx/controllers.py:324 msgid "Accept Blind Registration" msgstr "Безусловная регистрация" #. ts-context MainWindow -#: src/ipypbx/controllers.py:376 +#: src/ipypbx/controllers.py:394 msgid "Authenticate Calls" msgstr "Аутентифицировать звонки" #. ts-context MainWindow -#: src/ipypbx/controllers.py:376 +#: src/ipypbx/controllers.py:394 msgid "Is Active" msgstr "Активен" #. ts-context MainWindow -#: src/ipypbx/ui.py:455 +#: src/ipypbx/ui.py:449 msgid "SIP Profiles" msgstr "Профили SIP" #. ts-context MainWindow -#: src/ipypbx/controllers.py:325 +#: src/ipypbx/controllers.py:343 msgid "Host Name" msgstr "Имя хоста" #. ts-context MainWindow -#: src/ipypbx/ui.py:468 +#: src/ipypbx/ui.py:462 msgid "SIP Profile" msgstr "Профиль SIP" #. ts-context MainWindow -#: src/ipypbx/ui.py:461 +#: src/ipypbx/ui.py:455 msgid "Domains" msgstr "Домены" #. ts-context MainWindow -#: src/ipypbx/controllers.py:339 +#: src/ipypbx/controllers.py:357 msgid "Username" msgstr "Имя пользователя" #. ts-context MainWindow -#: src/ipypbx/controllers.py:361 +#: src/ipypbx/controllers.py:379 msgid "Password" msgstr "Пароль" #. ts-context MainWindow -#: src/ipypbx/controllers.py:339 +#: src/ipypbx/controllers.py:357 msgid "Realm" msgstr "Realm" #. ts-context MainWindow -#: src/ipypbx/controllers.py:339 +#: src/ipypbx/controllers.py:357 msgid "From Domain" msgstr "Домен в поле \"From\"" #. ts-context MainWindow -#: src/ipypbx/controllers.py:339 +#: src/ipypbx/controllers.py:357 msgid "Expire In Seconds" msgstr "Время регистрации в секундах" #. ts-context MainWindow -#: src/ipypbx/controllers.py:339 +#: src/ipypbx/controllers.py:357 msgid "Retry In Seconds" msgstr "Время повтора в секундах" #. ts-context MainWindow -#: src/ipypbx/ui.py:473 +#: src/ipypbx/ui.py:467 msgid "Caller ID In \"From\" Field" msgstr "Имя абонента в поле \"From\"" #. ts-context MainWindow -#: src/ipypbx/ui.py:477 +#: src/ipypbx/ui.py:471 msgid "Gateways" msgstr "Сетевой шлюз" #. ts-context MainWindow -#: src/ipypbx/controllers.py:361 +#: src/ipypbx/controllers.py:379 msgid "User ID" msgstr "Идентификатор пользователя" #. ts-context MainWindow -#: src/ipypbx/ui.py:489 +#: src/ipypbx/ui.py:483 msgid "Domain" msgstr "Домен" #. ts-context MainWindow -#: src/ipypbx/ui.py:484 +#: src/ipypbx/ui.py:478 msgid "Endpoints" msgstr "Конечное оборудование" #. ts-context MainWindow -#: src/ipypbx/controllers.py:376 +#: src/ipypbx/controllers.py:394 msgid "XML Dialplan" msgstr "План нумерации XML" #. ts-context MainWindow -#: src/ipypbx/controllers.py:376 +#: src/ipypbx/controllers.py:394 msgid "Destination Match" msgstr "Совпадение направления" #. ts-context MainWindow #: src/ipypbx/ui.py:490 -msgid "Endpoint" -msgstr "Конечное оборудование" +#~ msgid "Endpoint" +#~ msgstr "Конечное оборудование" #. ts-context MainWindow -#: src/ipypbx/ui.py:493 +#: src/ipypbx/ui.py:486 msgid "Extensions" msgstr "Номера" #. ts-context MainWindow -#: src/ipypbx/controllers.py:376 +#: src/ipypbx/controllers.py:394 msgid "ID" msgstr "Идентификатор" #. ts-context MainWindow -#: src/ipypbx/controllers.py:206 +#: src/ipypbx/controllers.py:215 msgid "Local IP Address" msgstr "Локальный IP-адрес" #. ts-context MainWindow -#: src/ipypbx/controllers.py:376 +#: src/ipypbx/controllers.py:394 msgid "Connection ID" msgstr "Идентификатор соединения" #. ts-context MainWindow -#: src/ipypbx/controllers.py:339 +#: src/ipypbx/controllers.py:357 msgid "SIP Profile ID" msgstr "Идентификатор SIP-профиля" #. ts-context MainWindow -#: src/ipypbx/controllers.py:339 +#: src/ipypbx/controllers.py:357 msgid "Caller ID In From Field" msgstr "Идентификатор вызывающего абонента в поле \"От\"" #. ts-context MainWindow -#: src/ipypbx/controllers.py:376 +#: src/ipypbx/controllers.py:394 msgid "Domain ID" msgstr "Идентификатор домена" #. ts-context MainWindow -#: src/ipypbx/controllers.py:376 +#: src/ipypbx/controllers.py:394 msgid "Endpoint ID" msgstr "Идентификатор конечного оборудования" #. ts-context MainWindow -#: src/ipypbx/controllers.py:339 +#: src/ipypbx/controllers.py:357 #, fuzzy msgid "Extension" msgstr "" #. ts-context MainWindow -#: src/ipypbx/ui.py:476 +#: src/ipypbx/ui.py:470 #, fuzzy msgid "3600" msgstr "" diff --git a/src/ipypbx/locale/ipypbx_ru.qm b/src/ipypbx/locale/ipypbx_ru.qm index 4a5c7ab07704d7c2a3fd818db16592f2fe7abeb5..64c2501d1ce59655f9d2778440a636bea67df9e8 100644 GIT binary patch delta 347 zcmbOvy;Ev}NWBLG1IrZ#26h$(2KOZl3=C-utRAKe3>FmNqk;CvAb2X);5^4qc%5X@-UVCJYRW-x-^N9|O%wVamU~g@J+fJ=1fpFF^ea z%nklPKC>K4HN#Y({sNY5=Kp~D-?Kb_Qo+Db&u-81a}gf{1DiE#rOE@KfwNfaKs09r z>(Rr9fd)-wJ*f|L81n+QtWcms7-q0PNCrBV{U`e)y;7jM101U!KLP4X=U8+1GSHlE z&Xdkx85p?rxl%bpf&5cko2K0Z^2@kg%S3<H_k)E% zA*NuSSntn3Kb+y2^IotTT=>FmQcj;CvCxz`*In z;1yjARQH`B@J$8-1Jh)Nh#k5>aT$h%{w53zjNciXf*%9T+RBuFdkX^tn*-Bxt}j6S zfy@p5Kt8h^OEtq(p#Fm_+syv~^}lD?9y5i3p`LjG%kw7{K#2(~KNs-4rKnwmK6$g5W@`i2gxizbzba`^h$vi339A@`~=9~ z!LjDLwpVgsLQG0+OmTl^dJKLFJQ@oxvy mb21qic*Hg*F)m@AT)}F>!Qq;hQjnjSH(8KdbTb>PF$Vze&tKmF diff --git a/src/ipypbx/locale/ipypbx_ru.ts b/src/ipypbx/locale/ipypbx_ru.ts index c094396..53d9bf2 100644 --- a/src/ipypbx/locale/ipypbx_ru.ts +++ b/src/ipypbx/locale/ipypbx_ru.ts @@ -3,22 +3,22 @@ MainWindow - + IPyPBX IPyPBX - + Name Имя - + Local Port Локальный порт - + Freeswitch Port Порт Freeswitch @@ -28,202 +28,202 @@ Локальный IP-адрес - + Freeswitch IP Address IP-адрес Freeswitch - + Add Добавить - + Save Сохранить - + Connections Подключения - + External RTP IP Внешний RTP IP - + External SIP IP Внешний SIP IP - + RTP IP RTP IP - + SIP IP SIP IP - + SIP Port Порт SIP - + Accept Blind Registration Безусловная регистрация - + Authenticate Calls Аутентифицировать звонки - + Is Active Активен - + SIP Profiles Профили SIP - + Host Name Имя хоста - + SIP Profile Профиль SIP - + Domains Домены - + Username Имя пользователя - + Password Пароль - + Realm Realm - + From Domain Домен в поле "From" - + Expire In Seconds Время регистрации в секундах - + Retry In Seconds Время повтора в секундах - + Caller ID In "From" Field Имя абонента в поле "From" - + Gateways Сетевой шлюз - + User ID Идентификатор пользователя - + Domain Домен - + Endpoints Конечное оборудование - + XML Dialplan План нумерации XML - + Destination Match Совпадение направления Endpoint - Конечное оборудование + Конечное оборудование - + Extensions Номера - + ID Идентификатор - + Local IP Address Локальный IP-адрес - + Connection ID Идентификатор соединения - + SIP Profile ID Идентификатор SIP-профиля - + Caller ID In From Field Идентификатор вызывающего абонента в поле "От" - + Domain ID Идентификатор домена - + Endpoint ID Идентификатор конечного оборудования - + Extension - + 3600 diff --git a/src/ipypbx/ui.py b/src/ipypbx/ui.py index 310df2c..d31b150 100644 --- 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 18:22:21 2010 +# Created: Thu Apr 15 21:54:09 2010 # by: PyQt4 UI code generator 4.7.2 # # WARNING! All changes made in this file will be lost! @@ -331,42 +331,37 @@ class Ui_MainWindow(object): self.extensionSave.setObjectName("extensionSave") self.gridLayout_4.addWidget(self.extensionSave, 1, 1, 1, 1) self.formLayout_4 = QtGui.QFormLayout() + self.formLayout_4.setFieldGrowthPolicy(QtGui.QFormLayout.AllNonFixedFieldsGrow) self.formLayout_4.setObjectName("formLayout_4") - self.label_3 = QtGui.QLabel(self.gridLayoutWidget_5) - self.label_3.setObjectName("label_3") - self.formLayout_4.setWidget(1, QtGui.QFormLayout.LabelRole, self.label_3) self.label_28 = QtGui.QLabel(self.gridLayoutWidget_5) self.label_28.setObjectName("label_28") self.formLayout_4.setWidget(0, QtGui.QFormLayout.LabelRole, self.label_28) - self.label_29 = QtGui.QLabel(self.gridLayoutWidget_5) - self.label_29.setObjectName("label_29") - self.formLayout_4.setWidget(2, QtGui.QFormLayout.LabelRole, self.label_29) - self.label_30 = QtGui.QLabel(self.gridLayoutWidget_5) - self.label_30.setObjectName("label_30") - self.formLayout_4.setWidget(3, QtGui.QFormLayout.LabelRole, self.label_30) - self.extensionIsActive = QtGui.QCheckBox(self.gridLayoutWidget_5) - self.extensionIsActive.setChecked(True) - self.extensionIsActive.setObjectName("extensionIsActive") - self.formLayout_4.setWidget(4, QtGui.QFormLayout.LabelRole, self.extensionIsActive) - self.extensionAuthenticateCalls = QtGui.QCheckBox(self.gridLayoutWidget_5) - self.extensionAuthenticateCalls.setChecked(True) - self.extensionAuthenticateCalls.setObjectName("extensionAuthenticateCalls") - self.formLayout_4.setWidget(4, QtGui.QFormLayout.FieldRole, self.extensionAuthenticateCalls) self.extensionDestinationMatch = QtGui.QLineEdit(self.gridLayoutWidget_5) self.extensionDestinationMatch.setObjectName("extensionDestinationMatch") self.formLayout_4.setWidget(0, QtGui.QFormLayout.FieldRole, self.extensionDestinationMatch) - self.extensionDomainId = QtGui.QComboBox(self.gridLayoutWidget_5) - self.extensionDomainId.setObjectName("extensionDomainId") - self.formLayout_4.setWidget(2, QtGui.QFormLayout.FieldRole, self.extensionDomainId) - self.extensionEndpointId = QtGui.QComboBox(self.gridLayoutWidget_5) - self.extensionEndpointId.setObjectName("extensionEndpointId") - self.formLayout_4.setWidget(3, QtGui.QFormLayout.FieldRole, self.extensionEndpointId) + self.label_3 = QtGui.QLabel(self.gridLayoutWidget_5) + self.label_3.setObjectName("label_3") + self.formLayout_4.setWidget(1, QtGui.QFormLayout.LabelRole, self.label_3) self.extensionXmlDialplan = QtGui.QPlainTextEdit(self.gridLayoutWidget_5) self.extensionXmlDialplan.setWhatsThis("") self.extensionXmlDialplan.setPlainText(" \n" "") self.extensionXmlDialplan.setObjectName("extensionXmlDialplan") self.formLayout_4.setWidget(1, QtGui.QFormLayout.FieldRole, self.extensionXmlDialplan) + self.label_29 = QtGui.QLabel(self.gridLayoutWidget_5) + self.label_29.setObjectName("label_29") + self.formLayout_4.setWidget(2, QtGui.QFormLayout.LabelRole, self.label_29) + self.extensionDomainId = QtGui.QComboBox(self.gridLayoutWidget_5) + self.extensionDomainId.setObjectName("extensionDomainId") + self.formLayout_4.setWidget(2, QtGui.QFormLayout.FieldRole, self.extensionDomainId) + self.extensionIsActive = QtGui.QCheckBox(self.gridLayoutWidget_5) + self.extensionIsActive.setChecked(True) + self.extensionIsActive.setObjectName("extensionIsActive") + self.formLayout_4.setWidget(3, QtGui.QFormLayout.LabelRole, self.extensionIsActive) + self.extensionAuthenticateCalls = QtGui.QCheckBox(self.gridLayoutWidget_5) + self.extensionAuthenticateCalls.setChecked(True) + self.extensionAuthenticateCalls.setObjectName("extensionAuthenticateCalls") + self.formLayout_4.setWidget(3, QtGui.QFormLayout.FieldRole, self.extensionAuthenticateCalls) self.gridLayout_4.addLayout(self.formLayout_4, 0, 1, 1, 1) self.extensionViewList = QtGui.QTableView(self.gridLayoutWidget_5) self.extensionViewList.setObjectName("extensionViewList") @@ -375,7 +370,7 @@ class Ui_MainWindow(object): MainWindow.setCentralWidget(self.centralwidget) self.retranslateUi(MainWindow) - self.tabWidget.setCurrentIndex(5) + self.tabWidget.setCurrentIndex(0) QtCore.QMetaObject.connectSlotsByName(MainWindow) MainWindow.setTabOrder(self.tabWidget, self.connectionViewList) MainWindow.setTabOrder(self.connectionViewList, self.connectionName) @@ -425,8 +420,7 @@ class Ui_MainWindow(object): MainWindow.setTabOrder(self.endpointSave, self.extensionViewList) MainWindow.setTabOrder(self.extensionViewList, self.extensionDestinationMatch) MainWindow.setTabOrder(self.extensionDestinationMatch, self.extensionDomainId) - MainWindow.setTabOrder(self.extensionDomainId, self.extensionEndpointId) - MainWindow.setTabOrder(self.extensionEndpointId, self.extensionAuthenticateCalls) + MainWindow.setTabOrder(self.extensionDomainId, self.extensionAuthenticateCalls) MainWindow.setTabOrder(self.extensionAuthenticateCalls, self.extensionIsActive) MainWindow.setTabOrder(self.extensionIsActive, self.extensionAdd) MainWindow.setTabOrder(self.extensionAdd, self.extensionSave) @@ -484,10 +478,9 @@ class Ui_MainWindow(object): self.tabWidget.setTabText(self.tabWidget.indexOf(self.endpointsTab), QtGui.QApplication.translate("MainWindow", "Endpoints", None, QtGui.QApplication.UnicodeUTF8)) self.extensionAdd.setText(QtGui.QApplication.translate("MainWindow", "Add", None, QtGui.QApplication.UnicodeUTF8)) self.extensionSave.setText(QtGui.QApplication.translate("MainWindow", "Save", None, QtGui.QApplication.UnicodeUTF8)) - self.label_3.setText(QtGui.QApplication.translate("MainWindow", "XML Dialplan", None, QtGui.QApplication.UnicodeUTF8)) self.label_28.setText(QtGui.QApplication.translate("MainWindow", "Destination Match", None, QtGui.QApplication.UnicodeUTF8)) + self.label_3.setText(QtGui.QApplication.translate("MainWindow", "XML Dialplan", None, QtGui.QApplication.UnicodeUTF8)) self.label_29.setText(QtGui.QApplication.translate("MainWindow", "Domain", None, QtGui.QApplication.UnicodeUTF8)) - self.label_30.setText(QtGui.QApplication.translate("MainWindow", "Endpoint", None, QtGui.QApplication.UnicodeUTF8)) self.extensionIsActive.setText(QtGui.QApplication.translate("MainWindow", "Is Active", None, QtGui.QApplication.UnicodeUTF8)) self.extensionAuthenticateCalls.setText(QtGui.QApplication.translate("MainWindow", "Authenticate Calls", None, QtGui.QApplication.UnicodeUTF8)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.extensionsTab), QtGui.QApplication.translate("MainWindow", "Extensions", None, QtGui.QApplication.UnicodeUTF8)) diff --git a/ui/layout.ui b/ui/layout.ui index eb6a8c7..77ae3b8 100644 --- a/ui/layout.ui +++ b/ui/layout.ui @@ -30,7 +30,7 @@ - 5 + 0 @@ -641,6 +641,19 @@ + + QFormLayout::AllNonFixedFieldsGrow + + + + + Destination Match + + + + + + @@ -648,10 +661,14 @@ - - - - Destination Match + + + + + + + <action application="echo" data=""/> + @@ -662,14 +679,10 @@ - - - - Endpoint - - + + - + Is Active @@ -679,7 +692,7 @@ - + Authenticate Calls @@ -689,26 +702,6 @@ - - - - - - - - - - - - - - - - <action application="echo" data=""/> - - - - @@ -770,7 +763,6 @@ extensionViewList extensionDestinationMatch extensionDomainId - extensionEndpointId extensionAuthenticateCalls extensionIsActive extensionAdd -- 1.7.9.5