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: <hor...@us...> - 2012-01-07 19:40:03
|
Revision: 4389
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4389&view=rev
Author: horned-reaper
Date: 2012-01-07 19:39:56 +0000 (Sat, 07 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/ResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/releases/update.xml
Modified: trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat
===================================================================
--- trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat 2012-01-07 16:50:13 UTC (rev 4388)
+++ trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat 2012-01-07 19:39:56 UTC (rev 4389)
@@ -13,7 +13,7 @@
REM Set plugin DLL path
set PluginDLL=%BuildPath%\FritzBox.dll
-REM set logfile where the infos are written to, and clear that file
+REM set log file where the infos are written to, and clear that file
set LOG=Build.log
echo. > %LOG%
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2012-01-07 16:50:13 UTC (rev 4388)
+++ trunk/plugins/FritzBox/Build/Build.log 2012-01-07 19:39:56 UTC (rev 4389)
@@ -1,16 +1,12 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4387
-Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
-Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
-Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs
-Updating: D:\FritzBox\Tools\FritzBoxConfigTester\Properties\AssemblyInfo.cs
-Updating: D:\FritzBox\Tools\FritzBoxDebugger\Properties\AssemblyInfo.cs
+Unable to determine SVN version. Try with a SVN cleanup!
+Local SVN not up to date
Microsoft (R) Build Engine Version 4.0.30319.1
[Microsoft .NET Framework, Version 4.0.30319.239]
Copyright (C) Microsoft Corporation 2007. All rights reserved.
-Build started 07.01.2012 17:48:25.
+Build started 07.01.2012 17:50:23.
Project "D:\FritzBox\FritzBox.sln" on node 1 (Rebuild target(s)).
ValidateSolutionConfiguration:
Building solution configuration "Release|Mixed Platforms".
@@ -156,6 +152,8 @@
Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.pdb".
Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.read.7.tlog".
Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.write.7.tlog".
+ Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.read.6.tlog".
+ Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.write.6.tlog".
CoreResGen:
"C:\Program Files\Microsoft SDKs\Windows\v7.0A\bin\NETFX 4.0 Tools\resgen.exe" /useSourcePath /r:"C:\Program Files\Team MediaPortal\MediaPortal\Core.dll" /r:D:\FritzBox\FritzBox\bin\Release\FritzBox.dll /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\mscorlib.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Core.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Data.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Drawing.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Windows.Forms.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Xml.dll" /compile DebugForm.resx,obj\Release\FritzBoxDebugger.DebugForm.resources
Processing resource file "DebugForm.resx" into "obj\Release\FritzBoxDebugger.DebugForm.resources".
@@ -195,13 +193,8 @@
0 Warning(s)
0 Error(s)
-Time Elapsed 00:00:01.79
+Time Elapsed 00:00:02.09
Reverting to build 0
-Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
-Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
-Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs
-Updating: D:\FritzBox\Tools\FritzBoxConfigTester\Properties\AssemblyInfo.cs
-Updating: D:\FritzBox\Tools\FritzBoxDebugger\Properties\AssemblyInfo.cs
C:\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\FritzBox.dll
1 File(s) copied
..\FritzBox\Resources\speexdec.exe
@@ -280,7 +273,7 @@
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
36 File(s) copied
MpeMaker version: 1.2.1.0
-Build started at 17:48:29
+Build started at 17:50:27
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2012-01-07 16:50:13 UTC (rev 4388)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2012-01-07 19:39:56 UTC (rev 4389)
@@ -596,7 +596,7 @@
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
- <ReleaseDate>2012-01-07T17:48:29.246982+01:00</ReleaseDate>
+ <ReleaseDate>2012-01-07T17:50:27.4469452+01:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/ResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.csproj.FileListAbsolute.txt
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.csproj.FileListAbsolute.txt 2012-01-07 16:50:13 UTC (rev 4388)
+++ trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.csproj.FileListAbsolute.txt 2012-01-07 19:39:56 UTC (rev 4389)
@@ -23,7 +23,5 @@
D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\log4net.dll
D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\Ionic.Zip.dll
D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\FritzBox.pdb
-D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.read.7.tlog
-D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.write.7.tlog
D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.read.6.tlog
D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.write.6.tlog
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/releases/update.xml
===================================================================
--- trunk/plugins/FritzBox/releases/update.xml 2012-01-07 16:50:13 UTC (rev 4388)
+++ trunk/plugins/FritzBox/releases/update.xml 2012-01-07 19:39:56 UTC (rev 4389)
@@ -125,7 +125,7 @@
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
- <ReleaseDate>2012-01-07T17:48:29.246982+01:00</ReleaseDate>
+ <ReleaseDate>2012-01-07T17:50:27.4469452+01:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hor...@us...> - 2012-01-07 16:50:20
|
Revision: 4388
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4388&view=rev
Author: horned-reaper
Date: 2012-01-07 16:50:13 +0000 (Sat, 07 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/ResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/releases/update.xml
Added Paths:
-----------
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.read.7.tlog
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.write.7.tlog
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2012-01-07 16:46:20 UTC (rev 4387)
+++ trunk/plugins/FritzBox/Build/Build.log 2012-01-07 16:50:13 UTC (rev 4388)
@@ -1,12 +1,16 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-Unable to determine SVN version. Try with a SVN cleanup!
-Local SVN not up to date
+SVN Version: 4387
+Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
+Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
+Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs
+Updating: D:\FritzBox\Tools\FritzBoxConfigTester\Properties\AssemblyInfo.cs
+Updating: D:\FritzBox\Tools\FritzBoxDebugger\Properties\AssemblyInfo.cs
Microsoft (R) Build Engine Version 4.0.30319.1
[Microsoft .NET Framework, Version 4.0.30319.239]
Copyright (C) Microsoft Corporation 2007. All rights reserved.
-Build started 07.01.2012 17:44:23.
+Build started 07.01.2012 17:48:25.
Project "D:\FritzBox\FritzBox.sln" on node 1 (Rebuild target(s)).
ValidateSolutionConfiguration:
Building solution configuration "Release|Mixed Platforms".
@@ -150,8 +154,8 @@
Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.DebugForm.resources".
Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.exe".
Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.pdb".
- Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.read.6.tlog".
- Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.write.6.tlog".
+ Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.read.7.tlog".
+ Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.write.7.tlog".
CoreResGen:
"C:\Program Files\Microsoft SDKs\Windows\v7.0A\bin\NETFX 4.0 Tools\resgen.exe" /useSourcePath /r:"C:\Program Files\Team MediaPortal\MediaPortal\Core.dll" /r:D:\FritzBox\FritzBox\bin\Release\FritzBox.dll /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\mscorlib.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Core.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Data.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Drawing.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Windows.Forms.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Xml.dll" /compile DebugForm.resx,obj\Release\FritzBoxDebugger.DebugForm.resources
Processing resource file "DebugForm.resx" into "obj\Release\FritzBoxDebugger.DebugForm.resources".
@@ -191,8 +195,13 @@
0 Warning(s)
0 Error(s)
-Time Elapsed 00:00:01.94
+Time Elapsed 00:00:01.79
Reverting to build 0
+Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
+Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
+Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs
+Updating: D:\FritzBox\Tools\FritzBoxConfigTester\Properties\AssemblyInfo.cs
+Updating: D:\FritzBox\Tools\FritzBoxDebugger\Properties\AssemblyInfo.cs
C:\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\FritzBox.dll
1 File(s) copied
..\FritzBox\Resources\speexdec.exe
@@ -271,7 +280,7 @@
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
36 File(s) copied
MpeMaker version: 1.2.1.0
-Build started at 17:44:27
+Build started at 17:48:29
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2012-01-07 16:46:20 UTC (rev 4387)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2012-01-07 16:50:13 UTC (rev 4388)
@@ -596,7 +596,7 @@
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
- <ReleaseDate>2012-01-07T17:44:27.2289772+01:00</ReleaseDate>
+ <ReleaseDate>2012-01-07T17:48:29.246982+01:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/ResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.csproj.FileListAbsolute.txt
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.csproj.FileListAbsolute.txt 2012-01-07 16:46:20 UTC (rev 4387)
+++ trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.csproj.FileListAbsolute.txt 2012-01-07 16:50:13 UTC (rev 4388)
@@ -23,5 +23,7 @@
D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\log4net.dll
D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\Ionic.Zip.dll
D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\FritzBox.pdb
+D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.read.7.tlog
+D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.write.7.tlog
D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.read.6.tlog
D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.write.6.tlog
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Added: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.read.7.tlog
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.read.7.tlog
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.write.7.tlog
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.write.7.tlog
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/FritzBox/releases/update.xml
===================================================================
--- trunk/plugins/FritzBox/releases/update.xml 2012-01-07 16:46:20 UTC (rev 4387)
+++ trunk/plugins/FritzBox/releases/update.xml 2012-01-07 16:50:13 UTC (rev 4388)
@@ -125,7 +125,7 @@
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
- <ReleaseDate>2012-01-07T17:44:27.2289772+01:00</ReleaseDate>
+ <ReleaseDate>2012-01-07T17:48:29.246982+01:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hor...@us...> - 2012-01-07 16:46:26
|
Revision: 4387
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4387&view=rev
Author: horned-reaper
Date: 2012-01-07 16:46:20 +0000 (Sat, 07 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/ResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/releases/update.xml
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2012-01-07 16:44:07 UTC (rev 4386)
+++ trunk/plugins/FritzBox/Build/Build.log 2012-01-07 16:46:20 UTC (rev 4387)
@@ -1,16 +1,12 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4385
-Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
-Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
-Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs
-Updating: D:\FritzBox\Tools\FritzBoxConfigTester\Properties\AssemblyInfo.cs
-Updating: D:\FritzBox\Tools\FritzBoxDebugger\Properties\AssemblyInfo.cs
+Unable to determine SVN version. Try with a SVN cleanup!
+Local SVN not up to date
Microsoft (R) Build Engine Version 4.0.30319.1
[Microsoft .NET Framework, Version 4.0.30319.239]
Copyright (C) Microsoft Corporation 2007. All rights reserved.
-Build started 07.01.2012 17:42:45.
+Build started 07.01.2012 17:44:23.
Project "D:\FritzBox\FritzBox.sln" on node 1 (Rebuild target(s)).
ValidateSolutionConfiguration:
Building solution configuration "Release|Mixed Platforms".
@@ -195,13 +191,8 @@
0 Warning(s)
0 Error(s)
-Time Elapsed 00:00:01.96
+Time Elapsed 00:00:01.94
Reverting to build 0
-Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
-Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
-Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs
-Updating: D:\FritzBox\Tools\FritzBoxConfigTester\Properties\AssemblyInfo.cs
-Updating: D:\FritzBox\Tools\FritzBoxDebugger\Properties\AssemblyInfo.cs
C:\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\FritzBox.dll
1 File(s) copied
..\FritzBox\Resources\speexdec.exe
@@ -280,7 +271,7 @@
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
36 File(s) copied
MpeMaker version: 1.2.1.0
-Build started at 17:42:49
+Build started at 17:44:27
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2012-01-07 16:44:07 UTC (rev 4386)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2012-01-07 16:46:20 UTC (rev 4387)
@@ -596,7 +596,7 @@
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
- <ReleaseDate>2012-01-07T17:42:49.308174+01:00</ReleaseDate>
+ <ReleaseDate>2012-01-07T17:44:27.2289772+01:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/ResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/releases/update.xml
===================================================================
--- trunk/plugins/FritzBox/releases/update.xml 2012-01-07 16:44:07 UTC (rev 4386)
+++ trunk/plugins/FritzBox/releases/update.xml 2012-01-07 16:46:20 UTC (rev 4387)
@@ -125,7 +125,7 @@
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
- <ReleaseDate>2012-01-07T17:42:49.308174+01:00</ReleaseDate>
+ <ReleaseDate>2012-01-07T17:44:27.2289772+01:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hor...@us...> - 2012-01-07 16:44:14
|
Revision: 4386
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4386&view=rev
Author: horned-reaper
Date: 2012-01-07 16:44:07 +0000 (Sat, 07 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/Docs/Vorgehensweise beim Update.txt
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/ResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/releases/update.xml
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2012-01-07 16:36:15 UTC (rev 4385)
+++ trunk/plugins/FritzBox/Build/Build.log 2012-01-07 16:44:07 UTC (rev 4386)
@@ -1,6 +1,6 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4384
+SVN Version: 4385
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs
@@ -10,7 +10,7 @@
[Microsoft .NET Framework, Version 4.0.30319.239]
Copyright (C) Microsoft Corporation 2007. All rights reserved.
-Build started 07.01.2012 17:27:34.
+Build started 07.01.2012 17:42:45.
Project "D:\FritzBox\FritzBox.sln" on node 1 (Rebuild target(s)).
ValidateSolutionConfiguration:
Building solution configuration "Release|Mixed Platforms".
@@ -154,8 +154,8 @@
Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.DebugForm.resources".
Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.exe".
Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.pdb".
- Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.read.7.tlog".
- Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.write.7.tlog".
+ Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.read.6.tlog".
+ Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.write.6.tlog".
CoreResGen:
"C:\Program Files\Microsoft SDKs\Windows\v7.0A\bin\NETFX 4.0 Tools\resgen.exe" /useSourcePath /r:"C:\Program Files\Team MediaPortal\MediaPortal\Core.dll" /r:D:\FritzBox\FritzBox\bin\Release\FritzBox.dll /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\mscorlib.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Core.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Data.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Drawing.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Windows.Forms.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Xml.dll" /compile DebugForm.resx,obj\Release\FritzBoxDebugger.DebugForm.resources
Processing resource file "DebugForm.resx" into "obj\Release\FritzBoxDebugger.DebugForm.resources".
@@ -195,7 +195,7 @@
0 Warning(s)
0 Error(s)
-Time Elapsed 00:00:01.98
+Time Elapsed 00:00:01.96
Reverting to build 0
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
@@ -280,7 +280,7 @@
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
36 File(s) copied
MpeMaker version: 1.2.1.0
-Build started at 17:27:38
+Build started at 17:42:49
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Modified: trunk/plugins/FritzBox/Docs/Vorgehensweise beim Update.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Vorgehensweise beim Update.txt 2012-01-07 16:36:15 UTC (rev 4385)
+++ trunk/plugins/FritzBox/Docs/Vorgehensweise beim Update.txt 2012-01-07 16:44:07 UTC (rev 4386)
@@ -3,7 +3,7 @@
3. Pr\xFCfen, ob Installer-Datei mit der korrekten Versionsnummer angelegt wurde. Beispiel:
- OK: FritzBox_v0.3.5.4364.mpe1
- Falsch: FritzBox_v0.3.5.0.mpe1
-4. Wenn falsch, dann Installer-Datei l\xF6schen, SVN update ausf\xFChren und Build.bat erneut ausf\xFChren
+4. Wenn falsch, dann Installer-Datei l\xF6schen, SVN update ausf\xFChren und Build.bat erneut ausf\xFChren. Falls das auch nicht helfen sollte, Installer-Datei l\xF6schen, Commit ausf\xFChren und bei Punkt 2 fortfahren
5. \xC4nderungen auf MediaPortal-Webseite hochladen
- Versionsnummer
- Change-Log-Eintrag
Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2012-01-07 16:36:15 UTC (rev 4385)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2012-01-07 16:44:07 UTC (rev 4386)
@@ -596,7 +596,7 @@
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
- <ReleaseDate>2012-01-07T17:27:38.4333325+01:00</ReleaseDate>
+ <ReleaseDate>2012-01-07T17:42:49.308174+01:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/ResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/releases/update.xml
===================================================================
--- trunk/plugins/FritzBox/releases/update.xml 2012-01-07 16:36:15 UTC (rev 4385)
+++ trunk/plugins/FritzBox/releases/update.xml 2012-01-07 16:44:07 UTC (rev 4386)
@@ -125,7 +125,7 @@
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
- <ReleaseDate>2012-01-07T17:27:38.4333325+01:00</ReleaseDate>
+ <ReleaseDate>2012-01-07T17:42:49.308174+01:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hor...@us...> - 2012-01-07 16:36:26
|
Revision: 4385
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4385&view=rev
Author: horned-reaper
Date: 2012-01-07 16:36:15 +0000 (Sat, 07 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/Docs/Ausstehend.txt
trunk/plugins/FritzBox/Docs/Changes.txt
trunk/plugins/FritzBox/FritzBox/FritzBox.cs
trunk/plugins/FritzBox/FritzBox/FritzBox.csproj
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.resx
trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/CallAction.cs
trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/Caller.cs
trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/BackGroundWorker.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/BlockingQueue.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/FritzboxPhonebook.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/Logger.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/LoggerFactory.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/PhonebookItem.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/Task.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/VBReader.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/VoiceboxItem.cs
trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_el.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_en-US.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_en.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_es.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_fr.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_it.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_nl.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_ru.xml
trunk/plugins/FritzBox/FritzBox/Properties/AssemblyInfo.cs
trunk/plugins/FritzBox/FritzBox/Settings.cs
trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/hover_FritzBox.png
trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/hover_FritzBox.png
trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/hover_FritzBox.png
trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/hover_FritzBox.png
trunk/plugins/FritzBox/FritzBox/Skin/Maya/Media/hover_FritzBox.png
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Debug/GenerateResource-ResGen.read.1.tlog
trunk/plugins/FritzBox/FritzBox/obj/Debug/GenerateResource-ResGen.write.1.tlog
trunk/plugins/FritzBox/FritzBox/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Release/ResolveAssemblyReference.cache
trunk/plugins/FritzBox/FritzBox/obj/Release/TempPE/Properties.Resources.Designer.cs.dll
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/ResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/ResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.DebugForm.resources
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/releases/update.xml
Added Paths:
-----------
trunk/plugins/FritzBox/Archived code/
trunk/plugins/FritzBox/Archived code/GCollections.cs
trunk/plugins/FritzBox/Archived code/InversSearch.cs
trunk/plugins/FritzBox/Archived code/Inverse Search.txt
trunk/plugins/FritzBox/Archived code/InverseSearchOert.cs
trunk/plugins/FritzBox/FritzBox/EditPhoneBook.Designer.cs
trunk/plugins/FritzBox/FritzBox/EditPhoneBook.cs
trunk/plugins/FritzBox/FritzBox/EditPhoneBook.resx
trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.EditPhoneBook.resources
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.EditPhoneBook.resources
trunk/plugins/FritzBox/FritzBox/obj/Release/GenerateResource-ResGen.read.1.tlog
trunk/plugins/FritzBox/FritzBox/obj/Release/GenerateResource-ResGen.read.4.tlog
trunk/plugins/FritzBox/FritzBox/obj/Release/GenerateResource-ResGen.write.1.tlog
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/AxInterop.WMPLib.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Bass.Net.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/BassRegistration.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/BassVisAPI.Net.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Common.Utils.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Core.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Dialogs.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/DirectShowLib.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Interop.SHDocVw.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Interop.WMPLib.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Ionic.Zip.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/MediaPortal.Support.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Utils.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/edtftpnet-1.2.2.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/log4net.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/taglib-sharp.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/build.force
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/AxInterop.WMPLib.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/Bass.Net.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/BassRegistration.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/BassVisAPI.Net.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/Common.Utils.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/Core.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/Dialogs.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/DirectShowLib.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/Interop.SHDocVw.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/Interop.WMPLib.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/Ionic.Zip.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/MediaPortal.Support.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/Utils.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/edtftpnet-1.2.2.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/log4net.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/taglib-sharp.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.read.6.tlog
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.write.6.tlog
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/build.force
Removed Paths:
-------------
trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/PhoneBook.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/GCollections.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/InversSearch.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/InversSearchOert.cs
Property Changed:
----------------
trunk/plugins/FritzBox/FritzBox/
trunk/plugins/FritzBox/FritzBox/Skin/
Added: trunk/plugins/FritzBox/Archived code/GCollections.cs
===================================================================
--- trunk/plugins/FritzBox/Archived code/GCollections.cs (rev 0)
+++ trunk/plugins/FritzBox/Archived code/GCollections.cs 2012-01-07 16:36:15 UTC (rev 4385)
@@ -0,0 +1,1875 @@
+ // Generic typesafe collections in Generic C#
+ // This program requires .Net version 2.0.
+ // Peter Sestoft (se...@it...) 2001-12-02, 2003-11-23, 2004-07-26
+
+ // NOTE: FOR SERIOUS WORK, USE THE C5 GENERIC COLLECTION LIBRARY!
+ // SEE: http://www.itu.dk/research/c5/
+
+ // For this code, see documentation in file collections.txt
+
+ // To create a module for use from other files, compile with
+ // csc /t:module GCollections.cs
+
+ // To do:
+ // * Test systematically (no time, unfortunately)
+ // * Make GetHashCode constant time everywhere
+ // * Make the collections themselves implement IComparable<T> ?
+ // * Add interval operators to ISortedSet and ISortedMap operations
+ // * Implement HashSets from the ground up, using linked list for
+ // buckets, and retaining the hashcode to avoid recomputing it.
+ // * There's a fair amount of code duplication (generic/non-generic)
+ // in TreeMap, but I fear the performance consequences of removing it.
+
+ using System; // For exceptions
+
+ namespace GCollections
+ {
+
+ // INTERFACES ===================================================
+
+ // Enumerators --------------------------------------------------
+
+ public interface IEnumerator<T>
+ {
+ T Current { get; }
+ bool MoveNext();
+ void Reset();
+ }
+
+ // Enumerables --------------------------------------------------
+
+ public interface IEnumerable<T>
+ {
+ IEnumerator<T> GetEnumerator();
+ }
+
+ // Collections --------------------------------------------------
+
+ public interface ICollection<T> : IEnumerable<T>
+ {
+ int Count { get; }
+ }
+
+ // Comparing two things -----------------------------------------
+
+ public interface IComparer<T>
+ {
+ int Compare(T v1, T v2);
+ }
+
+ // Comparing to type T ------------------------------------------
+
+ public interface IComparable<T>
+ {
+ int CompareTo(T that);
+ }
+
+ // Maps ---------------------------------------------------------
+
+ public interface IMap<K, V> : ICollection<MapEntry<K, V>>
+ {
+ bool Add(K key, V val); // Cannot return old value ...
+ MapEntry<K, V> Remove(K key);
+ V this[K key] { get; set; }
+ bool Contains(K key);
+ // ICollection<K> Keys { get; }
+ // ICollection<V> Values { get; }
+ }
+
+ // Sorted maps --------------------------------------------------
+
+ public interface ISortedMap<K, V> : IMap<K, V> { }
+
+ // Map entries --------------------------------------------------
+
+ public struct MapEntry<K, V>
+ {
+ K key; V val;
+
+ public MapEntry(K key, V val)
+ {
+ this.key = key; this.val = val;
+ }
+
+ public K Key { get { return key; } }
+
+ public V Value { get { return val; } }
+ }
+
+ // Sets ---------------------------------------------------------
+
+ public interface ISet<T> : ICollection<T>
+ {
+ bool Add(T item); // return true if item was added
+ T Remove(T item); // return removed item
+ bool Contains(T item);
+ }
+
+ // Sorted sets --------------------------------------------------
+
+ public interface ISortedSet<T> : ISet<T> { }
+
+ // Lists, stacks and queues -------------------------------------
+
+ public interface IList<T> : ICollection<T>
+ {
+ bool Add(T item);
+ bool Add(int i, T item);
+ T Remove();
+ T RemoveAt(int i);
+ T Remove(T item);
+ bool Contains(T item); // using Equals
+ T this[int index] { get; set; }
+ }
+
+ // IMPLEMENTATIONS ==============================================
+
+ // HashMaps -----------------------------------------------------
+
+ public class HashMap<K, V> : IMap<K, V>
+ {
+ private System.Collections.Hashtable table;
+
+ public HashMap()
+ {
+ table = new System.Collections.Hashtable();
+ }
+
+ public ICollection<K> Keys
+ {
+ get { return new Collection<K>(table.Keys); }
+ }
+
+ public ICollection<V> Values
+ {
+ get { return new Collection<V>(table.Values); }
+ }
+
+ public int Count
+ {
+ get { return table.Count; }
+ }
+
+ public bool Add(K key, V val)
+ {
+ if (table.Contains(key))
+ return false;
+ else
+ {
+ table.Add(key, val);
+ return true;
+ }
+ }
+
+ public MapEntry<K, V> Remove(K key)
+ {
+ if (table.Contains(key))
+ {
+ V val = (V)table[key];
+ table.Remove(key);
+ return new MapEntry<K, V>(key, val); // Issue: not quite as spec'ed
+ }
+ else
+ throw new ElementNotFoundException();
+ }
+
+ public V this[K key]
+ {
+ get { return (V)table[key]; }
+ set { table[key] = value; }
+ }
+
+ public bool Contains(K key)
+ {
+ return table.Contains(key);
+ }
+
+ // Two classes to help convert the underlying Hashtable's Keys and
+ // Values object ICollections into generic collections
+
+ class Collection<T> : ICollection<T>
+ {
+ private System.Collections.ICollection coll;
+
+ public Collection(System.Collections.ICollection coll)
+ {
+ this.coll = coll;
+ }
+
+ public IEnumerator<T> GetEnumerator()
+ {
+ return new Enumerator<T>(coll.GetEnumerator());
+ }
+
+ public int Count
+ {
+ get { return coll.Count; }
+ }
+ }
+
+ // Issue: this function could be optimized to not use the enumerators
+
+ public override int GetHashCode()
+ {
+ int sum = 0;
+ foreach (MapEntry<K, V> entry in this)
+ sum += entry.Key.GetHashCode() ^ entry.Value.GetHashCode();
+ return sum;
+ }
+
+ class Enumerator<T> : IEnumerator<T>
+ {
+ System.Collections.IEnumerator enm;
+
+ public Enumerator(System.Collections.IEnumerator enm)
+ {
+ this.enm = enm;
+ }
+
+ public T Current
+ {
+ get { return (T)enm.Current; }
+ }
+
+ public bool MoveNext()
+ {
+ return enm.MoveNext();
+ }
+
+ public void Reset()
+ {
+ enm.Reset();
+ }
+ }
+
+ public IEnumerator<MapEntry<K, V>> GetEnumerator()
+ {
+ return new HashMapEnumerator(this, table.GetEnumerator());
+ }
+
+ class HashMapEnumerator : IEnumerator<MapEntry<K, V>>
+ {
+ HashMap<K, V> map;
+ System.Collections.IEnumerator enm;
+
+ public HashMapEnumerator(HashMap<K, V> map,
+ System.Collections.IEnumerator enm)
+ {
+ this.map = map; this.enm = enm;
+ }
+
+ // Issue: should probably not create a new struct on every invocation
+ public virtual MapEntry<K, V> Current
+ {
+ get
+ {
+ System.Collections.DictionaryEntry entry
+ = (System.Collections.DictionaryEntry)enm.Current;
+ return new MapEntry<K, V>((K)entry.Key, (V)entry.Value);
+ }
+ }
+
+ public bool MoveNext()
+ {
+ return enm.MoveNext();
+ }
+
+ public void Reset()
+ {
+ enm.Reset();
+ }
+ }
+ }
+
+ // HashSet, sets of unordered items -----------------------------
+
+ public class HashSet<T> : ISet<T>
+ {
+ private System.Collections.Hashtable /* from T to null */ table;
+ private int hashCode = 0; // to save recomputing it
+
+ public HashSet()
+ {
+ table = new System.Collections.Hashtable();
+ }
+
+ public HashSet(T v)
+ : this()
+ {
+ Add(v);
+ }
+
+ public HashSet(HashSet<T> s)
+ : this()
+ {
+ IEnumerator<T> sIter = s.GetEnumerator();
+ while (sIter.MoveNext())
+ Add(sIter.Current);
+ }
+
+ public int Count
+ {
+ get { return table.Count; }
+ }
+
+ public bool Add(T v)
+ {
+ if (!table.Contains(v))
+ {
+ table.Add(v, null);
+ hashCode += v.GetHashCode();
+ return true;
+ }
+ else
+ return false;
+ }
+
+ public T Remove(T v)
+ {
+ if (table.Contains(v))
+ {
+ table.Remove(v);
+ hashCode -= v.GetHashCode();
+ return v; // Issue: not quite according to spec
+ }
+ else
+ throw new ElementNotFoundException();
+ }
+
+ public bool Contains(T v)
+ {
+ return table.Contains(v);
+ }
+
+ public IEnumerator<T> GetEnumerator()
+ {
+ return new HashSetEnumerator(table);
+ }
+
+ class HashSetEnumerator : IEnumerator<T>
+ {
+ System.Collections.IEnumerator enm;
+
+ public HashSetEnumerator(System.Collections.Hashtable table)
+ {
+ this.enm = table.Keys.GetEnumerator();
+ }
+
+ public virtual T Current
+ {
+ get { return (T)enm.Current; }
+ }
+
+ public bool MoveNext()
+ {
+ return enm.MoveNext();
+ }
+
+ public void Reset()
+ {
+ enm.Reset();
+ }
+ }
+
+ public override int GetHashCode()
+ {
+ return hashCode;
+ }
+
+ public override bool Equals(object that)
+ {
+ // Issue: could compare hashcodes, if GetHashCode were constant time
+ if (that is ISet<T> && Count == ((ISet<T>)that).Count)
+ {
+ ISet<T> thatSet = (ISet<T>)that;
+ IEnumerator<T> thisenm = this.GetEnumerator();
+ while (thisenm.MoveNext())
+ {
+ if (!thatSet.Contains(thisenm.Current))
+ return false;
+ }
+ return true;
+ }
+ else
+ return false;
+ }
+ }
+
+ // Doubly-linked lists ------------------------------------------
+ // Add(T) at end, Remove() from front; behaves like a queue (FIFO)
+
+ public class LinkedList<T> : IList<T>
+ {
+ int size; // Number of elements in the list
+ int stamp; // To detect modification during enumeration
+ Node first, last; // Invariant: first==null iff last==null
+
+ private class Node
+ {
+ public Node prev, next;
+ public T item;
+
+ public Node(T item)
+ {
+ this.item = item;
+ }
+
+ public Node(T item, Node prev, Node next)
+ {
+ this.item = item; this.prev = prev; this.next = next;
+ }
+ }
+
+ public LinkedList()
+ {
+ first = last = null;
+ size = stamp = 0;
+ }
+
+ public int Count
+ {
+ get { return size; }
+ }
+
+ public T this[int index]
+ {
+ get { return get(index).item; }
+ set { get(index).item = value; }
+ }
+
+ private Node get(int n)
+ {
+ if (n < 0 || n >= size)
+ throw new IndexOutOfRangeException();
+ else if (n < size / 2)
+ { // Closer to front
+ Node node = first;
+ for (int i = 0; i < n; i++)
+ node = node.next;
+ return node;
+ }
+ else
+ { // Closer to end
+ Node node = last;
+ for (int i = size - 1; i > n; i--)
+ node = node.prev;
+ return node;
+ }
+ }
+
+ public bool Add(T item)
+ {
+ return AddLast(item);
+ }
+
+ public bool AddFirst(T item)
+ {
+ if (first == null) // and thus last == null
+ first = last = new Node(item);
+ else
+ {
+ Node tmp = new Node(item, null, first);
+ first.prev = tmp;
+ first = tmp;
+ }
+ size++;
+ stamp++;
+ return true;
+ }
+
+ public bool Add(int i, T item)
+ {
+ if (i == 0)
+ return AddFirst(item);
+ else if (i == size)
+ return AddLast(item);
+ else
+ {
+ Node node = get(i);
+ // assert node.prev != null;
+ Node newnode = new Node(item, node.prev, node);
+ node.prev.next = newnode;
+ node.prev = newnode;
+ size++;
+ stamp++;
+ return true;
+ }
+ }
+
+ public bool AddLast(T item)
+ {
+ if (last == null) // and thus first = null
+ first = last = new Node(item);
+ else
+ {
+ Node tmp = new Node(item, last, null);
+ last.next = tmp;
+ last = tmp;
+ }
+ size++;
+ stamp++;
+ return true;
+ }
+
+ public T Remove()
+ {
+ return RemoveFirst();
+ }
+
+ public T RemoveFirst()
+ {
+ if (first == null) // and thus last == null
+ throw new IndexOutOfRangeException();
+ else
+ {
+ size--;
+ stamp++;
+ T item = first.item;
+ first = first.next;
+ if (first == null)
+ last = null;
+ else
+ first.prev = null;
+ return item;
+ }
+ }
+
+ public T RemoveAt(int i)
+ {
+ Node node = get(i);
+ if (node.prev == null)
+ first = node.next;
+ else
+ node.prev.next = node.next;
+ if (node.next == null)
+ last = node.prev;
+ else
+ node.next.prev = node.prev;
+ size--;
+ stamp++;
+ return node.item;
+ }
+
+ public T RemoveLast()
+ {
+ if (last == null) // and thus first == null
+ throw new IndexOutOfRangeException();
+ else
+ {
+ size--;
+ stamp++;
+ T item = last.item;
+ last = last.prev;
+ if (last == null)
+ first = null;
+ else
+ last.next = null;
+ return item;
+ }
+ }
+
+ public T Remove(T item)
+ {
+ Node node = first;
+ while (node != null)
+ {
+ if (item.Equals(node.item))
+ {
+ if (node.prev == null)
+ first = node.next;
+ else
+ node.prev.next = node.next;
+ if (node.next == null)
+ last = node.prev;
+ else
+ node.next.prev = node.prev;
+ size--;
+ stamp++;
+ return node.item;
+ }
+ node = node.next;
+ }
+ throw new ElementNotFoundException();
+ }
+
+ public bool Contains(T item)
+ {
+ Node node = first;
+ while (node != null)
+ {
+ if (item.Equals(node.item))
+ return true;
+ node = node.next;
+ }
+ return false;
+ }
+
+ public override int GetHashCode()
+ {
+ int sum = 0;
+ Node node = first;
+ while (node != null)
+ {
+ sum = 31 * sum + node.item.GetHashCode();
+ node = node.next;
+ }
+ return sum;
+ }
+
+ public override bool Equals(object that)
+ {
+ if (that is IList<T> && this.size == ((IList<T>)that).Count)
+ {
+ Node thisnode = this.first;
+ IEnumerator<T> thatenm = ((IList<T>)that).GetEnumerator();
+ while (thisnode != null)
+ {
+ if (!thatenm.MoveNext())
+ throw new Exception("Impossible: LinkedList<T>.Equals");
+ // assert MoveNext() was true; // because of the above size test
+ if (!thisnode.item.Equals(thatenm.Current))
+ return false;
+ thisnode = thisnode.next;
+ }
+ // assert !MoveNext(); // because of the size test
+ return true;
+ }
+ else
+ return false;
+ }
+
+ public IEnumerator<T> GetEnumerator()
+ {
+ return new LinkedListEnumerator(this);
+ }
+
+ class LinkedListEnumerator : IEnumerator<T>
+ {
+ LinkedList<T> lst;
+ Node curr;
+ int stamp;
+ bool valid;
+ T item;
+
+ public LinkedListEnumerator(LinkedList<T> lst)
+ {
+ this.lst = lst; this.stamp = lst.stamp; Reset();
+ }
+
+ public T Current
+ {
+ get
+ {
+ if (valid)
+ return item;
+ else
+ throw new InvalidOperationException();
+ }
+ }
+
+ public bool MoveNext()
+ {
+ if (stamp != lst.stamp)
+ throw new InvalidOperationException(); // List modified
+ else if (curr != null)
+ {
+ item = curr.item;
+ curr = curr.next;
+ return valid = true;
+ }
+ else
+ return valid = false;
+ }
+
+ public void Reset()
+ {
+ curr = lst.first;
+ valid = false;
+ }
+ }
+ }
+
+ // Array lists --------------------------------------------------
+ // Add(T) at end, Remove() from end; behaves like a stack, LIFO
+
+ public class ArrayList<T> : IList<T>
+ {
+ int size; // Number of elements in list
+ int stamp; // To detect modification during enumeration
+ T[] elems;
+
+ public ArrayList()
+ {
+ size = stamp = 0;
+ elems = new T[10]; // Initial capacity
+ }
+
+ private void reallocate(int newsize)
+ {
+ T[] newelems = new T[newsize];
+ for (int i = 0; i < size; i++)
+ newelems[i] = elems[i];
+ elems = newelems;
+ }
+
+ public int Count
+ {
+ get { return size; }
+ }
+
+ public T this[int index]
+ {
+ get { return elems[index]; }
+ set { elems[index] = value; }
+ }
+
+ public bool Add(T item)
+ {
+ return AddLast(item);
+ }
+
+ public bool AddLast(T item)
+ { // Add at end
+ return Add(size, item);
+ }
+
+ public bool Add(int i, T item)
+ { // Add at position i
+ if (i < 0 || i > size)
+ throw new IndexOutOfRangeException();
+ else
+ {
+ if (size == elems.Length)
+ reallocate(2 * size);
+ // assert elems.Length > size;
+ for (int j = size; j > i; j--)
+ elems[j] = elems[j - 1];
+ elems[i] = item;
+ size++;
+ stamp++;
+ return true;
+ }
+ }
+
+ public T Remove()
+ { // Remove last
+ return RemoveAt(size - 1);
+ }
+
+ public T RemoveAt(int i)
+ { // Remove at index i
+ if (i < 0 || i >= size)
+ throw new IndexOutOfRangeException();
+ else
+ {
+ T item = elems[i];
+ for (int j = i + 1; j < size; j++)
+ elems[j - 1] = elems[j];
+ elems[--size] = default(T); // To prevent space leaks
+ stamp++;
+ return item;
+ }
+ }
+
+ public T Remove(T item)
+ { // Search
+ for (int i = 0; i < size; i++)
+ if (item.Equals(elems[i]))
+ return RemoveAt(i);
+ throw new ElementNotFoundException();
+ }
+
+ public bool Contains(T item)
+ {
+ for (int i = 0; i < size; i++)
+ if (item.Equals(elems[i]))
+ return true;
+ return false;
+ }
+
+ public override int GetHashCode()
+ {
+ int sum = 0;
+ for (int i = 0; i < size; i++)
+ sum = 31 * sum + elems[i].GetHashCode();
+ return sum;
+ }
+
+ public override bool Equals(object that)
+ {
+ if (that is IList<T> && this.size == ((IList<T>)that).Count)
+ {
+ IEnumerator<T> thatenm = ((IList<T>)that).GetEnumerator();
+ for (int i = 0; i < size; i++)
+ {
+ if (!thatenm.MoveNext())
+ throw new Exception("Impossible: LinkedList<T>.Equals");
+ // assert MoveNext() returned true; /// because of the size test
+ if (!elems[i].Equals(thatenm.Current))
+ return false;
+ }
+ // assert !MoveNext(); /// because of the size test
+ return true;
+ }
+ else
+ return false;
+ }
+
+ public IEnumerator<T> GetEnumerator()
+ {
+ return new ArrayListEnumerator(this);
+ }
+
+ class ArrayListEnumerator : IEnumerator<T>
+ {
+ ArrayList<T> lst;
+ bool valid;
+ int stamp;
+ T item;
+ int curr;
+
+ public ArrayListEnumerator(ArrayList<T> lst)
+ {
+ this.lst = lst; stamp = lst.stamp; Reset();
+ }
+
+ public T Current
+ {
+ get
+ {
+ if (valid)
+ return item;
+ else
+ throw new InvalidOperationException();
+ }
+ }
+
+ public bool MoveNext()
+ {
+ if (stamp != lst.stamp)
+ throw new InvalidOperationException();
+ else if (curr < lst.size)
+ {
+ item = lst[curr];
+ curr++;
+ return valid = true;
+ }
+ else
+ return valid = false;
+ }
+
+ public void Reset()
+ {
+ curr = 0;
+ valid = false;
+ }
+ }
+ }
+
+ // ORDERED BINARY TREES (RED-BLACK TREES) -----------------------
+
+ // The root node is black
+ // Leaf nodes (null pointers) are black
+ // A red node must have a black parent
+ // All paths from a node to a leaf must have the same number of black nodes
+
+ // Much based on Ken Larsen's implementation for Moscow ML, whose
+ // deletion algorithm is inspired by Stefan Kahrs
+
+ // Nodes in binary trees
+
+ internal class Node<K, V>
+ {
+ public Node<K, V> left, rght;
+ public K key;
+ public V val;
+ public bool red; // Color is red or black
+
+ public Node(K key, V val)
+ {
+ this.key = key; this.val = val; red = true;
+ }
+
+ public Node(K key, V val, Node<K, V> left, Node<K, V> rght)
+ {
+ this.key = key; this.val = val; red = false;
+ }
+
+ // Colored rebalancing operations
+
+ public static void lbal(ref Node<K, V> t)
+ {
+ // assert t != null;
+ t.red = false;
+ Node<K, V> d = t.left;
+ if (d != null && d.red)
+ {
+ if (d.left != null && d.left.red)
+ {
+ d.left.red = false;
+ t.left = d.rght;
+ d.rght = t;
+ t = d;
+ }
+ else if (d.rght != null && d.rght.red)
+ {
+ Node<K, V> bc = d.rght;
+ d.red = false;
+ t.left = bc.rght;
+ bc.rght = t;
+ d.rght = bc.left;
+ bc.left = d;
+ t = bc;
+ }
+ }
+ }
+
+ public static void rbal(ref Node<K, V> t)
+ {
+ // assert t != null;
+ t.red = false;
+ Node<K, V> e = t.rght;
+ if (e != null && e.red)
+ {
+ if (e.rght != null && e.rght.red)
+ {
+ e.rght.red = false;
+ t.rght = e.left;
+ e.left = t;
+ t = e;
+ }
+ else if (e.left != null && e.left.red)
+ {
+ Node<K, V> bc = e.left;
+ e.red = false;
+ t.rght = bc.left;
+ bc.left = t;
+ e.left = bc.rght;
+ bc.rght = e;
+ t = bc;
+ }
+ }
+ }
+
+ public static void balleft(ref Node<K, V> t)
+ {
+ // assert t != null;
+ if (t.left != null && t.left.red)
+ { // (red, ---)
+ t.red = true;
+ t.left.red = false;
+ }
+ else if (t.rght != null)
+ if (!t.rght.red)
+ { // (black, black)
+ t.rght.red = true;
+ rbal(ref t);
+ }
+ else if (t.rght.left != null && !t.rght.left.red)
+ {
+ t.red = false;
+ Node<K, V> trl = t.rght.left;
+ t.rght.left = trl.rght;
+ if (t.rght.rght != null)
+ t.rght.rght.red = true;
+ rbal(ref t.rght);
+ trl.rght = t.rght;
+ t.rght = trl.left;
+ trl.left = t;
+ t = trl;
+ t.red = true;
+ }
+ else throw new Exception("balleft");
+ }
+
+ public static void balrght(ref Node<K, V> t)
+ {
+ // assert t != null;
+ if (t.rght != null && t.rght.red)
+ { // (---, red)
+ t.red = true;
+ t.rght.red = false;
+ }
+ else if (t.left != null)
+ if (!t.left.red)
+ { // (black, black)
+ t.left.red = true;
+ lbal(ref t);
+ }
+ else if (t.left.rght != null && !t.left.rght.red)
+ {
+ t.red = false;
+ Node<K, V> tlr = t.left.rght;
+ t.left.rght = tlr.left;
+ if (t.left.left != null)
+ t.left.left.red = true;
+ lbal(ref t.left);
+ tlr.left = t.left;
+ t.left = tlr.rght;
+ tlr.rght = t;
+ t = tlr;
+ t.red = true;
+ }
+ else throw new Exception("balrght");
+ }
+
+ public static Node<K, V> append(Node<K, V> left, Node<K, V> rght)
+ {
+ if (left == null)
+ return rght;
+ else if (rght == null)
+ return left;
+ else if (left.red != rght.red)
+ { // different colours
+ if (left.red)
+ { // (red, black)
+ left.rght = append(left.rght, rght);
+ return left;
+ }
+ else
+ { // (black, red)
+ rght.left = append(left, rght.left);
+ return rght;
+ }
+ }
+ else
+ { // same colours
+ Node<K, V> bc = append(left.rght, rght.left);
+ if (bc != null && bc.red)
+ {
+ left.rght = bc.left;
+ bc.left = left;
+ rght.left = bc.rght;
+ bc.rght = rght;
+ return bc;
+ }
+ else
+ {
+ rght.left = bc;
+ left.rght = rght;
+ if (!left.red) // (black, black)
+ balleft(ref left);
+ return left;
+ }
+ }
+ }
+ }
+
+ // Operations on tree maps
+
+ internal interface ITreeOps<K, V>
+ {
+ bool contains(Node<K, V> t, K key);
+ Node<K, V> get(Node<K, V> t, K key);
+ bool add(ref Node<K, V> t, K key, V val);
+ Node<K, V> del(ref Node<K, V> t, K key);
+ }
+
+ // Object-based IComparable tree operations ---------------------
+
+ // Object-based dynamically typed comparisons using CompareTo(object)
+
+ internal class OTreeOps<K, V> : ITreeOps<K, V>
+ where K : System.IComparable
+ {
+ public bool contains(Node<K, V> t, K key)
+ {
+ while (t != null)
+ {
+ int cmp = key.CompareTo(t.key);
+ if (cmp < 0)
+ t = t.left;
+ else if (cmp > 0)
+ t = t.rght;
+ else
+ return true;
+ }
+ return false;
+ }
+
+ public Node<K, V> get(Node<K, V> t, K key)
+ {
+ while (t != null)
+ {
+ int cmp = key.CompareTo(t.key);
+ if (cmp < 0)
+ t = t.left;
+ else if (cmp > 0)
+ t = t.rght;
+ else
+ return t;
+ }
+ throw new ElementNotFoundException();
+ }
+
+ public bool add(ref Node<K, V> t, K key, V val)
+ {
+ if (t == null)
+ {
+ t = new Node<K, V>(key, val);
+ return true;
+ }
+ else
+ {
+ int cmp = key.CompareTo(t.key);
+ if (cmp < 0)
+ {
+ bool added = add(ref t.left, key, val);
+ if (!t.red)
+ Node<K, V>.lbal(ref t);
+ return added;
+ }
+ else if (cmp > 0)
+ {
+ bool added = add(ref t.rght, key, val);
+ if (!t.red)
+ Node<K, V>.rbal(ref t);
+ return added;
+ }
+ else
+ return false;
+ }
+ }
+
+ public Node<K, V> del(ref Node<K, V> t, K key)
+ {
+ if (t == null)
+ {
+ throw new ElementNotFoundException("TreeMap.Remove: " + key);
+ }
+ else
+ {
+ int cmp = key.CompareTo(t.key);
+ if (cmp < 0)
+ {
+ bool tleftblack = !t.left.red;
+ Node<K, V> removed = del(ref t.left, key);
+ if (tleftblack)
+ Node<K, V>.balleft(ref t);
+ else
+ t.red = true;
+ return removed;
+ }
+ else if (cmp > 0)
+ {
+ bool trghtblack = !t.rght.red;
+ Node<K, V> removed = del(ref t.rght, key);
+ if (trghtblack)
+ Node<K, V>.balrght(ref t);
+ else
+ t.red = true;
+ return removed;
+ }
+ else
+ {
+ Node<K, V> removed = t;
+ t = Node<K, V>.append(t.left, t.rght);
+ return removed;
+ }
+ }
+ }
+ }
+
+ // Generic IComparable<K> tree operations ---------------------
+
+ // Generic statically typed implicit comparer CompareTo(K).
+
+ // The code is textually identical to the above, but will avoid
+ // all the boxings implied by the above code when K is
+ // instantiated to a value type.
+
+ internal class GTreeOps<K, V> : ITreeOps<K, V>
+ where K : IComparable<K>
+ {
+ public bool contains(Node<K, V> t, K key)
+ {
+ while (t != null)
+ {
+ int cmp = key.CompareTo(t.key);
+ if (cmp < 0)
+ t = t.left;
+ else if (cmp > 0)
+ t = t.rght;
+ else
+ return true;
+ }
+ return false;
+ }
+
+ public Node<K, V> get(Node<K, V> t, K key)
+ {
+ while (t != null)
+ {
+ int cmp = key.CompareTo(t.key);
+ if (cmp < 0)
+ t = t.left;
+ else if (cmp > 0)
+ t = t.rght;
+ else
+ return t;
+ }
+ throw new ElementNotFoundException();
+ }
+
+ public bool add(ref Node<K, V> t, K key, V val)
+ {
+ if (t == null)
+ {
+ t = new Node<K, V>(key, val);
+ return true;
+ }
+ else
+ {
+ int cmp = key.CompareTo(t.key);
+ if (cmp < 0)
+ {
+ bool added = add(ref t.left, key, val);
+ if (!t.red)
+ Node<K, V>.lbal(ref t);
+ return added;
+ }
+ else if (cmp > 0)
+ {
+ bool added = add(ref t.rght, key, val);
+ if (!t.red)
+ Node<K, V>.rbal(ref t);
+ return added;
+ }
+ else
+ return false;
+ }
+ }
+
+ public Node<K, V> del(ref Node<K, V> t, K key)
+ {
+ if (t == null)
+ {
+ throw new ElementNotFoundException("TreeMap.Remove: " + key);
+ }
+ else
+ {
+ int cmp = key.CompareTo(t.key);
+ if (cmp < 0)
+ {
+ bool tleftblack = !t.left.red;
+ Node<K, V> removed = del(ref t.left, key);
+ if (tleftblack)
+ Node<K, V>.balleft(ref t);
+ else
+ t.red = true;
+ return removed;
+ }
+ else if (cmp > 0)
+ {
+ bool trghtblack = !t.rght.red;
+ Node<K, V> removed = del(ref t.rght, key);
+ if (trghtblack)
+ Node<K, V>.balrght(ref t);
+ else
+ t.red = true;
+ return removed;
+ }
+ else
+ {
+ Node<K, V> removed = t;
+ t = Node<K, V>.append(t.left, t.rght);
+ return removed;
+ }
+ }
+ }
+ }
+
+ // Separate statically typed comparer: Compare(K,K)
+
+ internal class FGTreeOps<K, V> : ITreeOps<K, V>
+ {
+ IComparer<K> comparer;
+
+ public FGTreeOps(IComparer<K> comparer)
+ {
+ this.comparer = comparer;
+ }
+
+ public bool contains(Node<K, V> t, K key)
+ {
+ while (t != null)
+ {
+ int cmp = comparer.Compare(key, t.key);
+ if (cmp < 0)
+ t = t.left;
+ else if (cmp > 0)
+ t = t.rght;
+ else
+ return true;
+ }
+ return false;
+ }
+
+ public Node<K, V> get(Node<K, V> t, K key)
+ {
+ while (t != null)
+ {
+ int cmp = comparer.Compare(key, t.key);
+ if (cmp < 0)
+ t = t.left;
+ else if (cmp > 0)
+ t = t.rght;
+ else
+ return t;
+ }
+ throw new ElementNotFoundException();
+ }
+
+ public bool add(ref Node<K, V> t, K key, V val)
+ {
+ if (t == null)
+ {
+ t = new Node<K, V>(key, val);
+ return true;
+ }
+ else
+ {
+ int cmp = comparer.Compare(key, t.key);
+ if (cmp < 0)
+ {
+ bool added = add(ref t.left, key, val);
+ if (!t.red)
+ Node<K, V>.lbal(ref t);
+ return added;
+ }
+ else if (cmp > 0)
+ {
+ bool added = add(ref t.rght, key, val);
+ if (!t.red)
+ Node<K, V>.rbal(ref t);
+ return added;
+ }
+ else
+ return false;
+ }
+ }
+
+ public Node<K, V> del(ref Node<K, V> t, K key)
+ {
+ if (t == null)
+ {
+ throw new ElementNotFoundException("TreeMap.Remove: " + key);
+ }
+ else
+ {
+ int cmp = comparer.Compare(key, t.key);
+ if (cmp < 0)
+ {
+ bool tleftblack = !t.left.red;
+ Node<K, V> removed = del(ref t.left, key);
+ if (tleftblack)
+ Node<K, V>.balleft(ref t);
+ else
+ t.red = true;
+ return removed;
+ }
+ else if (cmp > 0)
+ {
+ bool trghtblack = !t.rght.red;
+ Node<K, V> removed = del(ref t.rght, key);
+ if (trghtblack)
+ Node<K, V>.balrght(ref t);
+ else
+ t.red = true;
+ return removed;
+ }
+ else
+ {
+ Node<K, V> removed = t;
+ t = Node<K, V>.append(t.left, t.rght);
+ return removed;
+ }
+ }
+ }
+ }
+
+ // Separate dynamically typed comparer: Compare(object, object)
+
+ internal class FOTreeOps<K, V> : ITreeOps<K, V>
+ {
+ System.Collections.IComparer comparer;
+
+ public FOTreeOps(System.Collections.IComparer comparer)
+ {
+ this.comparer = comparer;
+ }
+
+ public bool contains(Node<K, V> t, K key)
+ {
+ while (t != null)
+ {
+ int cmp = comparer.Compare(key, t.key);
+ if (cmp < 0)
+ t = t.left;
+ else if (cmp > 0)
+ t = t.rght;
+ else
+ return true;
+ }
+ return false;
+ }
+
+ public Node<K, V> get(Node<K, V> t, K key)
+ {
+ while (t != null)
+ {
+ int cmp = comparer.Compare(key, t.key);
+ if (cmp < 0)
+ t = t.left;
+ else if (cmp > 0)
+ t = t.rght;
+ else
+ return t;
+ }
+ throw new ElementNotFoundException();
+ }
+
+ public bool add(ref Node<K, V> t, K key, V val)
+ {
+ if (t == null)
+ {
+ t = new Node<K, V>(key, val);
+ return true;
+ }
+ else
+ {
+ int cmp = comparer.Compare(key, t.key);
+ if (cmp < 0)
+ {
+ bool added = add(ref t.left, key, val);
+ if (!t.red)
+ Node<K, V>.lbal(ref t);
+ return added;
+ }
+ else if (cmp > 0)
+ {
+ bool added = add(ref t.rght, key, val);
+ if (!t.red)
+ Node<K, V>.rbal(ref t);
+ return added;
+ }
+ else
+ return false;
+ }
+ }
+
+ public Node<K, V> del(ref Node<K, V> t, K key)
+ {
+ if (t == null)
+ {
+ throw new ElementNotFoundException("TreeMap.Remove: " + key);
+ }
+ else
+ {
+ int cmp = comparer.Compare(key, t.key);
+ if (cmp < 0)
+ {
+ bool tleftblack = !t.left.red;
+ Node<K, V> removed = del(ref t.left, key);
+ if (tleftblack)
+ Node<K, V>.balleft(ref t);
+ else
+ t.red = true;
+ return removed;
+ }
+ else if (cmp > 0)
+ {
+ bool trghtblack = !t.rght.red;
+ Node<K, V> removed = del(ref t.rght, key);
+ if (trghtblack)
+ Node<K, V>.balrght(ref t);
+ else
+ t.red = true;
+ return removed;
+ }
+ else
+ {
+ Node<K, V> removed = t;
+ t = Node<K, V>.append(t.left, t.rght);
+ return removed;
+ }
+ }
+ }
+ }
+
+ // The TreeMap class itself, and two subclasses
+
+ public class TreeMap<K, V> : ISortedMap<K, V>
+ {
+ private int size; // Number of entries in the tree map
+ private int stamp; // To detect modification during enumeration
+ private Node<K, V> root;
+ private ITreeOps<K, V> treeops;
+
+ internal TreeMap(ITreeOps<K, V> treeops)
+ {
+ size = stamp = 0;
+ root = null;
+ this.treeops = treeops;
+ }
+
+ // Object-based dynamically typed ...
[truncated message content] |
|
From: <Ba...@us...> - 2012-01-05 23:26:02
|
Revision: 4384
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4384&view=rev
Author: BartEv
Date: 2012-01-05 23:25:56 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/VeraControl/releases/VeraControl.xmp2
trunk/plugins/VeraControl/releases/VeraControl_v0.5.0.1.mpe1
trunk/plugins/VeraControl/releases/update.xml
Modified: trunk/plugins/VeraControl/releases/VeraControl.xmp2
===================================================================
--- trunk/plugins/VeraControl/releases/VeraControl.xmp2 2012-01-05 23:17:56 UTC (rev 4383)
+++ trunk/plugins/VeraControl/releases/VeraControl.xmp2 2012-01-05 23:25:56 UTC (rev 4384)
@@ -601,15 +601,15 @@
<Build>0</Build>
<Revision>1</Revision>
</Version>
- <ExtensionDescription>Control your Vera controller from MediaPortal.
-Supports Scene triggers for starting, hibernating and exiting MediaPortal; Also starting, pausing and stopping media streams. So dim your lights and close the curtain autmatically when MediaPortal starts a movie...
-
-Vera is a Z-wave home automation controller from MicasaVerde. This version is tested with Vera 2 UI4 v.1.1.1267
-
-
-
+ <ExtensionDescription>Control your Vera controller from MediaPortal.
+Supports Scene triggers for starting, hibernating and exiting MediaPortal; Also starting, pausing and stopping media streams. So dim your lights and close the curtain autmatically when MediaPortal starts a movie...
+
+Vera is a Z-wave home automation controller from MicasaVerde. This version is tested with Vera 2 UI4 v.1.1.1267
+
+
+
</ExtensionDescription>
- <VersionDescription>First version - for beta testing only
+ <VersionDescription>First version - for beta testing only
Minor updates</VersionDescription>
<DevelopmentStatus>Beta</DevelopmentStatus>
<OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/VeraControl/releases/</OnlineLocation>
Modified: trunk/plugins/VeraControl/releases/VeraControl_v0.5.0.1.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/VeraControl/releases/update.xml
===================================================================
--- trunk/plugins/VeraControl/releases/update.xml 2012-01-05 23:17:56 UTC (rev 4383)
+++ trunk/plugins/VeraControl/releases/update.xml 2012-01-05 23:25:56 UTC (rev 4384)
@@ -228,15 +228,15 @@
<Build>0</Build>
<Revision>1</Revision>
</Version>
- <ExtensionDescription>Control your Vera controller from MediaPortal.
-Supports Scene triggers for starting, hibernating and exiting MediaPortal; Also starting, pausing and stopping media streams. So dim your lights and close the curtain autmatically when MediaPortal starts a movie...
-
-Vera is a Z-wave home automation controller from MicasaVerde. This version is tested with Vera 2 UI4 v.1.1.1267
-
-
-
+ <ExtensionDescription>Control your Vera controller from MediaPortal.
+Supports Scene triggers for starting, hibernating and exiting MediaPortal; Also starting, pausing and stopping media streams. So dim your lights and close the curtain autmatically when MediaPortal starts a movie...
+
+Vera is a Z-wave home automation controller from MicasaVerde. This version is tested with Vera 2 UI4 v.1.1.1267
+
+
+
</ExtensionDescription>
- <VersionDescription>First version - for beta testing only
+ <VersionDescription>First version - for beta testing only
Minor updates</VersionDescription>
<DevelopmentStatus>Beta</DevelopmentStatus>
<OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/VeraControl/releases/</OnlineLocation>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ba...@us...> - 2012-01-05 23:18:02
|
Revision: 4383
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4383&view=rev
Author: BartEv
Date: 2012-01-05 23:17:56 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/VeraControl/releases/VeraControl.xmp2
trunk/plugins/VeraControl/releases/VeraControl_v0.5.0.1.mpe1
trunk/plugins/VeraControl/releases/update.xml
Modified: trunk/plugins/VeraControl/releases/VeraControl.xmp2
===================================================================
--- trunk/plugins/VeraControl/releases/VeraControl.xmp2 2012-01-05 15:10:56 UTC (rev 4382)
+++ trunk/plugins/VeraControl/releases/VeraControl.xmp2 2012-01-05 23:17:56 UTC (rev 4383)
@@ -601,16 +601,13 @@
<Build>0</Build>
<Revision>1</Revision>
</Version>
- <ExtensionDescription>Control your Vera controller from MediaPortal.
+ <ExtensionDescription>Control your Vera controller from MediaPortal.
+Supports Scene triggers for starting, hibernating and exiting MediaPortal; Also starting, pausing and stopping media streams. So dim your lights and close the curtain autmatically when MediaPortal starts a movie...
-Supports Scene triggers for starting, hibernating and exiting MediaPortal; Also starting, pausing and stopping media streams. So dim your lights and close the curtain autmatically when MediaPortal starts a movie...
+Vera is a Z-wave home automation controller from MicasaVerde. This version is tested with Vera 2 UI4 v.1.1.1267
-
-Vera is a Z-wave home automation controller from MicasaVerde. This version is tested with Vera 2 UI4 v.1.1.1267
-
-
</ExtensionDescription>
<VersionDescription>First version - for beta testing only
Minor updates</VersionDescription>
Modified: trunk/plugins/VeraControl/releases/VeraControl_v0.5.0.1.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/VeraControl/releases/update.xml
===================================================================
--- trunk/plugins/VeraControl/releases/update.xml 2012-01-05 15:10:56 UTC (rev 4382)
+++ trunk/plugins/VeraControl/releases/update.xml 2012-01-05 23:17:56 UTC (rev 4383)
@@ -228,18 +228,15 @@
<Build>0</Build>
<Revision>1</Revision>
</Version>
- <ExtensionDescription>Control your Vera controller from MediaPortal.
-
-Supports Scene triggers for starting, hibernating and exiting MediaPortal; Also starting, pausing and stopping media streams. So dim your lights and close the curtain autmatically when MediaPortal starts a movie...
-
-
-
-Vera is a Z-wave home automation controller from MicasaVerde. This version is tested with Vera 2 UI4 v.1.1.1267
-
-
-
+ <ExtensionDescription>Control your Vera controller from MediaPortal.
+Supports Scene triggers for starting, hibernating and exiting MediaPortal; Also starting, pausing and stopping media streams. So dim your lights and close the curtain autmatically when MediaPortal starts a movie...
+
+Vera is a Z-wave home automation controller from MicasaVerde. This version is tested with Vera 2 UI4 v.1.1.1267
+
+
+
</ExtensionDescription>
- <VersionDescription>First version - for beta testing only
+ <VersionDescription>First version - for beta testing only
Minor updates</VersionDescription>
<DevelopmentStatus>Beta</DevelopmentStatus>
<OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/VeraControl/releases/</OnlineLocation>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ba...@us...> - 2012-01-05 15:11:02
|
Revision: 4382
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4382&view=rev
Author: BartEv
Date: 2012-01-05 15:10:56 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/VeraControl/releases/update.xml
Modified: trunk/plugins/VeraControl/releases/update.xml
===================================================================
--- trunk/plugins/VeraControl/releases/update.xml 2012-01-05 14:48:47 UTC (rev 4381)
+++ trunk/plugins/VeraControl/releases/update.xml 2012-01-05 15:10:56 UTC (rev 4382)
@@ -228,18 +228,18 @@
<Build>0</Build>
<Revision>1</Revision>
</Version>
- <ExtensionDescription>Control your Vera controller from MediaPortal.
-
-Supports Scene triggers for starting, hibernating and exiting MediaPortal; Also starting, pausing and stopping media streams. So dim your lights and close the curtain autmatically when MediaPortal starts a movie...
-
-
-
-Vera is a Z-wave home automation controller from MicasaVerde. This version is tested with Vera 2 UI4 v.1.1.1267
-
-
-
+ <ExtensionDescription>Control your Vera controller from MediaPortal.
+
+Supports Scene triggers for starting, hibernating and exiting MediaPortal; Also starting, pausing and stopping media streams. So dim your lights and close the curtain autmatically when MediaPortal starts a movie...
+
+
+
+Vera is a Z-wave home automation controller from MicasaVerde. This version is tested with Vera 2 UI4 v.1.1.1267
+
+
+
</ExtensionDescription>
- <VersionDescription>First version - for beta testing only
+ <VersionDescription>First version - for beta testing only
Minor updates</VersionDescription>
<DevelopmentStatus>Beta</DevelopmentStatus>
<OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/VeraControl/releases/</OnlineLocation>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ba...@us...> - 2012-01-05 14:48:53
|
Revision: 4381
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4381&view=rev
Author: BartEv
Date: 2012-01-05 14:48:47 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/VeraControl/Properties/AssemblyInfo.cs
trunk/plugins/VeraControl/releases/VeraControl.xmp2
trunk/plugins/VeraControl/releases/update.xml
Added Paths:
-----------
trunk/plugins/VeraControl/releases/VeraControl_v0.5.0.1.mpe1
Modified: trunk/plugins/VeraControl/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/VeraControl/Properties/AssemblyInfo.cs 2012-01-05 14:37:36 UTC (rev 4380)
+++ trunk/plugins/VeraControl/Properties/AssemblyInfo.cs 2012-01-05 14:48:47 UTC (rev 4381)
@@ -28,4 +28,4 @@
//
// You can specify all the values or you can use the default the Revision and
// Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("0.5.*")]
+[assembly: AssemblyVersion("0.5.0.1")]
Modified: trunk/plugins/VeraControl/releases/VeraControl.xmp2
===================================================================
--- trunk/plugins/VeraControl/releases/VeraControl.xmp2 2012-01-05 14:37:36 UTC (rev 4380)
+++ trunk/plugins/VeraControl/releases/VeraControl.xmp2 2012-01-05 14:48:47 UTC (rev 4381)
@@ -599,23 +599,29 @@
<Major>0</Major>
<Minor>5</Minor>
<Build>0</Build>
- <Revision>0</Revision>
+ <Revision>1</Revision>
</Version>
- <ExtensionDescription>Control your Vera controller from MediaPortal.
-Supports Scene triggers for starting, hibernating and exiting MediaPortal; Also starting, pausing and stopping media streams. So dim your lights and close the curtain autmatically when MediaPortal starts a movie...
+ <ExtensionDescription>Control your Vera controller from MediaPortal.
-Vera is a Z-wave home automation controller from MicasaVerde. This version is tested with Vera 2 UI4 v.1.1.1267
+Supports Scene triggers for starting, hibernating and exiting MediaPortal; Also starting, pausing and stopping media streams. So dim your lights and close the curtain autmatically when MediaPortal starts a movie...
+
+
+Vera is a Z-wave home automation controller from MicasaVerde. This version is tested with Vera 2 UI4 v.1.1.1267
+
+
+
</ExtensionDescription>
- <VersionDescription>First version - for beta testing only</VersionDescription>
+ <VersionDescription>First version - for beta testing only
+Minor updates</VersionDescription>
<DevelopmentStatus>Beta</DevelopmentStatus>
<OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/VeraControl/releases/</OnlineLocation>
- <ReleaseDate>2012-01-04T22:51:05.585629+01:00</ReleaseDate>
+ <ReleaseDate>2012-01-05T22:51:05</ReleaseDate>
<Tags>home automation,
z-wave,
micasaverde,
vera</Tags>
- <Location>C:\Users\Bart\Documents\SharpDevelop Projects\VeraControl\releases\VeraControl_v0.5.0.0.mpe1</Location>
+ <Location>C:\Users\Bart\Documents\SharpDevelop Projects\VeraControl\releases\VeraControl_v[Version].mpe1</Location>
<Params>
<Items>
<SectionParam Name="Icon">
Added: trunk/plugins/VeraControl/releases/VeraControl_v0.5.0.1.mpe1
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/VeraControl/releases/VeraControl_v0.5.0.1.mpe1
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/VeraControl/releases/update.xml
===================================================================
--- trunk/plugins/VeraControl/releases/update.xml 2012-01-05 14:37:36 UTC (rev 4380)
+++ trunk/plugins/VeraControl/releases/update.xml 2012-01-05 14:48:47 UTC (rev 4381)
@@ -139,5 +139,150 @@
</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="IconsDefault">
+ <DisplayName>IconsDefault</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>IconsDefault</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="IconsDefaultWide">
+ <DisplayName>IconsDefaultWide</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>IconsDefaultWide</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="VeraControl.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.1.6.27644</MinRequiredVersion>
+ <DesignedForVersion>1.1.6.27644</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items>
+ <SubSystemItem Name="MP.SkinEngine" />
+ <SubSystemItem Name="MP.Config" />
+ </Items>
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
+ <GeneralInfo>
+ <Name>Vera Controller</Name>
+ <Id>ebb6b1af-6fb9-44e5-a859-9d32ffe20a9e</Id>
+ <Author>Bart Eversdijk</Author>
+ <HomePage>http://www.team-mediaportal.com/extensions/micasaverde-vera-controller</HomePage>
+ <ForumPage>http://forum.team-mediaportal.com/mediaportal-plugins-47/plugin-micasaverde-vera-controller-104337/</ForumPage>
+ <UpdateUrl>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/VeraControl/releases/update.xml</UpdateUrl>
+ <Version>
+ <Major>0</Major>
+ <Minor>5</Minor>
+ <Build>0</Build>
+ <Revision>1</Revision>
+ </Version>
+ <ExtensionDescription>Control your Vera controller from MediaPortal.
+
+Supports Scene triggers for starting, hibernating and exiting MediaPortal; Also starting, pausing and stopping media streams. So dim your lights and close the curtain autmatically when MediaPortal starts a movie...
+
+
+
+Vera is a Z-wave home automation controller from MicasaVerde. This version is tested with Vera 2 UI4 v.1.1.1267
+
+
+
+</ExtensionDescription>
+ <VersionDescription>First version - for beta testing only
+Minor updates</VersionDescription>
+ <DevelopmentStatus>Beta</DevelopmentStatus>
+ <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/VeraControl/releases/</OnlineLocation>
+ <ReleaseDate>2012-01-05T22:51:05</ReleaseDate>
+ <Tags>home automation,
+z-wave,
+micasaverde,
+vera</Tags>
+ <Location>C:\Users\Bart\Documents\SharpDevelop Projects\VeraControl\releases\VeraControl_v[Version].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>
+</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: <Ba...@us...> - 2012-01-05 14:37:46
|
Revision: 4380
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4380&view=rev
Author: BartEv
Date: 2012-01-05 14:37:36 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/VeraControl/releases/update.xml
Modified: trunk/plugins/VeraControl/releases/update.xml
===================================================================
--- trunk/plugins/VeraControl/releases/update.xml 2012-01-05 13:19:03 UTC (rev 4379)
+++ trunk/plugins/VeraControl/releases/update.xml 2012-01-05 14:37:36 UTC (rev 4380)
@@ -90,8 +90,7 @@
<Build>0</Build>
<Revision>0</Revision>
</Version>
- <ExtensionDescription>Control your Vera controller from MediaPortal.
-Supports Scene triggers for starting, hibernating and exiting MediaPortal; Also starting, pausing and stopping media streams. So dim your lights and close the curtain autmatically when MediaPortal starts a movie...
+ <ExtensionDescription>Control your Vera Box from MediaPortal. Supports Scene triggers for starting, hibernating and exiting MediaPortal; Also starting, pausing and stopping media streams. So dim your lights and close the curtain autmatically when MediaPortal starts a movie...
Vera is a Z-wave home automation controller from MicasaVerde. This version is tested with Vera 2 UI4 v.1.1.1267
@@ -141,4 +140,4 @@
<IsSkin>false</IsSkin>
</PackageClass>
</Items>
-</ExtensionCollection>
\ No newline at end of file
+</ExtensionCollection>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ba...@us...> - 2012-01-05 13:19:12
|
Revision: 4379
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4379&view=rev
Author: BartEv
Date: 2012-01-05 13:19:03 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/VeraControl/releases/update.xml
Modified: trunk/plugins/VeraControl/releases/update.xml
===================================================================
--- trunk/plugins/VeraControl/releases/update.xml 2012-01-05 13:13:54 UTC (rev 4378)
+++ trunk/plugins/VeraControl/releases/update.xml 2012-01-05 13:19:03 UTC (rev 4379)
@@ -90,11 +90,11 @@
<Build>0</Build>
<Revision>0</Revision>
</Version>
- <ExtensionDescription>Control your Vera controller from MediaPortal.
-Supports Scene triggers for starting, hibernating and exiting MediaPortal; Also starting, pausing and stopping media streams. So dim your lights and close the curtain autmatically when MediaPortal starts a movie...
-
-Vera is a Z-wave home automation controller from MicasaVerde. This version is tested with Vera 2 UI4 v.1.1.1267
-
+ <ExtensionDescription>Control your Vera controller from MediaPortal.
+Supports Scene triggers for starting, hibernating and exiting MediaPortal; Also starting, pausing and stopping media streams. So dim your lights and close the curtain autmatically when MediaPortal starts a movie...
+
+Vera is a Z-wave home automation controller from MicasaVerde. This version is tested with Vera 2 UI4 v.1.1.1267
+
</ExtensionDescription>
<VersionDescription>First version - for beta testing only</VersionDescription>
<DevelopmentStatus>Beta</DevelopmentStatus>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ba...@us...> - 2012-01-05 13:14:00
|
Revision: 4378
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4378&view=rev
Author: BartEv
Date: 2012-01-05 13:13:54 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/VeraControl/releases/VeraControl.xmp2
trunk/plugins/VeraControl/releases/VeraControl_v0.5.0.0.mpe1
trunk/plugins/VeraControl/releases/update.xml
Modified: trunk/plugins/VeraControl/releases/VeraControl.xmp2
===================================================================
--- trunk/plugins/VeraControl/releases/VeraControl.xmp2 2012-01-05 13:08:42 UTC (rev 4377)
+++ trunk/plugins/VeraControl/releases/VeraControl.xmp2 2012-01-05 13:13:54 UTC (rev 4378)
@@ -601,7 +601,8 @@
<Build>0</Build>
<Revision>0</Revision>
</Version>
- <ExtensionDescription>Control your Vera controller from MediaPortal. Supports Scene triggers for starting, hibernating and exiting MediaPortal; Also starting, pausing and stopping media streams. So dim your lights and close the curtain autmatically when MediaPortal starts a movie...
+ <ExtensionDescription>Control your Vera controller from MediaPortal.
+Supports Scene triggers for starting, hibernating and exiting MediaPortal; Also starting, pausing and stopping media streams. So dim your lights and close the curtain autmatically when MediaPortal starts a movie...
Vera is a Z-wave home automation controller from MicasaVerde. This version is tested with Vera 2 UI4 v.1.1.1267
@@ -614,7 +615,7 @@
z-wave,
micasaverde,
vera</Tags>
- <Location>C:\Users\Bart\Documents\SharpDevelop Projects\VeraControl\MP-Website\VeraControl.mpe1</Location>
+ <Location>C:\Users\Bart\Documents\SharpDevelop Projects\VeraControl\releases\VeraControl_v0.5.0.0.mpe1</Location>
<Params>
<Items>
<SectionParam Name="Icon">
Modified: trunk/plugins/VeraControl/releases/VeraControl_v0.5.0.0.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/VeraControl/releases/update.xml
===================================================================
--- trunk/plugins/VeraControl/releases/update.xml 2012-01-05 13:08:42 UTC (rev 4377)
+++ trunk/plugins/VeraControl/releases/update.xml 2012-01-05 13:13:54 UTC (rev 4378)
@@ -90,7 +90,8 @@
<Build>0</Build>
<Revision>0</Revision>
</Version>
- <ExtensionDescription>Control your Vera controller from MediaPortal. Supports Scene triggers for starting, hibernating and exiting MediaPortal; Also starting, pausing and stopping media streams. So dim your lights and close the curtain autmatically when MediaPortal starts a movie...
+ <ExtensionDescription>Control your Vera controller from MediaPortal.
+Supports Scene triggers for starting, hibernating and exiting MediaPortal; Also starting, pausing and stopping media streams. So dim your lights and close the curtain autmatically when MediaPortal starts a movie...
Vera is a Z-wave home automation controller from MicasaVerde. This version is tested with Vera 2 UI4 v.1.1.1267
@@ -103,7 +104,7 @@
z-wave,
micasaverde,
vera</Tags>
- <Location>C:\Users\Bart\Documents\SharpDevelop Projects\VeraControl\MP-Website\VeraControl.mpe1</Location>
+ <Location>C:\Users\Bart\Documents\SharpDevelop Projects\VeraControl\releases\VeraControl_v0.5.0.0.mpe1</Location>
<Params>
<Items>
<SectionParam Name="Online Icon">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ba...@us...> - 2012-01-05 13:08:48
|
Revision: 4377
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4377&view=rev
Author: BartEv
Date: 2012-01-05 13:08:42 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/VeraControl/releases/VeraControl.xmp2
trunk/plugins/VeraControl/releases/update.xml
Modified: trunk/plugins/VeraControl/releases/VeraControl.xmp2
===================================================================
--- trunk/plugins/VeraControl/releases/VeraControl.xmp2 2012-01-05 13:01:01 UTC (rev 4376)
+++ trunk/plugins/VeraControl/releases/VeraControl.xmp2 2012-01-05 13:08:42 UTC (rev 4377)
@@ -601,18 +601,8 @@
<Build>0</Build>
<Revision>0</Revision>
</Version>
- <ExtensionDescription>Control you Vera controller from MediaPortal.
+ <ExtensionDescription>Control your Vera controller from MediaPortal. Supports Scene triggers for starting, hibernating and exiting MediaPortal; Also starting, pausing and stopping media streams. So dim your lights and close the curtain autmatically when MediaPortal starts a movie...
-
-
-Supports Scene triggers for starting, hibernating and exiting MediaPortal; Also starting, pausing and stopping media streams.
-
-
-
-So dim your lights and close the curtain autmatically when MediaPortal starts a movie...
-
-
-
Vera is a Z-wave home automation controller from MicasaVerde. This version is tested with Vera 2 UI4 v.1.1.1267
</ExtensionDescription>
@@ -620,9 +610,9 @@
<DevelopmentStatus>Beta</DevelopmentStatus>
<OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/VeraControl/releases/</OnlineLocation>
<ReleaseDate>2012-01-04T22:51:05.585629+01:00</ReleaseDate>
- <Tags>home automation
-z-wave
-micasavera
+ <Tags>home automation,
+z-wave,
+micasaverde,
vera</Tags>
<Location>C:\Users\Bart\Documents\SharpDevelop Projects\VeraControl\MP-Website\VeraControl.mpe1</Location>
<Params>
Modified: trunk/plugins/VeraControl/releases/update.xml
===================================================================
--- trunk/plugins/VeraControl/releases/update.xml 2012-01-05 13:01:01 UTC (rev 4376)
+++ trunk/plugins/VeraControl/releases/update.xml 2012-01-05 13:08:42 UTC (rev 4377)
@@ -90,18 +90,8 @@
<Build>0</Build>
<Revision>0</Revision>
</Version>
- <ExtensionDescription>Control you Vera controller from MediaPortal.
+ <ExtensionDescription>Control your Vera controller from MediaPortal. Supports Scene triggers for starting, hibernating and exiting MediaPortal; Also starting, pausing and stopping media streams. So dim your lights and close the curtain autmatically when MediaPortal starts a movie...
-
-
-Supports Scene triggers for starting, hibernating and exiting MediaPortal; Also starting, pausing and stopping media streams.
-
-
-
-So dim your lights and close the curtain autmatically when MediaPortal starts a movie...
-
-
-
Vera is a Z-wave home automation controller from MicasaVerde. This version is tested with Vera 2 UI4 v.1.1.1267
</ExtensionDescription>
@@ -109,9 +99,9 @@
<DevelopmentStatus>Beta</DevelopmentStatus>
<OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/VeraControl/releases/</OnlineLocation>
<ReleaseDate>2012-01-04T22:51:05.585629+01:00</ReleaseDate>
- <Tags>home automation
-z-wave
-micasavera
+ <Tags>home automation,
+z-wave,
+micasaverde,
vera</Tags>
<Location>C:\Users\Bart\Documents\SharpDevelop Projects\VeraControl\MP-Website\VeraControl.mpe1</Location>
<Params>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ba...@us...> - 2012-01-05 13:01:12
|
Revision: 4376
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4376&view=rev
Author: BartEv
Date: 2012-01-05 13:01:01 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/VeraControl/releases/VeraControl.xmp2
trunk/plugins/VeraControl/releases/update.xml
Modified: trunk/plugins/VeraControl/releases/VeraControl.xmp2
===================================================================
--- trunk/plugins/VeraControl/releases/VeraControl.xmp2 2012-01-05 12:53:23 UTC (rev 4375)
+++ trunk/plugins/VeraControl/releases/VeraControl.xmp2 2012-01-05 13:01:01 UTC (rev 4376)
@@ -594,31 +594,31 @@
<Author>Bart Eversdijk</Author>
<HomePage>http://www.team-mediaportal.com/extensions/micasaverde-vera-controller</HomePage>
<ForumPage>http://forum.team-mediaportal.com/mediaportal-plugins-47/plugin-micasaverde-vera-controller-104337/</ForumPage>
- <UpdateUrl />
+ <UpdateUrl>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/VeraControl/releases/update.xml</UpdateUrl>
<Version>
<Major>0</Major>
<Minor>5</Minor>
<Build>0</Build>
<Revision>0</Revision>
</Version>
- <ExtensionDescription>Control you Vera controller from MediaPortal.
-
-
-
-Supports Scene triggers for starting, hibernating and exiting MediaPortal; Also starting, pausing and stopping media streams.
-
-
-
-So dim your lights and close the curtain autmatically when MediaPortal starts a movie...
-
-
-
-Vera is a Z-wave home automation controller from MicasaVerde. This version is tested with Vera 2 UI4 v.1.1.1267
-
+ <ExtensionDescription>Control you Vera controller from MediaPortal.
+
+
+
+Supports Scene triggers for starting, hibernating and exiting MediaPortal; Also starting, pausing and stopping media streams.
+
+
+
+So dim your lights and close the curtain autmatically when MediaPortal starts a movie...
+
+
+
+Vera is a Z-wave home automation controller from MicasaVerde. This version is tested with Vera 2 UI4 v.1.1.1267
+
</ExtensionDescription>
<VersionDescription>First version - for beta testing only</VersionDescription>
<DevelopmentStatus>Beta</DevelopmentStatus>
- <OnlineLocation />
+ <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/VeraControl/releases/</OnlineLocation>
<ReleaseDate>2012-01-04T22:51:05.585629+01:00</ReleaseDate>
<Tags>home automation
z-wave
@@ -909,7 +909,7 @@
</FolderGroup>
</FolderGroups>
<ProjectFilename>VeraControl.xmp2</ProjectFilename>
- <UpdatePath1 />
+ <UpdatePath1>C:\Users\Bart\Documents\SharpDevelop Projects\VeraControl\releases\update.xml</UpdatePath1>
<UpdatePath2 />
<UpdatePath3 />
</ProjectSettings>
Modified: trunk/plugins/VeraControl/releases/update.xml
===================================================================
--- trunk/plugins/VeraControl/releases/update.xml 2012-01-05 12:53:23 UTC (rev 4375)
+++ trunk/plugins/VeraControl/releases/update.xml 2012-01-05 13:01:01 UTC (rev 4376)
@@ -83,31 +83,31 @@
<Author>Bart Eversdijk</Author>
<HomePage>http://www.team-mediaportal.com/extensions/micasaverde-vera-controller</HomePage>
<ForumPage>http://forum.team-mediaportal.com/mediaportal-plugins-47/plugin-micasaverde-vera-controller-104337/</ForumPage>
- <UpdateUrl />
+ <UpdateUrl>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/VeraControl/releases/update.xml</UpdateUrl>
<Version>
<Major>0</Major>
<Minor>5</Minor>
<Build>0</Build>
<Revision>0</Revision>
</Version>
- <ExtensionDescription>Control you Vera controller from MediaPortal.
-
-
-
-Supports Scene triggers for starting, hibernating and exiting MediaPortal; Also starting, pausing and stopping media streams.
-
-
-
-So dim your lights and close the curtain autmatically when MediaPortal starts a movie...
-
-
-
-Vera is a Z-wave home automation controller from MicasaVerde. This version is tested with Vera 2 UI4 v.1.1.1267
-
+ <ExtensionDescription>Control you Vera controller from MediaPortal.
+
+
+
+Supports Scene triggers for starting, hibernating and exiting MediaPortal; Also starting, pausing and stopping media streams.
+
+
+
+So dim your lights and close the curtain autmatically when MediaPortal starts a movie...
+
+
+
+Vera is a Z-wave home automation controller from MicasaVerde. This version is tested with Vera 2 UI4 v.1.1.1267
+
</ExtensionDescription>
<VersionDescription>First version - for beta testing only</VersionDescription>
<DevelopmentStatus>Beta</DevelopmentStatus>
- <OnlineLocation />
+ <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/VeraControl/releases/</OnlineLocation>
<ReleaseDate>2012-01-04T22:51:05.585629+01:00</ReleaseDate>
<Tags>home automation
z-wave
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ba...@us...> - 2012-01-05 12:53:31
|
Revision: 4375
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4375&view=rev
Author: BartEv
Date: 2012-01-05 12:53:23 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
Added Paths:
-----------
trunk/plugins/VeraControl/releases/
trunk/plugins/VeraControl/releases/VeraControl.xmp2
trunk/plugins/VeraControl/releases/VeraControl_v0.5.0.0.mpe1
trunk/plugins/VeraControl/releases/update.xml
Added: trunk/plugins/VeraControl/releases/VeraControl.xmp2
===================================================================
--- trunk/plugins/VeraControl/releases/VeraControl.xmp2 (rev 0)
+++ trunk/plugins/VeraControl/releases/VeraControl.xmp2 2012-01-05 12:53:23 UTC (rev 4375)
@@ -0,0 +1,917 @@
+<?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>..\bin\Debug\VeraControl.dll</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{7313a25a-e5a1-46e7-af14-613b3d1294df}-VeraControl.dll</ZipFileName>
+ <DestinationFilename>%Plugins%\Windows\VeraControl.dll</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Default\VeraControl.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{028d1570-2f3e-4ddb-9721-36f94cca1de5}-VeraControl.xml</ZipFileName>
+ <DestinationFilename>%Skin%\Default\VeraControl.xml</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Default\VeraDialogActionTrigger.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{09937fdb-eda7-4fb5-a0c6-b94788cacdb6}-VeraDialogActionTrigger.xml</ZipFileName>
+ <DestinationFilename>%Skin%\Default\VeraDialogActionTrigger.xml</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Default\VeraDialogDeviceControl.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{507aff1a-15af-493d-b9b4-40ef11cfc4cd}-VeraDialogDeviceControl.xml</ZipFileName>
+ <DestinationFilename>%Skin%\Default\VeraDialogDeviceControl.xml</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\DefaultWide\VeraControl.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{85789702-644a-4d04-b55c-8d1b76947ba4}-VeraControl.xml</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\VeraControl.xml</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\DefaultWide\VeraDialogActionTrigger.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{34942e3c-61c3-4475-809b-89fb17f84fbb}-VeraDialogActionTrigger.xml</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\VeraDialogActionTrigger.xml</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\DefaultWide\VeraDialogDeviceControl.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{81cf93f1-6f6f-46de-9370-e4c75596ca9d}-VeraDialogDeviceControl.xml</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\VeraDialogDeviceControl.xml</DestinationFilename>
+ </FileItem>
+ </Items>
+ </Files>
+ </GroupItem>
+ <GroupItem Name="IconsDefault">
+ <DisplayName>Icons-default</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>IconsDefault</Description>
+ <Files>
+ <Items>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Binary_Light_0.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{89116eb0-9f8f-4115-8585-47c31626e2f2}-Binary_Light_0.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Binary_Light_0.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Binary_Light_100.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{6bb2f991-9a12-485d-b619-127cf337a8e6}-Binary_Light_100.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Binary_Light_100.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\default_panel.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{e50d693c-667a-4bca-9b98-94a88d9a26f3}-default_panel.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\default_panel.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Dimmable_Light_0.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{c4930324-5849-4cfb-b4cb-366999094a0d}-Dimmable_Light_0.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Dimmable_Light_0.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Dimmable_Light_100.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{fb44ba6e-e418-469b-8ba4-3fe1a064bb6e}-Dimmable_Light_100.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Dimmable_Light_100.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Dimmable_Light_25.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{7b289b0b-bae4-4636-a12e-ba59429f0cf3}-Dimmable_Light_25.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Dimmable_Light_25.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Dimmable_Light_50.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{f75631ed-96fe-4349-9be5-d278daff8cba}-Dimmable_Light_50.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Dimmable_Light_50.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Dimmable_Light_75.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{efb6ef6a-7cdf-48bf-b675-d45378f156e4}-Dimmable_Light_75.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Dimmable_Light_75.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Door_Lock.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{df1a20d3-936c-4b7b-89c5-fb509a998cf2}-Door_Lock.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Door_Lock.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Door_Lock_0.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{b1eaf501-4274-4a7f-9e7a-fbcf5cccf440}-Door_Lock_0.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Door_Lock_0.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Door_Lock_100.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{f9f6e928-f0fb-4212-8994-c88ae2981829}-Door_Lock_100.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Door_Lock_100.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\energy.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{53f9d0bd-c18e-40ee-8c54-d319744bc032}-energy.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\energy.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\findvera.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{d66f0720-f31a-494f-8f48-d573342f04bb}-findvera.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\findvera.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Generic_IO.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{5c67f3ea-9e86-4b21-adcf-5a8cb00e94c0}-Generic_IO.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Generic_IO.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\generic_sensor.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{48c7aff1-ff51-4c34-873a-9bb717a11eb1}-generic_sensor.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\generic_sensor.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Humidity_Sensor.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{eee55fd4-330f-40a8-b3e1-c728e9ae40cc}-Humidity_Sensor.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Humidity_Sensor.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Insteon.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{7316caa2-a4c9-43e9-9a11-4491aa20e358}-Insteon.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Insteon.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Light_Sensor.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{cfb228c8-c039-41b3-8388-e1292b40d568}-Light_Sensor.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Light_Sensor.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Motion_Sensor_0.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{4c0ff3e4-6770-4f74-9baf-92e3fefc783b}-Motion_Sensor_0.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Motion_Sensor_0.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Motion_Sensor_100.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{f84bc452-70f3-4bbf-ae56-00fc3182a8f3}-Motion_Sensor_100.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Motion_Sensor_100.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Power_Meter.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{968b6884-21e9-4357-99d5-b4368901d7b4}-Power_Meter.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Power_Meter.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Scenes.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{d4724f5a-6a6e-4702-b122-58d48b4d6822}-Scenes.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Scenes.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Temperature_Sensor.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{cd6d14cf-c7d2-4258-a8b4-4ac0c02ac1da}-Temperature_Sensor.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Temperature_Sensor.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Thermostat.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{6e4a50f0-98dd-4752-af25-7d260e6c4387}-Thermostat.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Thermostat.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Window_Covering.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{81d4d577-b083-4b25-ad60-86ae9f624f8b}-Window_Covering.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Window_Covering.png</DestinationFilename>
+ </FileItem>
+ </Items>
+ </Files>
+ </GroupItem>
+ <GroupItem Name="IconsDefaultWide">
+ <DisplayName>IconsDefaultWide</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>IconsDefaultWide</Description>
+ <Files>
+ <Items>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Binary_Light_0.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{6b52dea7-10b3-47f0-b501-fb4066d4401f}-Binary_Light_0.png</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\media\Vera\Binary_Light_0.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Binary_Light_100.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{038b63d1-5117-45d2-aabd-e71be925cd82}-Binary_Light_100.png</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\media\Vera\Binary_Light_100.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\default_panel.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{b73ea654-f982-4b56-9545-6b37eedbe50d}-default_panel.png</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\media\Vera\default_panel.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Dimmable_Light_0.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{f7b771b8-1e81-4b03-aa0e-e543828ebae6}-Dimmable_Light_0.png</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\media\Vera\Dimmable_Light_0.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Dimmable_Light_100.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{94401be2-c4ff-4ffb-b5cc-467a2a56ce09}-Dimmable_Light_100.png</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\media\Vera\Dimmable_Light_100.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Dimmable_Light_25.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{573a2fa0-792d-4f96-8b6f-77c132b401d9}-Dimmable_Light_25.png</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\media\Vera\Dimmable_Light_25.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Dimmable_Light_50.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{a22acfc5-030e-46b9-b3f2-a3d7715c686e}-Dimmable_Light_50.png</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\media\Vera\Dimmable_Light_50.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Dimmable_Light_75.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{00f2700c-279b-4f65-80a4-c6bf492bfedc}-Dimmable_Light_75.png</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\media\Vera\Dimmable_Light_75.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Door_Lock.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{8c082e30-634c-4522-b8c6-21ed2f1da157}-Door_Lock.png</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\media\Vera\Door_Lock.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Door_Lock_0.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{f4995882-0621-4a4b-b872-5dc4dd375874}-Door_Lock_0.png</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\media\Vera\Door_Lock_0.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Door_Lock_100.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{056c0d53-e453-4c10-aa53-7cc9e2feeeec}-Door_Lock_100.png</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\media\Vera\Door_Lock_100.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\energy.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{1b31597a-7ee0-431f-ac40-2c6f4ef900a1}-energy.png</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\media\Vera\energy.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\findvera.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{cca1d9fa-0a0c-4e82-8640-335e965f0944}-findvera.png</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\media\Vera\findvera.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Generic_IO.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{b5124f9f-e8bb-4c30-813c-ff06b9064f2b}-Generic_IO.png</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\media\Vera\Generic_IO.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\generic_sensor.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{9dac2abb-b92b-4f34-987b-89befad576e4}-generic_sensor.png</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\media\Vera\generic_sensor.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Humidity_Sensor.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{a4e8847b-7b39-4a7b-b2d3-4f3be63991f6}-Humidity_Sensor.png</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\media\Vera\Humidity_Sensor.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Insteon.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{d3df16fc-e295-4af2-8757-37b245cc6522}-Insteon.png</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\media\Vera\Insteon.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Light_Sensor.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{7f28ddf2-f66b-4726-bd27-53062fa65451}-Light_Sensor.png</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\media\Vera\Light_Sensor.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Motion_Sensor_0.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{11842716-9e2a-4226-8af5-57240474673c}-Motion_Sensor_0.png</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\media\Vera\Motion_Sensor_0.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Motion_Sensor_100.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{490ebe21-fa83-4cab-bd25-62d09902bc52}-Motion_Sensor_100.png</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\media\Vera\Motion_Sensor_100.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Power_Meter.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{c7e21c80-2566-4ae8-a656-24f36c0dee24}-Power_Meter.png</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\media\Vera\Power_Meter.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Scenes.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{6a32f914-e28c-4bb5-b6bd-633c527f26fe}-Scenes.png</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\media\Vera\Scenes.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Temperature_Sensor.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{40cc3e24-e58d-49d5-8747-0e7c8421e57d}-Temperature_Sensor.png</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\media\Vera\Temperature_Sensor.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Thermostat.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{26667211-641d-4524-88ac-8d8a07998da6}-Thermostat.png</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\media\Vera\Thermostat.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Window_Covering.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{10317a0b-8169-4b3c-acff-db60a3118d2e}-Window_Covering.png</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\media\Vera\Window_Covering.png</DestinationFilename>
+ </FileItem>
+ </Items>
+ </Files>
+ </GroupItem>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items>
+ <SectionItem Guid="f47c168b-0a86-4bee-ac91-76cc8511b6da" Name="Welcome Screen" ConditionGroup="Default">
+ <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="7719bf74-822b-47a6-be0f-cd876c40bcae" Name="Install Section" ConditionGroup="">
+ <Params>
+ <Items>
+ <SectionParam Name="Header Title">
+ <Value>Do not forget config this plugin, after installation!!!</Value>
+ <ValueType>String</ValueType>
+ <Description>Header title</Description>
+ </SectionParam>
+ <SectionParam Name="Header description">
+ <Value>- Run MediaPortal configuration-tool to enable VeraContoller
+- Hit also the config button and set Vera's IP-address</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>
+ <string>Default</string>
+ <string>IconsDefault</string>
+ <string>IconsDefaultWide</string>
+ </IncludedGroups>
+ <PanelName>Install Section</PanelName>
+ <WizardButtonsEnum>Next</WizardButtonsEnum>
+ </SectionItem>
+ <SectionItem Guid="50a84c38-e290-4043-9691-d1410eed9968" Name="Setup Complete" ConditionGroup="Default">
+ <Params>
+ <Items>
+ <SectionParam Name="Header text">
+ <Value>The Extension Installer Wizard has successfully installed [Name].
+
+Do not forget to configure the Vera Control plug in.
+
+</Value>
+ <ValueType>String</ValueType>
+ <Description />
+ </SectionParam>
+ <SectionParam Name="Left part image">
+ <Value />
+ <ValueType>File</ValueType>
+ <Description />
+ </SectionParam>
+ <SectionParam Name="Show radio buttons">
+ <Value>NO</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="VeraControl.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.1.6.27644</MinRequiredVersion>
+ <DesignedForVersion>1.1.6.27644</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items>
+ <SubSystemItem Name="MP.SkinEngine" />
+ <SubSystemItem Name="MP.Config" />
+ </Items>
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
+ <GeneralInfo>
+ <Name>Vera Controller</Name>
+ <Id>ebb6b1af-6fb9-44e5-a859-9d32ffe20a9e</Id>
+ <Author>Bart Eversdijk</Author>
+ <HomePage>http://www.team-mediaportal.com/extensions/micasaverde-vera-controller</HomePage>
+ <ForumPage>http://forum.team-mediaportal.com/mediaportal-plugins-47/plugin-micasaverde-vera-controller-104337/</ForumPage>
+ <UpdateUrl />
+ <Version>
+ <Major>0</Major>
+ <Minor>5</Minor>
+ <Build>0</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>Control you Vera controller from MediaPortal.
+
+
+
+Supports Scene triggers for starting, hibernating and exiting MediaPortal; Also starting, pausing and stopping media streams.
+
+
+
+So dim your lights and close the curtain autmatically when MediaPortal starts a movie...
+
+
+
+Vera is a Z-wave home automation controller from MicasaVerde. This version is tested with Vera 2 UI4 v.1.1.1267
+
+</ExtensionDescription>
+ <VersionDescription>First version - for beta testing only</VersionDescription>
+ <DevelopmentStatus>Beta</DevelopmentStatus>
+ <OnlineLocation />
+ <ReleaseDate>2012-01-04T22:51:05.585629+01:00</ReleaseDate>
+ <Tags>home automation
+z-wave
+micasavera
+vera</Tags>
+ <Location>C:\Users\Bart\Documents\SharpDevelop Projects\VeraControl\MP-Website\VeraControl.mpe1</Location>
+ <Params>
+ <Items>
+ <SectionParam Name="Icon">
+ <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>..\bin\Debug\VeraControl.dll</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{7313a25a-e5a1-46e7-af14-613b3d1294df}-VeraControl.dll</ZipFileName>
+ <DestinationFilename>%Plugins%\Windows\VeraControl.dll</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Default\VeraControl.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{028d1570-2f3e-4ddb-9721-36f94cca1de5}-VeraControl.xml</ZipFileName>
+ <DestinationFilename>%Skin%\Default\VeraControl.xml</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Default\VeraDialogActionTrigger.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{09937fdb-eda7-4fb5-a0c6-b94788cacdb6}-VeraDialogActionTrigger.xml</ZipFileName>
+ <DestinationFilename>%Skin%\Default\VeraDialogActionTrigger.xml</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Default\VeraDialogDeviceControl.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{507aff1a-15af-493d-b9b4-40ef11cfc4cd}-VeraDialogDeviceControl.xml</ZipFileName>
+ <DestinationFilename>%Skin%\Default\VeraDialogDeviceControl.xml</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\DefaultWide\VeraControl.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{85789702-644a-4d04-b55c-8d1b76947ba4}-VeraControl.xml</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\VeraControl.xml</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\DefaultWide\VeraDialogActionTrigger.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{34942e3c-61c3-4475-809b-89fb17f84fbb}-VeraDialogActionTrigger.xml</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\VeraDialogActionTrigger.xml</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\DefaultWide\VeraDialogDeviceControl.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{81cf93f1-6f6f-46de-9370-e4c75596ca9d}-VeraDialogDeviceControl.xml</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\VeraDialogDeviceControl.xml</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Binary_Light_0.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{89116eb0-9f8f-4115-8585-47c31626e2f2}-Binary_Light_0.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Binary_Light_0.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Binary_Light_100.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{6bb2f991-9a12-485d-b619-127cf337a8e6}-Binary_Light_100.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Binary_Light_100.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\default_panel.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{e50d693c-667a-4bca-9b98-94a88d9a26f3}-default_panel.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\default_panel.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Dimmable_Light_0.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{c4930324-5849-4cfb-b4cb-366999094a0d}-Dimmable_Light_0.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Dimmable_Light_0.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Dimmable_Light_100.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{fb44ba6e-e418-469b-8ba4-3fe1a064bb6e}-Dimmable_Light_100.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Dimmable_Light_100.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Dimmable_Light_25.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{7b289b0b-bae4-4636-a12e-ba59429f0cf3}-Dimmable_Light_25.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Dimmable_Light_25.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Dimmable_Light_50.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{f75631ed-96fe-4349-9be5-d278daff8cba}-Dimmable_Light_50.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Dimmable_Light_50.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Dimmable_Light_75.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{efb6ef6a-7cdf-48bf-b675-d45378f156e4}-Dimmable_Light_75.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Dimmable_Light_75.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Door_Lock.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{df1a20d3-936c-4b7b-89c5-fb509a998cf2}-Door_Lock.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Door_Lock.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Door_Lock_0.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{b1eaf501-4274-4a7f-9e7a-fbcf5cccf440}-Door_Lock_0.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Door_Lock_0.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Door_Lock_100.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{f9f6e928-f0fb-4212-8994-c88ae2981829}-Door_Lock_100.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Door_Lock_100.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\energy.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{53f9d0bd-c18e-40ee-8c54-d319744bc032}-energy.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\energy.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\findvera.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{d66f0720-f31a-494f-8f48-d573342f04bb}-findvera.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\findvera.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Generic_IO.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{5c67f3ea-9e86-4b21-adcf-5a8cb00e94c0}-Generic_IO.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Generic_IO.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\generic_sensor.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{48c7aff1-ff51-4c34-873a-9bb717a11eb1}-generic_sensor.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\generic_sensor.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Humidity_Sensor.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{eee55fd4-330f-40a8-b3e1-c728e9ae40cc}-Humidity_Sensor.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Humidity_Sensor.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Insteon.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{7316caa2-a4c9-43e9-9a11-4491aa20e358}-Insteon.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Insteon.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Light_Sensor.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{cfb228c8-c039-41b3-8388-e1292b40d568}-Light_Sensor.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Light_Sensor.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Motion_Sensor_0.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{4c0ff3e4-6770-4f74-9baf-92e3fefc783b}-Motion_Sensor_0.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Motion_Sensor_0.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Motion_Sensor_100.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{f84bc452-70f3-4bbf-ae56-00fc3182a8f3}-Motion_Sensor_100.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Motion_Sensor_100.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Power_Meter.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{968b6884-21e9-4357-99d5-b4368901d7b4}-Power_Meter.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Power_Meter.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Scenes.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{d4724f5a-6a6e-4702-b122-58d48b4d6822}-Scenes.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Scenes.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Temperature_Sensor.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{cd6d14cf-c7d2-4258-a8b4-4ac0c02ac1da}-Temperature_Sensor.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Temperature_Sensor.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Thermostat.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{6e4a50f0-98dd-4752-af25-7d260e6c4387}-Thermostat.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Thermostat.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Window_Covering.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{81d4d577-b083-4b25-ad60-86ae9f624f8b}-Window_Covering.png</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Window_Covering.png</DestinationFilename>
+ </FileItem>
+ </Items>
+ </UniqueFileList>
+ <ProjectSettings>
+ <FolderGroups>
+ <FolderGroup InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName />
+ <ZipFileName>Installer{CopyFile}\{73fd586f-091a-4183-a08b-ab1188766f84}-</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera</DestinationFilename>
+ <Folder>..\skin\Media\Vera</Folder>
+ <Group>IconsDefault</Group>
+ <Recursive>true</Recursive>
+ </FolderGroup>
+ <FolderGroup InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName />
+ <ZipFileName>Installer{CopyFile}\{1450eebe-7f65-4ae9-bfce-d5a499a4fbd3}-</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\media\Vera</DestinationFilename>
+ <Folder>..\skin\Media\Vera</Folder>
+ <Group>IconsDefaultWide</Group>
+ <Recursive>true</Recursive>
+ </FolderGroup>
+ </FolderGroups>
+ <ProjectFilename>VeraControl.xmp2</ProjectFilename>
+ <UpdatePath1 />
+ <UpdatePath2 />
+ <UpdatePath3 />
+ </ProjectSettings>
+ <IsSkin>false</IsSkin>
+</PackageClass>
\ No newline at end of file
Added: trunk/plugins/VeraControl/releases/VeraControl_v0.5.0.0.mpe1
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/VeraControl/releases/VeraControl_v0.5.0.0.mpe1
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/VeraControl/releases/update.xml
===================================================================
--- trunk/plugins/VeraControl/releases/update.xml (rev 0)
+++ trunk/plugins/VeraControl/releases/update.xml 2012-01-05 12:53:23 UTC (rev 4375)
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ExtensionCollection xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <Items>
+ <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="IconsDefault">
+ <DisplayName>IconsDefault</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>IconsDefault</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="IconsDefaultWide">
+ <DisplayName>IconsDefaultWide</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>IconsDefaultWide</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="VeraControl.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.1.6.27644</MinRequiredVersion>
+ <DesignedForVersion>1.1.6.27644</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items>
+ <SubSystemItem Name="MP.SkinEngine" />
+ <SubSystemItem Name="MP.Config" />
+ </Items>
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
+ <GeneralInfo>
+ <Name>Vera Controller</Name>
+ <Id>ebb6b1af-6fb9-44e5-a859-9d32ffe20a9e</Id>
+ <Author>Bart Eversdijk</Author>
+ <HomePage>http://www.team-mediaportal.com/extensions/micasaverde-vera-controller</HomePage>
+ <ForumPage>http://forum.team-mediaportal.com/mediaportal-plugins-47/plugin-micasaverde-vera-controller-104337/</ForumPage>
+ <UpdateUrl />
+ <Version>
+ <Major>0</Major>
+ <Minor>5</Minor>
+ <Build>0</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>Control you Vera controller from MediaPortal.
+
+
+
+Supports Scene triggers for starting, hibernating and exiting MediaPortal; Also starting, pausing and stopping media streams.
+
+
+
+So dim your lights and close the curtain autmatically when MediaPortal starts a movie...
+
+
+
+Vera is a Z-wave home automation controller from MicasaVerde. This version is tested with Vera 2 UI4 v.1.1.1267
+
+</ExtensionDescription>
+ <VersionDescription>First version - for beta testing only</VersionDescription>
+ <DevelopmentStatus>Beta</DevelopmentStatus>
+ <OnlineLocation />
+ <ReleaseDate>2012-01-04T22:51:05.585629+01:00</ReleaseDate>
+ <Tags>home automation
+z-wave
+micasavera
+vera</Tags>
+ <Location>C:\Users\Bart\Documents\SharpDevelop Projects\VeraControl\MP-Website\VeraControl.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</Val...
[truncated message content] |
|
From: <Ba...@us...> - 2012-01-05 12:19:38
|
Revision: 4374
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4374&view=rev
Author: BartEv
Date: 2012-01-05 12:19:29 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
Added Paths:
-----------
trunk/plugins/VeraControl/VeraControl.sln
Added: trunk/plugins/VeraControl/VeraControl.sln
===================================================================
--- trunk/plugins/VeraControl/VeraControl.sln (rev 0)
+++ trunk/plugins/VeraControl/VeraControl.sln 2012-01-05 12:19:29 UTC (rev 4374)
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+# SharpDevelop 4.1.0.8000
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VeraControl", "VeraControl.csproj", "{B403D22F-BFFF-41F5-846E-E60586CFB39F}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|x86 = Debug|x86
+ Release|x86 = Release|x86
+ Debug|x86 = Debug|x86
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {B403D22F-BFFF-41F5-846E-E60586CFB39F}.Debug|x86.Build.0 = Debug|x86
+ {B403D22F-BFFF-41F5-846E-E60586CFB39F}.Debug|x86.ActiveCfg = Debug|x86
+ {B403D22F-BFFF-41F5-846E-E60586CFB39F}.Release|x86.Build.0 = Release|x86
+ {B403D22F-BFFF-41F5-846E-E60586CFB39F}.Release|x86.ActiveCfg = Release|x86
+ EndGlobalSection
+EndGlobal
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ba...@us...> - 2012-01-05 12:17:33
|
Revision: 4373
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4373&view=rev
Author: BartEv
Date: 2012-01-05 12:17:24 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
Added Paths:
-----------
trunk/plugins/VeraControl/
trunk/plugins/VeraControl/DevCategories.cs
trunk/plugins/VeraControl/DeviceDimmer.cs
trunk/plugins/VeraControl/DeviceDoorlock.cs
trunk/plugins/VeraControl/DeviceGWeather.cs
trunk/plugins/VeraControl/DeviceGeneric.cs
trunk/plugins/VeraControl/DeviceHumidity.cs
trunk/plugins/VeraControl/DeviceLightSensor.cs
trunk/plugins/VeraControl/DevicePowerMeter.cs
trunk/plugins/VeraControl/DeviceSecurity.cs
trunk/plugins/VeraControl/DeviceSprinkler.cs
trunk/plugins/VeraControl/DeviceSwitch.cs
trunk/plugins/VeraControl/DeviceTemperature.cs
trunk/plugins/VeraControl/DeviceThermostat.cs
trunk/plugins/VeraControl/DeviceWindowCovering.cs
trunk/plugins/VeraControl/DialogActionTrigger.cs
trunk/plugins/VeraControl/DialogDeviceControl.cs
trunk/plugins/VeraControl/Properties/
trunk/plugins/VeraControl/Properties/AssemblyInfo.cs
trunk/plugins/VeraControl/Room.cs
trunk/plugins/VeraControl/Scene.cs
trunk/plugins/VeraControl/Section.cs
trunk/plugins/VeraControl/VeraCommunication.cs
trunk/plugins/VeraControl/VeraControl.cs
trunk/plugins/VeraControl/VeraControl.csproj
trunk/plugins/VeraControl/VeraSetupForm.Designer.cs
trunk/plugins/VeraControl/VeraSetupForm.cs
trunk/plugins/VeraControl/VeraSetupForm.resx
trunk/plugins/VeraControl/skin/
trunk/plugins/VeraControl/skin/Default/
trunk/plugins/VeraControl/skin/Default/VeraControl.xml
trunk/plugins/VeraControl/skin/Default/VeraDialogActionTrigger.xml
trunk/plugins/VeraControl/skin/Default/VeraDialogDeviceControl.xml
trunk/plugins/VeraControl/skin/DefaultWide/
trunk/plugins/VeraControl/skin/DefaultWide/VeraControl.xml
trunk/plugins/VeraControl/skin/DefaultWide/VeraDialogActionTrigger.xml
trunk/plugins/VeraControl/skin/DefaultWide/VeraDialogDeviceControl.xml
trunk/plugins/VeraControl/skin/Media/
trunk/plugins/VeraControl/skin/Media/Vera/
trunk/plugins/VeraControl/skin/Media/Vera/Binary_Light_0.png
trunk/plugins/VeraControl/skin/Media/Vera/Binary_Light_100.png
trunk/plugins/VeraControl/skin/Media/Vera/Dimmable_Light_0.png
trunk/plugins/VeraControl/skin/Media/Vera/Dimmable_Light_100.png
trunk/plugins/VeraControl/skin/Media/Vera/Dimmable_Light_25.png
trunk/plugins/VeraControl/skin/Media/Vera/Dimmable_Light_50.png
trunk/plugins/VeraControl/skin/Media/Vera/Dimmable_Light_75.png
trunk/plugins/VeraControl/skin/Media/Vera/Door_Lock.png
trunk/plugins/VeraControl/skin/Media/Vera/Door_Lock_0.png
trunk/plugins/VeraControl/skin/Media/Vera/Door_Lock_100.png
trunk/plugins/VeraControl/skin/Media/Vera/Generic_IO.png
trunk/plugins/VeraControl/skin/Media/Vera/Humidity_Sensor.png
trunk/plugins/VeraControl/skin/Media/Vera/Insteon.png
trunk/plugins/VeraControl/skin/Media/Vera/Light_Sensor.png
trunk/plugins/VeraControl/skin/Media/Vera/Motion_Sensor_0.png
trunk/plugins/VeraControl/skin/Media/Vera/Motion_Sensor_100.png
trunk/plugins/VeraControl/skin/Media/Vera/Power_Meter.png
trunk/plugins/VeraControl/skin/Media/Vera/Scenes.png
trunk/plugins/VeraControl/skin/Media/Vera/Temperature_Sensor.png
trunk/plugins/VeraControl/skin/Media/Vera/Thermostat.png
trunk/plugins/VeraControl/skin/Media/Vera/Window_Covering.png
trunk/plugins/VeraControl/skin/Media/Vera/default_panel.png
trunk/plugins/VeraControl/skin/Media/Vera/energy.png
trunk/plugins/VeraControl/skin/Media/Vera/findvera.png
trunk/plugins/VeraControl/skin/Media/Vera/generic_sensor.png
Added: trunk/plugins/VeraControl/DevCategories.cs
===================================================================
--- trunk/plugins/VeraControl/DevCategories.cs (rev 0)
+++ trunk/plugins/VeraControl/DevCategories.cs 2012-01-05 12:17:24 UTC (rev 4373)
@@ -0,0 +1,58 @@
+/*
+ * Created by SharpDevelop.
+ * User: Bart
+ * Date: 22-12-2011
+ * Time: 14:14
+ *
+ * Copyright: 2012 GPL - Bart Eversdijk
+ * MediaPort plugin - MicasaVerde (TM) Vera Controller
+ * E-mail: ba...@ev...
+ */
+using System;
+using System.Xml;
+
+namespace VeraControl.Properties
+{
+ /// <summary>
+ /// Description of DevCategories.
+ /// </summary>
+ public class DevCategories
+ {
+ public DevCategories(XmlNode xn)
+ {
+ if (xn == null) {
+ m_sName = "";
+ m_iId = 0;
+ } else {
+ update(xn);
+ }
+ }
+
+ private string m_sName;
+ private int m_iId;
+
+ public bool update(XmlNode xn)
+ {
+ m_sName = xn.Attributes["name"].Value;
+ m_iId = int.Parse(xn.Attributes["id"].Value);
+ return true;
+ }
+
+ public int id
+ {
+ get { return m_iId; }
+ set { }
+ }
+
+ public string name
+ {
+ get { return m_sName; }
+ set { }
+ }
+
+ public override string ToString()
+ {
+ return name;
+ }
+ }
+}
Added: trunk/plugins/VeraControl/DeviceDimmer.cs
===================================================================
--- trunk/plugins/VeraControl/DeviceDimmer.cs (rev 0)
+++ trunk/plugins/VeraControl/DeviceDimmer.cs 2012-01-05 12:17:24 UTC (rev 4373)
@@ -0,0 +1,108 @@
+/*
+ * Created by SharpDevelop.
+ * User: Bart
+ * Date: 22-12-2011
+ * Time: 17:36
+ *
+ * Copyright: 2012 GPL - Bart Eversdijk
+ * MediaPort plugin - MicasaVerde (TM) Vera Controller
+ * E-mail: ba...@ev...
+ */
+using System;
+using System.Xml;
+
+namespace VeraControl.Properties
+{
+ /// <summary>
+ /// Description of DeviceDimmer.
+ /// </summary>
+ public class DeviceDimmer : DeviceGeneric
+ {
+ private int m_iLevel;
+ private string m_sWatt;
+
+ public DeviceDimmer( XmlNode xn ): base (xn)
+ {
+ if (xn != null)
+ {
+ update(xn);
+ }
+ }
+
+ public override bool update(XmlNode xn)
+ {
+ m_iLevel = (xn.Attributes["level"] != null ? int.Parse(xn.Attributes["level"].Value) : 0);
+ m_sWatt = (xn.Attributes["watts"] != null ? xn.Attributes["watts"].Value : "0");
+
+ return base.update(xn);
+ }
+
+ public string watts
+ {
+ get { return m_sWatt; }
+ set { }
+ }
+
+ public override bool state
+ {
+ get { return (m_iLevel > 0); }
+ set {
+
+ }
+ }
+
+ public override int level
+ {
+ get { return m_iLevel; }
+ set
+ {
+ int newValue = value;
+ if (newValue > 100) {
+ newValue = 100;
+ } else {
+ if (newValue < 0) { newValue = 0; }
+ }
+ VeraCommunication vera = VeraCommunication.Instance;
+ // Do something with vera
+ string cmd = "?id=lu_action&DeviceNum="+id.ToString()+
+ "&serviceId=urn:upnp-org:serviceId:Dimming1&action=SetLoadLevelTarget" +
+ "&newLoadlevelTarget="+value;
+ string sResult = vera.doVeraRequest(cmd);
+ m_iLevel = newValue;
+ }
+ }
+
+ public override int maxLevel
+ {
+ get { return 100; }
+ set { }
+ }
+
+ public override string ToString()
+ {
+ return name + " [" + getStatusText() + "]";
+ }
+
+ public override bool isControllable
+ {
+ get { return true; }
+ set { }
+ }
+
+ public override string getIconName()
+ {
+ string leveltxt = "0";
+ if (level > 0) { leveltxt = "25"; }
+ if (level > 35) { leveltxt = "50"; }
+ if (level > 65) { leveltxt = "75"; }
+ if (level > 85) { leveltxt = "100"; }
+
+ return "Dimmable_Light_"+leveltxt;
+ }
+
+ public override string getStatusText()
+ {
+ return ( state ? level.ToString() + "%" : "Off");
+ }
+ }
+}
Added: trunk/plugins/VeraControl/DeviceDoorlock.cs
===================================================================
--- trunk/plugins/VeraControl/DeviceDoorlock.cs (rev 0)
+++ trunk/plugins/VeraControl/DeviceDoorlock.cs 2012-01-05 12:17:24 UTC (rev 4373)
@@ -0,0 +1,89 @@
+/*
+ * Created by SharpDevelop.
+ * User: Bart
+ * Date: 3-1-2012
+ * Time: 11:51
+ *
+ * Copyright: 2012 GPL - Bart Eversdijk
+ * MediaPort plugin - MicasaVerde (TM) Vera Controller
+ * E-mail: ba...@ev...
+ */
+using System;
+using System.Xml;
+
+namespace VeraControl.Properties
+{
+ /// <summary>
+ /// Description of DeviceDoorlock.
+ /// </summary>
+ public class DeviceDoorlock : DeviceGeneric
+ {
+ private bool m_bStatus;
+
+ public DeviceDoorlock( XmlNode xn ): base (xn)
+ {
+ if (xn != null)
+ {
+ update(xn);
+ }
+ }
+
+ public override bool update(XmlNode xn)
+ {
+ m_bStatus = (xn.Attributes["status"].Value == "1");
+
+ return base.update(xn);
+ }
+
+ public override bool state
+ {
+ get { return m_bStatus; }
+ set {
+ VeraCommunication vera = VeraCommunication.Instance;
+ // Do something with vera
+ string cmd = "?id=lu_action&DeviceNum="+id.ToString()+
+ "&serviceId=urn:micasaverde-com:serviceId:DoorLock1&action=SetTarget" +
+ "&newTargetValue="+(value ? "1" : "0");
+ string sResult = vera.doVeraRequest(cmd);
+ m_bStatus = value;
+ }
+ }
+
+ public override int level
+ {
+ get { return (m_bStatus ? 1 : 0); }
+ set
+ {
+ state = (value > 0);
+ }
+ }
+
+ public override int maxLevel
+ {
+ get { return 1; }
+ set { }
+ }
+
+ public override string ToString()
+ {
+ return name + " [" + getStatusText() + "]";
+ }
+
+ public override bool isControllable
+ {
+ get { return true; }
+ set { }
+ }
+
+ public override string getIconName()
+ {
+ return "Door_" + (m_bStatus ? "LOCKED" : "UNLOCKED");
+ }
+
+ public override string getStatusText()
+ {
+ return (state ? "Locked" : "Unlocked");
+ }
+
+ }
+}
Added: trunk/plugins/VeraControl/DeviceGWeather.cs
===================================================================
--- trunk/plugins/VeraControl/DeviceGWeather.cs (rev 0)
+++ trunk/plugins/VeraControl/DeviceGWeather.cs 2012-01-05 12:17:24 UTC (rev 4373)
@@ -0,0 +1,54 @@
+/*
+ * Created by SharpDevelop.
+ * User: Bart
+ * Date: 3-1-2012
+ * Time: 12:51
+ *
+ * Copyright: 2012 GPL - Bart Eversdijk
+ * MediaPort plugin - MicasaVerde (TM) Vera Controller
+ * E-mail: ba...@ev...
+ */
+using System;
+using System.Xml;
+
+namespace VeraControl.Properties
+{
+ /// <summary>
+ /// Description of DeviceGWeather.
+ /// </summary>
+ public class DeviceGWeather : DeviceGeneric
+ {
+ private string m_sCondition;
+ private string m_sWindCondition;
+
+ public DeviceGWeather( XmlNode xn ): base (xn)
+ {
+ if (xn != null)
+ {
+ update(xn);
+ }
+ }
+
+ public override bool update(XmlNode xn)
+ {
+ m_sCondition = (xn.Attributes["Condition"] != null ? xn.Attributes["Condition"].Value : "-");
+ m_sWindCondition = (xn.Attributes["WindCondition"] != null ? xn.Attributes["WindCondition"].Value : "-");
+
+ return base.update(xn);
+ }
+
+ public override string ToString()
+ {
+ return name + " [" + getStatusText() + "]";
+ }
+
+ public override string getStatusText()
+ {
+ return m_sCondition.Replace("_", " ");
+ }
+ public override string getExtraText()
+ {
+ return m_sWindCondition;
+ }
+ }
+}
Added: trunk/plugins/VeraControl/DeviceGeneric.cs
===================================================================
--- trunk/plugins/VeraControl/DeviceGeneric.cs (rev 0)
+++ trunk/plugins/VeraControl/DeviceGeneric.cs 2012-01-05 12:17:24 UTC (rev 4373)
@@ -0,0 +1,141 @@
+/*
+ * Created by SharpDevelop.
+ * User: Bart
+ * Date: 22-12-2011
+ * Time: 13:07
+ *
+ * Copyright: 2012 GPL - Bart Eversdijk
+ * MediaPort plugin - MicasaVerde (TM) Vera Controller
+ * E-mail: ba...@ev...
+ */
+using System;
+using System.Xml;
+using System.Collections.Generic;
+
+namespace VeraControl.Properties
+{
+ /// <summary>
+ /// Description of DeviceGeneric.
+ /// </summary>
+ public class DeviceGeneric
+ {
+ private string m_sName = "";
+ private int m_iId = 0;
+ private string m_sAltId = "";
+ private int m_iCategory = 0;
+ private int m_iRoom = 0;
+
+ public DeviceGeneric(XmlNode xn)
+ {
+ if (xn != null)
+ {
+ update(xn);
+ }
+ }
+
+ public virtual bool update(XmlNode xn)
+ {
+ m_sName = xn.Attributes["name"].Value;
+ m_iId = int.Parse(xn.Attributes["id"].Value);
+ m_sAltId = xn.Attributes["altid"].Value;
+ m_iCategory = int.Parse(xn.Attributes["category"].Value);
+ m_iRoom = int.Parse(xn.Attributes["room"].Value);
+ return true;
+ }
+
+ public int id
+ {
+ get { return m_iId; }
+ set { }
+ }
+
+ public string altid
+ {
+ get { return m_sAltId; }
+ set { }
+ }
+
+ public string name
+ {
+ get { return m_sName; }
+ set { }
+ }
+
+ public int category
+ {
+ get { return m_iCategory; }
+ set { }
+ }
+
+ public bool inRoom(int id)
+ {
+ return (m_iRoom == id);
+ }
+
+ public int room
+ {
+ get { return m_iRoom; }
+ set { }
+ }
+
+ public override string ToString()
+ {
+ return name;
+ }
+
+ public virtual bool isControllable
+ {
+ get { return false; }
+ set { }
+ }
+
+ public virtual bool state
+ {
+ get { return false; }
+ set { }
+ }
+
+ public virtual int level
+ {
+ get { return 0; }
+ set { }
+ }
+
+ public virtual string mode
+ {
+ get { return ""; }
+ set { }
+ }
+
+ public virtual int maxLevel
+ {
+ get { return -1; }
+ set { }
+ }
+ public virtual int minLevel
+ {
+ get { return 0; }
+ set { }
+ }
+
+ public virtual string getIconName()
+ {
+ return "generic_sensor";
+ }
+
+ public virtual string getStatusText()
+ {
+ return "";
+ }
+
+ public virtual string getExtraText()
+ {
+ return "";
+ }
+
+ public virtual string[] getCommands()
+ {
+ return new string [] {"Off", "On"};
+ }
+ }
+}
Added: trunk/plugins/VeraControl/DeviceHumidity.cs
===================================================================
--- trunk/plugins/VeraControl/DeviceHumidity.cs (rev 0)
+++ trunk/plugins/VeraControl/DeviceHumidity.cs 2012-01-05 12:17:24 UTC (rev 4373)
@@ -0,0 +1,64 @@
+/*
+ * Created by SharpDevelop.
+ * User: Bart
+ * Date: 22-12-2011
+ * Time: 17:47
+ *
+ * Copyright: 2012 GPL - Bart Eversdijk
+ * MediaPort plugin - MicasaVerde (TM) Vera Controller
+ * E-mail: ba...@ev...
+ */
+using System;
+using System.Xml;
+
+namespace VeraControl.Properties
+{
+ /// <summary>
+ /// Description of DeviceHumidity.
+ /// </summary>
+ public class DeviceHumidity : DeviceGeneric
+ {
+ private int m_iLevel;
+
+ public DeviceHumidity( XmlNode xn ): base (xn)
+ {
+ if (xn != null)
+ {
+ update(xn);
+ }
+ }
+
+ public override bool update(XmlNode xn)
+ {
+ m_iLevel = int.Parse(xn.Attributes["humidity"].Value);
+ return base.update(xn);
+ }
+
+ public override int level
+ {
+ get { return m_iLevel; }
+ set {}
+ }
+
+ public override int maxLevel
+ {
+ get { return 100; }
+ set { }
+ }
+
+ public override string ToString()
+ {
+ return name + " [" + level.ToString() + "%]";
+ }
+
+ public override string getIconName()
+ {
+ return "Humidity_Sensor";
+ }
+
+ public override string getStatusText()
+ {
+ return level + "%";
+ }
+ }
+}
Added: trunk/plugins/VeraControl/DeviceLightSensor.cs
===================================================================
--- trunk/plugins/VeraControl/DeviceLightSensor.cs (rev 0)
+++ trunk/plugins/VeraControl/DeviceLightSensor.cs 2012-01-05 12:17:24 UTC (rev 4373)
@@ -0,0 +1,70 @@
+/*
+ * Created by SharpDevelop.
+ * User: Bart
+ * Date: 3-1-2012
+ * Time: 12:09
+ *
+ * Copyright: 2012 GPL - Bart Eversdijk
+ * MediaPort plugin - MicasaVerde (TM) Vera Controller
+ * E-mail: ba...@ev...
+ */
+using System;
+using System.Xml;
+
+namespace VeraControl.Properties
+{
+ /// <summary>
+ /// Description of DeviceLightSensor.
+ /// </summary>
+ public class DeviceLightSensor : DeviceGeneric
+ {
+ private int m_iLevel;
+
+ public DeviceLightSensor( XmlNode xn ): base (xn)
+ {
+ if (xn != null)
+ {
+ update(xn);
+ }
+ }
+
+ public override bool update(XmlNode xn)
+ {
+ m_iLevel = (xn.Attributes["level"] != null ? int.Parse(xn.Attributes["level"].Value) : 0);
+ return base.update(xn);
+ }
+
+ public override bool state
+ {
+ get { return (m_iLevel > 0); }
+ set { }
+ }
+
+ public override int level
+ {
+ get { return m_iLevel; }
+ set { }
+ }
+
+ public override int maxLevel
+ {
+ get { return 100; }
+ set { }
+ }
+
+ public override string ToString()
+ {
+ return name + " [" + getStatusText() + "]";
+ }
+
+ public override string getIconName()
+ {
+ return "Light_Sensor";
+ }
+
+ public override string getStatusText()
+ {
+ return level.ToString() + "%";
+ }
+ }
+}
Added: trunk/plugins/VeraControl/DevicePowerMeter.cs
===================================================================
--- trunk/plugins/VeraControl/DevicePowerMeter.cs (rev 0)
+++ trunk/plugins/VeraControl/DevicePowerMeter.cs 2012-01-05 12:17:24 UTC (rev 4373)
@@ -0,0 +1,76 @@
+/*
+ * Created by SharpDevelop.
+ * User: Bart
+ * Date: 3-1-2012
+ * Time: 12:21
+ *
+ * Copyright: 2012 GPL - Bart Eversdijk
+ * MediaPort plugin - MicasaVerde (TM) Vera Controller
+ * E-mail: ba...@ev...
+ */
+using System;
+using System.Xml;
+
+namespace VeraControl.Properties
+{
+ /// <summary>
+ /// Description of DevicePowerMeter.
+ /// </summary>
+ public class DevicePowerMeter : DeviceGeneric
+ {
+ private int m_iLevel;
+
+ public DevicePowerMeter( XmlNode xn ): base (xn)
+ {
+ if (xn != null)
+ {
+ update(xn);
+ }
+ }
+
+ public override bool update(XmlNode xn)
+ {
+ m_iLevel = (xn.Attributes["level"] != null ? int.Parse(xn.Attributes["watts"].Value) : 0);
+ return base.update(xn);
+ }
+
+ public string watts
+ {
+ get { return m_iLevel.ToString(); }
+ set { }
+ }
+
+ public override bool state
+ {
+ get { return (m_iLevel > 0); }
+ set { }
+ }
+
+ public override int level
+ {
+ get { return m_iLevel; }
+ set { }
+ }
+
+ public override int maxLevel
+ {
+ get { return 1000; }
+ set { }
+ }
+
+ public override string ToString()
+ {
+ return name + " [" + getStatusText() + "]";
+ }
+
+ public override string getIconName()
+ {
+ return "Power_Meter";
+ }
+
+ public override string getStatusText()
+ {
+ return level.ToString() + "W";
+ }
+ }
+}
Added: trunk/plugins/VeraControl/DeviceSecurity.cs
===================================================================
--- trunk/plugins/VeraControl/DeviceSecurity.cs (rev 0)
+++ trunk/plugins/VeraControl/DeviceSecurity.cs 2012-01-05 12:17:24 UTC (rev 4373)
@@ -0,0 +1,95 @@
+/*
+ * Created by SharpDevelop.
+ * User: Bart
+ * Date: 22-12-2011
+ * Time: 18:03
+ *
+ * Copyright: 2012 GPL - Bart Eversdijk
+ * MediaPort plugin - MicasaVerde (TM) Vera Controller
+ * E-mail: ba...@ev...
+ */
+using System;
+using System.Xml;
+using System.Collections.Generic;
+
+namespace VeraControl.Properties
+{
+ /// <summary>
+ /// Description of DeviceSecurity.
+ /// </summary>
+ public class DeviceSecurity: DeviceGeneric
+ {
+ private bool m_bTripped;
+ private bool m_bArmed;
+
+ public DeviceSecurity( XmlNode xn ): base (xn)
+ {
+ if (xn != null)
+ {
+ update(xn);
+ }
+ }
+
+ public override bool update(XmlNode xn)
+ {
+ m_bTripped = (xn.Attributes["tripped"].Value == "1");
+ m_bArmed = (xn.Attributes["armed"].Value == "1");
+ return base.update(xn);
+ }
+
+ public override bool state
+ {
+ get { return m_bArmed; }
+ set { VeraCommunication vera = VeraCommunication.Instance;
+ // Do something with vera
+ string cmd = "?id=lu_action&DeviceNum="+id.ToString()+
+ "&serviceId=urn:micasaverde-com:serviceId:SecuritySensor1&action=SetArmed" +
+ "&newArmedValue=" + (value ? "1" : "0");
+ string sResult = vera.doVeraRequest(cmd);
+ m_bArmed = value;
+ }
+ }
+
+ public bool tripped
+ {
+ get { return m_bTripped; }
+ set { }
+ }
+
+ public override int level
+ {
+ get { return (m_bArmed ? 1 : 0); }
+ set { state = (value > 0); }
+ }
+
+ public override int maxLevel
+ {
+ get { return 1; }
+ set { }
+ }
+ public override bool isControllable
+ {
+ get { return true; }
+ set { }
+ }
+ public override string ToString()
+ {
+ return name + " [" + getStatusText() + "]";
+ }
+
+ public override string getIconName()
+ {
+ return "Motion_Sensor_" + (m_bTripped ? "100" : "0");
+ }
+
+ public override string getStatusText()
+ {
+ return (state ? ( tripped ? "TRIPPED" : "standby") : "bypass");
+ }
+
+ public override string[] getCommands()
+ {
+ return new string [] {"Bypass", "Arm"};
+ }
+ }
+}
Added: trunk/plugins/VeraControl/DeviceSprinkler.cs
===================================================================
--- trunk/plugins/VeraControl/DeviceSprinkler.cs (rev 0)
+++ trunk/plugins/VeraControl/DeviceSprinkler.cs 2012-01-05 12:17:24 UTC (rev 4373)
@@ -0,0 +1,119 @@
+/*
+ * Created by SharpDevelop.
+ * User: Bart
+ * Date: 3-1-2012
+ * Time: 16:26
+ *
+ * Copyright: 2012 GPL - Bart Eversdijk
+ * MediaPort plugin - MicasaVerde (TM) Vera Controller
+ * E-mail: ba...@ev...
+ */
+using System;
+using System.Xml;
+using System.Collections.Generic;
+
+namespace VeraControl.Properties
+{
+ /// <summary>
+ /// Description of DeviceSprinkler.
+ /// </summary>
+ public class DeviceSprinkler : DeviceGeneric
+ {
+ private bool m_bStatus;
+ private string m_sMode;
+ private string m_sShortMode;
+ private string m_sOperationMode;
+ private string m_sCondition;
+
+ public DeviceSprinkler( XmlNode xn ): base (xn)
+ {
+ if (xn != null)
+ {
+ update(xn);
+ }
+ }
+
+ public override bool update(XmlNode xn)
+ {
+ m_bStatus = (xn.Attributes["status"].Value == "1");
+ m_sMode = (xn.Attributes["Mode"] != null ? xn.Attributes["Mode"].Value : "-");
+ m_sShortMode = (xn.Attributes["ShortMode"] != null ? xn.Attributes["ShortMode"].Value : "-");
+ m_sOperationMode = (xn.Attributes["OperationMode"] != null ? xn.Attributes["OperationMode"].Value : "-");
+ m_sCondition = (xn.Attributes["Condition"] != null ? xn.Attributes["Condition"].Value : "-");
+ return base.update(xn);
+ }
+
+ public override bool state
+ {
+ get { return m_bStatus; }
+ set {
+ VeraCommunication vera = VeraCommunication.Instance;
+ // Do something with vera
+ string cmd = "?id=lu_action&DeviceNum="+id.ToString()+
+ "&serviceId=urn:upnp-org:serviceId:SwitchPower1&action=SetTarget" +
+ "&newTargetValue="+(value ? "1" : "0");
+ string sResult = vera.doVeraRequest(cmd);
+ m_bStatus = value;
+ }
+ }
+
+ public override int level
+ {
+ get { return (m_bStatus ? 1 : 0); }
+ set { state = (value > 0); }
+ }
+
+ public override string mode
+ {
+ get { return m_sMode; }
+ set {
+ VeraCommunication vera = VeraCommunication.Instance;
+ // Do something with vera
+ string cmd = "?id=lu_action&DeviceNum="+id.ToString()+
+ "&serviceId=urn:upnp-micasaverde-com:serviceId:Sprinkler1&action=" +
+ (value == "Auto" ? "SetModeAuto" : (value == "Block" ? "SetModeBlock" : "SetModeManual"));
+ string sResult = vera.doVeraRequest(cmd);
+ m_sMode = value;
+ }
+ }
+
+ public override string ToString()
+ {
+ return name + " [" + m_sShortMode + "]";
+ }
+
+ public override bool isControllable
+ {
+ get { return true; }
+ set { }
+ }
+
+ public override int maxLevel
+ {
+ get { return 1; }
+ set { }
+ }
+
+ public override string getIconName()
+ {
+ return "Humidity_Sensor";
+ }
+
+ public override string getStatusText()
+ {
+ return m_sOperationMode.Replace("_", " ");
+ }
+
+ public override string getExtraText()
+ {
+ return m_sCondition;
+ }
+
+
+
+ public override string [] getCommands()
+ {
+ return new string [] {"Off", "On", "Auto", "Block", "Manual"};
+ }
+ }
+}
Added: trunk/plugins/VeraControl/DeviceSwitch.cs
===================================================================
--- trunk/plugins/VeraControl/DeviceSwitch.cs (rev 0)
+++ trunk/plugins/VeraControl/DeviceSwitch.cs 2012-01-05 12:17:24 UTC (rev 4373)
@@ -0,0 +1,92 @@
+/*
+ * Created by SharpDevelop.
+ * User: Bart
+ * Date: 22-12-2011
+ * Time: 14:25
+ *
+ * Copyright: 2012 GPL - Bart Eversdijk
+ * MediaPort plugin - MicasaVerde (TM) Vera Controller
+ * E-mail: ba...@ev...
+ */
+using System;
+using System.Xml;
+
+namespace VeraControl.Properties
+{
+ /// <summary>
+ /// Description of DeviceSwitch.
+ /// </summary>
+ public class DeviceSwitch : DeviceGeneric
+ {
+ private bool m_bStatus;
+ private string m_sWatt;
+
+ public DeviceSwitch( XmlNode xn ): base (xn)
+ {
+ if (xn != null)
+ {
+ update(xn);
+ }
+ }
+
+ public override bool update(XmlNode xn)
+ {
+ m_bStatus = (xn.Attributes["status"].Value == "1");
+ m_sWatt = (xn.Attributes["watts"] != null ? xn.Attributes["watts"].Value : "0");
+ return base.update(xn);
+ }
+
+ public string watts
+ {
+ get { return m_sWatt; }
+ set { }
+ }
+
+ public override bool state
+ {
+ get { return m_bStatus; }
+ set {
+ VeraCommunication vera = VeraCommunication.Instance;
+ // Do something with vera
+ string cmd = "?id=lu_action&DeviceNum="+id.ToString()+
+ "&serviceId=urn:upnp-org:serviceId:SwitchPower1&action=SetTarget" +
+ "&newTargetValue="+(value ? "1" : "0");
+ string sResult = vera.doVeraRequest(cmd);
+ m_bStatus = value;
+ }
+ }
+
+ public override int level
+ {
+ get { return (m_bStatus ? 1 : 0); }
+ set { state = (value > 0); }
+ }
+
+ public override int maxLevel
+ {
+ get { return 1; }
+ set { }
+ }
+
+ public override string ToString()
+ {
+ return name + " [" + getStatusText()+ "]";
+ }
+
+ public override bool isControllable
+ {
+ get { return true; }
+ set { }
+ }
+
+ public override string getIconName()
+ {
+ return "Binary_Light_" + (m_bStatus ? "100" : "0");
+ }
+
+ public override string getStatusText()
+ {
+ return (state ? "On" : "Off");
+ }
+ }
+}
Added: trunk/plugins/VeraControl/DeviceTemperature.cs
===================================================================
--- trunk/plugins/VeraControl/DeviceTemperature.cs (rev 0)
+++ trunk/plugins/VeraControl/DeviceTemperature.cs 2012-01-05 12:17:24 UTC (rev 4373)
@@ -0,0 +1,73 @@
+/*
+ * Created by SharpDevelop.
+ * User: Bart
+ * Date: 22-12-2011
+ * Time: 17:52
+ *
+ * Copyright: 2012 GPL - Bart Eversdijk
+ * MediaPort plugin - MicasaVerde (TM) Vera Controller
+ * E-mail: ba...@ev...
+ */
+using System;
+using System.Xml;
+
+namespace VeraControl.Properties
+{
+ /// <summary>
+ /// Description of DeviceTemperature.
+ /// </summary>
+ public class DeviceTemperature : DeviceGeneric
+ {
+ public int m_iLevel;
+ private bool m_bMetric = true;
+
+ public DeviceTemperature( XmlNode xn, bool bMetric ): base (xn)
+ {
+ m_bMetric = bMetric;
+ if (xn != null)
+ {
+ update(xn);
+ }
+ }
+
+ public override bool update(XmlNode xn)
+ {
+ m_iLevel = (xn.Attributes["temperature"] != null ? int.Parse(xn.Attributes["temperature"].Value) : 0);
+ return base.update(xn);
+ }
+
+ public override int level
+ {
+ get { return m_iLevel; }
+ set { }
+ }
+
+ public override int maxLevel
+ {
+ get { return (m_bMetric ? 100 : 212); }
+ set { }
+ }
+
+ public override int minLevel
+ {
+ get { return (m_bMetric ? -22 : -7); }
+ set { }
+ }
+
+ public override string ToString()
+ {
+ return name + " [" + getStatusText() + "]";
+ }
+
+ public override string getIconName()
+ {
+ return "Temperature_Sensor";
+ }
+
+ public override string getStatusText()
+ {
+ return level + (m_bMetric ? "°C" : "F");
+ }
+
+ }
+}
Added: trunk/plugins/VeraControl/DeviceThermostat.cs
===================================================================
--- trunk/plugins/VeraControl/DeviceThermostat.cs (rev 0)
+++ trunk/plugins/VeraControl/DeviceThermostat.cs 2012-01-05 12:17:24 UTC (rev 4373)
@@ -0,0 +1,109 @@
+/*
+ * Created by SharpDevelop.
+ * User: Bart
+ * Date: 25-12-2011
+ * Time: 0:03
+ *
+ * Copyright: 2012 GPL - Bart Eversdijk
+ * MediaPort plugin - MicasaVerde (TM) Vera Controller
+ * E-mail: ba...@ev...
+ */
+using System;
+using System.Xml;
+
+namespace VeraControl.Properties
+{
+ /// <summary>
+ /// Description of DeviceThermostat.
+ /// </summary>
+ public class DeviceThermostat : DeviceTemperature
+ {
+ private bool m_bMetric = true;
+ private string m_sFan = "";
+ private string m_sState = "Off"; // "Off', "Idle", "Heating", "Cooling", "FanOnly", "PendingHeat", "PendingCool", "Vent"
+ private string m_sMode = "Off"; // "Off', "InDeadBand", "HeatOn", "CoolOn", "AutoChangeOver", "AuxHeatOn", "EconomyHeatOn", "EmergencyHeatOn",
+ // "AuxCoolOn", "EconomyCoolOn", "BuildingProtection", "EnergySavingsHeating", "EnergySavingsCooling"
+
+ public DeviceThermostat( XmlNode xn, bool bMetric ): base (xn, bMetric)
+ {
+ m_bMetric = bMetric;
+ if (xn != null)
+ {
+ update(xn);
+ }
+ }
+
+ public override bool update(XmlNode xn)
+ {
+ m_iLevel = (xn.Attributes["temperature"] != null ? int.Parse(xn.Attributes["temperature"].Value) : 0);
+ m_sFan = (xn.Attributes["fan"] != null ? xn.Attributes["fn"].Value : "Off");
+ m_sState = (xn.Attributes["hvacstate"] != null ? xn.Attributes["hvacstate"].Value : "Off");
+ m_sMode = (xn.Attributes["mode"] != null ? xn.Attributes["mode"].Value : "Off");
+ return base.update(xn);
+ }
+
+ public override bool state
+ {
+ get { return (mode != "Off"); }
+ set { mode = (value ? "Auto" : "Off"); }
+ }
+
+ public override int level
+ {
+ get { return -1; }
+ set { }
+ }
+
+ public override string mode
+ {
+ get { return m_sMode; }
+ set {
+ VeraCommunication vera = VeraCommunication.Instance;
+ // Do something with vera
+ string cmd = "?id=lu_action&DeviceNum="+id.ToString()+
+ "&serviceId=urn:upnp-org:serviceId:HVAC_UserOperatingMode1&action=SetModeTarget" +
+ "&NewModeTarget="+(value == "Off" ? "Off" : (value == "Cool" ? "CoolOn" : (value == "Heat" ? "HeatOn" : "AutoChangeOver"))
+ );
+ string sResult = vera.doVeraRequest(cmd);
+ m_sMode = value;
+ }
+ }
+
+ public override string ToString()
+ {
+ return name + " [" + mode + "]";
+ }
+
+ public override bool isControllable
+ {
+ get { return true; }
+ set { }
+ }
+
+ public override int maxLevel
+ {
+ get { return -1; }
+ set { }
+ }
+
+ public override string getStatusText()
+ {
+ return mode;
+ }
+
+ public override string getExtraText()
+ {
+ return m_sState + " - Fan : " + m_sFan + " - " + m_iLevel + (m_bMetric ? "°C" : "F") ;
+ }
+
+ public override string getIconName()
+ {
+ return "Thermostat";
+ }
+
+ public override string [] getCommands()
+ {
+ return new string [] {"Off", "On", "Auto", "Heat", "Cool"};
+ }
+ }
+}
Added: trunk/plugins/VeraControl/DeviceWindowCovering.cs
===================================================================
--- trunk/plugins/VeraControl/DeviceWindowCovering.cs (rev 0)
+++ trunk/plugins/VeraControl/DeviceWindowCovering.cs 2012-01-05 12:17:24 UTC (rev 4373)
@@ -0,0 +1,34 @@
+/*
+ * Created by SharpDevelop.
+ * User: Bart
+ * Date: 24-12-2011
+ * Time: 23:56
+ *
+ * Copyright: 2012 GPL - Bart Eversdijk
+ * MediaPort plugin - MicasaVerde (TM) Vera Controller
+ * E-mail: ba...@ev...
+ */
+using System;
+using System.Xml;
+
+namespace VeraControl.Properties
+{
+ /// <summary>
+ /// Description of DeviceWindowCovering.
+ /// </summary>
+ public class DeviceWindowCovering : DeviceDimmer
+ {
+ public DeviceWindowCovering( XmlNode xn ): base (xn)
+ {
+ if (xn != null)
+ {
+ update(xn);
+ }
+ }
+
+ public override string getIconName()
+ {
+ return "Window_Covering";
+ }
+ }
+}
Added: trunk/plugins/VeraControl/DialogActionTrigger.cs
===================================================================
--- trunk/plugins/VeraControl/DialogActionTrigger.cs (rev 0)
+++ trunk/plugins/VeraControl/DialogActionTrigger.cs 2012-01-05 12:17:24 UTC (rev 4373)
@@ -0,0 +1,176 @@
+/*
+ * Created by SharpDevelop.
+ * User: Bart
+ * Date: 30-12-2011
+ * Time: 0:35
+ *
+ * Copyright: 2012 GPL - Bart Eversdijk
+ * MediaPort plugin - MicasaVerde (TM) Vera Controller
+ * E-mail: ba...@ev...
+ */
+using System;
+using MediaPortal;
+using MediaPortal.Util;
+using MediaPortal.GUI.Library;
+using MediaPortal.Dialogs;
+using System.Collections.Generic;
+using Alignment = MediaPortal.GUI.Library.GUIControl.Alignment;
+using VAlignment = MediaPortal.GUI.Library.GUIControl.VAlignment;
+using Action = MediaPortal.GUI.Library.Action;
+using VeraControl.Properties;
+
+namespace VeraControl
+{
+ /// <summary>
+ /// Description of DialogActionTrigger.
+ /// </summary>
+ public class DialogActionTrigger : GUIDialogWindow
+ {
+ [SkinControl(2)] protected GUIButtonControl btnClose = null;
+ [SkinControl(4)] protected GUILabelControl lblHeading = null;
+ [SkinControl(100)] protected GUIButtonControl btnStore = null;
+
+ [SkinControlAttribute(20)] protected GUISpinButton spMusicStart = null;
+ [SkinControlAttribute(21)] protected GUISpinButton spMusicPause = null;
+ [SkinControlAttribute(22)] protected GUISpinButton spMusicResume = null;
+ [SkinControlAttribute(23)] protected GUISpinButton spMusicStop = null;
+
+ [SkinControlAttribute(25)] protected GUISpinButton spVideoStart = null;
+ [SkinControlAttribute(26)] protected GUISpinButton spVideoPause = null;
+ [SkinControlAttribute(27)] protected GUISpinButton spVideoResume = null;
+ [SkinControlAttribute(28)] protected GUISpinButton spVideoStop = null;
+
+ [SkinControlAttribute(30)] protected GUISpinButton spTVStart = null;
+ [SkinControlAttribute(31)] protected GUISpinButton spTVPause = null;
+ [SkinControlAttribute(32)] protected GUISpinButton spTVResume = null;
+ [SkinControlAttribute(33)] protected GUISpinButton spTVStop = null;
+
+ [SkinControlAttribute(35)] protected GUISpinButton spRecStart = null;
+ [SkinControlAttribute(36)] protected GUISpinButton spRecPause = null;
+ [SkinControlAttribute(37)] protected GUISpinButton spRecResume = null;
+ [SkinControlAttribute(38)] protected GUISpinButton spRecStop = null;
+
+ [SkinControlAttribute(40)] protected GUISpinButton spRadioStart = null;
+ [SkinControlAttribute(41)] protected GUISpinButton spRadioPause = null;
+ [SkinControlAttribute(42)] protected GUISpinButton spRadioResume = null;
+ [SkinControlAttribute(43)] protected GUISpinButton spRadioStop = null;
+
+ [SkinControlAttribute(45)] protected GUISpinButton spUnknownStart = null;
+ [SkinControlAttribute(46)] protected GUISpinButton spUnknownPause = null;
+ [SkinControlAttribute(47)] protected GUISpinButton spUnknownResume= null;
+ [SkinControlAttribute(48)] protected GUISpinButton spUnknownStop = null;
+
+ [SkinControlAttribute(50)] protected GUISpinButton spMPStart = null;
+ [SkinControlAttribute(51)] protected GUISpinButton spMPSleep = null;
+ [SkinControlAttribute(52)] protected GUISpinButton spMPExit = null;
+
+
+ public DialogActionTrigger()
+ {
+ GetID = (int)1974;
+ }
+
+ public void SetHeading(string strLine)
+ {
+ //LoadSkin();
+ AllocResources();
+ InitControls();
+
+ GUISpinButton[] spinList = new GUISpinButton[] {
+ spMusicStart, spMusicPause, spMusicResume, spMusicStop,
+ spVideoStart, spVideoPause, spVideoResume, spVideoStop,
+ spTVStart, spTVPause, spTVResume, spTVStop,
+ spRecStart, spRecPause, spRecResume, spRecStop,
+ spRadioStart, spRadioPause, spRadioResume, spRadioStop,
+ spUnknownStart, spUnknownPause, spUnknownResume, spUnknownStop,
+ spMPStart, spMPSleep, spMPExit
+ };
+
+ // (P)re load spin contor
+ for (int i = 0; i < spinList.Length; i++)
+ {
+ initSpinButtons(spinList[i], VeraCommunication.Instance.actionTriggerTable[i]);
+ }
+
+ lblHeading.Label = strLine;
+ }
+
+ public override bool Init()
+ {
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.MPSettings())
+ {
+ for (Actiontrigger i = 0; i < Actiontrigger.LAST_ACTIONTRIGGER; i++)
+ {
+ VeraCommunication.Instance.actionTriggerTable[(int)i] = xmlreader.GetValueAsInt("veracontroller", i.ToString(), 0);
+ }
+ }
+ return Load(GUIGraphicsContext.Skin + @"\VeraDialogActionTrigger.xml");
+ }
+
+ protected override void OnClicked(int controlId, GUIControl control, Action.ActionType actionType)
+ {
+ if (control == btnStore)
+ {
+ StoreSettings();
+ PageDestroy();
+ }
+ // Back to the text button to switch from image view
+ if (control == btnClose)
+ {
+ PageDestroy();
+ }
+ base.OnClicked(controlId, control, actionType);
+ }
+
+ private void initSpinButtons(GUISpinButton spin, int iSelectedScene)
+ {
+ GUIControl.ClearControl(GetID, spin.GetID);
+ int iSceneIndex = 0;
+ spin.AddSpinLabel("- none -", 0);
+
+ for (int i = 0; i < VeraCommunication.Instance.scenes.Count; i++)
+ {
+ spin.AddSpinLabel(shortString(VeraCommunication.Instance.scenes[i].name), VeraCommunication.Instance.scenes[i].id);
+ if (VeraCommunication.Instance.scenes[i].id == iSelectedScene)
+ {
+ iSceneIndex = i + 1; // 0 is - none -
+ }
+ }
+ spin.SpinValue = iSceneIndex;
+ }
+
+ private string shortString( string str )
+ {
+ if (str.Length > 15)
+ {
+ return str.Substring(0, 14) + "..";
+ }
+ return str;
+ }
+
+ private void StoreSettings()
+ {
+ using (MediaPortal.Profile.Settings xmlwritter = new MediaPortal.Profile.MPSettings())
+ {
+ GUISpinButton[] spinList = new GUISpinButton[] {
+ spMusicStart, spMusicPause, spMusicResume, spMusicStop,
+ spVideoStart, spVideoPause, spVideoResume, spVideoStop,
+ spTVStart, spTVPause, spTVResume, spTVStop,
+ spRecStart, spRecPause, spRecResume, spRecStop,
+ spRadioStart, spRadioPause, spRadioResume, spRadioStop,
+ spUnknownStart, spUnknownPause, spUnknownResume, spUnknownStop,
+ spMPStart, spMPSleep, spMPExit
+ };
+ for (int i = 0; i < spinList.Length; i++)
+ {
+ if (spinList[i].SpinValue == 0) {
+ VeraCommunication.Instance.actionTriggerTable[i] = 0;
+ } else {
+ VeraCommunication.Instance.actionTriggerTable[i] = VeraCommunication.Instance.scenes[spinList[i].SpinValue - 1].id;
+ }
+ xmlwritter.SetValue("veracontroller", ((Actiontrigger) i).ToString(), VeraCommunication.Instance.actionTriggerTable[i].ToString());
+ }
+ }
+ }
+ }
+}
Added: trunk/plugins/VeraControl/DialogDeviceControl.cs
===================================================================
--- trunk/plugins/VeraControl/DialogDeviceControl.cs (rev 0)
+++ trunk/plugins/VeraControl/DialogDeviceControl.cs 2012-01-05 12:17:24 UTC (rev 4373)
@@ -0,0 +1,194 @@
+/*
+ * Created by SharpDevelop.
+ * User: Bart
+ * Date: 24-12-2011
+ * Time: 14:17
+ *
+ * Copyright: 2012 GPL - Bart Eversdijk
+ * MediaPort plugin - MicasaVerde (TM) Vera Controller
+ * E-mail: ba...@ev...
+ */
+using System;
+using System.Collections;
+using MediaPortal;
+using MediaPortal.Util;
+using MediaPortal.GUI.Library;
+using MediaPortal.Dialogs;
+using System.Collections.Generic;
+using Alignment = MediaPortal.GUI.Library.GUIControl.Alignment;
+using VAlignment = MediaPortal.GUI.Library.GUIControl.VAlignment;
+using Action = MediaPortal.GUI.Library.Action;
+using VeraControl.Properties;
+
+namespace VeraControl
+{
+ /// <summary>
+ /// Description of DialogDeviceControl.
+ /// </summar`y>
+ public class DialogDeviceControl : GUIDialogWindow
+ {
+ [SkinControl(2)] protected GUIButtonControl btnClose = null;
+ [SkinControl(4)] protected GUILabelControl lblHeading = null;
+ [SkinControl(5)] protected GUIImage imgLogo = null;
+
+ [SkinControlAttribute(6)] protected GUILabelControl label1=null;
+ [SkinControlAttribute(7)] protected GUILabelControl label2=null;
+ [SkinControlAttribute(8)] protected GUILabelControl label3=null;
+
+ [SkinControl(10)] protected GUIButtonControl btnLeft = null;
+ [SkinControl(11)] protected GUIButtonControl btnRight = null;
+ [SkinControl(12)] protected GUIButtonControl btnMode1 = null;
+ [SkinControl(13)] protected GUIButtonControl btnMode2 = null;
+ [SkinControl(14)] protected GUIButtonControl btnMode3 = null;
+ [SkinControl(15)] protected GUISliderControl slider = null;
+
+ DeviceGeneric myDev = null;
+
+ public DialogDeviceControl()
+ {
+ GetID = (int)1973;
+ }
+
+ public void InitDialog(string strLine, DeviceGeneric dev)
+ {
+ //LoadSkin();
+ AllocResources();
+ InitControls();
+
+ lblHeading.Label = strLine;
+
+ myDev = dev;
+ }
+
+ public override bool Init()
+ {
+ bool bResult = Load(GUIGraphicsContext.Skin + @"\VeraDialogDeviceControl.xml");
+ return bResult;
+ }
+
+ protected override void OnClicked(int controlId, GUIControl control, Action.ActionType actionType)
+ {
+ if (control == btnLeft)
+ {
+ myDev.level = myDev.minLevel;
+ SetSlider( myDev.level, myDev.maxLevel );
+ }
+
+ if (control == btnRight)
+ {
+ myDev.level = myDev.maxLevel;
+ SetSlider( myDev.level, myDev.maxLevel );
+ }
+
+ if (control == btnMode1)
+ {
+ myDev.mode = btnMode1.Label;
+ SetActiveBut(-1, 0);
+ }
+ if (control == btnMode2)
+ {
+ myDev.mode = btnMode2.Label;
+ SetActiveBut(-1, 1);
+ }
+ if (control == btnMode3)
+ {
+ myDev.mode = btnMode3.Label;
+ SetActiveBut(-1, 2);
+ }
+
+ if (control == slider)
+ {
+ myDev.level = slider.IntValue;
+ }
+
+ // update button high lighting
+ SetActiveBut( (slider.IntValue > 0 ? 1 : 0), -1);
+
+ // update icon
+ SetImage("Vera\\" + myDev.getIconName() + ".png");
+
+ // Back to the text button to switch from image view
+ if (control == btnClose)
+ {
+ PageDestroy();
+ }
+ base.OnClicked(controlId, control, actionType);
+ }
+
+ public void SetButtons(string [] butTxt)
+ {
+ GUIButtonControl[] btns = new GUIButtonControl[] {btnLeft, btnRight, btnMode1, btnMode3, btnMode2};
+ for (int i=0; i < btns.Length; i++)
+ {
+ if (butTxt.Length > i) {
+ btns[i].Label = butTxt[i];
+ btns[i].Visibility = System.Windows.Visibility.Visible;
+ } else {
+ btns[i].Visibility = System.Windows.Visibility.Hidden;
+ }
+ }
+
+ if (butTxt.Length > 2)
+ {
+ btnLeft.NavigateUp = 12;
+ btnRight.NavigateUp = 14;
+
+ if (butTxt.Length < 5)
+ {
+ // if only 2 buttons required, use right iso middle button
+ btnMode1.NavigateRight = 14;
+ btnMode3.NavigateLeft = 12;
+ }
+ }
+ }
+
+ public void SetSlider(int iVal, int iMaxval)
+ {
+ if (iVal >= 0)
+ {
+ slider.SetRange(0, iMaxval);
+ slider.IntValue = iVal;
+ slider.Visibility = System.Windows.Visibility.Visible;
+ }
+ }
+
+ public void SetText(string txt1, string txt2, string txt3)
+ {
+ label1.Label = txt1;
+ label2.Label = txt2;
+ label3.Label = txt3;
+ }
+
+ public void SetActiveBut( int iButNr, int iModeNr )
+ {
+ if (iButNr >= 0)
+ {
+ btnLeft.TextColor = (iButNr == 0 ? 0xFFFFFF00 : 0xFFFFFFFF );
+ btnLeft.TextColorNoFocus = (iButNr == 0 ? 0x60FFFF00 : 0x60ffffff);
+
+ btnRight.TextColor = (iButNr == 1 ? 0xFFFFFF00 : 0xFFFFFFFF );
+ btnRight.TextColorNoFocus = (iButNr == 1 ? 0x60FFFF00 : 0x60ffffff);
+ }
+
+ if (iModeNr >= 0)
+ {
+ btnMode1.TextColor = (iModeNr == 0 ? 0xFFFFFF00 : 0xFFFFFFFF );
+ btnMode1.TextColorNoFocus = (iModeNr == 0 ? 0x60FFFF00 : 0x60ffffff);
+
+ btnMode2.TextColor = (iModeNr == 1 ? 0xFFFFFF00 : 0xFFFFFFFF );
+ btnMode2.TextColorNoFocus = (iModeNr == 1 ? 0x60FFFF00 : 0x60ffffff);
+
+ btnMode3.TextColor = (iModeNr == 2 ? 0xFFFFFF00 : 0xFFFFFFFF );
+ btnMode3.TextColorNoFocus = (iModeNr == 2 ? 0x60FFFF00 : 0x60ffffff);
+ }
+ }
+
+ public void SetImage(string filename)
+ {
+ imgLogo.Dispose();
+ imgLogo.SetFileName(filename);
+ imgLogo.AllocResources();
+ imgLogo.KeepAspectRatio = true;
+ }
+ }
+}
Added: trunk/plugins/VeraControl/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/VeraControl/Properties/AssemblyInfo.cs (rev 0)
+++ trunk/plugins/VeraControl/Properties/AssemblyInfo.cs 2012-01-05 12:17:24 UTC (rev 4373)
@@ -0,0 +1,31 @@
+#region Using directives
+
+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+#endregion
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("VeraControl")]
+[assembly: AssemblyDescription("MediaPortal - Windows Plugin")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Bart Eversdijk")]
+[assembly: AssemblyProduct("VeraControl")]
+[assembly: AssemblyCopyright("Copyright 2012")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("ba...@ev...")]
+
+// This sets the default COM visibility of types in the assembly to invisible.
+// If you need to expose a type to COM, use [ComVisible(true)] on that type.
+[assembly: ComVisible(false)]
+
+// The assembly version has following format :
+//
+// Major.Minor.Build.Revision
+//
+// You can specify all the values or you can use the default the Revision and
+// Build Numbers by using the '*' as shown below:
+[assembly: AssemblyVersion("0.5.*")]
Added: trunk/plugins/VeraControl/Room.cs
===================================================================
--- trunk/plugins/VeraControl/Room.cs (rev 0)
+++ trunk/plugins/VeraControl/Room.cs 2012-01-05 12:17:24 UTC (rev 4373)
@@ -0,0 +1,69 @@
+/*
+ * Created by SharpDevelop.
+ * User: Bart
+ * Date: 22-12-2011
+ * Time: 14:05
+ *
+ * Copyright: 2012 GPL - Bart Eversdijk
+ * MediaPort plugin - MicasaVerde (TM) Vera Controller
+ * E-mail: ba...@ev...
+ */
+using System;
+using System.Xml;
+
+namespace VeraControl.Properties
+{
+ /// <summary>
+ /// Description of Room.
+ /// </summary>
+ public class Room
+ {
+ public Room(XmlNode xn)
+ {
+ if (xn == null)
+ {
+ m_sName = "";
+ m_iId = 0;
+ m_iSection = 0;
+ } else {
+ update(xn);
+ }
+ }
+
+ private string m_sName;
+ private int m_iId;
+ private int m_iSection;
+
+ public bool update(XmlNode xn)
+ {
+ m_sName = xn.Attributes["name"].Value;
+ m_iId = int.Parse(xn.Attributes["id"].Value);
+ m_iSection = int.Parse(xn.Attributes["section"].Value);
+ return true;
+ }
+
+ public int id
+ {
+ get { return m_iId; }
+ set { }
+ }
+
+ public string name
+ {
+ get { return m_sName; }
+ set { }
+ }
+
+
+ public int section
+ {
+ get { return m_iSection; }
+ set { }
+ }
+
+ public override string ToString()
+ {
+ return name;
+ }
+ }
+}
Added: trunk/plugins/VeraControl/Scene.cs
===================================================================
--- trunk/plugins/VeraControl/Scene.cs (rev 0)
+++ trunk/plugins/VeraControl/Scene.cs 2012-01-05 12:17:24 UTC (rev 4373)
@@ -0,0 +1,93 @@
+/*
+ * Created by SharpDevelop.
+ * User: Bart
+ * Date: 22-12-2011
+ * Time: 13:50
+ *
+ * Copyright: 2012 GPL - Bart Eversdijk
+ * MediaPort plugin - MicasaVerde (TM) Vera Controller
+ * E-mail: ba...@ev...
+ */
+using System;
+using System.Xml;
+
+namespace VeraControl.Properties
+{
+ /// <summary>
+ /// Description of Scene.
+ /// </summary>
+ public class Scene
+ {
+ public Scene(XmlNode xn)
+ {
+ if (xn == null)
+ {
+ m_sName = "";
+ m_iId = 0;
+ m_bActive = false;
+ m_iRoom = 0;
+ } else {
+ update(xn);
+ }
+ }
+
+ private string m_sName;
+ private int m_iId;
+ private bool m_bActive;
+ private int m_iRoom;
+
+ public bool update(XmlNode xn)
+ {
+ m_sName = xn.Attributes["name"].Value;
+ m_iId = int.Parse(xn.Attributes["id"].Value);
+ m_iRoom = int.Parse(xn.Attributes["room"].Value);
+ m_bActive = (xn.Attributes["name"].Value == "1");
+ return true;
+ }
+
+ public int id
+ {
+ get { return m_iId; }
+ set { }
+ }
+
+ public string name
+ {
+ get { return m_sName; }
+ set { }
+ }
+
+
+ public bool isActive()
+ {
+ return m_bActive;
+ }
+
+ public bool inRoom(int id)
+ {
+ return (m_iRoom == id);
+ }
+
+ public int room
+ {
+ get { return m_iRoom; }
+ set { }
+ }
+
+ public override string ToString()
+ {
+ return name;
+ }
+
+ public string run()
+ {
+ if (id == 0)
+ {
+ return "Unknown scene";
+ }
+ VeraCommunication vera = VeraCommunication.Instance;
+ string cmd = "?id=lu_action&serviceId=urn:micasaverde-com:serviceId:HomeAutomationGateway1&action=RunScene&SceneNum="+id;
+ return vera.doVeraRequest(cmd, true);
+ }
+ }
+}
Added: trunk/plugins/VeraControl/Section.cs
===================================================================
--- trunk/plugins/VeraControl/Section.cs (rev 0)
+++ trunk/plugins/VeraControl/Section.cs 2012-01-05 12:17:24 UTC (rev 4373)
@@ -0,0 +1,59 @@
+/*
+ * Created by SharpDevelop.
+ * User: Bart
+ * Date: 23-12-2011
+ * Time: 21:05
+ *
+ * Copyright: 2012 GPL - Bart Eversdijk
+ * MediaPort plugin - MicasaVerde (TM) Vera Controller
+ * E-mail: ba...@ev...
+ */
+using System;
+using System.Xml;
+
+namespace VeraControl.Properties
+{
+ /// <summary>
+ /// Description of Section.
+ /// </summary>
+ public class Section
+ {
+ public Section(XmlNode xn)
+ {
+ if (xn == null)
+ {
+ m_sName = "";
+ m_iId = 0;
+ } else {
+ update(xn);
+ }
+ }
+
+ private string m_sName;
+ private int m_iId;
+
+ public bool update(XmlNode xn)
+ {
+ m_sName = xn.Attributes["name"].Value;
+ m_iId = int.Parse(xn.Attributes["id"].Value);
+ return true;
+ }
+
+ public int id
+ {
+ get { return m_iId; }
+ set { }
+ }
+
+ public string name
+ {
+ get { return m_sName; }
+ set { }
+ }
+
+ public override string ToString()
+ {
+ return name;
+ }
+ }
+}
Added: trunk/plugins/VeraControl/VeraCommunication.cs
===================================================================
--- trunk/plugins/VeraControl/VeraCommunication.cs (rev 0)
+++ trunk/plugins/VeraControl/VeraCommunication.cs 2012-01-05 12:17:24 UTC (rev 4373)
@@ -0,0 +1,474 @@
+/*
+ * Created by SharpDevelop.
+ * User: Bart
+ * Date: 21-12-2011
+ * Time: 22:26
+ *
+ * Copyright: 2012 GPL - Bart Eversdijk
+ * MediaPort plugin - MicasaVerde (TM) Vera Controller
+ * E-mail: ba...@ev...
+ */
+using System;
+using System.Net;
+using System.IO;
+using System.Collections.Generic;
+using System.Xml;
+
+namespace VeraControl.Properties
+{
+ /// <summary>
+ /// Description of VeraCommunication.
+ /// </summary>
+
+ public class VeraStatus
+ {
+ public List<DeviceGeneric> devices = new List<DeviceGeneric>();
+ public List<Scene> scenes = new List<Scene>();
+ public List<Room> rooms = new List<Room>();
+ public List<DevCategories> categories = new List<DevCategories>();
+ public List<Section> sections = new List<Section>();
+
+ #region Vers get by id support functions
+
+ public void clearAllLists()
+ {
+ devices.Clear();
+ scenes.Clear();
+ rooms.Clear();
+ categories.Clear();
+ sections.Clear();
+ }
+ public Room getRoomById( int id )
+ {
+ foreach(Room room in rooms)
+ {
+ if (room.id == id)
+ {
+ return room;
+ }
+ }
+ return new Room(null);
+ }
+
+ public Section getSectionById( int id )
+ {
+ foreach(Section section in sections)
+ {
+ if (section.id == id)
+ {
+ return section;
+ }
+ }
+ return new Section(null);
+ }
+
+ public DeviceGeneric getDeviceById( int id )
+ {
+ foreach(DeviceGeneric dev in devices)
+ {
+ if (dev.id == id)
+ {
+ return dev;
+ }
+ }
+ return new DeviceGeneric(null);
+ }
+
+ public Scene getSceneById( int id )
+ {
+ foreach(Scene scene in scenes)
+ {
+ if (scene.id == id)
+ {
+ return scene;
+ }
+ }
+ return new Scene(null);
+ }
+
+ public DevCategories getCategoryById( int id )
+ {
+ foreach(DevCategories cat in categories)
+ {
+ if (cat.id == id)
+ {
+ return cat;
+ }
+ }
+ return new DevCategories(null);
+ }
+
+ public bool isSectionFound( int id )
+ {
+ foreach(Section section in sections)
+ {
+ if (section.id == id)
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public bool isRoomFound( int id )
+ {
+ foreach(Room room in rooms)
+ {
+ if (room.id == id)
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public bool isDeviceFound( int id )
+ {
+ foreach(DeviceGeneric dev in devices)
+ {
+ if (dev.id == id)
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public bool isSceneFound( int id )
+ {
+ foreach(Scene scene in scenes)
+ {
+ if (scene.id == id)
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public bool isCategoryFound( int id )
+ {
+ foreach(DevCategories cat in categories)
+ {
+ if (cat.id == id)
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+ #endregion
+ }
+
+
+ public sealed class VeraCommunication
+ {
+ private static volatile VeraCommunication instance;
+ private static object syncRoot = new Object();
+
+ private string m_sVeraIPAddress;
+ private string m_sVeraTCPIPPort;
+ private string m_sDataVersion = "";
+ private bool m_bMetric = true;
+
+ private VeraStatus m_status = new VeraStatus();
+ private long m_lLastUpdate = 0;
+ private bool m_bUpdatePending = false;
+
+ public int[] actionTriggerTable = new int[(int)Actiontrigger.LAST_ACTIONTRIGGER];
+
+ public static VeraCommunication Instance
+ {
+ get
+ {
+ if (instance == null)
+ {
+ lock (syncRoot)
+ {
+ if (instance == null)
+ {
+ instance = new VeraCommunication();
+ }
+ }
+ }
+
+ return instance;
+ }
+ }
+
+ private VeraCommunication()
+ {
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.MPSettings())
+ {
+ m_sVeraIPAddress = xmlreader.GetValueAsString("veracontroller", "ipaddress", "127.0.0.1");
+ m_sVeraTCPIPPort = xmlreader.GetValueAsString("veracontroller", "portnumber", "49451");
+ }
+ // Clear action table (TO DO: load with config settings)
+ for (int i = 0; i < (int)Actiontrigger.LAST_ACTIONTRIGGER; i++)
+ {
+ actionTriggerTable[i] = 0;
+ }
+ }
+
+ public bool updateCurrentStatus()
+ {
+ if (m_bUpdatePending)
+ {
+ return false;
+ }
+ m_bUpdatePending = true;
+ string verastatus = doVeraRequest("?id=lu_sdata&output_format=xml");
+ m_lLastUpdate = getSecondSince1970();
+
+ var xmlDoc = new XmlDocument();
+ xmlDoc.LoadXml(verastatus);
+
+ // Parse header
+ XmlNode rootnode = xmlDoc.SelectSingleNode("/root");
+ m_bMetric = (rootnode.Attributes["temperature"].Value == "C");
+ bool bFullRefresh = (m_sDataVersion != rootnode.Attributes["dataversion"].Value);
+ m_sDataVersion = rootnode.Attributes["dataversion"].Value;
+
+ if (bFullRefresh)
+ {
+ // We have a full refresh -> Clear all lists
+ m_status.clearAllLists();
+ }
+
+ // Process Sections
+ XmlNodeList xnList = xmlDoc.SelectNodes("/root/sections/section");
+ foreach (XmlNode xn in xnList)
+ {
+ Section sc = m_status.getSectionById( int.Parse(xn.Attributes["id"].Value) );
+ if (sc.id != 0) {
+ sc.update(xn);
+ } else {
+ m_status.sections.Add(new Section(xn));
+ }
+ }
+
+ // Process Scenes
+ xnList = xmlDoc.SelectNodes("/root/scenes/scene");
+ foreach (XmlNode xn in xnList)
+ {
+ Scene sc = m_status.getSceneById( int.Parse(xn.Attributes["id"].Value) );
+ if (sc.id != 0) {
+ sc.update(xn);
+ } else {
+ m_status.scenes.Add(new Scene(xn));
+ }
+ }
+
+ // Process Rooms
+ xnList = xmlDoc.SelectNodes("/root/rooms/room");
+ foreach (XmlNode xn in xnList)
+ {
+ Room room = m_status.getRoomById( int.Parse(xn.Attributes["id"].Value) );
+ if (room.id != 0) {
+ room.update(xn);
+ } else {
+ m_status.rooms.Add(new Room(xn));
+ }
+ }
+
+ // Process Categories
+ xnList = xmlDoc.SelectNodes("/root/categories/categorie");
+ foreach (XmlNode xn in xnList)
+ {
+ DevCategories cat = m_status.getCategoryById( int.Parse(xn.Attributes["id"].Value) );
+ if (cat.id != 0) {
+ cat.update(xn);
+ } else {
+ m_status.categories.Add(new DevCategories(xn));
+ }
+ }
+
+ // Process Devices
+ xnList = xmlDoc.SelectNodes("/root/devices/device");
+ foreach (XmlNode xn in xnList)
+ {
+ DeviceGeneric dev = m_status.getDeviceById( int.Parse(xn.Attributes["id"].Value) );
+ if (dev.id != 0) {
+ dev.update(xn);
+ } else {
+ switch (xn.Attributes["category"].Value)
+ {
+ case "2":
+ m_status.devices.Add(new DeviceDimmer(xn));
+ break;
+
+ case "3":
+ case "11": // Generic IO
+ m_status.devices.Add(new DeviceSwitch(xn));
+ break;
+
+ case "4": // Generic Sensor
+ case "12": // Motion Sensor
+ m_status.devices.Add(new DeviceSecurity(xn));
+ break;
+
+ case "5":
+ m_status.devices.Add(new DeviceThermostat(xn, m_bMetric));
+ break;
+
+ // case "6": // TODO: Implement camera class ?
+ // m_status.devices.Add(new DeviceCamera(xn, m_bMetric));
+ // break;
+
+ case "7":
+ m_status.devices.Add(new DeviceDoorlock(xn));
+ break;
+
+ case "8":
+ m_status.devices.Add(new DeviceWindowCovering(xn));
+ break;
+
+ // case "14": // TODO: Implement Scene controller device ?
+ // m_status.devices.Add(new DeviceSceneController(xn));
+ // break;
+
+ // case "15": // TODO: Implement AV device ?
+ // m_status.devices.Add(new DeviceSensor(xn));
+ // break;
+
+ case "16":
+ m_status.devices.Add(new DeviceHumidity(xn));
+ break;
+
+ case "17":
+ m_status.devices.Add(new DeviceTemperature(xn, m_bMetric));
+ break;
+
+ case "18":
+ m_status.devices.Add(new DeviceLightSensor(xn));
+ break;
+
+ case "21":
+ m_status.devices.Add(new DevicePowerMeter(xn));
+ break;
+
+ case "0":
+ default:
+ // Check for Google Weather Device
+ if (xn.Attributes["WindCondition"] != null)
+ {
+ m_status.devices.Add(new DeviceGWeather(xn));
+ break;
+ }
+ // Check for Bart's sprinkler Device
+ if (xn.Attributes["OperationMode"] != null)
+ {
+ m_status.devices.Add(new DeviceSprinkler(xn));
+ break;
+ }
+ /* Falltrough */
+ m_status.devices.Add(new DeviceGeneric(xn));
+ break;
+ }
+ }
+ }
+ // update timer again (took some time to get the data)
+ m_lLastUpdate = getSecondSince1970();
+ m_bUpdatePending = false;
+ return bFullRefresh;
+ }
+
+ public string doVeraRequest( string param, bool pParseResult )
+ {
+ string response = doVeraRequest( param );
+ if (pParseResult)
+ {
+ response = parseVeraRespones(response);
+ }
+ return response;
+ }
+
+ public string doVeraRequest( string param )
+ {
+ return retrieveURL("http://" + m_sVeraIPAddress + ":" + m_sVeraTCPIPPort + "/data_request" + p...
[truncated message content] |
|
From: <hor...@us...> - 2011-12-10 11:02:44
|
Revision: 4372
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4372&view=rev
Author: horned-reaper
Date: 2011-12-10 11:02:37 +0000 (Sat, 10 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Docs/Ausstehend.txt
trunk/plugins/FritzBox/Docs/Changes.txt
trunk/plugins/FritzBox/FritzBox/FritzBox.cs
trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/BackGroundWorker.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/PhonebookItem.cs
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/ResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
Modified: trunk/plugins/FritzBox/Docs/Ausstehend.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Ausstehend.txt 2011-12-10 09:09:06 UTC (rev 4371)
+++ trunk/plugins/FritzBox/Docs/Ausstehend.txt 2011-12-10 11:02:37 UTC (rev 4372)
@@ -1,7 +1,6 @@
Testen:
- Auto-Update
- Zugriff auf Anrufliste und Telefonbuch nach Verbindungsabbruch
-- Cache-Funktion f\xFCr FRITZ!Box Telefonbuch
Fehler beheben:
- \xDCberschrift wird beim Klicken auf Anruflisten-Filter nicht aktualisiert (aus Telefonbuch und Anrufbeantworter)
@@ -12,9 +11,11 @@
- ein kleiner schwarzer Balken \xFCberdeckt das erste Zeichen oder die erste Ziffer zur H\xE4lfte
Neue Funktion:
-- Schalter f\xFCr Ereignisse bei ausgehenden Anrufen
- Umschalter zwischen FritzBox-Telefonbuch und lokalem Telefonbuch
-- Funktion zum Integrieren von Anrufer-Bildern
+ - R\xFCckw\xE4rtssuche integrieren
+ - Anrufer-Bilder von FRITZ!Box verwenden
+ - Einstellung f\xFCr unterdr\xFCckte Rufnummern
+ - Handbuch aktualisieren
- Kontextmen\xFC f\xFCr Telefonbuch
- Wiki-Eintrag
- Skin-Erweiterungen
Modified: trunk/plugins/FritzBox/Docs/Changes.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Changes.txt 2011-12-10 09:09:06 UTC (rev 4371)
+++ trunk/plugins/FritzBox/Docs/Changes.txt 2011-12-10 11:02:37 UTC (rev 4372)
@@ -1,3 +0,0 @@
-- unified logging format
-- password is not logged anymore
-- fixed display of new messages count
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2011-12-10 09:09:06 UTC (rev 4371)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2011-12-10 11:02:37 UTC (rev 4372)
@@ -431,7 +431,7 @@
/// </summary>
public void Start()
{
- Log.Info("FRITZ!Box Plugin {0} starting.", Assembly.GetExecutingAssembly().GetName().Version);
+ Log.Info("FRITZ!Box Manager {0} plugin is starting", Assembly.GetExecutingAssembly().GetName().Version);
Settings.Load();
Utils.OnStartExternal += OnStartExternal;
@@ -450,7 +450,7 @@
/// </summary>
public void Stop()
{
- Log.Info("FRITZ!Box Plugin {0} stopping.", Assembly.GetExecutingAssembly().GetName().Version);
+ Log.Info("FRITZ!Box Manager {0} plugin is stopping", Assembly.GetExecutingAssembly().GetName().Version);
FritzBoxClient.StopClient();
FritzBoxClient.CallEvent -= OnCallAction;
@@ -733,7 +733,7 @@
if (thePlugin.phoneBookDirty)
{
thePlugin.phoneBookDirty = false;
- InternalPhoneBook.savePhonebook(thePlugin.phoneBook.Values, thePlugin.phoneBookPath);
+ InternalPhoneBook.savePhoneBook(thePlugin.phoneBook.Values, thePlugin.phoneBookPath);
}
thePlugin.fritz.keepAlive();
@@ -838,7 +838,7 @@
callItemList = CallItem.load(new MemoryStream(data));
// populate phone book
- bool updatePhonebook = false;
+ bool updatePhoneBook = false;
int idx = 0;
foreach (CallItem i in callItemList)
@@ -857,20 +857,20 @@
pi.name = i.name;
pi.fritzEntry = true;
pi.inverseLookupDone = false;
- updatePhonebook = true;
+ updatePhoneBook = true;
}
else if (useInversSearch && !pi.inverseLookupDone && !pi.fritzEntry && i.number != "") worker.queue.Enqueue(new Task(Task.TaskAction.InversLookup, new object[] { i.number, idx }));
idx++;
}
- if (updatePhonebook) InternalPhoneBook.savePhonebook(phoneBook.Values, phoneBookPath);
+ if (updatePhoneBook) InternalPhoneBook.savePhoneBook(phoneBook.Values, phoneBookPath);
}
refreshView();
}
- public void updatePhonebook(string number, string name, int index)
+ public void updatePhoneBook(string number, string name, int index)
{
if (name != null && name != "" && phoneBook.Contains(number))
{
Modified: trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs 2011-12-10 09:09:06 UTC (rev 4371)
+++ trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs 2011-12-10 11:02:37 UTC (rev 4372)
@@ -123,7 +123,7 @@
{
if (_client != null)
{
- // Release the socket.
+ // Release the socket
_client.Shutdown(SocketShutdown.Both);
_client.Close();
}
@@ -152,14 +152,14 @@
"Address & port test failed! :(" + Environment.NewLine +
" Did you enter correct connection information?" + Environment.NewLine +
" Are you using the latest FRITZ!Box firmware?" + Environment.NewLine +
- " Did you open the port on your FRITZ!Box? If not call #96*5* from your phone.");
+ " Did you open the port on your FRITZ!Box? If not call #96*5* from your phone");
return false;
}
tcpClient.Close();
- Log(LogLevel.Info, "Testing address & port succeeded.");
+ Log(LogLevel.Info, "Testing address & port succeeded");
return true;
}
@@ -220,7 +220,7 @@
catch (SocketException)
{
Log(LogLevel.Debug, "Connect: SocketException");
- Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect.");
+ Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect");
ReConnect();
}
catch (Exception ex)
@@ -247,7 +247,7 @@
catch (SocketException)
{
Log(LogLevel.Debug, "Connect: SocketException");
- Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect.");
+ Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect");
ReConnect();
}
catch (Exception ex)
@@ -287,7 +287,7 @@
Log(LogLevel.HeavyDebug, ex.Source);
Log(LogLevel.HeavyDebug, ex.StackTrace);
Log(LogLevel.Debug, "Receive: SocketException");
- Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect.");
+ Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect");
ReConnect();
}
catch (Exception ex)
@@ -370,19 +370,19 @@
else
{
Log(LogLevel.Debug, "ReceiveCallback: No bytes to read");
- Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect.");
+ Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect");
ReConnect();
}
}
catch (ObjectDisposedException)
{
Log(LogLevel.Debug, "ReceiveCallback: ObjectDisposedException");
- Log(LogLevel.Info, "FRITZ!BOX connection shut down.");
+ Log(LogLevel.Info, "FRITZ!BOX connection shut down");
}
catch (SocketException)
{
Log(LogLevel.Debug, "ReceiveCallback: SocketException");
- Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect.");
+ Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect");
ReConnect();
}
catch (Exception ex)
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/BackGroundWorker.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/BackGroundWorker.cs 2011-12-10 09:09:06 UTC (rev 4371)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/BackGroundWorker.cs 2011-12-10 11:02:37 UTC (rev 4372)
@@ -59,7 +59,7 @@
if (plugin.phoneBook[number].name != null) name = plugin.phoneBook[number].name;
else name = search.LookupNumber((string)task.param[0], out info);
- plugin.updatePhonebook(number, name, index);
+ plugin.updatePhoneBook(number, name, index);
break;
}
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/PhonebookItem.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/PhonebookItem.cs 2011-12-10 09:09:06 UTC (rev 4371)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/PhonebookItem.cs 2011-12-10 11:02:37 UTC (rev 4372)
@@ -12,24 +12,6 @@
public List<PhonebookItem> items = new List<PhonebookItem>();
- public static void savePhonebook(GCollections.ICollection<PhonebookItem> items, string fileName)
- {
- InternalPhoneBook book = new InternalPhoneBook();
- Log.Debug("Saving internal phone book to {0}", fileName);
-
- foreach (PhonebookItem i in items)
- {
- book.items.Add(i);
- }
-
- XmlSerializer s = new XmlSerializer(typeof(InternalPhoneBook));
- TextWriter w = new StreamWriter(fileName);
-
- s.Serialize(w, book);
-
- w.Close();
- }
-
public static HashMap<string, PhonebookItem> loadPhoneBook(string fileName)
{
HashMap<string, PhonebookItem> result = new HashMap<string, PhonebookItem>();
@@ -49,12 +31,27 @@
result[i.number] = i;
}
}
- else
+ else Log.Debug("Could not load FRITZ!Box Manager phone book. File {0} cannot be found", fileName);
+
+ return result;
+ }
+
+ public static void savePhoneBook(GCollections.ICollection<PhonebookItem> items, string fileName)
+ {
+ InternalPhoneBook book = new InternalPhoneBook();
+ Log.Debug("Saving FRITZ!Box Manager phone book from {0}", fileName);
+
+ foreach (PhonebookItem i in items)
{
- Log.Debug("Could not load FRITZ!Box Manager phone book. File {0} cannot be found", fileName);
+ book.items.Add(i);
}
- return result;
+ XmlSerializer s = new XmlSerializer(typeof(InternalPhoneBook));
+ TextWriter w = new StreamWriter(fileName);
+
+ s.Serialize(w, book);
+
+ w.Close();
}
}
Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/ResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hor...@us...> - 2011-12-10 09:09:15
|
Revision: 4371
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4371&view=rev
Author: horned-reaper
Date: 2011-12-10 09:09:06 +0000 (Sat, 10 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/Docs/Vorgehensweise beim Update.txt
trunk/plugins/FritzBox/FritzBox/FritzBox.cs
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.resx
trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/PhoneBook.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/PhonebookItem.cs
trunk/plugins/FritzBox/FritzBox/Properties/AssemblyInfo.cs
trunk/plugins/FritzBox/FritzBox/Settings.cs
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Debug/GenerateResource-ResGen.read.1.tlog
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.GenerateResource.Cache
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Release/ResolveAssemblyReference.cache
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/ResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/ResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
Added Paths:
-----------
trunk/plugins/FritzBox/FritzBox/bin/Release/AxInterop.WMPLib.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/Bass.Net.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/BassRegistration.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/BassVisAPI.Net.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/Common.Utils.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/Core.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/Dialogs.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/DirectShowLib.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/Interop.SHDocVw.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/Interop.WMPLib.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/Ionic.Zip.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/MediaPortal.Support.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/Utils.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/edtftpnet-1.2.2.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/log4net.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/taglib-sharp.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/ResolveAssemblyReference.cache
trunk/plugins/FritzBox/releases/FritzBox_v0.3.5.4370.mpe1
trunk/plugins/FritzBox/releases/update.xml
Removed Paths:
-------------
trunk/plugins/FritzBox/MpeRelease/FritzBox.mpe1
trunk/plugins/FritzBox/MpeRelease/update.xml
Modified: trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat
===================================================================
--- trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat 2011-12-09 13:30:38 UTC (rev 4370)
+++ trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat 2011-12-10 09:09:06 UTC (rev 4371)
@@ -1,5 +1,8 @@
@echo off
+D:
+cd \FritzBox\Build
+
REM Select program path based on current machine environment
set ProgramDir=%ProgramFiles%
if not "%ProgramFiles(x86)%".=="". set ProgramDir=%ProgramFiles(x86)%
@@ -49,5 +52,5 @@
echo.
echo Move installer and update.xml files to the releases folder
-move "..\MpeRelease\FritzBox.mpe1" "..\releases\FritzBox_v%Version%.mpe1" /Y
-move "..\MpeRelease\update.xml" "..\releases\update.xml" /Y
+move /Y "..\MpeRelease\FritzBox.mpe1" "..\releases\FritzBox_v%Version%.mpe1"
+move /Y "..\MpeRelease\update.xml" "..\releases\update.xml"
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2011-12-09 13:30:38 UTC (rev 4370)
+++ trunk/plugins/FritzBox/Build/Build.log 2011-12-10 09:09:06 UTC (rev 4371)
@@ -1,11 +1,16 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4366
+SVN Version: 4370
+Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
+Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
+Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs
+Updating: D:\FritzBox\Tools\FritzBoxConfigTester\Properties\AssemblyInfo.cs
+Updating: D:\FritzBox\Tools\FritzBoxDebugger\Properties\AssemblyInfo.cs
Microsoft (R) Build Engine Version 3.5.30729.1
[Microsoft .NET Framework, Version 2.0.50727.3625]
Copyright (C) Microsoft Corporation 2007. All rights reserved.
-Build started 09.12.2011 00:23:17.
+Build started 10.12.2011 09:59:09.
Project "D:\FritzBox\FritzBox.sln" on node 0 (Rebuild target(s)).
Building solution configuration "Release|Mixed Platforms".
Project "D:\FritzBox\FritzBox.sln" (1) is building "D:\FritzBox\FritzBox\FritzBox.csproj" (2) on node 0 (Rebuild target(s)).
@@ -13,14 +18,53 @@
CoreClean:
Deleting file "D:\FritzBox\FritzBox\bin\Release\FritzBox.dll".
Deleting file "D:\FritzBox\FritzBox\bin\Release\FritzBox.pdb".
+ Deleting file "D:\FritzBox\FritzBox\bin\Release\Common.Utils.dll".
+ Deleting file "D:\FritzBox\FritzBox\bin\Release\Core.dll".
+ Deleting file "D:\FritzBox\FritzBox\bin\Release\Dialogs.dll".
+ Deleting file "D:\FritzBox\FritzBox\bin\Release\Utils.dll".
+ Deleting file "D:\FritzBox\FritzBox\bin\Release\AxInterop.WMPLib.dll".
+ Deleting file "D:\FritzBox\FritzBox\bin\Release\Ionic.Zip.dll".
+ Deleting file "D:\FritzBox\FritzBox\bin\Release\log4net.dll".
+ Deleting file "D:\FritzBox\FritzBox\bin\Release\DirectShowLib.dll".
+ Deleting file "D:\FritzBox\FritzBox\bin\Release\edtftpnet-1.2.2.dll".
+ Deleting file "D:\FritzBox\FritzBox\bin\Release\Interop.WMPLib.dll".
+ Deleting file "D:\FritzBox\FritzBox\bin\Release\taglib-sharp.dll".
+ Deleting file "D:\FritzBox\FritzBox\bin\Release\Interop.SHDocVw.dll".
+ Deleting file "D:\FritzBox\FritzBox\bin\Release\BassRegistration.dll".
+ Deleting file "D:\FritzBox\FritzBox\bin\Release\Bass.Net.dll".
+ Deleting file "D:\FritzBox\FritzBox\bin\Release\BassVisAPI.Net.dll".
+ Deleting file "D:\FritzBox\FritzBox\bin\Release\MediaPortal.Support.dll".
Deleting file "D:\FritzBox\FritzBox\obj\Release\ResolveAssemblyReference.cache".
Deleting file "D:\FritzBox\FritzBox\obj\Release\FritzBox.Properties.Resources.resources".
Deleting file "D:\FritzBox\FritzBox\obj\Release\FritzBox.FritzBoxConfig.resources".
Deleting file "D:\FritzBox\FritzBox\obj\Release\FritzBox.csproj.GenerateResource.Cache".
+ Deleting file "D:\FritzBox\FritzBox\obj\Release\FritzBox.dll".
Deleting file "D:\FritzBox\FritzBox\obj\Release\FritzBox.pdb".
+EntityClean:
+ Successfully cleaned the output for 0 EDMX files.
+EntityDeploy:
+ Processing 0 EDMX files.
+ Finished processing 0 EDMX files.
CoreResGen:
Processing resource file "Properties\Resources.resx" into "obj\Release\FritzBox.Properties.Resources.resources".
Processing resource file "FritzBoxConfig.resx" into "obj\Release\FritzBox.FritzBoxConfig.resources".
+_CopyFilesMarkedCopyLocal:
+ Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Common.Utils.dll" to "bin\Release\Common.Utils.dll".
+ Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Core.dll" to "bin\Release\Core.dll".
+ Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" to "bin\Release\Dialogs.dll".
+ Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Utils.dll" to "bin\Release\Utils.dll".
+ Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\AxInterop.WMPLib.dll" to "bin\Release\AxInterop.WMPLib.dll".
+ Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Ionic.Zip.dll" to "bin\Release\Ionic.Zip.dll".
+ Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\log4net.dll" to "bin\Release\log4net.dll".
+ Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\DirectShowLib.dll" to "bin\Release\DirectShowLib.dll".
+ Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\edtftpnet-1.2.2.dll" to "bin\Release\edtftpnet-1.2.2.dll".
+ Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Interop.WMPLib.dll" to "bin\Release\Interop.WMPLib.dll".
+ Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\taglib-sharp.dll" to "bin\Release\taglib-sharp.dll".
+ Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Interop.SHDocVw.dll" to "bin\Release\Interop.SHDocVw.dll".
+ Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\BassRegistration.dll" to "bin\Release\BassRegistration.dll".
+ Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Bass.Net.dll" to "bin\Release\Bass.Net.dll".
+ Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\BassVisAPI.Net.dll" to "bin\Release\BassVisAPI.Net.dll".
+ Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\MediaPortal.Support.dll" to "bin\Release\MediaPortal.Support.dll".
CopyFilesToOutputDirectory:
Copying file from "obj\Release\FritzBox.dll" to "bin\Release\FritzBox.dll".
FritzBox -> D:\FritzBox\FritzBox\bin\Release\FritzBox.dll
@@ -99,7 +143,7 @@
2 Warning(s)
0 Error(s)
-Time Elapsed 00:00:02.19
+Time Elapsed 00:00:02.17
Reverting to build 0
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
@@ -184,7 +228,7 @@
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
36 File(s) copied
MpeMaker version: 1.2.1.0
-Build started at 00:23:22
+Build started at 09:59:13
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Modified: trunk/plugins/FritzBox/Docs/Vorgehensweise beim Update.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Vorgehensweise beim Update.txt 2011-12-09 13:30:38 UTC (rev 4370)
+++ trunk/plugins/FritzBox/Docs/Vorgehensweise beim Update.txt 2011-12-10 09:09:06 UTC (rev 4371)
@@ -1,12 +1,12 @@
-1. \xC4nderungen in Visual Studio vornehmen (inklusive Build)
-2. SVN Commit ausf\xFChren
-3. Build.bat ausf\xFChren
-4. Pr\xFCfen, ob Installer-Datei mit der korrekten Versionsnummer angelegt wurde. Beispiel:
+1. \xC4nderungen in Visual Studio vornehmen
+2. Build.bat ausf\xFChren
+3. Pr\xFCfen, ob Installer-Datei mit der korrekten Versionsnummer angelegt wurde. Beispiel:
- OK: FritzBox_v0.3.5.4364.mpe1
- Falsch: FritzBox_v0.3.5.0.mpe1
-5. Wenn falsch, dann Installer-Datei l\xF6schen und SVN update ausf\xFChren und Build.bat erneut ausf\xFChren
-6. \xC4nderugnen MediaPortal-Webseite hochladen
+4. Wenn falsch, dann Installer-Datei l\xF6schen, SVN update ausf\xFChren und Build.bat erneut ausf\xFChren
+5. \xC4nderungen auf MediaPortal-Webseite hochladen
- Versionsnummer
- Change-Log-Eintrag
- neue Installer-Datei
- - neue update.xml-Datei
\ No newline at end of file
+ - neue update.xml-Datei
+6. SVN Commit ausf\xFChren
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2011-12-09 13:30:38 UTC (rev 4370)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2011-12-10 09:09:06 UTC (rev 4371)
@@ -268,9 +268,10 @@
// if notifies are disabled for this call, stop here
if (!IsCallerEnabled(callAction.Caller)) return;
+ // play sound
if (callAction.Type == CallAction.CallType.Incoming && Settings.IncomingSound != null && Settings.IncomingSound.Length > 0) Utils.PlaySound(Settings.IncomingSound, false, true);
- ShowNotify(strHeading, strImage, strText);
+ ShowNotify(callAction.Type, strHeading, strImage, strText);
}
#endregion
@@ -350,17 +351,32 @@
else return false;
}
- private void ShowNotify(string strHeading, string strImage, string strText)
+ private void ShowNotify(CallAction.CallType callType, string strHeading, string strImage, string strText)
{
bool resumePlayer = false;
if (notifyCount >= Settings.MaxNotifies) return;
// pause player
- if (g_Player.Playing && !g_Player.Paused && Settings.StopMedia)
+ if (g_Player.Playing && !g_Player.Paused)
{
- g_Player.Pause();
- resumePlayer = true;
+ switch (callType)
+ {
+ case CallAction.CallType.Incoming:
+ if (Settings.PauseMediaOnIncomingCall)
+ {
+ g_Player.Pause();
+ resumePlayer = true;
+ }
+ break;
+ case CallAction.CallType.Outgoing:
+ if (Settings.PauseMediaOnOutgoingCall)
+ {
+ g_Player.Pause();
+ resumePlayer = true;
+ }
+ break;
+ }
}
// show dialog
@@ -379,9 +395,21 @@
dlgNotify.DoModal(GUIWindowManager.ActiveWindow);
// resume player
- if (resumePlayer && g_Player.Playing && g_Player.Paused && Settings.StopMedia && Settings.ResumeMedia) g_Player.Pause();
+ if (resumePlayer && g_Player.Playing && g_Player.Paused)
+ {
+ switch (callType)
+ {
+ case CallAction.CallType.Incoming:
+ if (Settings.PauseMediaOnIncomingCall && Settings.ResumeMediaOnIncomingCall) g_Player.Pause();
+ break;
+ case CallAction.CallType.Outgoing:
+ if (Settings.PauseMediaOnOutgoingCall && Settings.ResumeMediaOnOutgoingCall) g_Player.Pause();
+ break;
+ }
+ }
_tempNotify = null;
+
if (_actionList.Count > 0)
{
CallAction tmpAction = _actionList[0];
@@ -992,6 +1020,7 @@
private string lookupCaller(string caller)
{
if (phoneBook.Contains(caller)) caller = phoneBook[caller].name;
+
if (caller == "" || caller == null) caller = GUILocalizeStrings.Get(3); // 3 = Unknown
return caller;
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2011-12-09 13:30:38 UTC (rev 4370)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2011-12-10 09:09:06 UTC (rev 4371)
@@ -60,10 +60,12 @@
this.numericUpDownTimeout = new MediaPortal.UserInterface.Controls.MPNumericUpDown();
this.checkBoxCloseOnTimout = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.groupBoxMedia = new MediaPortal.UserInterface.Controls.MPGroupBox();
+ this.checkBoxResumeMediaOnOutgoingCall = new MediaPortal.UserInterface.Controls.MPCheckBox();
+ this.checkBoxPauseMediaOnOutgoingCall = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.mpLabel5 = new MediaPortal.UserInterface.Controls.MPLabel();
this.mpIncomingSoundTextBox = new MediaPortal.UserInterface.Controls.MPTextBox();
- this.checkBoxResumeMedia = new MediaPortal.UserInterface.Controls.MPCheckBox();
- this.checkBoxStopMediaOnIncomingCall = new MediaPortal.UserInterface.Controls.MPCheckBox();
+ this.checkBoxResumeMediaOnIncomingCall = new MediaPortal.UserInterface.Controls.MPCheckBox();
+ this.checkBoxPauseMediaOnIncomingCall = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.tabPhonebook = new System.Windows.Forms.TabPage();
this.buttonRemoveAll = new MediaPortal.UserInterface.Controls.MPButton();
this.pictureBoxCaller = new System.Windows.Forms.PictureBox();
@@ -279,7 +281,7 @@
this.groupBoxPhonebook.Controls.Add(this.checkBoxShowUnknownCaller);
this.groupBoxPhonebook.Controls.Add(this.checkBoxUsePhonebook);
this.groupBoxPhonebook.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.groupBoxPhonebook.Location = new System.Drawing.Point(6, 208);
+ this.groupBoxPhonebook.Location = new System.Drawing.Point(6, 242);
this.groupBoxPhonebook.Name = "groupBoxPhonebook";
this.groupBoxPhonebook.Size = new System.Drawing.Size(177, 95);
this.groupBoxPhonebook.TabIndex = 2;
@@ -478,22 +480,46 @@
//
this.groupBoxMedia.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
+ this.groupBoxMedia.Controls.Add(this.checkBoxResumeMediaOnOutgoingCall);
+ this.groupBoxMedia.Controls.Add(this.checkBoxPauseMediaOnOutgoingCall);
this.groupBoxMedia.Controls.Add(this.mpLabel5);
this.groupBoxMedia.Controls.Add(this.mpIncomingSoundTextBox);
- this.groupBoxMedia.Controls.Add(this.checkBoxResumeMedia);
- this.groupBoxMedia.Controls.Add(this.checkBoxStopMediaOnIncomingCall);
+ this.groupBoxMedia.Controls.Add(this.checkBoxResumeMediaOnIncomingCall);
+ this.groupBoxMedia.Controls.Add(this.checkBoxPauseMediaOnIncomingCall);
this.groupBoxMedia.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.groupBoxMedia.Location = new System.Drawing.Point(6, 134);
this.groupBoxMedia.Name = "groupBoxMedia";
- this.groupBoxMedia.Size = new System.Drawing.Size(561, 66);
+ this.groupBoxMedia.Size = new System.Drawing.Size(561, 87);
this.groupBoxMedia.TabIndex = 1;
this.groupBoxMedia.TabStop = false;
this.groupBoxMedia.Text = "Media settings";
//
+ // checkBoxResumeMediaOnOutgoingCall
+ //
+ this.checkBoxResumeMediaOnOutgoingCall.AutoSize = true;
+ this.checkBoxResumeMediaOnOutgoingCall.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.checkBoxResumeMediaOnOutgoingCall.Location = new System.Drawing.Point(391, 40);
+ this.checkBoxResumeMediaOnOutgoingCall.Name = "checkBoxResumeMediaOnOutgoingCall";
+ this.checkBoxResumeMediaOnOutgoingCall.Size = new System.Drawing.Size(162, 17);
+ this.checkBoxResumeMediaOnOutgoingCall.TabIndex = 11;
+ this.checkBoxResumeMediaOnOutgoingCall.Text = "Auto-resume on closing notify";
+ this.checkBoxResumeMediaOnOutgoingCall.UseVisualStyleBackColor = true;
+ //
+ // checkBoxPauseMediaOnOutgoingCall
+ //
+ this.checkBoxPauseMediaOnOutgoingCall.AutoSize = true;
+ this.checkBoxPauseMediaOnOutgoingCall.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.checkBoxPauseMediaOnOutgoingCall.Location = new System.Drawing.Point(373, 20);
+ this.checkBoxPauseMediaOnOutgoingCall.Name = "checkBoxPauseMediaOnOutgoingCall";
+ this.checkBoxPauseMediaOnOutgoingCall.Size = new System.Drawing.Size(132, 17);
+ this.checkBoxPauseMediaOnOutgoingCall.TabIndex = 10;
+ this.checkBoxPauseMediaOnOutgoingCall.Text = "Pause on outgoing call";
+ this.checkBoxPauseMediaOnOutgoingCall.UseVisualStyleBackColor = true;
+ //
// mpLabel5
//
this.mpLabel5.AutoSize = true;
- this.mpLabel5.Location = new System.Drawing.Point(193, 24);
+ this.mpLabel5.Location = new System.Drawing.Point(3, 63);
this.mpLabel5.Name = "mpLabel5";
this.mpLabel5.Size = new System.Drawing.Size(104, 13);
this.mpLabel5.TabIndex = 9;
@@ -504,33 +530,33 @@
this.mpIncomingSoundTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.mpIncomingSoundTextBox.BorderColor = System.Drawing.Color.Empty;
- this.mpIncomingSoundTextBox.Location = new System.Drawing.Point(303, 20);
+ this.mpIncomingSoundTextBox.Location = new System.Drawing.Point(113, 59);
this.mpIncomingSoundTextBox.Name = "mpIncomingSoundTextBox";
this.mpIncomingSoundTextBox.Size = new System.Drawing.Size(248, 20);
this.mpIncomingSoundTextBox.TabIndex = 6;
//
- // checkBoxResumeMedia
+ // checkBoxResumeMediaOnIncomingCall
//
- this.checkBoxResumeMedia.AutoSize = true;
- this.checkBoxResumeMedia.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.checkBoxResumeMedia.Location = new System.Drawing.Point(24, 40);
- this.checkBoxResumeMedia.Name = "checkBoxResumeMedia";
- this.checkBoxResumeMedia.Size = new System.Drawing.Size(162, 17);
- this.checkBoxResumeMedia.TabIndex = 1;
- this.checkBoxResumeMedia.Text = "Auto-resume on closing notify";
- this.checkBoxResumeMedia.UseVisualStyleBackColor = true;
+ this.checkBoxResumeMediaOnIncomingCall.AutoSize = true;
+ this.checkBoxResumeMediaOnIncomingCall.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.checkBoxResumeMediaOnIncomingCall.Location = new System.Drawing.Point(24, 40);
+ this.checkBoxResumeMediaOnIncomingCall.Name = "checkBoxResumeMediaOnIncomingCall";
+ this.checkBoxResumeMediaOnIncomingCall.Size = new System.Drawing.Size(162, 17);
+ this.checkBoxResumeMediaOnIncomingCall.TabIndex = 1;
+ this.checkBoxResumeMediaOnIncomingCall.Text = "Auto-resume on closing notify";
+ this.checkBoxResumeMediaOnIncomingCall.UseVisualStyleBackColor = true;
//
- // checkBoxStopMediaOnIncomingCall
+ // checkBoxPauseMediaOnIncomingCall
//
- this.checkBoxStopMediaOnIncomingCall.AutoSize = true;
- this.checkBoxStopMediaOnIncomingCall.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.checkBoxStopMediaOnIncomingCall.Location = new System.Drawing.Point(6, 20);
- this.checkBoxStopMediaOnIncomingCall.Name = "checkBoxStopMediaOnIncomingCall";
- this.checkBoxStopMediaOnIncomingCall.Size = new System.Drawing.Size(85, 17);
- this.checkBoxStopMediaOnIncomingCall.TabIndex = 0;
- this.checkBoxStopMediaOnIncomingCall.Text = "Stop on calls";
- this.checkBoxStopMediaOnIncomingCall.UseVisualStyleBackColor = true;
- this.checkBoxStopMediaOnIncomingCall.CheckedChanged += new System.EventHandler(this.checkBoxStopMedia_CheckedChanged);
+ this.checkBoxPauseMediaOnIncomingCall.AutoSize = true;
+ this.checkBoxPauseMediaOnIncomingCall.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.checkBoxPauseMediaOnIncomingCall.Location = new System.Drawing.Point(6, 20);
+ this.checkBoxPauseMediaOnIncomingCall.Name = "checkBoxPauseMediaOnIncomingCall";
+ this.checkBoxPauseMediaOnIncomingCall.Size = new System.Drawing.Size(133, 17);
+ this.checkBoxPauseMediaOnIncomingCall.TabIndex = 0;
+ this.checkBoxPauseMediaOnIncomingCall.Text = "Pause on incoming call";
+ this.checkBoxPauseMediaOnIncomingCall.UseVisualStyleBackColor = true;
+ this.checkBoxPauseMediaOnIncomingCall.CheckedChanged += new System.EventHandler(this.checkBoxStopMedia_CheckedChanged);
//
// tabPhonebook
//
@@ -1056,8 +1082,8 @@
private MediaPortal.UserInterface.Controls.MPNumericUpDown numericUpDownTimeout;
private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxCloseOnTimout;
private MediaPortal.UserInterface.Controls.MPGroupBox groupBoxMedia;
- private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxResumeMedia;
- private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxStopMediaOnIncomingCall;
+ private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxResumeMediaOnIncomingCall;
+ private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxPauseMediaOnIncomingCall;
private System.Windows.Forms.TabPage tabPhonebook;
private System.Windows.Forms.PictureBox pictureBoxCaller;
private MediaPortal.UserInterface.Controls.MPButton buttonCallerChange;
@@ -1098,5 +1124,7 @@
private MediaPortal.UserInterface.Controls.MPTextBox textBoxSuffixHome;
private MediaPortal.UserInterface.Controls.MPButton mpImportFBMonitor;
private MediaPortal.UserInterface.Controls.MPTextBox textBoxSuffixWork;
+ private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxResumeMediaOnOutgoingCall;
+ private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxPauseMediaOnOutgoingCall;
}
}
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2011-12-09 13:30:38 UTC (rev 4370)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2011-12-10 09:09:06 UTC (rev 4371)
@@ -77,8 +77,10 @@
checkBoxShowMSNOnNotify.Checked = Settings.ShowMSNOnNotify;
// media settings
- checkBoxStopMediaOnIncomingCall.Checked = Settings.StopMedia;
- checkBoxResumeMedia.Checked = Settings.ResumeMedia;
+ checkBoxPauseMediaOnIncomingCall.Checked = Settings.PauseMediaOnIncomingCall;
+ checkBoxResumeMediaOnIncomingCall.Checked = Settings.ResumeMediaOnIncomingCall;
+ checkBoxPauseMediaOnOutgoingCall.Checked = Settings.PauseMediaOnOutgoingCall;
+ checkBoxResumeMediaOnOutgoingCall.Checked = Settings.ResumeMediaOnOutgoingCall;
// phone book settings
checkBoxUsePhonebook.Checked = PhoneBook.Enabled;
@@ -95,12 +97,16 @@
RefreshDataGridView();
- // FritzBox Manager settings
+ // FRITZ!Box settings
passwd.Text = Settings.FmPassword;
vBPath.Text = Settings.FmVBPath;
dialPort.Text = Settings.FmDialPort;
+
+ // inverse search settings
useInversSearch.Checked = Settings.FmUseInversSearch;
defaultAreacode.Text = Settings.FmDefaultAreacode;
+
+ // GUI settings
updateInterval.Text = Convert.ToString(Settings.FmUpdateInterval);
}
@@ -127,8 +133,10 @@
Settings.ShowMSNOnNotify = checkBoxShowMSNOnNotify.Checked;
// media settings
- Settings.StopMedia = checkBoxStopMediaOnIncomingCall.Checked;
- Settings.ResumeMedia = checkBoxResumeMedia.Checked;
+ Settings.PauseMediaOnIncomingCall = checkBoxPauseMediaOnIncomingCall.Checked;
+ Settings.ResumeMediaOnIncomingCall = checkBoxResumeMediaOnIncomingCall.Checked;
+ Settings.PauseMediaOnOutgoingCall = checkBoxPauseMediaOnOutgoingCall.Checked;
+ Settings.ResumeMediaOnOutgoingCall = checkBoxResumeMediaOnOutgoingCall.Checked;
// phone book settings
PhoneBook.Enabled = checkBoxUsePhonebook.Checked;
@@ -141,14 +149,18 @@
SaveDataGridView();
- // FritzManager settings
+ // FRITZ!Box settings
Settings.FmPassword = passwd.Text;
Settings.FmVBPath = vBPath.Text;
Settings.FmDialPort = dialPort.Text;
+
+ // inverse search settings
Settings.FmUseInversSearch = useInversSearch.Checked;
- Settings.FmUpdateInterval = Convert.ToInt16(updateInterval.Text);
Settings.FmDefaultAreacode = defaultAreacode.Text;
+ // GUI settings
+ Settings.FmUpdateInterval = Convert.ToInt16(updateInterval.Text);
+
Settings.Save();
}
@@ -181,7 +193,7 @@
private void checkBoxStopMedia_CheckedChanged(object sender, EventArgs e)
{
- checkBoxResumeMedia.Enabled = checkBoxStopMediaOnIncomingCall.Checked;
+ checkBoxResumeMediaOnIncomingCall.Enabled = checkBoxPauseMediaOnIncomingCall.Checked;
}
private void checkBoxUsePhonebook_CheckedChanged(object sender, EventArgs e)
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.resx
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.resx 2011-12-09 13:30:38 UTC (rev 4370)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.resx 2011-12-10 09:09:06 UTC (rev 4371)
@@ -112,21 +112,21 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <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=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <metadata name="colName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <metadata name="colName.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
- <metadata name="colCallerId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <metadata name="colCallerId.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
- <metadata name="colShow.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <metadata name="colShow.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
- <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAwAEBAQAAAAAAAoAQAAxgAAABAQAAABAAgAaAUAAO4BAAAgIBAAAAAAAOgCAABWBwAAICAAAAEA
Modified: trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/PhoneBook.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/PhoneBook.cs 2011-12-09 13:30:38 UTC (rev 4370)
+++ trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/PhoneBook.cs 2011-12-10 09:09:06 UTC (rev 4371)
@@ -234,7 +234,7 @@
caller.ID = normalizeMSN(caller.ID);
- if (Contacts.Count == 0)
+ if (Contacts.Count == 0 && SaveUnknownCaller)
{
Log.Info("Phone book is empty. Caller is added to the phone book");
Contacts.Add(caller);
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/PhonebookItem.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/PhonebookItem.cs 2011-12-09 13:30:38 UTC (rev 4370)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/PhonebookItem.cs 2011-12-10 09:09:06 UTC (rev 4371)
@@ -15,7 +15,7 @@
public static void savePhonebook(GCollections.ICollection<PhonebookItem> items, string fileName)
{
InternalPhoneBook book = new InternalPhoneBook();
- Log.Debug("Saving internal phoneBook to {0}", fileName);
+ Log.Debug("Saving internal phone book to {0}", fileName);
foreach (PhonebookItem i in items)
{
@@ -36,7 +36,7 @@
if (File.Exists(fileName))
{
- Log.Debug("Loading FritzManager phone book from {0}", fileName);
+ Log.Debug("Loading FRITZ!Box Manager phone book from {0}", fileName);
XmlSerializer s = new XmlSerializer(typeof(InternalPhoneBook));
TextReader r = new StreamReader(fileName);
@@ -51,7 +51,7 @@
}
else
{
- Log.Debug("Could not load FritzManager phone book. File {0} cannot be found", fileName);
+ Log.Debug("Could not load FRITZ!Box Manager phone book. File {0} cannot be found", fileName);
}
return result;
Modified: trunk/plugins/FritzBox/FritzBox/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Properties/AssemblyInfo.cs 2011-12-09 13:30:38 UTC (rev 4370)
+++ trunk/plugins/FritzBox/FritzBox/Properties/AssemblyInfo.cs 2011-12-10 09:09:06 UTC (rev 4371)
@@ -31,7 +31,7 @@
[assembly: AssemblyTitle("FRITZ!Box Manager")]
[assembly: AssemblyDescription("Displays FRITZ!Box calling information / phoneBook / voicebox.")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Horned Reaper, Steve, Chefkoch @ Team MediaPortal")]
+[assembly: AssemblyCompany("Horned_Reaper, Steve, Chefkoch @ Team MediaPortal")]
[assembly: AssemblyProduct("FRITZ!Box Manager")]
[assembly: AssemblyCopyright("Horned Reaper, Steve, Chefkoch @ Team MediaPortal 2009")]
[assembly: AssemblyTrademark("")]
Modified: trunk/plugins/FritzBox/FritzBox/Settings.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Settings.cs 2011-12-09 13:30:38 UTC (rev 4370)
+++ trunk/plugins/FritzBox/FritzBox/Settings.cs 2011-12-10 09:09:06 UTC (rev 4371)
@@ -50,15 +50,26 @@
public static bool ExtensiveLogging { get; set; }
/// <summary>
- /// stop media when an event happend
+ /// stop media on incoming call when an event happend
/// </summary>
- public static bool StopMedia { get; set; }
+ public static bool PauseMediaOnIncomingCall { get; set; }
/// <summary>
- /// resume media when notify is closed
+ /// resume media on incoming call when notify is closed
/// </summary>
- public static bool ResumeMedia { get; set; }
+ public static bool ResumeMediaOnIncomingCall { get; set; }
+ /// <summary>
+ /// stop media on outgoing call when an event happend
+ /// </summary>
+ public static bool PauseMediaOnOutgoingCall { get; set; }
+
+ /// <summary>
+ /// resume media on outgoing call when notify is closed
+ /// </summary>
+ ///
+ public static bool ResumeMediaOnOutgoingCall { get; set; }
+
public static int MaxNotifies { get; set; }
/// <summary>
@@ -105,8 +116,10 @@
static Settings()
{
- StopMedia = true;
- ResumeMedia = true;
+ PauseMediaOnIncomingCall = true;
+ ResumeMediaOnIncomingCall = true;
+ PauseMediaOnOutgoingCall = true;
+ ResumeMediaOnOutgoingCall = true;
MaxNotifies = 20;
NotifyTimeout = 10;
}
@@ -143,11 +156,13 @@
ShowMSNOnNotify = xmlreader.GetValueAsBool("fritzbox", "showMSNOnNotify", true);
// media settings
- StopMedia = xmlreader.GetValueAsBool("fritzbox", "stopMedia", true);
- ResumeMedia = xmlreader.GetValueAsBool("fritzbox", "resumeMedia", true);
+ PauseMediaOnIncomingCall = xmlreader.GetValueAsBool("fritzbox", "pauseMediaOnIncomingCall", true);
+ ResumeMediaOnIncomingCall = xmlreader.GetValueAsBool("fritzbox", "resumeMediaOnIncomingCall", true);
IncomingSound = xmlreader.GetValueAsString("fritzbox", "incomingSound", "");
+ PauseMediaOnOutgoingCall = xmlreader.GetValueAsBool("fritzbox", "pauseMediaOnOutgoingCall", false);
+ ResumeMediaOnOutgoingCall = xmlreader.GetValueAsBool("fritzbox", "resumeMediaOnOutgoingCall", false);
- // FritzManager settings
+ // FIRTZ!Box settings
string decryptedPassword = StringEncryption.DecryptString(xmlreader.GetValue("FritzManager", "passwd"), encryptionPassphrase);
if (decryptedPassword != null) FmPassword = decryptedPassword;
else FmPassword = xmlreader.GetValue("FritzManager", "passwd"); // if the password was not encrypted read it in clear text (for older FritzBox Manager versions)
@@ -166,16 +181,22 @@
FmUseInversSearch = xmlreader.GetValueAsBool("FritzManager", "useInversSearch", false);
FmDefaultAreacode = xmlreader.GetValue("FritzManager", "defaultAreacode");
+
+ // GUI settings
FmUpdateInterval = xmlreader.GetValueAsInt("FritzManager", "updateInterval", 0);
// delete (convert) obsolete setting entries
xmlreader.RemoveEntry("fritzbox", "showMsnOnHeading");
+
if (!String.IsNullOrEmpty(xmlreader.GetValue("FritzManager", "abpath")))
{
FmVBPath = xmlreader.GetValue("FritzManager", "abpath");
xmlreader.RemoveEntry("FritzManager", "abpath");
}
+ xmlreader.RemoveEntry("fritzbox", "stopMedia");
+ xmlreader.RemoveEntry("fritzbox", "resumeMedia");
+
// loading current skin setting
MediaPortalSkin = xmlreader.GetValueAsString("skin", "name", "DefaultWide");
}
@@ -209,19 +230,25 @@
xmlwriter.SetValueAsBool("fritzbox", "showMSNOnNotify", ShowMSNOnNotify);
// media settings
- xmlwriter.SetValueAsBool("fritzbox", "stopMedia", StopMedia);
- xmlwriter.SetValueAsBool("fritzbox", "resumeMedia", ResumeMedia);
+ xmlwriter.SetValueAsBool("fritzbox", "pauseMediaOnIncomingCall", PauseMediaOnIncomingCall);
+ xmlwriter.SetValueAsBool("fritzbox", "resumeMediaOnIncomingCall", ResumeMediaOnIncomingCall);
xmlwriter.SetValue("fritzbox", "incomingSound", IncomingSound);
+ xmlwriter.SetValueAsBool("fritzbox", "pauseMediaOnOutgoingCall", PauseMediaOnOutgoingCall);
+ xmlwriter.SetValueAsBool("fritzbox", "resumeMediaOnOutgoingCall", ResumeMediaOnOutgoingCall);
- // new FritzManager settings
+ // new FRITZ!Box settings
xmlwriter.SetValue("FritzManager", "passwd", StringEncryption.EncryptString(FmPassword, encryptionPassphrase));
xmlwriter.SetValue("FritzManager", "vBPath", FmVBPath);
xmlwriter.SetValue("FritzManager", "dialport", FmDialPort);
+
+ // inverse search settings
xmlwriter.SetValueAsBool("FritzManager", "useInversSearch", FmUseInversSearch);
xmlwriter.SetValue("FritzManager", "defaultAreacode", FmDefaultAreacode);
- if (FmUpdateInterval > 0 && FmUpdateInterval < 30) FmUpdateInterval = 30;
+
+ // GUI settings
+ if (FmUpdateInterval > 0 && FmUpdateInterval < 30) FmUpdateInterval = 30;
xmlwriter.SetValue("FritzManager", "updateInterval", FmUpdateInterval);
- //todo: writing currentmode okay this way?
+
xmlwriter.SetValue("FritzManager", "currentMode", (int)FmCurrentMode);
xmlwriter.SetValue("FritzManager", "currentFilter", (int)FmCurrentFilter);
}
Added: trunk/plugins/FritzBox/FritzBox/bin/Release/AxInterop.WMPLib.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/FritzBox/bin/Release/AxInterop.WMPLib.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/FritzBox/bin/Release/Bass.Net.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/FritzBox/bin/Release/Bass.Net.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/FritzBox/bin/Release/BassRegistration.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/FritzBox/bin/Release/BassRegistration.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/FritzBox/bin/Release/BassVisAPI.Net.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/FritzBox/bin/Release/BassVisAPI.Net.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/FritzBox/bin/Release/Common.Utils.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/FritzBox/bin/Release/Common.Utils.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/FritzBox/bin/Release/Core.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/FritzBox/bin/Release/Core.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/FritzBox/bin/Release/Dialogs.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/FritzBox/bin/Release/Dialogs.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/FritzBox/bin/Release/DirectShowLib.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/FritzBox/bin/Release/DirectShowLib.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Added: trunk/plugins/FritzBox/FritzBox/bin/Release/Interop.SHDocVw.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/FritzBox/bin/Release/Interop.SHDocVw.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/FritzBox/bin/Release/Interop.WMPLib.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/FritzBox/bin/Release/Interop.WMPLib.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/FritzBox/bin/Release/Ionic.Zip.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/FritzBox/bin/Release/Ionic.Zip.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/FritzBox/bin/Release/MediaPortal.Support.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/FritzBox/bin/Release/MediaPortal.Support.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/FritzBox/bin/Release/Utils.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/FritzBox/bin/Release/Utils.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/FritzBox/bin/Release/edtftpnet-1.2.2.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/FritzBox/bin/Release/edtftpnet-1.2.2.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/FritzBox/bin/Release/log4net.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/FritzBox/bin/Release/log4net.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/FritzBox/bin/Release/taglib-sharp.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/FritzBox/bin/Release/taglib-sharp.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/GenerateResource-ResGen.read.1.tlog
===================================================================
(Binary files differ)
Added: trunk/plugins/FritzBox/FritzBox/obj/Debug/ResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/FritzBox/obj/Debug/ResolveAssemblyReference.cache
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.FileListAbsolute.txt
===================================================================
--- trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.FileListAbsolute.txt 2011-12-09 13:30:38 UTC (rev 4370)
+++ trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.FileListAbsolute.txt 2011-12-10 09:09:06 UTC (rev 4371)
@@ -6,3 +6,19 @@
D:\FritzBox\FritzBox\obj\Release\FritzBox.csproj.GenerateResource.Cache
D:\FritzBox\FritzBox\obj\Release\FritzBox.dll
D:\FritzBox\FritzBox\obj\Release\FritzBox.pdb
+D:\FritzBox\FritzBox\bin\Release\Common.Utils.dll
+D:\FritzBox\FritzBox\bin\Release\Core.dll
+D:\FritzBox\FritzBox\bin\Release\Dialogs.dll
+D:\FritzBox\FritzBox\bin\Release\Utils.dll
+D:\FritzBox\FritzBox\bin\Release\AxInterop.WMPLib.dll
+D:\FritzBox\FritzBox\bin\Release\Ionic.Zip.dll
+D:\FritzBox\FritzBox\bin\Release\log4net.dll
+D:\FritzBox\FritzBox\bin\Release\DirectShowLib.dll
+D:\FritzBox\FritzBox\bin\Release\edtftpnet-1.2.2.dll
+D:\FritzBox\FritzBox\bin\Release\Interop.WMPLib.dll
+D:\FritzBox\FritzBox\bin\Release\taglib-sharp.dll
+D:\FritzBox\FritzBox\bin\Release\Interop.SHDocVw.dll
+D:\FritzBox\FritzBox\bin\Release\BassRegistration.dll
+D:\FritzBox\FritzBox\bin\Release\Bass.Net.dll
+D:\FritzBox\FritzBox\bin\Release\BassVisAPI.Net.dll
+D:\FritzBox\FritzBox\bin\Release\MediaPortal.Support.dll
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.GenerateResource.Cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/ResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Deleted: trunk/plugins/FritzBox/MpeRelease/FritzBox.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2011-12-09 13:30:38 UTC (rev 4370)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2011-12-10 09:09:06 UTC (rev 4371)
@@ -559,7 +559,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4366</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4370</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -574,7 +574,7 @@
<GeneralInfo>
<Name>FritzBox Manager</Name>
<Id>8cb6bbc2-5473-4a63-a8f9-e0bec7c8c81c</Id>
- <Author>Horned Reaper, Steve, Chefkoch</Author>
+ <Author>Horned_Reaper, Steve, Chefkoch</Author>
<HomePage>http://www.team-mediaportal.com/extensions/other/fritzbox-manager-phone-manager-callmonitor-for-avm-fritz-box</HomePage>
<ForumPage>http://forum.team-mediaportal.com/mediaportal-plugins-47/fritz-box-manager-english-forum-103177/#post817050</ForumPage>
<UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=52</UpdateUrl>
@@ -582,21 +582,21 @@
<Major>0</Major>
<Minor>3</Minor>
<Build>5</Build>
- <Revision>4366</Revision>
+ <Revision>4370</Revision>
</Version>
- <ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box informations from MediaPortal.
-
-Features:
-- notification for incoming and outgoing calls via window, sound and contact picture
-- MediaPortal Player is automatically paused and resumed on calls
-- access call lists, voice box and phone book directly in MediaPortal
-- voice box message notification in any MediaPortal screen
-- connection establishment from call list, voice box or phone book entries
+ <ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box informations from MediaPortal.
+
+Features:
+- notification for incoming and outgoing calls via window, sound and contact picture
+- MediaPortal Player is automatically paused and resumed on calls
+- access call lists, voice box and phone book directly in MediaPortal
+- voice box message notification in any MediaPortal screen
+- connection establishment from call list, voice box or phone book entries
- language localization</ExtensionDescription>
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
- <ReleaseDate>2011-12-09T00:23:22.128469+01:00</ReleaseDate>
+ <ReleaseDate>2011-12-10T09:59:13.995507+01:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
Deleted: trunk/plugins/FritzBox/MpeRelease/update.xml
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/update.xml 2011-12-09 13:30:38 UTC (rev 4370)
+++ trunk/plugins/FritzBox/MpeRelease/update.xml 2011-12-10 09:09:06 UTC (rev 4371)
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ExtensionCollection xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <Items>
- <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="Blue3 Skin">
- <DisplayName>Blue3 Skin</DisplayName>
- <DefaulChecked>false</DefaulChecked>
- <Description>Blue3 Skin</Description>
- <Files>
- <Items />
- </Files>
- </GroupItem>
- <GroupItem Name="Maya Skin">
- <DisplayName>Maya Skin</DisplayName>
- <DefaulChecked>false</DefaulChecked>
- <Description>Maya Skin</Description>
- <Files>
- <Items />
- </Files>
- </GroupItem>
- <GroupItem Name="Black & White Skin">
- <DisplayName>Black & White Skin</DisplayName>
- <DefaulChecked>false</DefaulChecked>
- <Description>Black & White Skin</Description>
- <Files>
- <Items />
- </Files>
- </GroupItem>
- <GroupItem Name="Default Skin">
- <DisplayName>Default Skin</DisplayName>
- <DefaulChecked>true</DefaulChecked>
- <Description>Default Skin</Description>
- <Files>
- <Items />
- </Files>
- </GroupItem>
- <GroupItem Name="DefaultWide Skin">
- <DisplayName>DefaultWide Skin</DisplayName>
- <DefaulChecked>true</DefaulChecked>
- <Description>DefaultWide Skin</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="FritzBox.dll">
- <CompatibleVersion>
- <Items>
- <CompatibleVersionItem>
- <MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4366</DesignedForVersion>
- </CompatibleVersionItem>
- </Items>
- </CompatibleVersion>
- <SubSystemsUsed>
- <Items>
- <SubSystemItem Name="MP.Config" />
- </Items>
- </SubSystemsUsed>
- </PluginDependencyItem>
- </Items>
- </PluginDependencies>
- <GeneralInfo>
- <Name>FritzBox Manager</Name>
- <Id>8cb6bbc2-5473-4a63-a8f9-e0bec7c8c81c</Id>
- <Author>Horned Reaper, Steve, Chefkoch</Author>
- <HomePage>http://www.team-mediaportal.com/extensions/other/fritzbox-manager-phone-manager-callmonitor-for-avm-fritz-box</HomePage>
- <ForumPage>http://forum.team-mediaportal.com/mediaportal-plugins-47/fritz-box-manager-english-forum-103177/#post817050</ForumPage>
- <UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=52</UpdateUrl>
- <Version>
- <Major>0</Major>
- <Minor>3</Minor>
- <Build>5</Build>
- <Revision>4366</Revision>
- </Version>
- <ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box informations from MediaPortal.
-
-Features:
-- notification for incoming and outgoing calls via window, sound and contact picture
-- MediaPortal Player is automatically paused and resumed on calls
-- access call lists, voice box and phone book directly in MediaPortal
-- voice box message notification in any MediaPortal screen
-- connection establishment from call list, voice box or phone book entries
-- language localization</ExtensionDescription>
- <VersionDescription />
- <DevelopmentStatus>Stable</DevelopmentStatus>
- <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
- <ReleaseDate>2011-12-09T00:23:22.128469+01:00</ReleaseDate>
- <Tags>fritzbox, fritzbox manager, callmonitor</Tags>
- <Location>..\MpeRelease\FritzBox.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>
- ...
[truncated message content] |
|
From: <hor...@us...> - 2011-12-09 13:30:48
|
Revision: 4370
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4370&view=rev
Author: horned-reaper
Date: 2011-12-09 13:30:38 +0000 (Fri, 09 Dec 2011)
Log Message:
-----------
Removed Paths:
-------------
trunk/plugins/FritzBox/FritzBox/Skin/GenericSkin/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hor...@us...> - 2011-12-09 13:30:16
|
Revision: 4369
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4369&view=rev
Author: horned-reaper
Date: 2011-12-09 13:30:05 +0000 (Fri, 09 Dec 2011)
Log Message:
-----------
Added Paths:
-----------
trunk/plugins/FritzBox/FritzBox/Skin/GenericSkin/
trunk/plugins/FritzBox/FritzBox/Skin/GenericSkin/Media/
Property Changed:
----------------
trunk/plugins/FritzBox/FritzBox/Skin/
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin
___________________________________________________________________
Deleted: svn:ignore
- GenericSkin
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hor...@us...> - 2011-12-09 13:24:49
|
Revision: 4368
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4368&view=rev
Author: horned-reaper
Date: 2011-12-09 13:24:36 +0000 (Fri, 09 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/FritzBox/FritzBox.cs
trunk/plugins/FritzBox/FritzBox/FritzBox.csproj
trunk/plugins/FritzBox/FritzBox/FritzBox.csproj.user
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Debug/DesignTimeResolveAssemblyReferences.cache
trunk/plugins/FritzBox/FritzBox/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.FritzBoxConfig.resources
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.Properties.Resources.resources
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Debug/GenerateResource.read.1.tlog
trunk/plugins/FritzBox/FritzBox/obj/Debug/GenerateResource.write.1.tlog
trunk/plugins/FritzBox/FritzBox/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.GenerateResource.Cache
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Release/ResolveAssemblyReference.cache
trunk/plugins/FritzBox/FritzBox.sln
trunk/plugins/FritzBox/MpeRelease/FritzBox.mpe1
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/ResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/ResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.csproj.GenerateResource.Cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
Added Paths:
-----------
trunk/plugins/FritzBox/Docs/
trunk/plugins/FritzBox/Docs/Ausstehend.txt
trunk/plugins/FritzBox/Docs/Changes.txt
trunk/plugins/FritzBox/Docs/Install-de.txt
trunk/plugins/FritzBox/Docs/Install.txt
trunk/plugins/FritzBox/Docs/Vorgehensweise beim Update.txt
trunk/plugins/FritzBox/FritzBox/Resources/MpeRelease/
trunk/plugins/FritzBox/FritzBox/obj/Debug/GenerateResource-ResGen.read.1.tlog
trunk/plugins/FritzBox/FritzBox/obj/Debug/GenerateResource-ResGen.read.4.tlog
trunk/plugins/FritzBox/FritzBox/obj/Debug/GenerateResource-ResGen.write.1.tlog
trunk/plugins/FritzBox/FritzBox/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/FritzBox/FritzBox/obj/Release/TempPE/
trunk/plugins/FritzBox/FritzBox/obj/Release/TempPE/Properties.Resources.Designer.cs.dll
trunk/plugins/FritzBox/MpeRelease/update.xml
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/TempPE/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/TempPE/
Removed Paths:
-------------
trunk/plugins/FritzBox/FritzBox/bin/Release/AxInterop.WMPLib.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/Bass.Net.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/BassRegistration.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/BassVisAPI.Net.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/Common.Utils.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/Core.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/Dialogs.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/DirectShowLib.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/Interop.SHDocVw.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/Interop.WMPLib.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/Ionic.Zip.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/MediaPortal.Support.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/Utils.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/edtftpnet-1.2.2.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/log4net.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/taglib-sharp.dll
trunk/plugins/FritzBox/FritzBox/docs/
trunk/plugins/FritzBox/FritzBox/obj/Debug/ResolveAssemblyReference.cache
Modified: trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat
===================================================================
--- trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat 2011-12-06 20:49:32 UTC (rev 4367)
+++ trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat 2011-12-09 13:24:36 UTC (rev 4368)
@@ -43,13 +43,11 @@
:version_done
echo.
-echo Delete old update.xml file
+echo Building MpeExtension package including update.xml...
del "..\MpeRelease\update.xml" /Q
+"%ProgramDir%\Team MediaPortal\MediaPortal\MpeMaker.exe" "..\MpeRelease\FritzBox.xmp2" /V=%version% /B /UpdateXML >> %LOG%
echo.
-echo Building MpeExtension package...
-"%ProgramDir%\Team MediaPortal\MediaPortal\MpeMaker.exe" "..\MpeRelease\FritzBox.xmp2" /V=%version% /B >> %LOG%
-
-echo.
-echo Copying installer file to releases folder
-copy "..\MpeRelease\FritzBox.mpe1" "..\releases\FritzBox_v%Version%.mpe1" /Y
+echo Move installer and update.xml files to the releases folder
+move "..\MpeRelease\FritzBox.mpe1" "..\releases\FritzBox_v%Version%.mpe1" /Y
+move "..\MpeRelease\update.xml" "..\releases\update.xml" /Y
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2011-12-06 20:49:32 UTC (rev 4367)
+++ trunk/plugins/FritzBox/Build/Build.log 2011-12-09 13:24:36 UTC (rev 4368)
@@ -1,12 +1,11 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-Unable to determine SVN version. Try with a SVN cleanup!
-Local SVN not up to date
+SVN Version: 4366
Microsoft (R) Build Engine Version 3.5.30729.1
[Microsoft .NET Framework, Version 2.0.50727.3625]
Copyright (C) Microsoft Corporation 2007. All rights reserved.
-Build started 06.12.2011 12:15:32.
+Build started 09.12.2011 00:23:17.
Project "D:\FritzBox\FritzBox.sln" on node 0 (Rebuild target(s)).
Building solution configuration "Release|Mixed Platforms".
Project "D:\FritzBox\FritzBox.sln" (1) is building "D:\FritzBox\FritzBox\FritzBox.csproj" (2) on node 0 (Rebuild target(s)).
@@ -18,7 +17,6 @@
Deleting file "D:\FritzBox\FritzBox\obj\Release\FritzBox.Properties.Resources.resources".
Deleting file "D:\FritzBox\FritzBox\obj\Release\FritzBox.FritzBoxConfig.resources".
Deleting file "D:\FritzBox\FritzBox\obj\Release\FritzBox.csproj.GenerateResource.Cache".
- Deleting file "D:\FritzBox\FritzBox\obj\Release\FritzBox.dll".
Deleting file "D:\FritzBox\FritzBox\obj\Release\FritzBox.pdb".
CoreResGen:
Processing resource file "Properties\Resources.resx" into "obj\Release\FritzBox.Properties.Resources.resources".
@@ -48,7 +46,7 @@
Consider app.config remapping of assembly "System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089" from Version "1.0.5000.0" [] to Version "2.0.0.0" [C:\WINDOWS\assembly\GAC_MSIL\System.Windows.Forms\2.0.0.0__b77a5c561934e089\System.Windows.Forms.dll] to solve conflict and get rid of warning.
Consider app.config remapping of assembly "Microsoft.VisualC, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" from Version "7.0.5000.0" [] to Version "8.0.0.0" [C:\WINDOWS\assembly\GAC_MSIL\Microsoft.VisualC\8.0.0.0__b03f5f7f11d50a3a\Microsoft.VisualC.dll] to solve conflict and get rid of warning.
Consider app.config remapping of assembly "System.Drawing, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" from Version "1.0.5000.0" [] to Version "2.0.0.0" [C:\WINDOWS\assembly\GAC_MSIL\System.Drawing\2.0.0.0__b03f5f7f11d50a3a\System.Drawing.dll] to solve conflict and get rid of warning.
-C:\WINDOWS\Microsoft.NET\Framework\v3.5\Microsoft.Common.targets : warning MSB3247: Found conflicts between different versions of the same dependent assembly.
+c:\WINDOWS\Microsoft.NET\Framework\v3.5\Microsoft.Common.targets : warning MSB3247: Found conflicts between different versions of the same dependent assembly.
Project "D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj" (3) is building "D:\FritzBox\FritzBox\FritzBox.csproj" (2:4) on node 0 (GetCopyToOutputDirectoryItems target(s)).
Project file contains ToolsVersion="4.0", which is not supported by this version of MSBuild. Treating the project as if it had ToolsVersion="3.5".
Done Building Project "D:\FritzBox\FritzBox\FritzBox.csproj" (GetCopyToOutputDirectoryItems target(s)).
@@ -74,7 +72,7 @@
Consider app.config remapping of assembly "System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089" from Version "1.0.5000.0" [] to Version "2.0.0.0" [C:\WINDOWS\assembly\GAC_MSIL\System.Windows.Forms\2.0.0.0__b77a5c561934e089\System.Windows.Forms.dll] to solve conflict and get rid of warning.
Consider app.config remapping of assembly "Microsoft.VisualC, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" from Version "7.0.5000.0" [] to Version "8.0.0.0" [C:\WINDOWS\assembly\GAC_MSIL\Microsoft.VisualC\8.0.0.0__b03f5f7f11d50a3a\Microsoft.VisualC.dll] to solve conflict and get rid of warning.
Consider app.config remapping of assembly "System.Drawing, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" from Version "1.0.5000.0" [] to Version "2.0.0.0" [C:\WINDOWS\assembly\GAC_MSIL\System.Drawing\2.0.0.0__b03f5f7f11d50a3a\System.Drawing.dll] to solve conflict and get rid of warning.
-C:\WINDOWS\Microsoft.NET\Framework\v3.5\Microsoft.Common.targets : warning MSB3247: Found conflicts between different versions of the same dependent assembly.
+c:\WINDOWS\Microsoft.NET\Framework\v3.5\Microsoft.Common.targets : warning MSB3247: Found conflicts between different versions of the same dependent assembly.
CoreResGen:
Processing resource file "DebugForm.resx" into "obj\Release\FritzBoxDebugger.DebugForm.resources".
_CopyAppConfigFile:
@@ -91,18 +89,23 @@
"D:\FritzBox\FritzBox.sln" (Rebuild target) (1) ->
"D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj" (Rebuild target) (3) ->
(ResolveAssemblyReferences target) ->
- C:\WINDOWS\Microsoft.NET\Framework\v3.5\Microsoft.Common.targets : warning MSB3247: Found conflicts between different versions of the same dependent assembly.
+ c:\WINDOWS\Microsoft.NET\Framework\v3.5\Microsoft.Common.targets : warning MSB3247: Found conflicts between different versions of the same dependent assembly.
"D:\FritzBox\FritzBox.sln" (Rebuild target) (1) ->
"D:\FritzBox\Tools\FritzBoxDebugger\FritzBoxDebugger.csproj" (Rebuild target) (4) ->
- C:\WINDOWS\Microsoft.NET\Framework\v3.5\Microsoft.Common.targets : warning MSB3247: Found conflicts between different versions of the same dependent assembly.
+ c:\WINDOWS\Microsoft.NET\Framework\v3.5\Microsoft.Common.targets : warning MSB3247: Found conflicts between different versions of the same dependent assembly.
2 Warning(s)
0 Error(s)
-Time Elapsed 00:00:02.48
+Time Elapsed 00:00:02.19
Reverting to build 0
+Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
+Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
+Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs
+Updating: D:\FritzBox\Tools\FritzBoxConfigTester\Properties\AssemblyInfo.cs
+Updating: D:\FritzBox\Tools\FritzBoxDebugger\Properties\AssemblyInfo.cs
..\FritzBox\bin\Release\FritzBox.dll
1 File(s) copied
..\FritzBox\Resources\speexdec.exe
@@ -181,6 +184,7 @@
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
36 File(s) copied
MpeMaker version: 1.2.1.0
-Build started at 12:15:37
+Build started at 00:23:22
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
+Writing UpdateXML to "update.xml"
Added: trunk/plugins/FritzBox/Docs/Ausstehend.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Ausstehend.txt (rev 0)
+++ trunk/plugins/FritzBox/Docs/Ausstehend.txt 2011-12-09 13:24:36 UTC (rev 4368)
@@ -0,0 +1,51 @@
+Testen:
+- Auto-Update
+- Zugriff auf Anrufliste und Telefonbuch nach Verbindungsabbruch
+- Cache-Funktion f\xFCr FRITZ!Box Telefonbuch
+
+Fehler beheben:
+- \xDCberschrift wird beim Klicken auf Anruflisten-Filter nicht aktualisiert (aus Telefonbuch und Anrufbeantworter)
+- MSN wird mehrfach gespeichert
+- erste MSN wird nicht im Dropdown-Men\xFC angezeigt
+- btnModus umbenennen?
+- ObjectDisposed-Exception bei Client-Stop
+- ein kleiner schwarzer Balken \xFCberdeckt das erste Zeichen oder die erste Ziffer zur H\xE4lfte
+
+Neue Funktion:
+- Schalter f\xFCr Ereignisse bei ausgehenden Anrufen
+- Umschalter zwischen FritzBox-Telefonbuch und lokalem Telefonbuch
+- Funktion zum Integrieren von Anrufer-Bildern
+- Kontextmen\xFC f\xFCr Telefonbuch
+- Wiki-Eintrag
+- Skin-Erweiterungen
+ - Anzahl der neuen Anrufe
+
+
+Anwenderw\xFCnsche:
+Scrounger, 05.12.2011:
+Was ich wirklich verdammt gerne noch h\xE4tte, w\xE4re die M\xF6glichkeit, sich auf dem Basic Home Screen die verpassten anrufe anzeigen zu lassen oder die letzten 3 Anrufe. K\xF6nntet ihr das evtl. in eine kommende Version integrieren?
+Was ich damit meine ist, dass du evtl. 3 globale Variablen (AnruferName bzw. Nr. und Bild) zur Verf\xFCgung stellen k\xF6nntest, die dann jeder Skindesigner in seinem BasicHome integrieren k\xF6nnte. Z.B. wie das beim DriveFreeSpace Plugin geht oder bei den Plugins von Micropolis.
+
+joit, 06.12.2011:
+was ich noch super f\xE4nd w\xE4re eine sch\xF6ne Mustayaluca-Integration!
+
+tor2010, 06.12.2011:
+Skinanpassung f\xFCr AVALON
+
+rogerleifert:
+F\xFCr den PurevisionHD-Skin gibt es m.W. auch noch keine Anpassung.
+Die Notifications bei eingehenden/ausgehenden Rufen funktionieren mit dem Skin problemlos.
+Wenn man allerdings in den Plugins-Bereichs geht, um z.B. die Anrufliste anzuzeigen, passiert erst mal gar nichts und dann kommt so ein ewig durchlaufender Fortschrittsbalken ohne da\xDF etwas passiert.
+
+Stefan:
+- Abspielen von Sprachnachrichten nach dem Anklicken im Home-Screen:
+add onAction handler to catch custom action from home screen button
+damit k\xF6nnten man ein Control auf dem HomeScreen erscheinen lassen
+welches beim einem neuen Anruf direkt auf abspielen geht.
+- use revers search in call monitor
+ist glaub ich auch noch nicht gemacht. damit w\xFCrden bei anrufen auch
+f\xFCr caller, die noch nicht im telefonbuch stehen, der namen angezeigt.
+Allerdings m\xFC\xDFte man das asynchron machen, weil der revers lookup zu
+lange dauert. solange kann man nicht warten mit der anzeige des calls.
+der lookup w\xFCrde im hintergrund gemachte werden und sobald der Name
+bekannt ist wird die Anzeige aktualisiert.
\ No newline at end of file
Added: trunk/plugins/FritzBox/Docs/Changes.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Changes.txt (rev 0)
+++ trunk/plugins/FritzBox/Docs/Changes.txt 2011-12-09 13:24:36 UTC (rev 4368)
@@ -0,0 +1,3 @@
+- unified logging format
+- password is not logged anymore
+- fixed display of new messages count
\ No newline at end of file
Added: trunk/plugins/FritzBox/Docs/Install-de.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Install-de.txt (rev 0)
+++ trunk/plugins/FritzBox/Docs/Install-de.txt 2011-12-09 13:24:36 UTC (rev 4368)
@@ -0,0 +1,144 @@
+Dieses Plugin ist eine Kombination aus dem fr\xFChreren Callmonitor und dem neuen FritzManager.
+
+Dieses Howto beschreibt die Installation und die Features des FritzManager Teils.
+
+Der FritzManager l\xE4dt und zeigt verschiedene Informationen der FritzBox an.
+
+Hinweis zur Installation:
+Bitte deinstalliere das alte Fritz Callmonitor Plugin zuerst. Wenn beide Plugins zusammen
+installiert sind, f\xFChrt das zu Problemen, wie z.B. das Plugin kann nicht entladen werden
+und MediaPortal bleibt h\xE4ngen.
+
+Die verschiedenen Sichten
+
+1. Die Anruferliste.
+-----------------------
+
+Wird \xFCber den CSV-Export aus dem Web-Gui der FritzBox heruntergeladen.
+
+2. Das Telefonbuch.
+------------------------
+
+Wird ebenfalls \xFCber das Web-Gui herunter geladen (Telefonbuch Export \xFCber XML).
+Zur Zeit wird nur ein Telefonbuch unterst\xFCtzt. Falls Du mehr als eins hast, wird
+wahrscheinlich nur das erste angezeigt (ungetestet).
+
+3. Die Nachrichten des Anrufbeantworters.
+--------------------------------------------
+
+Wird \xFCber das Auslesen der meta0...4 Dateien auf dem USB-Speicher der FritzBox
+erledigt. Damit das funktioniert, muss die FB so konfiguriert sein, dass Anrufbeantworter-
+nachrichten auf dem USB-Speicher abgelegt werden. Ausserdem muss der NAS Zugriff
+auf den USB-Speicher eingeschaltet sein.
+
+Als n\xE4chstes verbindet man dieses Netzlaufwerk (irgendwas wie \\fritz.box\your-usb-store)
+als lokales Laufwerk auf dem PC auf dem Mediaportal l\xE4uft. Es ist besser ein richtige Laufwerkverbindung zu nutzen, da UNC Pfade wie \\fritz.box\usb... manchmal nicht
+funktionieren.
+
+Der Pfad zu der meta0 Datei (das ist das Inhaltsverzeichnis des ersten Anrufbeantworters)
+muss dann in der Konfiguration bei 'path to voicebox' eingegeben werden.
+
+Falls keine Nachrichten angezeigt werden, wenn man auf die Nachrichten\xFCbersicht
+umschaltet, dann \xFCberpr\xFCfe bitte das Logfile (mediaportal.log muss auf debug level gesetzt
+sein), um zu sehen, ob das Plugin die metaX Dateien \xFCberhaupt findet.
+
+Bilder der Kontakte / Telefonbucheintr\xE4ge
+----------------------
+
+Alle Ansichten unterst\xFCtzen das Anzeigen von Bildern der jeweiligen Person. Wenn Du ein
+Bild gleichen Namens wie die Person in den Ordner
+<mediaportal-shared-base>\thumbs\yac legst, wird das Bild automatisch angezeigt.
+
+Weitere Features:
+
+Abspielen der Nachrichten:
+-------------------------
+
+Wird eine Nachricht angeklickt, wird sie direkt im MP abgespielt. Damit das funktioniert,
+muss die der speexdec.exe decoder ins Windows-verzeichnis kopiert werden.
+
+R\xFCckruf oder Anrufen eines Kontakts oder Anrufers:
+------------------------------------------------------------------
+
+\xD6ffne das Kontextmen\xFC eines Eintrags und w\xE4hle "Callback" dann l\xF6st das Plugin
+einen Rufruf mit Hilfe der FritzBox Funktion "Anrufassistent" aus.
+
+Versichere dich dass Du den richtigen "Dial-Port" gew\xE4hlt hast, damit die Verbindung
+auch auf dem gew\xFCnschten Telefon hergestellt wird. Falls Du nicht wei\xDFt, welcher
+Dial-Port der richtige ist, probier einfach 1,2,3 ... aus, bis Du das richtige
+Telefon gefunden hast.
+
+R\xFCckw\xE4rts-Aufl\xF6sung von Rufnummern:
+-----------------------------------
+
+Alle bekannten Nummers in der Anruferliste und in der Nachrichten\xFCbersicht werden
+mit ihren Namen aus dem Telefonbuch dargestellt.
+
+F\xFCr alle anderen Nummern wird im Hintergrund eine R\xFCckw\xE4rtssuche bei "Das \xF6rtliche"
+durchgef\xFChrt. Falls ein Name gefunden wird, wird der Listeneintrag ersetzt und f\xFCr
+das n\xE4chste mal gespeichert.
+
+Diese Funktion muss explizit in der Konfiguration eingeschaltet werden. F\xFCr Nummern,
+die ohne Vorwahl gew\xE4hlt wurden, muss deine Ortwahl eingegeben werden, sonst klappt
+die R\xFCckw\xE4rtssuche nicht.
+
+\xDCberwachen des Anrufbeantwortes mit Benachrichtigung
+----------------------------------------------------
+
+Das Plugin \xFCberwacht das Verzeichnis des Anrufbeantworters und aktualisiert die
+Ansicht, wenn eine neue Nachricht eintrifft.
+Ausserdem setzt das Plugin einige Skin-Properties, die es erlauben ein Custom-
+Control oder ein Label im Skin einzubauen, welches z.B. im Home-Screen von MP
+neue Nachrichten anzeigt.
+
+Du kannst den Home-Screen so \xE4ndern, dass ein Marker angezeigt. (sogar ein anklickbarer
+Marker ist m\xF6glich).
+
+Es gibt einige gui properties:
+#FritzManager.NewMessages
+#FritzManager.TotalMessages
+
+Werden auf ' ' (ein Leerzeichen) gesetzt, wenn keine nachricht vorhanden ist.
+Wenn eine Nachricht oder mehr vorhanden sind, dann wird '1 Nachtricht' oder '2 Nachrichten'
+gesetzt.
+
+#FritzManager.NewMessageCount: Leerstring oder Anzahl neuer Nachrichten
+#FritzManager.TotalMessageCount: Leerstring oder Anzahl aller Nachrichten
+#FritzManager.NewMessagesAvail: "true" oder "false" -> kann zum Umschalten der Sichtbarkeit
+genutzt werden
+
+Du kannst das direkt nutzen, um eine Anzeige f\xFCr den Anrufbeantworter in dein Skin zu
+integrieren. Eine Text hinzuf\xFCgen geht so:
+
+<control>
+ <type>fadelabel</type>
+ <label>#FritzManager.NewMessages</label>
+ <posX>100</posX>
+ <posY>120</posY>
+</control>
+
+In mediaportal 1.1.0 B1 and neuer, kann man sogar ein Control anzeigen oder verbergen:
+
+<control>
+ <type>button</type>
+ <visible>string.equals(#FritzManager.NewMessagesAvail,true)</visible>
+ ...
+</control>
+
+
+Bemerkungen:
+
+Die Kommunikation mit der FritzBox findet \xFCber das normale WebGui statt. Aus diesem
+Grund muss das Plugin das Password kennen, um sich einloggen zu k\xF6nnen. Aktuell wird
+nur die SID basierte Authetication unterst\xFCtzt (getestet auf 7270 und 7170).
+Falls ben\xF6tigt, kann auch die alte Methode noch integriert werden.
+
+Die URLs, die das Plugin nutzt, um das Telefonbuch und die Anruferliste herunterzuladen sind
+fest kodiert und passen zur fritz 7270 mit firmware 54.04.76.
+
+F\xFCr andere Firmware versionen und andere Fritzboxen ist nicht sichergestellt, dass alle URLs
+so funktionieren wir erwartet. Falls etwas nicht klappt schau bitte zuerst ins Logfile mediaportal.log.
+
+
+
+
\ No newline at end of file
Added: trunk/plugins/FritzBox/Docs/Install.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Install.txt (rev 0)
+++ trunk/plugins/FritzBox/Docs/Install.txt 2011-12-09 13:24:36 UTC (rev 4368)
@@ -0,0 +1,139 @@
+This plugin is a combination of the former fritz call monitor and the new fritz manager.
+
+This howto describes the installation and features of the fritz manager part.
+
+The fritz manager can load and display several informations from the fritz!box.
+
+Note on Installation:
+Please uninstall the old fritz call monitor first. It is completely included in this
+plugin. Installing both will lead to problems like media portal cannot unload the
+plugin and hangs.
+
+
+Views
+
+1. The list of callers.
+-----------------------
+
+This is done via the web admin gui (csv export).
+
+2. The fritz phone book.
+------------------------
+
+This is also done via the web admin gui (phone book export xml).
+Only one phone book is supported at this time. If you have more than one, I think
+the first one will be shown (not tested).
+
+3. The messages on the fritz voice mail box.
+--------------------------------------------
+
+This done by reading the meta0 ... 4 files on the fritz voicebox usb store.
+In order to make this work, you have configure you fritz box to use usb store
+for voicebox recordings and allows a NAS export of your usb store.
+
+Next map this export (something like \\fritz.box\your-usb-store) to a local drive
+on the pc mediaportal is running on. I prever to use a fix drive mapping, because
+in my environment unc pathes \\fritz.box\usb... sometimes don't work.
+
+Insert the path to the meta0 file (directory for the first voicebox) into
+'path to voicebox' setting of the fritz manager plugin.
+
+If no voice box items listed, when switching to voicebox view please check the
+logfile (mediaportal.log must be set to debug level) to see if the plugin finds
+the metaX files.
+
+Thumbsnail of contacts:
+----------------------
+
+All views support a thumbnail view of the selected contact. If you put an jpg
+image of the same name as show in the view in the
+<mediaportal-shared-base>\thumbs\yac folder, it will be displayed on your screen.
+
+Further feaures:
+
+Play voicebox recordings:
+-------------------------
+
+When you click a recording, it is played directly on the mediaportal pc. To
+get this running you must install the decoder speexdec.exe (comes with this
+plugin) somewhere 'on the search path' e.g. to c:\windows.
+
+Callback or Call someone from phoneBook / voicebox / callers list:
+------------------------------------------------------------------
+
+On the list view open the context menu and choose 'call back' and the plugin
+calls the selected subscriber via the fritz "call assistant" function.
+
+Be sure to configure the right dial port in the fritz manager settings to choose
+the right telephone which is connected by fritz. If you dont own which dial port
+to choose simply try 1,2,3 ...
+
+Revers lookup numbers:
+----------------------
+
+All known numbers in callers list and voicebox recordings are replaced by the
+matching name from phoneBook. For all other numbers the plugin will submit an
+invers search request to "das Oertliche" in background. If it finds a name the
+number will replaced and the name will remembered next time.
+
+You must activate this explicitly in fritz manager settings. For numbers without
+areacode, you must provide a default areacode to make the lookup for this numbers
+possible.
+
+Monitor the voicebox with notification
+--------------------------------------
+
+The plugin monitors the voicebox directory files and update the view, if a new
+message arrives. Further the plugin sets two skin properties, which allow to
+include a custom control or info label on any screen of media portal.
+
+you can modify our home screen that it shows a marker (or even a clickable marker)
+if there are new messages.
+
+There are some gui properties:
+#FritzManager.NewMessages
+#FritzManager.TotalMessages
+
+These are set to ' ' (one space) if message count is 0. If count is greather than
+0 a displayable string like '1 message' or '2 messages' is set.
+
+#FritzManager.NewMessageCount: empty string or number of new messages
+#FritzManager.TotalMessageCount: empty string or number of total messages
+#FritzManager.NewMessagesAvail: "true" or "false" -> use this to switch visibility
+
+You can use this directly in your skin file to include a voicebox display. Add a
+label control like this:
+
+<control>
+ <type>fadelabel</type>
+ <label>#FritzManager.NewMessages</label>
+ <posX>100</posX>
+ <posY>120</posY>
+</control>
+
+In mediaportal 1.1.0 B1 and newer you can even switch a control on and off:
+
+<control>
+ <type>button</type>
+ <visible>string.equals(#FritzManager.NewMessagesAvail,true)</visible>
+ ...
+</control>
+
+
+Notes:
+
+The communication to the fritz box is done via the normal web admin gui. For this
+reason the plugin has to know the password. Actually only the newer sid based
+authentication is supported (tested with 7270). If someone requests I will integrate
+the older auth methos as well.
+
+The URLs the plugin uses to download the phoneBook / callers list are fixed and tested
+with fritz 7270 firmware 54.04.76.
+
+For other firmware versions or other fritz box types there is no garantee, that all URLs
+or POST request will work as expected. If something unexpected happens please check
+the mediaportal.log logfile first.
+
+
+
+
\ No newline at end of file
Added: trunk/plugins/FritzBox/Docs/Vorgehensweise beim Update.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Vorgehensweise beim Update.txt (rev 0)
+++ trunk/plugins/FritzBox/Docs/Vorgehensweise beim Update.txt 2011-12-09 13:24:36 UTC (rev 4368)
@@ -0,0 +1,12 @@
+1. \xC4nderungen in Visual Studio vornehmen (inklusive Build)
+2. SVN Commit ausf\xFChren
+3. Build.bat ausf\xFChren
+4. Pr\xFCfen, ob Installer-Datei mit der korrekten Versionsnummer angelegt wurde. Beispiel:
+ - OK: FritzBox_v0.3.5.4364.mpe1
+ - Falsch: FritzBox_v0.3.5.0.mpe1
+5. Wenn falsch, dann Installer-Datei l\xF6schen und SVN update ausf\xFChren und Build.bat erneut ausf\xFChren
+6. \xC4nderugnen MediaPortal-Webseite hochladen
+ - Versionsnummer
+ - Change-Log-Eintrag
+ - neue Installer-Datei
+ - neue update.xml-Datei
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2011-12-06 20:49:32 UTC (rev 4367)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2011-12-09 13:24:36 UTC (rev 4368)
@@ -1023,7 +1023,7 @@
}
else
{
- if (newItems > 1) GUIPropertyManager.SetProperty("#FritzManager.TotalMessages", total + " " + GUILocalizeStrings.Get(7)); // 7 = Messages
+ if (total > 1) GUIPropertyManager.SetProperty("#FritzManager.TotalMessages", total + " " + GUILocalizeStrings.Get(7)); // 7 = Messages
else GUIPropertyManager.SetProperty("#FritzManager.TotalMessages", total + " " + GUILocalizeStrings.Get(27)); // 27 = Message
GUIPropertyManager.SetProperty("#FritzManager.TotalMessageCount", total.ToString());
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.csproj
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.csproj 2011-12-06 20:49:32 UTC (rev 4367)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.csproj 2011-12-09 13:24:36 UTC (rev 4368)
@@ -18,7 +18,7 @@
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
<SourceAnalysisOverrideSettingsFile>C:\Dokumente und Einstellungen\sr\Anwendungsdaten\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<NoStdLib>False</NoStdLib>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
@@ -43,10 +43,11 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>Full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>bin\Release\</OutputPath>
+ <OutputPath>C:\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.csproj.user
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.csproj.user 2011-12-06 20:49:32 UTC (rev 4367)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.csproj.user 2011-12-09 13:24:36 UTC (rev 4368)
@@ -12,5 +12,6 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<StartProgram>C:\Program Files\Team MediaPortal\MediaPortal\MediaPortal.exe</StartProgram>
+ <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
</PropertyGroup>
</Project>
\ No newline at end of file
Deleted: trunk/plugins/FritzBox/FritzBox/bin/Release/AxInterop.WMPLib.dll
===================================================================
(Binary files differ)
Deleted: trunk/plugins/FritzBox/FritzBox/bin/Release/Bass.Net.dll
===================================================================
(Binary files differ)
Deleted: trunk/plugins/FritzBox/FritzBox/bin/Release/BassRegistration.dll
===================================================================
(Binary files differ)
Deleted: trunk/plugins/FritzBox/FritzBox/bin/Release/BassVisAPI.Net.dll
===================================================================
(Binary files differ)
Deleted: trunk/plugins/FritzBox/FritzBox/bin/Release/Common.Utils.dll
===================================================================
(Binary files differ)
Deleted: trunk/plugins/FritzBox/FritzBox/bin/Release/Core.dll
===================================================================
(Binary files differ)
Deleted: trunk/plugins/FritzBox/FritzBox/bin/Release/Dialogs.dll
===================================================================
(Binary files differ)
Deleted: trunk/plugins/FritzBox/FritzBox/bin/Release/DirectShowLib.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Deleted: trunk/plugins/FritzBox/FritzBox/bin/Release/Interop.SHDocVw.dll
===================================================================
(Binary files differ)
Deleted: trunk/plugins/FritzBox/FritzBox/bin/Release/Interop.WMPLib.dll
===================================================================
(Binary files differ)
Deleted: trunk/plugins/FritzBox/FritzBox/bin/Release/Ionic.Zip.dll
===================================================================
(Binary files differ)
Deleted: trunk/plugins/FritzBox/FritzBox/bin/Release/MediaPortal.Support.dll
===================================================================
(Binary files differ)
Deleted: trunk/plugins/FritzBox/FritzBox/bin/Release/Utils.dll
===================================================================
(Binary files differ)
Deleted: trunk/plugins/FritzBox/FritzBox/bin/Release/edtftpnet-1.2.2.dll
===================================================================
(Binary files differ)
Deleted: trunk/plugins/FritzBox/FritzBox/bin/Release/log4net.dll
===================================================================
(Binary files differ)
Deleted: trunk/plugins/FritzBox/FritzBox/bin/Release/taglib-sharp.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/DesignTimeResolveAssemblyReferences.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.FritzBoxConfig.resources
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.Properties.Resources.resources
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.FileListAbsolute.txt
===================================================================
--- trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.FileListAbsolute.txt 2011-12-06 20:49:32 UTC (rev 4367)
+++ trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.FileListAbsolute.txt 2011-12-09 13:24:36 UTC (rev 4368)
@@ -35,10 +35,15 @@
D:\FritzBox\FritzBox\bin\Release\Interop.SHDocVw.dll
D:\FritzBox\FritzBox\bin\Release\log4net.dll
D:\FritzBox\FritzBox\bin\Release\Ionic.Zip.dll
+C:\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\FritzBox.dll
+C:\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\FritzBox.pdb
D:\FritzBox\FritzBox\obj\Debug\ResolveAssemblyReference.cache
D:\FritzBox\FritzBox\obj\Debug\FritzBox.Properties.Resources.resources
D:\FritzBox\FritzBox\obj\Debug\FritzBox.FritzBoxConfig.resources
+D:\FritzBox\FritzBox\obj\Debug\FritzBox.dll
+D:\FritzBox\FritzBox\obj\Debug\FritzBox.pdb
D:\FritzBox\FritzBox\obj\Debug\GenerateResource.read.1.tlog
D:\FritzBox\FritzBox\obj\Debug\GenerateResource.write.1.tlog
-D:\FritzBox\FritzBox\obj\Debug\FritzBox.dll
-D:\FritzBox\FritzBox\obj\Debug\FritzBox.pdb
+D:\FritzBox\FritzBox\obj\Debug\GenerateResource-ResGen.read.1.tlog
+D:\FritzBox\FritzBox\obj\Debug\GenerateResource-ResGen.read.4.tlog
+D:\FritzBox\FritzBox\obj\Debug\GenerateResource-ResGen.write.1.tlog
Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
===================================================================
(Binary files differ)
Added: trunk/plugins/FritzBox/FritzBox/obj/Debug/GenerateResource-ResGen.read.1.tlog
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/FritzBox/obj/Debug/GenerateResource-ResGen.read.1.tlog
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/FritzBox/obj/Debug/GenerateResource-ResGen.read.4.tlog
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/FritzBox/obj/Debug/GenerateResource-ResGen.read.4.tlog
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/FritzBox/obj/Debug/GenerateResource-ResGen.write.1.tlog
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/FritzBox/obj/Debug/GenerateResource-ResGen.write.1.tlog
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/GenerateResource.read.1.tlog
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/GenerateResource.write.1.tlog
===================================================================
(Binary files differ)
Deleted: trunk/plugins/FritzBox/FritzBox/obj/Debug/ResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
===================================================================
(Binary files differ)
Added: trunk/plugins/FritzBox/FritzBox/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/FritzBox/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.GenerateResource.Cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/ResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Added: trunk/plugins/FritzBox/FritzBox/obj/Release/TempPE/Properties.Resources.Designer.cs.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/FritzBox/obj/Release/TempPE/Properties.Resources.Designer.cs.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/FritzBox/FritzBox.sln
===================================================================
--- trunk/plugins/FritzBox/FritzBox.sln 2011-12-06 20:49:32 UTC (rev 4367)
+++ trunk/plugins/FritzBox/FritzBox.sln 2011-12-09 13:24:36 UTC (rev 4368)
@@ -8,10 +8,6 @@
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FritzBoxDebugger", "Tools\FritzBoxDebugger\FritzBoxDebugger.csproj", "{FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}"
EndProject
Global
- GlobalSection(SubversionScc) = preSolution
- Svn-Managed = True
- Manager = AnkhSVN - Subversion Support for Visual Studio
- EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|Mixed Platforms = Debug|Mixed Platforms
@@ -26,6 +22,7 @@
{7A458560-A537-429E-A016-1A4513CB586F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{7A458560-A537-429E-A016-1A4513CB586F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{7A458560-A537-429E-A016-1A4513CB586F}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {7A458560-A537-429E-A016-1A4513CB586F}.Debug|x86.Build.0 = Debug|Any CPU
{7A458560-A537-429E-A016-1A4513CB586F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7A458560-A537-429E-A016-1A4513CB586F}.Release|Any CPU.Build.0 = Release|Any CPU
{7A458560-A537-429E-A016-1A4513CB586F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -36,6 +33,7 @@
{5D751473-DCC5-4044-A6E3-403D97C5B9F9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{5D751473-DCC5-4044-A6E3-403D97C5B9F9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{5D751473-DCC5-4044-A6E3-403D97C5B9F9}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {5D751473-DCC5-4044-A6E3-403D97C5B9F9}.Debug|x86.Build.0 = Debug|Any CPU
{5D751473-DCC5-4044-A6E3-403D97C5B9F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5D751473-DCC5-4044-A6E3-403D97C5B9F9}.Release|Any CPU.Build.0 = Release|Any CPU
{5D751473-DCC5-4044-A6E3-403D97C5B9F9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -46,6 +44,7 @@
{FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Debug|x86.Build.0 = Debug|Any CPU
{FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Release|Any CPU.Build.0 = Release|Any CPU
{FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -55,4 +54,8 @@
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(SubversionScc) = preSolution
+ Svn-Managed = True
+ Manager = AnkhSVN - Subversion Support for Visual Studio
+ EndGlobalSection
EndGlobal
Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2011-12-06 20:49:32 UTC (rev 4367)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2011-12-09 13:24:36 UTC (rev 4368)
@@ -559,7 +559,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.0</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4366</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -582,7 +582,7 @@
<Major>0</Major>
<Minor>3</Minor>
<Build>5</Build>
- <Revision>0</Revision>
+ <Revision>4366</Revision>
</Version>
<ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box informations from MediaPortal.
@@ -596,7 +596,7 @@
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
- <ReleaseDate>2011-12-06T12:15:37.5408386+01:00</ReleaseDate>
+ <ReleaseDate>2011-12-09T00:23:22.128469+01:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
Added: trunk/plugins/FritzBox/MpeRelease/update.xml
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/update.xml (rev 0)
+++ trunk/plugins/FritzBox/MpeRelease/update.xml 2011-12-09 13:24:36 UTC (rev 4368)
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ExtensionCollection xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <Items>
+ <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="Blue3 Skin">
+ <DisplayName>Blue3 Skin</DisplayName>
+ <DefaulChecked>false</DefaulChecked>
+ <Description>Blue3 Skin</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Maya Skin">
+ <DisplayName>Maya Skin</DisplayName>
+ <DefaulChecked>false</DefaulChecked>
+ <Description>Maya Skin</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Black & White Skin">
+ <DisplayName>Black & White Skin</DisplayName>
+ <DefaulChecked>false</DefaulChecked>
+ <Description>Black & White Skin</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Default Skin">
+ <DisplayName>Default Skin</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Default Skin</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="DefaultWide Skin">
+ <DisplayName>DefaultWide Skin</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>DefaultWide Skin</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="FritzBox.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.1.0.0</MinRequiredVersion>
+ <DesignedForVersion>1.1.7.4366</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items>
+ <SubSystemItem Name="MP.Config" />
+ </Items>
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
+ <GeneralInfo>
+ <Name>FritzBox Manager</Name>
+ <Id>8cb6bbc2-5473-4a63-a8f9-e0bec7c8c81c</Id>
+ <Author>Horned Reaper, Steve, Chefkoch</Author>
+ <HomePage>http://www.team-mediaportal.com/extensions/other/fritzbox-manager-phone-manager-callmonitor-for-avm-fritz-box</HomePage>
+ <ForumPage>http://forum.team-mediaportal.com/mediaportal-plugins-47/fritz-box-manager-english-forum-103177/#post817050</ForumPage>
+ <UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=52</UpdateUrl>
+ <Version>
+ <Major>0</Major>
+ <Minor>3</Minor>
+ <Build>5</Build>
+ <Revision>4366</Revision>
+ </Version>
+ <ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box informations from MediaPortal.
+
+Features:
+- notification for incoming and outgoing calls via window, sound and contact picture
+- MediaPortal Player is automatically paused and resumed on calls
+- access call lists, voice box and phone book directly in MediaPortal
+- voice box message notification in any MediaPortal screen
+- connection establishment from call list, voice box or phone book entries
+- language localization</ExtensionDescription>
+ <VersionDescription />
+ <DevelopmentStatus>Stable</DevelopmentStatus>
+ <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
+ <ReleaseDate>2011-12-09T00:23:22.128469+01:00</ReleaseDate>
+ <Tags>fritzbox, fritzbox manager, callmonitor</Tags>
+ <Location>..\MpeRelease\FritzBox.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
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.csproj.FileListAbsolute.txt
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.csproj.FileListAbsolute.txt 2011-12-06 20:49:32 UTC (rev 4367)
+++ trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.csproj.FileListAbsolute.txt 2011-12-09 13:24:36 UTC (rev 4368)
@@ -1,6 +1,9 @@
D:\FritzBox\Tools\FritzBoxConfigTester\bin\Debug\FritzBoxConfigTester.exe.config
D:\FritzBox\Tools\FritzBoxConfigTester\bin\Debug\FritzBoxConfigTester.exe
D:\FritzBox\Tools\FritzBoxConfigTester\bin\Debug\FritzBoxConfigTester.pdb
+D:\FritzBox\Tools\FritzBoxConfigTester\obj\Debug\ResolveAssemblyReference.cache
+D:\FritzBox\Tools\FritzBoxConfigTester\obj\Debug\FritzBoxConfigTester.exe
+D:\FritzBox\Tools\FritzBoxConfigTester\obj\Debug\FritzBoxConfigTester.pdb
D:\FritzBox\Tools\FritzBoxConfigTester\bin\Debug\Core.dll
D:\FritzBox\Tools\FritzBoxConfigTester\bin\Debug\FritzBox.dll
D:\FritzBox\Tools\FritzBoxConfigTester\bin\Debug\Utils.dll
@@ -19,6 +22,3 @@
D:\FritzBox\Tools\FritzBoxConfigTester\bin\Debug\log4net.dll
D:\FritzBox\Tools\FritzBoxConfigTester\bin\Debug\Ionic.Zip.dll
D:\FritzBox\Tools\FritzBoxConfigTester\bin\Debug\FritzBox.pdb
-D:\FritzBox\Tools\FritzBoxConfigTester\obj\Debug\ResolveAssemblyReference.cache
-D:\FritzBox\Tools\FritzBoxConfigTester\obj\Debug\FritzBoxConfigTester.exe
-D:\FritzBox\Tools\FritzBoxConfigTester\obj\Debug\FritzBoxConfigTester.pdb
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/ResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Added: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/ResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csproj.FileListAbsolute.txt
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csproj.FileListAbsolute.txt 2011-12-06 20:49:32 UTC (rev 4367)
+++ trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csproj.FileListAbsolute.txt 2011-12-09 13:24:36 UTC (rev 4368)
@@ -1,6 +1,10 @@
D:\FritzBox\Tools\FritzBoxDebugger\bin\Debug\FritzBoxDebugger.exe.config
D:\FritzBox\Tools\FritzBoxDebugger\bin\Debug\FritzBoxDebugger.exe
D:\FritzBox\Tools\FritzBoxDebugger\bin\Debug\FritzBoxDebugger.pdb
+D:\FritzBox\Tools\FritzBoxDebugger\obj\Debug\ResolveAssemblyReference.cache
+D:\FritzBox\Tools\FritzBoxDebugger\obj\Debug\FritzBoxDebugger.DebugForm.resources
+D:\FritzBox\Tools\FritzBoxDebugger\obj\Debug\FritzBoxDebugger.exe
+D:\FritzBox\Tools\FritzBoxDebugger\obj\Debug\FritzBoxDebugger.pdb
D:\FritzBox\Tools\FritzBoxDebugger\bin\Debug\Core.dll
D:\FritzBox\Tools\FritzBoxDebugger\bin\Debug\FritzBox....
[truncated message content] |
|
From: <mca...@us...> - 2011-12-06 20:49:38
|
Revision: 4367
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4367&view=rev
Author: mcarter2006
Date: 2011-12-06 20:49:32 +0000 (Tue, 06 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/UKTVThumb/Normal/package/UK_Logos.mpe1
trunk/plugins/UKTVThumb/Normal/update.xml
Modified: trunk/plugins/UKTVThumb/Normal/package/UK_Logos.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/UKTVThumb/Normal/update.xml
===================================================================
--- trunk/plugins/UKTVThumb/Normal/update.xml 2011-12-06 15:15:37 UTC (rev 4366)
+++ trunk/plugins/UKTVThumb/Normal/update.xml 2011-12-06 20:49:32 UTC (rev 4367)
@@ -82,7 +82,7 @@
<Major>4</Major>
<Minor>0</Minor>
<Build>0</Build>
- <Revision>4</Revision>
+ <Revision>5</Revision>
</Version>
<ExtensionDescription>In this pack you find a large selection of UK TV and Radio channel logos. If the logo you require isn't in this pack, let me know or create your own. Please if you do make your own logos for a channel remember to share them with the rest of the community on this thread.
@@ -117,10 +117,10 @@
Big thanks go to cheetah05 for the glossy template and the core of the Freeview TV logos. Thanks also go to Mew, TritonT and jsimo01 and many others.</ExtensionDescription>
- <VersionDescription>TV and Radio logos for UK Freeview, Freesat, Sky and Virgin Media.</VersionDescription>
+ <VersionDescription>TV and Radio logos for UK Freeview & Freesat.</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/UKTVThumb/Normal/package/UK_Logos.mpe1</OnlineLocation>
- <ReleaseDate>2011-09-22T21:46:40</ReleaseDate>
+ <ReleaseDate>2011-12-06T21:46:40</ReleaseDate>
<Tags>logos, thumbs, tv, radio</Tags>
<Location>C:\Users\Matthew\Documents\TV Logos\Logos\mp-plugins\UKTVThumb\Normal\package\UK_Logos.mpe1</Location>
<Params>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hor...@us...> - 2011-12-06 15:15:49
|
Revision: 4366
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4366&view=rev
Author: horned-reaper
Date: 2011-12-06 15:15:37 +0000 (Tue, 06 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/FritzBox/FritzBox.cs
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs
trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/PhoneBook.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/BackGroundWorker.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/InversSearchOert.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/PhonebookItem.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/VBReader.cs
trunk/plugins/FritzBox/FritzBox/Settings.cs
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb
trunk/plugins/FritzBox/MpeRelease/FritzBox.mpe1
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/ResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/ResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/DebugForm.cs
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
Removed Paths:
-------------
trunk/plugins/FritzBox/FritzBox/Resources/ContactImages/
trunk/plugins/FritzBox/FritzBox/Resources/MpeRelease/
trunk/plugins/FritzBox/FritzBox/docs/Changes.txt
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2011-12-04 13:48:39 UTC (rev 4365)
+++ trunk/plugins/FritzBox/Build/Build.log 2011-12-06 15:15:37 UTC (rev 4366)
@@ -1,16 +1,12 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4364
-Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
-Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
-Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs
-Updating: D:\FritzBox\Tools\FritzBoxConfigTester\Properties\AssemblyInfo.cs
-Updating: D:\FritzBox\Tools\FritzBoxDebugger\Properties\AssemblyInfo.cs
+Unable to determine SVN version. Try with a SVN cleanup!
+Local SVN not up to date
Microsoft (R) Build Engine Version 3.5.30729.1
[Microsoft .NET Framework, Version 2.0.50727.3625]
Copyright (C) Microsoft Corporation 2007. All rights reserved.
-Build started 04.12.2011 14:47:03.
+Build started 06.12.2011 12:15:32.
Project "D:\FritzBox\FritzBox.sln" on node 0 (Rebuild target(s)).
Building solution configuration "Release|Mixed Platforms".
Project "D:\FritzBox\FritzBox.sln" (1) is building "D:\FritzBox\FritzBox\FritzBox.csproj" (2) on node 0 (Rebuild target(s)).
@@ -105,13 +101,8 @@
2 Warning(s)
0 Error(s)
-Time Elapsed 00:00:02.62
+Time Elapsed 00:00:02.48
Reverting to build 0
-Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
-Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
-Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs
-Updating: D:\FritzBox\Tools\FritzBoxConfigTester\Properties\AssemblyInfo.cs
-Updating: D:\FritzBox\Tools\FritzBoxDebugger\Properties\AssemblyInfo.cs
..\FritzBox\bin\Release\FritzBox.dll
1 File(s) copied
..\FritzBox\Resources\speexdec.exe
@@ -190,6 +181,6 @@
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
36 File(s) copied
MpeMaker version: 1.2.1.0
-Build started at 14:47:07
+Build started at 12:15:37
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2011-12-04 13:48:39 UTC (rev 4365)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2011-12-06 15:15:37 UTC (rev 4366)
@@ -46,6 +46,14 @@
PhoneBook = 2
}
+ internal enum CallListFilter
+ {
+ All = 0,
+ Incoming = 1,
+ Outgoing = 2,
+ Rejected = 3
+ }
+
[PluginIcons("FritzBox.FritzBox.png", "FritzBox.FritzBoxDisabled.png")]
public class FritzBox : GUIWindow, ISetupForm, IPlugin
{
@@ -152,7 +160,7 @@
if (!_showNotify)
{
- Log.Info("external process is running. Notify is queued and will be shown later");
+ Log.Info("External process is running. Notify is queued and will be shown later");
_notifyQueue.Add(callAction);
return;
}
@@ -182,7 +190,7 @@
}
break;
default:
- Log.Error("incorrect callAction.Type");
+ Log.Error("Incorrect callAction.Type");
break;
}
}
@@ -214,7 +222,7 @@
if (_tempNotify != null)
{
- Log.Info("yet another dialog is active. action is sent to queue");
+ Log.Info("Yet another dialog is active. Action is sent to queue");
if (_actionList.Count < Settings.MaxNotifies - 1) _actionList.Add(callAction);
@@ -269,45 +277,43 @@
#region Helper Methods
- private string GetCallerImage(string callerId)
+ private string GetCallerImage(string callerID)
{
// search image for caller
- if (Settings.ExtensiveLogging)
- Log.Info("searching image for callerId: " + callerId);
+ if (Settings.ExtensiveLogging) Log.Info("Searching image for caller ID: " + callerID);
string filePath;
// use new image path
- filePath = Utils.GetCoverArt(ContactPicturesFolder, callerId);
+ filePath = Utils.GetCoverArt(ContactPicturesFolder, callerID);
if (!String.IsNullOrEmpty(filePath)) return filePath;
- Log.Info("found image not in: " + ContactPicturesFolder);
+ Log.Info("Found no image in: " + ContactPicturesFolder);
// use old image path
- filePath = Utils.GetCoverArt(YacFolder, callerId);
+ filePath = Utils.GetCoverArt(YacFolder, callerID);
if (!String.IsNullOrEmpty(filePath)) return filePath;
- Log.Info("found image not in: " + YacFolder);
+ Log.Info("Found no image in: " + YacFolder);
return String.Empty;
}
private string GetCallerImage(Caller caller)
{
- if (caller.ID == "")
- return UnknownCallerImage;
+ if (caller.ID == "") return UnknownCallerImage;
else
{
string strImage = GetCallerImage(caller.Name);
if (File.Exists(strImage))
{
- if (Settings.ExtensiveLogging) Log.Info("found image for caller: " + strImage);
- else Log.Info("found image for caller");
+ if (Settings.ExtensiveLogging) Log.Info("Found image for caller: " + strImage);
+ else Log.Info("Found image for caller");
return strImage;
}
else
{
- Log.Info("found NO image for caller");
+ Log.Info("Found no image for caller");
return MissingCallerImage;
}
}
@@ -317,18 +323,18 @@
{
if (!Settings.FilterMSN)
{
- Log.Info("MSN filter is disabled.");
+ Log.Info("MSN filter is disabled");
return true;
}
if (Settings.MSNList.Contains(mSN))
{
- Log.Info("MSN is on list.");
+ Log.Info("MSN is on the list");
return true;
}
else
{
- Log.Info("MSN is not on list. Notify won't be shown.");
+ Log.Info("MSN is not on the list. Notify won't be shown");
return false;
}
}
@@ -337,7 +343,7 @@
{
if (!PhoneBook.Enabled)
{
- Log.Info("Phone book is disabled. Notify will be shown.");
+ Log.Info("Phone book is disabled. Notify will be shown");
return true;
}
else if (caller.Show) return true;
@@ -513,14 +519,6 @@
#region Nested type: Filter
- private enum Filter
- {
- All = 0,
- Incoming = 1,
- Outgoing = 2,
- Rejected = 3
- }
-
#endregion
#region Nested type: View
@@ -564,7 +562,7 @@
// list of call items (callers)
private List<CallItem> callItemList;
// filter on callitems used in list view
- private Filter currentFilter = Filter.All;
+ private CallListFilter currentFilter = CallListFilter.All;
// what kind of items is shown (callers, phoneBook, voicebox)
private FritzBoxGuiMode currentMode = FritzBoxGuiMode.CallList;
// state of facede view
@@ -634,7 +632,8 @@
Stop();
// persist some props for next time
- Log.Debug("DeInit called: persisting current props");
+ Log.Debug("DeInit called: Persisting current props");
+
using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml")))
{
xmlwriter.SetValue("FritzManager", "currentMode", (int)currentFilter);
@@ -653,22 +652,21 @@
{
phoneBookPath = Config.GetFolder(Config.Dir.Config) + "\\fritzmanagerPhonebook.xml";
mediaPortalLanguage = xmlreader.GetValue("gui", "language");
+
passwd = Settings.FmPassword;
- vBPath = xmlreader.GetValue("FritzManager", "vBPath");
- dialport = xmlreader.GetValue("FritzManager", "dialport");
- useInversSearch = xmlreader.GetValueAsBool("FritzManager", "useInversSearch", true);
- areacode = xmlreader.GetValue("FritzManager", "defaultAreacode");
+ vBPath = Settings.FmVBPath;
+ dialport = Settings.FmDialPort;
+ useInversSearch = Settings.FmUseInversSearch;
+ areacode = Settings.FmDefaultAreacode;
- string str = xmlreader.GetValue("FritzManager", "currentMode");
+ //currentMode = (FritzBoxGuiMode)System.Enum.Parse(typeof(FritzBoxGuiMode), Settings.FmCurrentMode);
+ //currentFilter = (CallListFilter)System.Enum.Parse(typeof(CallListFilter), Settings.FmcurrentFilter);
+
+ currentMode = Settings.FmCurrentMode;
+ currentFilter = Settings.FmCurrentFilter;
- if (str != null && str != "") currentMode = (FritzBoxGuiMode)System.Enum.Parse(typeof(FritzBoxGuiMode), str);
+ int interval = Settings.FmUpdateInterval;
- str = xmlreader.GetValue("FritzManager", "currentFilter");
-
- if (str != null && str != "") currentFilter = (Filter)System.Enum.Parse(typeof(Filter), str);
-
- int interval = xmlreader.GetValueAsInt("FritzManager", "updateInterval", 0);
-
if (interval != 0)
{
thePlugin = this;
@@ -864,7 +862,7 @@
if (item != null)
{
- Log.Debug("replacing label {0} with {1}", item.Label2, name);
+ Log.Debug("Replacing label {0} with {1}", item.Label2, name);
string l = name;
if (l.Length > 30) l = name.Substring(0, 30);
@@ -938,7 +936,7 @@
}
}
}
- else Log.Debug("no FRITZ!Box phone book items found");
+ else Log.Debug("No FRITZ!Box phone book items found");
}
/// <summary>
@@ -1059,9 +1057,9 @@
i++;
- if (currentFilter == Filter.Rejected) if (item.type != 2) continue;
- if (currentFilter == Filter.Incoming) if (item.type != 1) continue;
- if (currentFilter == Filter.Outgoing) if (item.type != 3) continue;
+ if (currentFilter == CallListFilter.Rejected) if (item.type != 2) continue;
+ if (currentFilter == CallListFilter.Incoming) if (item.type != 1) continue;
+ if (currentFilter == CallListFilter.Outgoing) if (item.type != 3) continue;
elem.Label = item.timestamp.ToString(format, ci) + " - " + item.duration.ToString("HH:mm", ci);
PhonebookItem pi = phoneBook[item.number];
@@ -1232,17 +1230,17 @@
{
switch (currentFilter)
{
- case Filter.All:
- currentFilter = Filter.Incoming;
+ case CallListFilter.All:
+ currentFilter = CallListFilter.Incoming;
break;
- case Filter.Incoming:
- currentFilter = Filter.Outgoing;
+ case CallListFilter.Incoming:
+ currentFilter = CallListFilter.Outgoing;
break;
- case Filter.Outgoing:
- currentFilter = Filter.Rejected;
+ case CallListFilter.Outgoing:
+ currentFilter = CallListFilter.Rejected;
break;
- case Filter.Rejected:
- currentFilter = Filter.All;
+ case CallListFilter.Rejected:
+ currentFilter = CallListFilter.All;
break;
}
@@ -1351,16 +1349,16 @@
switch (currentFilter)
{
- case Filter.All:
+ case CallListFilter.All:
strLine = GUILocalizeStrings.Get(14); // 14 = All
break;
- case Filter.Incoming:
+ case CallListFilter.Incoming:
strLine = GUILocalizeStrings.Get(15); // 15 = Incoming
break;
- case Filter.Outgoing:
+ case CallListFilter.Outgoing:
strLine = GUILocalizeStrings.Get(16); // 16 = Outgoing
break;
- case Filter.Rejected:
+ case CallListFilter.Rejected:
strLine = GUILocalizeStrings.Get(17); // 17 = Rejected
break;
}
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2011-12-04 13:48:39 UTC (rev 4365)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2011-12-06 15:15:37 UTC (rev 4366)
@@ -308,29 +308,29 @@
FritzBoxClient.LogEvent += OnLogAction;
- Log.Debug("FRITZ!Box: Connection test: Start");
+ Log.Debug("Connection test: Start");
// set current settings
FritzBoxClient.Address = textBoxAddress.Text;
FritzBoxClient.Port = (int)numericUpDownPort.Value;
// port test
- Log.Debug("FRITZ!Box: Connection test: Start port test");
+ Log.Debug("Connection test: Start port test");
if (FritzBoxClient.TestConnection())
{
// if port test was successful start client
- Log.Debug("FRITZ!Box: Connection test: Start client");
+ Log.Debug("Connection test: Start client");
FritzBoxClient.StartClient();
FritzBoxClient.LogEvent -= OnLogAction;
// stopping client
- Log.Debug("FRITZ!Box: Connection test: Stop client");
+ Log.Debug("Connection test: Stop client");
FritzBoxClient.StopClient();
}
else FritzBoxClient.LogEvent -= OnLogAction;
- Log.Debug("FRITZ!Box: Connection test: End");
+ Log.Debug("Connection test: End");
}
#endregion
@@ -418,10 +418,7 @@
SetTextCallback d = OnLogAction;
Invoke(d, new object[] { logLevel, logMessage });
}
- else
- {
- labelHelp.Text += logMessage + Environment.NewLine;
- }
+ else labelHelp.Text += logMessage + Environment.NewLine;
}
#region Nested type: SetTextCallback
Modified: trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs 2011-12-04 13:48:39 UTC (rev 4365)
+++ trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs 2011-12-06 15:15:37 UTC (rev 4366)
@@ -29,378 +29,378 @@
namespace FritzBox
{
- public static class FritzBoxClient
- {
- #region class StateObject
-
- public enum LogLevel
+ public static class FritzBoxClient
{
- Info,
- Warning,
- Error,
- Debug,
- HeavyDebug,
- }
+ #region class StateObject
- /// <summary>
- /// State object for receiving data from remote device.
- /// </summary>
- private class StateObject
- {
- /// <summary>
- /// Size of receive buffer.
- /// </summary>
- public const int BufferSize = 256;
+ public enum LogLevel
+ {
+ Info,
+ Warning,
+ Error,
+ Debug,
+ HeavyDebug,
+ }
- /// <summary>
- /// Receive buffer.
- /// </summary>
- public readonly byte[] buffer = new byte[BufferSize];
+ /// <summary>
+ /// State object for receiving data from remote device.
+ /// </summary>
+ private class StateObject
+ {
+ /// <summary>
+ /// Size of receive buffer.
+ /// </summary>
+ public const int BufferSize = 256;
- /// <summary>
- /// Received data string.
- /// </summary>
- public StringBuilder sb = new StringBuilder();
+ /// <summary>
+ /// Receive buffer.
+ /// </summary>
+ public readonly byte[] buffer = new byte[BufferSize];
- /// <summary>
- /// Client socket.
- /// </summary>
- public Socket workSocket;
- }
+ /// <summary>
+ /// Received data string.
+ /// </summary>
+ public StringBuilder sb = new StringBuilder();
- #endregion
+ /// <summary>
+ /// Client socket.
+ /// </summary>
+ public Socket workSocket;
+ }
- #region Delegates
+ #endregion
- public delegate void CallEventHandler(CallAction callAction);
+ #region Delegates
- public delegate void LogEventHandler(LogLevel logLevel, string logMessage);
+ public delegate void CallEventHandler(CallAction callAction);
- #endregion
+ public delegate void LogEventHandler(LogLevel logLevel, string logMessage);
- private static readonly TimeSpan minConnectWaitTime = new TimeSpan(0, 10, 0);
+ #endregion
- private static Socket _client;
- private static DateTime _connectionFailed;
+ private static readonly TimeSpan minConnectWaitTime = new TimeSpan(0, 10, 0);
- #region Properties
+ private static Socket _client;
+ private static DateTime _connectionFailed;
- static FritzBoxClient()
- {
- Address = "fritz.box";
- Port = 1012;
- }
+ #region Properties
- public static string Address { get; set; }
- public static int Port { get; set; }
+ static FritzBoxClient()
+ {
+ Address = "fritz.box";
+ Port = 1012;
+ }
- #endregion
+ public static string Address { get; set; }
+ public static int Port { get; set; }
- public static event CallEventHandler CallEvent;
+ #endregion
- public static event LogEventHandler LogEvent;
+ public static event CallEventHandler CallEvent;
- #region Public methods
+ public static event LogEventHandler LogEvent;
- public static void StartClient()
- {
- try
- {
- _connectionFailed = DateTime.MinValue;
+ #region Public methods
- Thread thread = new Thread(Connect);
- thread.Start();
- }
- catch (Exception ex)
- {
- Log(ex);
- }
- }
+ public static void StartClient()
+ {
+ try
+ {
+ _connectionFailed = DateTime.MinValue;
- public static void StopClient()
- {
- try
- {
- if (_client != null)
+ Thread thread = new Thread(Connect);
+ thread.Start();
+ }
+ catch (Exception ex)
+ {
+ Log(ex);
+ }
+ }
+
+ public static void StopClient()
{
- // Release the socket.
- _client.Shutdown(SocketShutdown.Both);
- _client.Close();
+ try
+ {
+ if (_client != null)
+ {
+ // Release the socket.
+ _client.Shutdown(SocketShutdown.Both);
+ _client.Close();
+ }
+ }
+ catch (Exception ex)
+ {
+ Log(LogLevel.Error, "Error on stopping client: " + ex.Message);
+ }
}
- }
- catch (Exception ex)
- {
- Log(LogLevel.Error, "Error on stopping client: " + ex.Message);
- }
- }
- public static bool TestConnection()
- {
- try
+ public static bool TestConnection()
{
- Log(LogLevel.Info, "Testing address ({0}) and port ({1})", Address, Port);
+ try
+ {
+ Log(LogLevel.Info, "Testing address ({0}) and port ({1})", Address, Port);
- TcpClient tcpClient;
+ TcpClient tcpClient;
- try
- {
- tcpClient = new TcpClient(Address, Port);
+ try
+ {
+ tcpClient = new TcpClient(Address, Port);
+ }
+ catch (Exception)
+ {
+ Log(LogLevel.Error,
+ "Address & port test failed! :(" + Environment.NewLine +
+ " Did you enter correct connection information?" + Environment.NewLine +
+ " Are you using the latest FRITZ!Box firmware?" + Environment.NewLine +
+ " Did you open the port on your FRITZ!Box? If not call #96*5* from your phone.");
+
+ return false;
+ }
+
+ tcpClient.Close();
+
+ Log(LogLevel.Info, "Testing address & port succeeded.");
+
+ return true;
}
- catch (Exception)
+ catch (Exception ex)
{
- Log(LogLevel.Error,
- "Address & port test failed! :(" + Environment.NewLine +
- " Did you enter correct connection information?" + Environment.NewLine +
- " Are you using the latest FRITZ!Box firmware?" + Environment.NewLine +
- " Did you open the port on your FRITZ!Box? If not call #96*5* from your phone.");
+ Log(ex);
return false;
}
+ }
- tcpClient.Close();
+ #endregion
- Log(LogLevel.Info, "Testing address & port succeeded.");
+ #region Private methods
- return true;
- }
- catch (Exception ex)
+ private static void ReConnect()
{
- Log(ex);
+ try
+ {
+ _connectionFailed = DateTime.Now;
- return false;
+ Thread thread = new Thread(Connect);
+ thread.Start();
+ }
+ catch (Exception ex)
+ {
+ Log(ex);
+ }
}
- }
- #endregion
+ private static void Connect()
+ {
+ // Enforce a minimum wait time between connects.
+ DateTime nextconnect = _connectionFailed.Add(minConnectWaitTime);
- #region Private methods
+ if (DateTime.Now < nextconnect)
+ {
+ TimeSpan waittime = nextconnect - DateTime.Now;
+ Log(LogLevel.Debug, "Avoiding too much reconnects, sleeping until {0}", nextconnect.ToString());
+ Thread.Sleep(waittime);
+ }
- private static void ReConnect()
- {
- try
- {
- _connectionFailed = DateTime.Now;
+ try
+ {
+ //Establish the remote endpoint for the socket.
+ //The name of the
+ //remote device is "host.contoso.com".
+ IPHostEntry ipHostInfo = Dns.GetHostEntry(Address);
+ IPAddress ipAddress = ipHostInfo.AddressList[0];
+ IPEndPoint remoteEP = new IPEndPoint(ipAddress, Port);
- Thread thread = new Thread(Connect);
- thread.Start();
- }
- catch (Exception ex)
- {
- Log(ex);
- }
- }
+ // Create a TCP/IP socket.
+ _client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
- private static void Connect()
- {
- // Enforce a minimum wait time between connects.
- DateTime nextconnect = _connectionFailed.Add(minConnectWaitTime);
- if (DateTime.Now < nextconnect)
- {
- TimeSpan waittime = nextconnect - DateTime.Now;
- Log(LogLevel.Debug, "Avoiding too much reconnects, sleeping until {0}.", nextconnect.ToString());
- Thread.Sleep(waittime);
- }
+ // Connect to the remote endpoint.
+ _client.BeginConnect(Address, Port, ConnectCallback, _client);
+ }
+ catch (SocketException)
+ {
+ Log(LogLevel.Debug, "Connect: SocketException");
+ Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect.");
+ ReConnect();
+ }
+ catch (Exception ex)
+ {
+ Log(ex);
+ }
+ }
- try
- {
- //Establish the remote endpoint for the socket.
- //The name of the
- //remote device is "host.contoso.com".
- IPHostEntry ipHostInfo = Dns.GetHostEntry(Address);
- IPAddress ipAddress = ipHostInfo.AddressList[0];
- IPEndPoint remoteEP = new IPEndPoint(ipAddress, Port);
+ private static void ConnectCallback(IAsyncResult ar)
+ {
+ try
+ {
+ // Retrieve the socket from the state object.
+ Socket client = (Socket)ar.AsyncState;
- // Create a TCP/IP socket.
- _client = new Socket(AddressFamily.InterNetwork,
- SocketType.Stream, ProtocolType.Tcp);
+ // Complete the connection.
+ client.EndConnect(ar);
- // Connect to the remote endpoint.
- _client.BeginConnect(Address, Port, ConnectCallback, _client);
- }
- catch (SocketException)
- {
- Log(LogLevel.Debug, "Connect: SocketException");
- Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect.");
- ReConnect();
- }
- catch (Exception ex)
- {
- Log(ex);
- }
- }
+ Log(LogLevel.Debug, "Socket connected to {0}",
+ client.RemoteEndPoint.ToString());
- private static void ConnectCallback(IAsyncResult ar)
- {
- try
- {
- // Retrieve the socket from the state object.
- Socket client = (Socket) ar.AsyncState;
+ Receive(client);
+ }
+ catch (SocketException)
+ {
+ Log(LogLevel.Debug, "Connect: SocketException");
+ Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect.");
+ ReConnect();
+ }
+ catch (Exception ex)
+ {
+ Log(ex);
+ }
+ }
- // Complete the connection.
- client.EndConnect(ar);
- Log(LogLevel.Debug, "Socket connected to {0}",
- client.RemoteEndPoint.ToString());
+ private static void Receive(Socket client)
+ {
+ try
+ {
+ // Create the state object.
+ //Log(LogLevel.HeavyDebug, "StateObject state = new StateObject();");
+ StateObject state = new StateObject();
+ //Log(LogLevel.HeavyDebug, "state.workSocket = client;");
+ state.workSocket = client;
- Receive(client);
- }
- catch (SocketException)
- {
- Log(LogLevel.Debug, "Connect: SocketException");
- Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect.");
- ReConnect();
- }
- catch (Exception ex)
- {
- Log(ex);
- }
- }
+ //Log(LogLevel.HeavyDebug, "Available {0}", client.Available);
+ //Log(LogLevel.HeavyDebug, "Connected {0}", client.Connected);
+ //Log(LogLevel.HeavyDebug, "IsBound {0}", client.IsBound);
+ //Log(LogLevel.HeavyDebug, "{0}", client.Connected);
+ // Begin receiving the data from the remote device.
+ //Log(LogLevel.HeavyDebug, "client.BeginReceive(state.buffer, 0, StateObject.BufferSize, 0,");
+ client.BeginReceive(state.buffer, 0, StateObject.BufferSize, 0, new AsyncCallback(ReceiveCallback), state);
+ }
+ catch (SocketException ex)
+ {
+ Log(LogLevel.HeavyDebug, "{0}", ex.NativeErrorCode);
+ Log(LogLevel.HeavyDebug, "{0}", ex.SocketErrorCode);
+ Log(LogLevel.HeavyDebug, "{0}", ex.Data);
+ Log(LogLevel.HeavyDebug, "{0}", ex.ErrorCode);
+ Log(LogLevel.HeavyDebug, "{0}", ex.InnerException);
+ Log(LogLevel.HeavyDebug, ex.Message);
+ Log(LogLevel.HeavyDebug, ex.Source);
+ Log(LogLevel.HeavyDebug, ex.StackTrace);
+ Log(LogLevel.Debug, "Receive: SocketException");
+ Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect.");
+ ReConnect();
+ }
+ catch (Exception ex)
+ {
+ Log(ex);
+ }
+ }
- private static void Receive(Socket client)
- {
- try
- {
- // Create the state object.
- //Log(LogLevel.HeavyDebug, "StateObject state = new StateObject();");
- StateObject state = new StateObject();
- //Log(LogLevel.HeavyDebug, "state.workSocket = client;");
- state.workSocket = client;
+ private static void ReceiveCallback(IAsyncResult ar)
+ {
+ try
+ {
+ // Retrieve the state object and the client socket
+ // from the asynchronous state object.
+ StateObject state = (StateObject)ar.AsyncState;
+ Socket client = state.workSocket;
- //Log(LogLevel.HeavyDebug, "Available {0}", client.Available);
- //Log(LogLevel.HeavyDebug, "Connected {0}", client.Connected);
- //Log(LogLevel.HeavyDebug, "IsBound {0}", client.IsBound);
- //Log(LogLevel.HeavyDebug, "{0}", client.Connected);
+ // Read data from the remote device.
+ int bytesRead = client.EndReceive(ar);
- // Begin receiving the data from the remote device.
- //Log(LogLevel.HeavyDebug, "client.BeginReceive(state.buffer, 0, StateObject.BufferSize, 0,");
- client.BeginReceive(state.buffer, 0, StateObject.BufferSize, 0,
- new AsyncCallback(ReceiveCallback), state);
- }
- catch (SocketException ex)
- {
- Log(LogLevel.HeavyDebug, "{0}", ex.NativeErrorCode);
- Log(LogLevel.HeavyDebug, "{0}", ex.SocketErrorCode);
- Log(LogLevel.HeavyDebug, "{0}", ex.Data);
- Log(LogLevel.HeavyDebug, "{0}", ex.ErrorCode);
- Log(LogLevel.HeavyDebug, "{0}", ex.InnerException);
- Log(LogLevel.HeavyDebug, ex.Message);
- Log(LogLevel.HeavyDebug, ex.Source);
- Log(LogLevel.HeavyDebug, ex.StackTrace);
- Log(LogLevel.Debug, "Receive: SocketException");
- Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect.");
- ReConnect();
- }
- catch (Exception ex)
- {
- Log(ex);
- }
- }
+ if (bytesRead > 0)
+ {
+ // There might be more data, so store the data received so far.
+ string data = Encoding.ASCII.GetString(state.buffer, 0, bytesRead);
+ Log(LogLevel.HeavyDebug, "ReceiveCallback : received data: {0}", data);
+ //Log.Debug();"ReceiveCallback : received data: {0}", data
- private static void ReceiveCallback(IAsyncResult ar)
- {
- try
- {
- // Retrieve the state object and the client socket
- // from the asynchronous state object.
- StateObject state = (StateObject)ar.AsyncState;
- Socket client = state.workSocket;
+ // data-stream can be in following format:
+ // incoming calls: DateTime;RING;ConnectionID;CallerID;MSN;??POTS??;
+ // outgoing calls: DateTime;CALL;ConnectionID;??Nebenstelle??;MSN;CallerID;??POTS??;
+ // connection started: DateTime;CONNECT;ConnectionID;??Nebenstelle??;CallerID;
+ // connection closed: DateTime;DISCONNECT;ConnectionID;ConnectedTime;
- // Read data from the remote device.
- int bytesRead = client.EndReceive(ar);
+ // DateTime format:
+ // 12.12.06 12:12:12
+ // dd.MM.yy hh:mm:ss
- if (bytesRead > 0)
- {
- // There might be more data, so store the data received so far.
- string data = Encoding.ASCII.GetString(state.buffer, 0, bytesRead);
- Log(LogLevel.HeavyDebug, "ReceiveCallback : received data: {0}", data);
- //Log.Debug();"ReceiveCallback : received data: {0}", data
+ string[] strList = data.Trim().Split(';');
+ CallAction callAction = new CallAction();
- // data-stream can be in following format:
- // incoming calls: DateTime;RING;ConnectionID;CallerID;MSN;??POTS??;
- // outgoing calls: DateTime;CALL;ConnectionID;??Nebenstelle??;MSN;CallerID;??POTS??;
- // connection started: DateTime;CONNECT;ConnectionID;??Nebenstelle??;CallerID;
- // connection closed: DateTime;DISCONNECT;ConnectionID;ConnectedTime;
+ // time when action happens
+ callAction.Time = DateTime.Parse(strList[0], new CultureInfo("de-DE", false));
- // DateTime format:
- // 12.12.06 12:12:12
- // dd.MM.yy hh:mm:ss
+ // set the type of the callAction
+ switch (strList[1])
+ {
+ case "RING":
+ callAction.Type = CallAction.CallType.Incoming;
- string[] strList = data.Trim().Split(';');
- CallAction callAction = new CallAction();
+ // sets the callerID
+ callAction.Caller.ID = strList[3];
+ callAction.MSN = strList[4];
+ break;
+ case "CALL":
+ callAction.Type = CallAction.CallType.Outgoing;
- // time when action happens
- callAction.Time = DateTime.Parse(strList[0], new CultureInfo("de-DE", false));
+ // sets the callerID
+ callAction.Caller.ID = strList[5];
+ callAction.MSN = strList[4];
+ break;
+ case "CONNECT":
+ callAction.Type = CallAction.CallType.ConnectionStarted;
- // set the type of the callAction
- switch (strList[1])
+ // sets the callerID
+ callAction.Caller.ID = strList[4];
+ break;
+ case "DISCONNECT":
+ callAction.Type = CallAction.CallType.ConnectionClosed;
+ break;
+ default:
+ callAction = null;
+ break;
+ }
+
+ // continue to listen to the fb
+ client.BeginReceive(state.buffer, 0, StateObject.BufferSize, 0, new AsyncCallback(ReceiveCallback), state);
+
+ if (CallEvent != null) CallEvent(callAction);
+ }
+ else
{
- case "RING":
- callAction.Type = CallAction.CallType.Incoming;
- // sets the callerID
- callAction.Caller.ID = strList[3];
- callAction.MSN = strList[4];
- break;
- case "CALL":
- callAction.Type = CallAction.CallType.Outgoing;
- // sets the callerID
- callAction.Caller.ID = strList[5];
- callAction.MSN = strList[4];
- break;
- case "CONNECT":
- callAction.Type = CallAction.CallType.ConnectionStarted;
- // sets the callerID
- callAction.Caller.ID = strList[4];
- break;
- case "DISCONNECT":
- callAction.Type = CallAction.CallType.ConnectionClosed;
- break;
- default:
- callAction = null;
- break;
+ Log(LogLevel.Debug, "ReceiveCallback: No bytes to read");
+ Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect.");
+ ReConnect();
}
-
- // continue to listen to the fb
- client.BeginReceive(state.buffer, 0, StateObject.BufferSize, 0, new AsyncCallback(ReceiveCallback), state);
-
- if (CallEvent != null) CallEvent(callAction);
}
- else
+ catch (ObjectDisposedException)
{
- Log(LogLevel.Debug, "ReceiveCallback: no bytes to read");
+ Log(LogLevel.Debug, "ReceiveCallback: ObjectDisposedException");
+ Log(LogLevel.Info, "FRITZ!BOX connection shut down.");
+ }
+ catch (SocketException)
+ {
+ Log(LogLevel.Debug, "ReceiveCallback: SocketException");
Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect.");
ReConnect();
}
+ catch (Exception ex)
+ {
+ Log(ex);
+ }
}
- catch (ObjectDisposedException)
+
+ private static void Log(LogLevel logLevel, string format, params object[] arg)
{
- Log(LogLevel.Debug, "ReceiveCallback: ObjectDisposedException");
- Log(LogLevel.Info, "FRITZ!BOX connection shut down.");
+ if (LogEvent != null) LogEvent(logLevel, String.Format(format, arg));
}
- catch (SocketException)
+
+ private static void Log(Exception ex)
{
- Log(LogLevel.Debug, "ReceiveCallback: SocketException");
- Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect.");
- ReConnect();
+ if (LogEvent != null) LogEvent(LogLevel.Error, ex.ToString());
}
- catch (Exception ex)
- {
- Log(ex);
- }
- }
- private static void Log(LogLevel logLevel, string format, params object[] arg)
- {
- if (LogEvent != null)
- LogEvent(logLevel, String.Format(format, arg));
+ #endregion
}
-
- private static void Log(Exception ex)
- {
- if (LogEvent != null)
- LogEvent(LogLevel.Error, ex.ToString());
- }
-
- #endregion
- }
}
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/PhoneBook.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/PhoneBook.cs 2011-12-04 13:48:39 UTC (rev 4365)
+++ trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/PhoneBook.cs 2011-12-06 15:15:37 UTC (rev 4366)
@@ -61,6 +61,7 @@
return _contacts;
}
+
set { _contacts = value; }
}
@@ -202,7 +203,7 @@
catch (Exception e)
{
// Let the user know what went wrong.
- Log.Error("the file could not be read: {0}", e.Message);
+ Log.Error("The file could not be read: {0}", e.Message);
return 0;
}
}
@@ -219,7 +220,7 @@
PhonebookItem item = phonebook[caller.ID];
if (item != null)
{
- Log.Info("caller is identified by FritzBox Manager internal phone book as {0}", item.name);
+ Log.Info("Caller is identified by FritzBox Manager internal phone book as {0}", item.name);
return new Caller(caller.ID, item.name, true);
}
return GetCaller(caller);
@@ -235,7 +236,7 @@
if (Contacts.Count == 0)
{
- Log.Info("phone book is empty. Caller is added to the phone book");
+ Log.Info("Phone book is empty. Caller is added to the phone book");
Contacts.Add(caller);
}
else
@@ -249,7 +250,7 @@
if (contact.ID == caller.ID)
{
- Log.Info("caller is identified by phone book as {0}", contact.Name);
+ Log.Info("Caller is identified by phone book as {0}", contact.Name);
caller = contact;
foundCaller = true;
}
@@ -283,7 +284,7 @@
}
catch
{
- Log.Info("country and area code could not be queried from Windows");
+ Log.Info("Country and area code could not be queried from Windows. MSN only works limited");
}
}
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/BackGroundWorker.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/BackGroundWorker.cs 2011-12-04 13:48:39 UTC (rev 4365)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/BackGroundWorker.cs 2011-12-06 15:15:37 UTC (rev 4366)
@@ -32,7 +32,7 @@
public void Run()
{
- Log.Debug("starting");
+ Log.Debug("Starting");
while (running)
{
@@ -41,7 +41,7 @@
switch (task.action)
{
case Task.TaskAction.LoadCallItems:
- Log.Debug("loading call items");
+ Log.Debug("Loading call items");
byte[] data = fritz.loadCallListData(false);
@@ -54,7 +54,7 @@
string info = "";
string name = number;
- Log.Debug("invers lookup for{0}", number);
+ Log.Debug("Inverse lookup for {0}", number);
if (plugin.phoneBook[number].name != null) name = plugin.phoneBook[number].name;
else name = search.LookupNumber((string)task.param[0], out info);
@@ -68,7 +68,7 @@
public void stop()
{
- Log.Debug("stopping");
+ Log.Debug("Stopping");
running = false;
}
}
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs 2011-12-04 13:48:39 UTC (rev 4365)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs 2011-12-06 15:15:37 UTC (rev 4366)
@@ -1,10 +1,4 @@
-/*
- * Erstellt mit SharpDevelop.
- * Benutzer: srinke
- * Datum: 11.12.2009
- * Zeit: 08:01
- */
-using System;
+using System;
using System.IO;
using System.Net;
using System.Security.Cryptography;
@@ -20,7 +14,7 @@
{
private string hostname;
private string baseurl;
- private bool loggedIn;
+ private bool _loggedIn;
private string passwd;
private string cacheDir;
private string cacheFileName;
@@ -41,43 +35,52 @@
this.dialport = dialport;
}
- public bool alreadyLoggedIn()
+ public bool loggedIn
{
- return loggedIn;
+ get
+ {
+ return _loggedIn;
+ }
}
- public bool login()
+ public void login()
{
- if (alreadyLoggedIn()) return true;
- string challenge = getChallenge();
- string md5in = challenge + "-" + passwd;
- MD5 md5 = new MD5CryptoServiceProvider();
- byte[] hash = md5.ComputeHash(Encoding.GetEncoding("UTF-16LE").GetBytes(md5in));
- string response = challenge + "-" + BitConverter.ToString(hash).Replace("-", string.Empty).ToLower();
- string sid = PostRequest(baseurl, "login:command/response=" + response + "&getpage=../html/de/menus/menu2.html");
+ if (!_loggedIn)
+ {
+ string challenge = getChallenge();
+ string md5in = challenge + "-" + passwd;
+ MD5 md5 = new MD5CryptoServiceProvider();
+ byte[] hash = md5.ComputeHash(Encoding.GetEncoding("UTF-16LE").GetBytes(md5in));
+ string response = challenge + "-" + BitConverter.ToString(hash).Replace("-", string.Empty).ToLower();
+ string sid = PostRequest(baseurl, "login:command/response=" + response + "&getpage=../html/de/menus/menu2.html");
- if (sid == "") return false;
-
- // name="sid" value=""
- Regex exp = new Regex("name=\"sid\" value=\"([0-9a-z]*)\"", RegexOptions.Multiline);
- MatchCollection matchList = exp.Matches(sid);
- sid = matchList[0].Groups[1].Value;
- this.sid = sid;
- loggedIn = true;
- return sid != null;
+ if (sid != "")
+ {
+ // name="sid" value=""
+ Regex exp = new Regex("name=\"sid\" value=\"([0-9a-z]*)\"", RegexOptions.Multiline);
+ MatchCollection matchList = exp.Matches(sid);
+ sid = matchList[0].Groups[1].Value;
+ this.sid = sid;
+ _loggedIn = sid != null;
+ }
+ else _loggedIn = false;
+ }
}
public void keepAlive()
{
- if (!loggedIn) return;
+ if (!_loggedIn) return;
+
string refreshUrl = baseurl + "?sid=" + sid + "&getpage=../html/de/menus/menu2.html";
WebClient client = new WebClient();
+
client.DownloadData(refreshUrl);
}
public void refresh()
{
- if (!loggedIn) login();
+ if (!_loggedIn) login();
+
TimeSpan ts = (DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0));
long unixTime = Convert.ToInt32(ts.TotalSeconds);
string refreshUrl = baseurl + "?sid=" + sid +
@@ -88,7 +91,8 @@
//"&logger=settings/filter=2"+
//"&time=settings/time="+Convert.ToString(unixTime)+",-0";
- Log.Debug("sending refresh request, time=" + Convert.ToString(unixTime));
+ Log.Debug("Sending refresh request, time = " + Convert.ToString(unixTime));
+
try
{
WebClient client = new WebClient();
@@ -96,7 +100,8 @@
}
catch (Exception e)
{
- Log.Debug("no connection to FritzBox: " + e.Message);
+ Log.Debug("No connection to FRITZ!Box: " + e.Message);
+ _loggedIn = false;
}
}
@@ -104,40 +109,43 @@
{
byte[] result = { 0 } ;
- if (!loggedIn) login();
+ if (!_loggedIn) login();
- if (alreadyLoggedIn() && (forceReload || DateTime.Now.Subtract(lastCallListUpdate).Minutes > 2))
+ if (!String.IsNullOrEmpty(passwd) && (forceReload || DateTime.Now.Subtract(lastCallListUpdate).Minutes > 2))
{
- // direct download from FRITZ!Box
- Log.Debug("trying to load call list directly from FRITZ!Box...");
-
- try
+ if (_loggedIn)
{
- result = loadCallListDataInternal();
- }
- catch
- {
- Log.Debug("could not load call list from FRITZ!Box");
- }
- }
- else
- {
- // download from local cache
- Log.Debug("trying to load call list from local cache...");
+ // direct download from FRITZ!Box
+ Log.Debug("Trying to load call list directly from FRITZ!Box");
- lock (cacheSync)
- {
try
{
- if (File.Exists(cacheFileName)) result = File.ReadAllBytes(cacheFileName);
+ result = loadCallListDataInternal();
}
catch
{
- Log.Debug("locally cached call list could not be loaded");
+ Log.Debug("Could not load call list from FRITZ!Box");
}
}
+ else
+ {
+ // download from local cache
+ Log.Debug("Trying to load call list from local cache");
- //if (result == null) result = loadCallListDataInternal();
+ lock (cacheSync)
+ {
+ try
+ {
+ if (File.Exists(cacheFileName)) result = File.ReadAllBytes(cacheFileName);
+ }
+ catch
+ {
+ Log.Debug("Locally cached call list could not be loaded");
+ }
+ }
+
+ //if (result == null) result = loadCallListDataInternal();
+ }
}
return result;
@@ -145,9 +153,9 @@
public string loadPhoneBook()
{
- if (!loggedIn) login();
+ if (!_loggedIn) login();
- if (alreadyLoggedIn())
+ if (_loggedIn)
{
try
{
@@ -175,13 +183,13 @@
}
catch
{
- Log.Debug("error on loading phone book");
+ Log.Debug("Error on loading phone book");
return "";
}
}
else
{
- Log.Debug("no connection to FRITZ!Box. Phone book cannot be loaded");
+ Log.Debug("No connection to FRITZ!Box. Phone book cannot be loaded");
return "";
}
}
@@ -280,7 +288,7 @@
}
catch (Exception e)
{
- Log.Debug("no connection to FritzBox: " + e.Message);
+ Log.Debug("No connection to FRITZ!Box: " + e.Message);
return "";
}
}
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/InversSearchOert.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/InversSearchOert.cs 2011-12-04 13:48:39 UTC (rev 4365)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/InversSearchOert.cs 2011-12-06 15:15:37 UTC (rev 4366)
@@ -34,10 +34,7 @@
string lookup = nr;
info = "";
string response = null;
- if (!nr.StartsWith("0"))
- {
- lookup = defaultAreacode + nr;
- }
+ if (!nr.StartsWith("0")) lookup = defaultAreacode + nr;
try
{
WebClient client = new WebClient();
@@ -51,13 +48,13 @@
}
catch (Exception e)
{
- Log.Debug("exception {0}", e);
+ Log.Debug("Exception: {0}", e);
return name;
}
if (response.IndexOf("war leider nicht erfolgreich") >= 0)
{
- Log.Warn("InversSearchOert -> No entry for number [" + lookup + "] found.");
+ Log.Warn("No entry for number [" + lookup + "] found");
return name;
}
else
@@ -73,15 +70,16 @@
MatchCollection matchList = exp.Matches(response);
if (matchList.Count == 0)
{
- Log.Warn("InversSearchOert -> RegEx doesnt match");
+ Log.Warn("RegEx doesn't match");
return name;
}
name = matchList[0].Groups[1].Value;
Log.Debug("Found {0} for {1}", name, lookup);
- } // else
+ }
+
return name;
}
#endregion
- } // class
-} // namespace
\ No newline at end of file
+ }
+}
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/PhonebookItem.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/PhonebookItem.cs 2011-12-04 13:48:39 UTC (rev 4365)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/PhonebookItem.cs 2011-12-06 15:15:37 UTC (rev 4366)
@@ -51,7 +51,7 @@
}
else
{
- Log.Debug("Could not load FritzManager phone book, file {0} not found", fileName);
+ Log.Debug("Could not load FritzManager phone book. File {0} cannot be found", fileName);
}
return result;
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/VBReader.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/VBReader.cs 2011-12-04 13:48:39 UTC (rev 4365)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/VBReader.cs 2011-12-06 15:15:37 UTC (rev 4366)
@@ -23,7 +23,7 @@
if (File.Exists(meta))
{
- Log.Debug("reading voice box items from {0}", meta);
+ Log.Debug("Reading voice box items from {0}", meta);
FileStream stream = File.OpenRead(meta);
MyBinaryReader r = new MyBinaryReader(stream);
@@ -71,12 +71,9 @@
item.mynumber = r.ReadCString();
stream.Position = pos;
result.Add(item);
- Log.Debug("found voice box item {0}", item);
+ Log.Debug("Found voice box item {0}", item);
}
- else
- {
- Log.Debug("bad length inidcator: {0}", len);
- }
+ else Log.Debug("Bad length inidcator: {0}", len);
p++;
}
@@ -91,7 +88,7 @@
Log.Debug("Exception {0}", e.Message);
}
}
- else Log.Debug("voice box path is not set. Voice box cannot be loaded");
+ else Log.Debug("Voice box path is not set. Voice box cannot be loaded");
return result;
}
Modified: trunk/plugins/FritzBox/FritzBox/Settings.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Settings.cs 2011-12-04 13:48:39 UTC (rev 4365)
+++ trunk/plugins/FritzBox/FritzBox/Settings.cs 2011-12-06 15:15:37 UTC (rev 4366)
@@ -27,224 +27,206 @@
using MediaPortal.Configuration;
using MediaPortal.ServiceImplementations;
using System.IO;
+using FritzManager;
namespace FritzBox
{
- internal static class Settings
- {
- #region Variables and constants
+ internal static class Settings
+ {
+ static Logger Log = LoggerFactory.getLogger("Settings");
- private const string PLUGIN_NAME = "FRITZ!Box";
+ #region Variables and constants
- private static List<String> _msnList;
+ private const string PLUGIN_NAME = "FRITZ!Box";
- private const string encryptionPassphrase = "j/§=sFf)39=Jd&wVZj37";
+ private static List<String> _msnList;
- #endregion Variables and constants
+ private const string encryptionPassphrase = "j/§=sFf)39=Jd&wVZj37";
- #region Properties
+ #endregion Variables and constants
- public static bool ExtensiveLogging { get; set; }
+ #region Properties
- /// <summary>
- /// stop media when an event happend
- /// </summary>
- public static bool StopMedia { get; set; }
+ public static bool ExtensiveLogging { get; set; }
- /// <summary>
- /// resume media when notify is closed
- /// </summary>
- publ...
[truncated message content] |
|
From: <hor...@us...> - 2011-12-04 13:48:46
|
Revision: 4365
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4365&view=rev
Author: horned-reaper
Date: 2011-12-04 13:48:39 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/FritzBox/FritzBox.cs
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/LoggerFactory.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/PhonebookItem.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/StringEncryption.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/VBReader.cs
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.GenerateResource.Cache
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb
trunk/plugins/FritzBox/MpeRelease/FritzBox.mpe1
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/ResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/ResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
Added Paths:
-----------
trunk/plugins/FritzBox/releases/FritzBox_v0.3.5.4364.mpe1
Removed Paths:
-------------
trunk/plugins/FritzBox/MpeRelease/update.xml
Modified: trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat
===================================================================
--- trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat 2011-12-04 10:46:06 UTC (rev 4364)
+++ trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat 2011-12-04 13:48:39 UTC (rev 4365)
@@ -43,9 +43,13 @@
:version_done
echo.
+echo Delete old update.xml file
+del "..\MpeRelease\update.xml" /Q
+
+echo.
echo Building MpeExtension package...
"%ProgramDir%\Team MediaPortal\MediaPortal\MpeMaker.exe" "..\MpeRelease\FritzBox.xmp2" /V=%version% /B >> %LOG%
echo.
echo Copying installer file to releases folder
-copy ..\MpeRelease\FritzBox.mpe1 ..\releases\FritzBox_v%Version%.mpe1 /Y
+copy "..\MpeRelease\FritzBox.mpe1" "..\releases\FritzBox_v%Version%.mpe1" /Y
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2011-12-04 10:46:06 UTC (rev 4364)
+++ trunk/plugins/FritzBox/Build/Build.log 2011-12-04 13:48:39 UTC (rev 4365)
@@ -1,6 +1,6 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4362
+SVN Version: 4364
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs
@@ -10,7 +10,7 @@
[Microsoft .NET Framework, Version 2.0.50727.3625]
Copyright (C) Microsoft Corporation 2007. All rights reserved.
-Build started 03.12.2011 16:47:07.
+Build started 04.12.2011 14:47:03.
Project "D:\FritzBox\FritzBox.sln" on node 0 (Rebuild target(s)).
Building solution configuration "Release|Mixed Platforms".
Project "D:\FritzBox\FritzBox.sln" (1) is building "D:\FritzBox\FritzBox\FritzBox.csproj" (2) on node 0 (Rebuild target(s)).
@@ -105,7 +105,7 @@
2 Warning(s)
0 Error(s)
-Time Elapsed 00:00:01.95
+Time Elapsed 00:00:02.62
Reverting to build 0
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
@@ -190,6 +190,6 @@
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
36 File(s) copied
MpeMaker version: 1.2.1.0
-Build started at 16:47:11
+Build started at 14:47:07
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2011-12-04 10:46:06 UTC (rev 4364)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2011-12-04 13:48:39 UTC (rev 4365)
@@ -152,7 +152,7 @@
if (!_showNotify)
{
- Log.Info("external process is running. Notify is queued and will be shown later.");
+ Log.Info("external process is running. Notify is queued and will be shown later");
_notifyQueue.Add(callAction);
return;
}
@@ -172,7 +172,7 @@
case CallAction.CallType.ConnectionClosed:
if (Settings.CloseOnConnectionClosed)
{
- Log.Info("_closeOnConnectionClosed is enabled. Try to close active notify.");
+ Log.Info("_closeOnConnectionClosed is enabled. Try to close active notify");
if (_tempNotify != null)
{
MediaPortal.GUI.Library.Action act = new MediaPortal.GUI.Library.Action();
@@ -214,7 +214,7 @@
if (_tempNotify != null)
{
- Log.Info("yet another dialog is active. action is sent to queue.");
+ Log.Info("yet another dialog is active. action is sent to queue");
if (_actionList.Count < Settings.MaxNotifies - 1) _actionList.Add(callAction);
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2011-12-04 10:46:06 UTC (rev 4364)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2011-12-04 13:48:39 UTC (rev 4365)
@@ -170,9 +170,9 @@
this.checkBoxExtensiveLogging.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.checkBoxExtensiveLogging.Location = new System.Drawing.Point(6, 138);
this.checkBoxExtensiveLogging.Name = "checkBoxExtensiveLogging";
- this.checkBoxExtensiveLogging.Size = new System.Drawing.Size(325, 17);
+ this.checkBoxExtensiveLogging.Size = new System.Drawing.Size(328, 17);
this.checkBoxExtensiveLogging.TabIndex = 1;
- this.checkBoxExtensiveLogging.Text = "Extensive logging (!!! phone numbers are written to the logfile !!!)";
+ this.checkBoxExtensiveLogging.Text = "Extensive logging (!!! phone numbers are written to the log file !!!)";
this.checkBoxExtensiveLogging.UseVisualStyleBackColor = true;
//
// mpGroupBox1
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2011-12-04 10:46:06 UTC (rev 4364)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2011-12-04 13:48:39 UTC (rev 4365)
@@ -28,6 +28,7 @@
using MediaPortal.Configuration;
using MediaPortal.GUI.Library;
using MediaPortal.Services;
+using FritzManager;
namespace FritzBox
{
@@ -35,15 +36,13 @@
{
public FritzBoxConfig()
{
- // Configure logging into Configuration.log file
- Log.SetConfigurationMode();
- Log.BackupLogFile(LogType.Config);
-
InitializeComponent();
LoadSettings();
YacFolder = Config.GetSubFolder(Config.Dir.Thumbs, "yac");
}
+ private static Logger Log = LoggerFactory.getLogger("FritzBoxConfig");
+
private string YacFolder;
#region Settings
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs 2011-12-04 10:46:06 UTC (rev 4364)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs 2011-12-04 13:48:39 UTC (rev 4365)
@@ -24,7 +24,7 @@
public string number;
public DateTime timestamp;
public int type;
- private static Logger Log = LoggerFactory.getLogger("FritzBox");
+ private static Logger Log = LoggerFactory.getLogger("CallItem");
public static List<CallItem> loadFromFile(string filename)
{
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/LoggerFactory.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/LoggerFactory.cs 2011-12-04 10:46:06 UTC (rev 4364)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/LoggerFactory.cs 2011-12-04 13:48:39 UTC (rev 4365)
@@ -1,43 +1,46 @@
-/*
- * Erstellt mit SharpDevelop.
- * Benutzer: srinke
- * Datum: 18.12.2009
- * Zeit: 15:45
- *
- * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern.
- */
-using System;
+using System;
using MediaPortal.GUI.Library;
namespace FritzManager
{
- public class MPLogger : Logger {
- string name;
- public MPLogger(string name) {
- this.name = name;
+ public class MPLogger : Logger
+ {
+ string className;
+
+ public MPLogger(string className)
+ {
+ this.className = className;
+ }
+
+ public void Debug(string message, params object[] args)
+ {
+ Log.Debug("FRITZ!Box: " + className + ": " + message, args);
+ }
+
+ public void Info(string message, params object[] args)
+ {
+ Log.Info("FRITZ!Box: " + className + ": " + message, args);
+ }
+
+ public void Warn(string message, params object[] args)
+ {
+ Log.Warn("FRITZ!Box: " + className + ": " + message, args);
+ }
+
+ public void Error(string message, params object[] args)
+ {
+ Log.Error("FRITZ!Box: " + className + ": " + message, args);
+ }
}
- public void Debug( string msg, params object[] args ){
- Log.Debug("FritzBox::"+name+" "+msg,args);
- }
- public void Info( string msg, params object[] args ){
- Log.Info("FritzBox::"+name+" "+msg,args);
- }
- public void Warn( string msg, params object[] args ){
- Log.Warn("FritzBox::"+name+" "+msg,args);
- }
- public void Error( string msg, params object[] args ){
- Log.Error("FritzBox::"+name+" "+msg,args);
- }
- }
-
- /// <summary>
- /// Description of LoggerFactory.
- /// </summary>
- public class LoggerFactory
- {
- public static Logger getLogger(string name)
- {
- return new MPLogger(name);
- }
- }
+
+ ///// <summary>
+ ///// Description of LoggerFactory.
+ ///// </summary>
+ public class LoggerFactory
+ {
+ public static Logger getLogger(string className)
+ {
+ return new MPLogger(className);
+ }
+ }
}
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/PhonebookItem.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/PhonebookItem.cs 2011-12-04 10:46:06 UTC (rev 4364)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/PhonebookItem.cs 2011-12-04 13:48:39 UTC (rev 4365)
@@ -8,7 +8,7 @@
{
public class InternalPhoneBook
{
- static Logger Log = LoggerFactory.getLogger("InternalPhoneBook");
+ static Logger Log = LoggerFactory.getLogger("PhoneBookItem");
public List<PhonebookItem> items = new List<PhonebookItem>();
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/StringEncryption.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/StringEncryption.cs 2011-12-04 10:46:06 UTC (rev 4364)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/StringEncryption.cs 2011-12-04 13:48:39 UTC (rev 4365)
@@ -7,7 +7,7 @@
{
class StringEncryption
{
- static Logger Log = LoggerFactory.getLogger("FritzBox");
+ static Logger Log = LoggerFactory.getLogger("StringEncryption");
public static string EncryptString(string Message, string Passphrase)
{
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/VBReader.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/VBReader.cs 2011-12-04 10:46:06 UTC (rev 4364)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/VBReader.cs 2011-12-04 13:48:39 UTC (rev 4365)
@@ -1,11 +1,4 @@
-/*
- * Erstellt mit SharpDevelop.
- * Benutzer: sr
- * Datum: 27.11.2009
- * Zeit: 11:28
- *
- */
-using System;
+using System;
using System.Collections.Generic;
using System.IO;
Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.GenerateResource.Cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2011-12-04 10:46:06 UTC (rev 4364)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2011-12-04 13:48:39 UTC (rev 4365)
@@ -559,7 +559,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4362</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4364</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -582,21 +582,21 @@
<Major>0</Major>
<Minor>3</Minor>
<Build>5</Build>
- <Revision>4362</Revision>
+ <Revision>4364</Revision>
</Version>
- <ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box informations from MediaPortal.
-
-Features:
-- notification for incoming and outgoing calls via window, sound and contact picture
-- MediaPortal Player is automatically paused and resumed on calls
-- access call lists, voice box and phone book directly in MediaPortal
-- voice box message notification in any MediaPortal screen
-- connection establishment from call list, voice box or phone book entries
+ <ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box informations from MediaPortal.
+
+Features:
+- notification for incoming and outgoing calls via window, sound and contact picture
+- MediaPortal Player is automatically paused and resumed on calls
+- access call lists, voice box and phone book directly in MediaPortal
+- voice box message notification in any MediaPortal screen
+- connection establishment from call list, voice box or phone book entries
- language localization</ExtensionDescription>
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
- <ReleaseDate>2011-12-03T16:47:11.414255+01:00</ReleaseDate>
+ <ReleaseDate>2011-12-04T14:47:07.5989888+01:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
Deleted: trunk/plugins/FritzBox/MpeRelease/update.xml
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/update.xml 2011-12-04 10:46:06 UTC (rev 4364)
+++ trunk/plugins/FritzBox/MpeRelease/update.xml 2011-12-04 13:48:39 UTC (rev 4365)
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ExtensionCollection xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <Items>
- <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="Blue3 Skin">
- <DisplayName>Blue3 Skin</DisplayName>
- <DefaulChecked>false</DefaulChecked>
- <Description>Blue3 Skin</Description>
- <Files>
- <Items />
- </Files>
- </GroupItem>
- <GroupItem Name="Maya Skin">
- <DisplayName>Maya Skin</DisplayName>
- <DefaulChecked>false</DefaulChecked>
- <Description>Maya Skin</Description>
- <Files>
- <Items />
- </Files>
- </GroupItem>
- <GroupItem Name="Black & White Skin">
- <DisplayName>Black & White Skin</DisplayName>
- <DefaulChecked>false</DefaulChecked>
- <Description>Black & White Skin</Description>
- <Files>
- <Items />
- </Files>
- </GroupItem>
- <GroupItem Name="Default Skin">
- <DisplayName>Default Skin</DisplayName>
- <DefaulChecked>true</DefaulChecked>
- <Description>Default Skin</Description>
- <Files>
- <Items />
- </Files>
- </GroupItem>
- <GroupItem Name="DefaultWide Skin">
- <DisplayName>DefaultWide Skin</DisplayName>
- <DefaulChecked>true</DefaulChecked>
- <Description>DefaultWide Skin</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="FritzBox.dll">
- <CompatibleVersion>
- <Items>
- <CompatibleVersionItem>
- <MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4362</DesignedForVersion>
- </CompatibleVersionItem>
- </Items>
- </CompatibleVersion>
- <SubSystemsUsed>
- <Items>
- <SubSystemItem Name="MP.Config" />
- </Items>
- </SubSystemsUsed>
- </PluginDependencyItem>
- </Items>
- </PluginDependencies>
- <GeneralInfo>
- <Name>FritzBox Manager</Name>
- <Id>8cb6bbc2-5473-4a63-a8f9-e0bec7c8c81c</Id>
- <Author>Horned Reaper, Steve, Chefkoch</Author>
- <HomePage>http://www.team-mediaportal.com/extensions/other/fritzbox-manager-phone-manager-callmonitor-for-avm-fritz-box</HomePage>
- <ForumPage>http://forum.team-mediaportal.com/mediaportal-plugins-47/fritz-box-manager-english-forum-103177/#post817050</ForumPage>
- <UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=52</UpdateUrl>
- <Version>
- <Major>0</Major>
- <Minor>3</Minor>
- <Build>5</Build>
- <Revision>4362</Revision>
- </Version>
- <ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box informations in MediaPortal.
-
-Features:
-- notification for incoming and outgoing calls via window, sound and contact picture
-- MediaPortal Player is automatically paused and resumed on calls
-- access call lists, voice box and phone book directly in MediaPortal
-- voice box message notification in any MediaPortal screen
-- connection establishment from call list, voice box or phone book entries
-- language localization</ExtensionDescription>
- <VersionDescription />
- <DevelopmentStatus>Stable</DevelopmentStatus>
- <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
- <ReleaseDate>2011-12-03T16:47:11.414255+01:00</ReleaseDate>
- <Tags>fritzbox, fritzbox manager, callmonitor</Tags>
- <Location>..\MpeRelease\FritzBox.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
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/ResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/ResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Added: trunk/plugins/FritzBox/releases/FritzBox_v0.3.5.4364.mpe1
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/releases/FritzBox_v0.3.5.4364.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.
|
2 messages has been excluded from this view by a project administrator.
