The branch, eden-pre has been updated
via 4c6930efdc5750cb49d8b2591fd7dcb6c6e3f98c (commit)
from 969e46d1ff679373f1cdd7c24a50b16b1e67a128 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=4c6930efdc5750cb49d8b2591fd7dcb6c6e3f98c
commit 4c6930efdc5750cb49d8b2591fd7dcb6c6e3f98c
Author: Arne Morten Kvarving <[email protected]>
Date: Mon Sep 19 10:12:24 2011 +0200
[script.xbmc-pbx-addon] -v 1.0.9
diff --git a/script.xbmc-pbx-addon/addon.xml b/script.xbmc-pbx-addon/addon.xml
index bae37c9..0dc640d 100644
--- a/script.xbmc-pbx-addon/addon.xml
+++ b/script.xbmc-pbx-addon/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<addon id="script.xbmc-pbx-addon"
name="XBMC PBX Addon"
- version="1.0.8"
+ version="1.0.9"
provider-name="hmronline">
<requires>
<import addon="xbmc.python" version="2.0"/>
diff --git a/script.xbmc-pbx-addon/backend_files/xbmc-pbx-addon.php
b/script.xbmc-pbx-addon/backend_files/xbmc-pbx-addon.php
index 6e2d571..a14e5fe 100644
--- a/script.xbmc-pbx-addon/backend_files/xbmc-pbx-addon.php
+++ b/script.xbmc-pbx-addon/backend_files/xbmc-pbx-addon.php
@@ -12,7 +12,7 @@ $__addon__ = "XBMC PBX Addon";
$__addon_id__ = "script.xbmc-pbx-addon";
$__author__ = "hmronline";
$__url__ = "http://code.google.com/p/xbmc-pbx-addon/";;
-$__version__ = "1.0.8";
+$__version__ = "1.0.9";
//
************************************************************************************************************
diff --git a/script.xbmc-pbx-addon/bgservice.py
b/script.xbmc-pbx-addon/bgservice.py
index 7e56b18..f2dddc1 100644
--- a/script.xbmc-pbx-addon/bgservice.py
+++ b/script.xbmc-pbx-addon/bgservice.py
@@ -12,7 +12,7 @@ __addon__ = "XBMC PBX Addon"
__addon_id__ = "script.xbmc-pbx-addon"
__author__ = "hmronline"
__url__ = "http://code.google.com/p/xbmc-pbx-addon/";
-__version__ = "1.0.8"
+__version__ = "1.0.9"
# Modules
import sys, os
@@ -67,8 +67,17 @@ class get_incoming_call(object):
def NewChannel(self,pbx,event):
settings = xbmcaddon.Addon(__addon_id__)
DEBUG = settings.getSetting("xbmc_debug")
- arr_chan_states = ['Down','Ring']
- asterisk_chan_state =
str(arr_chan_states[int(settings.getSetting("asterisk_chan_state"))])
+ arr_chan_states = ['Down','Ring','Auto']
+ asterisk_chan_state = settings.getSetting("asterisk_chan_state")
+ if (asterisk_chan_state == "2"):
+ if (self.asterisk_series == "1.4"):
+ # Asterisk 1.4
+ asterisk_chan_state = "0"
+ else:
+ # Asterisk 1.6+
+ asterisk_chan_state = "1"
+ settings.setSetting("asterisk_chan_state",asterisk_chan_state)
+ asterisk_chan_state = str(arr_chan_states[int(asterisk_chan_state)])
del settings
self.DEBUG = False
if (DEBUG == "true"):
@@ -235,8 +244,8 @@ try:
pbx = Manager(manager_host_port,manager_user,manager_pass)
asterisk_version = str(pbx.Command("core show version")[1])
asterisk_series = asterisk_version[9:12]
+ log(">> Asterisk " + asterisk_series)
if (DEBUG == "true"): log(">> " + asterisk_version)
- log(">> Asterisk: " + asterisk_series)
vm_count = str(pbx.MailboxCount(vm)[0])
xbmc_notification = __language__(30053) + vm_count
xbmc_img =
xbmc.translatePath(os.path.join(RESOURCE_PATH,'media','xbmc-pbx-addon.png'))
diff --git a/script.xbmc-pbx-addon/changelog.txt
b/script.xbmc-pbx-addon/changelog.txt
index c872bdd..e93e860 100644
--- a/script.xbmc-pbx-addon/changelog.txt
+++ b/script.xbmc-pbx-addon/changelog.txt
@@ -1,5 +1,12 @@
= Changelog =
+== 1.0.9 ==
+ * Restored autoexec.py which is still needed for Dharma;
+ * Added option to Auto-select NewChannel State setting based on Asterisk
Version;
+ * Added the ability to call back numbers from the voicemail list;
+ * Added a Dialpad (keyboard input) to initiate phone calls;
+ * Some other minor changes;
+
== 1.0.8 ==
* Updated images (fanart and icons) to comply with this guideline:
http://wiki.xbmc.org/index.php?title=Add-ons_for_XBMC_%28Development%29
* Removed (unnecessary) check for Linux64 that was causing trouble with XBMC
Eden(-pre). Thanks freebs (XBMC Forum member);
diff --git a/script.xbmc-pbx-addon/default.py b/script.xbmc-pbx-addon/default.py
index eceee59..5e2ac78 100644
--- a/script.xbmc-pbx-addon/default.py
+++ b/script.xbmc-pbx-addon/default.py
@@ -12,7 +12,7 @@ __addon__ = "XBMC PBX Addon"
__addon_id__ = "script.xbmc-pbx-addon"
__author__ = "hmronline"
__url__ = "http://code.google.com/p/xbmc-pbx-addon/";
-__version__ = "1.0.8"
+__version__ = "1.0.9"
# Modules
import sys, os
@@ -88,9 +88,10 @@ class MainGUI(xbmcgui.WindowXML):
def skinSetup(self):
log("> skinSetup()")
if (__os__ == 'xbox'): xbmcgui.lock()
- self.getControl(109).setLabel(__language__(30107)) # CDR toggle button
self.getControl(110).setLabel(__language__(30101)) # CDR toggle button
self.getControl(111).setLabel(__language__(30102)) # VM toggle button
+ self.getControl(109).setLabel(__language__(30107)) # Refresh button
+ self.getControl(108).setLabel(__language__(30108)) # Dialer button
self.getControl(112).setLabel(__language__(30103)) # Settings button
self.getControl(140).setLabel(__language__(30130)) # CDR - start
self.getControl(141).setLabel(__language__(30116)) # CDR - channel
@@ -119,8 +120,10 @@ class MainGUI(xbmcgui.WindowXML):
del settings
pbx = Manager(manager_host_port,manager_user,manager_pass)
asterisk_version = str(pbx.Command("core show version")[1])
+ asterisk_series = asterisk_version[9:12]
del pbx
- log(">> " + asterisk_version)
+ log(">> Asterisk " + asterisk_series)
+ if (DEBUG): log(">> " + asterisk_version)
str_url = str_url +"?vm&cdr&mailbox="+ asterisk_vm_mailbox
str_url = str_url +"&vmcontext="+ asterisk_vm_context
if (self.DEBUG):
@@ -191,16 +194,33 @@ class MainGUI(xbmcgui.WindowXML):
dialog = xbmcgui.Dialog()
if (dialog.yesno(__addon__,__language__(30105))):
self.play_voice_mail(recindex)
+ else:
+ # Callback
+ del dialog
+ number_to_call =
self.getControl(121).getSelectedItem().getProperty("callerid")
+ number_to_call = number_to_call.split('<')[0]
+ if (number_to_call != ""):
+ dialog = xbmcgui.Dialog()
+ if (dialog.yesno(__addon__,__language__(30104) + " '"
+ number_to_call + "'?")):
+ self.make_outgoing_call(number_to_call)
del dialog
+ # Refresh
+ elif (controlId == 109):
+ self.onInit()
+ # Dialer
+ elif (controlId == 108):
+ kb = xbmc.Keyboard('',__language__(30108))
+ kb.doModal()
+ if (kb.isConfirmed()):
+ number_to_call = kb.getText()
+ if (number_to_call != ""):
+ self.make_outgoing_call(number_to_call)
# Settings
elif (controlId == 112):
settings = xbmcaddon.Addon(__addon_id__)
settings.openSettings()
del settings
self.onInit()
- # Refresh
- elif (controlId == 109):
- self.onInit()
def onFocus(self,controlId):
pass
@@ -243,6 +263,7 @@ class MainGUI(xbmcgui.WindowXML):
if (self.url_vm != ""):
dialog = xbmcgui.Dialog()
if (dialog.yesno(__addon__,__language__(30106))):
+ # Delete Voice Mail
self.delete_voice_mail()
self.onInit()
del dialog
diff --git a/script.xbmc-pbx-addon/resources/language/English/strings.xml
b/script.xbmc-pbx-addon/resources/language/English/strings.xml
index ce7ef55..78e68b4 100644
--- a/script.xbmc-pbx-addon/resources/language/English/strings.xml
+++ b/script.xbmc-pbx-addon/resources/language/English/strings.xml
@@ -61,6 +61,7 @@
<string id="30105">Play Voice Mail?</string>
<string id="30106">Delete Voice Mail?</string>
<string id="30107">Refresh</string>
+ <string id="30108">Dialpad</string>
<!-- CDR -->
<string id="30110">Call Detail Record</string>
<string id="30111">Account Code</string>
diff --git a/script.xbmc-pbx-addon/resources/settings.xml
b/script.xbmc-pbx-addon/resources/settings.xml
index 83e09bc..aa085dd 100644
--- a/script.xbmc-pbx-addon/resources/settings.xml
+++ b/script.xbmc-pbx-addon/resources/settings.xml
@@ -38,7 +38,7 @@
<!-- Asterisk Inbound calls related settings -->
<setting id="separator" type="lsep" label="30020"/>
<setting id="xbmc_oncall" type="text" label="30021" default=""
enable="false"/>
- <setting id="asterisk_chan_state" type="enum" label="30022"
values="Down|Ring" default="1"/>
+ <setting id="asterisk_chan_state" type="enum" label="30022"
values="Down|Ring|Auto" default="2"/>
<setting id="asterisk_cid_alert_info" type="text" label="30023"
default=""/>
<setting id="xbmc_oncall_notification" type="bool" label="30024"
default="true"/>
<setting id="xbmc_oncall_notification_timeout" type="enum"
label="30025" values="5|10|15|20|25|30" default="2"/>
diff --git a/script.xbmc-pbx-addon/resources/skins/Default/720p/main_gui.xml
b/script.xbmc-pbx-addon/resources/skins/Default/720p/main_gui.xml
index 8519ee4..5abbf35 100644
--- a/script.xbmc-pbx-addon/resources/skins/Default/720p/main_gui.xml
+++ b/script.xbmc-pbx-addon/resources/skins/Default/720p/main_gui.xml
@@ -57,18 +57,30 @@
<!--<label>$LOCALIZE[30107]</label>-->
<font>special12</font>
<onleft>111</onleft>
+ <onright>108</onright>
+ <ondown>113</ondown>
+ </control>
+ <control type="button" id="108">
+ <description>Dialer button</description>
+ <posx>940</posx>
+ <posy>35</posy>
+ <width>150</width>
+ <align>left</align>
+ <!--<label>$LOCALIZE[30108]</label>-->
+ <font>special12</font>
+ <onleft>109</onleft>
<onright>112</onright>
<ondown>113</ondown>
</control>
<control type="button" id="112">
<description>Settings button</description>
- <posx>950</posx>
+ <posx>1110</posx>
<posy>35</posy>
<width>150</width>
<align>left</align>
<!--<label>$LOCALIZE[30103]</label>-->
<font>special12</font>
- <onleft>109</onleft>
+ <onleft>108</onleft>
<onright>110</onright>
<ondown>113</ondown>
</control>
-----------------------------------------------------------------------
Summary of changes:
script.xbmc-pbx-addon/addon.xml | 2 +-
.../backend_files/xbmc-pbx-addon.php | 2 +-
script.xbmc-pbx-addon/bgservice.py | 17 ++++++++--
script.xbmc-pbx-addon/changelog.txt | 7 ++++
script.xbmc-pbx-addon/default.py | 33 ++++++++++++++++---
.../resources/language/English/strings.xml | 1 +
script.xbmc-pbx-addon/resources/settings.xml | 2 +-
.../resources/skins/Default/720p/main_gui.xml | 16 ++++++++-
8 files changed, 65 insertions(+), 15 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA
Learn about the latest advances in developing for the
BlackBerry® mobile platform with sessions, labs & more.
See new tools and technologies. Register for BlackBerry® DevCon today!
http://p.sf.net/sfu/rim-devcon-copy1
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
