The branch, dharma-pre has been updated
via fbd812239fe2df16448e1a76c3b9c6c3abf2fa39 (commit)
from 6d1d428772ab27f6f279fabd2cfa6279036785fb (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=fbd812239fe2df16448e1a76c3b9c6c3abf2fa39
commit fbd812239fe2df16448e1a76c3b9c6c3abf2fa39
Author: spiff <[email protected]>
Date: Sat Nov 20 15:57:50 2010 +0100
[plugin.program.mceremote] updated to version 1.1.15
diff --git a/plugin.program.mceremote/ReadMeFirst.txt
b/plugin.program.mceremote/ReadMeFirst.txt
index ce0c41c..4448129 100644
--- a/plugin.program.mceremote/ReadMeFirst.txt
+++ b/plugin.program.mceremote/ReadMeFirst.txt
@@ -108,13 +108,25 @@ Edit keyboard.xml
If you tweak the button settings you might want to write a keyboard.xml
file to make XBMC take whatever action you want on your customised
-keypress. The sixth option "Edit keyboard.xml" will open your
-keyboard.xml in Notepad. One day someone will write a dedicated
-keyboard.xml editor, but for now Notepad is the best I can do!
+keypress. The sixth option "Edit keyboard.xml" will edit your
+keyboard.xml.
-If you don't already have a keyboard.xml you'll be asked if you want to
-create one. Answer yes to create a template keyboard.xml that you can
-modify to your requirements.
+As first installed, MCERemote will ask if you want to download a keymap
+editor applet. If you answer "No" it won't nag you again. If you
+subsequently want to download the keymap editor go into the addon
+settings, and under the Misc section enable "Update/install keymap
+editor". When you next select "Edit keyboard.xml" you'll be prompted to
+download the keymap editor.
+
+If you don't download the keymap editor your keyboard.xml will be
+opened in Notepad.
+
+NB if you don't already have a keyboard.xml you'll be asked if you want
+to create one. Answer yes to create a template keyboard.xml that you
+can modify to your requirements.
+
+There isn't a manual for the keymap editor since it hould be pretty
+obvious how to use it.
John Rennie
-16th November 2010
+20th November 2010
diff --git a/plugin.program.mceremote/addon.xml
b/plugin.program.mceremote/addon.xml
index 75ae405..9ee91d3 100644
--- a/plugin.program.mceremote/addon.xml
+++ b/plugin.program.mceremote/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.program.mceremote"
name="MCERemote"
- version="1.1.0"
+ version="1.1.15"
provider-name="John Rennie">
<requires>
<import addon="xbmc.gui" version="2.11"/>
diff --git a/plugin.program.mceremote/changelog.txt
b/plugin.program.mceremote/changelog.txt
index 3a033cf..a6c8508 100644
--- a/plugin.program.mceremote/changelog.txt
+++ b/plugin.program.mceremote/changelog.txt
@@ -1,3 +1,6 @@
+[B]Version 1.1.15 20th Nov 2010[/B]
+- Fix minor bug in keymap editor download.
+
[B]Version 1.1.0 16th Nov 2010[/B]
- Now uses KeyMapEdit to edit the keyboard.xml.
diff --git a/plugin.program.mceremote/default.py
b/plugin.program.mceremote/default.py
index 2bc1a9f..1b3d947 100644
--- a/plugin.program.mceremote/default.py
+++ b/plugin.program.mceremote/default.py
@@ -2,7 +2,7 @@
************************************************************************
MCERemote Addon
Author: John Rennie
-v1.1.0 16th Nov 2010
+v1.1.15 16th Nov 2010
This addon allows you to configure a Microsoft MCE remote, or any
compatible remote using the eHome driver.
@@ -445,15 +445,6 @@ def EditKeyboardDotXML():
dialog = xbmcgui.Dialog()
-# Check whether keyboard.xml exists
-
- dstpath = xbmc.translatePath("special://home/") +
"userdata\\keymaps\\keyboard.xml"
- if not os.path.isfile(dstpath):
- if dialog.yesno("MCERemote", "You don't currently have a keyboard.xml
file.", "Do you want to create one?"):
- CreateKeyboardDotXML()
- else:
- return
-
# Check if we are updating KeyMapEdit.exe
doupdate = _settings.getSetting("update_keyedit")
@@ -464,6 +455,15 @@ def EditKeyboardDotXML():
else:
return
+# Check whether keyboard.xml exists
+
+ dstpath = xbmc.translatePath("special://home/") +
"userdata\\keymaps\\keyboard.xml"
+ if not os.path.isfile(dstpath):
+ if dialog.yesno("MCERemote", "You don't currently have a keyboard.xml
file.", "Do you want to create one?"):
+ CreateKeyboardDotXML()
+ else:
+ return
+
# Select the keymap editor: if KeyMapEdit.exe exists use it, otherwise
# use Notepad.
@@ -529,7 +529,7 @@ def CreateKeyboardDotXML():
if not dialog.yesno("MCERemote", "A keyboard.xml already exists in:",
dstpath, "Do you want to overwrite it?"):
return
- elif not dialog.yesno("MCERemote", "Create the template keybaord.xml in:",
dstpath):
+ elif not dialog.yesno("MCERemote", "Create the template keyboard.xml in:",
dstpath):
return
# Copy the template keyboard.xml
@@ -539,14 +539,6 @@ def CreateKeyboardDotXML():
except:
dialog.ok("MCERemote", "Unexpected error copying the file")
-# Optionally the keyboard.xml in Notepad
-
- if dialog.yesno("MCERemote", "Edit the keyboard.xml now?"):
- child = subprocess.Popen('notepad.exe "' + dstpath + '"')
- rc = child.wait()
- ourpath = xbmc.translatePath("special://xbmcbin/")
- child = subprocess.Popen(ourpath + "XBMC.exe")
-
# **********************************************************************
# GetKeyMapEdit
diff --git a/plugin.program.mceremote/resources/settings.xml
b/plugin.program.mceremote/resources/settings.xml
index a71cf88..4afc5b3 100644
--- a/plugin.program.mceremote/resources/settings.xml
+++ b/plugin.program.mceremote/resources/settings.xml
@@ -13,7 +13,7 @@
<setting id="button_9" type="text" label="40009" default="9"
/>
<setting id="button_clear" type="text" label="40010" default="escape"
/>
<setting id="button_enter" type="text" label="40011" default="return"
/>
- <setting id="button_power" type="text" label="40012" default="mce"
/>
+ <setting id="button_power" type="text" label="40012" default="mce"
/>
<setting id="button_windows" type="text" label="40013"
default="ctrl-shift-w" />
<setting id="button_mute" type="text" label="40014" default="f8"
/>
<setting id="button_info" type="text" label="40015" default="ctrl-d"
/>
@@ -54,6 +54,6 @@
<setting id="button_blue" type="text" label="40094"
default="ctrl-alt-4" />
</category>
<category label="49998">
- <setting id="update_keyedit" type="bool" label="41000" default="yes"
/>
+ <setting id="update_keyedit" type="bool" label="41000" default="yes" />
</category>
</settings>
-----------------------------------------------------------------------
Summary of changes:
plugin.program.mceremote/ReadMeFirst.txt | 26 ++++++++++++++-----
plugin.program.mceremote/addon.xml | 2 +-
plugin.program.mceremote/changelog.txt | 3 ++
plugin.program.mceremote/default.py | 30 ++++++++--------------
plugin.program.mceremote/resources/settings.xml | 4 +-
5 files changed, 36 insertions(+), 29 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today
http://p.sf.net/sfu/msIE9-sfdev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
