Menu
▾
▴
mp-plugins-svn — SVN Update mailing list
You can subscribe to this list here.
| 2007 |
Jan
(36) |
Feb
(79) |
Mar
(123) |
Apr
(95) |
May
(119) |
Jun
(172) |
Jul
(124) |
Aug
(100) |
Sep
(83) |
Oct
(52) |
Nov
(97) |
Dec
(87) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(131) |
Feb
(80) |
Mar
(163) |
Apr
(178) |
May
(73) |
Jun
(54) |
Jul
(106) |
Aug
(118) |
Sep
(50) |
Oct
(125) |
Nov
(100) |
Dec
(99) |
| 2009 |
Jan
(104) |
Feb
(99) |
Mar
(68) |
Apr
(81) |
May
(52) |
Jun
(87) |
Jul
(67) |
Aug
(33) |
Sep
(27) |
Oct
(37) |
Nov
(60) |
Dec
(116) |
| 2010 |
Jan
(82) |
Feb
(79) |
Mar
(38) |
Apr
(50) |
May
(45) |
Jun
(53) |
Jul
(23) |
Aug
(86) |
Sep
(22) |
Oct
(96) |
Nov
(97) |
Dec
(73) |
| 2011 |
Jan
(24) |
Feb
(45) |
Mar
(28) |
Apr
(31) |
May
(42) |
Jun
(25) |
Jul
|
Aug
(12) |
Sep
(28) |
Oct
(13) |
Nov
(43) |
Dec
(13) |
| 2012 |
Jan
(62) |
Feb
(28) |
Mar
(6) |
Apr
(16) |
May
(7) |
Jun
|
Jul
(16) |
Aug
(2) |
Sep
(1) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
| 2013 |
Jan
(5) |
Feb
|
Mar
(34) |
Apr
(9) |
May
(6) |
Jun
(10) |
Jul
(32) |
Aug
(8) |
Sep
(11) |
Oct
(35) |
Nov
(24) |
Dec
(22) |
| 2014 |
Jan
(44) |
Feb
(9) |
Mar
(9) |
Apr
(15) |
May
(25) |
Jun
(34) |
Jul
(16) |
Aug
(11) |
Sep
(7) |
Oct
(6) |
Nov
(1) |
Dec
(12) |
| 2015 |
Jan
(33) |
Feb
(19) |
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2023 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(5) |
|
From: <rs...@us...> - 2011-11-23 11:33:27
|
Revision: 4339
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4339&view=rev
Author: rsenden
Date: 2011-11-23 11:33:17 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
Changed keyboard hook mechanism; hook now runs in own thread and invokes MP actions asynchronously. This should prevent hook time-outs under Win7.
Modified Paths:
--------------
trunk/plugins/KeyboardInputPlugin/HISTORY.HTML
trunk/plugins/KeyboardInputPlugin/MPE/KeyboardInputPlugin.mpe1
trunk/plugins/KeyboardInputPlugin/MPE/KeyboardInputPlugin.xmp2
trunk/plugins/KeyboardInputPlugin/MPE/update.xml
trunk/plugins/KeyboardInputPlugin/README.HTML
trunk/plugins/KeyboardInputPlugin/README_files/filelist.xml
trunk/plugins/KeyboardInputPlugin/README_files/image003.jpg
trunk/plugins/KeyboardInputPlugin/Release/plugins/process/KeyboardInputPlugin.dll
trunk/plugins/KeyboardInputPlugin/Source/KeyboardInputPlugin/InputHandler.cs
trunk/plugins/KeyboardInputPlugin/Source/KeyboardInputPlugin/KeyboardHandler.cs
trunk/plugins/KeyboardInputPlugin/Source/KeyboardInputPlugin/KeyboardInputPlugin.csproj
trunk/plugins/KeyboardInputPlugin/Source/KeyboardInputPlugin/KeyboardInputPluginMain.cs
trunk/plugins/KeyboardInputPlugin/Source/KeyboardInputPlugin/Properties/AssemblyInfo.cs
trunk/plugins/KeyboardInputPlugin/Source/KeyboardInputPlugin.suo
Added Paths:
-----------
trunk/plugins/KeyboardInputPlugin/HISTORY_files/
trunk/plugins/KeyboardInputPlugin/HISTORY_files/colorschememapping.xml
trunk/plugins/KeyboardInputPlugin/HISTORY_files/filelist.xml
trunk/plugins/KeyboardInputPlugin/HISTORY_files/themedata.thmx
trunk/plugins/KeyboardInputPlugin/MPE/KeyboardInputPlugin/
Modified: trunk/plugins/KeyboardInputPlugin/HISTORY.HTML
===================================================================
--- trunk/plugins/KeyboardInputPlugin/HISTORY.HTML 2011-11-21 20:29:56 UTC (rev 4338)
+++ trunk/plugins/KeyboardInputPlugin/HISTORY.HTML 2011-11-23 11:33:17 UTC (rev 4339)
@@ -1,152 +1,1042 @@
-<html xmlns="http://www.w3.org/TR/REC-html40">
+<html xmlns:v="urn:schemas-microsoft-com:vml"
+xmlns:o="urn:schemas-microsoft-com:office:office"
+xmlns:w="urn:schemas-microsoft-com:office:word"
+xmlns:m="http://schemas.microsoft.com/office/2004/12/omml"
+xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
+<meta name=ProgId content=Word.Document>
+<meta name=Generator content="Microsoft Word 12">
+<meta name=Originator content="Microsoft Word 12">
+<link rel=File-List href="HISTORY_files/filelist.xml">
<title>KeyboardInputPlugin History</title>
+<!--[if gte mso 9]><xml>
+ <o:DocumentProperties>
+ <o:Author>Ruud Senden</o:Author>
+ <o:LastAuthor>Ruud Senden</o:LastAuthor>
+ <o:Revision>2</o:Revision>
+ <o:TotalTime>40</o:TotalTime>
+ <o:Created>2011-11-23T10:40:00Z</o:Created>
+ <o:LastSaved>2011-11-23T11:20:00Z</o:LastSaved>
+ <o:Pages>2</o:Pages>
+ <o:Words>916</o:Words>
+ <o:Characters>5044</o:Characters>
+ <o:Lines>42</o:Lines>
+ <o:Paragraphs>11</o:Paragraphs>
+ <o:CharactersWithSpaces>5949</o:CharactersWithSpaces>
+ <o:Version>12.00</o:Version>
+ </o:DocumentProperties>
+</xml><![endif]-->
+<link rel=themeData href="HISTORY_files/themedata.thmx">
+<link rel=colorSchemeMapping href="HISTORY_files/colorschememapping.xml">
+<!--[if gte mso 9]><xml>
+ <w:WordDocument>
+ <w:TrackMoves>false</w:TrackMoves>
+ <w:TrackFormatting/>
+ <w:HyphenationZone>21</w:HyphenationZone>
+ <w:ValidateAgainstSchemas/>
+ <w:SaveIfXMLInvalid>false</w:SaveIfXMLInvalid>
+ <w:IgnoreMixedContent>false</w:IgnoreMixedContent>
+ <w:AlwaysShowPlaceholderText>false</w:AlwaysShowPlaceholderText>
+ <w:DoNotPromoteQF/>
+ <w:LidThemeOther>NL</w:LidThemeOther>
+ <w:LidThemeAsian>ZH-CN</w:LidThemeAsian>
+ <w:LidThemeComplexScript>X-NONE</w:LidThemeComplexScript>
+ <w:Compatibility>
+ <w:BreakWrappedTables/>
+ <w:SnapToGridInCell/>
+ <w:WrapTextWithPunct/>
+ <w:UseAsianBreakRules/>
+ <w:DontGrowAutofit/>
+ <w:SplitPgBreakAndParaMark/>
+ <w:DontVertAlignCellWithSp/>
+ <w:DontBreakConstrainedForcedTables/>
+ <w:DontVertAlignInTxbx/>
+ <w:Word11KerningPairs/>
+ <w:CachedColBalance/>
+ </w:Compatibility>
+ <w:BrowserLevel>MicrosoftInternetExplorer4</w:BrowserLevel>
+ <m:mathPr>
+ <m:mathFont m:val="Cambria Math"/>
+ <m:brkBin m:val="before"/>
+ <m:brkBinSub m:val="--"/>
+ <m:smallFrac m:val="off"/>
+ <m:dispDef/>
+ <m:lMargin m:val="0"/>
+ <m:rMargin m:val="0"/>
+ <m:defJc m:val="centerGroup"/>
+ <m:wrapIndent m:val="1440"/>
+ <m:intLim m:val="subSup"/>
+ <m:naryLim m:val="undOvr"/>
+ </m:mathPr></w:WordDocument>
+</xml><![endif]--><!--[if gte mso 9]><xml>
+ <w:LatentStyles DefLockedState="false" DefUnhideWhenUsed="true"
+ DefSemiHidden="true" DefQFormat="false" DefPriority="99"
+ LatentStyleCount="267">
+ <w:LsdException Locked="false" Priority="0" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Normal"/>
+ <w:LsdException Locked="false" Priority="9" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="heading 1"/>
+ <w:LsdException Locked="false" Priority="9" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="heading 2"/>
+ <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 3"/>
+ <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 4"/>
+ <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 5"/>
+ <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 6"/>
+ <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 7"/>
+ <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 8"/>
+ <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 9"/>
+ <w:LsdException Locked="false" Priority="39" Name="toc 1"/>
+ <w:LsdException Locked="false" Priority="39" Name="toc 2"/>
+ <w:LsdException Locked="false" Priority="39" Name="toc 3"/>
+ <w:LsdException Locked="false" Priority="39" Name="toc 4"/>
+ <w:LsdException Locked="false" Priority="39" Name="toc 5"/>
+ <w:LsdException Locked="false" Priority="39" Name="toc 6"/>
+ <w:LsdException Locked="false" Priority="39" Name="toc 7"/>
+ <w:LsdException Locked="false" Priority="39" Name="toc 8"/>
+ <w:LsdException Locked="false" Priority="39" Name="toc 9"/>
+ <w:LsdException Locked="false" Priority="35" QFormat="true" Name="caption"/>
+ <w:LsdException Locked="false" Priority="10" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Title"/>
+ <w:LsdException Locked="false" Priority="1" Name="Default Paragraph Font"/>
+ <w:LsdException Locked="false" Priority="11" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Subtitle"/>
+ <w:LsdException Locked="false" Priority="22" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Strong"/>
+ <w:LsdException Locked="false" Priority="20" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Emphasis"/>
+ <w:LsdException Locked="false" Priority="59" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Table Grid"/>
+ <w:LsdException Locked="false" UnhideWhenUsed="false" Name="Placeholder Text"/>
+ <w:LsdException Locked="false" Priority="1" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="No Spacing"/>
+ <w:LsdException Locked="false" Priority="60" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Shading"/>
+ <w:LsdException Locked="false" Priority="61" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light List"/>
+ <w:LsdException Locked="false" Priority="62" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Grid"/>
+ <w:LsdException Locked="false" Priority="63" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 1"/>
+ <w:LsdException Locked="false" Priority="64" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 2"/>
+ <w:LsdException Locked="false" Priority="65" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 1"/>
+ <w:LsdException Locked="false" Priority="66" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 2"/>
+ <w:LsdException Locked="false" Priority="67" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 1"/>
+ <w:LsdException Locked="false" Priority="68" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 2"/>
+ <w:LsdException Locked="false" Priority="69" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 3"/>
+ <w:LsdException Locked="false" Priority="70" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Dark List"/>
+ <w:LsdException Locked="false" Priority="71" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Shading"/>
+ <w:LsdException Locked="false" Priority="72" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful List"/>
+ <w:LsdException Locked="false" Priority="73" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Grid"/>
+ <w:LsdException Locked="false" Priority="60" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Shading Accent 1"/>
+ <w:LsdException Locked="false" Priority="61" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light List Accent 1"/>
+ <w:LsdException Locked="false" Priority="62" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Grid Accent 1"/>
+ <w:LsdException Locked="false" Priority="63" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 1 Accent 1"/>
+ <w:LsdException Locked="false" Priority="64" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 2 Accent 1"/>
+ <w:LsdException Locked="false" Priority="65" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 1 Accent 1"/>
+ <w:LsdException Locked="false" UnhideWhenUsed="false" Name="Revision"/>
+ <w:LsdException Locked="false" Priority="34" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="List Paragraph"/>
+ <w:LsdException Locked="false" Priority="29" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Quote"/>
+ <w:LsdException Locked="false" Priority="30" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Intense Quote"/>
+ <w:LsdException Locked="false" Priority="66" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 2 Accent 1"/>
+ <w:LsdException Locked="false" Priority="67" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 1 Accent 1"/>
+ <w:LsdException Locked="false" Priority="68" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 2 Accent 1"/>
+ <w:LsdException Locked="false" Priority="69" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 3 Accent 1"/>
+ <w:LsdException Locked="false" Priority="70" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Dark List Accent 1"/>
+ <w:LsdException Locked="false" Priority="71" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Shading Accent 1"/>
+ <w:LsdException Locked="false" Priority="72" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful List Accent 1"/>
+ <w:LsdException Locked="false" Priority="73" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Grid Accent 1"/>
+ <w:LsdException Locked="false" Priority="60" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Shading Accent 2"/>
+ <w:LsdException Locked="false" Priority="61" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light List Accent 2"/>
+ <w:LsdException Locked="false" Priority="62" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Grid Accent 2"/>
+ <w:LsdException Locked="false" Priority="63" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 1 Accent 2"/>
+ <w:LsdException Locked="false" Priority="64" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 2 Accent 2"/>
+ <w:LsdException Locked="false" Priority="65" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 1 Accent 2"/>
+ <w:LsdException Locked="false" Priority="66" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 2 Accent 2"/>
+ <w:LsdException Locked="false" Priority="67" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 1 Accent 2"/>
+ <w:LsdException Locked="false" Priority="68" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 2 Accent 2"/>
+ <w:LsdException Locked="false" Priority="69" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 3 Accent 2"/>
+ <w:LsdException Locked="false" Priority="70" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Dark List Accent 2"/>
+ <w:LsdException Locked="false" Priority="71" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Shading Accent 2"/>
+ <w:LsdException Locked="false" Priority="72" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful List Accent 2"/>
+ <w:LsdException Locked="false" Priority="73" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Grid Accent 2"/>
+ <w:LsdException Locked="false" Priority="60" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Shading Accent 3"/>
+ <w:LsdException Locked="false" Priority="61" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light List Accent 3"/>
+ <w:LsdException Locked="false" Priority="62" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Grid Accent 3"/>
+ <w:LsdException Locked="false" Priority="63" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 1 Accent 3"/>
+ <w:LsdException Locked="false" Priority="64" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 2 Accent 3"/>
+ <w:LsdException Locked="false" Priority="65" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 1 Accent 3"/>
+ <w:LsdException Locked="false" Priority="66" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 2 Accent 3"/>
+ <w:LsdException Locked="false" Priority="67" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 1 Accent 3"/>
+ <w:LsdException Locked="false" Priority="68" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 2 Accent 3"/>
+ <w:LsdException Locked="false" Priority="69" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 3 Accent 3"/>
+ <w:LsdException Locked="false" Priority="70" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Dark List Accent 3"/>
+ <w:LsdException Locked="false" Priority="71" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Shading Accent 3"/>
+ <w:LsdException Locked="false" Priority="72" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful List Accent 3"/>
+ <w:LsdException Locked="false" Priority="73" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Grid Accent 3"/>
+ <w:LsdException Locked="false" Priority="60" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Shading Accent 4"/>
+ <w:LsdException Locked="false" Priority="61" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light List Accent 4"/>
+ <w:LsdException Locked="false" Priority="62" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Grid Accent 4"/>
+ <w:LsdException Locked="false" Priority="63" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 1 Accent 4"/>
+ <w:LsdException Locked="false" Priority="64" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 2 Accent 4"/>
+ <w:LsdException Locked="false" Priority="65" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 1 Accent 4"/>
+ <w:LsdException Locked="false" Priority="66" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 2 Accent 4"/>
+ <w:LsdException Locked="false" Priority="67" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 1 Accent 4"/>
+ <w:LsdException Locked="false" Priority="68" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 2 Accent 4"/>
+ <w:LsdException Locked="false" Priority="69" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 3 Accent 4"/>
+ <w:LsdException Locked="false" Priority="70" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Dark List Accent 4"/>
+ <w:LsdException Locked="false" Priority="71" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Shading Accent 4"/>
+ <w:LsdException Locked="false" Priority="72" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful List Accent 4"/>
+ <w:LsdException Locked="false" Priority="73" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Grid Accent 4"/>
+ <w:LsdException Locked="false" Priority="60" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Shading Accent 5"/>
+ <w:LsdException Locked="false" Priority="61" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light List Accent 5"/>
+ <w:LsdException Locked="false" Priority="62" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Grid Accent 5"/>
+ <w:LsdException Locked="false" Priority="63" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 1 Accent 5"/>
+ <w:LsdException Locked="false" Priority="64" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 2 Accent 5"/>
+ <w:LsdException Locked="false" Priority="65" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 1 Accent 5"/>
+ <w:LsdException Locked="false" Priority="66" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 2 Accent 5"/>
+ <w:LsdException Locked="false" Priority="67" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 1 Accent 5"/>
+ <w:LsdException Locked="false" Priority="68" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 2 Accent 5"/>
+ <w:LsdException Locked="false" Priority="69" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 3 Accent 5"/>
+ <w:LsdException Locked="false" Priority="70" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Dark List Accent 5"/>
+ <w:LsdException Locked="false" Priority="71" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Shading Accent 5"/>
+ <w:LsdException Locked="false" Priority="72" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful List Accent 5"/>
+ <w:LsdException Locked="false" Priority="73" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Grid Accent 5"/>
+ <w:LsdException Locked="false" Priority="60" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Shading Accent 6"/>
+ <w:LsdException Locked="false" Priority="61" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light List Accent 6"/>
+ <w:LsdException Locked="false" Priority="62" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Grid Accent 6"/>
+ <w:LsdException Locked="false" Priority="63" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 1 Accent 6"/>
+ <w:LsdException Locked="false" Priority="64" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 2 Accent 6"/>
+ <w:LsdException Locked="false" Priority="65" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 1 Accent 6"/>
+ <w:LsdException Locked="false" Priority="66" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 2 Accent 6"/>
+ <w:LsdException Locked="false" Priority="67" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 1 Accent 6"/>
+ <w:LsdException Locked="false" Priority="68" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 2 Accent 6"/>
+ <w:LsdException Locked="false" Priority="69" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 3 Accent 6"/>
+ <w:LsdException Locked="false" Priority="70" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Dark List Accent 6"/>
+ <w:LsdException Locked="false" Priority="71" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Shading Accent 6"/>
+ <w:LsdException Locked="false" Priority="72" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful List Accent 6"/>
+ <w:LsdException Locked="false" Priority="73" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Grid Accent 6"/>
+ <w:LsdException Locked="false" Priority="19" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Subtle Emphasis"/>
+ <w:LsdException Locked="false" Priority="21" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Intense Emphasis"/>
+ <w:LsdException Locked="false" Priority="31" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Subtle Reference"/>
+ <w:LsdException Locked="false" Priority="32" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Intense Reference"/>
+ <w:LsdException Locked="false" Priority="33" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Book Title"/>
+ <w:LsdException Locked="false" Priority="37" Name="Bibliography"/>
+ <w:LsdException Locked="false" Priority="39" QFormat="true" Name="TOC Heading"/>
+ </w:LatentStyles>
+</xml><![endif]-->
+<style>
+<!--
+ /* Font Definitions */
+ @font-face
+ {font-family:Wingdings;
+ panose-1:5 0 0 0 0 0 0 0 0 0;
+ mso-font-charset:2;
+ mso-generic-font-family:auto;
+ mso-font-pitch:variable;
+ mso-font-signature:0 268435456 0 0 -2147483648 0;}
+@font-face
+ {font-family:"Cambria Math";
+ panose-1:2 4 5 3 5 4 6 3 2 4;
+ mso-font-charset:1;
+ mso-generic-font-family:roman;
+ mso-font-format:other;
+ mso-font-pitch:variable;
+ mso-font-signature:0 0 0 0 0 0;}
+ /* Style Definitions */
+ p.MsoNormal, li.MsoNormal, div.MsoNormal
+ {mso-style-unhide:no;
+ mso-style-qformat:yes;
+ mso-style-parent:"";
+ margin:0cm;
+ margin-bottom:.0001pt;
+ mso-pagination:widow-orphan;
+ font-size:12.0pt;
+ font-family:"Times New Roman","serif";
+ mso-fareast-font-family:SimSun;
+ mso-fareast-theme-font:minor-fareast;}
+h1
+ {mso-style-priority:9;
+ mso-style-unhide:no;
+ mso-style-qformat:yes;
+ mso-style-link:"Heading 1 Char";
+ mso-margin-top-alt:auto;
+ margin-right:0cm;
+ mso-margin-bottom-alt:auto;
+ margin-left:0cm;
+ mso-pagination:widow-orphan;
+ mso-outline-level:1;
+ font-size:24.0pt;
+ font-family:"Times New Roman","serif";
+ mso-fareast-font-family:SimSun;
+ mso-fareast-theme-font:minor-fareast;}
+h2
+ {mso-style-priority:9;
+ mso-style-unhide:no;
+ mso-style-qformat:yes;
+ mso-style-link:"Heading 2 Char";
+ mso-margin-top-alt:auto;
+ margin-right:0cm;
+ mso-margin-bottom-alt:auto;
+ margin-left:0cm;
+ mso-pagination:widow-orphan;
+ mso-outline-level:2;
+ font-size:18.0pt;
+ font-family:"Times New Roman","serif";
+ mso-fareast-font-family:SimSun;
+ mso-fareast-theme-font:minor-fareast;}
+span.Heading1Char
+ {mso-style-name:"Heading 1 Char";
+ mso-style-priority:9;
+ mso-style-unhide:no;
+ mso-style-locked:yes;
+ mso-style-link:"Heading 1";
+ mso-ansi-font-size:14.0pt;
+ mso-bidi-font-size:14.0pt;
+ font-family:"Cambria","serif";
+ mso-ascii-font-family:Cambria;
+ mso-ascii-theme-font:major-latin;
+ mso-fareast-font-family:SimSun;
+ mso-fareast-theme-font:major-fareast;
+ mso-hansi-font-family:Cambria;
+ mso-hansi-theme-font:major-latin;
+ mso-bidi-font-family:"Times New Roman";
+ mso-bidi-theme-font:major-bidi;
+ color:#365F91;
+ mso-themecolor:accent1;
+ mso-themeshade:191;
+ font-weight:bold;}
+span.Heading2Char
+ {mso-style-name:"Heading 2 Char";
+ mso-style-noshow:yes;
+ mso-style-priority:9;
+ mso-style-unhide:no;
+ mso-style-locked:yes;
+ mso-style-link:"Heading 2";
+ mso-ansi-font-size:13.0pt;
+ mso-bidi-font-size:13.0pt;
+ font-family:"Cambria","serif";
+ mso-ascii-font-family:Cambria;
+ mso-ascii-theme-font:major-latin;
+ mso-fareast-font-family:SimSun;
+ mso-fareast-theme-font:major-fareast;
+ mso-hansi-font-family:Cambria;
+ mso-hansi-theme-font:major-latin;
+ mso-bidi-font-family:"Times New Roman";
+ mso-bidi-theme-font:major-bidi;
+ color:#4F81BD;
+ mso-themecolor:accent1;
+ font-weight:bold;}
+.MsoChpDefault
+ {mso-style-type:export-only;
+ mso-default-props:yes;
+ font-size:10.0pt;
+ mso-ansi-font-size:10.0pt;
+ mso-bidi-font-size:10.0pt;}
+@page WordSection1
+ {size:595.3pt 841.9pt;
+ margin:70.85pt 70.85pt 70.85pt 70.85pt;
+ mso-header-margin:35.4pt;
+ mso-footer-margin:35.4pt;
+ mso-paper-source:0;}
+div.WordSection1
+ {page:WordSection1;}
+ /* List Definitions */
+ @list l0
+ {mso-list-id:68308407;
+ mso-list-template-ids:1468717466;}
+@list l0:level1
+ {mso-level-number-format:bullet;
+ mso-level-text:\F0B7;
+ mso-level-tab-stop:36.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;
+ mso-ansi-font-size:10.0pt;
+ font-family:Symbol;}
+@list l1
+ {mso-list-id:173230818;
+ mso-list-template-ids:-252027432;}
+@list l1:level1
+ {mso-level-number-format:bullet;
+ mso-level-text:\F0B7;
+ mso-level-tab-stop:36.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;
+ mso-ansi-font-size:10.0pt;
+ font-family:Symbol;}
+@list l1:level2
+ {mso-level-number-format:bullet;
+ mso-level-text:o;
+ mso-level-tab-stop:72.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;
+ mso-ansi-font-size:10.0pt;
+ font-family:"Courier New";
+ mso-bidi-font-family:"Times New Roman";}
+@list l2
+ {mso-list-id:201864976;
+ mso-list-template-ids:1384538122;}
+@list l2:level1
+ {mso-level-number-format:bullet;
+ mso-level-text:\F0B7;
+ mso-level-tab-stop:36.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;
+ mso-ansi-font-size:10.0pt;
+ font-family:Symbol;}
+@list l2:level2
+ {mso-level-number-format:bullet;
+ mso-level-text:o;
+ mso-level-tab-stop:72.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;
+ mso-ansi-font-size:10.0pt;
+ font-family:"Courier New";
+ mso-bidi-font-family:"Times New Roman";}
+@list l3
+ {mso-list-id:271743139;
+ mso-list-template-ids:-828498394;}
+@list l3:level1
+ {mso-level-number-format:bullet;
+ mso-level-text:\F0B7;
+ mso-level-tab-stop:36.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;
+ mso-ansi-font-size:10.0pt;
+ font-family:Symbol;}
+@list l4
+ {mso-list-id:907809527;
+ mso-list-template-ids:-43499458;}
+@list l4:level1
+ {mso-level-number-format:bullet;
+ mso-level-text:\F0B7;
+ mso-level-tab-stop:36.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;
+ mso-ansi-font-size:10.0pt;
+ font-family:Symbol;}
+@list l5
+ {mso-list-id:1149439426;
+ mso-list-template-ids:-203231614;}
+@list l5:level1
+ {mso-level-number-format:bullet;
+ mso-level-text:\F0B7;
+ mso-level-tab-stop:36.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;
+ mso-ansi-font-size:10.0pt;
+ font-family:Symbol;}
+@list l5:level2
+ {mso-level-number-format:bullet;
+ mso-level-text:o;
+ mso-level-tab-stop:72.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;
+ mso-ansi-font-size:10.0pt;
+ font-family:"Courier New";
+ mso-bidi-font-family:"Times New Roman";}
+@list l6
+ {mso-list-id:1179277009;
+ mso-list-template-ids:-819716864;}
+@list l6:level1
+ {mso-level-number-format:bullet;
+ mso-level-text:\F0B7;
+ mso-level-tab-stop:36.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;
+ mso-ansi-font-size:10.0pt;
+ font-family:Symbol;}
+@list l7
+ {mso-list-id:1280644938;
+ mso-list-template-ids:1731652506;}
+@list l7:level1
+ {mso-level-number-format:bullet;
+ mso-level-text:\F0B7;
+ mso-level-tab-stop:36.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;
+ mso-ansi-font-size:10.0pt;
+ font-family:Symbol;}
+@list l8
+ {mso-list-id:1336373281;
+ mso-list-template-ids:150882396;}
+@list l8:level1
+ {mso-level-number-format:bullet;
+ mso-level-text:\F0B7;
+ mso-level-tab-stop:36.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;
+ mso-ansi-font-size:10.0pt;
+ font-family:Symbol;}
+@list l8:level2
+ {mso-level-number-format:bullet;
+ mso-level-text:o;
+ mso-level-tab-stop:72.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;
+ mso-ansi-font-size:10.0pt;
+ font-family:"Courier New";
+ mso-bidi-font-family:"Times New Roman";}
+@list l9
+ {mso-list-id:1675835159;
+ mso-list-template-ids:1758646566;}
+@list l9:level1
+ {mso-level-number-format:bullet;
+ mso-level-text:\F0B7;
+ mso-level-tab-stop:36.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;
+ mso-ansi-font-size:10.0pt;
+ font-family:Symbol;}
+@list l9:level2
+ {mso-level-number-format:bullet;
+ mso-level-text:o;
+ mso-level-tab-stop:72.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;
+ mso-ansi-font-size:10.0pt;
+ font-family:"Courier New";
+ mso-bidi-font-family:"Times New Roman";}
+@list l10
+ {mso-list-id:2053796985;
+ mso-list-template-ids:932107218;}
+@list l10:level1
+ {mso-level-number-format:bullet;
+ mso-level-text:\F0B7;
+ mso-level-tab-stop:36.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;
+ mso-ansi-font-size:10.0pt;
+ font-family:Symbol;}
+ol
+ {margin-bottom:0cm;}
+ul
+ {margin-bottom:0cm;}
+-->
+</style>
+<!--[if gte mso 10]>
+<style>
+ /* Style Definitions */
+ table.MsoNormalTable
+ {mso-style-name:"Table Normal";
+ mso-tstyle-rowband-size:0;
+ mso-tstyle-colband-size:0;
+ mso-style-noshow:yes;
+ mso-style-priority:99;
+ mso-style-qformat:yes;
+ mso-style-parent:"";
+ mso-padding-alt:0cm 5.4pt 0cm 5.4pt;
+ mso-para-margin:0cm;
+ mso-para-margin-bottom:.0001pt;
+ mso-pagination:widow-orphan;
+ font-size:10.0pt;
+ font-family:"Times New Roman","serif";}
+</style>
+<![endif]--><!--[if gte mso 9]><xml>
+ <o:shapedefaults v:ext="edit" spidmax="2050"/>
+</xml><![endif]--><!--[if gte mso 9]><xml>
+ <o:shapelayout v:ext="edit">
+ <o:idmap v:ext="edit" data="1"/>
+ </o:shapelayout></xml><![endif]-->
</head>
-<body>
+<body lang=NL style='tab-interval:35.4pt'>
-<h1>KeyboardInputPlugin History</h1>
+<div class=WordSection1>
-<h2>Version 2.4.3.0 (stable)</h2>
-<ul>
- <li>Various updates for MediaPortal 1.2.x compatibility</li>
- <li>Updated some of the paths. Specifically, in order for your custom mappings to be picked up, you may need to move [MP install dir]\defaults\InputDeviceMappings\Keyboard.xml or [MP install dir]\InputDeviceMappings\defaults\Keyboard.xml to %ProgramData%\Team Mediaportal\Mediaportal\InputDeviceMappings
- <li>TODO: Update README.HTML to reflect configuration screen changes</li>
+<h1><span style='mso-fareast-font-family:"Times New Roman"'>KeyboardInputPlugin
+History<o:p></o:p></span></h1>
+
+<h2><span style='mso-fareast-font-family:"Times New Roman"'>Version 2.4.4.0
+(stable)<o:p></o:p></span></h2>
+
+<ul type=disc>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l4 level1 lfo1;tab-stops:list 36.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Updated
+ the keyboard hook mechanism to run in its own thread and invoke
+ MediaPortal actions asynchronously. This should prevent the hook from
+ being disabled under Windows 7 due to time-outs.<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l4 level1 lfo1;tab-stops:list 36.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Removed
+ the keyboard hook recovery mechanism (re-enabling the keyboard hook once
+ it gets disabled by Windows 7 due to time-outs); the recovery mechanism is
+ incompatible with the new keyboard hook mechanism, and should no longer be
+ needed. If the keyboard hook still gets disabled (for example due to heavy
+ system load/swapping), you will need to minimize and then maximize
+ MediaPortal, or simply restart MediaPortal.<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l4 level1 lfo1;tab-stops:list 36.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Due
+ to the new keyboard hook mechanism, mappings are handled slightly
+ different. Previous versions would pass on any keys to MediaPortal if they
+ were not mapped under the current conditions. For example, if you mapped
+ the Enter key only under the condition \x91Media is playing\x92, if no media was
+ playing the plug-in would pass on the Enter key to MediaPortal, in effect causing
+ the \x91Select Item\x92 action. The new mechanism will <b style='mso-bidi-font-weight:
+ normal'><i style='mso-bidi-font-style:normal'>never</i></b> pass on the
+ Enter key to MediaPortal once it has been defined in the plug-in
+ configuration. In this example, you would want to add an additional No
+ Conditions -> Action \x91Select Item\x92 mapping to the Enter key in the
+ plug-in configuration.<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l4 level1 lfo1;tab-stops:list 36.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>TODO:
+ Update README.HTML to reflect configuration screen changes<o:p></o:p></span></li>
</ul>
-<h2>Version 2.4.2.0 (stable)</h2>
-<ul>
- <li>Restructured InputDeviceMappings directory</li>
- <li>Fixed exception in configuration screen</li>
- <li>Various configuration screen changes:</li>
- <ul>
- <li>Added textbox for changing mapping name</li>
- <li>Added 'Mappings' root node; using the 'New' button new (remote) mappings can be added to this root node</li>
- <li>Added 'Import' button that allows importing predefined mapping XML files</li>
- <li>Added some warnings if the user is about to discard any changes (via Cancel or Reset buttons)</li>
- <li>Added a simple help screen, shown if no mappings are defined yet when the configuration screen is opened</li>
- <li>Updated tooltips</li>
+<h2><span style='mso-fareast-font-family:"Times New Roman"'>Version 2.4.3.0
+(stable)<o:p></o:p></span></h2>
+
+<ul type=disc>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l4 level1 lfo1;tab-stops:list 36.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Various
+ updates for MediaPortal 1.2.x compatibility<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l4 level1 lfo1;tab-stops:list 36.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Updated
+ some of the paths. Specifically, in order for your custom mappings to be
+ picked up, you may need to move [MP install
+ dir]\defaults\InputDeviceMappings\Keyboard.xml or [MP install
+ dir]\InputDeviceMappings\defaults\Keyboard.xml to %ProgramData%\Team Mediaportal\Mediaportal\InputDeviceMappings
+ <o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l4 level1 lfo1;tab-stops:list 36.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>TODO:
+ Update README.HTML to reflect configuration screen changes<o:p></o:p></span></li>
+</ul>
+
+<h2><span style='mso-fareast-font-family:"Times New Roman"'>Version 2.4.2.0
+(stable)<o:p></o:p></span></h2>
+
+<ul type=disc>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l2 level1 lfo2;tab-stops:list 36.0pt'><span style='mso-fareast-font-family:
+ "Times New Roman"'>Restructured InputDeviceMappings directory<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l2 level1 lfo2;tab-stops:list 36.0pt'><span style='mso-fareast-font-family:
+ "Times New Roman"'>Fixed exception in configuration screen<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l2 level1 lfo2;tab-stops:list 36.0pt'><span style='mso-fareast-font-family:
+ "Times New Roman"'>Various configuration screen changes:<o:p></o:p></span></li>
+ <ul type=circle>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:
+ auto;mso-list:l2 level2 lfo2;tab-stops:list 72.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Added
+ textbox for changing mapping name<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:
+ auto;mso-list:l2 level2 lfo2;tab-stops:list 72.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Added
+ 'Mappings' root node; using the 'New' button new (remote) mappings can be
+ added to this root node<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:
+ auto;mso-list:l2 level2 lfo2;tab-stops:list 72.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Added
+ 'Import' button that allows importing predefined mapping XML files<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:
+ auto;mso-list:l2 level2 lfo2;tab-stops:list 72.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Added
+ some warnings if the user is about to discard any changes (via Cancel or
+ Reset buttons)<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:
+ auto;mso-list:l2 level2 lfo2;tab-stops:list 72.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Added
+ a simple help screen, shown if no mappings are defined yet when the
+ configuration screen is opened<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:
+ auto;mso-list:l2 level2 lfo2;tab-stops:list 72.0pt'><span
+ style='mso-fareast-font-family:"Times New Roman"'>Updated tooltips<o:p></o:p></span></li>
</ul>
- <li>Updated MPEI package:</li>
- <ul>
- <li>Default mapping is no longer installed</li>
- <li>Instead, all available predefined mappings are copied to the MediaPortal directory; the user can later import one or more of these using the configuration 'Import' button</li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l2 level1 lfo2;tab-stops:list 36.0pt'><span style='mso-fareast-font-family:
+ "Times New Roman"'>Updated MPEI package:<o:p></o:p></span></li>
+ <ul type=circle>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:
+ auto;mso-list:l2 level2 lfo2;tab-stops:list 72.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Default
+ mapping is no longer installed<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:
+ auto;mso-list:l2 level2 lfo2;tab-stops:list 72.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Instead,
+ all available predefined mappings are copied to the MediaPortal
+ directory; the user can later import one or more of these using the
+ configuration 'Import' button<o:p></o:p></span></li>
</ul>
- <li>Updated predefined mappings:</li>
- <ul>
- <li>Added Speedlink SL-6399 remote control
- <li>Updated ShortCut'er plugin emulator mapping; added sounds
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l2 level1 lfo2;tab-stops:list 36.0pt'><span style='mso-fareast-font-family:
+ "Times New Roman"'>Updated predefined mappings:<o:p></o:p></span></li>
+ <ul type=circle>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:
+ auto;mso-list:l2 level2 lfo2;tab-stops:list 72.0pt'><span
+ style='mso-fareast-font-family:"Times New Roman"'>Added Speedlink SL-6399
+ remote control <o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:
+ auto;mso-list:l2 level2 lfo2;tab-stops:list 72.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Updated
+ ShortCut'er plugin emulator mapping; added sounds <o:p></o:p></span></li>
</ul>
</ul>
+<h2><span style='mso-fareast-font-family:"Times New Roman"'>Version 2.4.1.0
+(stable)<o:p></o:p></span></h2>
-<h2>Version 2.4.1.0 (stable)</h2>
-<ul>
- <li>Various configuration screen changes:</li>
- <ul>
- <li>Added tooltips for various UI elements</li>
- <li>Changed some button names to clarify their meaning</li>
- <li>Fixed event handling for comboboxes (sometimes selection change wasn't noticed)</li>
- <li>Removed 'Learn Mode' checkbox (Key input field is now always in learning mode)</li>
- <li>Instead of cryptic numeric keycodes, actual key names are now shown</li>
+<ul type=disc>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l9 level1 lfo3;tab-stops:list 36.0pt'><span style='mso-fareast-font-family:
+ "Times New Roman"'>Various configuration screen changes:<o:p></o:p></span></li>
+ <ul type=circle>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:
+ auto;mso-list:l9 level2 lfo3;tab-stops:list 72.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Added
+ tooltips for various UI elements<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:
+ auto;mso-list:l9 level2 lfo3;tab-stops:list 72.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Changed
+ some button names to clarify their meaning<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:
+ auto;mso-list:l9 level2 lfo3;tab-stops:list 72.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Fixed
+ event handling for comboboxes (sometimes selection change wasn't noticed)<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:
+ auto;mso-list:l9 level2 lfo3;tab-stops:list 72.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Removed
+ 'Learn Mode' checkbox (Key input field is now always in learning mode)<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:
+ auto;mso-list:l9 level2 lfo3;tab-stops:list 72.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Instead
+ of cryptic numeric keycodes, actual key names are now shown<o:p></o:p></span></li>
</ul>
- <li>Some further code clean-up.</li>
- <li>Added predefined mappings:</li>
- <ul>
- <li>ShortCut'er plug-in emulator mapping
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l9 level1 lfo3;tab-stops:list 36.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Some
+ further code clean-up.<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l9 level1 lfo3;tab-stops:list 36.0pt'><span style='mso-fareast-font-family:
+ "Times New Roman"'>Added predefined mappings:<o:p></o:p></span></li>
+ <ul type=circle>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:
+ auto;mso-list:l9 level2 lfo3;tab-stops:list 72.0pt'><span
+ style='mso-fareast-font-family:"Times New Roman"'>ShortCut'er plug-in
+ emulator mapping <o:p></o:p></span></li>
</ul>
</ul>
-<h2>Version 2.4.0.0 (stable)</h2>
-<ul>
- <li>Implemented automatic keyboard hook recovery if the keyboard hook is disabled by Windows for any reason.</li>
- <li>Some further code clean-up.</li>
+<h2><span style='mso-fareast-font-family:"Times New Roman"'>Version 2.4.0.0
+(stable)<o:p></o:p></span></h2>
+
+<ul type=disc>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l3 level1 lfo4;tab-stops:list 36.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Implemented
+ automatic keyboard hook recovery if the keyboard hook is disabled by
+ Windows for any reason.<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l3 level1 lfo4;tab-stops:list 36.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Some
+ further code clean-up.<o:p></o:p></span></li>
</ul>
-<h2>Version 2.4.0.0 (beta)</h2>
-<ul>
- <li>Greatly simplified and improved key interception code</li>
- <ul style='margin-top:0cm'>
- <li>State of modifier keys is now determined by GetAsyncKeyState;
- no more need to manually maintain a collection of currently pressed modifier keys.</li>
- <li>Unmapped keys are left untouched, e.g. they will simply pass through to MediaPortal and/or the system.
- So no more need to re-send intercepted keys using SendKeys.SendWait, which didn't support all key
- combinations correctly.</li>
- <li>Somewhere along the way, the 'duplicate key press' problem was introduced again (previously fixed in 2.0.0.0).
- This has been fixed again; keystrokes handled by this plug-in will not pass through to MediaPortal and/or
- the system.</li>
+<h2><span style='mso-fareast-font-family:"Times New Roman"'>Version 2.4.0.0
+(beta)<o:p></o:p></span></h2>
+
+<ul type=disc>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l1 level1 lfo5;tab-stops:list 36.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Greatly
+ simplified and improved key interception code<o:p></o:p></span></li>
+ <ul type=circle>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:
+ auto;mso-list:l1 level2 lfo5;tab-stops:list 72.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>State
+ of modifier keys is now determined by GetAsyncKeyState; no more need to
+ manually maintain a collection of currently pressed modifier keys.<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:
+ auto;mso-list:l1 level2 lfo5;tab-stops:list 72.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Unmapped
+ keys are left untouched, e.g. they will simply pass through to
+ MediaPortal and/or the system. So no more need to re-send intercepted
+ keys using SendKeys.SendWait, which didn't support all key combinations
+ correctly.<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:
+ auto;mso-list:l1 level2 lfo5;tab-stops:list 72.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Somewhere
+ along the way, the 'duplicate key press' problem was introduced again
+ (previously fixed in 2.0.0.0). This has been fixed again; keystrokes
+ handled by this plug-in will not pass through to MediaPortal and/or the
+ system.<o:p></o:p></span></li>
</ul>
- <li>Win-keys can be used as modifiers again.</li>
- <li>Massive code clean-up.</li>
- <li>Added predefined mappings:</li>
- <ul>
- <li>GoTView USB Remote Control
- <li>YaoCoo MCE Clone Remote Control
- <li>Default keyboard shortcuts
- <li>MyKeys plug-in emulator mapping
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l1 level1 lfo5;tab-stops:list 36.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Win-keys
+ can be used as modifiers again.<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l1 level1 lfo5;tab-stops:list 36.0pt'><span style='mso-fareast-font-family:
+ "Times New Roman"'>Massive code clean-up.<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l1 level1 lfo5;tab-stops:list 36.0pt'><span style='mso-fareast-font-family:
+ "Times New Roman"'>Added predefined mappings:<o:p></o:p></span></li>
+ <ul type=circle>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:
+ auto;mso-list:l1 level2 lfo5;tab-stops:list 72.0pt'><span
+ style='mso-fareast-font-family:"Times New Roman"'>GoTView USB Remote
+ Control <o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:
+ auto;mso-list:l1 level2 lfo5;tab-stops:list 72.0pt'><span
+ style='mso-fareast-font-family:"Times New Roman"'>YaoCoo MCE Clone Remote
+ Control <o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:
+ auto;mso-list:l1 level2 lfo5;tab-stops:list 72.0pt'><span
+ style='mso-fareast-font-family:"Times New Roman"'>Default keyboard
+ shortcuts <o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:
+ auto;mso-list:l1 level2 lfo5;tab-stops:list 72.0pt'><span
+ style='mso-fareast-font-family:"Times New Roman"'>MyKeys plug-in emulator
+ mapping <o:p></o:p></span></li>
</ul>
</ul>
-<h2>Version 2.3.0.0</h2>
-<ul>
- <li>Not using MouseKeyboardLibrary.dll anymore :)</li>
- <li>Some bug-fixes</li>
- <li>Massive code clean-up</li>
+<h2><span style='mso-fareast-font-family:"Times New Roman"'>Version 2.3.0.0<o:p></o:p></span></h2>
+
+<ul type=disc>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l6 level1 lfo6;tab-stops:list 36.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Not
+ using MouseKeyboardLibrary.dll anymore :)<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l6 level1 lfo6;tab-stops:list 36.0pt'><span style='mso-fareast-font-family:
+ "Times New Roman"'>Some bug-fixes<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l6 level1 lfo6;tab-stops:list 36.0pt'><span style='mso-fareast-font-family:
+ "Times New Roman"'>Massive code clean-up<o:p></o:p></span></li>
</ul>
-<h2>Version 2.2.0.0</h2>
-<ul>
- <li>Using MouseKeyboardLibrary.dll instead of proprietary hook</li>
- <li>Code clean-up</li>
+<h2><span style='mso-fareast-font-family:"Times New Roman"'>Version 2.2.0.0<o:p></o:p></span></h2>
+
+<ul type=disc>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l10 level1 lfo7;tab-stops:list 36.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Using
+ MouseKeyboardLibrary.dll instead of proprietary hook<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l10 level1 lfo7;tab-stops:list 36.0pt'><span style='mso-fareast-font-family:
+ "Times New Roman"'>Code clean-up<o:p></o:p></span></li>
</ul>
-<h2>Version 2.1.0.0</h2>
-<ul>
- <li>Unified log entries</li>
- <li>KEY action is fixed (SendKeys.SendWait)</li>
- <li>No sounds played if player is playing (standard MP behavior)</li>
- <li>Win keys are not modifiers anymore </li>
- <ul style='margin-top:0cm'>
- <li>they have standard key behavior, you can't use win+something in key map</li>
+<h2><span style='mso-fareast-font-family:"Times New Roman"'>Version 2.1.0.0<o:p></o:p></span></h2>
+
+<ul type=disc>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l8 level1 lfo8;tab-stops:list 36.0pt'><span style='mso-fareast-font-family:
+ "Times New Roman"'>Unified log entries<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l8 level1 lfo8;tab-stops:list 36.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>KEY
+ action is fixed (SendKeys.SendWait)<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l8 level1 lfo8;tab-stops:list 36.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>No
+ sounds played if player is playing (standard MP behavior)<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l8 level1 lfo8;tab-stops:list 36.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Win
+ keys are not modifiers anymore <o:p></o:p></span></li>
+ <ul type=circle>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:
+ auto;mso-list:l8 level2 lfo8;tab-stops:list 72.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>they
+ have standard key behavior, you can't use win+something in key map<o:p></o:p></span></li>
</ul>
- <li>Resetting modifier keys is now done on keyup</li>
- <ul style='margin-top:0cm'>
- <li>you can now hold ctrl and press keys, they would all have ctrl modifier</li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l8 level1 lfo8;tab-stops:list 36.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Resetting
+ modifier keys is now done on keyup<o:p></o:p></span></li>
+ <ul type=circle>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:
+ auto;mso-list:l8 level2 lfo8;tab-stops:list 72.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>you
+ can now hold ctrl and press keys, they would all have ctrl modifier<o:p></o:p></span></li>
</ul>
- <li>Better handling of keys not mapped through the plugin</li>
- <li>Better hook behavior </li>
- <ul style='margin-top:0cm'>
- <li>other hooks can now "see" pressed keys too</li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l8 level1 lfo8;tab-stops:list 36.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Better
+ handling of keys not mapped through the plugin<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l8 level1 lfo8;tab-stops:list 36.0pt'><span style='mso-fareast-font-family:
+ "Times New Roman"'>Better hook behavior <o:p></o:p></span></li>
+ <ul type=circle>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:
+ auto;mso-list:l8 level2 lfo8;tab-stops:list 72.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>other
+ hooks can now "see" pressed keys too<o:p></o:p></span></li>
</ul>
</ul>
-<h2>Version 2.0.0.0</h2>
-<ul>
- <li>Changed key interception mechanism:</li>
- <ul style='margin-top:0cm'>
- <li>Captures virtually all key combinations, including Win-keys.</li>
- <li>Keystrokes that are mapped by this plug-in will be 'eaten'; they will not be passed on to MediaPortal,
- so no more 'double' key presses or the need to remove MediaPortal\x92s keymap.xml.</li>
- <li>(Limited) support for passing through keystrokes that are not mapped by this plug-in.</li>
+<h2><span style='mso-fareast-font-family:"Times New Roman"'>Version 2.0.0.0<o:p></o:p></span></h2>
+
+<ul type=disc>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l5 level1 lfo9;tab-stops:list 36.0pt'><span style='mso-fareast-font-family:
+ "Times New Roman"'>Changed key interception mechanism:<o:p></o:p></span></li>
+ <ul type=circle>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:
+ auto;mso-list:l5 level2 lfo9;tab-stops:list 72.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Captures
+ virtually all key combinations, including Win-keys.<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:
+ auto;mso-list:l5 level2 lfo9;tab-stops:list 72.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Keystrokes
+ that are mapped by this plug-in will be 'eaten'; they will not be passed
+ on to MediaPortal, so no more 'double' key presses or the need to remove
+ MediaPortal\x92s keymap.xml.<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:
+ auto;mso-list:l5 level2 lfo9;tab-stops:list 72.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>(Limited)
+ support for passing through keystrokes that are not mapped by this
+ plug-in.<o:p></o:p></span></li>
</ul>
- <li>Integrated 'Add/Remove Buttons' and 'Button Mapping' configuration screens into single configuration screen.</li>
- <li>Added support for mapping keystrokes to plug-in windows (as opposed to only standard MediaPortal windows).</li>
- <li>Respects MediaPortal configuration paths; no more need to copy Keyboard.xml around and should work correctly with Windows Vista and up.</li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l5 level1 lfo9;tab-stops:list 36.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Integrated
+ 'Add/Remove Buttons' and 'Button Mapping' configuration screens into
+ single configuration screen.<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l5 level1 lfo9;tab-stops:list 36.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Added
+ support for mapping keystrokes to plug-in windows (as opposed to only
+ standard MediaPortal windows).<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l5 level1 lfo9;tab-stops:list 36.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Respects
+ MediaPortal configuration paths; no more need to copy Keyboard.xml around
+ and should work correctly with Windows Vista and up.<o:p></o:p></span></li>
</ul>
-<h2>Version 1.1.0.0</h2>
-<ul>
- <li>Added configuration screens for adding/changing/removing buttons. This includes a learning mode (press the
- key you want and see the code), and automatic creation of the Keyboard.xml file if it does not yet exist.</li>
+<h2><span style='mso-fareast-font-family:"Times New Roman"'>Version 1.1.0.0<o:p></o:p></span></h2>
+
+<ul type=disc>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l7 level1 lfo10;tab-stops:list 36.0pt'><span lang=EN-US
+ style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Added
+ configuration screens for adding/changing/removing buttons. This includes
+ a learning mode (press the key you want and see the code), and automatic
+ creation of the Keyboard.xml file if it does not yet exist.<o:p></o:p></span></li>
</ul>
-<h2>Version 1.0.0.0</h2>
-<ul>
- <li>Initial Release</li>
+<h2><span style='mso-fareast-font-family:"Times New Roman"'>Version 1.0.0.0<o:p></o:p></span></h2>
+
+<ul type=disc>
+ <li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
+ mso-list:l0 level1 lfo11;tab-stops:list 36.0pt'><span style='mso-fareast-font-family:
+ "Times New Roman"'>Initial Release<o:p></o:p></span></li>
</ul>
+</div>
+
</body>
</html>
Added: trunk/plugins/KeyboardInputPlugin/HISTORY_files/colorschememapping.xml
===================================================================
--- trunk/plugins/KeyboardInputPlugin/HISTORY_files/colorschememapping.xml (rev 0)
+++ trunk/plugins/KeyboardInputPlugin/HISTORY_files/colorschememapping.xml 2011-11-23 11:33:17 UTC (rev 4339)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<a:clrMap xmlns:a="http://schemas...
[truncated message content] |
|
From: <dou...@us...> - 2011-11-21 20:30:09
|
Revision: 4338
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4338&view=rev
Author: dougmckeen
Date: 2011-11-21 20:29:56 +0000 (Mon, 21 Nov 2011)
Log Message:
-----------
Added Paths:
-----------
trunk/plugins/CanadianWeather/
trunk/plugins/CanadianWeather/CanadianWeather.csproj
trunk/plugins/CanadianWeather/CanadianWeather.csproj.user
trunk/plugins/CanadianWeather/ConfigurationForm.Designer.cs
trunk/plugins/CanadianWeather/ConfigurationForm.cs
trunk/plugins/CanadianWeather/ConfigurationForm.resx
trunk/plugins/CanadianWeather/GUICanadianWeather.cs
trunk/plugins/CanadianWeather/Properties/
trunk/plugins/CanadianWeather/Properties/AssemblyInfo.cs
trunk/plugins/CanadianWeather/Properties/DataSources/
trunk/plugins/CanadianWeather/Properties/DataSources/ConfigurationForm.datasource
trunk/plugins/CanadianWeather/Properties/lf.png
trunk/plugins/CanadianWeather/Properties/lf_disabled.png
trunk/plugins/CanadianWeather/Resource1.Designer.cs
trunk/plugins/CanadianWeather/Resource1.resx
trunk/plugins/CanadianWeather/Resources/
trunk/plugins/CanadianWeather/Resources/lf.png
trunk/plugins/CanadianWeather/Resources/lf_disabled.png
Added: trunk/plugins/CanadianWeather/CanadianWeather.csproj
===================================================================
--- trunk/plugins/CanadianWeather/CanadianWeather.csproj (rev 0)
+++ trunk/plugins/CanadianWeather/CanadianWeather.csproj 2011-11-21 20:29:56 UTC (rev 4338)
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>8.0.30703</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{4065B871-27FA-4CCE-9ECC-D3722571B79D}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>CanadianWeather</RootNamespace>
+ <AssemblyName>CanadianWeather</AssemblyName>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ <TargetFrameworkProfile />
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup>
+ <Win32Resource>
+ </Win32Resource>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="Common.Utils">
+ <HintPath>C:\Program Files\Team MediaPortal\MediaPortal\Common.Utils.dll</HintPath>
+ </Reference>
+ <Reference Include="Core, Version=1.1.7.0, Culture=neutral, processorArchitecture=x86">
+ <HintPath>C:\Program Files\Team MediaPortal\MediaPortal\Core.dll</HintPath>
+ <SpecificVersion>False</SpecificVersion>
+ </Reference>
+ <Reference Include="Dialogs">
+ <HintPath>C:\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll</HintPath>
+ </Reference>
+ <Reference Include="System" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.Drawing" />
+ <Reference Include="System.Windows.Forms" />
+ <Reference Include="System.Xml.Linq" />
+ <Reference Include="System.Data.DataSetExtensions" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Xml" />
+ <Reference Include="Utils, Version=1.1.7.0, Culture=neutral, processorArchitecture=x86">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>C:\Program Files\Team MediaPortal\MediaPortal\Utils.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="GUICanadianWeather.cs" />
+ <Compile Include="ConfigurationForm.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="ConfigurationForm.Designer.cs">
+ <DependentUpon>ConfigurationForm.cs</DependentUpon>
+ </Compile>
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="Resource1.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <DependentUpon>Resource1.resx</DependentUpon>
+ </Compile>
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="ConfigurationForm.resx">
+ <DependentUpon>ConfigurationForm.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Resource1.resx">
+ <Generator>ResXFileCodeGenerator</Generator>
+ <LastGenOutput>Resource1.Designer.cs</LastGenOutput>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Resources\lf.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Resources\lf_disabled.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="Properties\DataSources\ConfigurationForm.datasource" />
+ </ItemGroup>
+ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
\ No newline at end of file
Added: trunk/plugins/CanadianWeather/CanadianWeather.csproj.user
===================================================================
--- trunk/plugins/CanadianWeather/CanadianWeather.csproj.user (rev 0)
+++ trunk/plugins/CanadianWeather/CanadianWeather.csproj.user 2011-11-21 20:29:56 UTC (rev 4338)
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
Added: trunk/plugins/CanadianWeather/ConfigurationForm.Designer.cs
===================================================================
--- trunk/plugins/CanadianWeather/ConfigurationForm.Designer.cs (rev 0)
+++ trunk/plugins/CanadianWeather/ConfigurationForm.Designer.cs 2011-11-21 20:29:56 UTC (rev 4338)
@@ -0,0 +1,451 @@
+namespace MediaPortal.GUI.CanadianWeather
+{
+ partial class ConfigurationForm
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ this.RadioButtonEnglish = new System.Windows.Forms.RadioButton();
+ this.RadioButtonFrench = new System.Windows.Forms.RadioButton();
+ this.LanguageChoice = new System.Windows.Forms.GroupBox();
+ this.label1 = new System.Windows.Forms.Label();
+ this.RefreshIntervalTxtBx = new System.Windows.Forms.TextBox();
+ this.PluginNameTextBox = new System.Windows.Forms.Label();
+ this.PluginNameTxtBx = new System.Windows.Forms.TextBox();
+ this.OKButton = new System.Windows.Forms.Button();
+ this.Cancel = new System.Windows.Forms.Button();
+ this.Locations = new System.Windows.Forms.ListBox();
+ this.MoveUp = new System.Windows.Forms.Button();
+ this.MoveDown = new System.Windows.Forms.Button();
+ this.Delete = new System.Windows.Forms.Button();
+ this.Add = new System.Windows.Forms.Button();
+ this.label6 = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
+ this.label4 = new System.Windows.Forms.Label();
+ this.label5 = new System.Windows.Forms.Label();
+ this.listBoxProvince = new System.Windows.Forms.ListBox();
+ this.listBoxCity = new System.Windows.Forms.ListBox();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.ImageURL0 = new System.Windows.Forms.TextBox();
+ this.label3 = new System.Windows.Forms.Label();
+ this.label7 = new System.Windows.Forms.Label();
+ this.label8 = new System.Windows.Forms.Label();
+ this.label9 = new System.Windows.Forms.Label();
+ this.label10 = new System.Windows.Forms.Label();
+ this.ImageURL1 = new System.Windows.Forms.TextBox();
+ this.ImageURL2 = new System.Windows.Forms.TextBox();
+ this.ImageURL3 = new System.Windows.Forms.TextBox();
+ this.ImageURL4 = new System.Windows.Forms.TextBox();
+ this.label12 = new System.Windows.Forms.Label();
+ this.configurationFormBindingSource = new System.Windows.Forms.BindingSource(this.components);
+ this.LanguageChoice.SuspendLayout();
+ this.groupBox1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.configurationFormBindingSource)).BeginInit();
+ this.SuspendLayout();
+ //
+ // RadioButtonEnglish
+ //
+ this.RadioButtonEnglish.AutoSize = true;
+ this.RadioButtonEnglish.Checked = true;
+ this.RadioButtonEnglish.Enabled = false;
+ this.RadioButtonEnglish.Location = new System.Drawing.Point(6, 19);
+ this.RadioButtonEnglish.Name = "RadioButtonEnglish";
+ this.RadioButtonEnglish.Size = new System.Drawing.Size(59, 17);
+ this.RadioButtonEnglish.TabIndex = 5;
+ this.RadioButtonEnglish.TabStop = true;
+ this.RadioButtonEnglish.Text = "English";
+ this.RadioButtonEnglish.UseVisualStyleBackColor = true;
+ //
+ // RadioButtonFrench
+ //
+ this.RadioButtonFrench.AutoSize = true;
+ this.RadioButtonFrench.Enabled = false;
+ this.RadioButtonFrench.Location = new System.Drawing.Point(6, 40);
+ this.RadioButtonFrench.Name = "RadioButtonFrench";
+ this.RadioButtonFrench.Size = new System.Drawing.Size(58, 17);
+ this.RadioButtonFrench.TabIndex = 6;
+ this.RadioButtonFrench.Text = "French";
+ this.RadioButtonFrench.UseVisualStyleBackColor = true;
+ //
+ // LanguageChoice
+ //
+ this.LanguageChoice.Controls.Add(this.RadioButtonEnglish);
+ this.LanguageChoice.Controls.Add(this.RadioButtonFrench);
+ this.LanguageChoice.Enabled = false;
+ this.LanguageChoice.Location = new System.Drawing.Point(341, 1);
+ this.LanguageChoice.Name = "LanguageChoice";
+ this.LanguageChoice.Size = new System.Drawing.Size(79, 66);
+ this.LanguageChoice.TabIndex = 8;
+ this.LanguageChoice.TabStop = false;
+ this.LanguageChoice.Text = "Language";
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(14, 37);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(82, 26);
+ this.label1.TabIndex = 9;
+ this.label1.Text = "Refresh Interval\r\n(minutes)";
+ //
+ // RefreshIntervalTxtBx
+ //
+ this.RefreshIntervalTxtBx.Location = new System.Drawing.Point(102, 45);
+ this.RefreshIntervalTxtBx.Name = "RefreshIntervalTxtBx";
+ this.RefreshIntervalTxtBx.Size = new System.Drawing.Size(135, 20);
+ this.RefreshIntervalTxtBx.TabIndex = 10;
+ //
+ // PluginNameTextBox
+ //
+ this.PluginNameTextBox.AutoSize = true;
+ this.PluginNameTextBox.Location = new System.Drawing.Point(14, 11);
+ this.PluginNameTextBox.Name = "PluginNameTextBox";
+ this.PluginNameTextBox.Size = new System.Drawing.Size(67, 13);
+ this.PluginNameTextBox.TabIndex = 9;
+ this.PluginNameTextBox.Text = "Plugin Name";
+ //
+ // PluginNameTxtBx
+ //
+ this.PluginNameTxtBx.Location = new System.Drawing.Point(102, 11);
+ this.PluginNameTxtBx.MaxLength = 127;
+ this.PluginNameTxtBx.Name = "PluginNameTxtBx";
+ this.PluginNameTxtBx.Size = new System.Drawing.Size(135, 20);
+ this.PluginNameTxtBx.TabIndex = 10;
+ //
+ // OKButton
+ //
+ this.OKButton.Location = new System.Drawing.Point(345, 491);
+ this.OKButton.Name = "OKButton";
+ this.OKButton.Size = new System.Drawing.Size(75, 23);
+ this.OKButton.TabIndex = 12;
+ this.OKButton.Text = "OK";
+ this.OKButton.UseVisualStyleBackColor = true;
+ this.OKButton.Click += new System.EventHandler(this.OK_Click);
+ //
+ // Cancel
+ //
+ this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ this.Cancel.Location = new System.Drawing.Point(426, 491);
+ this.Cancel.Name = "Cancel";
+ this.Cancel.Size = new System.Drawing.Size(75, 23);
+ this.Cancel.TabIndex = 13;
+ this.Cancel.Text = "Cancel";
+ this.Cancel.UseVisualStyleBackColor = true;
+ this.Cancel.Click += new System.EventHandler(this.Cancel_Click);
+ //
+ // Locations
+ //
+ this.Locations.FormattingEnabled = true;
+ this.Locations.HorizontalScrollbar = true;
+ this.Locations.Location = new System.Drawing.Point(335, 62);
+ this.Locations.Name = "Locations";
+ this.Locations.Size = new System.Drawing.Size(160, 173);
+ this.Locations.TabIndex = 0;
+ //
+ // MoveUp
+ //
+ this.MoveUp.Location = new System.Drawing.Point(254, 127);
+ this.MoveUp.Name = "MoveUp";
+ this.MoveUp.Size = new System.Drawing.Size(75, 23);
+ this.MoveUp.TabIndex = 1;
+ this.MoveUp.Text = "Move Up";
+ this.MoveUp.UseVisualStyleBackColor = true;
+ this.MoveUp.Click += new System.EventHandler(this.MoveUp_Click);
+ //
+ // MoveDown
+ //
+ this.MoveDown.Location = new System.Drawing.Point(254, 156);
+ this.MoveDown.Name = "MoveDown";
+ this.MoveDown.Size = new System.Drawing.Size(75, 23);
+ this.MoveDown.TabIndex = 2;
+ this.MoveDown.Text = "Move Down";
+ this.MoveDown.UseVisualStyleBackColor = true;
+ this.MoveDown.Click += new System.EventHandler(this.MoveDown_Click);
+ //
+ // Delete
+ //
+ this.Delete.Location = new System.Drawing.Point(254, 212);
+ this.Delete.Name = "Delete";
+ this.Delete.Size = new System.Drawing.Size(75, 23);
+ this.Delete.TabIndex = 3;
+ this.Delete.Text = "Delete";
+ this.Delete.UseVisualStyleBackColor = true;
+ this.Delete.Click += new System.EventHandler(this.Delete_Click);
+ //
+ // Add
+ //
+ this.Add.Location = new System.Drawing.Point(254, 67);
+ this.Add.Name = "Add";
+ this.Add.Size = new System.Drawing.Size(75, 23);
+ this.Add.TabIndex = 4;
+ this.Add.Text = "Add";
+ this.Add.UseVisualStyleBackColor = true;
+ this.Add.Click += new System.EventHandler(this.Add_Click);
+ //
+ // label6
+ //
+ this.label6.AutoSize = true;
+ this.label6.Location = new System.Drawing.Point(8, 16);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(215, 13);
+ this.label6.TabIndex = 9;
+ this.label6.Text = "Select a Province then a City and press Add";
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(335, 40);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(53, 13);
+ this.label2.TabIndex = 11;
+ this.label2.Text = "Locations";
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Location = new System.Drawing.Point(17, 40);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(49, 13);
+ this.label4.TabIndex = 16;
+ this.label4.Text = "Province";
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.Location = new System.Drawing.Point(17, 129);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(24, 13);
+ this.label5.TabIndex = 16;
+ this.label5.Text = "City";
+ //
+ // listBoxProvince
+ //
+ this.listBoxProvince.FormattingEnabled = true;
+ this.listBoxProvince.Location = new System.Drawing.Point(96, 39);
+ this.listBoxProvince.Name = "listBoxProvince";
+ this.listBoxProvince.Size = new System.Drawing.Size(76, 82);
+ this.listBoxProvince.TabIndex = 17;
+ this.listBoxProvince.SelectedIndexChanged += new System.EventHandler(this.listBoxProvince_SelectedIndexChanged);
+ //
+ // listBoxCity
+ //
+ this.listBoxCity.FormattingEnabled = true;
+ this.listBoxCity.HorizontalScrollbar = true;
+ this.listBoxCity.Location = new System.Drawing.Point(46, 127);
+ this.listBoxCity.Name = "listBoxCity";
+ this.listBoxCity.Size = new System.Drawing.Size(185, 108);
+ this.listBoxCity.TabIndex = 18;
+ this.listBoxCity.SelectedIndexChanged += new System.EventHandler(this.listBoxCity_SelectedIndexChanged);
+ //
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.listBoxCity);
+ this.groupBox1.Controls.Add(this.listBoxProvince);
+ this.groupBox1.Controls.Add(this.label5);
+ this.groupBox1.Controls.Add(this.label4);
+ this.groupBox1.Controls.Add(this.label2);
+ this.groupBox1.Controls.Add(this.label6);
+ this.groupBox1.Controls.Add(this.Add);
+ this.groupBox1.Controls.Add(this.Delete);
+ this.groupBox1.Controls.Add(this.MoveDown);
+ this.groupBox1.Controls.Add(this.MoveUp);
+ this.groupBox1.Controls.Add(this.Locations);
+ this.groupBox1.Location = new System.Drawing.Point(6, 72);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(509, 254);
+ this.groupBox1.TabIndex = 19;
+ this.groupBox1.TabStop = false;
+ //
+ // ImageURL0
+ //
+ this.ImageURL0.Location = new System.Drawing.Point(65, 363);
+ this.ImageURL0.Name = "ImageURL0";
+ this.ImageURL0.Size = new System.Drawing.Size(436, 20);
+ this.ImageURL0.TabIndex = 20;
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(14, 366);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(45, 13);
+ this.label3.TabIndex = 21;
+ this.label3.Text = "Image 1";
+ //
+ // label7
+ //
+ this.label7.AutoSize = true;
+ this.label7.Location = new System.Drawing.Point(14, 389);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(45, 13);
+ this.label7.TabIndex = 21;
+ this.label7.Text = "Image 2";
+ //
+ // label8
+ //
+ this.label8.AutoSize = true;
+ this.label8.Location = new System.Drawing.Point(14, 412);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(45, 13);
+ this.label8.TabIndex = 21;
+ this.label8.Text = "Image 3";
+ //
+ // label9
+ //
+ this.label9.AutoSize = true;
+ this.label9.Location = new System.Drawing.Point(14, 435);
+ this.label9.Name = "label9";
+ this.label9.Size = new System.Drawing.Size(45, 13);
+ this.label9.TabIndex = 21;
+ this.label9.Text = "Image 4";
+ //
+ // label10
+ //
+ this.label10.AutoSize = true;
+ this.label10.Location = new System.Drawing.Point(14, 457);
+ this.label10.Name = "label10";
+ this.label10.Size = new System.Drawing.Size(45, 13);
+ this.label10.TabIndex = 21;
+ this.label10.Text = "Image 5";
+ //
+ // ImageURL1
+ //
+ this.ImageURL1.Location = new System.Drawing.Point(65, 386);
+ this.ImageURL1.Name = "ImageURL1";
+ this.ImageURL1.Size = new System.Drawing.Size(436, 20);
+ this.ImageURL1.TabIndex = 20;
+ //
+ // ImageURL2
+ //
+ this.ImageURL2.Location = new System.Drawing.Point(65, 409);
+ this.ImageURL2.Name = "ImageURL2";
+ this.ImageURL2.Size = new System.Drawing.Size(436, 20);
+ this.ImageURL2.TabIndex = 20;
+ //
+ // ImageURL3
+ //
+ this.ImageURL3.Location = new System.Drawing.Point(65, 432);
+ this.ImageURL3.Name = "ImageURL3";
+ this.ImageURL3.Size = new System.Drawing.Size(436, 20);
+ this.ImageURL3.TabIndex = 20;
+ //
+ // ImageURL4
+ //
+ this.ImageURL4.Location = new System.Drawing.Point(65, 454);
+ this.ImageURL4.Name = "ImageURL4";
+ this.ImageURL4.Size = new System.Drawing.Size(436, 20);
+ this.ImageURL4.TabIndex = 20;
+ //
+ // label12
+ //
+ this.label12.AutoSize = true;
+ this.label12.Location = new System.Drawing.Point(14, 338);
+ this.label12.Name = "label12";
+ this.label12.Size = new System.Drawing.Size(319, 13);
+ this.label12.TabIndex = 21;
+ this.label12.Text = "Enter Image URLs below. e.g. http://www.sample.com/image.jpg";
+ //
+ // configurationFormBindingSource
+ //
+ this.configurationFormBindingSource.DataSource = typeof(MediaPortal.GUI.CanadianWeather.ConfigurationForm);
+ //
+ // ConfigurationForm
+ //
+ this.AcceptButton = this.OKButton;
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.CancelButton = this.Cancel;
+ this.ClientSize = new System.Drawing.Size(522, 532);
+ this.Controls.Add(this.label12);
+ this.Controls.Add(this.label10);
+ this.Controls.Add(this.label9);
+ this.Controls.Add(this.label8);
+ this.Controls.Add(this.label7);
+ this.Controls.Add(this.label3);
+ this.Controls.Add(this.ImageURL4);
+ this.Controls.Add(this.ImageURL3);
+ this.Controls.Add(this.ImageURL2);
+ this.Controls.Add(this.ImageURL1);
+ this.Controls.Add(this.ImageURL0);
+ this.Controls.Add(this.groupBox1);
+ this.Controls.Add(this.Cancel);
+ this.Controls.Add(this.OKButton);
+ this.Controls.Add(this.PluginNameTxtBx);
+ this.Controls.Add(this.RefreshIntervalTxtBx);
+ this.Controls.Add(this.PluginNameTextBox);
+ this.Controls.Add(this.label1);
+ this.Controls.Add(this.LanguageChoice);
+ this.Name = "ConfigurationForm";
+ this.Text = "Canadian Weather Configuration";
+ this.Load += new System.EventHandler(this.ConfigurationForm_Load);
+ this.LanguageChoice.ResumeLayout(false);
+ this.LanguageChoice.PerformLayout();
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.configurationFormBindingSource)).EndInit();
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.RadioButton RadioButtonEnglish;
+ private System.Windows.Forms.RadioButton RadioButtonFrench;
+ private System.Windows.Forms.GroupBox LanguageChoice;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.TextBox RefreshIntervalTxtBx;
+ private System.Windows.Forms.Label PluginNameTextBox;
+ private System.Windows.Forms.TextBox PluginNameTxtBx;
+ private System.Windows.Forms.Button OKButton;
+ private System.Windows.Forms.Button Cancel;
+ private System.Windows.Forms.BindingSource configurationFormBindingSource;
+ private System.Windows.Forms.ListBox Locations;
+ private System.Windows.Forms.Button MoveUp;
+ private System.Windows.Forms.Button MoveDown;
+ private System.Windows.Forms.Button Delete;
+ private System.Windows.Forms.Button Add;
+ private System.Windows.Forms.Label label6;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.ListBox listBoxProvince;
+ private System.Windows.Forms.ListBox listBoxCity;
+ private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.TextBox ImageURL0;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.Label label7;
+ private System.Windows.Forms.Label label8;
+ private System.Windows.Forms.Label label9;
+ private System.Windows.Forms.Label label10;
+ private System.Windows.Forms.TextBox ImageURL1;
+ private System.Windows.Forms.TextBox ImageURL2;
+ private System.Windows.Forms.TextBox ImageURL3;
+ private System.Windows.Forms.TextBox ImageURL4;
+ private System.Windows.Forms.Label label12;
+ }
+}
\ No newline at end of file
Added: trunk/plugins/CanadianWeather/ConfigurationForm.cs
===================================================================
--- trunk/plugins/CanadianWeather/ConfigurationForm.cs (rev 0)
+++ trunk/plugins/CanadianWeather/ConfigurationForm.cs 2011-11-21 20:29:56 UTC (rev 4338)
@@ -0,0 +1,354 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Xml.Linq;
+using System.Text;
+using System.Windows.Forms;
+using System.Net;
+using System.IO;
+using MediaPortal.Configuration;
+
+namespace MediaPortal.GUI.CanadianWeather
+{
+ public partial class ConfigurationForm : Form
+ {
+ String strURL = "http://dd.weatheroffice.ec.gc.ca/citypage_weather/xml/siteList.xml";
+
+ List<string> _items = new List<string>();
+ string PluginName;
+ int RefreshTime;
+ string Language;
+ string[,] Sites;
+ bool SiteLookupFailed;
+ int NumberofSites;
+ int siteIndex;
+ string[,] tempstring;
+ List<string> ShortListOfProvs;
+ List<string> CityNames;
+ XDocument loaded;
+ string[] ProvinceArray;
+ string[] CityArray;
+ string selectedProvince = "";
+ string selectedCity = "";
+ string Temp;
+
+ public ConfigurationForm()
+ {
+ InitializeComponent();
+
+ // read settings file, fill in form
+ using (MediaPortal.Profile.Settings reader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "CanadianWeatherSettings.xml")))
+ {
+ PluginName = reader.GetValueAsString("BasicSettings", "PluginName", "Canadian Weather");
+ RefreshTime = reader.GetValueAsInt("BasicSettings", "RefreshTime", 60);
+ Language = reader.GetValueAsString("BasicSettings", "Language", "English");
+
+ //create 2D array of sites (20 sites, 4 attributes)
+ Sites = new string[20, 4];
+ for (int i = 0; i < 20; i++)
+ {
+ Sites[i, 0] = reader.GetValueAsString("Site" + i, "SiteID", "");
+ Sites[i, 1] = reader.GetValueAsString("Site" + i, "EnglishName", "");
+ Sites[i, 2] = reader.GetValueAsString("Site" + i, "FrenchName", "");
+ Sites[i, 3] = reader.GetValueAsString("Site" + i, "ProvinceCode", "");
+ }
+
+ //Fill in Refresh Interval
+ RefreshIntervalTxtBx.Text = RefreshTime.ToString();
+
+ //Activate Language Radio Button
+ if (String.Equals(Language, "French"))
+ { RadioButtonFrench.Checked = true; }
+ else
+ { RadioButtonEnglish.Checked = true; }
+
+ //Determine how many sites exist
+ NumberofSites = 0;
+ for (int i = 0; i < 20; i++)
+ {
+ if (string.IsNullOrEmpty(Sites[i, 0]))
+ {
+ NumberofSites = i;
+ break;
+ }
+ //null string not found so list is full
+ NumberofSites = 19; //(20 sites, counting from zero)
+ }
+
+ //fill the list box
+ for (int i = 0; i < NumberofSites; i++)
+ { _items.Add(Sites[i, 1]); }
+
+ Locations.DataSource = _items;
+
+ //Fill in the Plugin Name
+ PluginNameTxtBx.Text = PluginName;
+ }
+
+ //Get Site List from Environment Canada
+ GetSiteListFromEnvironmentCanada();
+ }
+
+ public Boolean GetSiteListFromEnvironmentCanada()
+ {
+ try
+ {
+ //get XML
+ String SiteList;
+ HttpWebRequest request = (HttpWebRequest)WebRequest.Create(strURL);
+ request.Timeout = 20000;
+ HttpWebResponse response = (HttpWebResponse)request.GetResponse();
+ Stream responseStream = response.GetResponseStream();
+ StreamReader htmlStream = new StreamReader(responseStream, Encoding.Default);
+ SiteList = htmlStream.ReadToEnd();
+ //parse
+ loaded = XDocument.Parse(SiteList);
+ //int sitesCount = loaded.Descendants("site").Count();
+
+ //get a distinct list of the province codes from the XDocument
+ ShortListOfProvs = loaded.Descendants("provinceCode")
+ .Select(x => x.Value)
+ .Distinct()
+ .ToList();
+ ShortListOfProvs.Sort();
+
+ //display the short list of provinces in the listbox
+ ProvinceArray = ShortListOfProvs.ToArray();
+ listBoxProvince.Items.AddRange(ProvinceArray);
+
+ //clean up
+ htmlStream.Dispose();
+ responseStream.Dispose();
+
+ SiteLookupFailed = false;
+ return true;
+ }
+ catch (Exception)
+ {
+ //error retrieving list of sites
+ SiteLookupFailed = true;
+ MessageBox.Show("The list of Provinces and Cities could not be obtained from Environment Canada. You can perform all actions except Add. You can close the plugin Configuration and try again later.");
+ Add.Enabled.Equals(false);
+ return false;
+ }
+ }
+
+ private void ConfigurationForm_Load(object sender, EventArgs e)
+ {
+
+ }
+
+ private void OK_Click(object sender, EventArgs e)
+ {
+ if (RadioButtonEnglish.Checked == true)
+ { Language = "English"; }
+ else
+ { Language = "French"; }
+
+ //validate Refresh Interval
+ int tempInteger;
+ if (!int.TryParse(RefreshIntervalTxtBx.Text.ToString(), out tempInteger) || tempInteger < 0 || tempInteger > 1440)
+ { RefreshIntervalTxtBx.Text = "60"; } //input error, set as 60
+
+ //write XML file
+ using (MediaPortal.Profile.Settings writer = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "CanadianWeatherSettings.xml")))
+ {
+ writer.SetValue("BasicSettings", "PluginName", PluginNameTxtBx.Text);
+ writer.SetValue("BasicSettings", "RefreshTime", RefreshIntervalTxtBx.Text);
+ writer.SetValue("BasicSettings", "Language", Language);
+
+ for (int i = 0; i < 19; i++)
+ {
+ writer.SetValue("Site" + i, "SiteID", Sites[i, 0]);
+ writer.SetValue("Site" + i, "EnglishName", Sites[i, 1]);
+ writer.SetValue("Site" + i, "FrenchName", Sites[i, 2]);
+ writer.SetValue("Site" + i, "ProvinceCode", Sites[i, 3]);
+ }
+
+ writer.SetValue("Images", "Image0", ImageURL0.Text);
+ writer.SetValue("Images", "Image1", ImageURL1.Text);
+ writer.SetValue("Images", "Image2", ImageURL2.Text);
+ writer.SetValue("Images", "Image3", ImageURL3.Text);
+ writer.SetValue("Images", "Image4", ImageURL4.Text);
+
+ MediaPortal.Profile.Settings.SaveCache();
+ }
+
+ //close form
+ Close();
+ Dispose();
+ }
+
+ private void Add_Click(object sender, EventArgs e)
+ {
+ if (NumberofSites == 19)
+ {
+ MessageBox.Show("The maximum number of locations allowed is 20. You will have to delete one before adding another.");
+
+ }
+ else
+ {
+ //Add the site
+ if (SiteLookupFailed == true)
+ {
+ MessageBox.Show("The list of Provinces and Cities could not be obtained from Environment Canada. You can perform all actions except Add. You can close the plugin Configuration and try again later.");
+ Add.Enabled.Equals(false);
+ }
+
+ if (selectedCity == "" || selectedProvince == "")
+ {
+ MessageBox.Show("Select a Province and City first");
+ }
+ else
+ {
+ //update the Array
+ //determine French Name for Province and City selected, then fill the sitecode part of Sites array
+ Temp = loaded.Descendants("site")
+ .Where(x => x.Element("provinceCode").Value == selectedProvince)
+ .Where(x => x.Element("nameEn").Value == selectedCity)
+ .Select(x => x.Attribute("code").Value)
+ .SingleOrDefault()
+ .ToString();
+ Sites[NumberofSites, 0] = Temp;
+ //fill the nameEn part of Sites array
+ Sites[NumberofSites, 1] = selectedCity;
+ //determine French Name for Province and City selected, then fill the nameFr part of Sites array
+ Temp = loaded.Descendants("site")
+ .Where(x => x.Element("provinceCode").Value == selectedProvince)
+ .Where(x => x.Element("nameEn").Value == selectedCity)
+ .Select(x => x.Element("nameFr").Value)
+ .SingleOrDefault()
+ .ToString();
+ Sites[NumberofSites, 2] = Temp;
+ //fill the provinceCode part of Sites array
+ Sites[NumberofSites, 3] = selectedProvince;
+
+ //update the Locations Listbox
+ _items.Add(selectedCity);
+ //Locations.SetSelected(NumberofSites, true);
+ Locations.DataSource = null;
+ Locations.DataSource = _items;
+
+ NumberofSites++;
+ }
+ }
+ }
+
+ private void Delete_Click(object sender, EventArgs e)
+ {
+ if (NumberofSites == 0)
+ { MessageBox.Show("There are no locations in the list."); }
+ else
+ {
+ //which site is in focus?
+ siteIndex = Locations.SelectedIndex;
+ //move the sites one place in the list and mark the last one's attributes as null
+ for (int i = siteIndex; i < NumberofSites; i++)
+ {
+ for (int j = 0; j < 4; j++)
+ {
+ Sites[i, j] = Sites[i + 1, j];
+ }
+ }
+ for (int j = 0; j < 4; j++)
+ {
+ Sites[NumberofSites, j] = "";
+ }
+ NumberofSites--;
+
+ //update the ListBox
+ _items.RemoveAt(siteIndex);
+ Locations.SetSelected(Math.Max(siteIndex - 1, 0), true); //max prevents from evaluating <0
+ Locations.DataSource = null;
+ Locations.DataSource = _items;
+ }
+ }
+
+ private void MoveUp_Click(object sender, EventArgs e)
+ {
+ //check if already at the top
+ siteIndex = Locations.SelectedIndex;
+ if (siteIndex > 0)
+ {
+ //adjust string order
+ tempstring = new string[1, 4];
+ for (int j = 0; j < 4; j++)
+ {
+ tempstring[0, j] = Sites[siteIndex, j];
+ Sites[siteIndex, j] = Sites[siteIndex - 1, j];
+ Sites[siteIndex - 1, j] = tempstring[0, j];
+ }
+ //adjust ListBox order
+ _items.RemoveAt(siteIndex);
+ _items.Insert(siteIndex - 1, tempstring[0, 1]);
+ Locations.SetSelected(siteIndex - 1, true);
+ Locations.DataSource = null;
+ Locations.DataSource = _items;
+ }
+ }
+
+ private void MoveDown_Click(object sender, EventArgs e)
+ {
+ //check if already at the bottom
+ siteIndex = Locations.SelectedIndex;
+ if (siteIndex < NumberofSites - 1)
+ {
+ //adjust string order
+ string[,] tempstring;
+ tempstring = new string[1, 4];
+ for (int j = 0; j < 4; j++)
+ {
+ tempstring[0, j] = Sites[siteIndex, j];
+ Sites[siteIndex, j] = Sites[siteIndex + 1, j];
+ Sites[siteIndex + 1, j] = tempstring[0, j];
+ }
+ //adjust ListBox order
+ _items.RemoveAt(siteIndex);
+ _items.Insert(siteIndex + 1, tempstring[0, 1]);
+ Locations.SetSelected(siteIndex + 1, true);
+ Locations.DataSource = null;
+ Locations.DataSource = _items;
+ }
+ }
+
+ private void Cancel_Click(object sender, EventArgs e)
+ {
+ Close();
+ Dispose();
+ }
+
+ private void listBoxProvince_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ //Selected province to a string
+ selectedProvince = listBoxProvince.SelectedItem.ToString();
+
+ //make a list of the cities for the selected province
+ CityNames = loaded.Descendants("site")
+ .Where(x => x.Element("provinceCode").Value == selectedProvince)
+ .Select(x => x.Element("nameEn").Value)
+ .ToList();
+ CityNames.Sort();
+
+ //if we already have a city list, clear it
+ if (listBoxCity.Items.Count > 0)
+ {
+ listBoxCity.Items.Clear();
+ }
+
+ //create the listbox
+ CityArray = CityNames.ToArray();
+ listBoxCity.Items.AddRange(CityArray);
+ //clear the arry for use next time, if required
+ Array.Clear(CityArray, 0, CityArray.Length);
+ selectedCity = "";
+ }
+
+ private void listBoxCity_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ selectedCity = listBoxCity.SelectedItem.ToString();
+ }
+
+ }
+
+}
\ No newline at end of file
Added: trunk/plugins/CanadianWeather/ConfigurationForm.resx
===================================================================
--- trunk/plugins/CanadianWeather/ConfigurationForm.resx (rev 0)
+++ trunk/plugins/CanadianWeather/ConfigurationForm.resx 2011-11-21 20:29:56 UTC (rev 4338)
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <metadata name="configurationFormBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+</root>
\ No newline at end of file
Added: trunk/plugins/CanadianWeather/GUICanadianWeather.cs
===================================================================
--- trunk/plugins/CanadianWeather/GUICanadianWeather.cs (rev 0)
+++ trunk/plugins/CanadianWeather/GUICanadianWeather.cs 2011-11-21 20:29:56 UTC (rev 4338)
@@ -0,0 +1,1572 @@
+#region using
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Xml.Linq;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Windows.Forms;
+using System.IO;
+using System.Xml;
+using System.Net;
+using MediaPortal.Configuration;
+using MediaPortal.Dialogs;
+using MediaPortal.GUI.Library;
+using Action = MediaPortal.GUI.Library.Action;
+using System.Threading;
+using System.Globalization;
+#endregion
+
+namespace MediaPortal.GUI.CanadianWeather
+{
+ [PluginIcons("CanadianWeather.Resources.lf.png", "CanadianWeather.Resources.lf_disabled.png")]
+ public class GUICanadianWeather : GUIInternalWindow, ISetupForm
+ {
+ [SkinControlAttribute(2)] protected GUIButtonControl SatelliteImageButton = null;
+ [SkinControlAttribute(3)] protected GUIButtonControl SevenDayForecastButton = null;
+ [SkinControlAttribute(4)] protected GUIButtonControl RefreshButton = null;
+ [SkinControlAttribute(5)] protected GUIButtonControl CityButton = null;
+ [SkinControlAttribute(6)] protected GUIButtonControl WeatherWarningButton = null;
+
+ #region variables
+
+ int tempint = 0;
+ string tempsavedlow = "";
+ bool nightflag = false;
+
+
+ int RefreshTime;
+ string SelectedCity;
+ string LanguageChoice;
+ string Language;
+ string[,] Sites;
+ int NumberofSites;
+ string ForecastXML;
+ string URL;
+ private const int NUM_DAYS = 7;
+ private const char DEGREE_CHARACTER = (char)176; //the degree 'o' character
+ private DateTime _lastRefreshTime = DateTime.Now.AddHours(-1); //for autorefresh
+ string mode;
+ string lastmode;
+ private string _urlImage0 = string.Empty;
+ private string _urlImage1 = string.Empty;
+ private string _urlImage2 = string.Empty;
+ private string _urlImage3 = string.Empty;
+ private string _urlImage4 = string.Empty;
+ private string _urlViewImage = string.Empty;
+ private bool FirstTimeThruImageLoopIsCompleted;
+ private bool ContinueImageLoop;
+
+ string currentLocation;
+ string LocalizedTimeStamp;
+ string ObservedYear;
+ string ObservedMonth;
+ string ObservedDay;
+ string ObservedHour;
+ string ObservedMinute;
+ int intObservedYear;
+ int intObservedMonth;
+ int intObservedDay;
+ int intObservedHour;
+ int intObservedMinute;
+ string ObservedTimeStamp;
+ string ObservedtextSummary;
+ string currentCondition;
+ string currentIconCode;
+ string currentTemperature;
+ string currentFeelsLike;
+ string currentWindChill;
+ string currentHumidex;
+ string currentDewpoint;
+ string currentPressure;
+ string currentPressuretendency;
+ string currentPressureAndTendency;
+ string currentVisibility;
+ string currentRelativeHumidity;
+ string currentWindspeed;
+ string currentWindgust;
+ string currentWinddirection;
+ string currentWindCombinedString;
+ string IssuedTimeStamp;
+ string SunriseTime;
+ string SunsetTime;
+ string WeatherWarningPriority;
+ string WeatherWarningType;
+ string WeatherWarningURL;
+ string WarningHTML;
+ int intIssuedYear;
+ int intIssuedMonth;
+ int intIssuedDay;
+ int intIssuedHour;
+ int intIssuedMinute;
+ int intSunriseYear;
+ int intSunriseMonth;
+ int intSunriseDay;
+ int intSunriseHour;
+ int intSunriseMinute;
+ int intSunsetYear;
+ int intSunsetMonth;
+ int intSunsetDay;
+ int intSunsetHour;
+ int intSunsetMinute;
+
+ string strIcon = GUIGraphicsContext.Skin + @"\Media\CanadianWeather\na.png";
+ string strBaseURL = "http://dd.weatheroffice.ec.gc.ca/citypage_weather/xml/";
+ string strPressure = "Pressure";
+ string strVisibility = "Visibility";
+ string strSunrise = "Sunrise";
+ string strSunset = "Sunset";
+ string strForecastIssued = "Forecast Issued: ";
+ string strSevenDayForecast = "Text Forecast";
+ string strCurrentConditions = "Current Conditions";
+ string strNotObserved = "not observed";
+ string strGust = " gust ";
+ string strWarning = "Warning - ";
+ string strHigh = "High";
+ string strMed = "Med.";
+ string strLow = "Low";
+
+ public string[] Day = new string[NUM_DAYS];
+ public string[] High = new string[NUM_DAYS];
+ public string[] Low = new string[NUM_DAYS];
+ public string[] IconCode = new string[NUM_DAYS];
+ public string[] Pop = new string[NUM_DAYS];
+ public string[] Overview = new string[NUM_DAYS];
+ public string[] TextSummary = new string[NUM_DAYS];
+
+ private bool _workerCompleted = false;
+ private object _downloadLock = null;
+ private bool _workerActive = false;
+ private Images _images;
+
+ bool SitesFound = false;
+ XDocument loaded;
+ string[] ProvinceArray;
+ string[] CityArray;
+ List<string> ShortListOfProvs;
+ List<string> CityNames;
+ String strURL = "http://dd.weatheroffice.ec.gc.ca/citypage_weather/xml/siteList.xml";
+ String strChooseProv = "Select a Province";
+ String strChooseCity = "Select a City";
+
+ #endregion
+
+ #region enums
+
+ private enum Controls
+ {
+ CONTROL_BTNSWITCH = 2,
+ CONTROL_BTNVIEW = 3,
+ CONTROL_BTNREFRESH = 4,
+ CONTROL_BTNLOCATIONSELECT = 5,
+ CONTROL_BTNWEATHERWARNING = 6,
+
+ CONTROL_LABELLOCATION = 10,
+ CONTROL_FORECASTUPDATED = 11,
+ CONTROL_IMAGELOGO = 101,
+ CONTROL_LABELWEATHERWARNING = 16,
+ CONTROL_LABELSUNRISE = 19,
+ CONTROL_LABELSUNSET = 20,
+ CONTROL_IMAGENOWICON = 21,
+ CONTROL_LABELNOWCOND = 22,
+ CONTROL_LABELNOWTEMP = 23,
+ CONTROL_LABELNOWWIND = 24,
+ CONTROL_LABELNOWRELHUM = 25,
+ CONTROL_LABELNOWDEW = 26,
+ CONTROL_LABELNOWPRESSURE = 27,
+ CONTROL_LABELNOWVISIBILITY = 28,
+ CONTROL_LABELNOWFEELSLIKE = 29,
+
+ CONTROL_STATICFEEL = 223,
+ CONTROL_STATICWIND = 224,
+ CONTROL_STATICRELHUMIDITY = 225,
+ CONTROL_STATICDEWPOINT = 226,
+ CONTROL_STATICPRESSURE = 227,
+ CONTROL_STATICVISIBILIY = 228,
+ CONTROL_STATICSUNRISE = 229,
+ CONTROL_STATICSUNSET = 230,
+
+ CONTROL_LABELD0DAY = 31,
+ CONTROL_LABELD0HI = 32,
+ CONTROL_LABELD0LOW = 33,
+ CONTROL_LABELD0GEN = 34,
+ CONTROL_IMAGED0IMG = 35,
+ CONTROL_LABELD0POP = 36,
+ // Controls 31..36 - 91..96 are reserved for day 0-6 !!!
+
+ CONTROL_STATICDAY0 = 110, //110 to 116 for StaticDay0 to StaticDay6
+ CONTROL_LABELDAY0 = 120, //120 to 126 for LabelDay0 to LabelDay6
+
+ CONTROL_IMAGE_SAT = 1000
+
+ }
+
+ private enum Images
+ {
+ Image0 = 0,
+ Image1 = 1,
+ Image2 = 2,
+ Image3 = 3,
+ Image4 = 4,
+ }
+
+ #endregion
+
+ //public GUICanadianWeather()
+ //{
+ //}
+
+ public bool IsRefreshing
+ {
+ get { return _workerActive; }
+ [MethodImpl(MethodImplOptions.Synchronized)]
+ private set { _workerActive = value; }
+ }
+
+ protected override void OnPageDestroy(int newWindowId)
+ {
+ mode = "ShowCurrent";
+ lastmode = "ShowCurrent";
+ _images = Images.Image0;
+ FirstTimeThruImageLoopIsCompleted = false;
+ ContinueImageLoop = true;
+ }
+
+ //protected override void OnShowContextMenu()
+ //{
+ //}
+
+ protected override void OnPageLoad()
+ {
+ base.OnPageLoad();
+
+ _downloadLock = new object();
+
+ FirstTimeThruImageLoopIsCompleted = false;
+ _images = Images.Image0;
+ mode = "ShowCurrent";
+ lastmode = "ShowCurrent";
+ LoadSettings(); //get the weather settings from the user
+ SelectedCity = Sites[0, 3] + "/" + Sites[0, 0] + "_"; // e.g., "AB/s0000047_"
+ LanguageChoice = "e"; //language choice defaulting to English for now. later check Language and set as appropriate
+ URL = strBaseURL + SelectedCity + LanguageChoice + ".xml"; //form URL
+
+ OnRefresh();
+ }
+
+ public override void Process()
+ {
+ TimeSpan ts = DateTime.Now - _lastRefreshTime;
+ if (ts.TotalMinutes >= RefreshTime && NumberofSites > 0 && !IsRefreshing)
+ {
+ //autoupdate
+ mode = "ShowCurrent";
+ lastmode = "ShowCurrent";
+ OnRefresh();
+ }
+ base.Process();
+ }
+
+ private void BackgroundRefresh(object sender, DoWorkEventArgs e)
+ {
+ GetForecast(URL); //get the forecast from EC
+ ParseXML(ForecastXML); //parse it
+ SetWeatherModeControls(); //display
+ _workerCompleted = true;
+ IsRefreshing = false;
+ }
+
+ protected override void OnClicked(int controlId, GUIControl control, Action.ActionType actionType)
+ {
+
+ if (control == SevenDayForecastButton)
+ {
+ OnSevenDayForecast();
+ }
+ if (control == RefreshButton)
+ {
+ FirstTimeThruImageLoopIsCompleted = false;
+ lastmode = "ShowCurrent";
+ mode = "ShowCurrent";
+ _images = Images.Image0;
+ OnRefresh();
+ }
+ if (control == CityButton)
+ {
+ OnCityButton();
+ }
+ if (control == WeatherWarningButton)
+ {
+ OnWeatherWarningButton();
+ }
+ if (control == SatelliteImageButton)
+ {
+ OnSatelliteImageButton();
+ }
+ base.OnClicked(controlId, control, actionType);
+ }
+
+ private void OnSatelliteImageButton()
+ {
+
+ SetNextViewType();
+ if (ContinueImageLoop)
+ {
+ UpdateDetailImages();
+ }
+ OnRefresh();
+ }
+
+ private void OnSevenDayForecast()
+ {
+ if (lastmode != "ShowTextForecast")
+ {
+ mode = "ShowTextForecast";
+ SetWeatherModeControls();
+ lastmode = "ShowTextForeca...
[truncated message content] |
|
From: <ant...@us...> - 2011-11-19 15:46:43
|
Revision: 4337
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4337&view=rev
Author: anthrax-leprosy
Date: 2011-11-19 15:46:37 +0000 (Sat, 19 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.xmp2
trunk/plugins/MySleepTimer/MpeRelease/update.xml
Modified: trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.xmp2
===================================================================
--- trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.xmp2 2011-11-19 15:42:50 UTC (rev 4336)
+++ trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.xmp2 2011-11-19 15:46:37 UTC (rev 4337)
@@ -181,10 +181,10 @@
<Build>6</Build>
<Revision>0</Revision>
</Version>
- <ExtensionDescription>If you want to set a sleeptime by simply pressing a remote button, this plugin is what you are searching for.
-
-It is possible to define the steps which are used to set the sleeptime and detects the remaining playback time if a media is played while you pressed the sleeptimer button.
-
+ <ExtensionDescription>If you want to set a sleeptime by simply pressing a remote button, this plugin is what you are searching for.
+
+It is possible to define the steps which are used to set the sleeptime and detects the remaining playback time if a media is played while you pressed the sleeptimer button.
+
If you are using IRSS, there will be NO need to configure the remote button mapping within MP, since IRSS detects the sleeptimer plugin and always sends the yellow button if the plugin is found,</ExtensionDescription>
<VersionDescription>added support for MediaPortal 1.2.1.0 final</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
Modified: trunk/plugins/MySleepTimer/MpeRelease/update.xml
===================================================================
--- trunk/plugins/MySleepTimer/MpeRelease/update.xml 2011-11-19 15:42:50 UTC (rev 4336)
+++ trunk/plugins/MySleepTimer/MpeRelease/update.xml 2011-11-19 15:46:37 UTC (rev 4337)
@@ -71,10 +71,10 @@
<Build>6</Build>
<Revision>0</Revision>
</Version>
- <ExtensionDescription>If you want to set a sleeptime by simply pressing a remote button, this plugin is what you are searching for.
-
-It is possible to define the steps which are used to set the sleeptime and detects the remaining playback time if a media is played while you pressed the sleeptimer button.
-
+ <ExtensionDescription>If you want to set a sleeptime by simply pressing a remote button, this plugin is what you are searching for.
+
+It is possible to define the steps which are used to set the sleeptime and detects the remaining playback time if a media is played while you pressed the sleeptimer button.
+
If you are using IRSS, there will be NO need to configure the remote button mapping within MP, since IRSS detects the sleeptimer plugin and always sends the yellow button if the plugin is found,</ExtensionDescription>
<VersionDescription>added support for MediaPortal 1.2.1.0 final</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ant...@us...> - 2011-11-19 15:42:56
|
Revision: 4336
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4336&view=rev
Author: anthrax-leprosy
Date: 2011-11-19 15:42:50 +0000 (Sat, 19 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.mpe1
trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.xmp2
trunk/plugins/MySleepTimer/MpeRelease/update.xml
Modified: trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.xmp2
===================================================================
--- trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.xmp2 2011-11-19 15:33:24 UTC (rev 4335)
+++ trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.xmp2 2011-11-19 15:42:50 UTC (rev 4336)
@@ -174,7 +174,7 @@
<Author>Team MediaPortal, Anthrax (thx Chefkoch)</Author>
<HomePage>http://forum.team-mediaportal.com/MySleepTimer-t47353.html</HomePage>
<ForumPage>http://forum.team-mediaportal.com/MySleepTimer-t47353.html</ForumPage>
- <UpdateUrl>http://www.team-mediaportal.com/index.php?http://mp-plugins.svn.sourceforge.net/viewvc/mp-plugins/trunk/plugins/MySleepTimer/MpeRelease/update.xml?revision=4334</UpdateUrl>
+ <UpdateUrl>http://mp-plugins.svn.sourceforge.net/viewvc/mp-plugins/trunk/plugins/MySleepTimer/MpeRelease/update.xml</UpdateUrl>
<Version>
<Major>1</Major>
<Minor>0</Minor>
@@ -188,7 +188,7 @@
If you are using IRSS, there will be NO need to configure the remote button mapping within MP, since IRSS detects the sleeptimer plugin and always sends the yellow button if the plugin is found,</ExtensionDescription>
<VersionDescription>added support for MediaPortal 1.2.1.0 final</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
- <OnlineLocation>http://mp-plugins.svn.sourceforge.net/viewvc/mp-plugins/trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.mpe1?revision=4333</OnlineLocation>
+ <OnlineLocation>http://mp-plugins.svn.sourceforge.net/viewvc/mp-plugins/trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.mpe1</OnlineLocation>
<ReleaseDate>2011-11-19T00:54:51</ReleaseDate>
<Tags>standby, suspend, sleeptimer, sleep</Tags>
<Location>D:\Anthrax-Leprosy-Pi\Documents\Development\Projekte\MediaPortal\MySleepTimer\MpeRelease\MySleepTimer.mpe1</Location>
Modified: trunk/plugins/MySleepTimer/MpeRelease/update.xml
===================================================================
--- trunk/plugins/MySleepTimer/MpeRelease/update.xml 2011-11-19 15:33:24 UTC (rev 4335)
+++ trunk/plugins/MySleepTimer/MpeRelease/update.xml 2011-11-19 15:42:50 UTC (rev 4336)
@@ -64,7 +64,7 @@
<Author>Team MediaPortal, Anthrax (thx Chefkoch)</Author>
<HomePage>http://forum.team-mediaportal.com/MySleepTimer-t47353.html</HomePage>
<ForumPage>http://forum.team-mediaportal.com/MySleepTimer-t47353.html</ForumPage>
- <UpdateUrl>http://www.team-mediaportal.com/index.php?http://mp-plugins.svn.sourceforge.net/viewvc/mp-plugins/trunk/plugins/MySleepTimer/MpeRelease/update.xml?revision=4334</UpdateUrl>
+ <UpdateUrl>http://mp-plugins.svn.sourceforge.net/viewvc/mp-plugins/trunk/plugins/MySleepTimer/MpeRelease/update.xml</UpdateUrl>
<Version>
<Major>1</Major>
<Minor>0</Minor>
@@ -78,7 +78,7 @@
If you are using IRSS, there will be NO need to configure the remote button mapping within MP, since IRSS detects the sleeptimer plugin and always sends the yellow button if the plugin is found,</ExtensionDescription>
<VersionDescription>added support for MediaPortal 1.2.1.0 final</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
- <OnlineLocation>http://mp-plugins.svn.sourceforge.net/viewvc/mp-plugins/trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.mpe1?revision=4333</OnlineLocation>
+ <OnlineLocation>http://mp-plugins.svn.sourceforge.net/viewvc/mp-plugins/trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.mpe1</OnlineLocation>
<ReleaseDate>2011-11-19T00:54:51</ReleaseDate>
<Tags>standby, suspend, sleeptimer, sleep</Tags>
<Location>D:\Anthrax-Leprosy-Pi\Documents\Development\Projekte\MediaPortal\MySleepTimer\MpeRelease\MySleepTimer.mpe1</Location>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ant...@us...> - 2011-11-19 15:33:31
|
Revision: 4335
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4335&view=rev
Author: anthrax-leprosy
Date: 2011-11-19 15:33:24 +0000 (Sat, 19 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.mpe1
trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.xmp2
trunk/plugins/MySleepTimer/MpeRelease/update.xml
Modified: trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.xmp2
===================================================================
--- trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.xmp2 2011-11-19 15:30:19 UTC (rev 4334)
+++ trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.xmp2 2011-11-19 15:33:24 UTC (rev 4335)
@@ -174,7 +174,7 @@
<Author>Team MediaPortal, Anthrax (thx Chefkoch)</Author>
<HomePage>http://forum.team-mediaportal.com/MySleepTimer-t47353.html</HomePage>
<ForumPage>http://forum.team-mediaportal.com/MySleepTimer-t47353.html</ForumPage>
- <UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=52&cf_id=52</UpdateUrl>
+ <UpdateUrl>http://www.team-mediaportal.com/index.php?http://mp-plugins.svn.sourceforge.net/viewvc/mp-plugins/trunk/plugins/MySleepTimer/MpeRelease/update.xml?revision=4334</UpdateUrl>
<Version>
<Major>1</Major>
<Minor>0</Minor>
@@ -186,7 +186,7 @@
It is possible to define the steps which are used to set the sleeptime and detects the remaining playback time if a media is played while you pressed the sleeptimer button.
If you are using IRSS, there will be NO need to configure the remote button mapping within MP, since IRSS detects the sleeptimer plugin and always sends the yellow button if the plugin is found,</ExtensionDescription>
- <VersionDescription>added MP 1.2 beta compatibility</VersionDescription>
+ <VersionDescription>added support for MediaPortal 1.2.1.0 final</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://mp-plugins.svn.sourceforge.net/viewvc/mp-plugins/trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.mpe1?revision=4333</OnlineLocation>
<ReleaseDate>2011-11-19T00:54:51</ReleaseDate>
Modified: trunk/plugins/MySleepTimer/MpeRelease/update.xml
===================================================================
--- trunk/plugins/MySleepTimer/MpeRelease/update.xml 2011-11-19 15:30:19 UTC (rev 4334)
+++ trunk/plugins/MySleepTimer/MpeRelease/update.xml 2011-11-19 15:33:24 UTC (rev 4335)
@@ -64,7 +64,7 @@
<Author>Team MediaPortal, Anthrax (thx Chefkoch)</Author>
<HomePage>http://forum.team-mediaportal.com/MySleepTimer-t47353.html</HomePage>
<ForumPage>http://forum.team-mediaportal.com/MySleepTimer-t47353.html</ForumPage>
- <UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=52&cf_id=52</UpdateUrl>
+ <UpdateUrl>http://www.team-mediaportal.com/index.php?http://mp-plugins.svn.sourceforge.net/viewvc/mp-plugins/trunk/plugins/MySleepTimer/MpeRelease/update.xml?revision=4334</UpdateUrl>
<Version>
<Major>1</Major>
<Minor>0</Minor>
@@ -76,7 +76,7 @@
It is possible to define the steps which are used to set the sleeptime and detects the remaining playback time if a media is played while you pressed the sleeptimer button.
If you are using IRSS, there will be NO need to configure the remote button mapping within MP, since IRSS detects the sleeptimer plugin and always sends the yellow button if the plugin is found,</ExtensionDescription>
- <VersionDescription>added MP 1.2 beta compatibility</VersionDescription>
+ <VersionDescription>added support for MediaPortal 1.2.1.0 final</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://mp-plugins.svn.sourceforge.net/viewvc/mp-plugins/trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.mpe1?revision=4333</OnlineLocation>
<ReleaseDate>2011-11-19T00:54:51</ReleaseDate>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ant...@us...> - 2011-11-19 15:30:25
|
Revision: 4334
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4334&view=rev
Author: anthrax-leprosy
Date: 2011-11-19 15:30:19 +0000 (Sat, 19 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.xmp2
trunk/plugins/MySleepTimer/MpeRelease/update.xml
Modified: trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.xmp2
===================================================================
--- trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.xmp2 2011-11-19 15:20:37 UTC (rev 4333)
+++ trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.xmp2 2011-11-19 15:30:19 UTC (rev 4334)
@@ -181,14 +181,14 @@
<Build>6</Build>
<Revision>0</Revision>
</Version>
- <ExtensionDescription>If you want to set a sleeptime by simply pressing a remote button, this plugin is what you are searching for.
-
-It is possible to define the steps which are used to set the sleeptime and detects the remaining playback time if a media is played while you pressed the sleeptimer button.
-
+ <ExtensionDescription>If you want to set a sleeptime by simply pressing a remote button, this plugin is what you are searching for.
+
+It is possible to define the steps which are used to set the sleeptime and detects the remaining playback time if a media is played while you pressed the sleeptimer button.
+
If you are using IRSS, there will be NO need to configure the remote button mapping within MP, since IRSS detects the sleeptimer plugin and always sends the yellow button if the plugin is found,</ExtensionDescription>
<VersionDescription>added MP 1.2 beta compatibility</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
- <OnlineLocation>hhttp://mp-plugins.svn.sourceforge.net/viewvc/mp-plugins/trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.mpe1?revision=4332</OnlineLocation>
+ <OnlineLocation>http://mp-plugins.svn.sourceforge.net/viewvc/mp-plugins/trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.mpe1?revision=4333</OnlineLocation>
<ReleaseDate>2011-11-19T00:54:51</ReleaseDate>
<Tags>standby, suspend, sleeptimer, sleep</Tags>
<Location>D:\Anthrax-Leprosy-Pi\Documents\Development\Projekte\MediaPortal\MySleepTimer\MpeRelease\MySleepTimer.mpe1</Location>
Modified: trunk/plugins/MySleepTimer/MpeRelease/update.xml
===================================================================
--- trunk/plugins/MySleepTimer/MpeRelease/update.xml 2011-11-19 15:20:37 UTC (rev 4333)
+++ trunk/plugins/MySleepTimer/MpeRelease/update.xml 2011-11-19 15:30:19 UTC (rev 4334)
@@ -71,14 +71,14 @@
<Build>6</Build>
<Revision>0</Revision>
</Version>
- <ExtensionDescription>If you want to set a sleeptime by simply pressing a remote button, this plugin is what you are searching for.
-
-It is possible to define the steps which are used to set the sleeptime and detects the remaining playback time if a media is played while you pressed the sleeptimer button.
-
+ <ExtensionDescription>If you want to set a sleeptime by simply pressing a remote button, this plugin is what you are searching for.
+
+It is possible to define the steps which are used to set the sleeptime and detects the remaining playback time if a media is played while you pressed the sleeptimer button.
+
If you are using IRSS, there will be NO need to configure the remote button mapping within MP, since IRSS detects the sleeptimer plugin and always sends the yellow button if the plugin is found,</ExtensionDescription>
<VersionDescription>added MP 1.2 beta compatibility</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
- <OnlineLocation>hhttp://mp-plugins.svn.sourceforge.net/viewvc/mp-plugins/trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.mpe1?revision=4332</OnlineLocation>
+ <OnlineLocation>http://mp-plugins.svn.sourceforge.net/viewvc/mp-plugins/trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.mpe1?revision=4333</OnlineLocation>
<ReleaseDate>2011-11-19T00:54:51</ReleaseDate>
<Tags>standby, suspend, sleeptimer, sleep</Tags>
<Location>D:\Anthrax-Leprosy-Pi\Documents\Development\Projekte\MediaPortal\MySleepTimer\MpeRelease\MySleepTimer.mpe1</Location>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ant...@us...> - 2011-11-19 15:20:44
|
Revision: 4333
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4333&view=rev
Author: anthrax-leprosy
Date: 2011-11-19 15:20:37 +0000 (Sat, 19 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.mpe1
trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.xmp2
trunk/plugins/MySleepTimer/MpeRelease/update.xml
Modified: trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.xmp2
===================================================================
--- trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.xmp2 2011-11-19 15:12:55 UTC (rev 4332)
+++ trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.xmp2 2011-11-19 15:20:37 UTC (rev 4333)
@@ -188,7 +188,7 @@
If you are using IRSS, there will be NO need to configure the remote button mapping within MP, since IRSS detects the sleeptimer plugin and always sends the yellow button if the plugin is found,</ExtensionDescription>
<VersionDescription>added MP 1.2 beta compatibility</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
- <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=52&cf_id=24</OnlineLocation>
+ <OnlineLocation>hhttp://mp-plugins.svn.sourceforge.net/viewvc/mp-plugins/trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.mpe1?revision=4332</OnlineLocation>
<ReleaseDate>2011-11-19T00:54:51</ReleaseDate>
<Tags>standby, suspend, sleeptimer, sleep</Tags>
<Location>D:\Anthrax-Leprosy-Pi\Documents\Development\Projekte\MediaPortal\MySleepTimer\MpeRelease\MySleepTimer.mpe1</Location>
@@ -245,7 +245,7 @@
<ProjectSettings>
<FolderGroups />
<ProjectFilename>MySleepTimer.xmp2</ProjectFilename>
- <UpdatePath1>D:\MediaPortal\mp-plugins\trunk\plugins\MySleepTimer\MpeRelease\update.xml</UpdatePath1>
+ <UpdatePath1>D:\Anthrax-Leprosy-Pi\Documents\Development\Projekte\MediaPortal\MySleepTimer\MpeRelease\update.xml</UpdatePath1>
<UpdatePath2 />
<UpdatePath3 />
</ProjectSettings>
Modified: trunk/plugins/MySleepTimer/MpeRelease/update.xml
===================================================================
--- trunk/plugins/MySleepTimer/MpeRelease/update.xml 2011-11-19 15:12:55 UTC (rev 4332)
+++ trunk/plugins/MySleepTimer/MpeRelease/update.xml 2011-11-19 15:20:37 UTC (rev 4333)
@@ -26,32 +26,49 @@
<MinVersion>
<Major>1</Major>
<Minor>1</Minor>
- <Build>7</Build>
- <Revision>0</Revision>
+ <Build>6</Build>
+ <Revision>27644</Revision>
</MinVersion>
<MaxVersion>
- <Major>0</Major>
- <Minor>0</Minor>
- <Build>0</Build>
- <Revision>0</Revision>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
</MaxVersion>
- <WarnOnly>true</WarnOnly>
- <Message>Need minimum MediaPortal 1.2 beta or later</Message>
+ <WarnOnly>false</WarnOnly>
+ <Message>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message>
<Name>MediaPortal</Name>
</DependencyItem>
</Items>
</Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="MySleepTimer.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.1.7.0</MinRequiredVersion>
+ <DesignedForVersion>1.1.7.0</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items />
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
<GeneralInfo>
<Name>MySleepTimer</Name>
<Id>05afd608-7fb0-4738-85b3-250bb8e521a6</Id>
- <Author>chefkoch @ Team MediaPortal, Anthrax</Author>
+ <Author>Team MediaPortal, Anthrax (thx Chefkoch)</Author>
<HomePage>http://forum.team-mediaportal.com/MySleepTimer-t47353.html</HomePage>
<ForumPage>http://forum.team-mediaportal.com/MySleepTimer-t47353.html</ForumPage>
<UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=52&cf_id=52</UpdateUrl>
<Version>
<Major>1</Major>
<Minor>0</Minor>
- <Build>5</Build>
+ <Build>6</Build>
<Revision>0</Revision>
</Version>
<ExtensionDescription>If you want to set a sleeptime by simply pressing a remote button, this plugin is what you are searching for.
@@ -61,17 +78,12 @@
If you are using IRSS, there will be NO need to configure the remote button mapping within MP, since IRSS detects the sleeptimer plugin and always sends the yellow button if the plugin is found,</ExtensionDescription>
<VersionDescription>added MP 1.2 beta compatibility</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
- <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=52&cf_id=24</OnlineLocation>
- <ReleaseDate>2011-04-23T00:54:51.9699087+02:00</ReleaseDate>
+ <OnlineLocation>hhttp://mp-plugins.svn.sourceforge.net/viewvc/mp-plugins/trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.mpe1?revision=4332</OnlineLocation>
+ <ReleaseDate>2011-11-19T00:54:51</ReleaseDate>
<Tags>standby, suspend, sleeptimer, sleep</Tags>
- <Location>D:\MediaPortal\mp-plugins\trunk\plugins\MySleepTimer\MpeRelease\MySleepTimer.mpe1</Location>
+ <Location>D:\Anthrax-Leprosy-Pi\Documents\Development\Projekte\MediaPortal\MySleepTimer\MpeRelease\MySleepTimer.mpe1</Location>
<Params>
<Items>
- <SectionParam Name="Icon">
- <Value>D:\MediaPortal\mp-plugins\trunk\plugins\MySleepTimer\MySleepTimer\img\MySleepTimer_enabled.png</Value>
- <ValueType>File</ValueType>
- <Description>The icon file of the package (jpg,png,bmp)</Description>
- </SectionParam>
<SectionParam Name="Online Icon">
<Value>http://mp-plugins.svn.sourceforge.net/viewvc/mp-plugins/trunk/plugins/MySleepTimer/MySleepTimer/img/MySleepTimer_enabled.png</Value>
<ValueType>String</ValueType>
@@ -103,6 +115,7 @@
<ProjectSettings>
<FolderGroups />
</ProjectSettings>
+ <IsSkin>false</IsSkin>
</PackageClass>
</Items>
</ExtensionCollection>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ant...@us...> - 2011-11-19 15:13:01
|
Revision: 4332
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4332&view=rev
Author: anthrax-leprosy
Date: 2011-11-19 15:12:55 +0000 (Sat, 19 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.mpe1
Modified: trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.mpe1
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ant...@us...> - 2011-11-19 14:53:55
|
Revision: 4331
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4331&view=rev
Author: anthrax-leprosy
Date: 2011-11-19 14:53:49 +0000 (Sat, 19 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.mpe1
trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.xmp2
trunk/plugins/MySleepTimer/MySleepTimer/MySleepTimer.cs
trunk/plugins/MySleepTimer/MySleepTimer/MySleepTimer.csproj
trunk/plugins/MySleepTimer/MySleepTimer/Properties/AssemblyInfo.cs
Added Paths:
-----------
trunk/plugins/MySleepTimer/MySleepTimer/dll/
trunk/plugins/MySleepTimer/MySleepTimer/dll/Common.Utils.dll
trunk/plugins/MySleepTimer/MySleepTimer/dll/Core.dll
trunk/plugins/MySleepTimer/MySleepTimer/dll/Dialogs.dll
trunk/plugins/MySleepTimer/MySleepTimer/dll/Utils.dll
trunk/plugins/MySleepTimer/MySleepTimer/dll/WindowPlugins.dll
Modified: trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.xmp2
===================================================================
--- trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.xmp2 2011-11-17 13:35:49 UTC (rev 4330)
+++ trunk/plugins/MySleepTimer/MpeRelease/MySleepTimer.xmp2 2011-11-19 14:53:49 UTC (rev 4331)
@@ -17,6 +17,13 @@
<ZipFileName>Installer{CopyFile}\{23cd779d-aafa-4bc8-80ae-999fc60ebee4}-MySleepTimer.dll</ZipFileName>
<DestinationFilename>%Plugins%\process\MySleepTimer.dll</DestinationFilename>
</FileItem>
+ <FileItem InstallType="GenericSkinFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\MySleepTimer\img\MySleepTimer_enabled.png</LocalFileName>
+ <ZipFileName>Installer{GenericSkinFile}\{1eae909a-508f-4c2a-84a3-dc3ea79b3d86}-MySleepTimer_enabled.png</ZipFileName>
+ <DestinationFilename>%Skin%\[DEFAULT]\Media\MySleepTimer_enabled.png</DestinationFilename>
+ </FileItem>
</Items>
</Files>
</GroupItem>
@@ -129,32 +136,49 @@
<MinVersion>
<Major>1</Major>
<Minor>1</Minor>
- <Build>7</Build>
- <Revision>0</Revision>
+ <Build>6</Build>
+ <Revision>27644</Revision>
</MinVersion>
<MaxVersion>
- <Major>0</Major>
- <Minor>0</Minor>
- <Build>0</Build>
- <Revision>0</Revision>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
</MaxVersion>
- <WarnOnly>true</WarnOnly>
- <Message>Need minimum MediaPortal 1.2 beta or later</Message>
+ <WarnOnly>false</WarnOnly>
+ <Message>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message>
<Name>MediaPortal</Name>
</DependencyItem>
</Items>
</Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="MySleepTimer.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.1.7.0</MinRequiredVersion>
+ <DesignedForVersion>1.1.7.0</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items />
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
<GeneralInfo>
<Name>MySleepTimer</Name>
<Id>05afd608-7fb0-4738-85b3-250bb8e521a6</Id>
- <Author>chefkoch @ Team MediaPortal, Anthrax</Author>
+ <Author>Team MediaPortal, Anthrax (thx Chefkoch)</Author>
<HomePage>http://forum.team-mediaportal.com/MySleepTimer-t47353.html</HomePage>
<ForumPage>http://forum.team-mediaportal.com/MySleepTimer-t47353.html</ForumPage>
<UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=52&cf_id=52</UpdateUrl>
<Version>
<Major>1</Major>
<Minor>0</Minor>
- <Build>5</Build>
+ <Build>6</Build>
<Revision>0</Revision>
</Version>
<ExtensionDescription>If you want to set a sleeptime by simply pressing a remote button, this plugin is what you are searching for.
@@ -165,9 +189,9 @@
<VersionDescription>added MP 1.2 beta compatibility</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=52&cf_id=24</OnlineLocation>
- <ReleaseDate>2011-04-23T00:54:51.9699087+02:00</ReleaseDate>
+ <ReleaseDate>2011-11-19T00:54:51</ReleaseDate>
<Tags>standby, suspend, sleeptimer, sleep</Tags>
- <Location>D:\MediaPortal\mp-plugins\trunk\plugins\MySleepTimer\MpeRelease\MySleepTimer.mpe1</Location>
+ <Location>D:\Anthrax-Leprosy-Pi\Documents\Development\Projekte\MediaPortal\MySleepTimer\MpeRelease\MySleepTimer.mpe1</Location>
<Params>
<Items>
<SectionParam Name="Icon">
@@ -209,20 +233,21 @@
<ZipFileName>Installer{CopyFile}\{23cd779d-aafa-4bc8-80ae-999fc60ebee4}-MySleepTimer.dll</ZipFileName>
<DestinationFilename>%Plugins%\process\MySleepTimer.dll</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="true" Modified="true">
+ <FileItem InstallType="GenericSkinFile" SystemFile="true" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\MySleepTimer\img\MySleepTimer_enabled.png</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{08dd68d7-aefc-47d7-a9c6-393fd8d627a1}-MySleepTimer_enabled.png</ZipFileName>
- <DestinationFilename />
+ <ZipFileName>Installer{GenericSkinFile}\{1eae909a-508f-4c2a-84a3-dc3ea79b3d86}-MySleepTimer_enabled.png</ZipFileName>
+ <DestinationFilename>%Skin%\[DEFAULT]\Media\MySleepTimer_enabled.png</DestinationFilename>
</FileItem>
</Items>
</UniqueFileList>
<ProjectSettings>
<FolderGroups />
- <ProjectFilename>D:\MediaPortal\mp-plugins\trunk\plugins\MySleepTimer\MpeRelease\MySleepTimer.xmp2</ProjectFilename>
+ <ProjectFilename>MySleepTimer.xmp2</ProjectFilename>
<UpdatePath1>D:\MediaPortal\mp-plugins\trunk\plugins\MySleepTimer\MpeRelease\update.xml</UpdatePath1>
<UpdatePath2 />
<UpdatePath3 />
</ProjectSettings>
+ <IsSkin>false</IsSkin>
</PackageClass>
\ No newline at end of file
Modified: trunk/plugins/MySleepTimer/MySleepTimer/MySleepTimer.cs
===================================================================
--- trunk/plugins/MySleepTimer/MySleepTimer/MySleepTimer.cs 2011-11-17 13:35:49 UTC (rev 4330)
+++ trunk/plugins/MySleepTimer/MySleepTimer/MySleepTimer.cs 2011-11-19 14:53:49 UTC (rev 4331)
@@ -237,7 +237,7 @@
_dialogSleepTimerNotify =
(GUIDialogNotify)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_NOTIFY);
_dialogSleepTimerNotify.TimeOut = timeOut;
- _dialogSleepTimerNotify.SetImage(GUIGraphicsContext.Skin + @"\Media\MySleepTimer_logo.png");
+ _dialogSleepTimerNotify.SetImage(GUIGraphicsContext.Skin + @"\Media\MySleepTimer_enabled.png");
_dialogSleepTimerNotify.SetHeading("MySleepTimer");
_dialogSleepTimerNotify.SetText(notifyMessage);
_dialogSleepTimerNotify.DoModal(GUIWindowManager.ActiveWindow);
Modified: trunk/plugins/MySleepTimer/MySleepTimer/MySleepTimer.csproj
===================================================================
--- trunk/plugins/MySleepTimer/MySleepTimer/MySleepTimer.csproj 2011-11-17 13:35:49 UTC (rev 4330)
+++ trunk/plugins/MySleepTimer/MySleepTimer/MySleepTimer.csproj 2011-11-19 14:53:49 UTC (rev 4331)
@@ -55,13 +55,16 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Common.Utils">
- <HintPath>..\..\..\..\..\MediaPortal\trunk\Common-MP-TVE3\Common.Utils\bin\Release\Common.Utils.dll</HintPath>
+ <HintPath>dll\Common.Utils.dll</HintPath>
+ <Private>False</Private>
</Reference>
<Reference Include="Core">
- <HintPath>..\..\..\..\..\MediaPortal\trunk\mediaportal\Core\bin\Release\Core.dll</HintPath>
+ <HintPath>dll\Core.dll</HintPath>
+ <Private>False</Private>
</Reference>
<Reference Include="Dialogs">
- <HintPath>..\..\..\..\..\MediaPortal\trunk\mediaportal\Dialogs\bin\Release\Dialogs.dll</HintPath>
+ <HintPath>dll\Dialogs.dll</HintPath>
+ <Private>False</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -69,8 +72,13 @@
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="Utils">
- <HintPath>..\..\..\..\..\MediaPortal\trunk\mediaportal\Utils\bin\Release\Utils.dll</HintPath>
+ <HintPath>dll\Utils.dll</HintPath>
+ <Private>False</Private>
</Reference>
+ <Reference Include="WindowPlugins">
+ <HintPath>dll\WindowPlugins.dll</HintPath>
+ <Private>False</Private>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Translation.cs" />
Modified: trunk/plugins/MySleepTimer/MySleepTimer/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/MySleepTimer/MySleepTimer/Properties/AssemblyInfo.cs 2011-11-17 13:35:49 UTC (rev 4330)
+++ trunk/plugins/MySleepTimer/MySleepTimer/Properties/AssemblyInfo.cs 2011-11-19 14:53:49 UTC (rev 4331)
@@ -33,7 +33,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Anthrax")]
[assembly: AssemblyProduct("MySleepTimer")]
-[assembly: AssemblyCopyright("Copyright \xA9 2008")]
+[assembly: AssemblyCopyright("Copyright \xA9 2011")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -57,5 +57,5 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.5.0")]
-[assembly: AssemblyFileVersion("1.0.5.0")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.0.6.0")]
+[assembly: AssemblyFileVersion("1.0.6.0")]
\ No newline at end of file
Added: trunk/plugins/MySleepTimer/MySleepTimer/dll/Common.Utils.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/MySleepTimer/MySleepTimer/dll/Common.Utils.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/MySleepTimer/MySleepTimer/dll/Core.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/MySleepTimer/MySleepTimer/dll/Core.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/MySleepTimer/MySleepTimer/dll/Dialogs.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/MySleepTimer/MySleepTimer/dll/Dialogs.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/MySleepTimer/MySleepTimer/dll/Utils.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/MySleepTimer/MySleepTimer/dll/Utils.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/MySleepTimer/MySleepTimer/dll/WindowPlugins.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/MySleepTimer/MySleepTimer/dll/WindowPlugins.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rs...@us...> - 2011-11-17 13:35:56
|
Revision: 4330
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4330&view=rev
Author: rsenden
Date: 2011-11-17 13:35:49 +0000 (Thu, 17 Nov 2011)
Log Message:
-----------
Added Deda as author, changed encoding to UTF-8
Added Paths:
-----------
trunk/plugins/KeyboardInputPlugin/README_files/colorschememapping.xml
trunk/plugins/KeyboardInputPlugin/README_files/image002.jpg
trunk/plugins/KeyboardInputPlugin/README_files/themedata.thmx
Added: trunk/plugins/KeyboardInputPlugin/README_files/colorschememapping.xml
===================================================================
--- trunk/plugins/KeyboardInputPlugin/README_files/colorschememapping.xml (rev 0)
+++ trunk/plugins/KeyboardInputPlugin/README_files/colorschememapping.xml 2011-11-17 13:35:49 UTC (rev 4330)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<a:clrMap xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" bg1="lt1" tx1="dk1" bg2="lt2" tx2="dk2" accent1="accent1" accent2="accent2" accent3="accent3" accent4="accent4" accent5="accent5" accent6="accent6" hlink="hlink" folHlink="folHlink"/>
\ No newline at end of file
Added: trunk/plugins/KeyboardInputPlugin/README_files/image002.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/KeyboardInputPlugin/README_files/image002.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/KeyboardInputPlugin/README_files/themedata.thmx
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/KeyboardInputPlugin/README_files/themedata.thmx
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rs...@us...> - 2011-11-17 13:35:03
|
Revision: 4329
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4329&view=rev
Author: rsenden
Date: 2011-11-17 13:34:54 +0000 (Thu, 17 Nov 2011)
Log Message:
-----------
Added Deda as author, changed encoding to UTF-8
Modified Paths:
--------------
trunk/plugins/KeyboardInputPlugin/README_files/filelist.xml
Modified: trunk/plugins/KeyboardInputPlugin/README_files/filelist.xml
===================================================================
--- trunk/plugins/KeyboardInputPlugin/README_files/filelist.xml 2011-11-17 13:33:17 UTC (rev 4328)
+++ trunk/plugins/KeyboardInputPlugin/README_files/filelist.xml 2011-11-17 13:34:54 UTC (rev 4329)
@@ -1,6 +1,8 @@
<xml xmlns:o="urn:schemas-microsoft-com:office:office">
<o:MainFile HRef="../README.HTML"/>
+ <o:File HRef="themedata.thmx"/>
+ <o:File HRef="colorschememapping.xml"/>
<o:File HRef="image001.png"/>
- <o:File HRef="image003.jpg"/>
+ <o:File HRef="image002.jpg"/>
<o:File HRef="filelist.xml"/>
</xml>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rs...@us...> - 2011-11-17 13:33:29
|
Revision: 4328
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4328&view=rev
Author: rsenden
Date: 2011-11-17 13:33:17 +0000 (Thu, 17 Nov 2011)
Log Message:
-----------
Added Deda as author, changed encoding to UTF-8
Modified Paths:
--------------
trunk/plugins/KeyboardInputPlugin/README.HTML
Modified: trunk/plugins/KeyboardInputPlugin/README.HTML
===================================================================
--- trunk/plugins/KeyboardInputPlugin/README.HTML 2011-11-09 17:21:34 UTC (rev 4327)
+++ trunk/plugins/KeyboardInputPlugin/README.HTML 2011-11-17 13:33:17 UTC (rev 4328)
@@ -1,15 +1,15 @@
<html xmlns:v="urn:schemas-microsoft-com:vml"
xmlns:o="urn:schemas-microsoft-com:office:office"
xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns:st1="urn:schemas-microsoft-com:office:smarttags"
xmlns:m="http://schemas.microsoft.com/office/2004/12/omml"
+xmlns:st1="urn:schemas-microsoft-com:office:smarttags"
xmlns="http://www.w3.org/TR/REC-html40">
<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
+<meta http-equiv=Content-Type content="text/html; charset=utf-8">
<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 10">
-<meta name=Originator content="Microsoft Word 10">
+<meta name=Generator content="Microsoft Word 12">
+<meta name=Originator content="Microsoft Word 12">
<link rel=File-List href="README_files/filelist.xml">
<link rel=Edit-Time-Data href="README_files/editdata.mso">
<!--[if !mso]>
@@ -34,10 +34,39 @@
<o:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags"
name="City"/>
<!--[if gte mso 9]><xml>
+ <o:DocumentProperties>
+ <o:Author>Ruud Senden</o:Author>
+ <o:LastAuthor>Ruud Senden</o:LastAuthor>
+ <o:Revision>2</o:Revision>
+ <o:TotalTime>4</o:TotalTime>
+ <o:Created>2011-11-17T13:32:00Z</o:Created>
+ <o:LastSaved>2011-11-17T13:32:00Z</o:LastSaved>
+ <o:Pages>5</o:Pages>
+ <o:Words>2670</o:Words>
+ <o:Characters>14689</o:Characters>
+ <o:Lines>122</o:Lines>
+ <o:Paragraphs>34</o:Paragraphs>
+ <o:CharactersWithSpaces>17325</o:CharactersWithSpaces>
+ <o:Version>12.00</o:Version>
+ </o:DocumentProperties>
+</xml><![endif]-->
+<link rel=themeData href="README_files/themedata.thmx">
+<link rel=colorSchemeMapping href="README_files/colorschememapping.xml">
+<!--[if gte mso 9]><xml>
<w:WordDocument>
<w:SpellingState>Clean</w:SpellingState>
<w:GrammarState>Clean</w:GrammarState>
+ <w:TrackMoves>false</w:TrackMoves>
+ <w:TrackFormatting/>
<w:HyphenationZone>21</w:HyphenationZone>
+ <w:ValidateAgainstSchemas/>
+ <w:SaveIfXMLInvalid>false</w:SaveIfXMLInvalid>
+ <w:IgnoreMixedContent>false</w:IgnoreMixedContent>
+ <w:AlwaysShowPlaceholderText>false</w:AlwaysShowPlaceholderText>
+ <w:DoNotPromoteQF/>
+ <w:LidThemeOther>NL</w:LidThemeOther>
+ <w:LidThemeAsian>ZH-CN</w:LidThemeAsian>
+ <w:LidThemeComplexScript>X-NONE</w:LidThemeComplexScript>
<w:Compatibility>
<w:BreakWrappedTables/>
<w:SnapToGridInCell/>
@@ -52,20 +81,10 @@
<w:CachedColBalance/>
</w:Compatibility>
<w:BrowserLevel>MicrosoftInternetExplorer4</w:BrowserLevel>
- <w:TrackMoves>false</w:TrackMoves>
- <w:TrackFormatting/>
- <w:ValidateAgainstSchemas/>
- <w:SaveIfXMLInvalid>false</w:SaveIfXMLInvalid>
- <w:IgnoreMixedContent>false</w:IgnoreMixedContent>
- <w:AlwaysShowPlaceholderText>false</w:AlwaysShowPlaceholderText>
- <w:DoNotPromoteQF/>
- <w:LidThemeOther>NL</w:LidThemeOther>
- <w:LidThemeAsian>ZH-CN</w:LidThemeAsian>
- <w:LidThemeComplexScript>X-NONE</w:LidThemeComplexScript>
<m:mathPr>
<m:mathFont m:val="Cambria Math"/>
<m:brkBin m:val="before"/>
- <m:brkBinSub m:val="--"/>
+ <m:brkBinSub m:val="--"/>
<m:smallFrac m:val="off"/>
<m:dispDef/>
<m:lMargin m:val="0"/>
@@ -74,8 +93,154 @@
<m:wrapIndent m:val="1440"/>
<m:intLim m:val="subSup"/>
<m:naryLim m:val="undOvr"/>
- </m:mathPr>
- </w:WordDocument>
+ </m:mathPr></w:WordDocument>
+</xml><![endif]--><!--[if gte mso 9]><xml>
+ <w:LatentStyles DefLockedState="false" DefUnhideWhenUsed="false"
+ DefSemiHidden="false" DefQFormat="false" LatentStyleCount="267">
+ <w:LsdException Locked="false" QFormat="true" Name="Normal"/>
+ <w:LsdException Locked="false" QFormat="true" Name="heading 1"/>
+ <w:LsdException Locked="false" QFormat="true" Name="heading 2"/>
+ <w:LsdException Locked="false" QFormat="true" Name="heading 3"/>
+ <w:LsdException Locked="false" QFormat="true" Name="heading 4"/>
+ <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+ QFormat="true" Name="heading 5"/>
+ <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+ QFormat="true" Name="heading 6"/>
+ <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+ QFormat="true" Name="heading 7"/>
+ <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+ QFormat="true" Name="heading 8"/>
+ <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+ QFormat="true" Name="heading 9"/>
+ <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true"
+ QFormat="true" Name="caption"/>
+ <w:LsdException Locked="false" QFormat="true" Name="Title"/>
+ <w:LsdException Locked="false" Priority="1" Name="Default Paragraph Font"/>
+ <w:LsdException Locked="false" QFormat="true" Name="Subtitle"/>
+ <w:LsdException Locked="false" QFormat="true" Name="Strong"/>
+ <w:LsdException Locked="false" QFormat="true" Name="Emphasis"/>
+ <w:LsdException Locked="false" Priority="99" Name="No List"/>
+ <w:LsdException Locked="false" Priority="99" SemiHidden="true"
+ Name="Placeholder Text"/>
+ <w:LsdException Locked="false" Priority="1" QFormat="true" Name="No Spacing"/>
+ <w:LsdException Locked="false" Priority="60" Name="Light Shading"/>
+ <w:LsdException Locked="false" Priority="61" Name="Light List"/>
+ <w:LsdException Locked="false" Priority="62" Name="Light Grid"/>
+ <w:LsdException Locked="false" Priority="63" Name="Medium Shading 1"/>
+ <w:LsdException Locked="false" Priority="64" Name="Medium Shading 2"/>
+ <w:LsdException Locked="false" Priority="65" Name="Medium List 1"/>
+ <w:LsdException Locked="false" Priority="66" Name="Medium List 2"/>
+ <w:LsdException Locked="false" Priority="67" Name="Medium Grid 1"/>
+ <w:LsdException Locked="false" Priority="68" Name="Medium Grid 2"/>
+ <w:LsdException Locked="false" Priority="69" Name="Medium Grid 3"/>
+ <w:LsdException Locked="false" Priority="70" Name="Dark List"/>
+ <w:LsdException Locked="false" Priority="71" Name="Colorful Shading"/>
+ <w:LsdException Locked="false" Priority="72" Name="Colorful List"/>
+ <w:LsdException Locked="false" Priority="73" Name="Colorful Grid"/>
+ <w:LsdException Locked="false" Priority="60" Name="Light Shading Accent 1"/>
+ <w:LsdException Locked="false" Priority="61" Name="Light List Accent 1"/>
+ <w:LsdException Locked="false" Priority="62" Name="Light Grid Accent 1"/>
+ <w:LsdException Locked="false" Priority="63" Name="Medium Shading 1 Accent 1"/>
+ <w:LsdException Locked="false" Priority="64" Name="Medium Shading 2 Accent 1"/>
+ <w:LsdException Locked="false" Priority="65" Name="Medium List 1 Accent 1"/>
+ <w:LsdException Locked="false" Priority="99" SemiHidden="true" Name="Revision"/>
+ <w:LsdException Locked="false" Priority="34" QFormat="true"
+ Name="List Paragraph"/>
+ <w:LsdException Locked="false" Priority="29" QFormat="true" Name="Quote"/>
+ <w:LsdException Locked="false" Priority="30" QFormat="true"
+ Name="Intense Quote"/>
+ <w:LsdException Locked="false" Priority="66" Name="Medium List 2 Accent 1"/>
+ <w:LsdException Locked="false" Priority="67" Name="Medium Grid 1 Accent 1"/>
+ <w:LsdException Locked="false" Priority="68" Name="Medium Grid 2 Accent 1"/>
+ <w:LsdException Locked="false" Priority="69" Name="Medium Grid 3 Accent 1"/>
+ <w:LsdException Locked="false" Priority="70" Name="Dark List Accent 1"/>
+ <w:LsdException Locked="false" Priority="71" Name="Colorful Shading Accent 1"/>
+ <w:LsdException Locked="false" Priority="72" Name="Colorful List Accent 1"/>
+ <w:LsdException Locked="false" Priority="73" Name="Colorful Grid Accent 1"/>
+ <w:LsdException Locked="false" Priority="60" Name="Light Shading Accent 2"/>
+ <w:LsdException Locked="false" Priority="61" Name="Light List Accent 2"/>
+ <w:LsdException Locked="false" Priority="62" Name="Light Grid Accent 2"/>
+ <w:LsdException Locked="false" Priority="63" Name="Medium Shading 1 Accent 2"/>
+ <w:LsdException Locked="false" Priority="64" Name="Medium Shading 2 Accent 2"/>
+ <w:LsdException Locked="false" Priority="65" Name="Medium List 1 Accent 2"/>
+ <w:LsdException Locked="false" Priority="66" Name="Medium List 2 Accent 2"/>
+ <w:LsdException Locked="false" Priority="67" Name="Medium Grid 1 Accent 2"/>
+ <w:LsdException Locked="false" Priority="68" Name="Medium Grid 2 Accent 2"/>
+ <w:LsdException Locked="false" Priority="69" Name="Medium Grid 3 Accent 2"/>
+ <w:LsdException Locked="false" Priority="70" Name="Dark List Accent 2"/>
+ <w:LsdException Locked="false" Priority="71" Name="Colorful Shading Accent 2"/>
+ <w:LsdException Locked="false" Priority="72" Name="Colorful List Accent 2"/>
+ <w:LsdException Locked="false" Priority="73" Name="Colorful Grid Accent 2"/>
+ <w:LsdException Locked="false" Priority="60" Name="Light Shading Accent 3"/>
+ <w:LsdException Locked="false" Priority="61" Name="Light List Accent 3"/>
+ <w:LsdException Locked="false" Priority="62" Name="Light Grid Accent 3"/>
+ <w:LsdException Locked="false" Priority="63" Name="Medium Shading 1 Accent 3"/>
+ <w:LsdException Locked="false" Priority="64" Name="Medium Shading 2 Accent 3"/>
+ <w:LsdException Locked="false" Priority="65" Name="Medium List 1 Accent 3"/>
+ <w:LsdException Locked="false" Priority="66" Name="Medium List 2 Accent 3"/>
+ <w:LsdException Locked="false" Priority="67" Name="Medium Grid 1 Accent 3"/>
+ <w:LsdException Locked="false" Priority="68" Name="Medium Grid 2 Accent 3"/>
+ <w:LsdException Locked="false" Priority="69" Name="Medium Grid 3 Accent 3"/>
+ <w:LsdException Locked="false" Priority="70" Name="Dark List Accent 3"/>
+ <w:LsdException Locked="false" Priority="71" Name="Colorful Shading Accent 3"/>
+ <w:LsdException Locked="false" Priority="72" Name="Colorful List Accent 3"/>
+ <w:LsdException Locked="false" Priority="73" Name="Colorful Grid Accent 3"/>
+ <w:LsdException Locked="false" Priority="60" Name="Light Shading Accent 4"/>
+ <w:LsdException Locked="false" Priority="61" Name="Light List Accent 4"/>
+ <w:LsdException Locked="false" Priority="62" Name="Light Grid Accent 4"/>
+ <w:LsdException Locked="false" Priority="63" Name="Medium Shading 1 Accent 4"/>
+ <w:LsdException Locked="false" Priority="64" Name="Medium Shading 2 Accent 4"/>
+ <w:LsdException Locked="false" Priority="65" Name="Medium List 1 Accent 4"/>
+ <w:LsdException Locked="false" Priority="66" Name="Medium List 2 Accent 4"/>
+ <w:LsdException Locked="false" Priority="67" Name="Medium Grid 1 Accent 4"/>
+ <w:LsdException Locked="false" Priority="68" Name="Medium Grid 2 Accent 4"/>
+ <w:LsdException Locked="false" Priority="69" Name="Medium Grid 3 Accent 4"/>
+ <w:LsdException Locked="false" Priority="70" Name="Dark List Accent 4"/>
+ <w:LsdException Locked="false" Priority="71" Name="Colorful Shading Accent 4"/>
+ <w:LsdException Locked="false" Priority="72" Name="Colorful List Accent 4"/>
+ <w:LsdException Locked="false" Priority="73" Name="Colorful Grid Accent 4"/>
+ <w:LsdException Locked="false" Priority="60" Name="Light Shading Accent 5"/>
+ <w:LsdException Locked="false" Priority="61" Name="Light List Accent 5"/>
+ <w:LsdException Locked="false" Priority="62" Name="Light Grid Accent 5"/>
+ <w:LsdException Locked="false" Priority="63" Name="Medium Shading 1 Accent 5"/>
+ <w:LsdException Locked="false" Priority="64" Name="Medium Shading 2 Accent 5"/>
+ <w:LsdException Locked="false" Priority="65" Name="Medium List 1 Accent 5"/>
+ <w:LsdException Locked="false" Priority="66" Name="Medium List 2 Accent 5"/>
+ <w:LsdException Locked="false" Priority="67" Name="Medium Grid 1 Accent 5"/>
+ <w:LsdException Locked="false" Priority="68" Name="Medium Grid 2 Accent 5"/>
+ <w:LsdException Locked="false" Priority="69" Name="Medium Grid 3 Accent 5"/>
+ <w:LsdException Locked="false" Priority="70" Name="Dark List Accent 5"/>
+ <w:LsdException Locked="false" Priority="71" Name="Colorful Shading Accent 5"/>
+ <w:LsdException Locked="false" Priority="72" Name="Colorful List Accent 5"/>
+ <w:LsdException Locked="false" Priority="73" Name="Colorful Grid Accent 5"/>
+ <w:LsdException Locked="false" Priority="60" Name="Light Shading Accent 6"/>
+ <w:LsdException Locked="false" Priority="61" Name="Light List Accent 6"/>
+ <w:LsdException Locked="false" Priority="62" Name="Light Grid Accent 6"/>
+ <w:LsdException Locked="false" Priority="63" Name="Medium Shading 1 Accent 6"/>
+ <w:LsdException Locked="false" Priority="64" Name="Medium Shading 2 Accent 6"/>
+ <w:LsdException Locked="false" Priority="65" Name="Medium List 1 Accent 6"/>
+ <w:LsdException Locked="false" Priority="66" Name="Medium List 2 Accent 6"/>
+ <w:LsdException Locked="false" Priority="67" Name="Medium Grid 1 Accent 6"/>
+ <w:LsdException Locked="false" Priority="68" Name="Medium Grid 2 Accent 6"/>
+ <w:LsdException Locked="false" Priority="69" Name="Medium Grid 3 Accent 6"/>
+ <w:LsdException Locked="false" Priority="70" Name="Dark List Accent 6"/>
+ <w:LsdException Locked="false" Priority="71" Name="Colorful Shading Accent 6"/>
+ <w:LsdException Locked="false" Priority="72" Name="Colorful List Accent 6"/>
+ <w:LsdException Locked="false" Priority="73" Name="Colorful Grid Accent 6"/>
+ <w:LsdException Locked="false" Priority="19" QFormat="true"
+ Name="Subtle Emphasis"/>
+ <w:LsdException Locked="false" Priority="21" QFormat="true"
+ Name="Intense Emphasis"/>
+ <w:LsdException Locked="false" Priority="31" QFormat="true"
+ Name="Subtle Reference"/>
+ <w:LsdException Locked="false" Priority="32" QFormat="true"
+ Name="Intense Reference"/>
+ <w:LsdException Locked="false" Priority="33" QFormat="true" Name="Book Title"/>
+ <w:LsdException Locked="false" Priority="37" SemiHidden="true"
+ UnhideWhenUsed="true" Name="Bibliography"/>
+ <w:LsdException Locked="false" Priority="39" SemiHidden="true"
+ UnhideWhenUsed="true" QFormat="true" Name="TOC Heading"/>
+ </w:LatentStyles>
</xml><![endif]--><!--[if !mso]><object
classid="clsid:38481807-CA0E-42D2-BF39-B33AF135CC4D" id=ieooui></object>
<style>
@@ -83,194 +248,38 @@
</style>
<![endif]-->
<style>
-<!--p.MSONORMAL
- {mso-style-unhide:no;
- mso-style-qformat:yes;}
-li.MSONORMAL
- {mso-style-unhide:no;
- mso-style-qformat:yes;}
-div.MSONORMAL
- {mso-style-unhide:no;
- mso-style-qformat:yes;}
-h1
- {mso-style-unhide:no;
- mso-style-qformat:yes;
- mso-fareast-theme-font:minor-fareast;}
-h2
- {mso-style-unhide:no;
- mso-style-qformat:yes;
- mso-fareast-theme-font:minor-fareast;}
-h3
- {mso-style-unhide:no;
- mso-style-qformat:yes;
- mso-fareast-theme-font:minor-fareast;}
-h4
- {mso-style-unhide:no;
- mso-style-qformat:yes;
- mso-fareast-theme-font:minor-fareast;}
-p.MSOLIST
- {mso-style-unhide:no;}
-li.MSOLIST
- {mso-style-unhide:no;}
-div.MSOLIST
- {mso-style-unhide:no;}
-p.MSOLIST2
- {mso-style-unhide:no;}
-li.MSOLIST2
- {mso-style-unhide:no;}
-div.MSOLIST2
- {mso-style-unhide:no;}
-p.MSOLIST3
- {mso-style-unhide:no;}
-li.MSOLIST3
- {mso-style-unhide:no;}
-div.MSOLIST3
- {mso-style-unhide:no;}
-p.MSOLISTBULLET2
- {mso-style-unhide:no;}
-li.MSOLISTBULLET2
- {mso-style-unhide:no;}
-div.MSOLISTBULLET2
- {mso-style-unhide:no;}
-p.MSOBODYTEXT
- {mso-style-unhide:no;}
-li.MSOBODYTEXT
- {mso-style-unhide:no;}
-div.MSOBODYTEXT
- {mso-style-unhide:no;}
-p.MSOBODYTEXTFIRSTINDENT
- {mso-style-unhide:no;}
-li.MSOBODYTEXTFIRSTINDENT
- {mso-style-unhide:no;}
-div.MSOBODYTEXTFIRSTINDENT
- {mso-style-unhide:no;}
-a:link
- {mso-style-unhide:no;}
-span.MSOHYPERLINK
- {mso-style-unhide:no;}
-a:visited
- {mso-style-unhide:no;}
-span.MSOHYPERLINKFOLLOWED
- {mso-style-unhide:no;}
-p.MSOPLAINTEXT
- {mso-style-unhide:no;}
-li.MSOPLAINTEXT
- {mso-style-unhide:no;}
-div.MSOPLAINTEXT
- {mso-style-unhide:no;}
-p.MSOACETATE
- {mso-style-unhide:no;}
-li.MSOACETATE
- {mso-style-unhide:no;}
-div.MSOACETATE
- {mso-style-unhide:no;}
-p.MSOLISTPARAGRAPH
- {mso-style-priority:34;
- mso-style-unhide:no;
- mso-style-qformat:yes;}
-li.MSOLISTPARAGRAPH
- {mso-style-priority:34;
- mso-style-unhide:no;
- mso-style-qformat:yes;}
-div.MSOLISTPARAGRAPH
- {mso-style-priority:34;
- mso-style-unhide:no;
- mso-style-qformat:yes;}
-p.MSOLISTPARAGRAPHCXSPFIRST
- {mso-style-priority:34;
- mso-style-unhide:no;
- mso-style-qformat:yes;}
-li.MSOLISTPARAGRAPHCXSPFIRST
- {mso-style-priority:34;
- mso-style-unhide:no;
- mso-style-qformat:yes;}
-div.MSOLISTPARAGRAPHCXSPFIRST
- {mso-style-priority:34;
- mso-style-unhide:no;
- mso-style-qformat:yes;}
-p.MSOLISTPARAGRAPHCXSPMIDDLE
- {mso-style-priority:34;
- mso-style-unhide:no;
- mso-style-qformat:yes;}
-li.MSOLISTPARAGRAPHCXSPMIDDLE
- {mso-style-priority:34;
- mso-style-unhide:no;
- mso-style-qformat:yes;}
-div.MSOLISTPARAGRAPHCXSPMIDDLE
- {mso-style-priority:34;
- mso-style-unhide:no;
- mso-style-qformat:yes;}
-p.MSOLISTPARAGRAPHCXSPLAST
- {mso-style-priority:34;
- mso-style-unhide:no;
- mso-style-qformat:yes;}
-li.MSOLISTPARAGRAPHCXSPLAST
- {mso-style-priority:34;
- mso-style-unhide:no;
- mso-style-qformat:yes;}
-div.MSOLISTPARAGRAPHCXSPLAST
- {mso-style-priority:34;
- mso-style-unhide:no;
- mso-style-qformat:yes;}
-span.HEADING1CHAR
- {mso-style-unhide:no;
- mso-style-locked:yes;
- mso-ascii-theme-font:major-latin;
- mso-fareast-theme-font:major-fareast;
- mso-hansi-theme-font:major-latin;
- mso-bidi-theme-font:major-bidi;
- mso-themecolor:accent1;
- mso-themeshade:191;}
-span.HEADING2CHAR
- {mso-style-unhide:no;
- mso-style-locked:yes;
- mso-ascii-theme-font:major-latin;
- mso-fareast-theme-font:major-fareast;
- mso-hansi-theme-font:major-latin;
- mso-bidi-theme-font:major-bidi;
- mso-themecolor:accent1;}
-span.HEADING3CHAR
- {mso-style-unhide:no;
- mso-style-locked:yes;
- mso-ascii-theme-font:major-latin;
- mso-fareast-theme-font:major-fareast;
- mso-hansi-theme-font:major-latin;
- mso-bidi-theme-font:major-bidi;
- mso-themecolor:accent1;}
-span.HEADING4CHAR
- {mso-style-unhide:no;
- mso-style-locked:yes;
- mso-ascii-theme-font:major-latin;
- mso-fareast-theme-font:major-fareast;
- mso-hansi-theme-font:major-latin;
- mso-bidi-theme-font:major-bidi;
- mso-themecolor:accent1;}
-span.BODYTEXTCHAR
- {mso-style-unhide:no;
- mso-style-locked:yes;}
-span.BODYTEXTFIRSTINDENTCHAR
- {mso-style-unhide:no;
- mso-style-locked:yes;}
-span.PLAINTEXTCHAR
- {mso-style-unhide:no;
- mso-style-locked:yes;}
-span.BALLOONTEXTCHAR
- {mso-style-unhide:no;
- mso-style-locked:yes;}
-.MSOCHPDEFAULT
- {mso-default-props:yes;}
-table.MSONORMALTABLE
- {mso-style-priority:99;
- mso-style-qformat:yes;}
-
+<!--
/* Font Definitions */
@font-face
+ {font-family:SimSun;
+ panose-1:2 1 6 0 3 1 1 1 1 1;
+ mso-font-alt:宋体;
+ mso-font-charset:134;
+ mso-generic-font-family:auto;
+ mso-font-pitch:variable;
+ mso-font-signature:3 680460288 22 0 262145 0;}
+@font-face
+ {font-family:"Cambria Math";
+ panose-1:2 4 5 3 5 4 6 3 2 4;
+ mso-font-charset:1;
+ mso-generic-font-family:roman;
+ mso-font-format:other;
+ mso-font-pitch:variable;
+ mso-font-signature:0 0 0 0 0 0;}
+@font-face
+ {font-family:Cambria;
+ panose-1:2 4 5 3 5 4 6 3 2 4;
+ mso-font-charset:0;
+ mso-generic-font-family:roman;
+ mso-font-pitch:variable;
+ mso-font-signature:-536870145 1073743103 0 0 415 0;}
+@font-face
{font-family:Tahoma;
panose-1:2 11 6 4 3 5 4 4 2 4;
mso-font-charset:0;
mso-generic-font-family:swiss;
mso-font-pitch:variable;
- mso-font-signature:1627421319 -2147483648 8 0 66047 0;}
+ mso-font-signature:-520081665 -1073717157 41 0 66047 0;}
@font-face
{font-family:Consolas;
panose-1:2 11 6 9 2 2 4 3 2 4;
@@ -279,161 +288,199 @@
mso-font-pitch:fixed;
mso-font-signature:-520092929 1073806591 9 0 415 0;}
@font-face
- {font-family:Cambria;
- panose-1:2 4 5 3 5 4 6 3 2 4;
- mso-font-charset:0;
- mso-generic-font-family:roman;
+ {font-family:"\@SimSun";
+ panose-1:2 1 6 0 3 1 1 1 1 1;
+ mso-font-charset:134;
+ mso-generic-font-family:auto;
mso-font-pitch:variable;
- mso-font-signature:-1610611985 1073741899 0 0 159 0;}
+ mso-font-signature:3 680460288 22 0 262145 0;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
+ {mso-style-unhide:no;
+ mso-style-qformat:yes;
+ mso-style-parent:"";
+ margin:0cm;
margin-bottom:.0001pt;
mso-pagination:widow-orphan;
font-size:12.0pt;
- font-family:"Times New Roman";
+ font-family:"Times New Roman","serif";
mso-fareast-font-family:"Times New Roman";}
h1
- {mso-style-link:"Heading 1 Char";
+ {mso-style-unhide:no;
+ mso-style-qformat:yes;
+ mso-style-link:"Heading 1 Char";
mso-style-next:Normal;
margin-top:12.0pt;
- margin-right:0in;
+ margin-right:0cm;
margin-bottom:3.0pt;
- margin-left:0in;
+ margin-left:0cm;
mso-pagination:widow-orphan;
page-break-after:avoid;
mso-outline-level:1;
font-size:16.0pt;
- font-family:Arial;
+ font-family:"Arial","sans-serif";
+ mso-fareast-font-family:SimSun;
+ mso-fareast-theme-font:minor-fareast;
mso-font-kerning:16.0pt;}
h2
- {mso-style-link:"Heading 2 Char";
+ {mso-style-unhide:no;
+ mso-style-qformat:yes;
+ mso-style-link:"Heading 2 Char";
mso-style-next:Normal;
margin-top:12.0pt;
- margin-right:0in;
+ margin-right:0cm;
margin-bottom:3.0pt;
- margin-left:0in;
+ margin-left:0cm;
mso-pagination:widow-orphan;
page-break-after:avoid;
mso-outline-level:2;
font-size:14.0pt;
- font-family:Arial;
+ font-family:"Arial","sans-serif";
+ mso-fareast-font-family:SimSun;
+ mso-fareast-theme-font:minor-fareast;
font-style:italic;}
h3
- {mso-style-link:"Heading 3 Char";
+ {mso-style-unhide:no;
+ mso-style-qformat:yes;
+ mso-style-link:"Heading 3 Char";
mso-style-next:Normal;
margin-top:12.0pt;
- margin-right:0in;
+ margin-right:0cm;
margin-bottom:3.0pt;
- margin-left:0in;
+ margin-left:0cm;
mso-pagination:widow-orphan;
page-break-after:avoid;
mso-outline-level:3;
font-size:13.0pt;
- font-family:Arial;}
+ font-family:"Arial","sans-serif";
+ mso-fareast-font-family:SimSun;
+ mso-fareast-theme-font:minor-fareast;}
h4
- {mso-style-link:"Heading 4 Char";
+ {mso-style-unhide:no;
+ mso-style-qformat:yes;
+ mso-style-link:"Heading 4 Char";
mso-style-next:Normal;
margin-top:12.0pt;
- margin-right:0in;
+ margin-right:0cm;
margin-bottom:3.0pt;
- margin-left:0in;
+ margin-left:0cm;
mso-pagination:widow-orphan;
page-break-after:avoid;
mso-outline-level:4;
font-size:14.0pt;
- font-family:"Times New Roman";}
+ font-family:"Times New Roman","serif";
+ mso-fareast-font-family:SimSun;
+ mso-fareast-theme-font:minor-fareast;}
p.MsoList, li.MsoList, div.MsoList
- {margin-top:0in;
- margin-right:0in;
- margin-bottom:0in;
+ {mso-style-unhide:no;
+ margin-top:0cm;
+ margin-right:0cm;
+ margin-bottom:0cm;
margin-left:14.15pt;
margin-bottom:.0001pt;
text-indent:-14.15pt;
mso-pagination:widow-orphan;
font-size:12.0pt;
- font-family:"Times New Roman";
+ font-family:"Times New Roman","serif";
mso-fareast-font-family:"Times New Roman";}
p.MsoList2, li.MsoList2, div.MsoList2
- {margin-top:0in;
- margin-right:0in;
- margin-bottom:0in;
+ {mso-style-unhide:no;
+ margin-top:0cm;
+ margin-right:0cm;
+ margin-bottom:0cm;
margin-left:28.3pt;
margin-bottom:.0001pt;
text-indent:-14.15pt;
mso-pagination:widow-orphan;
font-size:12.0pt;
- font-family:"Times New Roman";
+ font-family:"Times New Roman","serif";
mso-fareast-font-family:"Times New Roman";}
p.MsoList3, li.MsoList3, div.MsoList3
- {margin-top:0in;
- margin-right:0in;
- margin-bottom:0in;
+ {mso-style-unhide:no;
+ margin-top:0cm;
+ margin-right:0cm;
+ margin-bottom:0cm;
margin-left:42.45pt;
margin-bottom:.0001pt;
text-indent:-14.15pt;
mso-pagination:widow-orphan;
font-size:12.0pt;
- font-family:"Times New Roman";
+ font-family:"Times New Roman","serif";
mso-fareast-font-family:"Times New Roman";}
p.MsoListBullet2, li.MsoListBullet2, div.MsoListBullet2
- {margin-top:0in;
- margin-right:0in;
- margin-bottom:0in;
+ {mso-style-unhide:no;
+ margin-top:0cm;
+ margin-right:0cm;
+ margin-bottom:0cm;
margin-left:32.15pt;
margin-bottom:.0001pt;
- text-indent:-.25in;
+ text-indent:-18.0pt;
mso-pagination:widow-orphan;
- mso-list:l0 level1 lfo3;
+ mso-list:l0 level1 lfo1;
tab-stops:list 32.15pt;
font-size:12.0pt;
- font-family:"Times New Roman";
+ font-family:"Times New Roman","serif";
mso-fareast-font-family:"Times New Roman";}
p.MsoBodyText, li.MsoBodyText, div.MsoBodyText
- {mso-style-link:"Body Text Char";
- margin-top:0in;
- margin-right:0in;
+ {mso-style-unhide:no;
+ mso-style-link:"Body Text Char";
+ margin-top:0cm;
+ margin-right:0cm;
margin-bottom:6.0pt;
- margin-left:0in;
+ margin-left:0cm;
mso-pagination:widow-orphan;
font-size:12.0pt;
- font-family:"Times New Roman";
+ font-family:"Times New Roman","serif";
mso-fareast-font-family:"Times New Roman";}
p.MsoBodyTextFirstIndent, li.MsoBodyTextFirstIndent, div.MsoBodyTextFirstIndent
- {mso-style-parent:"Body Text";
+ {mso-style-unhide:no;
+ mso-style-parent:"Body Text";
mso-style-link:"Body Text First Indent Char";
- margin-top:0in;
- margin-right:0in;
+ margin-top:0cm;
+ margin-right:0cm;
margin-bottom:6.0pt;
- margin-left:0in;
+ margin-left:0cm;
text-indent:10.5pt;
mso-pagination:widow-orphan;
font-size:12.0pt;
- font-family:"Times New Roman";
+ font-family:"Times New Roman","serif";
mso-fareast-font-family:"Times New Roman";}
a:link, span.MsoHyperlink
- {color:blue;
+ {mso-style-unhide:no;
+ color:blue;
text-decoration:underline;
text-underline:single;}
a:visited, span.MsoHyperlinkFollowed
- {color:purple;
+ {mso-style-unhide:no;
+ color:purple;
text-decoration:underline;
text-underline:single;}
p.MsoPlainText, li.MsoPlainText, div.MsoPlainText
- {mso-style-link:"Plain Text Char";
- margin:0in;
+ {mso-style-unhide:no;
+ mso-style-link:"Plain Text Char";
+ margin:0cm;
margin-bottom:.0001pt;
mso-pagination:widow-orphan;
font-size:10.0pt;
font-family:"Courier New";
mso-fareast-font-family:"Times New Roman";}
+p.MsoAcetate, li.MsoAcetate, div.MsoAcetate
+ {mso-style-unhide:no;
+ mso-style-link:"Balloon Text Char";
+ margin:0cm;
+ margin-bottom:.0001pt;
+ mso-pagination:widow-orphan;
+ font-size:8.0pt;
+ font-family:"Tahoma","sans-serif";
+ mso-fareast-font-family:"Times New Roman";}
span.Heading1Char
{mso-style-name:"Heading 1 Char";
+ mso-style-unhide:no;
+ mso-style-locked:yes;
mso-style-link:"Heading 1";
mso-ansi-font-size:14.0pt;
mso-bidi-font-size:14.0pt;
- font-family:Cambria;
+ font-family:"Cambria","serif";
mso-ascii-font-family:Cambria;
mso-fareast-font-family:"Times New Roman";
mso-hansi-font-family:Cambria;
@@ -442,10 +489,12 @@
font-weight:bold;}
span.Heading2Char
{mso-style-name:"Heading 2 Char";
+ mso-style-unhide:no;
+ mso-style-locked:yes;
mso-style-link:"Heading 2";
mso-ansi-font-size:13.0pt;
mso-bidi-font-size:13.0pt;
- font-family:Cambria;
+ font-family:"Cambria","serif";
mso-ascii-font-family:Cambria;
mso-fareast-font-family:"Times New Roman";
mso-hansi-font-family:Cambria;
@@ -454,10 +503,12 @@
font-weight:bold;}
span.Heading3Char
{mso-style-name:"Heading 3 Char";
+ mso-style-unhide:no;
+ mso-style-locked:yes;
mso-style-link:"Heading 3";
mso-ansi-font-size:12.0pt;
mso-bidi-font-size:12.0pt;
- font-family:Cambria;
+ font-family:"Cambria","serif";
mso-ascii-font-family:Cambria;
mso-fareast-font-family:"Times New Roman";
mso-hansi-font-family:Cambria;
@@ -466,10 +517,12 @@
font-weight:bold;}
span.Heading4Char
{mso-style-name:"Heading 4 Char";
+ mso-style-unhide:no;
+ mso-style-locked:yes;
mso-style-link:"Heading 4";
mso-ansi-font-size:12.0pt;
mso-bidi-font-size:12.0pt;
- font-family:Cambria;
+ font-family:"Cambria","serif";
mso-ascii-font-family:Cambria;
mso-fareast-font-family:"Times New Roman";
mso-hansi-font-family:Cambria;
@@ -477,19 +530,88 @@
color:#4F81BD;
font-weight:bold;
font-style:italic;}
+p.msolistparagraph0, li.msolistparagraph0, div.msolistparagraph0
+ {mso-style-name:msolistparagraph;
+ mso-style-priority:34;
+ mso-style-unhide:no;
+ mso-style-qformat:yes;
+ margin-top:0cm;
+ margin-right:0cm;
+ margin-bottom:0cm;
+ margin-left:36.0pt;
+ margin-bottom:.0001pt;
+ mso-add-space:auto;
+ mso-pagination:widow-orphan;
+ font-size:12.0pt;
+ font-family:"Times New Roman","serif";
+ mso-fareast-font-family:"Times New Roman";}
+p.msolistparagraph0CxSpFirst, li.msolistparagraph0CxSpFirst, div.msolistparagraph0CxSpFirst
+ {mso-style-name:msolistparagraphCxSpFirst;
+ mso-style-priority:34;
+ mso-style-unhide:no;
+ mso-style-qformat:yes;
+ mso-style-type:export-only;
+ margin-top:0cm;
+ margin-right:0cm;
+ margin-bottom:0cm;
+ margin-left:36.0pt;
+ margin-bottom:.0001pt;
+ mso-add-space:auto;
+ mso-pagination:widow-orphan;
+ font-size:12.0pt;
+ font-family:"Times New Roman","serif";
+ mso-fareast-font-family:"Times New Roman";}
+p.msolistparagraph0CxSpMiddle, li.msolistparagraph0CxSpMiddle, div.msolistparagraph0CxSpMiddle
+ {mso-style-name:msolistparagraphCxSpMiddle;
+ mso-style-priority:34;
+ mso-style-unhide:no;
+ mso-style-qformat:yes;
+ mso-style-type:export-only;
+ margin-top:0cm;
+ margin-right:0cm;
+ margin-bottom:0cm;
+ margin-left:36.0pt;
+ margin-bottom:.0001pt;
+ mso-add-space:auto;
+ mso-pagination:widow-orphan;
+ font-size:12.0pt;
+ font-family:"Times New Roman","serif";
+ mso-fareast-font-family:"Times New Roman";}
+p.msolistparagraph0CxSpLast, li.msolistparagraph0CxSpLast, div.msolistparagraph0CxSpLast
+ {mso-style-name:msolistparagraphCxSpLast;
+ mso-style-priority:34;
+ mso-style-unhide:no;
+ mso-style-qformat:yes;
+ mso-style-type:export-only;
+ margin-top:0cm;
+ margin-right:0cm;
+ margin-bottom:0cm;
+ margin-left:36.0pt;
+ margin-bottom:.0001pt;
+ mso-add-space:auto;
+ mso-pagination:widow-orphan;
+ font-size:12.0pt;
+ font-family:"Times New Roman","serif";
+ mso-fareast-font-family:"Times New Roman";}
span.BodyTextChar
{mso-style-name:"Body Text Char";
+ mso-style-unhide:no;
+ mso-style-locked:yes;
mso-style-link:"Body Text";
mso-ansi-font-size:12.0pt;
mso-bidi-font-size:12.0pt;}
span.BodyTextFirstIndentChar
{mso-style-name:"Body Text First Indent Char";
+ mso-style-unhide:no;
+ mso-style-locked:yes;
mso-style-parent:"Body Text Char";
mso-style-link:"Body Text First Indent";
mso-ansi-font-size:12.0pt;
mso-bidi-font-size:12.0pt;}
span.PlainTextChar
{mso-style-name:"Plain Text Char";
+ mso-style-unhide:no;
+ mso-style-locked:yes;
mso-style-link:"Plain Text";
mso-ansi-font-size:10.5pt;
mso-bidi-font-size:10.5pt;
@@ -499,87 +621,56 @@
mso-bidi-font-family:Consolas;}
span.BalloonTextChar
{mso-style-name:"Balloon Text Char";
+ mso-style-unhide:no;
+ mso-style-locked:yes;
mso-style-link:"Balloon Text";
mso-ansi-font-size:8.0pt;
mso-bidi-font-size:8.0pt;
- font-family:Tahoma;
+ font-family:"Tahoma","sans-serif";
mso-ascii-font-family:Tahoma;
mso-hansi-font-family:Tahoma;
mso-bidi-font-family:Tahoma;}
-p.msoacetate, li.msoacetate, div.msoacetate
+p.msoacetate0, li.msoacetate0, div.msoacetate0
{mso-style-name:msoacetate;
+ mso-style-unhide:no;
mso-style-link:"Balloon Text Char";
- margin:0in;
+ margin:0cm;
margin-bottom:.0001pt;
mso-pagination:widow-orphan;
font-size:8.0pt;
- font-family:Tahoma;
+ font-family:"Tahoma","sans-serif";
mso-fareast-font-family:"Times New Roman";}
-p.msolistparagraph, li.msolistparagraph, div.msolistparagraph
- {mso-style-name:msolistparagraph;
- margin-top:0in;
- margin-right:0in;
- margin-bottom:0in;
- margin-left:.5in;
- margin-bottom:.0001pt;
- mso-add-space:auto;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.msolistparagraphCxSpFirst, li.msolistparagraphCxSpFirst, div.msolistparagraphCxSpFirst
- {mso-style-name:msolistparagraphCxSpFirst;
- mso-style-type:export-only;
- margin-top:0in;
- margin-right:0in;
- margin-bottom:0in;
- margin-left:.5in;
- margin-bottom:.0001pt;
- mso-add-space:auto;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.msolistparagraphCxSpMiddle, li.msolistparagraphCxSpMiddle, div.msolistparagraphCxSpMiddle
- {mso-style-name:msolistparagraphCxSpMiddle;
- mso-style-type:export-only;
- margin-top:0in;
- margin-right:0in;
- margin-bottom:0in;
- margin-left:.5in;
- margin-bottom:.0001pt;
- mso-add-space:auto;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.msolistparagraphCxSpLast, li.msolistparagraphCxSpLast, div.msolistparagraphCxSpLast
- {mso-style-name:msolistparagraphCxSpLast;
- mso-style-type:export-only;
- margin-top:0in;
- margin-right:0in;
- margin-bottom:0in;
- margin-left:.5in;
- margin-bottom:.0001pt;
- mso-add-space:auto;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
+span.BalloonTextChar1
+ {mso-style-name:"Balloon Text Char1";
+ mso-style-unhide:no;
+ mso-style-locked:yes;
+ mso-style-link:"Balloon Text";
+ mso-ansi-font-size:8.0pt;
+ mso-bidi-font-size:8.0pt;
+ font-family:"Tahoma","sans-serif";
+ mso-ascii-font-family:Tahoma;
+ mso-hansi-font-family:Tahoma;
+ mso-bidi-font-family:Tahoma;}
span.SpellE
{mso-style-name:"";
mso-spl-e:yes;}
span.GramE
{mso-style-name:"";
mso-gram-e:yes;}
-@page Section1
+.MsoChpDefault
+ {mso-style-type:export-only;
+ mso-default-props:yes;
+ font-size:10.0pt;
+ mso-ansi-font-size:10.0pt;
+ mso-bidi-font-size:10.0pt;}
+@page WordSection1
{size:595.3pt 841.9pt;
- margin:70.85pt .8in 70.85pt .8in;
+ margin:70.85pt 57.6pt 70.85pt 57.6pt;
mso-header-margin:35.4pt;
mso-footer-margin:35.4pt;
mso-paper-source:0;}
-div.Section1
- {page:Section1;}
+div.WordSection1
+ {page:WordSection1;}
/* List Definitions */
@list l0
{mso-list-id:-125;
@@ -588,11 +679,11 @@
@list l0:level1
{mso-level-number-format:bullet;
mso-level-style-link:"List Bullet 2";
- mso-level-text:\F0B7;
+ mso-level-text:;
mso-level-tab-stop:32.15pt;
mso-level-number-position:left;
margin-left:32.15pt;
- text-indent:-.25in;
+ text-indent:-18.0pt;
font-family:Symbol;}
@list l1
{mso-list-id:246230042;
@@ -600,279 +691,251 @@
mso-list-template-ids:639688826 67698689 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;}
@list l1:level1
{mso-level-number-format:bullet;
- mso-level-text:\F0B7;
- mso-level-tab-stop:.5in;
+ mso-level-text:;
+ mso-level-tab-stop:36.0pt;
mso-level-number-position:left;
- text-indent:-.25in;
+ text-indent:-18.0pt;
font-family:Symbol;}
@list l1:level2
- {mso-level-tab-stop:1.0in;
+ {mso-level-tab-stop:72.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
+ text-indent:-18.0pt;}
@list l1:level3
- {mso-level-tab-stop:1.5in;
+ {mso-level-tab-stop:108.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
+ text-indent:-18.0pt;}
@list l1:level4
- {mso-level-tab-stop:2.0in;
+ {mso-level-tab-stop:144.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
+ text-indent:-18.0pt;}
@list l1:level5
- {mso-level-tab-stop:2.5in;
+ {mso-level-tab-stop:180.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
+ text-indent:-18.0pt;}
@list l1:level6
- {mso-level-tab-stop:3.0in;
+ {mso-level-tab-stop:216.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
+ text-indent:-18.0pt;}
@list l1:level7
- {mso-level-tab-stop:3.5in;
+ {mso-level-tab-stop:252.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
+ text-indent:-18.0pt;}
@list l1:level8
- {mso-level-tab-stop:4.0in;
+ {mso-level-tab-stop:288.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
+ text-indent:-18.0pt;}
@list l1:level9
- {mso-level-tab-stop:4.5in;
+ {mso-level-tab-stop:324.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
+ text-indent:-18.0pt;}
@list l2
{mso-list-id:894004367;
mso-list-type:hybrid;
mso-list-template-ids:-417941668 68354063 68354073 68354075 68354063 68354073 68354075 68354063 68354073 68354075;}
@list l2:level1
- {mso-level-tab-stop:.5in;
+ {mso-level-tab-stop:36.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
+ text-indent:-18.0pt;}
@list l2:level2
- {mso-level-tab-stop:1.0in;
+ {mso-level-tab-stop:72.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
+ text-indent:-18.0pt;}
@list l2:level3
- {mso-level-tab-stop:1.5in;
+ {mso-level-tab-stop:108.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
+ text-indent:-18.0pt;}
@list l2:level4
- {mso-level-tab-stop:2.0in;
+ {mso-level-tab-stop:144.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
+ text-indent:-18.0pt;}
@list l2:level5
- {mso-level-tab-stop:2.5in;
+ {mso-level-tab-stop:180.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
+ text-indent:-18.0pt;}
@list l2:level6
- {mso-level-tab-stop:3.0in;
+ {mso-level-tab-stop:216.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
+ text-indent:-18.0pt;}
@list l2:level7
- {mso-level-tab-stop:3.5in;
+ {mso-level-tab-stop:252.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
+ text-indent:-18.0pt;}
@list l2:level8
- {mso-level-tab-stop:4.0in;
+ {mso-level-tab-stop:288.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
+ text-indent:-18.0pt;}
@list l2:level9
- {mso-level-tab-stop:4.5in;
+ {mso-level-tab-stop:324.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
+ text-indent:-18.0pt;}
@list l3
- {mso-list-id:1286473236;
- mso-list-template-ids:-581672928;}
-@list l3:level1
- {mso-level-number-format:bullet;
- mso-level-text:\F0B7;
- mso-level-tab-stop:.5in;
- mso-level-number-position:left;
- text-indent:-.25in;
- mso-ansi-font-size:10.0pt;
- font-family:Symbol;}
-@list l4
- {mso-list-id:1321813535;
- mso-list-template-ids:-2029854896;}
-@list l4:level1
- {mso-level-number-format:bullet;
- mso-level-text:\F0B7;
- mso-level-tab-stop:.5in;
- mso-level-number-position:left;
- text-indent:-.25in;
- mso-ansi-font-size:10.0pt;
- font-family:Symbol;}
-@list l5
{mso-list-id:1438672925;
mso-list-type:hybrid;
mso-list-template-ids:33709472 67698703 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;}
-@list l5:level1
- {mso-level-tab-stop:.5in;
+@list l3:level1
+ {mso-level-tab-stop:36.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
-@list l5:level2
- {mso-level-tab-stop:1.0in;
+ text-indent:-18.0pt;}
+@list l3:level2
+ {mso-level-tab-stop:72.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
-@list l5:level3
- {mso-level-tab-stop:1.5in;
+ text-indent:-18.0pt;}
+@list l3:level3
+ {mso-level-tab-stop:108.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
-@list l5:level4
- {mso-level-tab-stop:2.0in;
+ text-indent:-18.0pt;}
+@list l3:level4
+ {mso-level-tab-stop:144.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
-@list l5:level5
- {mso-level-tab-stop:2.5in;
+ text-indent:-18.0pt;}
+@list l3:level5
+ {mso-level-tab-stop:180.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
-@list l5:level6
- {mso-level-tab-stop:3.0in;
+ text-indent:-18.0pt;}
+@list l3:level6
+ {mso-level-tab-stop:216.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
-@list l5:level7
- {mso-level-tab-stop:3.5in;
+ text-indent:-18.0pt;}
+@list l3:level7
+ {mso-level-tab-stop:252.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
-@list l5:level8
- {mso-level-tab-stop:4.0in;
+ text-indent:-18.0pt;}
+@list l3:level8
+ {mso-level-tab-stop:288.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
-@list l5:level9
- {mso-level-tab-stop:4.5in;
+ text-indent:-18.0pt;}
+@list l3:level9
+ {mso-level-tab-stop:324.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
-@list l6
+ text-indent:-18.0pt;}
+@list l4
{mso-list-id:1502696944;
mso-list-type:hybrid;
mso-list-template-ids:1175852696 67698689 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;}
-@list l6:level1
+@list l4:level1
{mso-level-number-format:bullet;
- mso-level-text:\F0B7;
- mso-level-tab-stop:.5in;
+ mso-level-text:;
+ mso-level-tab-stop:36.0pt;
mso-level-number-position:left;
- text-indent:-.25in;
+ text-indent:-18.0pt;
font-family:Symbol;}
-@list l6:level2
- {mso-level-tab-stop:1.0in;
+@list l4:level2
+ {mso-level-tab-stop:72.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
-@list l6:level3
- {mso-level-tab-stop:1.5in;
+ text-indent:-18.0pt;}
+@list l4:level3
+ {mso-level-tab-stop:108.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
-@list l6:level4
- {mso-level-tab-stop:2.0in;
+ text-indent:-18.0pt;}
+@list l4:level4
+ {mso-level-tab-stop:144.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
-@list l6:level5
- {mso-level-tab-stop:2.5in;
+ text-indent:-18.0pt;}
+@list l4:level5
+ {mso-level-tab-stop:180.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
-@list l6:level6
- {mso-level-tab-stop:3.0in;
+ text-indent:-18.0pt;}
+@list l4:level6
+ {mso-level-tab-stop:216.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
-@list l6:level7
- {mso-level-tab-stop:3.5in;
+ text-indent:-18.0pt;}
+@list l4:level7
+ {mso-level-tab-stop:252.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
-@list l6:level8
- {mso-level-tab-stop:4.0in;
+ text-indent:-18.0pt;}
+@list l4:level8
+ {mso-level-tab-stop:288.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
-@list l6:level9
- {mso-level-tab-stop:4.5in;
+ text-indent:-18.0pt;}
+@list l4:level9
+ {mso-level-tab-stop:324.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
-@list l7
- {mso-list-id:1510750885;
- mso-list-template-ids:904045180;}
-@list l8
+ text-indent:-18.0pt;}
+@list l5
{mso-list-id:1610548232;
mso-list-type:hybrid;
mso-list-template-ids:-267750922 69468175 69468185 69468187 69468175 69468185 69468187 69468175 69468185 69468187;}
-@list l8:level1
+@list l5:level1
{mso-level-tab-stop:none;
mso-level-number-position:left;
- text-indent:-.25in;}
-@list l8:level2
- {mso-level-tab-stop:1.0in;
+ text-indent:-18.0pt;}
+@list l5:level2
+ {mso-level-tab-stop:72.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
-@list l8:level3
- {mso-level-tab-stop:1.5in;
+ text-indent:-18.0pt;}
+@list l5:level3
+ {mso-level-tab-stop:108.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
-@list l8:level4
- {mso-level-tab-stop:2.0in;
+ text-indent:-18.0pt;}
+@list l5:level4
+ {mso-level-tab-stop:144.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
-@list l8:level5
- {mso-level-tab-stop:2.5in;
+ text-indent:-18.0pt;}
+@list l5:level5
+ {mso-level-tab-stop:180.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
-@list l8:level6
- {mso-level-tab-stop:3.0in;
+ text-indent:-18.0pt;}
+@list l5:level6
+ {mso-level-tab-stop:216.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
-@list l8:level7
- {mso-level-tab-stop:3.5in;
+ text-indent:-18.0pt;}
+@list l5:level7
+ {mso-level-tab-stop:252.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
-@list l8:level8
- {mso-level-tab-stop:4.0in;
+ text-indent:-18.0pt;}
+@list l5:level8
+ {mso-level-tab-stop:288.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
-@list l8:level9
- {mso-level-tab-stop:4.5in;
+ text-indent:-18.0pt;}
+@list l5:level9
+ {mso-level-tab-stop:324.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
-@list l9
+ text-indent:-18.0pt;}
+@list l6
{mso-list-id:1895895012;
mso-list-type:hybrid;
mso-list-template-ids:-1044208806 67698703 67698713 67698715 67698703 67698713 67698715 67698703 67698713 67698715;}
-@list l9:level1
+@list l6:level1
{mso-level-tab-stop:39.0pt;
mso-level-number-position:left;
margin-left:39.0pt;
- text-indent:-.25in;}
-@list l9:level2
- {mso-level-tab-stop:1.0in;
+ text-indent:-18.0pt;}
+@list l6:level2
+ {mso-level-tab-stop:72.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
-@list l9:level3
- {mso-level-tab-stop:1.5in;
+ text-indent:-18.0pt;}
+@list l6:level3
+ {mso-level-tab-stop:108.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
-@list l9:level4
- {mso-level-tab-stop:2.0in;
+ text-indent:-18.0pt;}
+@list l6:level4
+ {mso-level-tab-stop:144.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
-@list l9:level5
- {mso-level-tab-stop:2.5in;
+ text-indent:-18.0pt;}
+@list l6:level5
+ {mso-level-tab-stop:180.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
-@list l9:level6
- {mso-level-tab-stop:3.0in;
+ text-indent:-18.0pt;}
+@list l6:level6
+ {mso-level-tab-stop:216.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
-@list l9:level7
- {mso-level-tab-stop:3.5in;
+ text-indent:-18.0pt;}
+@list l6:level7
+ {mso-level-tab-stop:252.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
-@list l9:level8
- {mso-level-tab-stop:4.0in;
+ text-indent:-18.0pt;}
+@list l6:level8
+ {mso-level-tab-stop:288.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
-@list l9:level9
- {mso-level-tab-stop:4.5in;
+ text-indent:-18.0pt;}
+@list l6:level9
+ {mso-level-tab-stop:324.0pt;
mso-level-number-position:left;
- text-indent:-.25in;}
-@list l10
- {mso-list-id:2019189007;
- mso-list-template-ids:-2050745414;}
+ text-indent:-18.0pt;}
ol
- {margin-bottom:0in;}
+ {margin-bottom:0cm;}
ul
- {margin-bottom:0in;}
+ {margin-bottom:0cm;}
-->
</style>
<!--[if gte mso 10]>
@@ -883,178 +946,46 @@
mso-tstyle-rowband-size:0;
mso-tstyle-colband-size:0;
mso-style-noshow:yes;
+ mso-style-priority:99;
+ mso-style-qformat:yes;
mso-style-parent:"";
- mso-padding-alt:0in 5.4pt 0in 5.4pt;
- mso-para-margin:0in;
+ mso-padding-alt:0cm 5.4pt 0cm 5.4pt;
+ mso-para-margin:0cm;
mso-para-margin-bottom:.0001pt;
mso-pagination:widow-orphan;
font-size:10.0pt;
- font-family:"Times New Roman";}
+ font-family:"Times New Roman","serif";}
</style>
-<![endif]-->
-<link rel=themeData href="README_files/themedata.thmx">
-<link rel=colorSchemeMapping href="README_files/colorschememapping.xml">
-<!--[if gte mso 9]><xml>
- <w:LatentStyles DefLockedState="false" DefUnhideWhenUsed="false" DefSemiHidden="false" DefQFormat="false" LatentStyleCount="267">
- <w:LsdException Locked="false" QFormat="true" Name="Normal"/>
- <w:LsdException Locked="false" QFormat="true" Name="heading 1"/>
- <w:LsdException Locked="false" QFormat="true" Name="heading 2"/>
- <w:LsdException Locked="false" QFormat="true" Name="heading 3"/>
- <w:LsdException Locked="false" QFormat="true" Name="heading 4"/>
- <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" QFormat="true" Name="heading 5"/>
- <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" QFormat="true" Name="heading 6"/>
- <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" QFormat="true" Name="heading 7"/>
- <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" QFormat="true" Name="heading 8"/>
- <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" QFormat="true" Name="heading 9"/>
- <w:LsdException Locked="false" SemiHidden="true" UnhideWhenUsed="true" QFormat="true" Name="caption"/>
- <w:LsdException Locked="false" QFormat="true" Name="Title"/>
- <w:LsdException Locked="false" Priority="1" Name="Default Paragraph Font"/>
- <w:LsdException Locked="false" QFormat="true" Name="Subtitle"/>
- <w:LsdException Locked="false" QFormat="true" Name="Strong"/>
- <w:LsdException Locked="false" QFormat="true" Name="Emphasis"/>
- <w:LsdException Locked="false" Priority="99" Name="No List"/>
- <w:LsdException Locked="false" Priority="99" SemiHidden="true" Name="Placeholder Text"/>
- <w:LsdException Locked="false" Priority="1" QFormat="true" Name="No Spacing"/>
- <w:LsdException Locked="false" Priority="60" Name="Light Shading"/>
- <w:LsdException Locked="false" Priority="61" Name="Light List"/>
- <w:LsdException Locked="false" Priority="62" Name="Light Grid"/>
- <w:LsdException Locked="false" Priority="63" Name="Medium Shading 1"/>
- <w:LsdException Locked="false" Priority="64" Name="Medium Shading 2"/>
- <w:LsdException Locked="false" Priority="65" Name="Medium List 1"/>
- <w:LsdException Locked="false" Priority="66" Name="Medium List 2"/>
- <w:LsdException Locked="false" Priority="67" Name="Medium Grid 1"/>
- <w:LsdException Locked="false" Priority="68" Name="Medium Grid 2"/>
- <w:LsdException Locked="false" Priority="69" Name="Medium Grid 3"/>
- <w:LsdException Locked="false" Priority="70" Name="Dark List"/>
- <w:LsdException Locked="false" Priority="71" Name="Colorful Shading"/>
- <w:LsdException Locked="false" Priority="72" Name="Colorful List"/>
- <w:LsdException Locked="false" Priority="73" Name="Colorful Grid"/>
- <w:LsdException Locked="false" Priority="60" Name="Light Shading Accent 1"/>
- <w:LsdException Locked="false" Priority="61" Name="Light List Accent 1"/>
- <w:LsdException Locked="false" Priority="62" Name="Light Grid Accent 1"/>
- <w:LsdException Locked="false" Priority="63" Name="Medium Shading 1 Accent 1"/>
- <w:LsdException Locked="false" Priority="64" Name="Medium Shading 2 Accent 1"/>
- <w:LsdException Locked="false" Priority="65" Name="Medium List 1 Accent 1"/>
- <w:LsdException Locked="false" Priority="99" SemiHidden="true" Name="Revision"/>
- <w:LsdException Locked="false" Priority="34" QFormat="true" Name="List Paragraph"/>
- <w:LsdException Locked="false" Priority="29" QFormat="true" Name="Quote"/>
- <w:LsdException Locked="false" Priority="30" QFormat="true" Name="Intense Quote"/>
- <w:LsdException Locked="false" Priority="66" Name="Medium List 2 Accent 1"/>
- <w:LsdException Locked="false" Priority="67" Name="Medium Grid 1 Accent 1"/>
- <w:LsdException Locked="false" Priority="68" Name="Medium Grid 2 Accent 1"/>
- <w:LsdException Locked="false" Priority="69" Name="Medium Grid 3 Accent 1"/>
- <w:LsdException Locked="false" Priority="70" Name="Dark List Accent 1"/>
- <w:LsdException Locked="false" Priority="71" Name="Colorful Shading Accent 1"/>
- <w:LsdException Locked="false" Priority="72" Name="Colorful List Accent 1"/>
- <w:LsdException Locked="false" Priority="73" Name="Colorful Grid Accent 1"/>
- <w:LsdException Locked="false" Priority="60" Name="Light Shading Accent 2"/>
- <w:LsdException Locked="false" Priority="61" Name="Light List Accent 2"/>
- <w:LsdException Locked="false" Priority="62" Name="Light Grid Accent 2"/>
- <w:LsdException Locked="false" Priority="63" Name="Medium Shading 1 Accent 2"/>
- <w:LsdException Locked="false" Priority="64" Name="Medium Shading 2 Accent 2"/>
- <w:LsdException Locked="false" Priority="65" Name="Medium List 1 Accent 2"/>
- <w:LsdException Locked="false" Priority="66" Name="Medium List 2 Accent 2"/>
- <w:LsdException Locked="false" Priority="67" Name="Medium Grid 1 Accent 2"/>
- <w:LsdException Locked="false" Priority="68" Name="Medium Grid 2 Accent 2"/>
- <w:LsdException Locked="false" Priority="69" Name="Medium Grid 3 Accent 2"/>
- <w:LsdException Locked="false" Priority="70" Name="Dark List Accent 2"/>
- <w:LsdException Locked="false" Priority="71" Name="Colorful Shading Accent 2"/>
- <w:LsdException Locked="false" Priority="72" Name="Colorful List Accent 2"/>
- <w:LsdException Locked="false" Priority="73" Name="Colorful Grid Accent 2"/>
- <w:LsdException Locked="false" Priority="60" Name="Light Shading Accent 3"/>
- <w:LsdException Locked="false" Priority="61" Name="Light List Accent 3"/>
- <w:LsdException Locked="false" Priority="62" Name="Light Grid Accent 3"/>
- <w:LsdException Locked="false" Priority="63" Name="Medium Shading 1 Accent 3"/>
- <w:LsdException Locked="false" Priority="64" Name="Medium Shading 2 Accent 3"/>
- <w:LsdException Locked="false" Priority="65" Name="Medium List 1 Accent 3"/>
- <w:LsdException Locked="false" Priority="66" Name="Medium List 2 Accent 3"/>
- <w:LsdException Locked="false" Priority="67" Name="Medium Grid 1 Accent 3"/>
- <w:LsdException Locked="false" Priority="68" Name="Medium Grid 2 Accent 3"/>
- <w:LsdException Locked="false" Priority="69" Name="Medium Grid 3 Accent 3"/>
- <w:LsdException Locked="false" Priority="70" Name="Dark List Accent 3"/>
- <w:LsdException Locked="false" Priority="71" Name="Colorful Shading Accent 3"/>
- <w:LsdException Locked="false" Priority="72" Name="Colorful List Accent 3"/>
- <w:LsdException Locked="false" Priority="73" Name="Colorful Grid Accent 3"/>
- <w:LsdException Locked="false" Priority="60" Name="Light Shading Accent 4"/>
- <w:LsdException Locked="false" Priority="61" Name="Light List Accent 4"/>
- <w:LsdException Locked="false" Priority="62" Name="Light Grid Accent 4"/>
- <w:LsdException Locked="false" Priority="63" Name="Medium Shading 1 Accent 4"/>
- <w:LsdException Locked="false" Priority="64" Name="Medium Shading 2 Accent 4"/>
- <w:LsdException Locked="false" Priority="65" Name="Medium List 1 Accent 4"/>
- <w:LsdException Locked="false" Priority="66" Name="Medium List 2 Accent 4"/>
- <w:LsdException Locked="false" Priority="67" Name="Medium Grid 1 Accent 4"/>
- <w:LsdException Locked="false" Priority="68" Name="Medium Grid 2 Accent 4"/>
- <w:LsdException Locked="false" Priority="69" Name="Medium Grid 3 Accent 4"/>
- <w:LsdException Locked="false" Priority="70" Name="Dark List Accent 4"/>
- <w:LsdException Locked="false" Priority="71" Name="Colorful Shading Accent 4"/>
- <w:LsdException Locked="false" Priority="72" Name="Colorful List Accent 4"/>
- <w:LsdException Locked="false" Priority="73" Name="Colorful Grid Accent 4"/>
- <w:LsdException Locked="false" Priority="60" Name="Light Shading Accent 5"/>
- <w:LsdException Locked="false" Priority="61" Name="Light List Accent 5"/>
- <w:LsdException Locked="false" Priority="62" Name="Light Grid Accent 5"/>
- <w:LsdException Locked="false" Priority="63" Name="Medium Shading 1 Accent 5"/>
- <w:LsdException Locked="false" Priority="64" Name="Medium Shading 2 Accent 5"/>
- <w:LsdException Locked="false" Priority="65" Name="Medium List 1 Accent 5"/>
- <w:LsdException Locked="false" Priority="66" Name="Medium List 2 Accent 5"/>
- <w:LsdException Locked="false" Priority="67" Name="Medium Grid 1 Accent 5"/>
- <w:LsdException Locked="false" Priority="68" Name="Medium Grid 2 Accent 5"/>
- <w:LsdException Locked="false" Priority="69" Name="Medium Grid 3 Accent 5"/>
- <w:LsdException Locked="false" Priority="70" Name="Dark List Accent 5"/>
- <w:LsdException Locked="false" Priority="71" Name="Colorful Shading Accent 5"/>
- <w:LsdException Locked="false" Priority="72" Name="Colorful List Accent 5"/>
- <w:LsdException Locked="false" Priority="73" Name="Colorful Grid Accent 5"/>
- <w:LsdException Locked="false" Priority="60" Name="Light Shading Accent 6"/>
- <w:LsdException Locked="false" Priority="61" Name="Light List Accent 6"/>
- <w:LsdException Locked="false" Priority="62" Name="Light Grid Accent 6"/>
- <w:LsdException Locked="false" Priority="63" Name="Medium Shading 1 Accent 6"/>
- <w:LsdException Locked="false" Priority="64" Name="Medium Shading 2 Accent 6"/>
- <w:LsdException Locked="false" Priority="65" Name="Medium List 1 Accent 6"/>
- <w:LsdException Locked="false" Priority="66" Name="Medium List 2 Accent 6"/>
- <w:LsdException Locked="false" Priority="67" Name="Medium Grid 1 Accent 6"/>
- <w:LsdException Locked="false" Priority="68" Name="Medium Grid 2 Accent 6"/>
- <w:LsdException Locked="false" Priority="69" Name="Medium Grid 3 Accent 6"/>
- <w:LsdException Locked="false" Priority="70" Name="Dark List Accent 6"/>
- <w:LsdException Locked="false" Priority="71" Name="Colorful Shading Accent 6"/>
- <w:LsdException Locked="false" Priority="72" Name="Colorful List Accent 6"/>
- <w:LsdException Locked="false" Priority="73" Name="Colorful Grid Accent 6"/>
- <w:LsdException Locked="false" Priority="19" QFormat="true" Name="Subtle Emphasis"/>
- <w:LsdException Locked="false" Priority="21" QFormat="true" Name="Intense Emphasis"/>
- <w:LsdException Locked="false" Priority="31" QFormat="true" Name="Subtle Reference"/>
- <w:LsdException Locked="false" Priority="32" QFormat="true" Name="Intense Reference"/>
- <w:LsdException Locked="false" Priority="33" QFormat="true" Name="Book Title"/>
- <w:LsdException Locked="false" Priority="37" SemiHidden="true" UnhideWhenUsed="true" Name="Bibliography"/>
- <w:LsdException Locked="false" Priority="39" SemiHidden="true" UnhideWhenUsed="true" QFormat="true" Name="TOC Heading"/>
- </w:LatentStyles>
+<![endif]--><!--[if gte mso 9]><xml>
+ <o:shapedefaults v:ext="edit" spidmax="7170"/>
</xml><![endif]--><!--[if gte mso 9]><xml>
- <o:shapedefaults v:ext="edit" spidmax="6146"/>
-</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1"/>
</o:shapelayout></xml><![endif]-->
</head>
-<body lang=EN-US link=blue vlink=purple style='tab-interval:35.4pt'>
+<body lang=NL link=blue vlink=purple style='tab-interval:35.4pt'>
-<div class=Section1>
+<div class=WordSection1>
<h1><span lang=EN-GB style='mso-ansi-language:EN-GB'>README<o:p></o:p></span></h1>
<h2><span lang=EN-GB style='mso-ansi-language:EN-GB'>License & Disclaimer<o:p></o:p></span></h2>
<p class=MsoNormal><span lang=EN-GB style='mso-ansi-language:EN-GB'>Copyright
-(C) 2007-2010 <span class=SpellE>Ruud</span> <span class=SpellE>Senden</span> |
-<span class=SpellE>SilentException</span><o:p></o:p></span></p>
+(C) 2007-2011 <span class=SpellE>Ruud</span> <span class=SpellE>Senden</span> |
+<span class=SpellE>SilentException</span> | <span class=SpellE>Deda</span><o:p></o:p></span></p>
<p class=MsoNormal><span lang=EN-GB style='mso-ansi-language:EN-GB'><span
-style='mso-spacerun:yes'>\xA0</span><o:p></o:p></span></p>
+style='mso-spacerun:yes'> </span><o:p></o:p></span></p>
<p class=MsoNormal><span lang=EN-GB style='mso-ansi-language:EN-GB'>This
Program is free software; you can redistribute it and/or modify it under the
-terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2, or (at your option) any later version.<o:p></o:p></span></p>
+terms of the GNU General Public License as published by the Free Software Foundation;
+either version 2, or (at your option) any later version.<o:p></o:p></span></p>
<p class=MsoNormal><span lang=EN-GB style='mso-ansi-language:EN-GB'><span
-style='mso-spacerun:yes'>\xA0</span><o:p></o:p></span></p>
+style='mso-spacerun:yes'> </span><o:p></o:p></span></p>
<p class=MsoNormal><span lang=EN-GB style='mso-ansi-language:EN-GB'>This
Program is distributed in the hope that it will be useful, but WITHOUT ANY
@@ -1062,27 +993,20 @@
PARTICULAR PURPOSE. See the GNU General Public License for more details.<o:p></o:p></span></p>
<p class=MsoNormal><span lang=EN-GB style='mso-ansi-language:EN-GB'><span
-style='mso-spacerun:yes'>\xA0</span><o:p></o:p></span></p>
+style='mso-spacerun:yes'> </span><o:p></o:p></span></p>
<p class=MsoNormal><span lang=EN-GB style='mso-ansi-language:EN-GB'>Use this
program at your own risk, I can not be held responsible for any damage.<o:p></o:p></span></p>
<p class=MsoNormal><span lang=EN-GB style='mso-ansi-language:EN-GB'><span
-style='mso-spacerun:yes'>\xA0</span><o:p></o:p></span></p>
+style='mso-spacerun:yes'> </span><o:p></o:p></span></p>
<p class=MsoNormal><span lang=EN-GB style='mso-ansi-language:EN-GB'>You should
have received a copy of the GNU General Public License along with this program;
-see the file COPYING.<span style='mso-spacerun:yes'>\xA0 </span>If not, write to
-the Free Software Foundation, </span><st1:place><span lang=EN-GB
- style='mso-ansi-language:EN-GB'>675 Mass Ave, </span><st1:City><span
- lang=EN-GB style='mso-ansi-language:EN-GB'>Cambridge</span></st1:City><span
- lang=EN-GB style='mso-ansi-language:EN-GB'>, </span><st1:State><span
- lang=EN-GB style='mso-ansi-language:EN-GB'>MA</span></st1:State><span
- lang=EN-GB style='mso-ansi-language:EN-GB'> </span><st1:PostalCode><span
- lang=EN-GB style='mso-ansi-language:EN-GB'>02139</span></st1:PostalCode><span
- lang=EN-GB style='mso-ansi-language:EN-GB'>, </span><st1:country-region><span
- lang=EN-GB style='mso-ansi-language:EN-GB'>USA</span></st1:country-region></st1:pla...
[truncated message content] |
|
From: <mic...@us...> - 2011-11-09 17:21:43
|
Revision: 4327
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4327&view=rev
Author: michael-t
Date: 2011-11-09 17:21:34 +0000 (Wed, 09 Nov 2011)
Log Message:
-----------
Added Paths:
-----------
trunk/plugins/PowerScheduler++/Stable/1.2.1.2/MPEI/PowerScheduler++ 1.2.1.2.mpe1
Removed Paths:
-------------
trunk/plugins/PowerScheduler++/Stable/1.2.1.2/MPEI/PowerScheduler++ 1.2.1.2.mpe1
Deleted: trunk/plugins/PowerScheduler++/Stable/1.2.1.2/MPEI/PowerScheduler++ 1.2.1.2.mpe1
===================================================================
(Binary files differ)
Added: trunk/plugins/PowerScheduler++/Stable/1.2.1.2/MPEI/PowerScheduler++ 1.2.1.2.mpe1
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/PowerScheduler++/Stable/1.2.1.2/MPEI/PowerScheduler++ 1.2.1.2.mpe1
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mic...@us...> - 2011-11-09 17:20:05
|
Revision: 4326
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4326&view=rev
Author: michael-t
Date: 2011-11-09 17:19:54 +0000 (Wed, 09 Nov 2011)
Log Message:
-----------
New version 1.2.1.2
Bugfix: Bug in WaitableTimer.cs caused 100 % CPU load on Windows XP systems
Modified Paths:
--------------
trunk/plugins/PowerScheduler++/Stable/1.2.1.2/CleanupFiles.bat
trunk/plugins/PowerScheduler++/Stable/1.2.1.2/Common-MP-TVE3/PowerScheduler.Interfaces/WaitableTimer.cs
trunk/plugins/PowerScheduler++/Stable/1.2.1.2/CopyFiles.bat
trunk/plugins/PowerScheduler++/Stable/1.2.1.2/MPEI/PowerScheduler++.xmp2
trunk/plugins/PowerScheduler++/Stable/1.2.1.2/MPEI/update.xml
trunk/plugins/PowerScheduler++/Stable/1.2.1.2/RestoreFiles.bat
trunk/plugins/PowerScheduler++/Stable/1.2.1.2/VersionInfo.cs
Added Paths:
-----------
trunk/plugins/PowerScheduler++/Stable/1.2.1.2/
trunk/plugins/PowerScheduler++/Stable/1.2.1.2/MPEI/PowerScheduler++ 1.2.1.2.mpe1
Removed Paths:
-------------
trunk/plugins/PowerScheduler++/Stable/1.2.1.2/MPEI/PowerScheduler++ 1.2.1.1.mpe1
Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.2/CleanupFiles.bat
===================================================================
--- trunk/plugins/PowerScheduler++/Stable/1.2.1.1/CleanupFiles.bat 2011-11-06 13:41:46 UTC (rev 4325)
+++ trunk/plugins/PowerScheduler++/Stable/1.2.1.2/CleanupFiles.bat 2011-11-09 17:19:54 UTC (rev 4326)
@@ -1,9 +1,20 @@
@echo off
set PROJECTPATH=%~dp0
+if "%ProgramFiles(x86)%" == "" goto 32bit
set SERVERPATH=%ProgramFiles(x86)%\Team MediaPortal\MediaPortal TV Server
set CLIENTPATH=%ProgramFiles(x86)%\Team MediaPortal\MediaPortal
+goto data
+:32bit
+set SERVERPATH=%ProgramFiles%\Team MediaPortal\MediaPortal TV Server
+set CLIENTPATH=%ProgramFiles%\Team MediaPortal\MediaPortal
+:data
+if "%ProgramData%" == "" goto winXP
set SERVERLOGPATH=%ProgramData%\Team MediaPortal\MediaPortal TV Server\log
-set CLIENTLOGPATH=%ProgramData%\Team MediaPortal\MediaPortal\log
+goto count
+:winXP
+set SERVERLOGPATH=%ALLUSERSPROFILE%\Application Data\Team MediaPortal\MediaPortal TV Server\log
+
+:count
set COUNT=1
echo Stopping TV Server
Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.2/Common-MP-TVE3/PowerScheduler.Interfaces/WaitableTimer.cs
===================================================================
--- trunk/plugins/PowerScheduler++/Stable/1.2.1.1/Common-MP-TVE3/PowerScheduler.Interfaces/WaitableTimer.cs 2011-11-06 13:41:46 UTC (rev 4325)
+++ trunk/plugins/PowerScheduler++/Stable/1.2.1.2/Common-MP-TVE3/PowerScheduler.Interfaces/WaitableTimer.cs 2011-11-09 17:19:54 UTC (rev 4326)
@@ -167,7 +167,8 @@
// Create thread
m_Waiting = new Thread(new ParameterizedThreadStart(WaitThread));
- m_Waiting.Priority = ThreadPriority.AboveNormal;
+ // Causes 100 % CPU load on XP systems
+ // m_Waiting.Priority = ThreadPriority.AboveNormal;
m_Waiting.Name = "PowerScheduler Waiter";
using (ManualResetEvent handshake = new ManualResetEvent(false))
Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.2/CopyFiles.bat
===================================================================
--- trunk/plugins/PowerScheduler++/Stable/1.2.1.1/CopyFiles.bat 2011-11-06 13:41:46 UTC (rev 4325)
+++ trunk/plugins/PowerScheduler++/Stable/1.2.1.2/CopyFiles.bat 2011-11-09 17:19:54 UTC (rev 4326)
@@ -1,9 +1,20 @@
@echo off
set PROJECTPATH=%~dp0
+if "%ProgramFiles(x86)%" == "" goto 32bit
set SERVERPATH=%ProgramFiles(x86)%\Team MediaPortal\MediaPortal TV Server
set CLIENTPATH=%ProgramFiles(x86)%\Team MediaPortal\MediaPortal
+goto data
+:32bit
+set SERVERPATH=%ProgramFiles%\Team MediaPortal\MediaPortal TV Server
+set CLIENTPATH=%ProgramFiles%\Team MediaPortal\MediaPortal
+:data
+if "%ProgramData%" == "" goto winXP
set SERVERLOGPATH=%ProgramData%\Team MediaPortal\MediaPortal TV Server\log
-set CLIENTLOGPATH=%ProgramData%\Team MediaPortal\MediaPortal\log
+goto count
+:winXP
+set SERVERLOGPATH=%ALLUSERSPROFILE%\Application Data\Team MediaPortal\MediaPortal TV Server\log
+
+:count
set COUNT=1
echo Stopping TV Server
Deleted: trunk/plugins/PowerScheduler++/Stable/1.2.1.2/MPEI/PowerScheduler++ 1.2.1.1.mpe1
===================================================================
(Binary files differ)
Added: trunk/plugins/PowerScheduler++/Stable/1.2.1.2/MPEI/PowerScheduler++ 1.2.1.2.mpe1
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/PowerScheduler++/Stable/1.2.1.2/MPEI/PowerScheduler++ 1.2.1.2.mpe1
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.2/MPEI/PowerScheduler++.xmp2
===================================================================
--- trunk/plugins/PowerScheduler++/Stable/1.2.1.1/MPEI/PowerScheduler++.xmp2 2011-11-06 13:41:46 UTC (rev 4325)
+++ trunk/plugins/PowerScheduler++/Stable/1.2.1.2/MPEI/PowerScheduler++.xmp2 2011-11-09 17:19:54 UTC (rev 4326)
@@ -477,24 +477,24 @@
<Id>9b9bc24e-69ca-4abc-8810-f8f95bd4bbe6</Id>
<Author>michael_t (based on PowerScheduler by micheloe)</Author>
<HomePage>http://www.team-mediaportal.com/extensions/other/powerscheduler</HomePage>
- <ForumPage>http://forum.team-mediaportal.com/tv-server-plugins-294/powerscheduler-1-2-1-0-stable-version-mediaportal-1-2-1-final-95463/#post733512/</ForumPage>
+ <ForumPage>http://forum.team-mediaportal.com/tv-server-plugins-294/powerscheduler-1-2-1-2-stable-version-mediaportal-1-2-1-final-95463/#post733512/</ForumPage>
<UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=52</UpdateUrl>
<Version>
<Major>1</Major>
<Minor>2</Minor>
<Build>1</Build>
- <Revision>1</Revision>
+ <Revision>2</Revision>
</Version>
<ExtensionDescription>The PowerScheduler++ plugin is a replacement for the PowerScheduler plugin that comes as part of MediaPortal. Compared to the original PowerScheduler it provides additional features (easy configuration, shares monitoring, reboot option, ...) and is supporting "away mode" for Vista and Win 7 systems.</ExtensionDescription>
- <VersionDescription>Version 1.2.1.1 - Stable version for MP 1.2.1 FINAL
+ <VersionDescription>Version 1.2.1.2 - Stable version for MP 1.2.1 FINAL
Release Notes:
-Version 1.2.1.1
-Bugfix: Changes to NetworkMonitor minimum transfer rate had no effect
+Version 1.2.1.2 - Bugfix: Fixed periodic 100% CPU load on Windows XP (thx to daniel_1980 and umlaut)
+Version 1.2.1.1 - Bugfix: Changes to NetworkMonitor minimum transfer rate had no effect
Version 1.2.1.0 - Initial version</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=24</OnlineLocation>
- <ReleaseDate>2011-10-01T16:03:54</ReleaseDate>
+ <ReleaseDate>2011-11-01T16:03:54</ReleaseDate>
<Tags>tv server plugins, automation</Tags>
<Location>..\MPEI\[Name] [Version].mpe1</Location>
<Params>
@@ -563,14 +563,14 @@
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>PowerScheduler_high.png</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{3787c1d2-5a62-4df7-a5a9-de1e9a974797}-PowerScheduler_high.png</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{cf7fec65-3cd1-4bba-9522-cf1e8617c50b}-PowerScheduler_high.png</ZipFileName>
<DestinationFilename />
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="true" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\mediaportal\PowerSchedulerClientPlugin\PowerScheduler.gif</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{ddb06ce2-4424-4de8-942e-0534e5e522f6}-PowerScheduler.gif</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{e45bd37f-259b-4280-af2b-7c5e718f7113}-PowerScheduler.gif</ZipFileName>
<DestinationFilename />
</FileItem>
</Items>
Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.2/MPEI/update.xml
===================================================================
--- trunk/plugins/PowerScheduler++/Stable/1.2.1.1/MPEI/update.xml 2011-11-06 13:41:46 UTC (rev 4325)
+++ trunk/plugins/PowerScheduler++/Stable/1.2.1.2/MPEI/update.xml 2011-11-09 17:19:54 UTC (rev 4326)
@@ -249,15 +249,168 @@
<Revision>1</Revision>
</Version>
<ExtensionDescription>The PowerScheduler++ plugin is a replacement for the PowerScheduler plugin that comes as part of MediaPortal. Compared to the original PowerScheduler it provides additional features (easy configuration, shares monitoring, reboot option, ...) and is supporting "away mode" for Vista and Win 7 systems.</ExtensionDescription>
- <VersionDescription>Version 1.2.1.1 - Stable version for MP 1.2.1 FINAL
+ <VersionDescription>Version 1.2.1.1 - Stable version for MP 1.2.1 FINAL
+
+Release Notes:
+Version 1.2.1.1
+Bugfix: Changes to NetworkMonitor minimum transfer rate had no effect
+Version 1.2.1.0 - Initial version</VersionDescription>
+ <DevelopmentStatus>Stable</DevelopmentStatus>
+ <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=24</OnlineLocation>
+ <ReleaseDate>2011-10-01T16:03:54</ReleaseDate>
+ <Tags>tv server plugins, automation</Tags>
+ <Location>..\MPEI\[Name] [Version].mpe1</Location>
+ <Params>
+ <Items>
+ <SectionParam Name="Online Icon">
+ <Value>http://www.team-mediaportal.com/components/com_mtree/img/listings/m/471.gif</Value>
+ <ValueType>String</ValueType>
+ <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Configuration file">
+ <Value />
+ <ValueType>Template</ValueType>
+ <Description>The file used to configure the extension.
+ If have .exe extension the will be executed
+ If have .dll extension used like MP plugin configuration</Description>
+ </SectionParam>
+ <SectionParam Name="Online Screenshots">
+ <Value>http://www.team-mediaportal.com/components/com_mtree/img/listings/m/480.jpg;
+http://www.team-mediaportal.com/components/com_mtree/img/listings/m/481.jpg;
+http://www.team-mediaportal.com/components/com_mtree/img/listings/m/482.jpg;
+http://www.team-mediaportal.com/components/com_mtree/img/listings/m/483.jpg;
+http://www.team-mediaportal.com/components/com_mtree/img/listings/m/484.jpg;
+http://www.team-mediaportal.com/components/com_mtree/img/listings/m/485.jpg;
+http://www.team-mediaportal.com/components/com_mtree/img/listings/m/486.jpg;
+http://www.team-mediaportal.com/components/com_mtree/img/listings/m/487.jpg</Value>
+ <ValueType>String</ValueType>
+ <Description>Online stored screenshot urls separated by ; </Description>
+ </SectionParam>
+ <SectionParam Name="Force to uninstall on update">
+ <Value>YES</Value>
+ <ValueType>Bool</ValueType>
+ <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ </GeneralInfo>
+ <UniqueFileList>
+ <Items />
+ </UniqueFileList>
+ <ProjectSettings>
+ <FolderGroups />
+ </ProjectSettings>
+ <IsSkin>false</IsSkin>
+ </PackageClass>
+ <PackageClass>
+ <Version>2.0</Version>
+ <Groups>
+ <Items>
+ <GroupItem Name="Server files">
+ <DisplayName>Server files</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Server files</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Client files">
+ <DisplayName>Client files</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Client files</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items />
+ </Sections>
+ <Dependencies>
+ <Items>
+ <DependencyItem>
+ <Type>Installer</Type>
+ <Id />
+ <MinVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MinVersion>
+ <MaxVersion>
+ <Major>1</Major>
+ <Minor>2</Minor>
+ <Build>1</Build>
+ <Revision>0</Revision>
+ </MaxVersion>
+ <WarnOnly>true</WarnOnly>
+ <Message>For MediaPortal release 1.2.1 FINAL (not compatible with 1.1.x releases)</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ <DependencyItem>
+ <Type>MediaPortal</Type>
+ <Id />
+ <MinVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MinVersion>
+ <MaxVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MaxVersion>
+ <WarnOnly>false</WarnOnly>
+ <Message>For MediaPortal release 1.2.1 FINAL (not compatible with 1.1.x releases)</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ </Items>
+ </Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="PowerSchedulerClientPlugin.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.1.6.27644</MinRequiredVersion>
+ <DesignedForVersion>1.2.1.0</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items>
+ <SubSystemItem Name="MP" />
+ </Items>
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
+ <GeneralInfo>
+ <Name>PowerScheduler++</Name>
+ <Id>9b9bc24e-69ca-4abc-8810-f8f95bd4bbe6</Id>
+ <Author>michael_t (based on PowerScheduler by micheloe)</Author>
+ <HomePage>http://www.team-mediaportal.com/extensions/other/powerscheduler</HomePage>
+ <ForumPage>http://forum.team-mediaportal.com/tv-server-plugins-294/powerscheduler-1-2-1-2-stable-version-mediaportal-1-2-1-final-95463/#post733512/</ForumPage>
+ <UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=52</UpdateUrl>
+ <Version>
+ <Major>1</Major>
+ <Minor>2</Minor>
+ <Build>1</Build>
+ <Revision>2</Revision>
+ </Version>
+ <ExtensionDescription>The PowerScheduler++ plugin is a replacement for the PowerScheduler plugin that comes as part of MediaPortal. Compared to the original PowerScheduler it provides additional features (easy configuration, shares monitoring, reboot option, ...) and is supporting "away mode" for Vista and Win 7 systems.</ExtensionDescription>
+ <VersionDescription>Version 1.2.1.2 - Stable version for MP 1.2.1 FINAL
Release Notes:
-Version 1.2.1.1
-Bugfix: Changes to NetworkMonitor minimum transfer rate had no effect
+Version 1.2.1.2 - Bugfix: Fixed periodic 100% CPU load on Windows XP (thx to daniel_1980 and umlaut)
+Version 1.2.1.1 - Bugfix: Changes to NetworkMonitor minimum transfer rate had no effect
Version 1.2.1.0 - Initial version</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=24</OnlineLocation>
- <ReleaseDate>2011-10-01T16:03:54</ReleaseDate>
+ <ReleaseDate>2011-11-01T16:03:54</ReleaseDate>
<Tags>tv server plugins, automation</Tags>
<Location>..\MPEI\[Name] [Version].mpe1</Location>
<Params>
Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.2/RestoreFiles.bat
===================================================================
--- trunk/plugins/PowerScheduler++/Stable/1.2.1.1/RestoreFiles.bat 2011-11-06 13:41:46 UTC (rev 4325)
+++ trunk/plugins/PowerScheduler++/Stable/1.2.1.2/RestoreFiles.bat 2011-11-09 17:19:54 UTC (rev 4326)
@@ -1,9 +1,20 @@
@echo off
set PROJECTPATH=%~dp0
+if "%ProgramFiles(x86)%" == "" goto 32bit
set SERVERPATH=%ProgramFiles(x86)%\Team MediaPortal\MediaPortal TV Server
set CLIENTPATH=%ProgramFiles(x86)%\Team MediaPortal\MediaPortal
+goto data
+:32bit
+set SERVERPATH=%ProgramFiles%\Team MediaPortal\MediaPortal TV Server
+set CLIENTPATH=%ProgramFiles%\Team MediaPortal\MediaPortal
+:data
+if "%ProgramData%" == "" goto winXP
set SERVERLOGPATH=%ProgramData%\Team MediaPortal\MediaPortal TV Server\log
-set CLIENTLOGPATH=%ProgramData%\Team MediaPortal\MediaPortal\log
+goto count
+:winXP
+set SERVERLOGPATH=%ALLUSERSPROFILE%\Application Data\Team MediaPortal\MediaPortal TV Server\log
+
+:count
set COUNT=1
echo Stopping TV Server
Modified: trunk/plugins/PowerScheduler++/Stable/1.2.1.2/VersionInfo.cs
===================================================================
--- trunk/plugins/PowerScheduler++/Stable/1.2.1.1/VersionInfo.cs 2011-11-06 13:41:46 UTC (rev 4325)
+++ trunk/plugins/PowerScheduler++/Stable/1.2.1.2/VersionInfo.cs 2011-11-09 17:19:54 UTC (rev 4326)
@@ -47,9 +47,9 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.2.1.0")]
-[assembly: AssemblyFileVersion("1.2.1.0")]
-[assembly: AssemblyInformationalVersion("1.2.1.0 for MP 1.2.1")]
+[assembly: AssemblyVersion("1.2.1.2")]
+[assembly: AssemblyFileVersion("1.2.1.2")]
+[assembly: AssemblyInformationalVersion("1.2.1.2 for MP 1.2.1")]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <off...@us...> - 2011-11-06 13:41:54
|
Revision: 4325
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4325&view=rev
Author: offbyonebb
Date: 2011-11-06 13:41:46 +0000 (Sun, 06 Nov 2011)
Log Message:
-----------
added WiFiManager plugin (C# code, DefaultWide skin, MPEI installer script)
Added Paths:
-----------
trunk/plugins/WiFiManager/
trunk/plugins/WiFiManager/Installer/
trunk/plugins/WiFiManager/Installer/WifiManager.xmp2
trunk/plugins/WiFiManager/Skins/
trunk/plugins/WiFiManager/Skins/DefaultWide/
trunk/plugins/WiFiManager/Skins/DefaultWide/Media/
trunk/plugins/WiFiManager/Skins/DefaultWide/Media/WifiManager/
trunk/plugins/WiFiManager/Skins/DefaultWide/Media/WifiManager/Secure.png
trunk/plugins/WiFiManager/Skins/DefaultWide/Media/WifiManager/WiFi.png
trunk/plugins/WiFiManager/Skins/DefaultWide/Media/hover_WifiManager.png
trunk/plugins/WiFiManager/Skins/DefaultWide/WifiManager.xml
trunk/plugins/WiFiManager/WiFiManager/
trunk/plugins/WiFiManager/WiFiManager/GuiWifiManager.cs
trunk/plugins/WiFiManager/WiFiManager/NativeWifi/
trunk/plugins/WiFiManager/WiFiManager/NativeWifi/Interop.cs
trunk/plugins/WiFiManager/WiFiManager/NativeWifi/WlanApi.cs
trunk/plugins/WiFiManager/WiFiManager/Properties/
trunk/plugins/WiFiManager/WiFiManager/Properties/AssemblyInfo.cs
trunk/plugins/WiFiManager/WiFiManager/WiFiManager.csproj
trunk/plugins/WiFiManager/WiFiManager/WiFiManager.png
trunk/plugins/WiFiManager/WiFiManager/WiFiManagerDisabled.png
trunk/plugins/WiFiManager/WiFiManager.sln
Added: trunk/plugins/WiFiManager/Installer/WifiManager.xmp2
===================================================================
--- trunk/plugins/WiFiManager/Installer/WifiManager.xmp2 (rev 0)
+++ trunk/plugins/WiFiManager/Installer/WifiManager.xmp2 2011-11-06 13:41:46 UTC (rev 4325)
@@ -0,0 +1,320 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PackageClass xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <Version>2.0</Version>
+ <Groups>
+ <Items>
+ <GroupItem Name="Default">
+ <ParentGroup />
+ <DisplayName>Default</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Default</Description>
+ <Files>
+ <Items>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\..\..\..\..\..\..\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\WiFiManager.dll</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{aab3d026-d2e8-4f15-8480-3b70f83f3691}-WiFiManager.dll</ZipFileName>
+ <DestinationFilename>%Plugins%\Windows\WiFiManager.dll</DestinationFilename>
+ </FileItem>
+ </Items>
+ </Files>
+ </GroupItem>
+ <GroupItem Name="DefaultWide">
+ <DisplayName>DefaultWide</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>DefaultWide</Description>
+ <Files>
+ <Items>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\Skins\DefaultWide\WifiManager.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{944d093b-3705-4475-861f-990902757585}-WifiManager.xml</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\WifiManager.xml</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\Skins\DefaultWide\Media\hover_WifiManager.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{04f2f181-b6ab-40f7-b1fc-c750ad55f179}-hover_WifiManager.png</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\Media\hover_WifiManager.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\Skins\DefaultWide\Media\WifiManager\Secure.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{4c2639f2-c49d-4282-ae9f-efec23cd8590}-Secure.png</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\Media\WifiManager\Secure.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\Skins\DefaultWide\Media\WifiManager\WiFi.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{f1ca47e1-c17f-4dea-8ec9-593b889b2b66}-WiFi.png</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\Media\WifiManager\WiFi.png</DestinationFilename>
+ </FileItem>
+ </Items>
+ </Files>
+ </GroupItem>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items>
+ <SectionItem Guid="69d915bb-c231-409b-bd58-dafd64a2e470" Name="Welcome Screen" ConditionGroup="">
+ <Params>
+ <Items>
+ <SectionParam Name="Header text">
+ <Value>Welcome to the Extension Installer for [Name]</Value>
+ <ValueType>String</ValueType>
+ <Description />
+ </SectionParam>
+ <SectionParam Name="Description">
+ <Value>This will install [Name] version [Version] on your computer.
+It is recommended that you close all other applications before continuing.
+Click Next to continue or Cancel to exit Setup.</Value>
+ <ValueType>String</ValueType>
+ <Description />
+ </SectionParam>
+ <SectionParam Name="Left part image">
+ <Value />
+ <ValueType>File</ValueType>
+ <Description />
+ </SectionParam>
+ <SectionParam Name="Header image">
+ <Value />
+ <ValueType>File</ValueType>
+ <Description>Image in upper right part</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ <Actions>
+ <Items />
+ </Actions>
+ <IncludedGroups />
+ <PanelName>Welcome Screen</PanelName>
+ <WizardButtonsEnum>NextCancel</WizardButtonsEnum>
+ </SectionItem>
+ <SectionItem Guid="a29114e3-8300-476d-8271-fe07bb3c58e2" Name="Install Section" ConditionGroup="">
+ <Params>
+ <Items>
+ <SectionParam Name="Header Title">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>Header title</Description>
+ </SectionParam>
+ <SectionParam Name="Header description">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>Description of section, shown in under section title</Description>
+ </SectionParam>
+ <SectionParam Name="Header image">
+ <Value />
+ <ValueType>File</ValueType>
+ <Description>Image in upper right part</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ <Actions>
+ <Items>
+ <ActionItem Name="InstallFiles" ActionType="InstallFiles" ConditionGroup="">
+ <Params>
+ <Items />
+ </Params>
+ <ExecuteLocation>AfterPanelShow</ExecuteLocation>
+ </ActionItem>
+ </Items>
+ </Actions>
+ <IncludedGroups />
+ <PanelName>Install Section</PanelName>
+ <WizardButtonsEnum>Next</WizardButtonsEnum>
+ </SectionItem>
+ <SectionItem Guid="645d811e-4b75-4ed8-a3ce-06bfe821f676" Name="Setup Complete" ConditionGroup="">
+ <Params>
+ <Items>
+ <SectionParam Name="Header text">
+ <Value>The Extension Installer Wizard has successfully installed [Name].</Value>
+ <ValueType>String</ValueType>
+ <Description />
+ </SectionParam>
+ <SectionParam Name="Left part image">
+ <Value />
+ <ValueType>File</ValueType>
+ <Description />
+ </SectionParam>
+ <SectionParam Name="Show radio buttons">
+ <Value />
+ <ValueType>Bool</ValueType>
+ <Description>Use radiobutton in place of combobox</Description>
+ </SectionParam>
+ <SectionParam Name="Header image">
+ <Value />
+ <ValueType>File</ValueType>
+ <Description>Image in upper right part</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ <Actions>
+ <Items />
+ </Actions>
+ <IncludedGroups />
+ <PanelName>Setup Complete</PanelName>
+ <WizardButtonsEnum>Finish</WizardButtonsEnum>
+ </SectionItem>
+ </Items>
+ </Sections>
+ <Dependencies>
+ <Items>
+ <DependencyItem>
+ <Type>MediaPortal</Type>
+ <Id />
+ <MinVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MinVersion>
+ <MaxVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MaxVersion>
+ <WarnOnly>false</WarnOnly>
+ <Message>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ </Items>
+ </Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="WiFiManager.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.1.6.27644</MinRequiredVersion>
+ <DesignedForVersion>1.1.6.27644</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items>
+ <SubSystemItem Name="MP.Input" />
+ <SubSystemItem Name="MP.SkinEngine" />
+ <SubSystemItem Name="MP.Config" />
+ </Items>
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
+ <GeneralInfo>
+ <Name>WifiManager</Name>
+ <Id>dbd7af5e-8b89-420d-b8b4-a935fa9282c2</Id>
+ <Author>offbyone</Author>
+ <HomePage />
+ <ForumPage />
+ <UpdateUrl />
+ <Version>
+ <Major>1</Major>
+ <Minor>0</Minor>
+ <Build>0</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>This plugin displays a list of available wireless networks if you have a WiFi adapter installed on your machine and allows connecting or disconnecting without the need to go to your Windows Desktop.</ExtensionDescription>
+ <VersionDescription />
+ <DevelopmentStatus>Beta</DevelopmentStatus>
+ <OnlineLocation />
+ <ReleaseDate>2011-10-03T21:30:37.6965017+02:00</ReleaseDate>
+ <Tags>settings, wlan, wifi</Tags>
+ <Location>C:\Users\offbyone\Documents\Code\CodeUnlimited\WiFiManager\Installers\WifiManager.mpe1</Location>
+ <Params>
+ <Items>
+ <SectionParam Name="Icon">
+ <Value>..\Skins\DefaultWide\Media\hover_WifiManager.png</Value>
+ <ValueType>File</ValueType>
+ <Description>The icon file of the package (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Online Icon">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Configuration file">
+ <Value />
+ <ValueType>Template</ValueType>
+ <Description>The file used to configure the extension.
+ If have .exe extension the will be executed
+ If have .dll extension used like MP plugin configuration</Description>
+ </SectionParam>
+ <SectionParam Name="Online Screenshots">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>Online stored screenshot urls separated by ; </Description>
+ </SectionParam>
+ <SectionParam Name="Force to uninstall on update">
+ <Value>yes</Value>
+ <ValueType>Bool</ValueType>
+ <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ </GeneralInfo>
+ <UniqueFileList>
+ <Items>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\..\..\..\..\..\..\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\WiFiManager.dll</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{aab3d026-d2e8-4f15-8480-3b70f83f3691}-WiFiManager.dll</ZipFileName>
+ <DestinationFilename>%Plugins%\Windows\WiFiManager.dll</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\Skins\DefaultWide\WifiManager.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{944d093b-3705-4475-861f-990902757585}-WifiManager.xml</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\WifiManager.xml</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="true" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\Skins\DefaultWide\Media\hover_WifiManager.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{04f2f181-b6ab-40f7-b1fc-c750ad55f179}-hover_WifiManager.png</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\Media\hover_WifiManager.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\Skins\DefaultWide\Media\WifiManager\Secure.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{4c2639f2-c49d-4282-ae9f-efec23cd8590}-Secure.png</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\Media\WifiManager\Secure.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\Skins\DefaultWide\Media\WifiManager\WiFi.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{f1ca47e1-c17f-4dea-8ec9-593b889b2b66}-WiFi.png</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\Media\WifiManager\WiFi.png</DestinationFilename>
+ </FileItem>
+ </Items>
+ </UniqueFileList>
+ <ProjectSettings>
+ <FolderGroups>
+ <FolderGroup InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName />
+ <ZipFileName>Installer{CopyFile}\{cabbe550-cd32-474d-8a9b-8024dcda05c9}-</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\</DestinationFilename>
+ <Folder>..\Skins\DefaultWide</Folder>
+ <Group>DefaultWide</Group>
+ <Recursive>true</Recursive>
+ </FolderGroup>
+ </FolderGroups>
+ <ProjectFilename>WifiManager.xmp2</ProjectFilename>
+ <UpdatePath1 />
+ <UpdatePath2 />
+ <UpdatePath3 />
+ </ProjectSettings>
+ <IsSkin>false</IsSkin>
+</PackageClass>
\ No newline at end of file
Added: trunk/plugins/WiFiManager/Skins/DefaultWide/Media/WifiManager/Secure.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/WiFiManager/Skins/DefaultWide/Media/WifiManager/Secure.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/WiFiManager/Skins/DefaultWide/Media/WifiManager/WiFi.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/WiFiManager/Skins/DefaultWide/Media/WifiManager/WiFi.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/WiFiManager/Skins/DefaultWide/Media/hover_WifiManager.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/WiFiManager/Skins/DefaultWide/Media/hover_WifiManager.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/WiFiManager/Skins/DefaultWide/WifiManager.xml
===================================================================
--- trunk/plugins/WiFiManager/Skins/DefaultWide/WifiManager.xml (rev 0)
+++ trunk/plugins/WiFiManager/Skins/DefaultWide/WifiManager.xml 2011-11-06 13:41:46 UTC (rev 4325)
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<window>
+ <id>4855</id>
+ <defaultcontrol>50</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <controls>
+ <control>
+ <description>background image</description>
+ <type>image</type>
+ <id>1</id>
+ <width>1280</width>
+ <height>720</height>
+ </control>
+ <import>common.window.xml</import>
+ <import>common.time.xml</import>
+ <control>
+ <type>label</type>
+ <id>1</id>
+ <posX>60</posX>
+ <posY>27</posY>
+ <label>#currentmodule</label>
+ <font>font16</font>
+ <align>left</align>
+ <textcolor>White</textcolor>
+ </control>
+ <control>
+ <type>actiongroup</type>
+ <description>action menu</description>
+ <defaultcontrol>2</defaultcontrol>
+ <onexit>50</onexit>
+ <buttonX>0</buttonX>
+ <buttonY>0</buttonY>
+ <buttonwidth>106</buttonwidth>
+ <buttonheight>720</buttonheight>
+ <textureFocus>-</textureFocus>
+ <textureNoFocus>Action_nofocus.png</textureNoFocus>
+ <width>275</width>
+ <height>900</height>
+ <dimColor>00ffffff</dimColor>
+ <control>
+ <type>image</type>
+ <posX>26</posX>
+ <posY>78</posY>
+ <width>367</width>
+ <height>591</height>
+ <texture>Backslide.png</texture>
+ <colorDiffuse>fffffffff</colorDiffuse>
+ <visible>!Control.HasFocus(50)</visible>
+ <animation effect="slide" time="70" start="-300,0" reversible="false">visible</animation>
+ <animation effect="slide" time="70" end="-300,0" reversible="false">hidden</animation>
+ </control>
+ <control>
+ <description>button group</description>
+ <type>group</type>
+ <animation effect="slide" time="70" start="-300,0" reversible="false">visible</animation>
+ <animation effect="slide" time="70" end="-300,0" reversible="false">hidden</animation>
+ <posX>71</posX>
+ <posY>121</posY>
+ <layout>StackLayout</layout>
+ <visible>!Control.HasFocus(50)</visible>
+ <control>
+ <description>Scan button</description>
+ <type>button</type>
+ <id>2</id>
+ <label>Scan</label>
+ <onright>50</onright>
+ </control>
+ <control>
+ <description>Refresh button</description>
+ <type>button</type>
+ <id>3</id>
+ <label>Refresh List</label>
+ <onright>50</onright>
+ </control>
+ </control>
+ </control>
+ <import>common.facade.xml</import>
+ </controls>
+</window>
Added: trunk/plugins/WiFiManager/WiFiManager/GuiWifiManager.cs
===================================================================
--- trunk/plugins/WiFiManager/WiFiManager/GuiWifiManager.cs (rev 0)
+++ trunk/plugins/WiFiManager/WiFiManager/GuiWifiManager.cs 2011-11-06 13:41:46 UTC (rev 4325)
@@ -0,0 +1,474 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using MediaPortal.GUI.Library;
+using MediaPortal.Configuration;
+using NativeWifi;
+using MediaPortal.Dialogs;
+using System.IO;
+
+namespace WiFiManager
+{
+ [PluginIcons("WiFiManager.WiFiManager.png", "WiFiManager.WiFiManagerDisabled.png")]
+ public class GuiWifiManager : GUIWindow, ISetupForm, IShowPlugin
+ {
+ #region Constants
+ public const int WINDOW_ID = 4855;
+ public const string FRIENDLY_NAME = "Wifi Manager";
+ #endregion
+
+ #region Fields
+ int outstandingScans = 0;
+ string selectedSSID = null;
+ WlanClient wlanClient = null;
+ #endregion
+
+ #region Enums
+ enum WinProfileAuthenticationEnumeration { open, shared, WPA, WPAPSK, WPA2, WPA2PSK };
+ enum WinProfileEncryptionEnumeration { none, WEP, TKIP, AES };
+ #endregion
+
+ #region Skin Controls
+ [SkinControlAttribute(50)]
+ protected GUIFacadeControl GUI_facadeWlans = null;
+ [SkinControlAttribute(2)]
+ protected GUIButtonControl GUI_btnScan = null;
+ [SkinControlAttribute(3)]
+ protected GUIButtonControl GUI_btnRefresh = null;
+ #endregion
+
+ #region ISetupForm
+ string ISetupForm.Author()
+ {
+ return "offbyone";
+ }
+
+ bool ISetupForm.CanEnable()
+ {
+ return true;
+ }
+
+ bool ISetupForm.DefaultEnabled()
+ {
+ return true;
+ }
+
+ string ISetupForm.Description()
+ {
+ return "This Plugin list available wirelesse networks and allow connecting to one.";
+ }
+
+ bool ISetupForm.GetHome(out string strButtonText, out string strButtonImage, out string strButtonImageFocus, out string strPictureImage)
+ {
+ strButtonText = FRIENDLY_NAME;
+ strButtonImage = String.Empty;
+ strButtonImageFocus = String.Empty;
+ strPictureImage = @"hover_WifiManager.png";
+ return true;
+ }
+
+ int ISetupForm.GetWindowId()
+ {
+ return GetID;
+ }
+
+ bool ISetupForm.HasSetup()
+ {
+ return false;
+ }
+
+ string ISetupForm.PluginName()
+ {
+ return "WifiManager";
+ }
+
+ void ISetupForm.ShowPlugin()
+ {
+
+ }
+ #endregion
+
+ #region IShowPlugin
+ bool IShowPlugin.ShowDefaultHome()
+ {
+ return false;
+ }
+ #endregion
+
+ #region GUIWindow overrides
+ public override int GetID
+ {
+ get { return WINDOW_ID; }
+ set { base.GetID = value; }
+ }
+
+ public override string GetModuleName()
+ {
+ return FRIENDLY_NAME;
+ }
+
+ public override bool Init()
+ {
+ return Load(GUIGraphicsContext.Skin + @"\WifiManager.xml");
+ }
+
+ protected override void OnPageLoad()
+ {
+ if (wlanClient == null)
+ {
+ try
+ {
+ wlanClient = new WlanClient();
+ }
+ catch (Exception ex)
+ {
+ Log.Warn("WiFiManager: Error creating WlanClient: {0}", ex.Message);
+ wlanClient = null;
+ ShowMessage(ex.Message, "Wifi Manager Error");
+ }
+ }
+ if (wlanClient != null)
+ {
+ foreach (var nic in wlanClient.Interfaces) nic.WlanNotification += new WlanClient.WlanInterface.WlanNotificationEventHandler(nic_WlanNotification);
+ FindNetworks();
+ GUI_btnScan.IsEnabled = true;
+ GUI_btnRefresh.IsEnabled = true;
+ }
+ else
+ {
+ GUI_btnScan.IsEnabled = false;
+ GUI_btnRefresh.IsEnabled = false;
+ }
+ GUIPropertyManager.SetProperty("#itemtype", "Networks");
+ base.OnPageLoad();
+ }
+
+ protected override void OnClicked(int controlId, GUIControl control, MediaPortal.GUI.Library.Action.ActionType actionType)
+ {
+ if (control == GUI_btnScan)
+ {
+ outstandingScans = wlanClient.Interfaces.Length;
+ GUIWaitCursor.Init(); GUIWaitCursor.Show(); // init and show the wait cursor in MediaPortal
+ foreach (WlanClient.WlanInterface wlanIface in wlanClient.Interfaces) wlanIface.Scan();
+ }
+ else if (control == GUI_btnRefresh)
+ {
+ FindNetworks();
+ GUIControl.FocusControl(GetID, GUI_facadeWlans.GetID);
+ }
+ else if (control == GUI_facadeWlans)
+ {
+ GUIDialogMenu dlgWlanOptions = (GUIDialogMenu)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU);
+ if (dlgWlanOptions == null) return;
+ string ssid = GUI_facadeWlans.SelectedListItem.Label;
+ dlgWlanOptions.Reset();
+ dlgWlanOptions.SetHeading(ssid);
+ WlanClient.WlanInterface nic = (WlanClient.WlanInterface)GUI_facadeWlans.SelectedListItem.TVTag;
+ Wlan.WlanAvailableNetwork network = (Wlan.WlanAvailableNetwork)GUI_facadeWlans.SelectedListItem.AlbumInfoTag;
+ if ((network.flags & Wlan.WlanAvailableNetworkFlags.Connected) == Wlan.WlanAvailableNetworkFlags.Connected)
+ {
+ dlgWlanOptions.Add(new GUIListItem("Disconnect"));
+ if (!string.IsNullOrEmpty(network.profileName)) dlgWlanOptions.Add(new GUIListItem("Save Profile To XML"));
+ }
+ else
+ {
+ dlgWlanOptions.Add(new GUIListItem("Connect"));
+ if (!string.IsNullOrEmpty(network.profileName)) dlgWlanOptions.Add(new GUIListItem("Delete Profile"));
+ }
+ dlgWlanOptions.DoModal(GetID);
+ if (dlgWlanOptions.SelectedId == -1) return;
+ if (dlgWlanOptions.SelectedLabelText == "Connect")
+ {
+ ConnectNetwork(ssid, nic, network);
+ }
+ else if (dlgWlanOptions.SelectedLabelText == "Disconnect")
+ {
+ Log.Info("WiFiManager: Disconnecting from WLAN '{0}'", ssid);
+ nic.Disconnect();
+ }
+ else if (dlgWlanOptions.SelectedLabelText == "Delete Profile")
+ {
+ Log.Info("WiFiManager: Deleting WLAN Profile '{0}'", network.profileName);
+ nic.DeleteProfile(network.profileName);
+ FindNetworks();
+ }
+ else if (dlgWlanOptions.SelectedLabelText == "Save Profile To XML")
+ {
+ File.WriteAllText(Config.GetFile(Config.Dir.Log, string.Format("{0}#{1}#{2}.xml", network.profileName, network.dot11DefaultAuthAlgorithm.ToString(), network.dot11DefaultCipherAlgorithm.ToString())), nic.GetProfileXml(network.profileName));
+ }
+ }
+ else base.OnClicked(controlId, control, actionType);
+ }
+ #endregion
+
+ internal static bool GetUserInputString(ref string sString, bool password)
+ {
+ VirtualKeyboard keyBoard = (VirtualKeyboard)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_VIRTUAL_KEYBOARD);
+ if (keyBoard == null) return false;
+ keyBoard.Reset();
+ keyBoard.Text = sString;
+ keyBoard.Password = password;
+ keyBoard.DoModal(GUIWindowManager.ActiveWindow);
+ if (keyBoard.IsConfirmed) sString = keyBoard.Text;
+ return keyBoard.IsConfirmed;
+ }
+
+ internal static void ShowMessage(string message, string header = "Wifi Manager")
+ {
+ GUIDialogNotify dlg_error = (GUIDialogNotify)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_NOTIFY);
+ if (dlg_error != null)
+ {
+ dlg_error.Reset();
+ dlg_error.SetImage(string.Format(@"{0}\Media\WifiManager\WiFi.png", GUIGraphicsContext.Skin));
+ dlg_error.SetHeading(header);
+ dlg_error.SetText(message);
+ dlg_error.DoModal(GUIWindowManager.ActiveWindow);
+ }
+ }
+
+ /// <summary>
+ /// Converts a 802.11 SSID to a string.
+ /// </summary>
+ internal static string GetStringForSSID(Wlan.Dot11Ssid ssid)
+ {
+ return Encoding.ASCII.GetString(ssid.SSID, 0, (int)ssid.SSIDLength);
+ }
+
+ void nic_WlanNotification(Wlan.WlanNotificationData notifyData)
+ {
+ if (notifyData.notificationSource == Wlan.WlanNotificationSource.ACM)
+ {
+ if (outstandingScans > 0 && (notifyData.notificationCode == (int)NativeWifi.Wlan.WlanNotificationCodeAcm.ScanComplete || notifyData.notificationCode == (int)NativeWifi.Wlan.WlanNotificationCodeAcm.ScanFail))
+ {
+ outstandingScans--;
+ if (outstandingScans <= 0)
+ {
+ if (GUIWindowManager.ActiveWindow == GetID)
+ {
+ GUIWindowManager.SendThreadCallback((p1, p2, o) =>
+ {
+ GUIWaitCursor.Hide(); // hide the wait cursor in MediaPortal
+ FindNetworks();
+ GUIControl.FocusControl(GetID, GUI_facadeWlans.GetID);
+ return 0;
+ }, 0, 0, null);
+ }
+ }
+ }
+ else if (notifyData.notificationCode == (int)NativeWifi.Wlan.WlanNotificationCodeAcm.ConnectionAttemptFail)
+ {
+ ShowMessage("Connection failed!", "Wifi Manager Error");
+ }
+ else if (notifyData.notificationCode == (int)NativeWifi.Wlan.WlanNotificationCodeAcm.ConnectionComplete)
+ {
+ string connectedTo = "";
+ try
+ {
+ connectedTo = wlanClient.Interfaces.First(i => i.InterfaceGuid == notifyData.interfaceGuid).CurrentConnection.profileName;
+ connectedTo = " to " + connectedTo;
+ }
+ catch (Exception) { }
+ if (GUIWindowManager.ActiveWindow == GetID)
+ {
+ GUIWindowManager.SendThreadCallback((p1, p2, o) =>
+ {
+ ShowMessage(string.Format("Successfully connected{0}!", connectedTo));
+ FindNetworks();
+ return 0;
+ }, 0, 0, null);
+ }
+ }
+ }
+ else if (notifyData.notificationSource == Wlan.WlanNotificationSource.MSM)
+ {
+ if (notifyData.notificationCode == (int)Wlan.WlanNotificationCodeMsm.Disconnected)
+ {
+ if (GUIWindowManager.ActiveWindow == GetID)
+ {
+ GUIWindowManager.SendThreadCallback((p1, p2, o) =>
+ {
+ ShowMessage("Successfully disconnected!");
+ FindNetworks();
+ return 0;
+ }, 0, 0, null);
+ }
+ }
+ }
+ }
+
+ void FindNetworks()
+ {
+ if (GUI_facadeWlans == null) return;
+
+ selectedSSID = GUI_facadeWlans.SelectedListItem != null ? GUI_facadeWlans.SelectedListItem.Label : null; // remember the currently selected one
+ int selectedIndex = 0; // index to select when the currently selected one is found in the new list
+ GUI_facadeWlans.Clear();
+
+
+ foreach (WlanClient.WlanInterface wlanIface in wlanClient.Interfaces)
+ {
+ Wlan.WlanAvailableNetwork[] networks = wlanIface.GetAvailableNetworkList(0);
+ Dictionary<string, List<Wlan.WlanAvailableNetwork>> hashedNetworks = new Dictionary<string, List<Wlan.WlanAvailableNetwork>>();
+ foreach (Wlan.WlanAvailableNetwork network in networks)
+ {
+ string ssid = GetStringForSSID(network.dot11Ssid);
+ if (!string.IsNullOrEmpty(ssid))
+ {
+ List<Wlan.WlanAvailableNetwork> networksForSSID = null;
+ if (!hashedNetworks.TryGetValue(ssid, out networksForSSID)) hashedNetworks[ssid] = networksForSSID = new List<Wlan.WlanAvailableNetwork>();
+ networksForSSID.Add(network);
+ }
+ }
+ foreach (List<Wlan.WlanAvailableNetwork> networklist in hashedNetworks.Values.OrderByDescending(v => v.Max(n => n.wlanSignalQuality)))
+ {
+ networklist.Sort((n1,n2) =>
+ {
+ int result = ((int)n2.flags).CompareTo((int)n1.flags); // the higher the flags the earlier in the list
+ if (result == 0) result = n2.wlanSignalQuality.CompareTo(n1.wlanSignalQuality); // equal flags -> sort by signal strength descending
+ return result;
+ });
+ Wlan.WlanAvailableNetwork network = networklist[0];
+ if (network.networkConnectable)
+ {
+ GUIListItem item = new GUIListItem(GetStringForSSID(network.dot11Ssid));
+ if (item.Label == selectedSSID) selectedIndex = GUI_facadeWlans.Count;
+ if (item.Label.Length == 0) item.Label = "No SSID";
+ item.Label2 = network.wlanSignalQuality.ToString() + "%";
+ if (network.securityEnabled) item.IconImage = "WifiManager/Secure.png";
+ item.IsPlayed = (network.flags & Wlan.WlanAvailableNetworkFlags.Connected) == Wlan.WlanAvailableNetworkFlags.Connected;
+ if (!item.IsPlayed) item.IsRemote = (network.flags & Wlan.WlanAvailableNetworkFlags.HasProfile) == Wlan.WlanAvailableNetworkFlags.HasProfile;
+ item.AlbumInfoTag = network;
+ item.TVTag = wlanIface;
+ GUI_facadeWlans.Add(item);
+ }
+ }
+ }
+
+ GUIPropertyManager.SetProperty("#itemcount", GUI_facadeWlans.Count.ToString());
+ GUI_facadeWlans.SelectedListItemIndex = selectedIndex;
+ }
+
+ void ConnectNetwork(string ssid, WlanClient.WlanInterface nic, Wlan.WlanAvailableNetwork network)
+ {
+ if (!string.IsNullOrEmpty(network.profileName))
+ {
+ Log.Info("WiFiManager: Using existing Profile to connect to WLAN '{0}'", ssid);
+ bool success = nic.ConnectSynchronously(Wlan.WlanConnectionMode.Profile, Wlan.Dot11BssType.Any, network.profileName, 15000);
+ FindNetworks();
+ }
+ else
+ {
+ if (network.securityEnabled)
+ {
+ string key = "";
+ if (GetUserInputString(ref key, false) && key.Length > 0)
+ {
+ Log.Info("WiFiManager: Building new Profile to connect to WLAN '{0}'", ssid);
+ string profileXml = GetProfileXml(ssid, key, network.dot11DefaultAuthAlgorithm, network.dot11DefaultCipherAlgorithm);
+ if (profileXml != null)
+ {
+ string error = null;
+ try
+ {
+ Wlan.WlanReasonCode reasonCode = nic.SetProfile(Wlan.WlanProfileFlags.User, profileXml, true);
+ if (reasonCode != Wlan.WlanReasonCode.Success) error = reasonCode.ToString();
+ }
+ catch (Exception ex)
+ {
+ error = ex.Message;
+ }
+ if (error == null)
+ {
+ nic.Connect(Wlan.WlanConnectionMode.Profile, Wlan.Dot11BssType.Any, ssid);
+ }
+ else
+ {
+ Log.Warn("WiFiManager: Setting Profile for WLAN '{0}' failed: '{1}'", ssid, error);
+ ShowMessage(error, "Wifi Manager Error");
+ }
+ }
+ else
+ {
+ // don't know how to build profile
+ ShowMessage("Unable to build profile. Connect in Windows and save profile to xml in MP.", "Wifi Manager Error");
+ }
+ }
+ }
+ else
+ {
+ Log.Info("WiFiManager: Connecting to unsecured WLAN '{0}'", ssid);
+ nic.Connect(Wlan.WlanConnectionMode.Auto, Wlan.Dot11BssType.Any, network.dot11Ssid, 0);
+ }
+ }
+ }
+
+ /// <summary>
+ /// Create a valid Profile xml according to: http://msdn.microsoft.com/en-us/library/ms707381(v=VS.85).aspx
+ /// </summary>
+ /// <param name="ssid"></param>
+ /// <param name="key"></param>
+ /// <param name="authAlg"></param>
+ /// <param name="encAlg"></param>
+ /// <returns></returns>
+ string GetProfileXml(string ssid, string key, Wlan.Dot11AuthAlgorithm authAlg, Wlan.Dot11CipherAlgorithm encAlg)
+ {
+ WinProfileAuthenticationEnumeration? auth = null;
+ WinProfileEncryptionEnumeration? enc = null;
+ switch (authAlg)
+ {
+ case Wlan.Dot11AuthAlgorithm.IEEE80211_SharedKey:
+ auth = WinProfileAuthenticationEnumeration.open;
+ enc = WinProfileEncryptionEnumeration.WEP;
+ break;
+ case Wlan.Dot11AuthAlgorithm.WPA_PSK:
+ auth = WinProfileAuthenticationEnumeration.WPAPSK;
+ break;
+ case Wlan.Dot11AuthAlgorithm.RSNA_PSK:
+ auth = WinProfileAuthenticationEnumeration.WPA2PSK;
+ break;
+ }
+ switch (encAlg)
+ {
+ case Wlan.Dot11CipherAlgorithm.TKIP:
+ enc = WinProfileEncryptionEnumeration.TKIP;
+ break;
+ case Wlan.Dot11CipherAlgorithm.CCMP:
+ enc = WinProfileEncryptionEnumeration.AES;
+ break;
+ }
+
+ if (enc == null || auth == null)
+ {
+ Log.Warn("WiFiManager: No known Mapping to create Profile '{0}' for AuthAlg: '{1}' and CipherAlg: '{2}'", ssid, authAlg.ToString(), encAlg.ToString());
+ return null;
+ }
+
+ return string.Format(@"<?xml version=""1.0""?>
+<WLANProfile xmlns=""http://www.microsoft.com/networking/WLAN/profile/v1"">
+ <name>{0}</name>
+ <SSIDConfig>
+ <SSID>
+ <name>{0}</name>
+ </SSID>
+ </SSIDConfig>
+ <connectionType>ESS</connectionType>
+ <connectionMode>auto</connectionMode>
+ <MSM>
+ <security>
+ <authEncryption>
+ <authentication>{2}</authentication>
+ <encryption>{3}</encryption>
+ <useOneX>false</useOneX>
+ </authEncryption>
+ <sharedKey>
+ <keyType>passPhrase</keyType>
+ <protected>false</protected>
+ <keyMaterial>{1}</keyMaterial>
+ </sharedKey>
+ </security>
+ </MSM>
+</WLANProfile>", ssid, key, auth.ToString(), enc.ToString());
+ }
+ }
+}
Added: trunk/plugins/WiFiManager/WiFiManager/NativeWifi/Interop.cs
===================================================================
--- trunk/plugins/WiFiManager/WiFiManager/NativeWifi/Interop.cs (rev 0)
+++ trunk/plugins/WiFiManager/WiFiManager/NativeWifi/Interop.cs 2011-11-06 13:41:46 UTC (rev 4325)
@@ -0,0 +1,1612 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Net.NetworkInformation;
+using System.Text;
+using System.Diagnostics;
+using System.ComponentModel;
+
+namespace NativeWifi
+{
+ // TODO: Separate the functions and the structs/enums. Many of the structs/enums should remain public
+ // (since they're reused in the OOP interfaces) -- the rest (including all P/Invoke function mappings)
+ // should become internal.
+
+ // All structures which native methods rely on should be kept in the Wlan class.
+ // Only change the layout of those structures if it matches the native API documentation.
+ // Some structures might have helper properties but adding or changing fields is prohibited.
+ // This class is not documented since all the documentation resides in the MSDN. The code
+ // documentation only covers details which concern interop users.
+ // Some identifier names were modified to correspond to .NET naming conventions
+ // but otherwise retain their native meaning.
+
+ /// <summary>
+ /// Defines the Native Wifi API through P/Invoke interop.
+ /// </summary>
+ /// <remarks>
+ /// This class is intended for internal use. Use the <see cref="WlanCliient"/> class instead.
+ /// </remarks>
+ public static class Wlan
+ {
+ #region P/Invoke API
+ /// <summary>
+ /// Defines various opcodes used to set and query parameters for an interface.
+ /// </summary>
+ /// <remarks>
+ /// Corresponds to the native <c>WLAN_INTF_OPCODE</c> type.
+ /// </remarks>
+ public enum WlanIntfOpcode
+ {
+ /// <summary>
+ /// Opcode used to set or query whether auto config is enabled.
+ /// </summary>
+ AutoconfEnabled = 1,
+ /// <summary>
+ /// Opcode used to set or query whether background scan is enabled.
+ /// </summary>
+ BackgroundScanEnabled,
+ /// <summary>
+ /// Opcode used to set or query the media streaming mode of the driver.
+ /// </summary>
+ MediaStreamingMode,
+ /// <summary>
+ /// Opcode used to set or query the radio state.
+ /// </summary>
+ RadioState,
+ /// <summary>
+ /// Opcode used to set or query the BSS type of the interface.
+ /// </summary>
+ BssType,
+ /// <summary>
+ /// Opcode used to query the state of the interface.
+ /// </summary>
+ InterfaceState,
+ /// <summary>
+ /// Opcode used to query information about the current connection of the interface.
+ /// </summary>
+ CurrentConnection,
+ /// <summary>
+ /// Opcose used to query the current channel on which the wireless interface is operating.
+ /// </summary>
+ ChannelNumber,
+ /// <summary>
+ /// Opcode used to query the supported auth/cipher pairs for infrastructure mode.
+ /// </summary>
+ SupportedInfrastructureAuthCipherPairs,
+ /// <summary>
+ /// Opcode used to query the supported auth/cipher pairs for ad hoc mode.
+ /// </summary>
+ SupportedAdhocAuthCipherPairs,
+ /// <summary>
+ /// Opcode used to query the list of supported country or region strings.
+ /// </summary>
+ SupportedCountryOrRegionStringList,
+ /// <summary>
+ /// Opcode used to set or query the current operation mode of the wireless interface.
+ /// </summary>
+ CurrentOperationMode,
+ /// <summary>
+ /// Opcode used to query driver statistics.
+ /// </summary>
+ Statistics = 0x10000101,
+ /// <summary>
+ /// Opcode used to query the received signal strength.
+ /// </summary>
+ RSSI,
+ SecurityStart = 0x20010000,
+ SecurityEnd = 0x2fffffff,
+ IhvStart = 0x30000000,
+ IhvEnd = 0x3fffffff
+ }
+
+ /// <summary>
+ /// Specifies the origin of automatic configuration (auto config) settings.
+ /// </summary>
+ /// <remarks>
+ /// Corresponds to the native <c>WLAN_OPCODE_VALUE_TYPE</c> type.
+ /// </remarks>
+ public enum WlanOpcodeValueType
+ {
+ /// <summary>
+ /// The auto config settings were queried, but the origin of the settings was not determined.
+ /// </summary>
+ QueryOnly = 0,
+ /// <summary>
+ /// The auto config settings were set by group policy.
+ /// </summary>
+ SetByGroupPolicy = 1,
+ /// <summary>
+ /// The auto config settings were set by the user.
+ /// </summary>
+ SetByUser = 2,
+ /// <summary>
+ /// The auto config settings are invalid.
+ /// </summary>
+ Invalid = 3
+ }
+
+ public const uint WLAN_CLIENT_VERSION_XP_SP2 = 1;
+ public const uint WLAN_CLIENT_VERSION_LONGHORN = 2;
+
+ [DllImport("wlanapi.dll")]
+ public static extern int WlanOpenHandle(
+ [In] UInt32 clientVersion,
+ [In, Out] IntPtr pReserved,
+ [Out] out UInt32 negotiatedVersion,
+ [Out] out IntPtr clientHandle);
+
+ [DllImport("wlanapi.dll")]
+ public static extern int WlanCloseHandle(
+ [In] IntPtr clientHandle,
+ [In, Out] IntPtr pReserved);
+
+ [DllImport("wlanapi.dll")]
+ public static extern int WlanEnumInterfaces(
+ [In] IntPtr clientHandle,
+ [In, Out] IntPtr pReserved,
+ [Out] out IntPtr ppInterfaceList);
+
+ [DllImport("wlanapi.dll")]
+ public static extern int WlanQueryInterface(
+ [In] IntPtr clientHandle,
+ [In, MarshalAs(UnmanagedType.LPStruct)] Guid interfaceGuid,
+ [In] WlanIntfOpcode opCode,
+ [In, Out] IntPtr pReserved,
+ [Out] out int dataSize,
+ [Out] out IntPtr ppData,
+ [Out] out WlanOpcodeValueType wlanOpcodeValueType);
+
+ [DllImport("wlanapi.dll")]
+ public static extern int WlanSetInterface(
+ [In] IntPtr clientHandle,
+ [In, MarshalAs(UnmanagedType.LPStruct)] Guid interfaceGuid,
+ [In] WlanIntfOpcode opCode,
+ [In] uint dataSize,
+ [In] IntPtr pData,
+ [In, Out] IntPtr pReserved);
+
+ /// <param name="pDot11Ssid">Not supported on Windows XP SP2: must be a <c>null</c> reference.</param>
+ /// <param name="pIeData">Not supported on Windows XP SP2: must be a <c>null</c> reference.</param>
+ [DllImport("wlanapi.dll")]
+ public static extern int WlanScan(
+ [In] IntPtr clientHandle,
+ [In, MarshalAs(UnmanagedType.LPStruct)] Guid interfaceGuid,
+ [In] IntPtr pDot11Ssid,
+ [In] IntPtr pIeData,
+ [In, Out] IntPtr pReserved);
+
+ /// <summary>
+ /// Defines flags passed to <see cref="WlanGetAvailableNetworkList"/>.
+ /// </summary>
+ [Flags]
+ public enum WlanGetAvailableNetworkFlags
+ {
+ /// <summary>
+ /// Include all ad-hoc network profiles in the available network list, including profiles that are not visible.
+ /// </summary>
+ IncludeAllAdhocProfiles = 0x00000001,
+ /// <summary>
+ /// Include all hidden network profiles in the available network list, including profiles that are not visible.
+ /// </summary>
+ IncludeAllManualHiddenProfiles = 0x00000002
+ }
+
+ /// <summary>
+ /// The header of an array of information about available networks.
+ /// </summary>
+ [StructLayout(LayoutKind.Sequential)]
+ internal struct WlanAvailableNetworkListHeader
+ {
+ /// <summary>
+ /// Contains the number of <see cref=""/> items following the header.
+ /// </summary>
+ public uint numberOfItems;
+ /// <summary>
+ /// The index of the current item. The index of the first item is 0.
+ /// </summary>
+ public uint index;
+ }
+
+ /// <summary>
+ /// Contains various flags for the network.
+ /// </summary>
+ [Flags]
+ public enum WlanAvailableNetworkFlags
+ {
+ /// <summary>
+ /// This network is currently connected.
+ /// </summary>
+ Connected = 0x00000001,
+ /// <summary>
+ /// There is a profile for this network.
+ /// </summary>
+ HasProfile = 0x00000002
+ }
+
+ /// <summary>
+ /// Contains information about an available wireless network.
+ /// </summary>
+ [StructLayout(LayoutKind.Sequential, CharSet=CharSet.Unicode)]
+ public struct WlanAvailableNetwork
+ {
+ /// <summary>
+ /// Contains the profile name associated with the network.
+ /// If the network doesn't have a profile, this member will be empty.
+ /// If multiple profiles are associated with the network, there will be multiple entries with the same SSID in the visible network list. Profile names are case-sensitive.
+ /// </summary>
+ [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
+ public string profileName;
+ /// <summary>
+ /// Contains the SSID of the visible wireless network.
+ /// </summary>
+ public Dot11Ssid dot11Ssid;
+ /// <summary>
+ /// Specifies whether the network is infrastructure or ad hoc.
+ /// </summary>
+ public Dot11BssType dot11BssType;
+ /// <summary>
+ /// Indicates the number of BSSIDs in the network.
+ /// </summary>
+ public uint numberOfBssids;
+ /// <summary>
+ /// Indicates whether the network is connectable or not.
+ /// </summary>
+ public bool networkConnectable;
+ /// <summary>
+ /// Indicates why a network cannot be connected to. This member is only valid when <see cref="networkConnectable"/> is <c>false</c>.
+ /// </summary>
+ public WlanReasonCode wlanNotConnectableReason;
+ /// <summary>
+ /// The number of PHY types supported on available networks.
+ /// The maximum value of this field is 8. If more than 8 PHY types are supported, <see cref="morePhyTypes"/> must be set to <c>true</c>.
+ /// </summary>
+ private uint numberOfPhyTypes;
+ /// <summary>
+ /// Contains an array of <see cref="Dot11PhyType"/> values that represent the PHY types supported by the available networks.
+ /// When <see cref="numberOfPhyTypes"/> is greater than 8, this array contains only the first 8 PHY types.
+ /// </summary>
+ [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+ private Dot11PhyType[] dot11PhyTypes;
+ /// <summary>
+ /// Gets the <see cref="Dot11PhyType"/> values that represent the PHY types supported by the available networks.
+ /// </summary>
+ public Dot11PhyType[] Dot11PhyTypes
+ {
+ get
+ {
+ Dot11PhyType[] ret = new Dot11PhyType[numberOfPhyTypes];
+ Array.Copy(dot11PhyTypes, ret, numberOfPhyTypes);
+ return ret;
+ }
+ }
+ /// <summary>
+ /// Specifies if there are more than 8 PHY types supported.
+ /// When this member is set to <c>true</c>, an application must call <see cref="WlanClient.WlanInterface.GetNetworkBssList"/> to get the complete list of PHY types.
+ /// <see cref="WlanBssEntry.phyId"/> contains the PHY type for an entry.
+ /// </summary>
+ public bool morePhyTypes;
+ /// <summary>
+ /// A percentage value that represents the signal quality of the network.
+ /// This field contains a value between 0 and 100.
+ /// A value of 0 implies an actual RSSI signal strength of -100 dbm.
+ /// A value of 100 implies an actual RSSI signal strength of -50 dbm.
+ /// You can calculate the RSSI signal strength value for values between 1 and 99 using linear interpolation.
+ /// </summary>
+ public uint wlanSignalQuality;
+ /// <summary>
+ /// Indicates whether security is enabled on the network.
+ /// </summary>
+ public bool securityEnabled;
+ /// <summary>
+ /// Indicates the default authentication algorithm used to join this network for the first time.
+ /// </summary>
+ public Dot11AuthAlgorithm dot11DefaultAuthAlgorithm;
+ /// <summary>
+ /// Indicates the default cipher algorithm to be used when joining this network.
+ /// </summary>
+ public Dot11CipherAlgorithm dot11DefaultCipherAlgorithm;
+ /// <summary>
+ /// Contains various flags for the network.
+ /// </summary>
+ public WlanAvailableNetworkFlags flags;
+ /// <summary>
+ /// Reserved for future use. Must be set to NULL.
+ /// </summary>
+ uint reserved;
+ }
+
+ [DllImport("wlanapi.dll")]
+ public static extern int WlanGetAvailableNetworkList(
+ [In] IntPtr clientHandle,
+ [In, MarshalAs(UnmanagedType.LPStruct)] Guid interfaceGuid,
+ [In] WlanGetAvailableNetworkFlags flags,
+ [In, Out] IntPtr reservedPtr,
+ [Out] out IntPtr availableNetworkListPtr);
+
+ [Flags]
+ public enum WlanProfileFlags
+ {
+ /// <remarks>
+ /// The only option available on Windows XP SP2.
+ /// </remarks>
+ AllUser = 0,
+ GroupPolicy = 1,
+ User = 2
+ }
+
+ [DllImport("wlanapi.dll")]
+ public static extern int WlanSetProfile(
+ [In] IntPtr clientHandle,
+ [In, MarshalAs(UnmanagedType.LPStruct)] Guid interfaceGuid,
+ [In] WlanProfileFlags flags,
+ [In, MarshalAs(UnmanagedType.LPWStr)] string profileXml,
+ [In, Optional, MarshalAs(UnmanagedType.LPWStr)] string allUserProfileSecurity,
+ [In] bool overwrite,
+ [In] IntPtr pReserved,
+ [Out] out WlanReasonCode reasonCode);
+
+ /// <summary>
+ /// Defines the access mask of an all-user profile.
+ /// </summary>
+ [Flags]
+ public enum WlanAccess
+ {
+ /// <summary>
+ /// The user can view profile permissions.
+ /// </summary>
+ ReadAccess = 0x00020000 | 0x0001,
+ /// <summary>
+ /// The user has read access, and the user can also connect to and disconnect from a network using the profile.
+ /// </summary>
+ ExecuteAccess = ReadAccess | 0x0020,
+ /// <summary>
+ /// The user has execute access and the user can also modify and delete permissions associated with a profile.
+ /// </summary>
+ WriteAccess = ReadAccess | ExecuteAccess | 0x0002 | 0x00010000 | 0x00040000
+ }
+
+ /// <param name="flags">Not supported on Windows XP SP2: must be a <c>null</c> reference.</param>
+ [DllImport("wlanapi.dll")]
+ public static extern int WlanGetProfile(
+ [In] IntPtr clientHandle,
+ [In, MarshalAs(UnmanagedType.LPStruct)] Guid interfaceGuid,
+ [In, MarshalAs(UnmanagedType.LPWStr)] string profileName,
+ [In] IntPtr pReserved,
+ [Out] out IntPtr profileXml,
+ [Out, Optional] out WlanProfileFlags flags,
+ [Out, Optional] out WlanAccess grantedAccess);
+
+ [DllImport("wlanapi.dll")]
+ public static extern int WlanGetProfileList(
+ [In] IntPtr clientHandle,
+ [In, MarshalAs(UnmanagedType.LPStruct)] Guid interfaceGuid,
+ [In] IntPtr pReserved,
+ [Out] out IntPtr profileList
+ );
+
+ [DllImport("wlanapi.dll")]
+ public static extern void WlanFreeMemory(IntPtr pMemory);
+
+ [DllImport("wlanapi.dll")]
+ public static extern int WlanReasonCodeToString(
+ [In] WlanReasonCode reasonCode,
+ [In] int bufferSize,
+ [In, Out] StringBuilder stringBuffer,
+ IntPtr pReserved
+ );
+
+ /// <summary>
+ /// Specifies where the notification comes from.
+ /// </summary>
+ [Flags]
+ public enum WlanNotificationSource
+ {
+ None = 0,
+ /// <summary>
+ /// All notifications, including those generated by the 802.1X module.
+ /// </summary>
+ All = 0X0000FFFF,
+ /// <summary>
+ /// Notifications generated by the auto configuration module.
+ /// </summary>
+ ACM = 0X00000008,
+ /// <summary>
+ /// Notifications generated by MSM.
+ /// </summary>
+ MSM = 0X00000010,
+ /// <summary>
+ /// Notifications generated by the security module.
+ /// </summary>
+ Security = 0X00000020,
+ /// <summary>
+ /// Notifications generated by independent hardware vendors (IHV).
+ /// </summary>
+ IHV = 0X00000040
+ }
+
+ /// <summary>
+ /// Indicates the type of an ACM (<see cref="WlanNotificationSource.ACM"/>) notification.
+ /// </summary>
+ /// <remarks>
+ /// The enumeration identifiers correspond to the native <c>wlan_notification_acm_</c> identifiers.
+ /// On Windows XP SP2, only the <c>ConnectionComplete</c> and <c>Disconnected</c> notifications are available.
+ /// </remarks>
+ public enum WlanNotificationCodeAcm
+ {
+ AutoconfEnabled = 1,
+ AutoconfDisabled,
+ BackgroundScanEnabled,
+ BackgroundScanDisabled,
+ BssTypeChange,
+ PowerSettingChange,
+ ScanComplete,
+ ScanFail,
+ ConnectionStart,
+ ConnectionComplete,
+ ConnectionAttemptFail,
+ FilterListChange,
+ InterfaceArrival,
+ InterfaceRemoval,
+ ProfileChange,
+ ProfileNameChange,
+ ProfilesExhausted,
+ NetworkNotAvailable,
+ NetworkAvailable,
+ Disconnecting,
+ Disconnected,
+ AdhocNetworkStateChange
+ }
+
+ /// <summary>
+ /// Indicates the type of an MSM (<see cref="WlanNotificationSource.MSM"/>) notification.
+ /// </summary>
+ /// <remarks>
+ /// The enumeration identifiers correspond to the native <c>wlan_notification_msm_</c> identifiers.
+ /// </remarks>
+ public enum WlanNotificationCodeMsm
+ {
+ Associating = 1,
+ Associated,
+ Authenticating,
+ Connected,
+ RoamingStart,
+ RoamingEnd,
+ RadioStateChange,
+ SignalQualityChange,
+ Disassociating,
+ Disconnected,
+ PeerJoin,
+ PeerLeave,
+ AdapterRemoval,
+ AdapterOperationModeChange
+ }
+
+ /// <summary>
+ /// Contains information provided when registering for notifications.
+ /// </summary>
+ /// <remarks>
+ /// Corresponds to the native <c>WLAN_NOTIFICATION_DATA</c> type.
+ /// </remarks>
+ [StructLayout(LayoutKind.Sequential)]
+ public struct WlanNotificationData
+ {
+ /// <summary>
+ /// Specifies where the notification comes from.
+ /// </summary>
+ /// <remarks>
+ /// On Windows XP SP2, this field must be set to <see cref="WlanNotificationSource.None"/>, <see cref="WlanNotificationSource.All"/> or <see cref="WlanNotificationSource.ACM"/>.
+ /// </remarks>
+ public WlanNotificationSource notificationSource;
+ /// <summary>
+ /// Indicates the type of notification. The value of this field indicates what type of associated data will be present in <see cref="dataPtr"/>.
+ /// </summary>
+ public int notificationCode;
+ /// <summary>
+ /// Indicates which interface the notification is for.
+ /// </summary>
+ public Guid interfaceGuid;
+ /// <summary>
+ /// Specifies the size of <see cref="dataPtr"/>, in bytes.
+ /// </summary>
+ public int dataSize;
+ /// <summary>
+ /// Pointer to additional data needed for the notification, as indicated by <see cref="notificationCode"/>.
+ /// </summary>
+ public IntPtr dataPtr;
+
+ /// <summary>
+ /// Gets the notification code (in the correct enumeration type) according to the notification source.
+ /// </summary>
+ public object NotificationCode
+ {
+ get
+ {
+ if (notificationSource == WlanNotificationSource.MSM)
+ return (WlanNotificationCodeMsm)notificationCode;
+ else if (notificationSource == WlanNotificationSource.ACM)
+ return (WlanNotificationCodeAcm)notificationCode;
+ else
+ return notificationCode;
+ }
+
+ }
+ }
+
+ /// <summary>
+ /// Defines the callback function which accepts WLAN notifications.
+ /// </summary>
+ public delegate void WlanNotificationCallbackDelegate(ref WlanNotificationData notificationData, IntPtr context);
+
+ [DllImport("wlanapi.dll")]
+ public static extern int WlanRegisterNotification(
+ [In] IntPtr clientHandle,
+ [In] WlanNotificationSource notifSource,
+ [In] bool ignoreDuplicate,
+ [In] WlanNotificationCallbackDelegate funcCallback,
+ [In] IntPtr callbackContext,
+ [In] IntPtr reserved,
+ [Out] out WlanNotificationSource prevNotifSource);
+
+ /// <summary>
+ /// Defines connection parameter flags.
+ /// </summary>
+ [Flags]
+ public enum WlanConnectionFlags
+ {
+ /// <summary>
+ /// Connect to the destination network even if the destination is a hidden network. A hidden network does not broadcast its SSID. Do not use this flag if the destination network is an ad-hoc network.
+ /// <para>If the profile specified by <see cref="WlanConnect...
[truncated message content] |
|
From: <rs...@us...> - 2011-11-04 14:51:37
|
Revision: 4324
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4324&view=rev
Author: rsenden
Date: 2011-11-04 14:51:31 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------
Updated for MP 1.2.x compatibility
Modified Paths:
--------------
trunk/plugins/SPressoDisplayPlugin/MPE/SPressoDisplayPlugin.mpe1
trunk/plugins/SPressoDisplayPlugin/MPE/update.xml
Modified: trunk/plugins/SPressoDisplayPlugin/MPE/SPressoDisplayPlugin.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/SPressoDisplayPlugin/MPE/update.xml
===================================================================
--- trunk/plugins/SPressoDisplayPlugin/MPE/update.xml 2011-11-04 14:48:05 UTC (rev 4323)
+++ trunk/plugins/SPressoDisplayPlugin/MPE/update.xml 2011-11-04 14:51:31 UTC (rev 4324)
@@ -21,6 +21,9 @@
<Dependencies>
<Items />
</Dependencies>
+ <PluginDependencies>
+ <Items />
+ </PluginDependencies>
<GeneralInfo>
<Name>SPressoDisplayPlugin</Name>
<Id>02fa2bda-53fe-4920-9e5a-72719fac7eee</Id>
@@ -35,11 +38,11 @@
<Revision>0</Revision>
</Version>
<ExtensionDescription>This extension allows MediaPortal to update the front panel display on an Asus S-Presso barebone, and to react to front panel button presses.</ExtensionDescription>
- <VersionDescription>Version 2.1 includes the following changes:
+ <VersionDescription>Version 2.1 includes the following changes:
-- Removed support for MediaPortal built-in TV Client (not supported anymore by MediaPortal 1.1.0)
-- AControl2 no longer shows date/time (may fix some interoperability issues between AControl2 and MediaPortal plugin)
-- Created MediaPortal Extension Installer package
+- Removed support for MediaPortal built-in TV Client (not supported anymore by MediaPortal 1.1.0)
+- AControl2 no longer shows date/time (may fix some interoperability issues between AControl2 and MediaPortal plugin)
+- Created MediaPortal Extension Installer package
- Various smaller updates</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/SPressoDisplayPlugin/MPE/SPressoDisplayPlugin.mpe1</OnlineLocation>
@@ -84,6 +87,119 @@
<ProjectSettings>
<FolderGroups />
</ProjectSettings>
+ <IsSkin>false</IsSkin>
</PackageClass>
+ <PackageClass>
+ <Version>2.0</Version>
+ <Groups>
+ <Items>
+ <GroupItem Name="Default">
+ <DisplayName>Default</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Default</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items />
+ </Sections>
+ <Dependencies>
+ <Items>
+ <DependencyItem>
+ <Type>MediaPortal</Type>
+ <Id />
+ <MinVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MinVersion>
+ <MaxVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MaxVersion>
+ <WarnOnly>false</WarnOnly>
+ <Message>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ </Items>
+ </Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="SPressoDisplayPlugin.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.1.6.27644</MinRequiredVersion>
+ <DesignedForVersion>1.1.6.27644</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items />
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
+ <GeneralInfo>
+ <Name>SPressoDisplayPlugin</Name>
+ <Id>02fa2bda-53fe-4920-9e5a-72719fac7eee</Id>
+ <Author>Ruud Senden</Author>
+ <HomePage />
+ <ForumPage>http://forum.team-mediaportal.com/showthread.php?p=72281</ForumPage>
+ <UpdateUrl>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/SPressoDisplayPlugin/MPE/update.xml</UpdateUrl>
+ <Version>
+ <Major>2</Major>
+ <Minor>2</Minor>
+ <Build>0</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>This extension allows MediaPortal to update the front panel display on an Asus S-Presso barebone, and to react to front panel button presses.</ExtensionDescription>
+ <VersionDescription>Updated for MediaPortal 1.2.x</VersionDescription>
+ <DevelopmentStatus>Stable</DevelopmentStatus>
+ <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/SPressoDisplayPlugin/MPE/SPressoDisplayPlugin.mpe1</OnlineLocation>
+ <ReleaseDate>2010-07-29T13:02:35.9879365+02:00</ReleaseDate>
+ <Tags>s-presso afpd display</Tags>
+ <Location>D:\Development\MediaPortal\Plugins\SPressoDisplayPlugin\MPE\SPressoDisplayPlugin.mpe1</Location>
+ <Params>
+ <Items>
+ <SectionParam Name="Online Icon">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Configuration file">
+ <Value />
+ <ValueType>Template</ValueType>
+ <Description>The file used to configure the extension.
+ If have .exe extension the will be executed
+ If have .dll extension used like MP plugin configuration</Description>
+ </SectionParam>
+ <SectionParam Name="Online Screenshots">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>Online stored screenshot urls separated by ; </Description>
+ </SectionParam>
+ <SectionParam Name="Force to uninstall on update">
+ <Value>yes</Value>
+ <ValueType>Bool</ValueType>
+ <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ </GeneralInfo>
+ <UniqueFileList>
+ <Items />
+ </UniqueFileList>
+ <ProjectSettings>
+ <FolderGroups />
+ </ProjectSettings>
+ <IsSkin>false</IsSkin>
+ </PackageClass>
</Items>
</ExtensionCollection>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rs...@us...> - 2011-11-04 14:48:12
|
Revision: 4323
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4323&view=rev
Author: rsenden
Date: 2011-11-04 14:48:05 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------
Updated for MP 1.2.x compatibility
Modified Paths:
--------------
trunk/plugins/SPressoDisplayPlugin/MPE/SPressoDisplayPlugin.mpe1
trunk/plugins/SPressoDisplayPlugin/MPE/SPressoDisplayPlugin.xmp2
trunk/plugins/SPressoDisplayPlugin/README.HTML
trunk/plugins/SPressoDisplayPlugin/Release/plugins/process/AControl2.exe
trunk/plugins/SPressoDisplayPlugin/Release/plugins/process/SPressoDisplayPlugin.dll
trunk/plugins/SPressoDisplayPlugin/Release/test/SPressoTest.exe
trunk/plugins/SPressoDisplayPlugin/Source/AControl2/obj/Release/AControl2.exe
trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/Properties/AssemblyInfo.cs
trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/SPressoDisplayPlugin.csproj
trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/SPressoDisplayPlugin.csproj.user
trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/Settings.cs
trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/obj/Release/SPressoDisplayPlugin.csproj.GenerateResource.Cache
trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/obj/Release/SPressoDisplayPlugin.dll
trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin.suo
trunk/plugins/SPressoDisplayPlugin/Source/SPressoTest/obj/Release/SPressoTest.exe
Modified: trunk/plugins/SPressoDisplayPlugin/MPE/SPressoDisplayPlugin.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/SPressoDisplayPlugin/MPE/SPressoDisplayPlugin.xmp2
===================================================================
--- trunk/plugins/SPressoDisplayPlugin/MPE/SPressoDisplayPlugin.xmp2 2011-11-04 14:04:43 UTC (rev 4322)
+++ trunk/plugins/SPressoDisplayPlugin/MPE/SPressoDisplayPlugin.xmp2 2011-11-04 14:48:05 UTC (rev 4323)
@@ -4,6 +4,7 @@
<Groups>
<Items>
<GroupItem Name="Default">
+ <ParentGroup />
<DisplayName>Default</DisplayName>
<DefaulChecked>true</DefaulChecked>
<Description>Default</Description>
@@ -23,12 +24,12 @@
<ZipFileName>Installer{CopyFile}\{725a57da-2ead-4fe5-b720-599c7ad0802a}-SPressoDisplayPlugin.dll</ZipFileName>
<DestinationFilename>%Plugins%\process\SPressoDisplayPlugin.dll</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Release\InputDeviceMappings\defaults\SPressoAFPD.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{333717a9-871f-491e-a8ec-797e9f44208d}-SPressoAFPD.xml</ZipFileName>
- <DestinationFilename>%CustomInputDefault%\SPressoAFPD.xml</DestinationFilename>
+ <DestinationFilename>%Base%\defaults\InputDeviceMappings\SPressoAFPD.xml</DestinationFilename>
</FileItem>
</Items>
</Files>
@@ -261,8 +262,45 @@
</Items>
</Sections>
<Dependencies>
- <Items />
+ <Items>
+ <DependencyItem>
+ <Type>MediaPortal</Type>
+ <Id />
+ <MinVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MinVersion>
+ <MaxVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MaxVersion>
+ <WarnOnly>false</WarnOnly>
+ <Message>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ </Items>
</Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="SPressoDisplayPlugin.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.1.6.27644</MinRequiredVersion>
+ <DesignedForVersion>1.1.6.27644</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items />
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
<GeneralInfo>
<Name>SPressoDisplayPlugin</Name>
<Id>02fa2bda-53fe-4920-9e5a-72719fac7eee</Id>
@@ -272,17 +310,12 @@
<UpdateUrl>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/SPressoDisplayPlugin/MPE/update.xml</UpdateUrl>
<Version>
<Major>2</Major>
- <Minor>1</Minor>
+ <Minor>2</Minor>
<Build>0</Build>
<Revision>0</Revision>
</Version>
<ExtensionDescription>This extension allows MediaPortal to update the front panel display on an Asus S-Presso barebone, and to react to front panel button presses.</ExtensionDescription>
- <VersionDescription>Version 2.1 includes the following changes:
-
-- Removed support for MediaPortal built-in TV Client (not supported anymore by MediaPortal 1.1.0)
-- AControl2 no longer shows date/time (may fix some interoperability issues between AControl2 and MediaPortal plugin)
-- Created MediaPortal Extension Installer package
-- Various smaller updates</VersionDescription>
+ <VersionDescription>Updated for MediaPortal 1.2.x</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/SPressoDisplayPlugin/MPE/SPressoDisplayPlugin.mpe1</OnlineLocation>
<ReleaseDate>2010-07-29T13:02:35.9879365+02:00</ReleaseDate>
@@ -336,41 +369,21 @@
<ZipFileName>Installer{CopyFile}\{725a57da-2ead-4fe5-b720-599c7ad0802a}-SPressoDisplayPlugin.dll</ZipFileName>
<DestinationFilename>%Plugins%\process\SPressoDisplayPlugin.dll</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Release\InputDeviceMappings\defaults\SPressoAFPD.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{333717a9-871f-491e-a8ec-797e9f44208d}-SPressoAFPD.xml</ZipFileName>
- <DestinationFilename>%CustomInputDefault%\SPressoAFPD.xml</DestinationFilename>
+ <DestinationFilename>%Base%\defaults\InputDeviceMappings\SPressoAFPD.xml</DestinationFilename>
</FileItem>
</Items>
</UniqueFileList>
<ProjectSettings>
- <FolderGroups>
- <FolderGroup InstallType="CopyFile" SystemFile="false" Modified="true">
- <Param1 />
- <UpdateOption>OverwriteIfOlder</UpdateOption>
- <LocalFileName />
- <ZipFileName>Installer{CopyFile}\{8451714b-ac23-455d-a9c6-d07f57dbf6f9}-</ZipFileName>
- <DestinationFilename>%Plugins%\process</DestinationFilename>
- <Folder>..\Release\plugins\process</Folder>
- <Group>Default</Group>
- <Recursive>false</Recursive>
- </FolderGroup>
- <FolderGroup InstallType="CopyFile" SystemFile="false" Modified="true">
- <Param1 />
- <UpdateOption>OverwriteIfOlder</UpdateOption>
- <LocalFileName />
- <ZipFileName>Installer{CopyFile}\{338600a4-a888-4338-b765-ed47fb0848b4}-</ZipFileName>
- <DestinationFilename>%CustomInputDefault%</DestinationFilename>
- <Folder>..\Release\InputDeviceMappings\defaults</Folder>
- <Group>Default</Group>
- <Recursive>false</Recursive>
- </FolderGroup>
- </FolderGroups>
- <ProjectFilename>D:\Development\MediaPortal\Plugins\SPressoDisplayPlugin\MPE\SPressoDisplayPlugin.xmp2</ProjectFilename>
- <UpdatePath1 />
+ <FolderGroups />
+ <ProjectFilename>SPressoDisplayPlugin.xmp2</ProjectFilename>
+ <UpdatePath1>D:\Development\MediaPortal\Plugins\KeyboardInputPlugin\MPE\update.xml</UpdatePath1>
<UpdatePath2 />
<UpdatePath3 />
</ProjectSettings>
+ <IsSkin>false</IsSkin>
</PackageClass>
\ No newline at end of file
Modified: trunk/plugins/SPressoDisplayPlugin/README.HTML
===================================================================
--- trunk/plugins/SPressoDisplayPlugin/README.HTML 2011-11-04 14:04:43 UTC (rev 4322)
+++ trunk/plugins/SPressoDisplayPlugin/README.HTML 2011-11-04 14:48:05 UTC (rev 4323)
@@ -26,8 +26,6 @@
<link rel=colorSchemeMapping href="README_files/colorschememapping.xml">
<!--[if gte mso 9]><xml>
<w:WordDocument>
- <w:SpellingState>Clean</w:SpellingState>
- <w:GrammarState>Clean</w:GrammarState>
<w:TrackMoves>false</w:TrackMoves>
<w:TrackFormatting/>
<w:HyphenationZone>21</w:HyphenationZone>
@@ -234,12 +232,11 @@
mso-font-signature:0 0 0 0 0 0;}
@font-face
{font-family:Consolas;
- panose-1:0 0 0 0 0 0 0 0 0 0;
+ panose-1:2 11 6 9 2 2 4 3 2 4;
mso-font-charset:0;
- mso-generic-font-family:roman;
- mso-font-format:other;
- mso-font-pitch:auto;
- mso-font-signature:0 0 0 0 0 0;}
+ mso-generic-font-family:modern;
+ mso-font-pitch:fixed;
+ mso-font-signature:-520092929 1073806591 9 0 415 0;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{mso-style-unhide:no;
@@ -265,7 +262,7 @@
mso-outline-level:1;
font-size:16.0pt;
font-family:"Arial","sans-serif";
- mso-fareast-font-family:SimSun;
+ mso-fareast-font-family:"Times New Roman";
mso-fareast-theme-font:minor-fareast;
mso-font-kerning:16.0pt;}
h2
@@ -282,7 +279,7 @@
mso-outline-level:2;
font-size:14.0pt;
font-family:"Arial","sans-serif";
- mso-fareast-font-family:SimSun;
+ mso-fareast-font-family:"Times New Roman";
mso-fareast-theme-font:minor-fareast;
font-style:italic;}
a:link, span.MsoHyperlink
@@ -314,7 +311,7 @@
font-family:"Cambria","serif";
mso-ascii-font-family:Cambria;
mso-ascii-theme-font:major-latin;
- mso-fareast-font-family:SimSun;
+ mso-fareast-font-family:"Times New Roman";
mso-fareast-theme-font:major-fareast;
mso-hansi-font-family:Cambria;
mso-hansi-theme-font:major-latin;
@@ -334,7 +331,7 @@
font-family:"Cambria","serif";
mso-ascii-font-family:Cambria;
mso-ascii-theme-font:major-latin;
- mso-fareast-font-family:SimSun;
+ mso-fareast-font-family:"Times New Roman";
mso-fareast-theme-font:major-fareast;
mso-hansi-font-family:Cambria;
mso-hansi-theme-font:major-latin;
@@ -350,15 +347,10 @@
mso-style-link:"Plain Text";
mso-ansi-font-size:10.5pt;
mso-bidi-font-size:10.5pt;
- font-family:"Consolas","serif";
+ font-family:Consolas;
mso-ascii-font-family:Consolas;
- mso-hansi-font-family:Consolas;}
-span.SpellE
- {mso-style-name:"";
- mso-spl-e:yes;}
-span.GramE
- {mso-style-name:"";
- mso-gram-e:yes;}
+ mso-hansi-font-family:Consolas;
+ mso-bidi-font-family:Consolas;}
.MsoChpDefault
{mso-style-type:export-only;
mso-default-props:yes;
@@ -375,8 +367,16 @@
{page:WordSection1;}
/* List Definitions */
@list l0
- {mso-list-id:6635120;
- mso-list-template-ids:75410220;}
+ {mso-list-id:573395997;
+ mso-list-template-ids:861022582;}
+@list l0:level1
+ {mso-level-number-format:bullet;
+ mso-level-text:\F0B7;
+ mso-level-tab-stop:36.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;
+ mso-ansi-font-size:10.0pt;
+ font-family:Symbol;}
@list l1
{mso-list-id:894004367;
mso-list-type:hybrid;
@@ -418,113 +418,105 @@
mso-level-number-position:left;
text-indent:-18.0pt;}
@list l2
+ {mso-list-id:1272275385;
+ mso-list-template-ids:-2072723930;}
+@list l2:level1
+ {mso-level-number-format:bullet;
+ mso-level-text:\F0B7;
+ mso-level-tab-stop:36.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;
+ mso-ansi-font-size:10.0pt;
+ font-family:Symbol;}
+@list l3
+ {mso-list-id:1275290077;
+ mso-list-template-ids:866950128;}
+@list l4
{mso-list-id:1852068051;
mso-list-type:hybrid;
mso-list-template-ids:183894846 67698689 67698691 67698693 67698689 67698691 67698693 67698689 67698691 67698693;}
-@list l2:level1
+@list l4:level1
{mso-level-number-format:bullet;
mso-level-text:\F0B7;
mso-level-tab-stop:36.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
font-family:Symbol;}
-@list l2:level2
+@list l4:level2
{mso-level-tab-stop:72.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;}
-@list l2:level3
+@list l4:level3
{mso-level-tab-stop:108.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;}
-@list l2:level4
+@list l4:level4
{mso-level-tab-stop:144.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;}
-@list l2:level5
+@list l4:level5
{mso-level-tab-stop:180.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;}
-@list l2:level6
+@list l4:level6
{mso-level-tab-stop:216.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;}
-@list l2:level7
+@list l4:level7
{mso-level-tab-stop:252.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;}
-@list l2:level8
+@list l4:level8
{mso-level-tab-stop:288.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;}
-@list l2:level9
+@list l4:level9
{mso-level-tab-stop:324.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;}
-@list l3
- {mso-list-id:1852261567;
- mso-list-template-ids:113511196;}
-@list l3:level1
- {mso-level-number-format:bullet;
- mso-level-text:\F0B7;
- mso-level-tab-stop:36.0pt;
- mso-level-number-position:left;
- text-indent:-18.0pt;
- mso-ansi-font-size:10.0pt;
- font-family:Symbol;}
-@list l4
+@list l5
{mso-list-id:1933656922;
mso-list-type:hybrid;
mso-list-template-ids:1039941474 68354049 68354051 68354053 68354049 68354051 68354053 68354049 68354051 68354053;}
-@list l4:level1
+@list l5:level1
{mso-level-number-format:bullet;
mso-level-text:\F0B7;
mso-level-tab-stop:36.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
font-family:Symbol;}
-@list l4:level2
+@list l5:level2
{mso-level-tab-stop:72.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;}
-@list l4:level3
+@list l5:level3
{mso-level-tab-stop:108.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;}
-@list l4:level4
+@list l5:level4
{mso-level-tab-stop:144.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;}
-@list l4:level5
+@list l5:level5
{mso-level-tab-stop:180.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;}
-@list l4:level6
+@list l5:level6
{mso-level-tab-stop:216.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;}
-@list l4:level7
+@list l5:level7
{mso-level-tab-stop:252.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;}
-@list l4:level8
+@list l5:level8
{mso-level-tab-stop:288.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;}
-@list l4:level9
+@list l5:level9
{mso-level-tab-stop:324.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;}
-@list l5
- {mso-list-id:1956399818;
- mso-list-template-ids:-1303510286;}
-@list l5:level1
- {mso-level-number-format:bullet;
- mso-level-text:\F0B7;
- mso-level-tab-stop:36.0pt;
- mso-level-number-position:left;
- text-indent:-18.0pt;
- mso-ansi-font-size:10.0pt;
- font-family:Symbol;}
ol
{margin-bottom:0cm;}
ul
@@ -550,7 +542,7 @@
font-family:"Times New Roman","serif";}
</style>
<![endif]--><!--[if gte mso 9]><xml>
- <o:shapedefaults v:ext="edit" spidmax="2050"/>
+ <o:shapedefaults v:ext="edit" spidmax="3074"/>
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1"/>
@@ -568,15 +560,15 @@
mso-ansi-language:EN-GB'>License & Disclaimer<o:p></o:p></span></h2>
<p class=MsoNormal><span lang=EN-GB style='mso-ansi-language:EN-GB'>Copyright
-(C) 2006-2008 <span class=SpellE>Ruud</span> <span class=SpellE>Senden</span><o:p></o:p></span></p>
+(C) 2006-2010 Ruud Senden<o:p></o:p></span></p>
<p class=MsoNormal><span lang=EN-GB style='mso-ansi-language:EN-GB'><span
style='mso-spacerun:yes'>\xA0</span><o:p></o:p></span></p>
<p class=MsoNormal><span lang=EN-GB style='mso-ansi-language:EN-GB'>This
Program is free software; you can redistribute it and/or modify it under the
-terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2, or (at your option) any later version.<o:p></o:p></span></p>
+terms of the GNU General Public License as published by the Free Software Foundation;
+either version 2, or (at your option) any later version.<o:p></o:p></span></p>
<p class=MsoNormal><span lang=EN-GB style='mso-ansi-language:EN-GB'><span
style='mso-spacerun:yes'>\xA0</span><o:p></o:p></span></p>
@@ -606,44 +598,38 @@
<h2><span lang=EN-GB style='mso-fareast-font-family:"Times New Roman";
mso-ansi-language:EN-GB'>Introduction<o:p></o:p></span></h2>
-<p class=MsoNormal><span lang=EN-GB style='mso-ansi-language:EN-GB'>This is a <span
-class=SpellE>MediaPortal</span> <span class=SpellE>Plugin</span> for supporting
-various features of the Asus S-<span class=SpellE>Presso</span> S1-P111 <span
-class=SpellE>barebone</span>. This includes the following functionality:<o:p></o:p></span></p>
+<p class=MsoNormal><span lang=EN-GB style='mso-ansi-language:EN-GB'>This is a
+MediaPortal Plugin for supporting various features of the Asus S-Presso S1-P111
+barebone. This includes the following functionality:<o:p></o:p></span></p>
<p class=MsoNormal><span lang=EN-GB style='mso-ansi-language:EN-GB'><o:p> </o:p></span></p>
<ul style='margin-top:0cm' type=disc>
- <li class=MsoNormal style='mso-list:l4 level1 lfo3;tab-stops:list 36.0pt'><span
+ <li class=MsoNormal style='mso-list:l5 level1 lfo3;tab-stops:list 36.0pt'><span
lang=EN-GB style='mso-ansi-language:EN-GB'>Light the various mode icons
- based on the currently playing media or the current screen in <span
- class=SpellE>MediaPortal</span>.<o:p></o:p></span></li>
- <li class=MsoNormal style='mso-list:l4 level1 lfo3;tab-stops:list 36.0pt'><span
+ based on the currently playing media or the current screen in MediaPortal.<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-list:l5 level1 lfo3;tab-stops:list 36.0pt'><span
lang=EN-GB style='mso-ansi-language:EN-GB'>Light the Play, Pause and
- Record icons depending on the status of the <span class=SpellE>MediaPortal</span>
- player.<o:p></o:p></span></li>
- <li class=MsoNormal style='mso-list:l4 level1 lfo3;tab-stops:list 36.0pt'><span
+ Record icons depending on the status of the MediaPortal player.<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-list:l5 level1 lfo3;tab-stops:list 36.0pt'><span
lang=EN-GB style='mso-ansi-language:EN-GB'>Display the current time when
- the <span class=SpellE>MediaPortal</span> player isn't playing.<o:p></o:p></span></li>
- <li class=MsoNormal style='mso-list:l4 level1 lfo3;tab-stops:list 36.0pt'><span
+ the MediaPortal player isn't playing.<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-list:l5 level1 lfo3;tab-stops:list 36.0pt'><span
lang=EN-GB style='mso-ansi-language:EN-GB'>Display the elapsed time then
- the <span class=SpellE>MediaPortal</span> player is playing.<o:p></o:p></span></li>
- <li class=MsoNormal style='mso-list:l4 level1 lfo3;tab-stops:list 36.0pt'><span
+ the MediaPortal player is playing.<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-list:l5 level1 lfo3;tab-stops:list 36.0pt'><span
lang=EN-GB style='mso-ansi-language:EN-GB'>Perform actions when the front
panel buttons are pressed.<o:p></o:p></span></li>
</ul>
<h2><span lang=EN-GB style='mso-fareast-font-family:"Times New Roman";
-mso-ansi-language:EN-GB'>Supported <span class=SpellE>MediaPortal</span>
-versions<o:p></o:p></span></h2>
+mso-ansi-language:EN-GB'>Supported MediaPortal versions<o:p></o:p></span></h2>
-<p class=MsoNormal><span lang=EN-GB style='mso-ansi-language:EN-GB'>This <span
-class=SpellE>plugin</span> has been compiled against the <span class=SpellE>MediaPortal</span>
-1.1.0 source code, and has also been tested against that version. However, it
-may also work for earlier and/or later <span class=SpellE>MediaPortal</span>
-versions. If you find that it works with any other version than <span
-class=SpellE>MediaPortal</span> 1.1.0, please post a message on the forum (see
-below).<o:p></o:p></span></p>
+<p class=MsoNormal><span lang=EN-GB style='mso-ansi-language:EN-GB'>This plugin
+has been compiled against the MediaPortal 1.1.0 source code, and has also been
+tested against that version. However, it may also work for earlier and/or later
+MediaPortal versions. If you find that it works with any other version than
+MediaPortal 1.1.0, please post a message on the forum (see below).<o:p></o:p></span></p>
<h2><span lang=EN-GB style='mso-fareast-font-family:"Times New Roman";
mso-ansi-language:EN-GB'>Installation Instructions<o:p></o:p></span></h2>
@@ -652,49 +638,43 @@
<li class=MsoNormal style='mso-list:l1 level1 lfo6;tab-stops:list 36.0pt'><span
lang=EN-GB style='mso-ansi-language:EN-GB'>Make sure that the Asus Front
Panel Display utility has been installed. This is available on the Asus
- Support CD that came with your S-<span class=SpellE>Presso</span>. When
- installed, you should have files named AControl.exe, Afpd.dll and
- AFPDSet.exe in your c:\windows\system32 directory. If the required
- Afpd.dll and asusio.sys are not installed, the plug-in will not work.<o:p></o:p></span></li>
+ Support CD that came with your S-Presso. When installed, you should have
+ files named AControl.exe, Afpd.dll and AFPDSet.exe in your
+ c:\windows\system32 directory. If the required Afpd.dll and asusio.sys are
+ not installed, the plug-in will not work.<o:p></o:p></span></li>
<li class=MsoNormal style='mso-list:l1 level1 lfo6;tab-stops:list 36.0pt'><span
lang=EN-GB style='mso-ansi-language:EN-GB'>Install the extension using the
- <span class=SpellE>MediaPortal</span> Extension Installer, or perform the
- following manual installation steps:<o:p></o:p></span></li>
+ MediaPortal Extension Installer, or perform the following manual
+ installation steps:<o:p></o:p></span></li>
<ol style='margin-top:0cm' start=1 type=1>
<li class=MsoNormal style='mso-list:l1 level2 lfo6;tab-stops:list 72.0pt'><span
- lang=EN-GB style='mso-ansi-language:EN-GB'>Disable <span class=SpellE>autostart</span>
- of the Asus-supplied AControl.exe program, for example a utility like <span
- class=SpellE>Autoruns</span> from <span class=SpellE>SysInternals</span>
- can be used for this (<a
+ lang=EN-GB style='mso-ansi-language:EN-GB'>Disable autostart of the
+ Asus-supplied AControl.exe program, for example a utility like Autoruns
+ from SysInternals can be used for this (<a
href="http://www.sysinternals.com/Utilities/Autoruns.html">http://www.sysinternals.com/Utilities/Autoruns.html</a>).
The plug-in will not work correctly if the AControl.exe program is
running.<o:p></o:p></span></li>
<li class=MsoNormal style='mso-list:l1 level2 lfo6;tab-stops:list 72.0pt'><span
lang=EN-GB style='mso-ansi-language:EN-GB'>Copy the AControl2.exe
(replacement program for Asus AControl.exe) and SPressoDisplayPlugin.dll
- (<span class=SpellE>MediaPortal</span> <span class=SpellE>plugin</span>)
- files from the Release\<span class=SpellE>Plugins</span>\Process
- directory to your <span class=SpellE>MediaPortal</span> <span
- class=SpellE>Plugins</span>\Process directory.<o:p></o:p></span></li>
+ (MediaPortal plugin) files from the Release\Plugins\Process directory to
+ your MediaPortal Plugins\Process directory.<o:p></o:p></span></li>
<li class=MsoNormal style='mso-list:l1 level2 lfo6;tab-stops:list 72.0pt'><span
lang=EN-GB style='mso-ansi-language:EN-GB'>Copy the SPressoAFPD.xml file
- from the Release\<span class=SpellE>InputDeviceMappings</span>\defaults
- directory to your <span class=SpellE>MediaPortal</span> <span
- class=SpellE>InputDeviceMappings</span>\defaults folder.<o:p></o:p></span></li>
+ from the Release\InputDeviceMappings\defaults directory to your
+ MediaPortal InputDeviceMappings\defaults folder.<o:p></o:p></span></li>
<li class=MsoNormal style='mso-list:l1 level2 lfo6;tab-stops:list 72.0pt'><span
lang=EN-GB style='mso-ansi-language:EN-GB'>Add a shortcut to
- AControl2.exe to your Start -> All Programs -> <span class=SpellE>Startup</span>
- folder.<o:p></o:p></span></li>
+ AControl2.exe to your Start -> All Programs -> Startup folder.<o:p></o:p></span></li>
<li class=MsoNormal style='mso-list:l1 level2 lfo6;tab-stops:list 72.0pt'><span
- lang=EN-GB style='mso-ansi-language:EN-GB'>Restart your <span
- class=GramE>PC,</span> verify that the front panel display correctly
- displays volume and temperatures.<o:p></o:p></span></li>
+ lang=EN-GB style='mso-ansi-language:EN-GB'>Restart your PC, verify that
+ the front panel display correctly displays volume and temperatures.<o:p></o:p></span></li>
</ol>
<li class=MsoNormal style='mso-list:l1 level1 lfo6;tab-stops:list 36.0pt'><span
lang=EN-GB style='mso-ansi-language:EN-GB'>(Optional) Configure the
plug-in (see next section).<o:p></o:p></span></li>
<li class=MsoNormal style='mso-list:l1 level1 lfo6;tab-stops:list 36.0pt'><span
- lang=EN-GB style='mso-ansi-language:EN-GB'>Start <span class=SpellE>MediaPortal</span>.<o:p></o:p></span></li>
+ lang=EN-GB style='mso-ansi-language:EN-GB'>Start MediaPortal.<o:p></o:p></span></li>
</ol>
<h2><span lang=EN-GB style='mso-fareast-font-family:"Times New Roman";
@@ -702,49 +682,44 @@
<p class=MsoNormal><span lang=EN-GB style='mso-ansi-language:EN-GB'>The plug-in
is configurable via the plug-in configuration screen. This screen is available
-via <span class=SpellE>MediaPortal</span> Configuration -> <span
-class=SpellE>Plugins</span> -> Process <span class=SpellE>Plugins</span>
--> <span class=SpellE>SPressDisplayPlugin</span> -> Configure). The
-following configuration options are available:<o:p></o:p></span></p>
+via MediaPortal Configuration -> Plugins -> Process Plugins ->
+SPressDisplayPlugin -> Configure). The following configuration options are
+available:<o:p></o:p></span></p>
<ul style='margin-top:0cm' type=disc>
- <li class=MsoNormal style='mso-list:l2 level1 lfo9;tab-stops:list 36.0pt'><span
+ <li class=MsoNormal style='mso-list:l4 level1 lfo9;tab-stops:list 36.0pt'><span
lang=EN-GB style='mso-ansi-language:EN-GB'>Enable/disable extensive
logging.<br>
Enabling this option makes the plug-in write more debugging information to
- the <span class=SpellE>MediaPortal</span> log files. Please note however
- that this will result in multiple log messages per second being written to
- the log file, so this option should be used with care and only be enabled
- for short periods.<o:p></o:p></span></li>
- <li class=MsoNormal style='mso-list:l2 level1 lfo9;tab-stops:list 36.0pt'><span
+ the MediaPortal log files. Please note however that this will result in
+ multiple log messages per second being written to the log file, so this
+ option should be used with care and only be enabled for short periods.<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-list:l4 level1 lfo9;tab-stops:list 36.0pt'><span
lang=EN-GB style='mso-ansi-language:EN-GB'>Front Panel Button Mapping.<br>
- This button will pop up another screen similar to the standard <span
- class=SpellE>MediaPortal</span> Remote <span class=SpellE>Plugin</span>
- configuration screens. This screen lists all available front panel
- buttons, including the various mode changes. Using this screen, you can
- configure the actions for each button. Please refer to the <span
- class=SpellE>MediaPortal</span> documentation on Remote button mapping for
- more information about this configuration window.<o:p></o:p></span></li>
- <li class=MsoNormal style='mso-list:l2 level1 lfo9;tab-stops:list 36.0pt'><span
+ This button will pop up another screen similar to the standard MediaPortal
+ Remote Plugin configuration screens. This screen lists all available front
+ panel buttons, including the various mode changes. Using this screen, you
+ can configure the actions for each button. Please refer to the MediaPortal
+ documentation on Remote button mapping for more information about this
+ configuration window.<o:p></o:p></span></li>
+ <li class=MsoNormal style='mso-list:l4 level1 lfo9;tab-stops:list 36.0pt'><span
lang=EN-GB style='mso-ansi-language:EN-GB'>Window -> Mode Display
Mapping.<br>
This button will pop up another screen on which you can define a mapping
- between <span class=SpellE>MediaPortal</span> windows and the Mode
- indicators on the front panel display. For each individual <span
- class=SpellE>MediaPortal</span> window (including windows available in
- plug-ins), you can define which mode icon (e.g. DVD, VCD, etc) is lit on
- the front panel display.<o:p></o:p></span></li>
+ between MediaPortal windows and the Mode indicators on the front panel
+ display. For each individual MediaPortal window (including windows
+ available in plug-ins), you can define which mode icon (e.g. DVD, VCD,
+ etc) is lit on the front panel display.<o:p></o:p></span></li>
</ul>
<h2><span lang=EN-GB style='mso-fareast-font-family:"Times New Roman";
mso-ansi-language:EN-GB'>Other information<o:p></o:p></span></h2>
<p class=MsoNormal><span lang=EN-GB style='mso-ansi-language:EN-GB'>A thread
-about this <span class=SpellE>plugin</span> has been started on the <span
-class=SpellE>MediaPortal</span> forum at <a
+about this plugin has been started on the MediaPortal forum at <a
href="http://forum.team-mediaportal.com/showthread.php?p=72281%20">http://forum.team-mediaportal.com/showthread.php?p=72281</a>.
-Please let me know there how this <span class=SpellE>plugin</span> works for
-you, and whether you have any suggestions. <o:p></o:p></span></p>
+Please let me know there how this plugin works for you, and whether you have
+any suggestions. <o:p></o:p></span></p>
<p class=MsoNormal><span lang=EN-GB style='mso-ansi-language:EN-GB'><o:p> </o:p></span></p>
Modified: trunk/plugins/SPressoDisplayPlugin/Release/plugins/process/AControl2.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/SPressoDisplayPlugin/Release/plugins/process/SPressoDisplayPlugin.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/SPressoDisplayPlugin/Release/test/SPressoTest.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/SPressoDisplayPlugin/Source/AControl2/obj/Release/AControl2.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/Properties/AssemblyInfo.cs 2011-11-04 14:04:43 UTC (rev 4322)
+++ trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/Properties/AssemblyInfo.cs 2011-11-04 14:48:05 UTC (rev 4323)
@@ -1,6 +1,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using MediaPortal.Common.Utils;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
@@ -10,7 +11,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SPressoDisplayPlugin")]
-[assembly: AssemblyCopyright("Copyright © 2006-2010")]
+[assembly: AssemblyCopyright("Copyright © 2006-2011")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -31,5 +32,7 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.1.0.0")]
-[assembly: AssemblyFileVersion("2.1.0.0")]
+[assembly: AssemblyVersion("2.2.0.0")]
+[assembly: AssemblyFileVersion("2.2.0.0")]
+
+[assembly: CompatibleVersion("1.1.6.27644")]
Modified: trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/SPressoDisplayPlugin.csproj
===================================================================
--- trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/SPressoDisplayPlugin.csproj 2011-11-04 14:04:43 UTC (rev 4322)
+++ trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/SPressoDisplayPlugin.csproj 2011-11-04 14:48:05 UTC (rev 4323)
@@ -29,6 +29,7 @@
<IsWebBootstrapper>true</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
+ <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
@@ -39,6 +40,7 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="Common.Utils, Version=1.2.1.0, Culture=neutral, processorArchitecture=x86" />
<Reference Include="Core, Version=1.0.2421.29687, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<Private>False</Private>
Modified: trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/SPressoDisplayPlugin.csproj.user
===================================================================
--- trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/SPressoDisplayPlugin.csproj.user 2011-11-04 14:04:43 UTC (rev 4322)
+++ trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/SPressoDisplayPlugin.csproj.user 2011-11-04 14:48:05 UTC (rev 4323)
@@ -1,4 +1,4 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<PublishUrlHistory>
</PublishUrlHistory>
@@ -12,6 +12,6 @@
</BootstrapperUrlHistory>
<FallbackCulture>en-US</FallbackCulture>
<VerifyUploadedFiles>true</VerifyUploadedFiles>
- <ReferencePath>D:\Development\MediaPortal\Releases\Release 1.1.0\mediaportal\xbmc\bin\Release\</ReferencePath>
+ <ReferencePath>C:\Program Files\Team MediaPortal\MediaPortal</ReferencePath>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/Settings.cs
===================================================================
--- trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/Settings.cs 2011-11-04 14:04:43 UTC (rev 4322)
+++ trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/Settings.cs 2011-11-04 14:48:05 UTC (rev 4323)
@@ -169,51 +169,51 @@
_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TVFULLSCREEN] = Mode.TV;
_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TVGUIDE] = Mode.TV;
_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_RECORDEDTV] = Mode.TV;
- _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_RECORDEDTVCHANNEL] = Mode.TV;
- _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_RECORDEDTVGENRE] = Mode.TV;
+ //_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_RECORDEDTVCHANNEL] = Mode.TV;
+ //_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_RECORDEDTVGENRE] = Mode.TV;
_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_SCHEDULER] = Mode.TV;
_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_SEARCHTV] = Mode.TV;
_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TELETEXT] = Mode.TV;
_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_FULLSCREEN_TELETEXT] = Mode.TV;
_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TV_SCHEDULER_PRIORITIES] = Mode.TV;
_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TV_CONFLICTS] = Mode.TV;
- _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TV_COMPRESS_MAIN] = Mode.TV;
- _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TV_COMPRESS_AUTO] = Mode.TV;
- _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TV_COMPRESS_COMPRESS] = Mode.TV;
- _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TV_COMPRESS_COMPRESS_STATUS] = Mode.TV;
- _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TV_COMPRESS_SETTINGS] = Mode.TV;
+ //_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TV_COMPRESS_MAIN] = Mode.TV;
+ //_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TV_COMPRESS_AUTO] = Mode.TV;
+ //_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TV_COMPRESS_COMPRESS] = Mode.TV;
+ //_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TV_COMPRESS_COMPRESS_STATUS] = Mode.TV;
+ //_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TV_COMPRESS_SETTINGS] = Mode.TV;
_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TV_NO_SIGNAL] = Mode.TV;
_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TV_PROGRAM_INFO] = Mode.TV;
_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_DVD] = Mode.DVD;
_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_FULLSCREEN_VIDEO] = Mode.VCD;
_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_HOME] = Mode.NONE;
- _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_ALBUM] = Mode.MUSIC;
- _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_ARTIST] = Mode.MUSIC;
+ //_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_ALBUM] = Mode.MUSIC;
+ //_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_ARTIST] = Mode.MUSIC;
_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_COVERART_GRABBER_PROGRESS] = Mode.MUSIC;
_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_COVERART_GRABBER_RESULTS] = Mode.MUSIC;
- _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_FAVORITES] = Mode.MUSIC;
+ //_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_FAVORITES] = Mode.MUSIC;
_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_FILES] = Mode.MUSIC;
_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_GENRE] = Mode.MUSIC;
_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_INFO] = Mode.MUSIC;
_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_OVERLAY] = Mode.MUSIC;
_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_PLAYING_NOW] = Mode.MUSIC;
_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_PLAYLIST] = Mode.MUSIC;
- _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_TOP100] = Mode.MUSIC;
- _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_YEARS] = Mode.MUSIC;
+ //_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_TOP100] = Mode.MUSIC;
+ //_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_MUSIC_YEARS] = Mode.MUSIC;
_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_PICTURES] = Mode.PHOTO;
_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_RADIO] = Mode.FM;
_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_RADIO_GUIDE] = Mode.FM;
_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_SLIDESHOW] = Mode.PHOTO;
- _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TRAILERS] = Mode.VCD;
- _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_VIDEO_ACTOR] = Mode.VCD;
+ //_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_TRAILERS] = Mode.VCD;
+ //_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_VIDEO_ACTOR] = Mode.VCD;
_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_VIDEO_ARTIST_INFO] = Mode.VCD;
- _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_VIDEO_GENRE] = Mode.VCD;
+ //_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_VIDEO_GENRE] = Mode.VCD;
_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_VIDEO_INFO] = Mode.VCD;
_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_VIDEO_OVERLAY] = Mode.VCD;
_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_VIDEO_OVERLAY_TOP] = Mode.VCD;
_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_VIDEO_PLAYLIST] = Mode.VCD;
_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_VIDEO_TITLE] = Mode.VCD;
- _settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_VIDEO_YEAR] = Mode.VCD;
+ //_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_VIDEO_YEAR] = Mode.VCD;
_settings.m_WindowId2ModeMap[(int)GUIWindow.Window.WINDOW_VIDEOS] = Mode.VCD;
}
}
Modified: trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/obj/Release/SPressoDisplayPlugin.csproj.GenerateResource.Cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin/obj/Release/SPressoDisplayPlugin.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/SPressoDisplayPlugin/Source/SPressoDisplayPlugin.suo
===================================================================
(Binary files differ)
Modified: trunk/plugins/SPressoDisplayPlugin/Source/SPressoTest/obj/Release/SPressoTest.exe
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rs...@us...> - 2011-11-04 14:04:49
|
Revision: 4322
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4322&view=rev
Author: rsenden
Date: 2011-11-04 14:04:43 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------
Updated for MP 1.2.1 compatibility, updated file locations
Modified Paths:
--------------
trunk/plugins/KeyboardInputPlugin/HISTORY.HTML
Modified: trunk/plugins/KeyboardInputPlugin/HISTORY.HTML
===================================================================
--- trunk/plugins/KeyboardInputPlugin/HISTORY.HTML 2011-11-04 13:48:54 UTC (rev 4321)
+++ trunk/plugins/KeyboardInputPlugin/HISTORY.HTML 2011-11-04 14:04:43 UTC (rev 4322)
@@ -9,8 +9,10 @@
<h1>KeyboardInputPlugin History</h1>
-<h2>Version 2.4.3.0 (future version)</h2>
+<h2>Version 2.4.3.0 (stable)</h2>
<ul>
+ <li>Various updates for MediaPortal 1.2.x compatibility</li>
+ <li>Updated some of the paths. Specifically, in order for your custom mappings to be picked up, you may need to move [MP install dir]\defaults\InputDeviceMappings\Keyboard.xml or [MP install dir]\InputDeviceMappings\defaults\Keyboard.xml to %ProgramData%\Team Mediaportal\Mediaportal\InputDeviceMappings
<li>TODO: Update README.HTML to reflect configuration screen changes</li>
</ul>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rs...@us...> - 2011-11-04 13:49:00
|
Revision: 4321
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4321&view=rev
Author: rsenden
Date: 2011-11-04 13:48:54 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------
Updated for MP 1.2.1 compatibility, updated file locations
Modified Paths:
--------------
trunk/plugins/KeyboardInputPlugin/Source/KeyboardInputPlugin/Properties/AssemblyInfo.cs
Modified: trunk/plugins/KeyboardInputPlugin/Source/KeyboardInputPlugin/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/KeyboardInputPlugin/Source/KeyboardInputPlugin/Properties/AssemblyInfo.cs 2011-11-04 13:48:30 UTC (rev 4320)
+++ trunk/plugins/KeyboardInputPlugin/Source/KeyboardInputPlugin/Properties/AssemblyInfo.cs 2011-11-04 13:48:54 UTC (rev 4321)
@@ -1,6 +1,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using MediaPortal.Common.Utils;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
@@ -10,7 +11,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Keyboard Input Plugin")]
-[assembly: AssemblyCopyright("Copyright © 2007-2010")]
+[assembly: AssemblyCopyright("Copyright © 2007-2011")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -31,5 +32,7 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.4.2.0")]
-[assembly: AssemblyFileVersion("2.4.2.0")]
+[assembly: AssemblyVersion("2.4.3.0")]
+[assembly: AssemblyFileVersion("2.4.3.0")]
+
+[assembly: CompatibleVersion("1.1.6.27644")]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rs...@us...> - 2011-11-04 13:48:36
|
Revision: 4320
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4320&view=rev
Author: rsenden
Date: 2011-11-04 13:48:30 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------
Updated for MP 1.2.1 compatibility, updated file locations
Modified Paths:
--------------
trunk/plugins/KeyboardInputPlugin/Source/KeyboardInputPlugin/InputHandler.cs
trunk/plugins/KeyboardInputPlugin/Source/KeyboardInputPlugin/InputMappingForm.cs
trunk/plugins/KeyboardInputPlugin/Source/KeyboardInputPlugin/KeyboardInputPlugin.csproj
trunk/plugins/KeyboardInputPlugin/Source/KeyboardInputPlugin/KeyboardInputPlugin.csproj.user
Modified: trunk/plugins/KeyboardInputPlugin/Source/KeyboardInputPlugin/InputHandler.cs
===================================================================
--- trunk/plugins/KeyboardInputPlugin/Source/KeyboardInputPlugin/InputHandler.cs 2011-11-04 13:48:02 UTC (rev 4319)
+++ trunk/plugins/KeyboardInputPlugin/Source/KeyboardInputPlugin/InputHandler.cs 2011-11-04 13:48:30 UTC (rev 4320)
@@ -63,8 +63,24 @@
/// </summary>
public int CurrentLayer { get { return _currentLayer; } }
+ /// <summary>
+ /// Returns the path to the directory, which contains all available default input device mappings.
+ /// </summary>
+ public static string DefaultsDirectory
+ {
+ get { return Config.GetSubFolder(Config.Dir.Base, @"Defaults\InputDeviceMappings"); }
+ }
/// <summary>
+ /// Returns the path to the directory, which contains the customized mappings directory.
+ /// </summary>
+ public static string CustomizedMappingsDirectory
+ {
+ get { return Config.GetSubFolder(Config.Dir.Config, @"InputDeviceMappings"); }
+ }
+
+
+ /// <summary>
/// Condition/action class
/// </summary>
public class Mapping
@@ -133,9 +149,10 @@
/// <param name="deviceXmlName">Input device name</param>
public InputHandler(string deviceXmlName)
{
- using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml")))
- _basicHome = xmlreader.GetValueAsBool("general", "startbasichome", false);
- //_basicHome = false;
+ using (Settings xmlreader = new MPSettings())
+ {
+ _basicHome = xmlreader.GetValueAsBool("gui", "startbasichome", false);
+ }
string xmlPath = GetXmlPath(deviceXmlName);
LoadMapping(xmlPath);
}
@@ -180,8 +197,8 @@
public string GetXmlPath(string deviceXmlName)
{
string path = string.Empty;
- string pathCustom = Config.GetFile(Config.Dir.CustomInputDevice, deviceXmlName + ".xml");
- string pathDefault = Config.GetFile(Config.Dir.CustomInputDefault, deviceXmlName + ".xml");
+ string pathCustom = Path.Combine(InputHandler.CustomizedMappingsDirectory, deviceXmlName + ".xml");
+ string pathDefault = Path.Combine(InputHandler.DefaultsDirectory, deviceXmlName + ".xml");
if (System.IO.File.Exists(pathCustom) && CheckXmlFile(pathCustom))
{
Modified: trunk/plugins/KeyboardInputPlugin/Source/KeyboardInputPlugin/InputMappingForm.cs
===================================================================
--- trunk/plugins/KeyboardInputPlugin/Source/KeyboardInputPlugin/InputMappingForm.cs 2011-11-04 13:48:02 UTC (rev 4319)
+++ trunk/plugins/KeyboardInputPlugin/Source/KeyboardInputPlugin/InputMappingForm.cs 2011-11-04 13:48:30 UTC (rev 4320)
@@ -24,19 +24,17 @@
#endregion
using System;
-using System.Diagnostics;
using System.Drawing;
using System.Collections;
using System.ComponentModel;
using System.Windows.Forms;
using System.Xml;
using System.IO;
-using System.Runtime.InteropServices;
using MediaPortal.GUI.Library;
-using MediaPortal.Util;
using System.Threading;
using MediaPortal.Configuration;
using System.Reflection;
+using System.Text;
namespace KeyboardInputPlugin // KBIP CHANGED: namespace
{
@@ -196,20 +194,20 @@
case (int)GUIWindow.Window.WINDOW_INVALID:
case (int)GUIWindow.Window.WINDOW_MINI_GUIDE:
case (int)GUIWindow.Window.WINDOW_TV_CROP_SETTINGS:
- case (int)GUIWindow.Window.WINDOW_MSNOSD:
+ //case (int)GUIWindow.Window.WINDOW_MSNOSD:
case (int)GUIWindow.Window.WINDOW_MUSIC:
case (int)GUIWindow.Window.WINDOW_MUSIC_COVERART_GRABBER_RESULTS:
case (int)GUIWindow.Window.WINDOW_MUSIC_INFO:
case (int)GUIWindow.Window.WINDOW_OSD:
case (int)GUIWindow.Window.WINDOW_TOPBAR:
//case (int)GUIWindow.Window.WINDOW_TOPBARHOME:
- case (int)GUIWindow.Window.WINDOW_TVMSNOSD:
+ //case (int)GUIWindow.Window.WINDOW_TVMSNOSD:
case (int)GUIWindow.Window.WINDOW_TVOSD:
case (int)GUIWindow.Window.WINDOW_TVZAPOSD:
case (int)GUIWindow.Window.WINDOW_VIDEO_ARTIST_INFO:
case (int)GUIWindow.Window.WINDOW_VIDEO_INFO:
case (int)GUIWindow.Window.WINDOW_VIRTUAL_KEYBOARD:
- case (int)GUIWindow.Window.WINDOW_VIRTUAL_WEB_KEYBOARD:
+ //case (int)GUIWindow.Window.WINDOW_VIRTUAL_WEB_KEYBOARD:
break;
default:
windowsListFiltered.Add(GetFriendlyName(wnd.ToString()));
@@ -914,14 +912,19 @@
void LoadMapping(string xmlFile, bool defaults)
{
+ string pathDefault = Path.Combine(InputHandler.DefaultsDirectory, xmlFile);
+ string pathCustom = Path.Combine(InputHandler.CustomizedMappingsDirectory, xmlFile);
+
groupBoxMapping.Enabled = false;
groupBoxButton.Enabled = false;
groupBoxLayer.Enabled = false;
groupBoxCondition.Enabled = false;
groupBoxAction.Enabled = false;
- string path = Config.GetFolder(Config.Dir.Base) + "\\InputDeviceMappings\\defaults\\" + xmlFile;
- if (!defaults && File.Exists(Config.GetFile(Config.Dir.CustomInputDevice, xmlFile)))
- path = Config.GetFile(Config.Dir.CustomInputDevice, xmlFile);
+ string path = pathDefault;
+ if (!defaults && File.Exists(pathCustom))
+ {
+ path = pathCustom;
+ }
try
{
@@ -930,7 +933,7 @@
catch (Exception ex)
{
Log.Error(LOG_PREFIX + ex);
- File.Delete(Config.GetFile(Config.Dir.CustomInputDevice, xmlFile));
+ File.Delete(pathCustom);
if ( !defaults ) { LoadMapping(xmlFile, true); }
}
}
@@ -1089,7 +1092,7 @@
try
#endif
{
- DirectoryInfo dir = Directory.CreateDirectory(Config.GetFolder(Config.Dir.CustomInputDevice));
+ DirectoryInfo dir = Directory.CreateDirectory(InputHandler.CustomizedMappingsDirectory);
}
#if !DEBUG
catch
@@ -1100,7 +1103,8 @@
//try
#endif
{
- XmlTextWriter writer = new XmlTextWriter(Config.GetFile(Config.Dir.CustomInputDevice, xmlFile), System.Text.Encoding.UTF8);
+ string pathCustom = Path.Combine(InputHandler.CustomizedMappingsDirectory, xmlFile);
+ XmlTextWriter writer = new XmlTextWriter(pathCustom, Encoding.UTF8);
writer.Formatting = Formatting.Indented;
writer.Indentation = 1;
writer.IndentChar = (char)9;
@@ -1880,8 +1884,9 @@
MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2);
if (result == DialogResult.Yes)
{
- if (File.Exists(Config.GetFile(Config.Dir.CustomInputDevice, inputClassName + ".xml")))
- File.Delete(Config.GetFile(Config.Dir.CustomInputDevice, inputClassName + ".xml"));
+ string pathCustom = Path.Combine(InputHandler.CustomizedMappingsDirectory, inputClassName);
+ if (File.Exists(pathCustom))
+ File.Delete(pathCustom);
InitializeTreeMapping(inputClassName);
}
}
@@ -2210,7 +2215,7 @@
{
OpenFileDialog dlg = new OpenFileDialog();
dlg.Filter = "xml-file (*.xml)|*.xml";
- dlg.InitialDirectory = Config.GetFolder(Config.Dir.Base) + "\\InputDeviceMappings\\defaults\\KeyboardInputPlugin";
+ dlg.InitialDirectory = Path.Combine(InputHandler.DefaultsDirectory, "KeyboardInputPlugin");
if (dlg.ShowDialog() == DialogResult.OK)
{
AddMapping(dlg.FileName);
Modified: trunk/plugins/KeyboardInputPlugin/Source/KeyboardInputPlugin/KeyboardInputPlugin.csproj
===================================================================
--- trunk/plugins/KeyboardInputPlugin/Source/KeyboardInputPlugin/KeyboardInputPlugin.csproj 2011-11-04 13:48:02 UTC (rev 4319)
+++ trunk/plugins/KeyboardInputPlugin/Source/KeyboardInputPlugin/KeyboardInputPlugin.csproj 2011-11-04 13:48:30 UTC (rev 4320)
@@ -3,7 +3,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{0E665FA4-1C44-4828-962E-6EC6F6D59F00}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -48,6 +48,11 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="Common.Utils, Version=1.1.6.0, Culture=neutral, processorArchitecture=x86">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>C:\Program Files\Team MediaPortal\MediaPortal\Common.Utils.dll</HintPath>
+ <Private>False</Private>
+ </Reference>
<Reference Include="Core, Version=1.0.6.28732, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<HintPath>C:\Program Files\Team MediaPortal\MediaPortal\Core.dll</HintPath>
Modified: trunk/plugins/KeyboardInputPlugin/Source/KeyboardInputPlugin/KeyboardInputPlugin.csproj.user
===================================================================
--- trunk/plugins/KeyboardInputPlugin/Source/KeyboardInputPlugin/KeyboardInputPlugin.csproj.user 2011-11-04 13:48:02 UTC (rev 4319)
+++ trunk/plugins/KeyboardInputPlugin/Source/KeyboardInputPlugin/KeyboardInputPlugin.csproj.user 2011-11-04 13:48:30 UTC (rev 4320)
@@ -1,5 +1,5 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <ReferencePath>D:\Development\MediaPortal\Releases\Release 1.1.0\mediaportal\xbmc\bin\Release\</ReferencePath>
+ <ReferencePath>C:\Program Files\Team MediaPortal\MediaPortal</ReferencePath>
</PropertyGroup>
</Project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rs...@us...> - 2011-11-04 13:48:08
|
Revision: 4319
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4319&view=rev
Author: rsenden
Date: 2011-11-04 13:48:02 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------
Updated for MP 1.2.1 compatibility, updated file locations
Modified Paths:
--------------
trunk/plugins/KeyboardInputPlugin/Source/KeyboardInputPlugin.suo
Modified: trunk/plugins/KeyboardInputPlugin/Source/KeyboardInputPlugin.suo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rs...@us...> - 2011-11-04 13:47:42
|
Revision: 4318
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4318&view=rev
Author: rsenden
Date: 2011-11-04 13:47:36 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------
Updated for MP 1.2.1 compatibility, updated file locations
Modified Paths:
--------------
trunk/plugins/KeyboardInputPlugin/Release/plugins/process/KeyboardInputPlugin.dll
Modified: trunk/plugins/KeyboardInputPlugin/Release/plugins/process/KeyboardInputPlugin.dll
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rs...@us...> - 2011-11-04 13:47:11
|
Revision: 4317
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4317&view=rev
Author: rsenden
Date: 2011-11-04 13:47:04 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------
Updated for MP 1.2.1 compatibility, updated file locations
Modified Paths:
--------------
trunk/plugins/KeyboardInputPlugin/MPE/KeyboardInputPlugin.mpe1
trunk/plugins/KeyboardInputPlugin/MPE/KeyboardInputPlugin.xmp2
trunk/plugins/KeyboardInputPlugin/MPE/update.xml
Modified: trunk/plugins/KeyboardInputPlugin/MPE/KeyboardInputPlugin.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/KeyboardInputPlugin/MPE/KeyboardInputPlugin.xmp2
===================================================================
--- trunk/plugins/KeyboardInputPlugin/MPE/KeyboardInputPlugin.xmp2 2011-10-24 18:51:29 UTC (rev 4316)
+++ trunk/plugins/KeyboardInputPlugin/MPE/KeyboardInputPlugin.xmp2 2011-11-04 13:47:04 UTC (rev 4317)
@@ -21,101 +21,102 @@
</Files>
</GroupItem>
<GroupItem Name="PredefinedMappings">
+ <ParentGroup />
<DisplayName>Predefined Mappings</DisplayName>
<DefaulChecked>true</DefaulChecked>
<Description>PredefinedMappings</Description>
<Files>
<Items>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Release\InputDeviceMappings\defaults\KeyboardInputPlugin\Remote\YaoCoo MCE Clone\info.txt</LocalFileName>
<ZipFileName>Installer{CopyFile}\{f1afb692-3d7e-4375-96ab-eb96153f95c4}-info.txt</ZipFileName>
- <DestinationFilename>%CustomInputDefault%\KeyboardInputPlugin\Remote\YaoCoo MCE Clone\info.txt</DestinationFilename>
+ <DestinationFilename>%Base%\Defaults\InputDeviceMappings\KeyboardInputPlugin\Remote\YaoCoo MCE Clone\info.txt</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Release\InputDeviceMappings\defaults\KeyboardInputPlugin\Remote\YaoCoo MCE Clone\Keyboard.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{cb55eb66-db53-4a42-b947-fe84dc0f041e}-Keyboard.xml</ZipFileName>
- <DestinationFilename>%CustomInputDefault%\KeyboardInputPlugin\Remote\YaoCoo MCE Clone\Keyboard.xml</DestinationFilename>
+ <DestinationFilename>%Base%\Defaults\InputDeviceMappings\KeyboardInputPlugin\Remote\YaoCoo MCE Clone\Keyboard.xml</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Release\InputDeviceMappings\defaults\KeyboardInputPlugin\Remote\Speedlink SL-6399\info.txt</LocalFileName>
<ZipFileName>Installer{CopyFile}\{b8a4f45b-e2a4-4030-b045-54ec363b5092}-info.txt</ZipFileName>
- <DestinationFilename>%CustomInputDefault%\KeyboardInputPlugin\Remote\Speedlink SL-6399\info.txt</DestinationFilename>
+ <DestinationFilename>%Base%\Defaults\InputDeviceMappings\KeyboardInputPlugin\Remote\Speedlink SL-6399\info.txt</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Release\InputDeviceMappings\defaults\KeyboardInputPlugin\Remote\Speedlink SL-6399\Keyboard.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{fa24f95e-7134-4780-96bf-f338f36ee309}-Keyboard.xml</ZipFileName>
- <DestinationFilename>%CustomInputDefault%\KeyboardInputPlugin\Remote\Speedlink SL-6399\Keyboard.xml</DestinationFilename>
+ <DestinationFilename>%Base%\Defaults\InputDeviceMappings\KeyboardInputPlugin\Remote\Speedlink SL-6399\Keyboard.xml</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Release\InputDeviceMappings\defaults\KeyboardInputPlugin\Remote\MCE-Remote based mappings\Keyboard.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{69b2ba52-5c6c-486b-ae20-06d4d4f1c376}-Keyboard.xml</ZipFileName>
- <DestinationFilename>%CustomInputDefault%\KeyboardInputPlugin\Remote\MCE-Remote based mappings\Keyboard.xml</DestinationFilename>
+ <DestinationFilename>%Base%\Defaults\InputDeviceMappings\KeyboardInputPlugin\Remote\MCE-Remote based mappings\Keyboard.xml</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Release\InputDeviceMappings\defaults\KeyboardInputPlugin\Remote\GoTView USB\info.txt</LocalFileName>
<ZipFileName>Installer{CopyFile}\{e08be968-ccf2-4482-956f-2eacfce53353}-info.txt</ZipFileName>
- <DestinationFilename>%CustomInputDefault%\KeyboardInputPlugin\Remote\GoTView USB\info.txt</DestinationFilename>
+ <DestinationFilename>%Base%\Defaults\InputDeviceMappings\KeyboardInputPlugin\Remote\GoTView USB\info.txt</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Release\InputDeviceMappings\defaults\KeyboardInputPlugin\Remote\GoTView USB\Keyboard.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{50173c26-eb85-46ee-984f-721eae5a966b}-Keyboard.xml</ZipFileName>
- <DestinationFilename>%CustomInputDefault%\KeyboardInputPlugin\Remote\GoTView USB\Keyboard.xml</DestinationFilename>
+ <DestinationFilename>%Base%\Defaults\InputDeviceMappings\KeyboardInputPlugin\Remote\GoTView USB\Keyboard.xml</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Release\InputDeviceMappings\defaults\KeyboardInputPlugin\Remote\Asus S-Presso Remote\Keyboard.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{7436ccf5-446f-43bf-97e8-7350040d761e}-Keyboard.xml</ZipFileName>
- <DestinationFilename>%CustomInputDefault%\KeyboardInputPlugin\Remote\Asus S-Presso Remote\Keyboard.xml</DestinationFilename>
+ <DestinationFilename>%Base%\Defaults\InputDeviceMappings\KeyboardInputPlugin\Remote\Asus S-Presso Remote\Keyboard.xml</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Release\InputDeviceMappings\defaults\KeyboardInputPlugin\Keyboard\ShortCut'er (no modifier keys)\Keyboard.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{40f73c5d-fc97-427a-a91f-54a59c5bbe37}-Keyboard.xml</ZipFileName>
- <DestinationFilename>%CustomInputDefault%\KeyboardInputPlugin\Keyboard\ShortCut'er (no modifier keys)\Keyboard.xml</DestinationFilename>
+ <DestinationFilename>%Base%\Defaults\InputDeviceMappings\KeyboardInputPlugin\Keyboard\ShortCut'er (no modifier keys)\Keyboard.xml</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Release\InputDeviceMappings\defaults\KeyboardInputPlugin\Keyboard\MyKeys\info.txt</LocalFileName>
<ZipFileName>Installer{CopyFile}\{b8080f32-adc6-4e66-acb1-21da907c6c57}-info.txt</ZipFileName>
- <DestinationFilename>%CustomInputDefault%\KeyboardInputPlugin\Keyboard\MyKeys\info.txt</DestinationFilename>
+ <DestinationFilename>%Base%\Defaults\InputDeviceMappings\KeyboardInputPlugin\Keyboard\MyKeys\info.txt</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Release\InputDeviceMappings\defaults\KeyboardInputPlugin\Keyboard\MyKeys\Keyboard.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{170e2098-e806-43b3-be82-97fb04b6332f}-Keyboard.xml</ZipFileName>
- <DestinationFilename>%CustomInputDefault%\KeyboardInputPlugin\Keyboard\MyKeys\Keyboard.xml</DestinationFilename>
+ <DestinationFilename>%Base%\Defaults\InputDeviceMappings\KeyboardInputPlugin\Keyboard\MyKeys\Keyboard.xml</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Release\InputDeviceMappings\defaults\KeyboardInputPlugin\Keyboard\MediaPortal Shortcuts\info.txt</LocalFileName>
<ZipFileName>Installer{CopyFile}\{cee7e6e9-dd99-4ffb-a4f2-5b826865cf81}-info.txt</ZipFileName>
- <DestinationFilename>%CustomInputDefault%\KeyboardInputPlugin\Keyboard\MediaPortal Shortcuts\info.txt</DestinationFilename>
+ <DestinationFilename>%Base%\Defaults\InputDeviceMappings\KeyboardInputPlugin\Keyboard\MediaPortal Shortcuts\info.txt</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Release\InputDeviceMappings\defaults\KeyboardInputPlugin\Keyboard\MediaPortal Shortcuts\Keyboard.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{3a78d93a-ad77-4111-af9d-812da81ad5e8}-Keyboard.xml</ZipFileName>
- <DestinationFilename>%CustomInputDefault%\KeyboardInputPlugin\Keyboard\MediaPortal Shortcuts\Keyboard.xml</DestinationFilename>
+ <DestinationFilename>%Base%\Defaults\InputDeviceMappings\KeyboardInputPlugin\Keyboard\MediaPortal Shortcuts\Keyboard.xml</DestinationFilename>
</FileItem>
</Items>
</Files>
@@ -242,23 +243,62 @@
</Items>
</Sections>
<Dependencies>
- <Items />
+ <Items>
+ <DependencyItem>
+ <Type>MediaPortal</Type>
+ <Id />
+ <MinVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MinVersion>
+ <MaxVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MaxVersion>
+ <WarnOnly>false</WarnOnly>
+ <Message>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ </Items>
</Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="KeyboardInputPlugin.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.1.6.27644</MinRequiredVersion>
+ <DesignedForVersion>1.1.6.27644</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items />
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
<GeneralInfo>
<Name>KeyboardInputPlugin</Name>
<Id>7e2b5b18-46ba-48f8-b7a3-2430405a9f86</Id>
- <Author>Ruud Senden, SilentException</Author>
+ <Author>Ruud Senden, SilentException, Deda</Author>
<HomePage />
<ForumPage>http://forum.team-mediaportal.com/mediaportal-plugins-47/generic-keyboard-remote-input-plugin-25755/</ForumPage>
<UpdateUrl>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/KeyboardInputPlugin/MPE/update.xml</UpdateUrl>
<Version>
<Major>2</Major>
<Minor>4</Minor>
- <Build>2</Build>
+ <Build>3</Build>
<Revision>0</Revision>
</Version>
<ExtensionDescription>This plug-in allows you to map keystrokes to MediaPortal screens and actions. Virtually all keystrokes can be mapped, including Ctrl, Alt, Shift and Win modifier key combinations. Among others, this enables the use of remote controls that emulate a HID keyboard, and/or allows you to create keyboard shortcuts.</ExtensionDescription>
- <VersionDescription>Fixed exception in configuration screen, various other configuration screen changes, updated default mappings. For more info, see https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/KeyboardInputPlugin/HISTORY.HTML</VersionDescription>
+ <VersionDescription>Update for MPE 1.2.1, with thanks to Deda (http://forum.team-mediaportal.com/members/89768.html)
+
+Updated file locations</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/KeyboardInputPlugin/MPE/KeyboardInputPlugin.mpe1</OnlineLocation>
<ReleaseDate>2010-08-15T18:27:00</ReleaseDate>
@@ -305,122 +345,112 @@
<ZipFileName>Installer{CopyFile}\{b39e5bde-80d5-417f-85c8-b699c5713b4e}-KeyboardInputPlugin.dll</ZipFileName>
<DestinationFilename>%Plugins%\process\KeyboardInputPlugin.dll</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Release\InputDeviceMappings\defaults\KeyboardInputPlugin\Remote\YaoCoo MCE Clone\info.txt</LocalFileName>
<ZipFileName>Installer{CopyFile}\{f1afb692-3d7e-4375-96ab-eb96153f95c4}-info.txt</ZipFileName>
- <DestinationFilename>%CustomInputDefault%\KeyboardInputPlugin\Remote\YaoCoo MCE Clone\info.txt</DestinationFilename>
+ <DestinationFilename>%Base%\Defaults\InputDeviceMappings\KeyboardInputPlugin\Remote\YaoCoo MCE Clone\info.txt</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Release\InputDeviceMappings\defaults\KeyboardInputPlugin\Remote\YaoCoo MCE Clone\Keyboard.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{cb55eb66-db53-4a42-b947-fe84dc0f041e}-Keyboard.xml</ZipFileName>
- <DestinationFilename>%CustomInputDefault%\KeyboardInputPlugin\Remote\YaoCoo MCE Clone\Keyboard.xml</DestinationFilename>
+ <DestinationFilename>%Base%\Defaults\InputDeviceMappings\KeyboardInputPlugin\Remote\YaoCoo MCE Clone\Keyboard.xml</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Release\InputDeviceMappings\defaults\KeyboardInputPlugin\Remote\Speedlink SL-6399\info.txt</LocalFileName>
<ZipFileName>Installer{CopyFile}\{b8a4f45b-e2a4-4030-b045-54ec363b5092}-info.txt</ZipFileName>
- <DestinationFilename>%CustomInputDefault%\KeyboardInputPlugin\Remote\Speedlink SL-6399\info.txt</DestinationFilename>
+ <DestinationFilename>%Base%\Defaults\InputDeviceMappings\KeyboardInputPlugin\Remote\Speedlink SL-6399\info.txt</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Release\InputDeviceMappings\defaults\KeyboardInputPlugin\Remote\Speedlink SL-6399\Keyboard.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{fa24f95e-7134-4780-96bf-f338f36ee309}-Keyboard.xml</ZipFileName>
- <DestinationFilename>%CustomInputDefault%\KeyboardInputPlugin\Remote\Speedlink SL-6399\Keyboard.xml</DestinationFilename>
+ <DestinationFilename>%Base%\Defaults\InputDeviceMappings\KeyboardInputPlugin\Remote\Speedlink SL-6399\Keyboard.xml</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Release\InputDeviceMappings\defaults\KeyboardInputPlugin\Remote\MCE-Remote based mappings\Keyboard.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{69b2ba52-5c6c-486b-ae20-06d4d4f1c376}-Keyboard.xml</ZipFileName>
- <DestinationFilename>%CustomInputDefault%\KeyboardInputPlugin\Remote\MCE-Remote based mappings\Keyboard.xml</DestinationFilename>
+ <DestinationFilename>%Base%\Defaults\InputDeviceMappings\KeyboardInputPlugin\Remote\MCE-Remote based mappings\Keyboard.xml</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Release\InputDeviceMappings\defaults\KeyboardInputPlugin\Remote\GoTView USB\info.txt</LocalFileName>
<ZipFileName>Installer{CopyFile}\{e08be968-ccf2-4482-956f-2eacfce53353}-info.txt</ZipFileName>
- <DestinationFilename>%CustomInputDefault%\KeyboardInputPlugin\Remote\GoTView USB\info.txt</DestinationFilename>
+ <DestinationFilename>%Base%\Defaults\InputDeviceMappings\KeyboardInputPlugin\Remote\GoTView USB\info.txt</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Release\InputDeviceMappings\defaults\KeyboardInputPlugin\Remote\GoTView USB\Keyboard.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{50173c26-eb85-46ee-984f-721eae5a966b}-Keyboard.xml</ZipFileName>
- <DestinationFilename>%CustomInputDefault%\KeyboardInputPlugin\Remote\GoTView USB\Keyboard.xml</DestinationFilename>
+ <DestinationFilename>%Base%\Defaults\InputDeviceMappings\KeyboardInputPlugin\Remote\GoTView USB\Keyboard.xml</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Release\InputDeviceMappings\defaults\KeyboardInputPlugin\Remote\Asus S-Presso Remote\Keyboard.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{7436ccf5-446f-43bf-97e8-7350040d761e}-Keyboard.xml</ZipFileName>
- <DestinationFilename>%CustomInputDefault%\KeyboardInputPlugin\Remote\Asus S-Presso Remote\Keyboard.xml</DestinationFilename>
+ <DestinationFilename>%Base%\Defaults\InputDeviceMappings\KeyboardInputPlugin\Remote\Asus S-Presso Remote\Keyboard.xml</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Release\InputDeviceMappings\defaults\KeyboardInputPlugin\Keyboard\ShortCut'er (no modifier keys)\Keyboard.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{40f73c5d-fc97-427a-a91f-54a59c5bbe37}-Keyboard.xml</ZipFileName>
- <DestinationFilename>%CustomInputDefault%\KeyboardInputPlugin\Keyboard\ShortCut'er (no modifier keys)\Keyboard.xml</DestinationFilename>
+ <DestinationFilename>%Base%\Defaults\InputDeviceMappings\KeyboardInputPlugin\Keyboard\ShortCut'er (no modifier keys)\Keyboard.xml</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Release\InputDeviceMappings\defaults\KeyboardInputPlugin\Keyboard\MyKeys\info.txt</LocalFileName>
<ZipFileName>Installer{CopyFile}\{b8080f32-adc6-4e66-acb1-21da907c6c57}-info.txt</ZipFileName>
- <DestinationFilename>%CustomInputDefault%\KeyboardInputPlugin\Keyboard\MyKeys\info.txt</DestinationFilename>
+ <DestinationFilename>%Base%\Defaults\InputDeviceMappings\KeyboardInputPlugin\Keyboard\MyKeys\info.txt</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Release\InputDeviceMappings\defaults\KeyboardInputPlugin\Keyboard\MyKeys\Keyboard.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{170e2098-e806-43b3-be82-97fb04b6332f}-Keyboard.xml</ZipFileName>
- <DestinationFilename>%CustomInputDefault%\KeyboardInputPlugin\Keyboard\MyKeys\Keyboard.xml</DestinationFilename>
+ <DestinationFilename>%Base%\Defaults\InputDeviceMappings\KeyboardInputPlugin\Keyboard\MyKeys\Keyboard.xml</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Release\InputDeviceMappings\defaults\KeyboardInputPlugin\Keyboard\MediaPortal Shortcuts\info.txt</LocalFileName>
<ZipFileName>Installer{CopyFile}\{cee7e6e9-dd99-4ffb-a4f2-5b826865cf81}-info.txt</ZipFileName>
- <DestinationFilename>%CustomInputDefault%\KeyboardInputPlugin\Keyboard\MediaPortal Shortcuts\info.txt</DestinationFilename>
+ <DestinationFilename>%Base%\Defaults\InputDeviceMappings\KeyboardInputPlugin\Keyboard\MediaPortal Shortcuts\info.txt</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Release\InputDeviceMappings\defaults\KeyboardInputPlugin\Keyboard\MediaPortal Shortcuts\Keyboard.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{3a78d93a-ad77-4111-af9d-812da81ad5e8}-Keyboard.xml</ZipFileName>
- <DestinationFilename>%CustomInputDefault%\KeyboardInputPlugin\Keyboard\MediaPortal Shortcuts\Keyboard.xml</DestinationFilename>
+ <DestinationFilename>%Base%\Defaults\InputDeviceMappings\KeyboardInputPlugin\Keyboard\MediaPortal Shortcuts\Keyboard.xml</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="true" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\Source\KeyboardInputPlugin\Keyboard.jpg</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{30f7f5cf-f377-4634-86cb-80fbb6124a53}-Keyboard.jpg</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{6049d8df-5654-4332-abfc-b942b38e662c}-Keyboard.jpg</ZipFileName>
<DestinationFilename />
</FileItem>
</Items>
</UniqueFileList>
<ProjectSettings>
- <FolderGroups>
- <FolderGroup InstallType="CopyFile" SystemFile="false" Modified="true">
- <Param1 />
- <UpdateOption>OverwriteIfOlder</UpdateOption>
- <LocalFileName />
- <ZipFileName>Installer{CopyFile}\{0bfd413c-a655-4ae5-a9f7-7e7c617c7eeb}-</ZipFileName>
- <DestinationFilename>%CustomInputDefault%\KeyboardInputPlugin</DestinationFilename>
- <Folder>..\Release\InputDeviceMappings\defaults\KeyboardInputPlugin</Folder>
- <Group>PredefinedMappings</Group>
- <Recursive>true</Recursive>
- </FolderGroup>
- </FolderGroups>
- <ProjectFilename>D:\Development\MediaPortal\Plugins\KeyboardInputPlugin\MPE\KeyboardInputPlugin.xmp2</ProjectFilename>
+ <FolderGroups />
+ <ProjectFilename>KeyboardInputPlugin.xmp2</ProjectFilename>
<UpdatePath1>D:\Development\MediaPortal\Plugins\KeyboardInputPlugin\MPE\update.xml</UpdatePath1>
<UpdatePath2 />
<UpdatePath3 />
</ProjectSettings>
+ <IsSkin>false</IsSkin>
</PackageClass>
\ No newline at end of file
Modified: trunk/plugins/KeyboardInputPlugin/MPE/update.xml
===================================================================
--- trunk/plugins/KeyboardInputPlugin/MPE/update.xml 2011-10-24 18:51:29 UTC (rev 4316)
+++ trunk/plugins/KeyboardInputPlugin/MPE/update.xml 2011-11-04 13:47:04 UTC (rev 4317)
@@ -29,6 +29,9 @@
<Dependencies>
<Items />
</Dependencies>
+ <PluginDependencies>
+ <Items />
+ </PluginDependencies>
<GeneralInfo>
<Name>KeyboardInputPlugin</Name>
<Id>7e2b5b18-46ba-48f8-b7a3-2430405a9f86</Id>
@@ -87,6 +90,127 @@
<ProjectSettings>
<FolderGroups />
</ProjectSettings>
+ <IsSkin>false</IsSkin>
</PackageClass>
+ <PackageClass>
+ <Version>2.0</Version>
+ <Groups>
+ <Items>
+ <GroupItem Name="Default">
+ <DisplayName>Default</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Default</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="PredefinedMappings">
+ <DisplayName>PredefinedMappings</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>PredefinedMappings</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items />
+ </Sections>
+ <Dependencies>
+ <Items>
+ <DependencyItem>
+ <Type>MediaPortal</Type>
+ <Id />
+ <MinVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MinVersion>
+ <MaxVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MaxVersion>
+ <WarnOnly>false</WarnOnly>
+ <Message>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ </Items>
+ </Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="KeyboardInputPlugin.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.1.6.27644</MinRequiredVersion>
+ <DesignedForVersion>1.1.6.27644</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items />
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
+ <GeneralInfo>
+ <Name>KeyboardInputPlugin</Name>
+ <Id>7e2b5b18-46ba-48f8-b7a3-2430405a9f86</Id>
+ <Author>Ruud Senden, SilentException, Deda</Author>
+ <HomePage />
+ <ForumPage>http://forum.team-mediaportal.com/mediaportal-plugins-47/generic-keyboard-remote-input-plugin-25755/</ForumPage>
+ <UpdateUrl>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/KeyboardInputPlugin/MPE/update.xml</UpdateUrl>
+ <Version>
+ <Major>2</Major>
+ <Minor>4</Minor>
+ <Build>3</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>This plug-in allows you to map keystrokes to MediaPortal screens and actions. Virtually all keystrokes can be mapped, including Ctrl, Alt, Shift and Win modifier key combinations. Among others, this enables the use of remote controls that emulate a HID keyboard, and/or allows you to create keyboard shortcuts.</ExtensionDescription>
+ <VersionDescription>Update for MPE 1.2.1, with thanks to Deda (http://forum.team-mediaportal.com/members/89768.html)</VersionDescription>
+ <DevelopmentStatus>Stable</DevelopmentStatus>
+ <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/KeyboardInputPlugin/MPE/KeyboardInputPlugin.mpe1</OnlineLocation>
+ <ReleaseDate>2010-08-15T18:27:00</ReleaseDate>
+ <Tags>keyboard input remote</Tags>
+ <Location>D:\Development\MediaPortal\Plugins\KeyboardInputPlugin\MPE\KeyboardInputPlugin.mpe1</Location>
+ <Params>
+ <Items>
+ <SectionParam Name="Online Icon">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Configuration file">
+ <Value />
+ <ValueType>Template</ValueType>
+ <Description>The file used to configure the extension.
+ If have .exe extension the will be executed
+ If have .dll extension used like MP plugin configuration</Description>
+ </SectionParam>
+ <SectionParam Name="Online Screenshots">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>Online stored screenshot urls separated by ; </Description>
+ </SectionParam>
+ <SectionParam Name="Force to uninstall on update">
+ <Value>YES</Value>
+ <ValueType>Bool</ValueType>
+ <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ </GeneralInfo>
+ <UniqueFileList>
+ <Items />
+ </UniqueFileList>
+ <ProjectSettings>
+ <FolderGroups />
+ </ProjectSettings>
+ <IsSkin>false</IsSkin>
+ </PackageClass>
</Items>
</ExtensionCollection>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Sil...@us...> - 2011-10-24 18:51:38
|
Revision: 4316
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4316&view=rev
Author: SilentException
Date: 2011-10-24 18:51:29 +0000 (Mon, 24 Oct 2011)
Log Message:
-----------
MyDailyComics
- updated comic list (thx userjan!)
Modified Paths:
--------------
trunk/plugins/MyDailyComics/example/MyDailyComics.xml
trunk/plugins/MyDailyComics/example/comics.xml
Modified: trunk/plugins/MyDailyComics/example/MyDailyComics.xml
===================================================================
--- trunk/plugins/MyDailyComics/example/MyDailyComics.xml 2011-10-24 18:40:53 UTC (rev 4315)
+++ trunk/plugins/MyDailyComics/example/MyDailyComics.xml 2011-10-24 18:51:29 UTC (rev 4316)
@@ -112,4 +112,215 @@
<previousregex><![CDATA[<a href="(?<prev>[^"]*)" id="dyn-prev" title="Prethodni overkloking">Prethodni overkloking</a>]]></previousregex>
<nextregex><![CDATA[<a href="(?<next>[^"]*)" id="dyn-next" title="Sljedeći overkloking">Sljedeći overkloking</a>]]></nextregex>
<datetitleregex><![CDATA[<h2 class="title">\s<span>(?<title>.*?)</h2>]]></datetitleregex>
+</comic><comic>
+ <name>Off the Mark</name>
+ <url>http://www.offthemarkcartoons.com/cartoons/[yyyy]-[MM]-[dd].gif</url>
+ <enabled>true</enabled>
+ <banner>http://www.offthemark.com/siteimages/logobar.gif</banner>
+ <language>us</language>
+ <type>date</type>
+ <urltype>image</urltype>
+</comic><comic>
+ <name>Lectrrland</name>
+ <url>http://www.lectrr.be/day/[MM][dd].gif</url>
+ <enabled>true</enabled>
+ <banner>http://www.lectrr.be/boven1.gif</banner>
+ <language>nl</language>
+ <type>date</type>
+ <urltype>image</urltype>
+</comic><comic>
+ <name>SinFest</name>
+ <url>http://sinfest.net/comikaze/comics/[yyyy]-[MM]-[dd].gif</url>
+ <enabled>true</enabled>
+ <banner>http://www.sinfest.net/nique.gif</banner>
+ <language>us</language>
+ <type>date</type>
+ <urltype>image</urltype>
+</comic><comic>
+ <name>Sigmund</name>
+ <url>http://www.sigmund.nl/strips/sig[yy][MM][dd].gif</url>
+ <enabled>true</enabled>
+ <language>nl</language>
+ <type>date</type>
+ <urltype>image</urltype>
+</comic><comic>
+ <name>PVP</name>
+ <url>http://www.pvponline.com/comics/pvp[yyyy][MM][dd].png</url>
+ <enabled>true</enabled>
+ <banner>http://www.freestylemotions.com/Graphics/Comic%20Logos/PVP20logo.jpg</banner>
+ <language>us</language>
+ <type>date</type>
+ <urltype>image</urltype>
+</comic><comic>
+ <name>Flo</name>
+ <url>http://www.doyouknowflo.nl/site/uploads/[yyyy]/[MM]/[dd]-[MM]-[yy].jpg</url>
+ <enabled>true</enabled>
+ <banner>http://lh4.ggpht.com/_fPKrSfXLMMw/SQ5ECPPVriI/AAAAAAAAAso/yb-OlaPLbE0/doyouknowflo.jpg</banner>
+ <language>nl</language>
+ <type>date</type>
+ <urltype>image</urltype>
+</comic><comic>
+ <name>Cul de Sac</name>
+ <url>http://www.gocomics.com/culdesac/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <banner>http://www.comicsreporter.com/images/uploads/rthompsonculdesactop_thumb.jpg</banner>
+ <language>us</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
+</comic><comic>
+ <name>FoxTrot</name>
+ <url>http://www.gocomics.com/foxtrot/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <banner>http://images.gocomics.com/images/gocomics/flare/foxtrot/foxtrot_header.jpg</banner>
+ <language>us</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
+</comic><comic>
+ <name>Views Europe</name>
+ <url>http://www.gocomics.com/viewseurope/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <language>us</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
+</comic><comic>
+ <name>Views of the World</name>
+ <url>http://www.gocomics.com/viewsoftheworld/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <language>us</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
+</comic><comic>
+ <name>Views of Business</name>
+ <url>http://www.gocomics.com/viewsbusiness/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <language>us</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
+</comic><comic>
+ <name>Views of Latin America</name>
+ <url>http://www.gocomics.com/viewslatinamerica/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <language>us</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
+</comic><comic>
+ <name>Views of Asia</name>
+ <url>http://www.gocomics.com/viewsasia/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <language>us</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
+</comic><comic>
+ <name>Views of Middle East</name>
+ <url>http://www.gocomics.com/viewsmideast/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <language>us</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
+</comic><comic>
+ <name>Visiones del Mundo </name>
+ <url>http://www.gocomics.com/espanol/visionesdelmundo/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <language>es</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
+</comic><comic>
+ <name>Wit of the World</name>
+ <url>http://www.gocomics.com/witoftheworld/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <language>us</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
+</comic><comic>
+ <name>by Michael Ramirez</name>
+ <url>http://www.gocomics.com/michaelramirez/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <language>us</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
+</comic><comic>
+ <name>by Mike Luckovich</name>
+ <url>http://www.gocomics.com/mikeluckovich/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <language>us</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
+</comic><comic>
+ <name>by Nick Anderson</name>
+ <url>http://www.gocomics.com/nickanderson/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <language>us</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
+</comic><comic>
+ <name>by Matt Davies</name>
+ <url>http://www.gocomics.com/mattdavies/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <language>us</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
+</comic><comic>
+ <name>by Joel Pett</name>
+ <url>http://www.gocomics.com/joelpett/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <language>us</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
+</comic><comic>
+ <name>9 to 5</name>
+ <url>http://www.gocomics.com/9to5/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <language>us</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
+</comic><comic>
+ <name>Views of Africa</name>
+ <url>http://www.gocomics.com/viewsafrica/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <language>us</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
+</comic><comic>
+ <name>Views of America</name>
+ <url>http://www.gocomics.com/viewsamerica/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <language>us</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
</comic></MyDailyComics>
\ No newline at end of file
Modified: trunk/plugins/MyDailyComics/example/comics.xml
===================================================================
--- trunk/plugins/MyDailyComics/example/comics.xml 2011-10-24 18:40:53 UTC (rev 4315)
+++ trunk/plugins/MyDailyComics/example/comics.xml 2011-10-24 18:51:29 UTC (rev 4316)
@@ -112,4 +112,215 @@
<previousregex><![CDATA[<a href="(?<prev>[^"]*)" id="dyn-prev" title="Prethodni overkloking">Prethodni overkloking</a>]]></previousregex>
<nextregex><![CDATA[<a href="(?<next>[^"]*)" id="dyn-next" title="Sljedeći overkloking">Sljedeći overkloking</a>]]></nextregex>
<datetitleregex><![CDATA[<h2 class="title">\s<span>(?<title>.*?)</h2>]]></datetitleregex>
+</comic><comic>
+ <name>Off the Mark</name>
+ <url>http://www.offthemarkcartoons.com/cartoons/[yyyy]-[MM]-[dd].gif</url>
+ <enabled>true</enabled>
+ <banner>http://www.offthemark.com/siteimages/logobar.gif</banner>
+ <language>us</language>
+ <type>date</type>
+ <urltype>image</urltype>
+</comic><comic>
+ <name>Lectrrland</name>
+ <url>http://www.lectrr.be/day/[MM][dd].gif</url>
+ <enabled>true</enabled>
+ <banner>http://www.lectrr.be/boven1.gif</banner>
+ <language>nl</language>
+ <type>date</type>
+ <urltype>image</urltype>
+</comic><comic>
+ <name>SinFest</name>
+ <url>http://sinfest.net/comikaze/comics/[yyyy]-[MM]-[dd].gif</url>
+ <enabled>true</enabled>
+ <banner>http://www.sinfest.net/nique.gif</banner>
+ <language>us</language>
+ <type>date</type>
+ <urltype>image</urltype>
+</comic><comic>
+ <name>Sigmund</name>
+ <url>http://www.sigmund.nl/strips/sig[yy][MM][dd].gif</url>
+ <enabled>true</enabled>
+ <language>nl</language>
+ <type>date</type>
+ <urltype>image</urltype>
+</comic><comic>
+ <name>PVP</name>
+ <url>http://www.pvponline.com/comics/pvp[yyyy][MM][dd].png</url>
+ <enabled>true</enabled>
+ <banner>http://www.freestylemotions.com/Graphics/Comic%20Logos/PVP20logo.jpg</banner>
+ <language>us</language>
+ <type>date</type>
+ <urltype>image</urltype>
+</comic><comic>
+ <name>Flo</name>
+ <url>http://www.doyouknowflo.nl/site/uploads/[yyyy]/[MM]/[dd]-[MM]-[yy].jpg</url>
+ <enabled>true</enabled>
+ <banner>http://lh4.ggpht.com/_fPKrSfXLMMw/SQ5ECPPVriI/AAAAAAAAAso/yb-OlaPLbE0/doyouknowflo.jpg</banner>
+ <language>nl</language>
+ <type>date</type>
+ <urltype>image</urltype>
+</comic><comic>
+ <name>Cul de Sac</name>
+ <url>http://www.gocomics.com/culdesac/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <banner>http://www.comicsreporter.com/images/uploads/rthompsonculdesactop_thumb.jpg</banner>
+ <language>us</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
+</comic><comic>
+ <name>FoxTrot</name>
+ <url>http://www.gocomics.com/foxtrot/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <banner>http://images.gocomics.com/images/gocomics/flare/foxtrot/foxtrot_header.jpg</banner>
+ <language>us</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
+</comic><comic>
+ <name>Views Europe</name>
+ <url>http://www.gocomics.com/viewseurope/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <language>us</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
+</comic><comic>
+ <name>Views of the World</name>
+ <url>http://www.gocomics.com/viewsoftheworld/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <language>us</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
+</comic><comic>
+ <name>Views of Business</name>
+ <url>http://www.gocomics.com/viewsbusiness/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <language>us</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
+</comic><comic>
+ <name>Views of Latin America</name>
+ <url>http://www.gocomics.com/viewslatinamerica/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <language>us</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
+</comic><comic>
+ <name>Views of Asia</name>
+ <url>http://www.gocomics.com/viewsasia/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <language>us</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
+</comic><comic>
+ <name>Views of Middle East</name>
+ <url>http://www.gocomics.com/viewsmideast/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <language>us</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
+</comic><comic>
+ <name>Visiones del Mundo </name>
+ <url>http://www.gocomics.com/espanol/visionesdelmundo/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <language>es</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
+</comic><comic>
+ <name>Wit of the World</name>
+ <url>http://www.gocomics.com/witoftheworld/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <language>us</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
+</comic><comic>
+ <name>by Michael Ramirez</name>
+ <url>http://www.gocomics.com/michaelramirez/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <language>us</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
+</comic><comic>
+ <name>by Mike Luckovich</name>
+ <url>http://www.gocomics.com/mikeluckovich/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <language>us</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
+</comic><comic>
+ <name>by Nick Anderson</name>
+ <url>http://www.gocomics.com/nickanderson/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <language>us</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
+</comic><comic>
+ <name>by Matt Davies</name>
+ <url>http://www.gocomics.com/mattdavies/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <language>us</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
+</comic><comic>
+ <name>by Joel Pett</name>
+ <url>http://www.gocomics.com/joelpett/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <language>us</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
+</comic><comic>
+ <name>9 to 5</name>
+ <url>http://www.gocomics.com/9to5/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <language>us</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
+</comic><comic>
+ <name>Views of Africa</name>
+ <url>http://www.gocomics.com/viewsafrica/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <language>us</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
+</comic><comic>
+ <name>Views of America</name>
+ <url>http://www.gocomics.com/viewsamerica/[yyyy]/[MM]/[dd]</url>
+ <enabled>true</enabled>
+ <language>us</language>
+ <type>date</type>
+ <urltype>webpage</urltype>
+ <startswith>http://cdn.svcs.c2.uclick.com/</startswith>
+ <endswith>5b</endswith>
</comic></MyDailyComics>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Sil...@us...> - 2011-10-24 18:40:59
|
Revision: 4315
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4315&view=rev
Author: SilentException
Date: 2011-10-24 18:40:53 +0000 (Mon, 24 Oct 2011)
Log Message:
-----------
BrowseTheWeb
- updated xulrunner
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner.zip
Modified: trunk/plugins/BrowseTheWeb/Release/Files/xulrunner.zip
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
2 messages has been excluded from this view by a project administrator.
![http://www.sample.com/image.jpg";](http://www.sample.com/image.jpg";){kind=link}
