Menu
▾
▴
mp-plugins-svn
|
From: <hor...@us...> - 2011-11-29 20:09:09
|
Revision: 4358
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4358&view=rev
Author: horned-reaper
Date: 2011-11-29 20:09:03 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml
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.mpe1
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
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/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/FritzBox_v0.3.5.0.mpe1
Modified: trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat
===================================================================
--- trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat 2011-11-29 19:50:29 UTC (rev 4357)
+++ trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat 2011-11-29 20:09:03 UTC (rev 4358)
@@ -17,6 +17,10 @@
echo Writing SVN revision assemblies...
DeployVersionSVN.exe /svn=".." >> %LOG%
+echo %errorlevel%
+if not errorlevel 0 exit
+pause
+
echo.
echo Building FRITZ!Box Manager...
"%WINDIR%\Microsoft.NET\Framework\v3.5\MSBUILD.exe" /target:Rebuild /property:Configuration=Release;AllowUnsafeBlocks=true "..\FritzBox.sln" >> %LOG%
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2011-11-29 19:50:29 UTC (rev 4357)
+++ trunk/plugins/FritzBox/Build/Build.log 2011-11-29 20:09:03 UTC (rev 4358)
@@ -1,32 +1,20 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4356
-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 29.11.2011 20:48:19.
+Build started 29.11.2011 21:02:16.
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)).
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".
-CoreClean:
- Deleting file "D:\FritzBox\FritzBox\bin\Release\FritzBox.dll".
- Deleting file "D:\FritzBox\FritzBox\bin\Release\FritzBox.pdb".
- 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".
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".
+ No resources are out of date with respect to their source files. Skipping resource generation.
+CoreCompile:
+Skipping target "CoreCompile" because all output files are up-to-date with respect to the input files.
CopyFilesToOutputDirectory:
Copying file from "obj\Release\FritzBox.dll" to "bin\Release\FritzBox.dll".
FritzBox -> D:\FritzBox\FritzBox\bin\Release\FritzBox.dll
@@ -105,13 +93,8 @@
2 Warning(s)
0 Error(s)
-Time Elapsed 00:00:02.06
+Time Elapsed 00:00:01.73
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
@@ -161,35 +144,3 @@
..\FritzBox\Languages\strings_it.xml
..\FritzBox\Languages\strings_nl.xml
..\FritzBox\Languages\strings_ru.xml
-..\FritzBox\Languages\Unsupported\strings_bg.xml
-..\FritzBox\Languages\Unsupported\strings_ca.xml
-..\FritzBox\Languages\Unsupported\strings_cs.xml
-..\FritzBox\Languages\Unsupported\strings_cy-GB.xml
-..\FritzBox\Languages\Unsupported\strings_da.xml
-..\FritzBox\Languages\Unsupported\strings_et.xml
-..\FritzBox\Languages\Unsupported\strings_eu.xml
-..\FritzBox\Languages\Unsupported\strings_fi.xml
-..\FritzBox\Languages\Unsupported\strings_fo.xml
-..\FritzBox\Languages\Unsupported\strings_he.xml
-..\FritzBox\Languages\Unsupported\strings_hr.xml
-..\FritzBox\Languages\Unsupported\strings_hu.xml
-..\FritzBox\Languages\Unsupported\strings_id.xml
-..\FritzBox\Languages\Unsupported\strings_is.xml
-..\FritzBox\Languages\Unsupported\strings_ko.xml
-..\FritzBox\Languages\Unsupported\strings_mk.xml
-..\FritzBox\Languages\Unsupported\strings_no.xml
-..\FritzBox\Languages\Unsupported\strings_pl.xml
-..\FritzBox\Languages\Unsupported\strings_pt-BR.xml
-..\FritzBox\Languages\Unsupported\strings_pt.xml
-..\FritzBox\Languages\Unsupported\strings_ro.xml
-..\FritzBox\Languages\Unsupported\strings_sk.xml
-..\FritzBox\Languages\Unsupported\strings_sl.xml
-..\FritzBox\Languages\Unsupported\strings_sv.xml
-..\FritzBox\Languages\Unsupported\strings_tr.xml
-..\FritzBox\Languages\Unsupported\strings_uk.xml
-..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
-36 File(s) copied
-MpeMaker version: 1.2.1.0
-Build started at 20:48:23
-Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
-Output: "..\MpeRelease\FritzBox.mpe1"
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml 2011-11-29 19:50:29 UTC (rev 4357)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml 2011-11-29 20:09:03 UTC (rev 4358)
@@ -24,7 +24,7 @@
<String id="21">FritzBox Anrufliste</String>
<String id="22">FritzBox Telefonbuch</String>
<String id="23">Fehler</String>
- <String id="24">Telefonbuch konnte nicht geladen werden!</String>
+ <String id="24">FritzBox Passwort & Anrufbeantworter-Pfad wurden noch nicht definiert!</String>
<String id="25">Update</String>
<String id="26">an</String>
<String id="27">Nachricht</String>
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.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2011-11-29 19:50:29 UTC (rev 4357)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2011-11-29 20:09:03 UTC (rev 4358)
@@ -559,7 +559,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4356</DesignedForVersion>
+ <DesignedForVersion>1.1.7.0</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -582,13 +582,13 @@
<Major>0</Major>
<Minor>3</Minor>
<Build>5</Build>
- <Revision>4356</Revision>
+ <Revision>0</Revision>
</Version>
<ExtensionDescription>This plugin is a combination of the former fritz call monitor and the new fritz manager.</ExtensionDescription>
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation />
- <ReleaseDate>2011-11-29T20:48:23.2293344+01:00</ReleaseDate>
+ <ReleaseDate>2011-11-29T20:53:44.6886313+01:00</ReleaseDate>
<Tags />
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
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/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/FritzBox_v0.3.5.0.mpe1
===================================================================
(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-11-30 08:20:03
|
Revision: 4359
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4359&view=rev
Author: horned-reaper
Date: 2011-11-30 08:19:55 +0000 (Wed, 30 Nov 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.cs
trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml
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/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/releases/FritzBox_v0.3.5.0.mpe1
Modified: trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat
===================================================================
--- trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat 2011-11-29 20:09:03 UTC (rev 4358)
+++ trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat 2011-11-30 08:19:55 UTC (rev 4359)
@@ -17,10 +17,6 @@
echo Writing SVN revision assemblies...
DeployVersionSVN.exe /svn=".." >> %LOG%
-echo %errorlevel%
-if not errorlevel 0 exit
-pause
-
echo.
echo Building FRITZ!Box Manager...
"%WINDIR%\Microsoft.NET\Framework\v3.5\MSBUILD.exe" /target:Rebuild /property:Configuration=Release;AllowUnsafeBlocks=true "..\FritzBox.sln" >> %LOG%
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2011-11-29 20:09:03 UTC (rev 4358)
+++ trunk/plugins/FritzBox/Build/Build.log 2011-11-30 08:19:55 UTC (rev 4359)
@@ -1,20 +1,32 @@
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: 4358
+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 29.11.2011 21:02:16.
+Build started 29.11.2011 21:41:47.
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)).
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".
+CoreClean:
+ Deleting file "D:\FritzBox\FritzBox\bin\Release\FritzBox.dll".
+ Deleting file "D:\FritzBox\FritzBox\bin\Release\FritzBox.pdb".
+ 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".
CoreResGen:
- No resources are out of date with respect to their source files. Skipping resource generation.
-CoreCompile:
-Skipping target "CoreCompile" because all output files are up-to-date with respect to the input files.
+ Processing resource file "Properties\Resources.resx" into "obj\Release\FritzBox.Properties.Resources.resources".
+ Processing resource file "FritzBoxConfig.resx" into "obj\Release\FritzBox.FritzBoxConfig.resources".
CopyFilesToOutputDirectory:
Copying file from "obj\Release\FritzBox.dll" to "bin\Release\FritzBox.dll".
FritzBox -> D:\FritzBox\FritzBox\bin\Release\FritzBox.dll
@@ -93,8 +105,13 @@
2 Warning(s)
0 Error(s)
-Time Elapsed 00:00:01.73
+Time Elapsed 00:00:02.01
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
@@ -144,3 +161,35 @@
..\FritzBox\Languages\strings_it.xml
..\FritzBox\Languages\strings_nl.xml
..\FritzBox\Languages\strings_ru.xml
+..\FritzBox\Languages\Unsupported\strings_bg.xml
+..\FritzBox\Languages\Unsupported\strings_ca.xml
+..\FritzBox\Languages\Unsupported\strings_cs.xml
+..\FritzBox\Languages\Unsupported\strings_cy-GB.xml
+..\FritzBox\Languages\Unsupported\strings_da.xml
+..\FritzBox\Languages\Unsupported\strings_et.xml
+..\FritzBox\Languages\Unsupported\strings_eu.xml
+..\FritzBox\Languages\Unsupported\strings_fi.xml
+..\FritzBox\Languages\Unsupported\strings_fo.xml
+..\FritzBox\Languages\Unsupported\strings_he.xml
+..\FritzBox\Languages\Unsupported\strings_hr.xml
+..\FritzBox\Languages\Unsupported\strings_hu.xml
+..\FritzBox\Languages\Unsupported\strings_id.xml
+..\FritzBox\Languages\Unsupported\strings_is.xml
+..\FritzBox\Languages\Unsupported\strings_ko.xml
+..\FritzBox\Languages\Unsupported\strings_mk.xml
+..\FritzBox\Languages\Unsupported\strings_no.xml
+..\FritzBox\Languages\Unsupported\strings_pl.xml
+..\FritzBox\Languages\Unsupported\strings_pt-BR.xml
+..\FritzBox\Languages\Unsupported\strings_pt.xml
+..\FritzBox\Languages\Unsupported\strings_ro.xml
+..\FritzBox\Languages\Unsupported\strings_sk.xml
+..\FritzBox\Languages\Unsupported\strings_sl.xml
+..\FritzBox\Languages\Unsupported\strings_sv.xml
+..\FritzBox\Languages\Unsupported\strings_tr.xml
+..\FritzBox\Languages\Unsupported\strings_uk.xml
+..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
+36 File(s) copied
+MpeMaker version: 1.2.1.0
+Build started at 21:41:51
+Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
+Output: "..\MpeRelease\FritzBox.mpe1"
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2011-11-29 20:09:03 UTC (rev 4358)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2011-11-30 08:19:55 UTC (rev 4359)
@@ -1411,8 +1411,8 @@
{
GUIDialogOK dlg = (GUIDialogOK)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_OK);
dlg.SetHeading(GUILocalizeStrings.Get(23)); // 23 = Error
- dlg.SetLine(1, msg);
- dlg.SetLine(2, String.Empty);
+ dlg.SetLine(1, String.Empty);
+ dlg.SetLine(2, msg);
dlg.SetLine(3, String.Empty);
dlg.DoModal(GUIWindowManager.ActiveWindow);
}
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2011-11-29 20:09:03 UTC (rev 4358)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2011-11-30 08:19:55 UTC (rev 4359)
@@ -308,32 +308,33 @@
private void mpButton1_Click(object sender, EventArgs e)
{
+ // clear text box
+ labelHelp.Text = string.Empty;
+
+ FritzBoxClient.LogEvent += OnLogAction;
+
Log.Debug("FRITZ!Box: Connection test: Start");
- FritzBoxClient.LogEvent += OnLogAction;
-
// stopping client
Log.Debug("FRITZ!Box: Connection test: Stop client");
FritzBoxClient.StopClient();
- // clear text box
- labelHelp.Text = string.Empty;
-
- // set current used text
+ // set current settings
FritzBoxClient.Address = textBoxAddress.Text;
FritzBoxClient.Port = (int)numericUpDownPort.Value;
// port test
Log.Debug("FRITZ!Box: Connection test: Start port test");
- if (!FritzBoxClient.TestConnection()) return;
+ if (FritzBoxClient.TestConnection())
+ {
+ // if port test was successful start client
+ Log.Debug("FRITZ!Box: Connection test: Start client");
+ FritzBoxClient.StartClient();
+ }
- // start client
- Log.Debug("FRITZ!Box: Connection test: Start client");
- FritzBoxClient.StartClient();
+ Log.Debug("FRITZ!Box: Connection test: End");
FritzBoxClient.LogEvent -= OnLogAction;
-
- Log.Debug("FRITZ!Box: Connection test: End");
}
#endregion
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml 2011-11-29 20:09:03 UTC (rev 4358)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml 2011-11-30 08:19:55 UTC (rev 4359)
@@ -24,7 +24,7 @@
<String id="21">FritzBox Anrufliste</String>
<String id="22">FritzBox Telefonbuch</String>
<String id="23">Fehler</String>
- <String id="24">FritzBox Passwort & Anrufbeantworter-Pfad wurden noch nicht definiert!</String>
+ <String id="24">Einstellungen für FRITZBox-Passw. + AB-Pfad fehlen!</String>
<String id="25">Update</String>
<String id="26">an</String>
<String id="27">Nachricht</String>
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.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-11-29 20:09:03 UTC (rev 4358)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2011-11-30 08:19:55 UTC (rev 4359)
@@ -559,7 +559,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.0</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4358</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -582,13 +582,13 @@
<Major>0</Major>
<Minor>3</Minor>
<Build>5</Build>
- <Revision>0</Revision>
+ <Revision>4358</Revision>
</Version>
<ExtensionDescription>This plugin is a combination of the former fritz call monitor and the new fritz manager.</ExtensionDescription>
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation />
- <ReleaseDate>2011-11-29T20:53:44.6886313+01:00</ReleaseDate>
+ <ReleaseDate>2011-11-29T21:41:51.2753027+01:00</ReleaseDate>
<Tags />
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
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)
Deleted: trunk/plugins/FritzBox/releases/FritzBox_v0.3.5.0.mpe1
===================================================================
(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-01 20:27:11
|
Revision: 4361
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4361&view=rev
Author: horned-reaper
Date: 2011-12-01 20:27:04 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/FritzBox/FritzBox.cs
trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_en.xml
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/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.4358.mpe1
trunk/plugins/FritzBox/releases/FritzBox_v0.3.5.4359.mpe1
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2011-12-01 10:24:20 UTC (rev 4360)
+++ trunk/plugins/FritzBox/Build/Build.log 2011-12-01 20:27:04 UTC (rev 4361)
@@ -1,6 +1,6 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4358
+SVN Version: 4359
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 29.11.2011 21:41:47.
+Build started 01.12.2011 10:04:59.
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:02.01
+Time Elapsed 00:00:01.93
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 21:41:51
+Build started at 10:05:03
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-01 10:24:20 UTC (rev 4360)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2011-12-01 20:27:04 UTC (rev 4361)
@@ -1411,8 +1411,8 @@
{
GUIDialogOK dlg = (GUIDialogOK)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_OK);
dlg.SetHeading(GUILocalizeStrings.Get(23)); // 23 = Error
- dlg.SetLine(1, String.Empty);
- dlg.SetLine(2, msg);
+ dlg.SetLine(1, msg); // the text must be added to the first line, otherwise scrolling is not enabled
+ dlg.SetLine(2, String.Empty);
dlg.SetLine(3, String.Empty);
dlg.DoModal(GUIWindowManager.ActiveWindow);
}
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml 2011-12-01 10:24:20 UTC (rev 4360)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml 2011-12-01 20:27:04 UTC (rev 4361)
@@ -24,7 +24,7 @@
<String id="21">FritzBox Anrufliste</String>
<String id="22">FritzBox Telefonbuch</String>
<String id="23">Fehler</String>
- <String id="24">Einstellungen für FRITZBox-Passw. + AB-Pfad fehlen!</String>
+ <String id="24">Bitte FRITZ!Box-Passwort und Anrufbeantworter-Pfad unter Configuration eintragen!</String>
<String id="25">Update</String>
<String id="26">an</String>
<String id="27">Nachricht</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_en.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_en.xml 2011-12-01 10:24:20 UTC (rev 4360)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_en.xml 2011-12-01 20:27:04 UTC (rev 4361)
@@ -24,7 +24,7 @@
<String id="21">FritzBox call list</String>
<String id="22">FritzBox phone book</String>
<String id="23">Error</String>
- <String id="24">Could not load phone book!</String>
+ <String id="24">FRITZ!Box password and voice box path are missing in settings!</String>
<String id="25">Update</String>
<String id="26">to</String>
<String id="27">Message</String>
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.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-01 10:24:20 UTC (rev 4360)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2011-12-01 20:27:04 UTC (rev 4361)
@@ -559,7 +559,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4358</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4359</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -582,13 +582,13 @@
<Major>0</Major>
<Minor>3</Minor>
<Build>5</Build>
- <Revision>4358</Revision>
+ <Revision>4359</Revision>
</Version>
<ExtensionDescription>This plugin is a combination of the former fritz call monitor and the new fritz manager.</ExtensionDescription>
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation />
- <ReleaseDate>2011-11-29T21:41:51.2753027+01:00</ReleaseDate>
+ <ReleaseDate>2011-12-01T10:05:03.1294614+01:00</ReleaseDate>
<Tags />
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
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.4358.mpe1
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/releases/FritzBox_v0.3.5.4358.mpe1
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/releases/FritzBox_v0.3.5.4359.mpe1
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/releases/FritzBox_v0.3.5.4359.mpe1
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hor...@us...> - 2011-12-03 16:12:17
|
Revision: 4363
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4363&view=rev
Author: horned-reaper
Date: 2011-12-03 16:12:08 +0000 (Sat, 03 Dec 2011)
Log Message:
-----------
Official build
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
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/FritzCallMonitor/FritzBoxClient.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.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.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/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.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/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.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
Added Paths:
-----------
trunk/plugins/FritzBox/FritzBox/FritzManager/StringEncryption.cs
trunk/plugins/FritzBox/MpeRelease/update.xml
trunk/plugins/FritzBox/releases/FritzBox_v0.3.5.4362.mpe1
Removed Paths:
-------------
trunk/plugins/FritzBox/releases/FritzBox_v0.3.5.4349.mpe1
trunk/plugins/FritzBox/releases/FritzBox_v0.3.5.4356.mpe1
trunk/plugins/FritzBox/releases/FritzBox_v0.3.5.4358.mpe1
trunk/plugins/FritzBox/releases/FritzBox_v0.3.5.4359.mpe1
Property Changed:
----------------
trunk/plugins/FritzBox/FritzBox/Skin/
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2011-12-01 20:35:25 UTC (rev 4362)
+++ trunk/plugins/FritzBox/Build/Build.log 2011-12-03 16:12:08 UTC (rev 4363)
@@ -1,6 +1,6 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4359
+SVN Version: 4362
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 01.12.2011 10:04:59.
+Build started 03.12.2011 16:47:07.
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.93
+Time Elapsed 00:00:01.95
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 10:05:03
+Build started at 16:47:11
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-01 20:35:25 UTC (rev 4362)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2011-12-03 16:12:08 UTC (rev 4363)
@@ -653,8 +653,7 @@
{
phoneBookPath = Config.GetFolder(Config.Dir.Config) + "\\fritzmanagerPhonebook.xml";
mediaPortalLanguage = xmlreader.GetValue("gui", "language");
-
- passwd = xmlreader.GetValue("FritzManager", "passwd");
+ passwd = Settings.FmPassword;
vBPath = xmlreader.GetValue("FritzManager", "vBPath");
dialport = xmlreader.GetValue("FritzManager", "dialport");
useInversSearch = xmlreader.GetValueAsBool("FritzManager", "useInversSearch", true);
@@ -698,7 +697,7 @@
ShowThumbPanel();
- if (String.IsNullOrEmpty(passwd) && String.IsNullOrEmpty(vBPath)) ShowError(GUILocalizeStrings.Get(24)); // 24 = "Could not load phone book"
+ if (String.IsNullOrEmpty(passwd) && String.IsNullOrEmpty(vBPath)) ShowError(GUILocalizeStrings.Get(24)); // 24 = FRITZ!Box password and voice box path are missing in settings!
}
private static void OnTimedEvent(object source, System.Timers.ElapsedEventArgs e)
@@ -880,26 +879,13 @@
protected void loadCallListFromFritzbox(bool forceReload)
{
- if (!String.IsNullOrEmpty(passwd))
- {
- GUIWaitCursor.Show();
+ GUIWaitCursor.Show();
- try
- {
- Log.Debug("load call list from FritzBox");
+ byte[] data = fritz.loadCallListData(forceReload);
- byte[] data = fritz.loadCallListData(forceReload);
+ refreshCallData(data);
- refreshCallData(data);
- }
- catch (Exception e)
- {
- Log.Debug("Exception {0}", e.Message);
- }
-
- GUIWaitCursor.Hide();
- }
- else Log.Debug("FritzBox password is not set. Call list cannot be loaded");
+ GUIWaitCursor.Hide();
}
protected string decode(VoiceBoxItem item)
@@ -924,38 +910,35 @@
{
facadeView.Clear();
- if (fritzPhonebooks.Items == null || fritzPhonebooks.Items.GetLength(0) == 0)
+ if (fritzPhonebooks.Items != null && fritzPhonebooks.Items.GetLength(0) != 0)
{
- Log.Debug("no FritzBox phone book items found");
+ Phonebook p = fritzPhonebooks.Items[0]; // always choose first phone book
+ int i = 0;
+ string thumbDir = Config.GetFolder(Config.Dir.Thumbs) + "\\yac\\";
- return;
- }
-
- Phonebook p = fritzPhonebooks.Items[0]; // always choose first phone book
- int i = 0;
- string thumbDir = Config.GetFolder(Config.Dir.Thumbs) + "\\yac\\";
-
- foreach (Contact c in p.contact)
- {
- string name = c.person[0].realName;
-
- foreach (TelephonyNumber number in c.telephony)
+ foreach (Contact c in p.contact)
{
- GUIListItem elem = new GUIListItem();
- elem.Label = name;
- elem.Label2 = number.Value;
+ string name = c.person[0].realName;
- if (elem.Label2.Length > 0)
+ foreach (TelephonyNumber number in c.telephony)
{
- if (File.Exists(thumbDir + c.person[0].realName + ".jpg")) elem.ThumbnailImage = thumbDir + c.person[0].realName + ".jpg";
- else elem.ThumbnailImage = thumbDir + "_noImage.png";
+ GUIListItem elem = new GUIListItem();
+ elem.Label = name;
+ elem.Label2 = number.Value;
- elem.Path = Convert.ToString(i++);
+ if (elem.Label2.Length > 0)
+ {
+ if (File.Exists(thumbDir + c.person[0].realName + ".jpg")) elem.ThumbnailImage = thumbDir + c.person[0].realName + ".jpg";
+ else elem.ThumbnailImage = thumbDir + "_noImage.png";
- facadeView.Add(elem);
+ elem.Path = Convert.ToString(i++);
+
+ facadeView.Add(elem);
+ }
}
}
}
+ else Log.Debug("no FRITZ!Box phone book items found");
}
/// <summary>
@@ -1054,7 +1037,7 @@
}
/// <summary>
- /// fill in call items in facadeView
+ /// fill in call list items in facadeView
/// </summary>
protected void populateCallItems()
{
@@ -1175,7 +1158,6 @@
if (actionType == MediaPortal.GUI.Library.Action.ActionType.ACTION_SHOW_INFO)
{
OnShowContextMenu();
-
return;
}
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.csproj
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.csproj 2011-12-01 20:35:25 UTC (rev 4362)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.csproj 2011-12-03 16:12:08 UTC (rev 4363)
@@ -89,6 +89,9 @@
</ItemGroup>
<ItemGroup>
<Compile Include="FritzCallMonitor\FritzBoxClient.cs" />
+ <Compile Include="FritzManager\StringEncryption.cs">
+ <SubType>Code</SubType>
+ </Compile>
<Compile Include="FritzManager\VBReader.cs" />
<Compile Include="FritzManager\BackGroundWorker.cs" />
<Compile Include="FritzManager\BlockingQueue.cs" />
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2011-12-01 20:35:25 UTC (rev 4362)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2011-12-03 16:12:08 UTC (rev 4363)
@@ -849,9 +849,9 @@
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(24, 92);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(371, 13);
+ this.label2.Size = new System.Drawing.Size(354, 13);
this.label2.TabIndex = 17;
- this.label2.Text = "Voice box path (e. g. \\\\Fritz!nas\\FRITZ.NAS\\MemoryStick\\FRITZ\\voicebox)";
+ this.label2.Text = "Voice box path (e. g. \\\\fritz.box\\FRITZ.NAS\\USBStore\\FRITZ\\voicebox)";
//
// updateInterval
//
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2011-12-01 20:35:25 UTC (rev 4362)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2011-12-03 16:12:08 UTC (rev 4363)
@@ -35,7 +35,7 @@
{
public FritzBoxConfig()
{
- // Configure logging into Configuration.log
+ // Configure logging into Configuration.log file
Log.SetConfigurationMode();
Log.BackupLogFile(LogType.Config);
@@ -81,7 +81,7 @@
checkBoxStopMediaOnIncomingCall.Checked = Settings.StopMedia;
checkBoxResumeMedia.Checked = Settings.ResumeMedia;
- // phoneBook settings
+ // phone book settings
checkBoxUsePhonebook.Checked = PhoneBook.Enabled;
checkBoxShowUnknownCaller.Checked = PhoneBook.ShowUnknownCaller;
@@ -96,7 +96,7 @@
RefreshDataGridView();
- // fritzmanager settings
+ // FritzBox Manager settings
passwd.Text = Settings.FmPassword;
vBPath.Text = Settings.FmVBPath;
dialPort.Text = Settings.FmDialPort;
@@ -160,15 +160,11 @@
private void okButton_Click(object sender, EventArgs e)
{
SaveSettings();
- FritzBoxClient.StopClient();
- FritzBoxClient.LogEvent -= OnLogAction;
Close();
}
private void cancelButton_Click(object sender, EventArgs e)
{
- FritzBoxClient.StopClient();
- FritzBoxClient.LogEvent -= OnLogAction;
Close();
}
@@ -314,10 +310,6 @@
FritzBoxClient.LogEvent += OnLogAction;
Log.Debug("FRITZ!Box: Connection test: Start");
-
- // stopping client
- Log.Debug("FRITZ!Box: Connection test: Stop client");
- FritzBoxClient.StopClient();
// set current settings
FritzBoxClient.Address = textBoxAddress.Text;
@@ -330,11 +322,16 @@
// if port test was successful start client
Log.Debug("FRITZ!Box: Connection test: Start client");
FritzBoxClient.StartClient();
+
+ FritzBoxClient.LogEvent -= OnLogAction;
+
+ // stopping client
+ Log.Debug("FRITZ!Box: Connection test: Stop client");
+ FritzBoxClient.StopClient();
}
+ else FritzBoxClient.LogEvent -= OnLogAction;
Log.Debug("FRITZ!Box: Connection test: End");
-
- FritzBoxClient.LogEvent -= OnLogAction;
}
#endregion
@@ -434,4 +431,4 @@
#endregion
}
-}
+}
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs 2011-12-01 20:35:25 UTC (rev 4362)
+++ trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs 2011-12-03 16:12:08 UTC (rev 4363)
@@ -121,7 +121,8 @@
{
try
{
- if( _client != null ) {
+ if (_client != null)
+ {
// Release the socket.
_client.Shutdown(SocketShutdown.Both);
_client.Close();
@@ -129,44 +130,45 @@
}
catch (Exception ex)
{
- Log(ex);
+ Log(LogLevel.Error, "Error on stopping client: " + ex.Message);
}
}
public static bool TestConnection()
{
- try
- {
- Log(LogLevel.Info, "Testing address ({0}) and port ({1})", Address, Port);
-
- TcpClient tcpClient;
-
try
{
- tcpClient = new TcpClient(Address, Port);
- }
- catch (Exception)
- {
- Log(LogLevel.Error,
- "Address & port test failed! :(" + Environment.NewLine +
- " Did you entered correct connection information?" + Environment.NewLine +
- " Are you using the latest FRITZ!Box firmware?" + Environment.NewLine +
- " Did you opened the port on your FRITZ!Box? If not, call #96*5* from your phone.");
+ Log(LogLevel.Info, "Testing address ({0}) and port ({1})", Address, Port);
- return false;
- }
+ TcpClient tcpClient;
- tcpClient.Close();
- Log(LogLevel.Info, "Testing address & port succeeded.");
+ 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 true;
- }
- catch (Exception ex)
- {
- Log(ex);
+ return false;
+ }
- return false;
- }
+ tcpClient.Close();
+
+ Log(LogLevel.Info, "Testing address & port succeeded.");
+
+ return true;
+ }
+ catch (Exception ex)
+ {
+ Log(ex);
+
+ return false;
+ }
}
#endregion
@@ -297,99 +299,96 @@
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;
+ try
+ {
+ // Retrieve the state object and the client socket
+ // from the asynchronous state object.
+ StateObject state = (StateObject)ar.AsyncState;
+ Socket client = state.workSocket;
- // Read data from the remote device.
- int bytesRead = client.EndReceive(ar);
+ // Read data from the remote device.
+ int bytesRead = client.EndReceive(ar);
- 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
+ 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
- // 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;
+ // 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;
- // DateTime format:
- // 12.12.06 12:12:12
- // dd.MM.yy hh:mm:ss
+ // DateTime format:
+ // 12.12.06 12:12:12
+ // dd.MM.yy hh:mm:ss
- string[] strList = data.Trim().Split(';');
- CallAction callAction = new CallAction();
+ string[] strList = data.Trim().Split(';');
+ CallAction callAction = new CallAction();
- // time when action happens
- callAction.Time = DateTime.Parse(strList[0], new CultureInfo("de-DE", false));
+ // time when action happens
+ callAction.Time = DateTime.Parse(strList[0], new CultureInfo("de-DE", false));
- // set the type of the callAction
- switch (strList[1])
- {
- 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;
- }
+ // set the type of the callAction
+ switch (strList[1])
+ {
+ 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;
+ }
- // continue to listen to the fb
- client.BeginReceive(state.buffer, 0, StateObject.BufferSize, 0,
- new AsyncCallback(ReceiveCallback), state);
+ // continue to listen to the fb
+ client.BeginReceive(state.buffer, 0, StateObject.BufferSize, 0, new AsyncCallback(ReceiveCallback), state);
- if (CallEvent != null)
- CallEvent(callAction);
+ if (CallEvent != null) CallEvent(callAction);
+ }
+ else
+ {
+ Log(LogLevel.Debug, "ReceiveCallback: no bytes to read");
+ Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect.");
+ ReConnect();
+ }
}
- else
+ catch (ObjectDisposedException)
{
- Log(LogLevel.Debug, "ReceiveCallback: no bytes to read");
- Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect.");
- ReConnect();
+ Log(LogLevel.Debug, "ReceiveCallback: ObjectDisposedException");
+ Log(LogLevel.Info, "FRITZ!BOX connection shut down.");
}
- }
- catch (ObjectDisposedException)
- {
- 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 (SocketException)
+ {
+ Log(LogLevel.Debug, "ReceiveCallback: SocketException");
+ Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect.");
+ ReConnect();
+ }
+ catch (Exception ex)
+ {
+ Log(ex);
+ }
}
-
private static void Log(LogLevel logLevel, string format, params object[] arg)
{
if (LogEvent != null)
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs 2011-12-01 20:35:25 UTC (rev 4362)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs 2011-12-03 16:12:08 UTC (rev 4363)
@@ -74,7 +74,7 @@
}
catch (Exception e)
{
- Log.Debug("Error loading call items: {0}", e.Message);
+ Log.Debug("Error loading call list items: {0}", e.Message);
}
return result;
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs 2011-12-01 20:35:25 UTC (rev 4362)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs 2011-12-03 16:12:08 UTC (rev 4363)
@@ -41,26 +41,8 @@
this.dialport = dialport;
}
- private string getChallenge()
+ public bool alreadyLoggedIn()
{
- string response = null;
- try
- {
- WebClient client = new WebClient();
- response = client.DownloadString(baseurl + "?getpage=../html/login_sid.xml");
- }
- catch (WebException)
- {
- //useSidAuthentication = false;
- return "";
- }
- Regex exp = new Regex(@"<Challenge>(.*)</Challenge>", RegexOptions.Multiline);
- MatchCollection matchList = exp.Matches(response);
- return matchList[0].Groups[1].Value;
- }
-
- private bool alreadyLoggedIn()
- {
return loggedIn;
}
@@ -122,85 +104,53 @@
{
byte[] result = { 0 } ;
- if (!String.IsNullOrEmpty(passwd))
- {
- if (forceReload || DateTime.Now.Subtract(lastCallListUpdate).Minutes > 2) result = loadCallListDataInternal();
- else
- {
- // try local cache
- Log.Debug("try to load call list from cache");
+ if (!loggedIn) login();
- lock (cacheSync)
- {
- // read data from cache
- try
- {
- if (File.Exists(cacheFileName)) result = File.ReadAllBytes(cacheFileName);
- }
- catch
- {
- Log.Debug("cached call list could not be loaded");
- }
- }
-
- if (result == null) result = loadCallListDataInternal();
- }
- }
- else Log.Debug("FritzBox password is not set. Call list cannot be loaded");
-
- return result;
- }
-
- private System.Object cacheSync = new System.Object();
-
- /// <summary>
- /// load internally (really remote) and put result to cache
- /// </summary>
- /// <returns></returns>
- protected byte[] loadCallListDataInternal()
- {
- byte[] result = { 0 };
-
- Log.Debug("load call list from FritzBox");
-
- if (!String.IsNullOrEmpty(passwd))
+ if (alreadyLoggedIn() && (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) login();
-
- refresh();
-
- lastCallListUpdate = DateTime.Now; // update time stamp
- WebClient client = new WebClient();
-
- client.Headers.Add("Cache-Control", "max-age=0");
- result = client.DownloadData(baseurl + "?sid=" + sid + "&getpage=../html/de/FRITZ%21Box_Anrufliste.csv");
-
- lock (cacheSync)
- {
- // put data to cache
- File.WriteAllBytes(cacheFileName, result);
- }
+ result = loadCallListDataInternal();
}
catch
{
- Log.Debug("call list could not be loaded");
+ Log.Debug("could not load call list from FRITZ!Box");
}
}
- else Log.Debug("FritzBox password is not set. Call list cannot be loaded");
+ else
+ {
+ // download from local cache
+ Log.Debug("trying to load call list from local cache...");
+ 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;
}
public string loadPhoneBook()
{
- if (!String.IsNullOrEmpty(passwd))
+ if (!loggedIn) login();
+
+ if (alreadyLoggedIn())
{
try
{
- if (!loggedIn) login();
-
string postdata =
"-----------------------------88612920297\r\n" +
"Content-Disposition: form-data; name=\"sid\"\r\n" +
@@ -225,17 +175,80 @@
}
catch
{
- Log.Debug("Error on loading phone book");
+ Log.Debug("error on loading phone book");
return "";
}
}
else
{
- Log.Debug("FritzBox password is not set. Phone book cannot be loaded");
+ Log.Debug("no connection to FRITZ!Box. Phone book cannot be loaded");
return "";
}
}
+ /// <summary>
+ /// dial a number on fritz
+ /// </summary>
+ /// <param name="number">number to dial</param>
+ /// <param name="dialport">port to use</param>
+ public void dial(string number)
+ {
+ if (!loggedIn) login();
+
+ string postdata = String.Format(
+ "getpage=../html/de/menus/menu2.html&var:lang=de&sid={0}" +
+ "&telcfg:settings/UseClickToDial=1&telcfg:command/Dial={1}" +
+ "&telcfg:settings/DialPort={2}",
+ this.sid, number, dialport);
+
+ PostRequest(baseurl, postdata);
+ }
+
+ private string getChallenge()
+ {
+ string response = null;
+ try
+ {
+ WebClient client = new WebClient();
+ response = client.DownloadString(baseurl + "?getpage=../html/login_sid.xml");
+ }
+ catch (WebException)
+ {
+ //useSidAuthentication = false;
+ return "";
+ }
+ Regex exp = new Regex(@"<Challenge>(.*)</Challenge>", RegexOptions.Multiline);
+ MatchCollection matchList = exp.Matches(response);
+ return matchList[0].Groups[1].Value;
+ }
+
+ private System.Object cacheSync = new System.Object();
+
+ /// <summary>
+ /// load internally (really remote) and put result to cache
+ /// </summary>
+ /// <returns></returns>
+ protected byte[] loadCallListDataInternal()
+ {
+ byte[] result = { 0 };
+
+ refresh();
+
+ lastCallListUpdate = DateTime.Now; // update time stamp
+ WebClient client = new WebClient();
+
+ client.Headers.Add("Cache-Control", "max-age=0");
+ result = client.DownloadData(baseurl + "?sid=" + sid + "&getpage=../html/de/FRITZ%21Box_Anrufliste.csv");
+
+ lock (cacheSync)
+ {
+ // put data to cache
+ File.WriteAllBytes(cacheFileName, result);
+ }
+
+ return result;
+ }
+
protected string PostRequest(string url, string postdata)
{
return PostRequest(url, postdata, "application/x-www-form-urlencoded", "UTF-8");
@@ -271,22 +284,5 @@
return "";
}
}
-
- /// <summary>
- /// dial a number on fritz
- /// </summary>
- /// <param name="number">number to dial</param>
- /// <param name="dialport">port to use</param>
- public void dial(string number)
- {
- if (!loggedIn) login();
- string postdata = String.Format(
- "getpage=../html/de/menus/menu2.html&var:lang=de&sid={0}" +
- "&telcfg:settings/UseClickToDial=1&telcfg:command/Dial={1}" +
- "&telcfg:settings/DialPort={2}",
- this.sid, number, dialport);
-
- PostRequest(baseurl, postdata);
- }
}
}
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/PhonebookItem.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/PhonebookItem.cs 2011-12-01 20:35:25 UTC (rev 4362)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/PhonebookItem.cs 2011-12-03 16:12:08 UTC (rev 4363)
@@ -6,57 +6,57 @@
namespace FritzManager
{
- public class InternalPhoneBook
- {
- static Logger Log = LoggerFactory.getLogger("InternalPhoneBook");
-
- public List<PhonebookItem> items = new List<PhonebookItem>();
-
- public static void savePhonebook(GCollections.ICollection<PhonebookItem> items, string fileName)
+ public class InternalPhoneBook
{
- InternalPhoneBook book = new InternalPhoneBook();
- Log.Debug("Saving internal phoneBook to {0}", fileName);
+ static Logger Log = LoggerFactory.getLogger("InternalPhoneBook");
- foreach (PhonebookItem i in items)
- {
- book.items.Add(i);
- }
+ public List<PhonebookItem> items = new List<PhonebookItem>();
- XmlSerializer s = new XmlSerializer(typeof (InternalPhoneBook));
- TextWriter w = new StreamWriter(fileName);
+ public static void savePhonebook(GCollections.ICollection<PhonebookItem> items, string fileName)
+ {
+ InternalPhoneBook book = new InternalPhoneBook();
+ Log.Debug("Saving internal phoneBook to {0}", fileName);
- s.Serialize(w, book);
+ foreach (PhonebookItem i in items)
+ {
+ book.items.Add(i);
+ }
- w.Close();
- }
+ XmlSerializer s = new XmlSerializer(typeof(InternalPhoneBook));
+ TextWriter w = new StreamWriter(fileName);
- public static HashMap<string, PhonebookItem> loadPhoneBook(string fileName)
- {
- HashMap<string, PhonebookItem> result = new HashMap<string, PhonebookItem>();
+ s.Serialize(w, book);
- if (File.Exists(fileName))
- {
- Log.Debug("Loading internal phone book from {0}", fileName);
-
- XmlSerializer s = new XmlSerializer(typeof (InternalPhoneBook));
- TextReader r = new StreamReader(fileName);
- InternalPhoneBook l = (InternalPhoneBook) s.Deserialize(r);
-
- r.Close();
+ w.Close();
+ }
- foreach (PhonebookItem i in l.items)
+ public static HashMap<string, PhonebookItem> loadPhoneBook(string fileName)
{
- result[i.number] = i;
+ HashMap<string, PhonebookItem> result = new HashMap<string, PhonebookItem>();
+
+ if (File.Exists(fileName))
+ {
+ Log.Debug("Loading FritzManager phone book from {0}", fileName);
+
+ XmlSerializer s = new XmlSerializer(typeof(InternalPhoneBook));
+ TextReader r = new StreamReader(fileName);
+ InternalPhoneBook l = (InternalPhoneBook)s.Deserialize(r);
+
+ r.Close();
+
+ foreach (PhonebookItem i in l.items)
+ {
+ result[i.number] = i;
+ }
+ }
+ else
+ {
+ Log.Debug("Could not load FritzManager phone book, file {0} not found", fileName);
+ }
+
+ return result;
}
- }
- else
- {
- Log.Debug("Could not load internal phone book, file {0} not found", fileName);
- }
-
- return result;
}
- }
/// <summary>
/// Description of PhonebookItem.
Added: trunk/plugins/FritzBox/FritzBox/FritzManager/StringEncryption.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/StringEncryption.cs (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/StringEncryption.cs 2011-12-03 16:12:08 UTC (rev 4363)
@@ -0,0 +1,106 @@
+using System;
+using System.Text;
+using System.Security.Cryptography;
+
+namespace FritzBox
+{
+ class StringEncryption
+ {
+ public static string EncryptString(string Message, string Passphrase)
+ {
+ byte[] Results;
+ System.Text.UTF8Encoding UTF8 = new System.Text.UTF8Encoding();
+
+ if (!String.IsNullOrEmpty(Message) && !String.IsNullOrEmpty(Passphrase))
+ {
+ // Step 1. We hash the passphrase using MD5
+ // We use the MD5 hash generator as the result is a 128 bit byte array
+ // which is a valid length for the TripleDES encoder we use below
+
+ MD5CryptoServiceProvider HashProvider = new MD5CryptoServiceProvider();
+ byte[] TDESKey = HashProvider.ComputeHash(UTF8.GetBytes(Passphrase));
+
+ // Step 2. Create a new TripleDESCryptoServiceProvider object
+ TripleDESCryptoServiceProvider TDESAlgorithm = new TripleDESCryptoServiceProvider();
+
+ // Step 3. Setup the encoder
+ TDESAlgorithm.Key = TDESKey;
+ TDESAlgorithm.Mode = CipherMode.ECB;
+ TDESAlgorithm.Padding = PaddingMode.PKCS7;
+
+ // Step 4. Convert the input string to a byte[]
+ byte[] DataToEncrypt = UTF8.GetBytes(Message);
+
+ // Step 5. Attempt to encrypt the string
+ try
+ {
+ ICryptoTransform Encryptor = TDESAlgorithm.CreateEncryptor();
+ Results = Encryptor.TransformFinalBlock(DataToEncrypt, 0, DataToEncrypt.Length);
+ }
+ finally
+ {
+ // Clear the TripleDes and Hashprovider services of any sensitive information
+ TDESAlgorithm.Clear();
+ HashProvider.Clear();
+ }
+
+ // Step 6. Return the encrypted string as a base64 encoded string
+ return Convert.ToBase64String(Results);
+ }
+ else return null;
+ }
+
+ public static string DecryptString(string Message, string Passphrase)
+ {
+ byte[] Results;
+ System.Text.UTF8Encoding UTF8 = new System.Text.UTF8Encoding();
+
+ if (!String.IsNullOrEmpty(Message) && !String.IsNullOrEmpty(Passphrase))
+ {
+ // Step 1. We hash the passphrase using MD5
+ // We use the MD5 hash generator as the result is a 128 bit byte array
+ // which is a valid length for the TripleDES encoder we use below
+
+ MD5CryptoServiceProvider HashProvider = new MD5CryptoServiceProvider();
+ byte[] TDESKey = HashProvider.ComputeHash(UTF8.GetBytes(Passphrase));
+
+ // Step 2. Create a new TripleDESCryptoServiceProvider object
+ TripleDESCryptoServiceProvider TDESAlgorithm = new TripleDESCryptoServiceProvider();
+
+ // Step 3. Setup the decoder
+ TDESAlgorithm.Key = TDESKey;
+ TDESAlgorithm.Mode = CipherMode.ECB;
+ TDESAlgorithm.Padding = PaddingMode.PKCS7;
+
+ // Step 4. Convert the input string to a byte[]
+ byte[] DataToDecrypt;
+
+ try
+ {
+ DataToDecrypt = Convert.FromBase64String(Message);
+ }
+ catch
+ {
+ return null;
+ }
+
+ // Step 5. Attempt to decrypt the string
+ try
+ {
+ ICryptoTransform Decryptor = TDESAlgorithm.CreateDecryptor();
+ Results = Decryptor.TransformFinalBlock(DataToDecrypt, 0, DataToDecrypt.Length);
+ }
+ finally
+ {
+ // Clear the TripleDes and Hashprovider services of any sensitive information
+ TDESAlgorithm.Clear();
+ HashProvider.Clear();
+ }
+
+ // Step 6. Return the decrypted string in UTF8 format
+ return UTF8.GetString(Results);
+ }
+ else return null;
+ }
+ }
+}
Modified: trunk/plugins/FritzBox/FritzBox/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Properties/AssemblyInfo.cs 2011-12-01 20:35:25 UTC (rev 4362)
+++ trunk/plugins/FritzBox/FritzBox/Properties/AssemblyInfo.cs 2011-12-03 16:12:08 UTC (rev 4363)
@@ -31,9 +31,9 @@
[assembly: AssemblyTitle("FRITZ!Box Manager")]
[assembly: AssemblyDescription("Displays FRITZ!Box calling information / phoneBook / voicebox.")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Rinke Solutions / Horned Reaper / chefkoch @ Team MediaPortal")]
+[assembly: AssemblyCompany("Horned Reaper, Steve, Chefkoch @ Team MediaPortal")]
[assembly: AssemblyProduct("FRITZ!Box Manager")]
-[assembly: AssemblyCopyright("Copyright © S.Rinke / Horned Reaper / chefkoch @ Team MediaPortal 2009")]
+[assembly: AssemblyCopyright("Horned Reaper, Steve, Chefkoch @ Team MediaPortal 2009")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
Modified: trunk/plugins/FritzBox/FritzBox/Settings.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Settings.cs 2011-12-01 20:35:25 UTC (rev 4362)
+++ trunk/plugins/FritzBox/FritzBox/Settings.cs 2011-12-03 16:12:08 UTC (rev 4363)
@@ -38,6 +38,8 @@
private static List<String> _msnList;
+ private const string encryptionPassphrase = "j/§=sFf)39=Jd&wVZj37";
+
#endregion Variables and constants
#region Properties
@@ -109,62 +111,68 @@
public static void Load()
{
- Log.Info("FRITZ!Box: Settings.Load()");
+ Log.Info("FRITZ!Box: Settings.Load()");
- PhoneBook.LoadSettings();
+ PhoneBook.LoadSettings();
- using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml")))
- {
- ExtensiveLogging = xmlreader.GetValueAsBool("fritzbox", "extensiveLogging", false);
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml")))
+ {
+ ExtensiveLogging = xmlreader.GetValueAsBool("fritzbox", "extensiveLogging", false);
- FritzBoxClient.Address = xmlreader.GetValueAsString("fritzbox", "address", "fritz.box");
- FritzBoxClient.Port = xmlreader.GetValueAsInt("fritzbox", "port", 1012);
+ FritzBoxClient.Address = xmlreader.GetValueAsString("fritzbox", "address", "fritz.box");
+ FritzBoxClient.Port = xmlreader.GetValueAsInt("fritzbox", "port", 1012);
- // notify settings
- MaxNotifies = xmlreader.GetValueAsInt("fritzbox", "maxNotifies", 20);
- CloseOnTimeout = xmlreader.GetValueAsBool("fritzbox", "closeOnTimeout", false);
- NotifyTimeout = xmlreader.GetValueAsInt("fritzbox", "timeout", 10);
- CloseOnConnectionClosed = xmlreader.GetValueAsBool("fritzbox", "closeOnConnectionClosed", true);
+ // notify settings
+ MaxNotifies = xmlreader.GetValueAsInt("fritzbox", "maxNotifies", 20);
+ CloseOnTimeout = xmlreader.GetValueAsBool("fritzbox", "closeOnTimeout", false);
+ NotifyTimeout = xmlreader.GetValueAsInt("fritzbox", "timeout", 10);
+ CloseOnConnectionClosed = xmlreader.GetValueAsBool("fritzbox", "closeOnConnectionClosed", true);
- //if ((!CloseOnTimeout) || (NotifyTimeout == 0))
- //NotifyTimeout = -1;
+ //if ((!CloseOnTimeout) || (NotifyTimeout == 0))
+ //NotifyTimeout = -1;
- FilterMSN = xmlreader.GetValueAsBool("fritzbox", "filterMSNs", false);
- string strMSN = xmlreader.GetValueAsString("fritzbox", "MSN", "");
- char[] charSeparators = new[] {';'};
- MSNList.AddRange(strMSN.Split(charSeparators, StringSplitOptions.RemoveEmptyEntries));
+ FilterMSN = xmlreader.GetValueAsBool("fritzbox", "filterMSNs", false);
+ string strMSN = xmlreader.GetValueAsString("fritzbox", "MSN", "");
+ char[] charSeparators = new[] { ';' };
+ MSNList.AddRange(strMSN.Split(charSeparators, StringSplitOptions.RemoveEmptyEntries));
- ShowMSNOnNotify = xmlreader.GetValueAsBool("fritzbox", "showMSNOnNotify", true);
+ ShowMSNOnNotify = xmlreader.GetValueAsBool("fritzbox", "showMSNOnNotify", true);
- // media settings
- StopMedia = xmlreader.GetValueAsBool("fritzbox", "stopMedia", true);
- ResumeMedia = xmlreader.GetValueAsBool("fritzbox", "resumeMedia", true);
- IncomingSound = xmlreader.GetValueAsString("fritzbox", "incomingSound", "");
+ // media settings
+ StopMedia = xmlreader.GetValueAsBool("fritzbox", "stopMedia", true);
+ ResumeMedia = xmlreader.GetValueAsBool("fritzbox", "resumeMedia", true);
+ IncomingSound = xmlreader.GetValueAsString("fritzbox", "incomingSound", "");
- // new FritzManager settings
- FmPassword = xmlreader.GetValue("FritzManager", "passwd");
- FmVBPath = xmlreader.GetValue("FritzManager", "vBPath");
- FmDialPort = xmlreader.GetValue("FritzManager", "dialport");
- //todo: check if the other way to load the currentmode also works
- //string modestr = xmlreader.GetValue("FritzManager", "currentMode");
- //if (modestr != null && modestr != "")
- //{
- // FmCurrentMode = (FritzBoxGuiMode)Enum.Parse(typeof(FritzBoxGuiMode), modestr);
- //}
- FmCurrentMode = (FritzBoxGuiMode) xmlreader.GetValueAsInt("FritzManager", "currentMode", 0);
- FmUseInversSearch = xmlreader.GetValueAsBool("FritzManager", "useInversSearch", false);
- FmDefaultAreacode = xmlreader.GetValue("FritzManager", "defaultAreacode");
- FmUpdateInterval = xmlreader.GetValueAsInt("FritzManager", "updateInterval", 0);
-
- // delete obsolete setting entries
- xmlreader.RemoveEntry("fritzbox", "showMsnOnHeading");
- xmlreader.RemoveEntry("FritzManager", "abpath");
+ // FritzManager 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)
+ FmVBPath = xmlreader.GetValue("FritzManager", "vBPath");
+ FmDialPort = xmlreader.GetValue("FritzManager", "dialport");
+ //todo: check if the other way to load the currentmode also works
+ //string modestr = xmlreader.GetValue("FritzManager", "currentMode");
+ //if (modestr != null && modestr != "")
+ //{
+ // FmCurrentMode = (FritzBoxGuiMode)Enum.Parse(typeof(FritzBoxGuiMode), modestr);
+ //}
+ FmCurrentMode = (FritzBoxGuiMode)xmlreader.GetValueAsInt("FritzManager", "currentMode", 0);
+ FmUseInversSearch = xmlreader.GetValueAsBool("FritzManager", "useInversSearch", false);
+ FmDefaultAreacode = xmlreader.GetValue("FritzManager", "defaultAreacode");
+ FmUpdateInterval = xmlreader.GetValueAsInt("FritzManager", "updateInterval", 0);
- // loading current skin setting
- MediaPortalSkin = xmlreader.GetValueAsString("skin", "name", "DefaultWide");
- }
+ // 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");
+ }
- WriteToLog();
+ // loading current skin setting
+ MediaPortalSkin = xmlreader.GetValueAsString("skin", "name", "DefaultWide");
+ }
+
+ WriteToLog();
}
public static void Save()
@@ -200,7 +208,7 @@
xmlwriter.SetValue("fritzbox", "incomingSound", IncomingSound );
// new FritzManager settings
- xmlwriter.SetValue("FritzManager", "passwd", FmPassword);
+ xmlwriter.SetValue("FritzManager", "passwd", StringEncryption.EncryptString(FmPassword, encryptionPassphrase));
xmlwriter.SetValue("FritzManager", "vBPath", FmVBPath);
xmlwriter.SetValue("FritzManager", "dialport", FmDialPort);
xmlwriter.SetValueAsBool("FritzManager", "useInversSearch", FmUseInversSearch);
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin
___________________________________________________________________
Added: svn:ignore
+ GenericSkin
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.csproj.FileListAbsolute.txt
===================================================================
--- trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.FileListAbsolute.txt 2011-12-01 20:35:25 UTC (rev 4362)
+++ trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.FileListAbsolute.txt 2011-12-03 16:12:08 UTC (rev 4363)
@@ -1,12 +1,5 @@
-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\GenerateResource.read.1.tlog
-D:\FritzBox\FritzBox\obj\Debug\GenerateResource.write.1.tlog
D:\Programme\Team MediaPortal\MediaPortal\plugins\Windows\FritzBox.dll
D:\Programme\Team MediaPortal\MediaPortal\plugins\Windows\FritzBox.pdb
-D:\FritzBox\FritzBox\obj\Debug\FritzBox.dll
-D:\FritzBox\FritzBox\obj\Debug\FritzBox.pdb
D:\FritzBox\FritzBox\FritzBox\bin\Release\FritzBox.dll
D:\FritzBox\FritzBox\FritzBox\bin\Release\FritzBox.pdb
D:\FritzBox\FritzBox\FritzBox\bin\Release\Common.Utils.dll
@@ -39,6 +32,13 @@
D:\FritzBox\FritzBox\bin\Release\BassRegistration.dll
D:\FritzBox\FritzBox\bin\Release\MediaPortal.Support.dll
D:\FritzBox\FritzBox\bin\Release\Interop.WMPLib.dll
+D:\FritzBox\FritzBox\bin\Release\Interop.SHDocVw.dll
D:\FritzBox\FritzBox\bin\Release\log4net.dll
D:\FritzBox\FritzBox\bin\Release\Ionic.Zip.dll
-D:\FritzBox\FritzBox\bin\Release\Interop.SHDocVw.dll
+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\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
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.read.1.tlog
===================================================================
(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-01 20:35:25 UTC (rev 4362)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2011-12-03 16:12:08 UTC (rev 4363)
@@ -559,7 +559,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4359</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4362</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -574,22 +574,30 @@
<GeneralInfo>
<Name>FritzBox Manager</Name>
<Id>8cb6bbc2-5473-4a63-a8f9-e0bec7c8c81c</Id>
- <Author>Steve, Horned Reaper, 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/new-plugin-fritzbox-manager-update-merged-plugin-0-3-4-9-a-74531/</ForumPage>
- <UpdateUrl />
+ <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>4359</Revision>
+ <Revision>4362</Revision>
</Version>
- <ExtensionDescription>This plugin is a combination of the former fritz call monitor and the new fritz manager.</ExtensionDescription>
+ <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 />
- <ReleaseDate>2011-12-01T10:05:03.1294614+01:00</ReleaseDate>
- <Tags />
+ <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>
@@ -1003,7 +1011,7 @@
</FolderGroup>
</FolderGroups>
<ProjectFilename>FritzBox.xmp2</ProjectFilename>
- <UpdatePath1>C:\Documents and Settings\All Users\Application Data\Team MediaPortal\MediaPortal\language\strings_de.xml</UpdatePath1>
+ <UpdatePath1>update.xml</UpdatePath1>
<UpdatePath2 />
<UpdatePath3 />
</ProjectSettings>
Added: trunk/plugins/FritzBox/MpeRelease/update.xml
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/update.xml (rev 0)
+++ trunk/plugins/FritzBox/MpeRelease/update.xml 2011-12-03 16:12:08 UTC (rev 4363)
@@ -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>
+...
[truncated message content] |
|
From: <hor...@us...> - 2011-12-04 10:46:13
|
Revision: 4364
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4364&view=rev
Author: horned-reaper
Date: 2011-12-04 10:46:06 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/FritzBox/FritzManager/StringEncryption.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/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/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/FritzBox/FritzManager/StringEncryption.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/StringEncryption.cs 2011-12-03 16:12:08 UTC (rev 4363)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/StringEncryption.cs 2011-12-04 10:46:06 UTC (rev 4364)
@@ -1,11 +1,14 @@
using System;
using System.Text;
using System.Security.Cryptography;
+using FritzManager;
namespace FritzBox
{
class StringEncryption
{
+ static Logger Log = LoggerFactory.getLogger("FritzBox");
+
public static string EncryptString(string Message, string Passphrase)
{
byte[] Results;
@@ -37,6 +40,11 @@
ICryptoTransform Encryptor = TDESAlgorithm.CreateEncryptor();
Results = Encryptor.TransformFinalBlock(DataToEncrypt, 0, DataToEncrypt.Length);
}
+ catch (Exception e)
+ {
+ Log.Debug("Error on encrypting string: " + e.Message);
+ return null;
+ }
finally
{
// Clear the TripleDes and Hashprovider services of any sensitive information
@@ -79,8 +87,9 @@
{
DataToDecrypt = Convert.FromBase64String(Message);
}
- catch
+ catch (Exception e)
{
+ Log.Debug("Error on decrypting string: " + e.Message);
return null;
}
@@ -90,6 +99,11 @@
ICryptoTransform Decryptor = TDESAlgorithm.CreateDecryptor();
Results = Decryptor.TransformFinalBlock(DataToDecrypt, 0, DataToDecrypt.Length);
}
+ catch (Exception e)
+ {
+ Log.Debug("Error on decrypting string: " + e.Message);
+ return null;
+ }
finally
{
// Clear the TripleDes and Hashprovider services of any sensitive information
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/MpeRelease/FritzBox.xmp2
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2011-12-03 16:12:08 UTC (rev 4363)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2011-12-04 10:46:06 UTC (rev 4364)
@@ -584,7 +584,7 @@
<Build>5</Build>
<Revision>4362</Revision>
</Version>
- <ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box informations in MediaPortal.
+ <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
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-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.
|
|
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-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: <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-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...> - 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: <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: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: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 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-08 07:31:26
|
Revision: 4390
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4390&view=rev
Author: horned-reaper
Date: 2012-01-08 07:31:19 +0000 (Sun, 08 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/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/releases/FritzBox_v0.4.0.4389.mpe1
Modified: trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat
===================================================================
--- trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat 2012-01-07 19:39:56 UTC (rev 4389)
+++ trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat 2012-01-08 07:31:19 UTC (rev 4390)
@@ -8,7 +8,7 @@
if not "%ProgramFiles(x86)%".=="". set ProgramDir=%ProgramFiles(x86)%
REM Set build path
-set BuildPath=%ProgramDir%\Team MediaPortal\MediaPortal\plugins\Windows
+set BuildPath=..\FritzBox\bin\Release
REM Set plugin DLL path
set PluginDLL=%BuildPath%\FritzBox.dll
@@ -43,11 +43,11 @@
echo.
echo Reading the version number...
if not exist "%PluginDLL%" goto version_error
-for /f "Tokens=5" %%a in ('filever "%plugindll%"') do set version=%%a
+for /f "Tokens=5" %%a in ('filever "%PluginDLL%"') do set version=%%a
goto :version_done
:version_error
-echo fritzbox.dll not found. version could not be read >> %LOG%
-echo fritzbox.dll not found. version could not be read. Build is cancelled
+echo FritzBox.dll not found. version could not be read >> %LOG%
+echo FritzBox.dll not found. version could not be read. Build is cancelled
pause
goto :EOF
:version_done
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2012-01-07 19:39:56 UTC (rev 4389)
+++ trunk/plugins/FritzBox/Build/Build.log 2012-01-08 07:31:19 UTC (rev 4390)
@@ -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: 4389
+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:50:23.
+Build started 07.01.2012 23:13:40.
Project "D:\FritzBox\FritzBox.sln" on node 1 (Rebuild target(s)).
ValidateSolutionConfiguration:
Building solution configuration "Release|Mixed Platforms".
@@ -150,8 +154,6 @@
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:
@@ -193,9 +195,14 @@
0 Warning(s)
0 Error(s)
-Time Elapsed 00:00:02.09
+Time Elapsed 00:00:01.91
Reverting to build 0
-C:\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\FritzBox.dll
+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
1 File(s) copied
@@ -273,7 +280,7 @@
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
36 File(s) copied
MpeMaker version: 1.2.1.0
-Build started at 17:50:27
+Build started at 23:13:44
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Modified: trunk/plugins/FritzBox/Docs/Ausstehend.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Ausstehend.txt 2012-01-07 19:39:56 UTC (rev 4389)
+++ trunk/plugins/FritzBox/Docs/Ausstehend.txt 2012-01-08 07:31:19 UTC (rev 4390)
@@ -9,8 +9,6 @@
- GUI-Properties \xFCberpr\xFCfen und Dokumentation vervollst\xE4ndigen
Neue Funktionen:
-- Telefonbuch-Konsolidierung
- - Handbuch aktualisieren
- Schalter zum Deaktivieren von Benachrichtigungen bei ausgehenden Anrufen
- Rufnummer-Typ hinzuf\xFCgen
- GUI-Adressbuch
@@ -49,4 +47,7 @@
Burkh2407, 30.12.2011:
ich benutze Stremed MP... mich st\xF6rt das ich zum Umschalten zwischen den einzelnen Listen seitlich ins Untermen\xFC wechseln
mu\xDF warum gibt es kein Buttons wo ich die Listen direKt anw\xE4hlen kann oder \xFCbersehe ich da was.
-Gru\xDF Burkh2407
\ No newline at end of file
+Gru\xDF Burkh2407
+
+IchBinsShort, 05.01.2012, 18:02:.
+Noch eine andere Frage ist es auch m\xF6glich das bei ausgehenden Anrufen nur bei bestimmten Handger\xE4ten der Pause Befehl gesendet wird. Ich benutze drei Funktelefone \xFCber die Dect Funktion der Fritzbox 7020, Garten, Eltern und bei mir. W\xE4re also sch\xF6n wenn nur auf Pause gestellt wird wenn von meinem Telefon eine Anruf get\xE4tigt wird.
\ No newline at end of file
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 19:39:56 UTC (rev 4389)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2012-01-08 07:31:19 UTC (rev 4390)
@@ -559,7 +559,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.0</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4389</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -582,7 +582,7 @@
<Major>0</Major>
<Minor>4</Minor>
<Build>0</Build>
- <Revision>0</Revision>
+ <Revision>4389</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>2012-01-07T17:50:27.4469452+01:00</ReleaseDate>
+ <ReleaseDate>2012-01-07T23:13:44.2036574+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 19:39:56 UTC (rev 4389)
+++ trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.csproj.FileListAbsolute.txt 2012-01-08 07:31:19 UTC (rev 4390)
@@ -25,3 +25,5 @@
D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\FritzBox.pdb
D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.read.6.tlog
D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.write.6.tlog
+D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.read.7.tlog
+D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.write.7.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/releases/FritzBox_v0.4.0.4389.mpe1
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/releases/FritzBox_v0.4.0.4389.mpe1
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/FritzBox/releases/update.xml
===================================================================
--- trunk/plugins/FritzBox/releases/update.xml 2012-01-07 19:39:56 UTC (rev 4389)
+++ trunk/plugins/FritzBox/releases/update.xml 2012-01-08 07:31:19 UTC (rev 4390)
@@ -88,7 +88,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.0</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4389</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -111,7 +111,7 @@
<Major>0</Major>
<Minor>4</Minor>
<Build>0</Build>
- <Revision>0</Revision>
+ <Revision>4389</Revision>
</Version>
<ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box informations from MediaPortal.
@@ -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:50:27.4469452+01:00</ReleaseDate>
+ <ReleaseDate>2012-01-07T23:13:44.2036574+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-09 19:40:53
|
Revision: 4399
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4399&view=rev
Author: horned-reaper
Date: 2012-01-09 19:40:41 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/FritzBox/FritzBox.cs
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/Fritz.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/Task.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.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/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/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/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/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/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/Tools/FritzBoxDebugger/obj/Release/GenerateResource.read.7.tlog
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.write.7.tlog
trunk/plugins/FritzBox/releases/update.xml
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2012-01-08 22:16:47 UTC (rev 4398)
+++ trunk/plugins/FritzBox/Build/Build.log 2012-01-09 19:40:41 UTC (rev 4399)
@@ -1,16 +1,12 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4389
-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 23:13:40.
+Build started 09.01.2012 18:24:45.
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.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".
@@ -195,13 +193,8 @@
0 Warning(s)
0 Error(s)
-Time Elapsed 00:00:01.91
+Time Elapsed 00:00:05.87
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
@@ -280,7 +273,7 @@
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
36 File(s) copied
MpeMaker version: 1.2.1.0
-Build started at 23:13:44
+Build started at 18:24:56
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2012-01-08 22:16:47 UTC (rev 4398)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2012-01-09 19:40:41 UTC (rev 4399)
@@ -239,9 +239,10 @@
// show call notification
ShowNotify(callAction.Type, strHeading, strImage, strText);
}
- // update call list and voice box items
+ // update call list and voice box items and refresh GUI
worker.queue.Enqueue(new Task(Task.TaskAction.LoadCallListItems, null));
worker.queue.Enqueue(new Task(Task.TaskAction.LoadVoiceBoxItems, null));
+ worker.queue.Enqueue(new Task(Task.TaskAction.RefreshView, null));
}
}
@@ -632,7 +633,7 @@
// display error on missing FRITZ!Box settings
if (String.IsNullOrEmpty(Settings.Password) && String.IsNullOrEmpty(Settings.VBPath)) showError(GUILocalizeStrings.Get(24)); // 24 = FRITZ!Box password and voice box path are missing in settings!
- refreshView(Settings.CurrentMode);
+ RefreshView(Settings.CurrentMode);
loadDataInBackground();
}
@@ -678,7 +679,7 @@
}
/// <summary>
- /// update data for the views.
+ /// update data for the views and show the wait cursor. Practical for user-initiated view updates
/// </summary>
/// <param name="forceReload">if set the data is loaded during the update in any case</param>
protected void updateGUI(bool forceReload)
@@ -692,7 +693,7 @@
else if (Settings.CurrentMode == GUIMode.PhoneBook && forceReload) SynchronizePhoneBook();
}
- refreshView(Settings.CurrentMode);
+ RefreshView(Settings.CurrentMode);
updateButtonStates();
@@ -734,7 +735,7 @@
{
voiceBoxItemList = newVoiceBoxItemList;
- refreshView(GUIMode.VoiceBox);
+ worker.queue.Enqueue(new Task(Task.TaskAction.RefreshView, null));
}
}
else Log.Debug("No voice box items on the FRITZ!Box");
@@ -745,7 +746,7 @@
public void SynchronizePhoneBook()
{
- if (phoneBook.SynchronizePhoneBook()) refreshView(GUIMode.PhoneBook);
+ if (phoneBook.SynchronizePhoneBook()) worker.queue.Enqueue(new Task(Task.TaskAction.RefreshView, null));
}
public void SynchronizeContactImages()
@@ -754,9 +755,10 @@
}
/// <summary>
- /// refreshes the view. call when backing lists / maps have changed
+ /// refreshes a particular view. Practical for automatic view updates
/// </summary>
- protected void refreshView(GUIMode gUIMode)
+ /// <param name="forceReload">the view to be updated</param>
+ public void RefreshView(GUIMode gUIMode)
{
if (Settings.CurrentMode == gUIMode && windowIsDisplayed)
{
@@ -822,7 +824,7 @@
{
callItemList = newCallItemList;
- refreshView(GUIMode.CallList);
+ worker.queue.Enqueue(new Task(Task.TaskAction.RefreshView, null));
}
}
else Log.Debug("No voice box items on the FRITZ!Box");
@@ -1177,7 +1179,7 @@
break;
}
- refreshView(Settings.CurrentMode);
+ RefreshView(Settings.CurrentMode);
updateButtonStates();
Modified: trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/CallAction.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/CallAction.cs 2012-01-08 22:16:47 UTC (rev 4398)
+++ trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/CallAction.cs 2012-01-09 19:40:41 UTC (rev 4399)
@@ -34,7 +34,7 @@
Incoming,
Outgoing,
ConnectionStarted,
- ConnectionClosed,
+ ConnectionClosed
}
#endregion
Modified: trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/Caller.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/Caller.cs 2012-01-08 22:16:47 UTC (rev 4398)
+++ trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/Caller.cs 2012-01-09 19:40:41 UTC (rev 4399)
@@ -22,26 +22,6 @@
namespace FritzBox
{
- //public class Caller
- //{
- // public Caller()
- // {
- // ID = string.Empty;
- // Name = string.Empty;
- // Show = true;
- // }
-
- // public Caller(string id, string name, bool show)
- // {
- // ID = id;
- // Name = name;
- // Show = show;
- // }
-
- // public string ID { get; set; }
- // public string Name { get; set; }
- // public bool Show { get; set; }
- //}
public class Caller
{
public Caller()
Modified: trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs 2012-01-08 22:16:47 UTC (rev 4398)
+++ trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs 2012-01-09 19:40:41 UTC (rev 4399)
@@ -331,21 +331,18 @@
case "RING":
callAction.Type = CallAction.CallType.Incoming;
- // sets the callerID
callAction.Caller.PhoneNumber = strList[3];
callAction.MSN = strList[4];
break;
case "CALL":
callAction.Type = CallAction.CallType.Outgoing;
- // sets the callerID
callAction.Caller.PhoneNumber = strList[5];
callAction.MSN = strList[4];
break;
case "CONNECT":
callAction.Type = CallAction.CallType.ConnectionStarted;
- // sets the callerID
callAction.Caller.PhoneNumber = strList[4];
break;
case "DISCONNECT":
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/BackGroundWorker.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/BackGroundWorker.cs 2012-01-08 22:16:47 UTC (rev 4398)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/BackGroundWorker.cs 2012-01-09 19:40:41 UTC (rev 4399)
@@ -60,6 +60,11 @@
Log.Debug("Running temp file cleanup task");
plugin.CleanupTempFiles();
break;
+
+ case Task.TaskAction.RefreshView:
+ Log.Debug("Running refresh view task");
+ plugin.RefreshView(FritzBox.Settings.CurrentMode);
+ break;
}
}
}
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs 2012-01-08 22:16:47 UTC (rev 4398)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs 2012-01-09 19:40:41 UTC (rev 4399)
@@ -4,6 +4,7 @@
using System.Security.Cryptography;
using System.Text;
using System.Text.RegularExpressions;
+using Microsoft.Win32;
namespace FritzManager
{
@@ -33,6 +34,9 @@
this.cacheDir = cacheDir;
this.cacheFileName = cacheDir + "\\FritzBox-CallList.csv";
this.dialport = dialport;
+
+ // start monitoring Windows power mode changes (Standby & Hibernate)
+ SystemEvents.PowerModeChanged += new PowerModeChangedEventHandler(SystemEvents_PowerModeChanged);
}
public bool LoggedIn
@@ -120,7 +124,7 @@
public byte[] loadCallListData(bool forceReload)
{
- byte[] result = { 0 } ;
+ byte[] result = { 0 };
if (loggedIn && (forceReload || DateTime.Now.Subtract(lastCallListUpdate).Minutes > 2))
{
@@ -136,7 +140,7 @@
result = loadCachedCallListData();
}
-
+
return result;
}
@@ -144,6 +148,8 @@
{
if (LoggedIn)
{
+ string returnData;
+
try
{
string postdata =
@@ -166,20 +172,24 @@
"-----------------------------88612920297--\r\n" +
"\r\n";
- return PostRequest("http://" + hostname + "/cgi-bin/firmwarecfg", postdata, "multipart/form-data; boundary=---------------------------88612920297", "ISO-8859-15");
+ returnData = PostRequest("http://" + hostname + "/cgi-bin/firmwarecfg", postdata, "multipart/form-data; boundary=---------------------------88612920297", "ISO-8859-15");
+
+ if (!returnData.StartsWith("<!DOCTYPE html")) return returnData; // check if return data is FRITZ!Box logon page
+ else
+ {
+ loggedIn = false;
+ Log.Debug("Not logged in to FRITZ!Box. Phone book cannot be loaded");
+ }
}
catch
{
Log.Debug("Error on loading phone book from FRITZ!Box");
loggedIn = false;
- return "";
}
}
- else
- {
- Log.Debug("No connection to FRITZ!Box. Phone book cannot be loaded");
- return "";
- }
+ else Log.Debug("Not logged in to FRITZ!Box. Phone book cannot be loaded");
+
+ return null;
}
/// <summary>
@@ -315,5 +325,18 @@
return "";
}
}
+
+ private void SystemEvents_PowerModeChanged(object sender, Microsoft.Win32.PowerModeChangedEventArgs e)
+ {
+ switch (e.Mode)
+ {
+ case PowerModes.Suspend:
+ loggedIn = false;
+ break;
+
+ case PowerModes.Resume:
+ break;
+ }
+ }
}
}
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs 2012-01-08 22:16:47 UTC (rev 4398)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs 2012-01-09 19:40:41 UTC (rev 4399)
@@ -158,7 +158,7 @@
string fritzPhoneBooksSerialized = fritz.loadPhoneBookFromFritzBox();
- if (fritzPhoneBooksSerialized != "")
+ if (fritzPhoneBooksSerialized != null)
{
XmlSerializer xmlSerializer = new XmlSerializer(typeof(FritzPhoneBooks));
fritzPhoneBooks = (FritzPhoneBooks)xmlSerializer.Deserialize(new StringReader(fritzPhoneBooksSerialized));
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/Task.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/Task.cs 2012-01-08 22:16:47 UTC (rev 4398)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/Task.cs 2012-01-09 19:40:41 UTC (rev 4399)
@@ -15,7 +15,8 @@
LoadVoiceBoxItems,
UpdateGUIProperties,
SynchronizeContactImages,
- CleanUpTempFiles
+ CleanUpTempFiles,
+ RefreshView
}
#endregion
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.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-08 22:16:47 UTC (rev 4398)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2012-01-09 19:40:41 UTC (rev 4399)
@@ -559,7 +559,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4389</DesignedForVersion>
+ <DesignedForVersion>1.1.7.0</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -582,7 +582,7 @@
<Major>0</Major>
<Minor>4</Minor>
<Build>0</Build>
- <Revision>4389</Revision>
+ <Revision>0</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>2012-01-07T23:13:44.2036574+01:00</ReleaseDate>
+ <ReleaseDate>2012-01-09T18:24:56.1938676+01:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
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/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/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/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/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.csproj.FileListAbsolute.txt
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.csproj.FileListAbsolute.txt 2012-01-08 22:16:47 UTC (rev 4398)
+++ trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.csproj.FileListAbsolute.txt 2012-01-09 19:40:41 UTC (rev 4399)
@@ -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.6.tlog
-D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.write.6.tlog
D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.read.7.tlog
D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.write.7.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/Tools/FritzBoxDebugger/obj/Release/GenerateResource.read.7.tlog
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.write.7.tlog
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/releases/update.xml
===================================================================
--- trunk/plugins/FritzBox/releases/update.xml 2012-01-08 22:16:47 UTC (rev 4398)
+++ trunk/plugins/FritzBox/releases/update.xml 2012-01-09 19:40:41 UTC (rev 4399)
@@ -88,7 +88,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4389</DesignedForVersion>
+ <DesignedForVersion>1.1.7.0</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -111,7 +111,7 @@
<Major>0</Major>
<Minor>4</Minor>
<Build>0</Build>
- <Revision>4389</Revision>
+ <Revision>0</Revision>
</Version>
<ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box informations from MediaPortal.
@@ -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-07T23:13:44.2036574+01:00</ReleaseDate>
+ <ReleaseDate>2012-01-09T18:24:56.1938676+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-10 23:26:54
|
Revision: 4401
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4401&view=rev
Author: horned-reaper
Date: 2012-01-10 22:45:33 +0000 (Tue, 10 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/Docs/Changes.txt
trunk/plugins/FritzBox/FritzBox/FritzBox.cs
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs
trunk/plugins/FritzBox/FritzBox/Languages/strings_en-US.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_en.xml
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.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/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/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/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/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
trunk/plugins/FritzBox/releases/update.xml
Added Paths:
-----------
trunk/plugins/FritzBox/Docs/Documentation/
trunk/plugins/FritzBox/Docs/Documentation/Data/
trunk/plugins/FritzBox/Docs/Documentation/Data/FRITZ!Box Manager Phone Book.xml
trunk/plugins/FritzBox/Docs/Documentation/Data/FritzBox-CallList.csv
trunk/plugins/FritzBox/Docs/Documentation/Screenshots/
trunk/plugins/FritzBox/Docs/Documentation/Screenshots/1.JPG
trunk/plugins/FritzBox/Docs/Documentation/Screenshots/2.JPG
trunk/plugins/FritzBox/Docs/Documentation/Screenshots/3.JPG
trunk/plugins/FritzBox/Docs/Documentation/Screenshots/4.JPG
trunk/plugins/FritzBox/Docs/Documentation/Screenshots/5.JPG
trunk/plugins/FritzBox/Docs/Documentation/Screenshots/6.JPG
trunk/plugins/FritzBox/Docs/Documentation/Screenshots/7.JPG
trunk/plugins/FritzBox/releases/FritzBox_v0.4.0.4400.mpe1
Removed Paths:
-------------
trunk/plugins/FritzBox/Docs/Install-de.txt
trunk/plugins/FritzBox/Docs/Install.txt
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.read.6.tlog
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.write.6.tlog
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2012-01-09 21:25:08 UTC (rev 4400)
+++ trunk/plugins/FritzBox/Build/Build.log 2012-01-10 22:45:33 UTC (rev 4401)
@@ -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: 4400
+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 09.01.2012 18:24:45.
+Build started 10.01.2012 23:18:05.
Project "D:\FritzBox\FritzBox.sln" on node 1 (Rebuild target(s)).
ValidateSolutionConfiguration:
Building solution configuration "Release|Mixed Platforms".
@@ -150,10 +154,10 @@
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".
- 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".
@@ -193,8 +197,13 @@
0 Warning(s)
0 Error(s)
-Time Elapsed 00:00:05.87
+Time Elapsed 00:00:01.90
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
@@ -273,7 +282,7 @@
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
36 File(s) copied
MpeMaker version: 1.2.1.0
-Build started at 18:24:56
+Build started at 23:18:09
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Modified: trunk/plugins/FritzBox/Docs/Changes.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Changes.txt 2012-01-09 21:25:08 UTC (rev 4400)
+++ trunk/plugins/FritzBox/Docs/Changes.txt 2012-01-10 22:45:33 UTC (rev 4401)
@@ -1,21 +0,0 @@
-New features:
-- FRITZ!Box phone book is now used only. The local FRITZ!Manager phone book (fritzbox.xml) has been replaced
-- automatic list update on changes
-- offline function for phone book
-- contact-specific sounds for incoming calls
-- reworked Configuration menu
-
-Optimizations:
-- improved performance: all data load is done in the background
-- main menu icon with transparent background (thanks to Peter2!)
-- improved handling with network connection interrupts
-
-Removed features (make no sense anymore if phone book is stored in FRITZ!Box):
-- inverse search
-- save unknown callers
-
-Fixed bugs:
-- MediaPortal crashes when network connection to FRITZ!Box is interrupted
-- voice box items are not displayed on the first menu call
-- the picture of the first contact is not automatically shown on menu openning
-- call list menu title is not shown when another menu (e. g. phone book) is active and you click on the filter button
\ No newline at end of file
Added: trunk/plugins/FritzBox/Docs/Documentation/Data/FRITZ!Box Manager Phone Book.xml
===================================================================
--- trunk/plugins/FritzBox/Docs/Documentation/Data/FRITZ!Box Manager Phone Book.xml (rev 0)
+++ trunk/plugins/FritzBox/Docs/Documentation/Data/FRITZ!Box Manager Phone Book.xml 2012-01-10 22:45:33 UTC (rev 4401)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<InternalPhoneBook xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <items>
+ <PhoneBookItem>
+ <ShowCallNotification>true</ShowCallNotification>
+ <Name>Angelina Jolie</Name>
+ <UniqueID>1321</UniqueID>
+ <PhoneNumbers>
+ <PhoneNumber prio="1" type="home">+00 (123) 45678</PhoneNumber>
+ </PhoneNumbers>
+ </PhoneBookItem>
+ <PhoneBookItem>
+ <ShowCallNotification>true</ShowCallNotification>
+ <Name>Tom Hanks</Name>
+ <UniqueID>1256</UniqueID>
+ <PhoneNumbers>
+ <PhoneNumber prio="1" type="home">+00 (456) 78901</PhoneNumber>
+ </PhoneNumbers>
+ </PhoneBookItem>
+ <PhoneBookItem>
+ <ShowCallNotification>true</ShowCallNotification>
+ <Name>Bruce Willis</Name>
+ <UniqueID>1224</UniqueID>
+ <PhoneNumbers>
+ <PhoneNumber prio="1" type="home">+00 (789) 98745</PhoneNumber>
+ </PhoneNumbers>
+ </PhoneBookItem>
+ </items>
+</InternalPhoneBook>
\ No newline at end of file
Added: trunk/plugins/FritzBox/Docs/Documentation/Data/FritzBox-CallList.csv
===================================================================
--- trunk/plugins/FritzBox/Docs/Documentation/Data/FritzBox-CallList.csv (rev 0)
+++ trunk/plugins/FritzBox/Docs/Documentation/Data/FritzBox-CallList.csv 2012-01-10 22:45:33 UTC (rev 4401)
@@ -0,0 +1,5 @@
+sep=;
+Typ;Datum;Name;Rufnummer;Nebenstelle;Eigene Rufnummer;Dauer
+
+2;08.01.12 08:41;Angelina Jolie;+00 (123) 45678;;123;0:06
+1;08.01.12 10:40;Tom Hanks;+00 (456) 78901;;123;0:16
Added: trunk/plugins/FritzBox/Docs/Documentation/Screenshots/1.JPG
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/Docs/Documentation/Screenshots/1.JPG
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/Docs/Documentation/Screenshots/2.JPG
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/Docs/Documentation/Screenshots/2.JPG
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/Docs/Documentation/Screenshots/3.JPG
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/Docs/Documentation/Screenshots/3.JPG
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/Docs/Documentation/Screenshots/4.JPG
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/Docs/Documentation/Screenshots/4.JPG
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/Docs/Documentation/Screenshots/5.JPG
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/Docs/Documentation/Screenshots/5.JPG
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/Docs/Documentation/Screenshots/6.JPG
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/Docs/Documentation/Screenshots/6.JPG
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/Docs/Documentation/Screenshots/7.JPG
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/Docs/Documentation/Screenshots/7.JPG
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/plugins/FritzBox/Docs/Install-de.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Install-de.txt 2012-01-09 21:25:08 UTC (rev 4400)
+++ trunk/plugins/FritzBox/Docs/Install-de.txt 2012-01-10 22:45:33 UTC (rev 4401)
@@ -1,144 +0,0 @@
-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
Deleted: trunk/plugins/FritzBox/Docs/Install.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Install.txt 2012-01-09 21:25:08 UTC (rev 4400)
+++ trunk/plugins/FritzBox/Docs/Install.txt 2012-01-10 22:45:33 UTC (rev 4401)
@@ -1,139 +0,0 @@
-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
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2012-01-09 21:25:08 UTC (rev 4400)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2012-01-10 22:45:33 UTC (rev 4401)
@@ -154,6 +154,15 @@
}
}
+ private void OnConnectedAction()
+ {
+ fritz.Login();
+
+ loadDataInBackground();
+
+ worker.queue.Enqueue(new Task(Task.TaskAction.RefreshView, null)); // schedule refresh view task
+ }
+
private void OnCall(CallAction callAction)
{
PhoneBookItem phoneBookItem = callAction.Caller.PhoneBookItem;
@@ -352,17 +361,49 @@
public void Start()
{
Log.Info("FRITZ!Box Manager {0} plugin is starting", Assembly.GetExecutingAssembly().GetName().Version);
+
Settings.Load();
+ // register events
Utils.OnStartExternal += OnStartExternal;
Utils.OnStopExternal += OnStopExternal;
FritzBoxClient.LogEvent += OnLogAction;
FritzBoxClient.CallEvent += OnCallAction;
+
+ FritzBoxClient.ConnectedEvent += OnConnectedAction;
+
+ SystemEvents.PowerModeChanged += new PowerModeChangedEventHandler(SystemEvents_PowerModeChanged); // power mode changes (Standby & Hibernate)
+
FritzBoxClient.StartClient();
+
+ thePlugin = this;
- // start monitoring Windows power mode changes (Standby & Hibernate)
- SystemEvents.PowerModeChanged += new PowerModeChangedEventHandler(SystemEvents_PowerModeChanged);
+ // open FRITZ!Box connection and login
+ fritz = new Fritz(Settings.Password, Config.GetFolder(Config.Dir.Config), FritzBoxClient.Address, Settings.DialPort);
+
+ // set session timer interval and start the timer
+ sessionTimer.Interval = 30000;
+ sessionTimer.Elapsed += OnSessionTimerEvent;
+ sessionTimer.Start();
+
+ // set update timer interval and start the timer
+ int updateInterval = Settings.UpdateInterval;
+
+ if (updateInterval != 0)
+ {
+ updateTimer.Interval = updateInterval * 1000; // interval is in sec
+ updateTimer.Elapsed += OnUpdateTimerEvent;
+ updateTimer.Start();
+ }
+
+ // load phone book from XML file
+ phoneBook = new PhoneBook(fritz);
+ phoneBook.LoadPhoneBookFromXMLFile();
+
+ startBackGroundWorker();
+
+ loadDataInBackground();
}
/// <summary>
@@ -373,15 +414,17 @@
Log.Info("FRITZ!Box Manager {0} plugin is stopping", Assembly.GetExecutingAssembly().GetName().Version);
FritzBoxClient.StopClient();
+
+ // unregister events
FritzBoxClient.CallEvent -= OnCallAction;
FritzBoxClient.LogEvent -= OnLogAction;
Utils.OnStartExternal -= OnStartExternal;
Utils.OnStopExternal -= OnStopExternal;
- // stop monitoring power changes
- SystemEvents.PowerModeChanged -= new PowerModeChangedEventHandler(SystemEvents_PowerModeChanged);
+ SystemEvents.PowerModeChanged -= new PowerModeChangedEventHandler(SystemEvents_PowerModeChanged); // power changes
+ // save phone book
phoneBook.SavePhoneBookToXMLFile();
}
@@ -525,9 +568,6 @@
private Thread workerThread;
// sync the access to call list
private System.Object sync = new System.Object();
- //private bool gUICallItemListUpdateIsRequired = true;
- //private bool gUIPhoneBookUpdateIsRequired = true;
- //private bool gUIVoiceBoxItemListUpdateIsRequired = true;
#endregion fields
@@ -539,7 +579,7 @@
Log.Debug("Init called");
Start();
- loadConfig();
+ //loadConfig();
return Load(GUIGraphicsContext.Skin + @"\FritzManager.xml");
}
@@ -592,38 +632,6 @@
filesToDelete.Clear();
}
- protected void loadConfig()
- {
- thePlugin = this;
-
- // open FRITZ!Box connection and login
- fritz = new Fritz(Settings.Password, Config.GetFolder(Config.Dir.Config), FritzBoxClient.Address, Settings.DialPort);
- fritz.Login();
-
- // set session timer interval and start the timer
- sessionTimer.Interval = 30000;
- sessionTimer.Elapsed += OnSessionTimerEvent;
- sessionTimer.Start();
-
- // set update timer interval and start the timer
- int updateInterval = Settings.UpdateInterval;
-
- if (updateInterval != 0)
- {
- updateTimer.Interval = updateInterval * 1000; // interval is in sec
- updateTimer.Elapsed += OnUpdateTimerEvent;
- updateTimer.Start();
- }
-
- // load phone book from XML file
- phoneBook = new PhoneBook(fritz);
- phoneBook.LoadPhoneBookFromXMLFile();
-
- startBackGroundWorker();
-
- loadDataInBackground();
- }
-
protected override void OnPageLoad()
{
windowIsDisplayed = true;
@@ -654,8 +662,7 @@
{
Log.Debug("Processing session timer event");
- if (!fritz.LoggedIn) fritz.Login();
- else
+ if (fritz.LoggedIn)
{
fritz.KeepAlive();
@@ -892,6 +899,7 @@
voiceBoxItemList.Sort(VoiceBoxItem.CompareByDate);
int i = 0;
Caller caller;
+ string callerName;
foreach (VoiceBoxItem voiceBoxItem in voiceBoxItemList)
{
@@ -905,8 +913,19 @@
if (mSNs.ContainsValue(voiceBoxItem.mynumber)) mSNName = mSNs[voiceBoxItem.mynumber];
elem.Label = (voiceBoxItem.isNew == 1 ? "* " : " ") + voiceBoxItem.time.ToString(format, ci);
- elem.Label2 = caller.PhoneBookItem.Name + " " + GUILocalizeStrings.Get(26) + " " + mSNName; // 26 = to
+
+ // add caller name/phone number and MSN
+ if (caller.PhoneBookItem != null) callerName = caller.PhoneBookItem.Name;
+ else
+ {
+ if (caller.PhoneNumber != "") callerName = caller.PhoneNumber;
+ else callerName = GUILocalizeStrings.Get(3); // 3 = Unknown
+ }
+
+ elem.Label2 = callerName + " " + GUILocalizeStrings.Get(26) + " " + mSNName; // 26 = to
+
elem.Path = Convert.ToString(i);
+
elem.IconImageBig = "defaultAudioBig.png";
elem.IconImage = "defaultAudio.png";
@@ -1009,10 +1028,14 @@
elem.Label = item.timestamp.ToString(format, ci) + " - " + item.duration.ToString("HH:mm", ci);
- // add caller name
- elem.Label2 = caller.PhoneBookItem.Name;
+ // add caller name/phone number
+ if (caller.PhoneBookItem != null) elem.Label2 = caller.PhoneBookItem.Name;
+ else
+ {
+ if (caller.PhoneNumber != "") elem.Label2 = caller.PhoneNumber;
+ else elem.Label2 = GUILocalizeStrings.Get(3); // 3 = Unknown
+ }
- // add phone number
elem.DVDLabel = item.mynumber + item.extension;
elem.Path = Convert.ToString(i);
@@ -1034,7 +1057,7 @@
facadeView.Add(elem);
}
}
- else Log.Debug("callItemList is not initialized");
+ else Log.Debug("call item list is not initialized");
}
private void showThumbPanel()
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2012-01-09 21:25:08 UTC (rev 4400)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2012-01-10 22:45:33 UTC (rev 4401)
@@ -173,6 +173,8 @@
private void checkBoxUsePhonebook_CheckedChanged(object sender, EventArgs e)
{
checkBoxShowUnknownCaller.Enabled = checkBoxUsePhonebook.Checked;
+
+ if (!checkBoxUsePhonebook.Checked) checkBoxShowUnknownCaller.Checked = true;
}
private void buttonMSNsAdd_Click(object sender, EventArgs e)
Modified: trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs 2012-01-09 21:25:08 UTC (rev 4400)
+++ trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs 2012-01-10 22:45:33 UTC (rev 4401)
@@ -76,6 +76,8 @@
public delegate void LogEventHandler(LogLevel logLevel, string logMessage);
+ public delegate void ConnectedEventHandler();
+
#endregion
private static readonly TimeSpan minConnectWaitTime = new TimeSpan(0, 0, 30);
@@ -101,6 +103,8 @@
public static event LogEventHandler LogEvent;
+ public static event ConnectedEventHandler ConnectedEvent;
+
#region Public methods
public static void StartClient()
@@ -223,6 +227,9 @@
_client.BeginConnect(Address, Port, ConnectCallback, _client);
Connected = true;
+
+ // Raise event
+ ConnectedEvent();
}
catch (SocketException)
{
@@ -256,7 +263,7 @@
}
catch (SocketException)
{
- Log(LogLevel.Error, "Connection faild: SocketException");
+ Log(LogLevel.Error, "Connection failed: SocketException");
ReConnect();
}
catch (Exception ex)
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs 2012-01-09 21:25:08 UTC (rev 4400)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs 2012-01-10 22:45:33 UTC (rev 4401)
@@ -146,48 +146,44 @@
public string loadPhoneBookFromFritzBox()
{
- if (LoggedIn)
+ string returnData;
+
+ try
{
- string returnData;
+ string postdata =
+ "-----------------------------88612920297\r\n" +
+ "Content-Disposition: form-data; name=\"sid\"\r\n" +
+ "\r\n" +
+ sid + "\r\n" +
+ "-----------------------------88612920297\r\n" +
+ "Content-Disposition: form-data; name=\"PhonebookId\"\r\n" +
+ "\r\n" +
+ "0\r\n" +
+ "-----------------------------88612920297\r\n" +
+ "Content-Disposition: form-data; name=\"PhonebookExportName\"\r\n" +
+ "\r\n" +
+ "Telefonbuch\r\n" +
+ "-----------------------------88612920297\r\n" +
+ "Content-Disposition: form-data; name=\"PhonebookExport\"\r\n" +
+ "\r\n" +
+ "\r\n" +
+ "-----------------------------88612920297--\r\n" +
+ "\r\n";
- try
- {
- string postdata =
- "-----------------------------88612920297\r\n" +
- "Content-Disposition: form-data; name=\"sid\"\r\n" +
- "\r\n" +
- sid + "\r\n" +
- "-----------------------------88612920297\r\n" +
- "Content-Disposition: form-data; name=\"PhonebookId\"\r\n" +
- "\r\n" +
- "0\r\n" +
- "-----------------------------88612920297\r\n" +
- "Content-Disposition: form-data; name=\"PhonebookExportName\"\r\n" +
- "\r\n" +
- "Telefonbuch\r\n" +
- "-----------------------------88612920297\r\n" +
- "Content-Disposition: form-data; name=\"PhonebookExport\"\r\n" +
- "\r\n" +
- "\r\n" +
- "-----------------------------88612920297--\r\n" +
- "\r\n";
+ returnData = PostRequest("http://" + hostname + "/cgi-bin/firmwarecfg", postdata, "multipart/form-data; boundary=---------------------------88612920297", "ISO-8859-15");
- returnData = PostRequest("http://" + hostname + "/cgi-bin/firmwarecfg", postdata, "multipart/form-data; boundary=---------------------------88612920297", "ISO-8859-15");
-
- if (!returnData.StartsWith("<!DOCTYPE html")) return returnData; // check if return data is FRITZ!Box logon page
- else
- {
- loggedIn = false;
- Log.Debug("Not logged in to FRITZ!Box. Phone book cannot be loaded");
- }
- }
- catch
+ if (!returnData.StartsWith("<!DOCTYPE html")) return returnData; // check if return data is FRITZ!Box logon page
+ else
{
- Log.Debug("Error on loading phone book from FRITZ!Box");
loggedIn = false;
+ Log.Debug("Not logged in to FRITZ!Box. Phone book cannot be loaded");
}
}
- else Log.Debug("Not logged in to FRITZ!Box. Phone book cannot be loaded");
+ catch
+ {
+ Log.Debug("Error on loading phone book from FRITZ!Box");
+ loggedIn = false;
+ }
return null;
}
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs 2012-01-09 21:25:08 UTC (rev 4400)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs 2012-01-10 22:45:33 UTC (rev 4401)
@@ -92,10 +92,8 @@
}
}
}
-
- // if no contact item was found return "Unknown" as name
- if (caller.PhoneBookItem == null) caller.PhoneBookItem = new PhoneBookItem(GUILocalizeStrings.Get(3)); // 3 = Unknown
+ // if no contact item was found return null
return caller;
}
@@ -122,8 +120,6 @@
{
InternalPhoneBook internalPhoneBook = new InternalPhoneBook();
- // ...
-
foreach (PhoneBookItem phoneBookItem in phoneBook.Values)
{
internalPhoneBook.items.Add(phoneBookItem);
@@ -162,111 +158,112 @@
{
XmlSerializer xmlSerializer = new XmlSerializer(typeof(FritzPhoneBooks));
fritzPhoneBooks = (FritzPhoneBooks)xmlSerializer.Deserialize(new StringReader(fritzPhoneBooksSerialized));
- }
- FritzManager.PhoneBook fritzPhoneBook = fritzPhoneBooks.Items[0]; // always choose first phone book
- PhoneBookItem tempPhoneBookItem;
- bool updateRequired, contactFound;
- string name, uniqueID, imageURL;
+ FritzManager.PhoneBook fritzPhoneBook = fritzPhoneBooks.Items[0]; // always choose first phone book
+ PhoneBookItem tempPhoneBookItem;
+ bool updateRequired, contactFound;
+ string name, uniqueID, imageURL;
- lock (sync)
- {
- // update/add entries from FRITZ!Box phone book to local phone book
- foreach (Contact contact in fritzPhoneBook.contact)
+ lock (sync)
{
- name = contact.person[0].realName;
- imageURL = contact.person[0].imageURL;
- uniqueID = contact.uniqueid;
+ // update/add entries from FRITZ!Box phone book to local phone book
+ foreach (Contact contact in fritzPhoneBook.contact)
+ {
+ name = contact.person[0].realName;
+ imageURL = contact.person[0].imageURL;
+ uniqueID = contact.uniqueid;
- updateRequired = false;
+ updateRequired = false;
- // search if FRITZ!Box contact already exists in phone book
- if (phoneBook.ContainsKey(uniqueID))
- {
- // check for differences
- for (int i = 0; i < contact.telephony.Length; i++)
+ // search if FRITZ!Box contact already exists in phone book
+ if (phoneBook.ContainsKey(uniqueID))
{
- try
+ // check for differences
+ for (int i = 0; i < contact.telephony.Length; i++)
{
- if (phoneBook[uniqueID].Name != name || !contact.telephony[i].Equals(phoneBook[uniqueID].PhoneNumbers[i]) || imageURL != phoneBook[uniqueID].ImageURL) updateRequired = true;
+ try
+ {
+ if (phoneBook[uniqueID].Name != name || !contact.telephony[i].Equals(phoneBook[uniqueID].PhoneNumbers[i]) || imageURL != phoneBook[uniqueID].ImageURL) updateRequired = true;
+ }
+ catch
+ {
+ // on property changes the differences check may fail
+ Log.Debug("Phone book difference check failed. Forcing contact update");
+ updateRequired = true;
+ break;
+ }
}
- catch
+
+ if (updateRequired)
{
- // on property changes the differences check may fail
- Log.Debug("Phone book difference check failed. Forcing contact update");
- updateRequired = true;
- break;
+ Log.Info("Updating contact " + phoneBook[uniqueID].Name);
+
+ phoneBook[uniqueID].Name = name;
+ phoneBook[uniqueID].PhoneNumbers = contact.telephony;
+ phoneBook[uniqueID].ImageURL = imageURL;
+
+ phoneBookChanges = true;
}
}
-
- if (updateRequired)
+ else
{
- Log.Info("Updating contact " + phoneBook[uniqueID].Name);
+ Log.Info("Adding contact " + name);
- phoneBook[uniqueID].Name = name;
- phoneBook[uniqueID].PhoneNumbers = contact.telephony;
- phoneBook[uniqueID].ImageURL = imageURL;
+ tempPhoneBookItem = new PhoneBookItem();
+ tempPhoneBookItem.UniqueID = uniqueID;
+ tempPhoneBookItem.Name = name;
+ tempPhoneBookItem.PhoneNumbers = contact.telephony;
+ tempPhoneBookItem.ImageURL = imageURL;
+ phoneBook.Add(uniqueID, tempPhoneBookItem);
+
+ phoneBookSortIsRequired = true;
phoneBookChanges = true;
}
}
- else
- {
- Log.Info("Adding contact " + name);
- tempPhoneBookItem = new PhoneBookItem();
- tempPhoneBookItem.UniqueID = uniqueID;
- tempPhoneBookItem.Name = name;
- tempPhoneBookItem.PhoneNumbers = contact.telephony;
- tempPhoneBookItem.ImageURL = imageURL;
+ // check for obsolete entries in local phone book (not existing in FRITZ!Box phone book anymore)
+ string[] contactsToDelete = new string[phoneBook.Count];
+ int k = 0;
- phoneBook.Add(uniqueID, tempPhoneBookItem);
+ foreach (PhoneBookItem phoneBookItem in phoneBook.Values)
+ {
+ uniqueID = phoneBookItem.UniqueID;
+ contactFound = false;
- phoneBookSortIsRequired = true;
- phoneBookChanges = true;
- }
- }
+ foreach (Contact contact in fritzPhoneBook.contact)
+ {
+ if (contact.uniqueid == uniqueID)
+ {
+ contactFound = true;
+ break;
+ }
+ }
- // check for obsolete entries in local phone book (not existing in FRITZ!Box phone book anymore)
- string[] contactsToDelete = new string[phoneBook.Count];
- int k = 0;
-
- foreach (PhoneBookItem phoneBookItem in phoneBook.Values)
- {
- uniqueID = phoneBookItem.UniqueID;
- contactFound = false;
-
- foreach (Contact contact in fritzPhoneBook.contact)
- {
- if (contact.uniqueid == uniqueID)
+ if (!contactFound)
{
- contactFound = true;
- break;
+ contactsToDelete[k] = uniqueID;
+ k++;
}
}
- if (!contactFound)
+ lock (sync)
{
- contactsToDelete[k] = uniqueID;
- k++;
- }
- }
-
- lock (sync)
- {
- foreach (string _uniqueID in contactsToDelete) // contacts cannot be deleted in above foreach loop, a second loop is required
- {
- if (_uniqueID != null)
+ foreach (string _uniqueID in contactsToDelete) // contacts cannot be deleted in above foreach loop, a second loop is required
{
- Log.Info("Removing contact " + phoneBook[_uniqueID].Name);
- phoneBook.Remove(_uniqueID);
- phoneBookChanges = true;
+ if (_uniqueID != null)
+ {
+ Log.Info("Removing contact " + phoneBook[_uniqueID].Name);
+ phoneBook.Remove(_uniqueID);
+ phoneBookChanges = true;
+ }
}
}
}
- }
- Log.Debug("Synchronized " + phoneBook.Count + " contacts with FRITZ!Box");
+ Log.Debug("Synchronized " + phoneBook.Count + " contacts with FRITZ!Box");
+ }
+ else Log.Error("Phone book synchronisation with the FRITZ!Box failed");
}
else Log.Debug("No connection to FRITZ!Box. Phone book synchronization not started");
@@ -284,8 +281,8 @@
}
if (phoneBookChanges)
- {
- phoneBookSaveIsRequired = true;
+ {
+ phoneBookSaveIsRequired = true;
return true;
}
else return false;
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_en-US.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_en-US.xml 2012-01-09 21:25:08 UTC (rev 4400)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_en-US.xml 2012-01-10 22:45:33 UTC (rev 4401)
@@ -15,7 +15,7 @@
<String id="13">View: Large icons</String>
<String id="14">All</String>
<String id="15">Incoming</String>
- <String id="16">Ougoing</String>
+ <String id="16">Outgoing</String>
<String id="17">Rejected</String>
<String id="18">Call list</String>
<String id="19">FritzBox messages</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_en.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_en.xml 2012-01-09 21:25:08 UTC (rev 4400)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_en.xml 2012-01-10 22:45:33 UTC (rev 4401)
@@ -15,7 +15,7 @@
<String id="13">View: Large icons</String>
<String id="14">All</String>
<String id="15">Incoming</String>
- <String id="16">Ougoing</String>
+ <String id="16">Outgoing</String>
<String id="17">Rejected</String>
<String id="18">Call list</String>
<String id="19">FritzBox messages</String>
Modified: trunk/plugins/FritzBox/FritzBox/Settings.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Settings.cs 2012-01-09 21:25:08 UTC (rev 4400)
+++ trunk/plugins/FritzBox/FritzBox/Settings.cs 2012-01-10 22:45:33 UTC (rev 4401)
@@ -144,8 +144,6 @@
{
Log.Info("Loading settings");
- //PhoneBook.LoadSettings();
-
using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml")))
{
// connection settings
@@ -260,7 +258,7 @@
xmlwriter.SetValueAsBool("fritzbox", "showMSNOnNotify", ShowMSNOnNotify);
- xmlwriter.SetValueAsBool("fritzbox", "showMSNOnNotify", PhoneBookEnabled);
+ xmlwriter.SetValueAsBool("fritzbox", "usePhonebook", PhoneBookEnabled);
xmlwriter.SetValueAsBool("fritzbox", "showUnknownCaller", ShowUnknownCaller);
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.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-09 21:25:08 UTC (rev 4400)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2012-01-10 22:45:33 UTC (rev 4401)
@@ -559,7 +559,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.0</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4400</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -582,7 +582,7 @@
<Major>0</Major>
<Minor>4</Minor>
<Build>0</Build>
- <Revision>0</Revision>
+ <Revision>4400</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>2012-01-09T18:24:56.1938676+01:00</ReleaseDate>
+ <ReleaseDate>2012-01-10T23:18:09.5983408+01:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
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/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/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/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....
[truncated message content] |
|
From: <hor...@us...> - 2012-01-12 23:52:20
|
Revision: 4403
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4403&view=rev
Author: horned-reaper
Date: 2012-01-12 23:52:12 +0000 (Thu, 12 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/Docs/Ausstehend.txt
trunk/plugins/FritzBox/FritzBox/FritzBox.cs
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.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.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/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/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/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/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/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.6.tlog
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.write.6.tlog
trunk/plugins/FritzBox/releases/FritzBox_v0.4.0.4402.mpe1
Removed 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-11 20:30:59 UTC (rev 4402)
+++ trunk/plugins/FritzBox/Build/Build.log 2012-01-12 23:52:12 UTC (rev 4403)
@@ -1,6 +1,6 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4400
+SVN Version: 4402
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 10.01.2012 23:18:05.
+Build started 13.01.2012 00:47:42.
Project "D:\FritzBox\FritzBox.sln" on node 1 (Rebuild target(s)).
ValidateSolutionConfiguration:
Building solution configuration "Release|Mixed Platforms".
@@ -154,8 +154,6 @@
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:
@@ -197,7 +195,7 @@
0 Warning(s)
0 Error(s)
-Time Elapsed 00:00:01.90
+Time Elapsed 00:00:02.11
Reverting to build 0
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
@@ -282,7 +280,7 @@
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
36 File(s) copied
MpeMaker version: 1.2.1.0
-Build started at 23:18:09
+Build started at 00:47:46
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Modified: trunk/plugins/FritzBox/Docs/Ausstehend.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Ausstehend.txt 2012-01-11 20:30:59 UTC (rev 4402)
+++ trunk/plugins/FritzBox/Docs/Ausstehend.txt 2012-01-12 23:52:12 UTC (rev 4403)
@@ -1,3 +1,6 @@
+Testen:
+Einen kleinen Bug habe ich auch gefunden: Ich wollte gerade unter MyTVSeries die Sendung einer Serie weiterschauen - es wurde der Dialog angezeigt ob man die Folge bei Stelle X fortsetzen m\xF6chte - in diesem Moment kam ein Anruf - nach Beendigung des Anrufs wurde die Sendung dann automatisch gestartet/fortgesetzt
+
Fehler beheben:
- bei Auswahl einer MSN im Konfigurationsdialog werden die MSN-Eintr\xE4ge verdoppelt
- Configuration: erste MSN wird nicht im Dropdown-Men\xFC angezeigt
@@ -49,5 +52,14 @@
mu\xDF warum gibt es kein Buttons wo ich die Listen direKt anw\xE4hlen kann oder \xFCbersehe ich da was.
Gru\xDF Burkh2407
-IchBinsShort, 05.01.2012, 18:02:.
-Noch eine andere Frage ist es auch m\xF6glich das bei ausgehenden Anrufen nur bei bestimmten Handger\xE4ten der Pause Befehl gesendet wird. Ich benutze drei Funktelefone \xFCber die Dect Funktion der Fritzbox 7020, Garten, Eltern und bei mir. W\xE4re also sch\xF6n wenn nur auf Pause gestellt wird wenn von meinem Telefon eine Anruf get\xE4tigt wird.
\ No newline at end of file
+IchBinsShort, 05.01.2012, 18:02:
+Noch eine andere Frage ist es auch m\xF6glich das bei ausgehenden Anrufen nur bei bestimmten Handger\xE4ten der Pause Befehl gesendet wird. Ich benutze drei Funktelefone \xFCber die Dect Funktion der Fritzbox 7020, Garten, Eltern und bei mir. W\xE4re also sch\xF6n wenn nur auf Pause gestellt wird wenn von meinem Telefon eine Anruf get\xE4tigt wird.
+
+creativ, 10.01.2012, 19:53:
+Was nur noch eingebaut werden sollte, das dort Kontakte abgew\xE4hlt werden k\xF6nnen die im MP dann nicht angezeigt werden! Ich habe n\xE4mlich das Fritz!Fon MT-F und dort sind Kontakte im internen Speicher die nicht gel\xF6scht werden k\xF6nnen, z.b. (wie klingt HD-Telefonie und daf\xFCr gibt es eine Telefonnumer die hinterlegt ist).
+
+IchBinsShort, 11.01.2012, 00:28:
+L\xF6schen von Anruflisten \xFCber die GUI
+
+creativ, 20.01.2012, 19:53:
+Ausblenden bestimmter Kontakte in der GUI
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2012-01-11 20:30:59 UTC (rev 4402)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2012-01-12 23:52:12 UTC (rev 4403)
@@ -107,10 +107,12 @@
{
case CallAction.CallType.Incoming:
if (Settings.PhoneBookEnabled) callAction.Caller = phoneBook.FindContactEntry(callAction.Caller);
+
OnCall(callAction);
break;
case CallAction.CallType.Outgoing:
if (Settings.PhoneBookEnabled) callAction.Caller = phoneBook.FindContactEntry(callAction.Caller);
+
OnCall(callAction);
break;
case CallAction.CallType.ConnectionStarted:
@@ -118,7 +120,8 @@
case CallAction.CallType.ConnectionClosed:
if (Settings.CloseOnConnectionClosed)
{
- Log.Info("_closeOnConnectionClosed is enabled. Try to close active notification");
+ Log.Info("\"Close On Connection Close\" setting is enabled. Try to close active notification");
+
if (_tempNotify != null)
{
MediaPortal.GUI.Library.Action act = new MediaPortal.GUI.Library.Action();
@@ -128,7 +131,7 @@
}
break;
default:
- Log.Error("Incorrect callAction.Type");
+ Log.Error("Incorrect CallAction.CallType");
break;
}
}
@@ -329,10 +332,10 @@
switch (callType)
{
case CallAction.CallType.Incoming:
- if (Settings.PauseMediaOnIncomingCall && Settings.ResumeMediaOnIncomingCall) g_Player.Pause();
+ if (Settings.ResumeMediaOnIncomingCall) g_Player.Pause();
break;
case CallAction.CallType.Outgoing:
- if (Settings.PauseMediaOnOutgoingCall && Settings.ResumeMediaOnOutgoingCall) g_Player.Pause();
+ if (Settings.ResumeMediaOnOutgoingCall) g_Player.Pause();
break;
}
}
@@ -419,6 +422,8 @@
FritzBoxClient.CallEvent -= OnCallAction;
FritzBoxClient.LogEvent -= OnLogAction;
+ FritzBoxClient.ConnectedEvent += OnConnectedAction;
+
Utils.OnStartExternal -= OnStartExternal;
Utils.OnStopExternal -= OnStopExternal;
@@ -948,59 +953,66 @@
Log.Debug("Updating GUI properties");
- if (voiceBoxItemList != null)
+ try
{
- voiceBoxItemsCount = voiceBoxItemList.Count;
+ if (voiceBoxItemList != null)
+ {
+ voiceBoxItemsCount = voiceBoxItemList.Count;
- foreach (VoiceBoxItem voiceBoxItem in voiceBoxItemList)
- {
- if (voiceBoxItem.type == 3)
+ foreach (VoiceBoxItem voiceBoxItem in voiceBoxItemList)
{
- caller = phoneBook.FindContactEntry(voiceBoxItem.callerId);
-
- if (voiceBoxItem.isNew > 0)
+ if (voiceBoxItem.type == 3)
{
- if (lastNewCallerName == "") lastNewCallerName = caller.PhoneBookItem.Name;
+ caller = phoneBook.FindContactEntry(voiceBoxItem.callerId);
- newVoiceBoxItemsCount++;
+ if (voiceBoxItem.isNew > 0)
+ {
+ if (lastNewCallerName == "") lastNewCallerName = caller.PhoneBookItem.Name;
+
+ newVoiceBoxItemsCount++;
+ }
}
}
}
- }
- if (newVoiceBoxItemsCount == 0)
- {
- GUIPropertyManager.SetProperty("#FritzManager.NewMessages", " ");
- GUIPropertyManager.SetProperty("#FritzManager.Caller", " ");
- GUIPropertyManager.SetProperty("#FritzManager.NewMessageCount", string.Empty);
- GUIPropertyManager.SetProperty("#FritzManager.NewMessagesAvail", "false");
- }
- else
- {
- if (newVoiceBoxItemsCount > 1) GUIPropertyManager.SetProperty("#FritzManager.NewMessages", newVoiceBoxItemsCount + " " + GUILocalizeStrings.Get(7)); // 7 = Messages
- else GUIPropertyManager.SetProperty("#FritzManager.NewMessages", newVoiceBoxItemsCount + " " + GUILocalizeStrings.Get(27)); // 27 = Message
+ if (newVoiceBoxItemsCount == 0)
+ {
+ GUIPropertyManager.SetProperty("#FritzManager.NewMessages", " ");
+ GUIPropertyManager.SetProperty("#FritzManager.Caller", " ");
+ GUIPropertyManager.SetProperty("#FritzManager.NewMessageCount", string.Empty);
+ GUIPropertyManager.SetProperty("#FritzManager.NewMessagesAvail", "false");
+ }
+ else
+ {
+ if (newVoiceBoxItemsCount > 1) GUIPropertyManager.SetProperty("#FritzManager.NewMessages", newVoiceBoxItemsCount + " " + GUILocalizeStrings.Get(7)); // 7 = Messages
+ else GUIPropertyManager.SetProperty("#FritzManager.NewMessages", newVoiceBoxItemsCount + " " + GUILocalizeStrings.Get(27)); // 27 = Message
- GUIPropertyManager.SetProperty("#FritzManager.Caller", lastNewCallerName);
- GUIPropertyManager.SetProperty("#FritzManager.NewMessageCount", newVoiceBoxItemsCount.ToString());
- GUIPropertyManager.SetProperty("#FritzManager.NewMessagesAvail", "true");
- }
+ GUIPropertyManager.SetProperty("#FritzManager.Caller", lastNewCallerName);
+ GUIPropertyManager.SetProperty("#FritzManager.NewMessageCount", newVoiceBoxItemsCount.ToString());
+ GUIPropertyManager.SetProperty("#FritzManager.NewMessagesAvail", "true");
+ }
- if (voiceBoxItemsCount == 0)
- {
- GUIPropertyManager.SetProperty("#FritzManager.TotalMessages", " ");
- GUIPropertyManager.SetProperty("#FritzManager.TotalMessageCount", string.Empty);
+ if (voiceBoxItemsCount == 0)
+ {
+ GUIPropertyManager.SetProperty("#FritzManager.TotalMessages", " ");
+ GUIPropertyManager.SetProperty("#FritzManager.TotalMessageCount", string.Empty);
+ }
+ else
+ {
+ if (voiceBoxItemsCount > 1) GUIPropertyManager.SetProperty("#FritzManager.TotalMessages", voiceBoxItemsCount + " " + GUILocalizeStrings.Get(7)); // 7 = Messages
+ else GUIPropertyManager.SetProperty("#FritzManager.TotalMessages", voiceBoxItemsCount + " " + GUILocalizeStrings.Get(27)); // 27 = Message
+
+ GUIPropertyManager.SetProperty("#FritzManager.TotalMessageCount", voiceBoxItemsCount.ToString());
+ }
+
+ // set properties for skin file labels
+ GUIPropertyManager.SetProperty("#FritzManager.LabelCallList", GUILocalizeStrings.Get(18)); // 18 = Call list
+ GUIPropertyManager.SetProperty("#FritzManager.LabelUpdate", GUILocalizeStrings.Get(25)); // 25 = Update
}
- else
+ catch (Exception e)
{
- if (voiceBoxItemsCount > 1) GUIPropertyManager.SetProperty("#FritzManager.TotalMessages", voiceBoxItemsCount + " " + GUILocalizeStrings.Get(7)); // 7 = Messages
- else GUIPropertyManager.SetProperty("#FritzManager.TotalMessages", voiceBoxItemsCount + " " + GUILocalizeStrings.Get(27)); // 27 = Message
-
- GUIPropertyManager.SetProperty("#FritzManager.TotalMessageCount", voiceBoxItemsCount.ToString());
+ Log.Error("An error occured during GUI properties update: {0}", e.Message);
}
-
- // set properties for skin file labels
- GUIPropertyManager.SetProperty("#FritzManager.LabelCallList", GUILocalizeStrings.Get(18)); // 18 = Call list
- GUIPropertyManager.SetProperty("#FritzManager.LabelUpdate", GUILocalizeStrings.Get(25)); // 25 = Update
}
/// <summary>
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2012-01-11 20:30:59 UTC (rev 4402)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2012-01-12 23:52:12 UTC (rev 4403)
@@ -418,9 +418,9 @@
this.checkBoxResumeMediaOnOutgoingCall.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.checkBoxResumeMediaOnOutgoingCall.Location = new System.Drawing.Point(220, 40);
this.checkBoxResumeMediaOnOutgoingCall.Name = "checkBoxResumeMediaOnOutgoingCall";
- this.checkBoxResumeMediaOnOutgoingCall.Size = new System.Drawing.Size(162, 17);
+ this.checkBoxResumeMediaOnOutgoingCall.Size = new System.Drawing.Size(118, 17);
this.checkBoxResumeMediaOnOutgoingCall.TabIndex = 11;
- this.checkBoxResumeMediaOnOutgoingCall.Text = "Auto-resume on closing notify";
+ this.checkBoxResumeMediaOnOutgoingCall.Text = "Resume on call end";
this.checkBoxResumeMediaOnOutgoingCall.UseVisualStyleBackColor = true;
//
// checkBoxPauseMediaOnOutgoingCall
@@ -433,6 +433,7 @@
this.checkBoxPauseMediaOnOutgoingCall.TabIndex = 10;
this.checkBoxPauseMediaOnOutgoingCall.Text = "Pause on outgoing call";
this.checkBoxPauseMediaOnOutgoingCall.UseVisualStyleBackColor = true;
+ this.checkBoxPauseMediaOnOutgoingCall.CheckedChanged += new System.EventHandler(this.checkBoxPauseMediaOnOutgoingCall_CheckedChanged);
//
// mpLabel5
//
@@ -460,9 +461,9 @@
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.Size = new System.Drawing.Size(118, 17);
this.checkBoxResumeMediaOnIncomingCall.TabIndex = 1;
- this.checkBoxResumeMediaOnIncomingCall.Text = "Auto-resume on closing notify";
+ this.checkBoxResumeMediaOnIncomingCall.Text = "Resume on call end";
this.checkBoxResumeMediaOnIncomingCall.UseVisualStyleBackColor = true;
//
// checkBoxPauseMediaOnIncomingCall
@@ -639,9 +640,9 @@
this.checkBoxExtensiveLogging.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.checkBoxExtensiveLogging.Location = new System.Drawing.Point(33, 94);
this.checkBoxExtensiveLogging.Name = "checkBoxExtensiveLogging";
- this.checkBoxExtensiveLogging.Size = new System.Drawing.Size(328, 17);
+ this.checkBoxExtensiveLogging.Size = new System.Drawing.Size(399, 17);
this.checkBoxExtensiveLogging.TabIndex = 21;
- this.checkBoxExtensiveLogging.Text = "Extensive logging (!!! phone numbers are written to the log file !!!)";
+ this.checkBoxExtensiveLogging.Text = "Extensive logging: Phone numbers and contact names are written to the log file!";
this.checkBoxExtensiveLogging.UseVisualStyleBackColor = true;
//
// label4
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2012-01-11 20:30:59 UTC (rev 4402)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2012-01-12 23:52:12 UTC (rev 4403)
@@ -167,8 +167,23 @@
private void checkBoxStopMedia_CheckedChanged(object sender, EventArgs e)
{
- checkBoxResumeMediaOnIncomingCall.Enabled = checkBoxPauseMediaOnIncomingCall.Checked;
+ if (!checkBoxPauseMediaOnIncomingCall.Checked)
+ {
+ checkBoxResumeMediaOnIncomingCall.Checked = false;
+ checkBoxResumeMediaOnIncomingCall.Enabled = false;
+ }
+ else checkBoxResumeMediaOnIncomingCall.Enabled = true;
}
+
+ private void checkBoxPauseMediaOnOutgoingCall_CheckedChanged(object sender, EventArgs e)
+ {
+ if (!checkBoxPauseMediaOnOutgoingCall.Checked)
+ {
+ checkBoxResumeMediaOnOutgoingCall.Checked = false;
+ checkBoxResumeMediaOnOutgoingCall.Enabled = false;
+ }
+ else checkBoxResumeMediaOnOutgoingCall.Enabled = true;
+ }
private void checkBoxUsePhonebook_CheckedChanged(object sender, EventArgs e)
{
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs 2012-01-11 20:30:59 UTC (rev 4402)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs 2012-01-12 23:52:12 UTC (rev 4403)
@@ -149,121 +149,131 @@
{
Log.Debug("Synchronizing phone book with FRITZ!Box");
- // load FRITZ!Box phone book
- FritzPhoneBooks fritzPhoneBooks = new FritzPhoneBooks();
+ try
+ {
+ // load FRITZ!Box phone book
+ FritzPhoneBooks fritzPhoneBooks = new FritzPhoneBooks();
- string fritzPhoneBooksSerialized = fritz.loadPhoneBookFromFritzBox();
+ string fritzPhoneBooksSerialized = fritz.loadPhoneBookFromFritzBox();
- if (fritzPhoneBooksSerialized != null)
- {
- XmlSerializer xmlSerializer = new XmlSerializer(typeof(FritzPhoneBooks));
- fritzPhoneBooks = (FritzPhoneBooks)xmlSerializer.Deserialize(new StringReader(fritzPhoneBooksSerialized));
+ if (fritzPhoneBooksSerialized != null)
+ {
+ XmlSerializer xmlSerializer = new XmlSerializer(typeof(FritzPhoneBooks));
+ fritzPhoneBooks = (FritzPhoneBooks)xmlSerializer.Deserialize(new StringReader(fritzPhoneBooksSerialized));
- FritzManager.PhoneBook fritzPhoneBook = fritzPhoneBooks.Items[0]; // always choose first phone book
- PhoneBookItem tempPhoneBookItem;
- bool updateRequired, contactFound;
- string name, uniqueID, imageURL;
+ FritzManager.PhoneBook fritzPhoneBook = fritzPhoneBooks.Items[0]; // always choose first phone book
+ PhoneBookItem tempPhoneBookItem;
+ bool updateRequired, contactFound;
+ string name, uniqueID = null, imageURL;
- lock (sync)
- {
- // update/add entries from FRITZ!Box phone book to local phone book
- foreach (Contact contact in fritzPhoneBook.contact)
+ // check if FRITZ!Box phone book has unique ID field. Older FRITZ!Box models e. g. 7170 and 7320 doesn't have an unique ID field in it's address book
+ if (fritzPhoneBook.contact[0].uniqueid == null) Log.Debug("FRITZ!Box phone book doesn't have an unique ID field. Synchronizing contacts in compatibility mode. Multiple contacts with the same name won't be shown and cause update actions on every synchronization!");
+
+ lock (sync)
{
- name = contact.person[0].realName;
- imageURL = contact.person[0].imageURL;
- uniqueID = contact.uniqueid;
+ // update/add entries from FRITZ!Box phone book to local phone book
+ foreach (Contact contact in fritzPhoneBook.contact)
+ {
+ name = contact.person[0].realName;
+ imageURL = contact.person[0].imageURL;
- updateRequired = false;
+ if (fritzPhoneBook.contact[0].uniqueid != null) uniqueID = contact.uniqueid;
+ else uniqueID = name; // in compatibility mode the name is used as unique ID
- // search if FRITZ!Box contact already exists in phone book
- if (phoneBook.ContainsKey(uniqueID))
- {
- // check for differences
- for (int i = 0; i < contact.telephony.Length; i++)
- {
- try
+ updateRequired = false;
+
+ // search if FRITZ!Box contact already exists in phone book
+ if (phoneBook.ContainsKey(uniqueID))
{
- if (phoneBook[uniqueID].Name != name || !contact.telephony[i].Equals(phoneBook[uniqueID].PhoneNumbers[i]) || imageURL != phoneBook[uniqueID].ImageURL) updateRequired = true;
+ // check for differences
+ for (int i = 0; i < contact.telephony.Length; i++)
+ {
+ try
+ {
+ if (phoneBook[uniqueID].Name != name || !contact.telephony[i].Equals(phoneBook[uniqueID].PhoneNumbers[i]) || imageURL != phoneBook[uniqueID].ImageURL) updateRequired = true;
+ }
+ catch
+ {
+ // on property changes the differences check may fail
+ Log.Debug("Phone book difference check failed. Forcing contact update");
+ updateRequired = true;
+ break;
+ }
+ }
+
+ if (updateRequired)
+ {
+ if (Settings.ExtensiveLogging) Log.Info("Updating contact " + phoneBook[uniqueID].Name);
+
+ phoneBook[uniqueID].Name = name;
+ phoneBook[uniqueID].PhoneNumbers = contact.telephony;
+ phoneBook[uniqueID].ImageURL = imageURL;
+
+ phoneBookChanges = true;
+ }
}
- catch
+ else
{
- // on property changes the differences check may fail
- Log.Debug("Phone book difference check failed. Forcing contact update");
- updateRequired = true;
- break;
- }
- }
+ if (Settings.ExtensiveLogging) Log.Info("Adding contact " + name);
- if (updateRequired)
- {
- Log.Info("Updating contact " + phoneBook[uniqueID].Name);
+ tempPhoneBookItem = new PhoneBookItem();
+ tempPhoneBookItem.UniqueID = uniqueID;
+ tempPhoneBookItem.Name = name;
+ tempPhoneBookItem.PhoneNumbers = contact.telephony;
+ tempPhoneBookItem.ImageURL = imageURL;
- phoneBook[uniqueID].Name = name;
- phoneBook[uniqueID].PhoneNumbers = contact.telephony;
- phoneBook[uniqueID].ImageURL = imageURL;
+ phoneBook.Add(uniqueID, tempPhoneBookItem);
- phoneBookChanges = true;
+ phoneBookSortIsRequired = true;
+ phoneBookChanges = true;
+ }
}
- }
- else
- {
- Log.Info("Adding contact " + name);
- tempPhoneBookItem = new PhoneBookItem();
- tempPhoneBookItem.UniqueID = uniqueID;
- tempPhoneBookItem.Name = name;
- tempPhoneBookItem.PhoneNumbers = contact.telephony;
- tempPhoneBookItem.ImageURL = imageURL;
+ // check for obsolete entries in local phone book (not existing in FRITZ!Box phone book anymore)
+ string[] contactsToDelete = new string[phoneBook.Count];
+ int k = 0;
- phoneBook.Add(uniqueID, tempPhoneBookItem);
+ foreach (PhoneBookItem phoneBookItem in phoneBook.Values)
+ {
+ contactFound = false;
- phoneBookSortIsRequired = true;
- phoneBookChanges = true;
- }
- }
+ foreach (Contact contact in fritzPhoneBook.contact)
+ {
+ uniqueID = phoneBookItem.UniqueID;
- // check for obsolete entries in local phone book (not existing in FRITZ!Box phone book anymore)
- string[] contactsToDelete = new string[phoneBook.Count];
- int k = 0;
+ if (uniqueID == phoneBookItem.UniqueID)
+ {
+ contactFound = true;
+ break;
+ }
+ }
- foreach (PhoneBookItem phoneBookItem in phoneBook.Values)
- {
- uniqueID = phoneBookItem.UniqueID;
- contactFound = false;
-
- foreach (Contact contact in fritzPhoneBook.contact)
- {
- if (contact.uniqueid == uniqueID)
- {
- contactFound = true;
- break;
+ if (!contactFound)
+ {
+ contactsToDelete[k] = uniqueID;
+ k++;
+ break;
+ }
}
- }
- if (!contactFound)
- {
- contactsToDelete[k] = uniqueID;
- k++;
- }
+ foreach (string _uniqueID in contactsToDelete) // contacts cannot be deleted in above foreach loop, a second loop is required
+ {
+ if (_uniqueID != null)
+ {
+ if (Settings.ExtensiveLogging) Log.Info("Removing contact " + phoneBook[_uniqueID].Name);
+ phoneBook.Remove(_uniqueID);
+ phoneBookChanges = true;
+ }
+ }
}
- lock (sync)
- {
- foreach (string _uniqueID in contactsToDelete) // contacts cannot be deleted in above foreach loop, a second loop is required
- {
- if (_uniqueID != null)
- {
- Log.Info("Removing contact " + phoneBook[_uniqueID].Name);
- phoneBook.Remove(_uniqueID);
- phoneBookChanges = true;
- }
- }
- }
+ Log.Info("Synchronized " + phoneBook.Count + " contacts with FRITZ!Box");
}
-
- Log.Debug("Synchronized " + phoneBook.Count + " contacts with FRITZ!Box");
}
- else Log.Error("Phone book synchronisation with the FRITZ!Box failed");
+ catch (Exception e)
+ {
+ Log.Error("An error occured during phone book synchronisation with the FRITZ!Box: {0}", e.Message);
+ }
}
else Log.Debug("No connection to FRITZ!Box. Phone book synchronization not started");
@@ -278,6 +288,8 @@
{
phoneBook = sortedPhoneBook.ToDictionary(k => k.Key, v => v.Value);
}
+
+ phoneBookSaveIsRequired = true;
}
if (phoneBookChanges)
@@ -302,13 +314,11 @@
if (File.Exists(picturePath))
{
- if (Settings.ExtensiveLogging) Log.Debug("Found image for contact " + contact.Name + ": " + picturePath);
return picturePath;
}
}
else
{
- if (Settings.ExtensiveLogging) Log.Debug("No image has been assigned for the contact " + contact.Name);
picturePath = Settings.SkinMediaFolderPath + @"\FritzBox\CallMonitor.Missing.png";
}
}
@@ -324,8 +334,6 @@
}
// unknown caller
- if (Settings.ExtensiveLogging) Log.Debug("Assigning unknown caller image for phone number {0}", caller.PhoneNumber);
-
return Settings.SkinMediaFolderPath + @"\FritzBox\CallMonitor.Unknown.png";
}
@@ -478,8 +486,6 @@
}
}
- if (Settings.ExtensiveLogging) Log.Debug("Normalized phone number \"{0}\" to \"{1}\"", inputPhoneNumber, outputPhoneNumber);
-
return outputPhoneNumber;
}
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.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-11 20:30:59 UTC (rev 4402)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2012-01-12 23:52:12 UTC (rev 4403)
@@ -559,7 +559,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4400</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4402</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -582,7 +582,7 @@
<Major>0</Major>
<Minor>4</Minor>
<Build>0</Build>
- <Revision>4400</Revision>
+ <Revision>4402</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>2012-01-10T23:18:09.5983408+01:00</ReleaseDate>
+ <ReleaseDate>2012-01-13T00:47:46.7613728+01:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
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/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/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/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/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.csproj.FileListAbsolute.txt
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.csproj.FileListAbsolute.txt 2012-01-11 20:30:59 UTC (rev 4402)
+++ trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.csproj.FileListAbsolute.txt 2012-01-12 23:52:12 UTC (rev 4403)
@@ -23,5 +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)
Added: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.read.6.tlog
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.read.6.tlog
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.read.7.tlog
===================================================================
(Binary files differ)
Added: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.write.6.tlog
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.write.6.tlog
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.write.7.tlog
===================================================================
(Binary files differ)
Added: trunk/plugins/FritzBox/releases/FritzBox_v0.4.0.4402.mpe1
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/releases/FritzBox_v0.4.0.4402.mpe1
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/FritzBox/releases/update.xml
===================================================================
--- trunk/plugins/FritzBox/releases/update.xml 2012-01-11 20:30:59 UTC (rev 4402)
+++ trunk/plugins/FritzBox/releases/update.xml 2012-01-12 23:52:12 UTC (rev 4403)
@@ -88,7 +88,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4400</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4402</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -111,7 +111,7 @@
<Major>0</Major>
<Minor>4</Minor>
<Build>0</Build>
- <Revision>4400</Revision>
+ <Revision>4402</Revision>
</Version>
<ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box informations from MediaPortal.
@@ -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-10T23:18:09.5983408+01:00</ReleaseDate>
+ <ReleaseDate>2012-01-13T00:47:46.7613728+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-14 17:51:35
|
Revision: 4404
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4404&view=rev
Author: horned-reaper
Date: 2012-01-14 17:51:27 +0000 (Sat, 14 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/Docs/Ausstehend.txt
trunk/plugins/FritzBox/Docs/Documentation/Data/FRITZ!Box Manager Phone Book.xml
trunk/plugins/FritzBox/FritzBox/EditPhoneBook.Designer.cs
trunk/plugins/FritzBox/FritzBox/EditPhoneBook.cs
trunk/plugins/FritzBox/FritzBox/FritzBox.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.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.dll
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb
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/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/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/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/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
trunk/plugins/FritzBox/releases/update.xml
Added Paths:
-----------
trunk/plugins/FritzBox/releases/FritzBox_v0.4.0.4403.mpe1
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2012-01-12 23:52:12 UTC (rev 4403)
+++ trunk/plugins/FritzBox/Build/Build.log 2012-01-14 17:51:27 UTC (rev 4404)
@@ -1,6 +1,6 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4402
+SVN Version: 4403
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 13.01.2012 00:47:42.
+Build started 14.01.2012 18:41:28.
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.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".
@@ -195,7 +195,7 @@
0 Warning(s)
0 Error(s)
-Time Elapsed 00:00:02.11
+Time Elapsed 00:00:02.20
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 00:47:46
+Build started at 18:41:32
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Modified: trunk/plugins/FritzBox/Docs/Ausstehend.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Ausstehend.txt 2012-01-12 23:52:12 UTC (rev 4403)
+++ trunk/plugins/FritzBox/Docs/Ausstehend.txt 2012-01-14 17:51:27 UTC (rev 4404)
@@ -2,6 +2,7 @@
Einen kleinen Bug habe ich auch gefunden: Ich wollte gerade unter MyTVSeries die Sendung einer Serie weiterschauen - es wurde der Dialog angezeigt ob man die Folge bei Stelle X fortsetzen m\xF6chte - in diesem Moment kam ein Anruf - nach Beendigung des Anrufs wurde die Sendung dann automatisch gestartet/fortgesetzt
Fehler beheben:
+- auch bei einem "Unbekannten Anrufer" (unterdr\xFCckte bzw. nicht \xFCbertragene Rufnummer) \xF6ffnet sich \xFCber das Kontextrufen "zur\xFCckrufen". Sollte man deaktivieren
- bei Auswahl einer MSN im Konfigurationsdialog werden die MSN-Eintr\xE4ge verdoppelt
- Configuration: erste MSN wird nicht im Dropdown-Men\xFC angezeigt
- btnModus umbenennen?
@@ -10,12 +11,15 @@
- Problem beim Laden gro\xDFer meta0-Dateien, siehe "Problembeschreibung 1.txt"
- blauer Hintergrund f\xFCr Default und DefaultWide Skins
- GUI-Properties \xFCberpr\xFCfen und Dokumentation vervollst\xE4ndigen
+- vertrauliche Daten im Log trotz "Extensive Logging"-Einstellung
-Neue Funktionen:
+Neue Funktionen/Erweiterungen:
- Schalter zum Deaktivieren von Benachrichtigungen bei ausgehenden Anrufen
- Rufnummer-Typ hinzuf\xFCgen
- GUI-Adressbuch
- Anruf-Benachrichtigungen
+- Telefonbuch editierbar machen (f\xFCr FRITZ!Box-Versionen ohne Telefonbuch), ImageURL-Feld editierbar machen
+- R\xFCckw\xE4rtssuche wieder integrieren
- Kontextmen\xFC f\xFCr Telefonbuch
- Wiki-Eintrag
- Skin-Erweiterungen
@@ -23,6 +27,7 @@
- geplante \xC4nderungen ver\xF6ffentlichen
- wenn m\xF6glich GUI-Telefonbuch (und edit Phonebook) nach Kontakt gruppieren
- Bei Anrufbenachrichtigungen: Auflistung von Kontaktnamen wenn eine Rufnummer mehrmals im Telefonbuch vorkommt
+- Verbindungstest um Login, Anruflisten- und Telefonbuch-Download erweitern
Anwenderw\xFCnsche:
@@ -62,4 +67,7 @@
L\xF6schen von Anruflisten \xFCber die GUI
creativ, 20.01.2012, 19:53:
-Ausblenden bestimmter Kontakte in der GUI
\ No newline at end of file
+Ausblenden bestimmter Kontakte in der GUI
+
+AlfredENeuma, 13.01.2012, 12:10:
+Vielleicht w\xE4re das eine M\xF6glichkeit f\xFCr die Zukunft: Im Telefonbuch des Plugins eine zus\xE4tzliche Spalte f\xFCr Bilder (lokal oder auf FB USB Stick). Diese Eintr\xE4ge k\xF6nnten dann verwendet werden, wenn die FB keine Eintr\xE4ge f\xFCr Bilder hat
\ No newline at end of file
Modified: trunk/plugins/FritzBox/Docs/Documentation/Data/FRITZ!Box Manager Phone Book.xml
===================================================================
--- trunk/plugins/FritzBox/Docs/Documentation/Data/FRITZ!Box Manager Phone Book.xml 2012-01-12 23:52:12 UTC (rev 4403)
+++ trunk/plugins/FritzBox/Docs/Documentation/Data/FRITZ!Box Manager Phone Book.xml 2012-01-14 17:51:27 UTC (rev 4404)
@@ -14,7 +14,7 @@
<Name>Tom Hanks</Name>
<UniqueID>1256</UniqueID>
<PhoneNumbers>
- <PhoneNumber prio="1" type="home">+00 (456) 78901</PhoneNumber>
+ <PhoneNumber prio="1" type="mobile">+00 (456) 78901</PhoneNumber>
</PhoneNumbers>
</PhoneBookItem>
<PhoneBookItem>
@@ -22,7 +22,7 @@
<Name>Bruce Willis</Name>
<UniqueID>1224</UniqueID>
<PhoneNumbers>
- <PhoneNumber prio="1" type="home">+00 (789) 98745</PhoneNumber>
+ <PhoneNumber prio="1" type="work">+00 (789) 98745</PhoneNumber>
</PhoneNumbers>
</PhoneBookItem>
</items>
Modified: trunk/plugins/FritzBox/FritzBox/EditPhoneBook.Designer.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/EditPhoneBook.Designer.cs 2012-01-12 23:52:12 UTC (rev 4403)
+++ trunk/plugins/FritzBox/FritzBox/EditPhoneBook.Designer.cs 2012-01-14 17:51:27 UTC (rev 4404)
@@ -28,19 +28,20 @@
/// </summary>
private void InitializeComponent()
{
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
this.dataGridView = new System.Windows.Forms.DataGridView();
- this.pictureBoxCaller = new System.Windows.Forms.PictureBox();
this.columnContactID = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.columnName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.columnPhoneType = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.columnPhoneNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.columnShowCallNotification = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.columnRingTonePath = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.pictureBoxCaller = new System.Windows.Forms.PictureBox();
+ this.label1 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxCaller)).BeginInit();
this.SuspendLayout();
@@ -54,14 +55,14 @@
this.dataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
- dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle16.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- dataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle16;
+ dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.columnContactID,
@@ -70,46 +71,36 @@
this.columnPhoneNumber,
this.columnShowCallNotification,
this.columnRingTonePath});
- dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Window;
- dataGridViewCellStyle19.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- dataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.ControlText;
- dataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dataGridView.DefaultCellStyle = dataGridViewCellStyle19;
+ dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window;
+ dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText;
+ dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dataGridView.DefaultCellStyle = dataGridViewCellStyle4;
this.dataGridView.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
this.dataGridView.Location = new System.Drawing.Point(31, 29);
this.dataGridView.MultiSelect = false;
this.dataGridView.Name = "dataGridView";
- dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle20.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- dataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dataGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle20;
+ dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dataGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle5;
this.dataGridView.RowHeadersVisible = false;
this.dataGridView.RowTemplate.Height = 23;
this.dataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
this.dataGridView.Size = new System.Drawing.Size(729, 582);
this.dataGridView.TabIndex = 19;
//
- // pictureBoxCaller
- //
- this.pictureBoxCaller.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.pictureBoxCaller.Location = new System.Drawing.Point(785, 29);
- this.pictureBoxCaller.Name = "pictureBoxCaller";
- this.pictureBoxCaller.Size = new System.Drawing.Size(122, 122);
- this.pictureBoxCaller.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
- this.pictureBoxCaller.TabIndex = 23;
- this.pictureBoxCaller.TabStop = false;
- //
// columnContactID
//
- dataGridViewCellStyle17.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.columnContactID.DefaultCellStyle = dataGridViewCellStyle17;
+ dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.columnContactID.DefaultCellStyle = dataGridViewCellStyle2;
this.columnContactID.HeaderText = "Contact ID";
this.columnContactID.Name = "columnContactID";
this.columnContactID.ReadOnly = true;
@@ -117,8 +108,8 @@
//
// columnName
//
- dataGridViewCellStyle18.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.columnName.DefaultCellStyle = dataGridViewCellStyle18;
+ dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.columnName.DefaultCellStyle = dataGridViewCellStyle3;
this.columnName.FillWeight = 3.825149F;
this.columnName.HeaderText = "Name";
this.columnName.MinimumWidth = 150;
@@ -160,11 +151,31 @@
this.columnRingTonePath.Name = "columnRingTonePath";
this.columnRingTonePath.Width = 225;
//
+ // pictureBoxCaller
+ //
+ this.pictureBoxCaller.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.pictureBoxCaller.Location = new System.Drawing.Point(785, 29);
+ this.pictureBoxCaller.Name = "pictureBoxCaller";
+ this.pictureBoxCaller.Size = new System.Drawing.Size(122, 122);
+ this.pictureBoxCaller.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+ this.pictureBoxCaller.TabIndex = 23;
+ this.pictureBoxCaller.TabStop = false;
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(782, 598);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(89, 13);
+ this.label1.TabIndex = 24;
+ this.label1.Text = "0 phone numbers";
+ //
// EditPhoneBook
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(933, 639);
+ this.Controls.Add(this.label1);
this.Controls.Add(this.pictureBoxCaller);
this.Controls.Add(this.dataGridView);
this.Name = "EditPhoneBook";
@@ -174,6 +185,7 @@
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxCaller)).EndInit();
this.ResumeLayout(false);
+ this.PerformLayout();
}
@@ -187,5 +199,6 @@
private System.Windows.Forms.DataGridViewTextBoxColumn columnPhoneNumber;
private System.Windows.Forms.DataGridViewCheckBoxColumn columnShowCallNotification;
private System.Windows.Forms.DataGridViewTextBoxColumn columnRingTonePath;
+ private System.Windows.Forms.Label label1;
}
}
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/EditPhoneBook.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/EditPhoneBook.cs 2012-01-12 23:52:12 UTC (rev 4403)
+++ trunk/plugins/FritzBox/FritzBox/EditPhoneBook.cs 2012-01-14 17:51:27 UTC (rev 4404)
@@ -30,18 +30,22 @@
{
uniqueID = phoneBookItem.UniqueID;
name = phoneBookItem.Name;
+ showCallNotification = phoneBookItem.ShowCallNotification;
+ ringTonePath = phoneBookItem.RingTonePath;
foreach (PhoneNumber phoneNumber in phoneBookItem.PhoneNumbers)
{
- type = phoneNumber.type;
- number = phoneNumber.Value;
+ if (!String.IsNullOrEmpty(phoneNumber.Value))
+ {
+ type = phoneNumber.type;
+ number = phoneNumber.Value;
+
+ dataGridView.Rows.Add(uniqueID, name, type, number, showCallNotification, ringTonePath);
+ }
}
+ }
- showCallNotification = phoneBookItem.ShowCallNotification;
- ringTonePath = phoneBookItem.RingTonePath;
-
- dataGridView.Rows.Add(uniqueID, name, type, number, showCallNotification, ringTonePath);
- }
+ label1.Text = dataGridView.Rows.Count + " phone numbers";
}
private void EditPhoneBook_Load(object sender, EventArgs e)
@@ -86,12 +90,27 @@
{
case 4:
contact.ShowCallNotification = (bool)newValue;
+
+ // update "Show call notification" field in all rows
+ for (int i = 0; i < dataGridView.Rows.Count; i++)
+ {
+ dataGridView.Rows[i].Cells[4].Value = phoneBook.Items[dataGridView.Rows[i].Cells[0].Value.ToString()].ShowCallNotification;
+ }
+
break;
case 5:
contact.RingTonePath = (string)newValue;
+
+ // update "Ring tone path" field in all rows
+ for (int i = 0; i < dataGridView.Rows.Count; i++)
+ {
+ dataGridView.Rows[i].Cells[5].Value = phoneBook.Items[dataGridView.Rows[i].Cells[0].Value.ToString()].RingTonePath;
+ }
+
break;
}
+ // transfer changed contact to phone book
phoneBook.EditItem(contact);
}
@@ -100,6 +119,10 @@
dataGridView.EndEdit(); // confirm open table changes
phoneBook.SavePhoneBookToXMLFile();
+
+ // unregister event monitors
+ this.dataGridView.SelectionChanged -= new System.EventHandler(this.dataGridView_SelectionChanged);
+ dataGridView.CellValueChanged -= new DataGridViewCellEventHandler(dataGridView_CellValueChanged);
}
}
}
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2012-01-12 23:52:12 UTC (rev 4403)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2012-01-14 17:51:27 UTC (rev 4404)
@@ -967,7 +967,7 @@
if (voiceBoxItem.isNew > 0)
{
- if (lastNewCallerName == "") lastNewCallerName = caller.PhoneBookItem.Name;
+ if (lastNewCallerName == "" && caller.PhoneBookItem != null) lastNewCallerName = caller.PhoneBookItem.Name;
newVoiceBoxItemsCount++;
}
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs 2012-01-12 23:52:12 UTC (rev 4403)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs 2012-01-14 17:51:27 UTC (rev 4404)
@@ -86,6 +86,7 @@
if (normalizePhoneNumber(phoneNumber.Value) == normalizePhoneNumber(caller.PhoneNumber))
{
if (Settings.ExtensiveLogging) Log.Info("Caller is identified by phone book as {0}", phoneBookItem.Name);
+
caller.PhoneBookItem = phoneBookItem;
return caller;
}
@@ -160,9 +161,8 @@
{
XmlSerializer xmlSerializer = new XmlSerializer(typeof(FritzPhoneBooks));
fritzPhoneBooks = (FritzPhoneBooks)xmlSerializer.Deserialize(new StringReader(fritzPhoneBooksSerialized));
-
FritzManager.PhoneBook fritzPhoneBook = fritzPhoneBooks.Items[0]; // always choose first phone book
- PhoneBookItem tempPhoneBookItem;
+ PhoneBookItem newPhoneBookItem;
bool updateRequired, contactFound;
string name, uniqueID = null, imageURL;
@@ -186,11 +186,15 @@
if (phoneBook.ContainsKey(uniqueID))
{
// check for differences
+ // ...on name and image URL fields
+ if (phoneBook[uniqueID].Name != name || imageURL != phoneBook[uniqueID].ImageURL) updateRequired = true;
+
+ // ...on phone numbers
for (int i = 0; i < contact.telephony.Length; i++)
{
try
{
- if (phoneBook[uniqueID].Name != name || !contact.telephony[i].Equals(phoneBook[uniqueID].PhoneNumbers[i]) || imageURL != phoneBook[uniqueID].ImageURL) updateRequired = true;
+ if (!contact.telephony[i].Equals(phoneBook[uniqueID].PhoneNumbers[i])) updateRequired = true;
}
catch
{
@@ -204,6 +208,7 @@
if (updateRequired)
{
if (Settings.ExtensiveLogging) Log.Info("Updating contact " + phoneBook[uniqueID].Name);
+ else Log.Info("Updating contact");
phoneBook[uniqueID].Name = name;
phoneBook[uniqueID].PhoneNumbers = contact.telephony;
@@ -215,14 +220,15 @@
else
{
if (Settings.ExtensiveLogging) Log.Info("Adding contact " + name);
+ else Log.Info("Adding contact");
- tempPhoneBookItem = new PhoneBookItem();
- tempPhoneBookItem.UniqueID = uniqueID;
- tempPhoneBookItem.Name = name;
- tempPhoneBookItem.PhoneNumbers = contact.telephony;
- tempPhoneBookItem.ImageURL = imageURL;
+ newPhoneBookItem = new PhoneBookItem();
+ newPhoneBookItem.UniqueID = uniqueID;
+ newPhoneBookItem.Name = name;
+ newPhoneBookItem.PhoneNumbers = contact.telephony;
+ newPhoneBookItem.ImageURL = imageURL;
- phoneBook.Add(uniqueID, tempPhoneBookItem);
+ phoneBook.Add(uniqueID, newPhoneBookItem);
phoneBookSortIsRequired = true;
phoneBookChanges = true;
@@ -232,6 +238,7 @@
// check for obsolete entries in local phone book (not existing in FRITZ!Box phone book anymore)
string[] contactsToDelete = new string[phoneBook.Count];
int k = 0;
+ string uniqueIDOnFritzBox;
foreach (PhoneBookItem phoneBookItem in phoneBook.Values)
{
@@ -239,9 +246,15 @@
foreach (Contact contact in fritzPhoneBook.contact)
{
- uniqueID = phoneBookItem.UniqueID;
+ name = contact.person[0].realName;
- if (uniqueID == phoneBookItem.UniqueID)
+ if (contact.uniqueid != null) uniqueID = phoneBookItem.UniqueID;
+ else uniqueID = phoneBookItem.Name; // in compatibility mode the name is used as unique ID
+
+ if (fritzPhoneBook.contact[0].uniqueid != null) uniqueIDOnFritzBox = contact.uniqueid;
+ else uniqueIDOnFritzBox = name; // in compatibility mode the name is used as unique ID
+
+ if (uniqueID == uniqueIDOnFritzBox)
{
contactFound = true;
break;
@@ -261,9 +274,13 @@
if (_uniqueID != null)
{
if (Settings.ExtensiveLogging) Log.Info("Removing contact " + phoneBook[_uniqueID].Name);
+ else Log.Info("Removing contact");
+
phoneBook.Remove(_uniqueID);
+
phoneBookChanges = true;
}
+ else break;
}
}
@@ -317,10 +334,7 @@
return picturePath;
}
}
- else
- {
- picturePath = Settings.SkinMediaFolderPath + @"\FritzBox\CallMonitor.Missing.png";
- }
+ else picturePath = Settings.SkinMediaFolderPath + @"\FritzBox\CallMonitor.Missing.png";
}
return picturePath;
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/Debug/GenerateResource-ResGen.read.1.tlog
===================================================================
(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-12 23:52:12 UTC (rev 4403)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2012-01-14 17:51:27 UTC (rev 4404)
@@ -559,7 +559,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4402</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4403</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -582,7 +582,7 @@
<Major>0</Major>
<Minor>4</Minor>
<Build>0</Build>
- <Revision>4402</Revision>
+ <Revision>4403</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>2012-01-13T00:47:46.7613728+01:00</ReleaseDate>
+ <ReleaseDate>2012-01-14T18:41:32.7676728+01:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
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/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/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/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/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.4.0.4403.mpe1
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/releases/FritzBox_v0.4.0.4403.mpe1
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/FritzBox/releases/update.xml
===================================================================
--- trunk/plugins/FritzBox/releases/update.xml 2012-01-12 23:52:12 UTC (rev 4403)
+++ trunk/plugins/FritzBox/releases/update.xml 2012-01-14 17:51:27 UTC (rev 4404)
@@ -88,7 +88,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4402</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4403</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -111,7 +111,7 @@
<Major>0</Major>
<Minor>4</Minor>
<Build>0</Build>
- <Revision>4402</Revision>
+ <Revision>4403</Revision>
</Version>
<ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box informations from MediaPortal.
@@ -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-13T00:47:46.7613728+01:00</ReleaseDate>
+ <ReleaseDate>2012-01-14T18:41:32.7676728+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-18 09:01:05
|
Revision: 4414
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4414&view=rev
Author: horned-reaper
Date: 2012-01-18 09:00:52 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
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/FritzBoxConfig.Designer.cs
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.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.dll
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb
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/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/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/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/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
trunk/plugins/FritzBox/releases/update.xml
Added Paths:
-----------
trunk/plugins/FritzBox/releases/FritzBox_v0.4.0.4413.mpe1
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2012-01-17 23:36:10 UTC (rev 4413)
+++ trunk/plugins/FritzBox/Build/Build.log 2012-01-18 09:00:52 UTC (rev 4414)
@@ -1,6 +1,6 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4403
+SVN Version: 4413
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 14.01.2012 18:41:28.
+Build started 18.01.2012 09:46: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:02.20
+Time Elapsed 00:00:02.46
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 18:41:32
+Build started at 09:46:50
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Modified: trunk/plugins/FritzBox/Docs/Ausstehend.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Ausstehend.txt 2012-01-17 23:36:10 UTC (rev 4413)
+++ trunk/plugins/FritzBox/Docs/Ausstehend.txt 2012-01-18 09:00:52 UTC (rev 4414)
@@ -3,8 +3,6 @@
Fehler beheben:
- auch bei einem "Unbekannten Anrufer" (unterdr\xFCckte bzw. nicht \xFCbertragene Rufnummer) \xF6ffnet sich \xFCber das Kontextrufen "zur\xFCckrufen". Sollte man deaktivieren
-- bei Auswahl einer MSN im Konfigurationsdialog werden die MSN-Eintr\xE4ge verdoppelt
-- Configuration: 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
@@ -18,7 +16,7 @@
- Rufnummer-Typ hinzuf\xFCgen
- GUI-Adressbuch
- Anruf-Benachrichtigungen
-- Telefonbuch editierbar machen (f\xFCr FRITZ!Box-Versionen ohne Telefonbuch), ImageURL-Feld editierbar machen
+- Telefonbuch editierbar machen (f\xFCr FRITZ!Box-Versionen ohne Telefonbuch), ImageURL-Feld hinzuf\xFCgen und nur synchronisieren, wenn im FRITZ!Box-Telefonbuch vorhanden
- R\xFCckw\xE4rtssuche wieder integrieren
- Kontextmen\xFC f\xFCr Telefonbuch
- Wiki-Eintrag
@@ -31,6 +29,9 @@
Anwenderw\xFCnsche:
+IchBinsShort, 05.01.2012, 18:02:
+Noch eine andere Frage ist es auch m\xF6glich das bei ausgehenden Anrufen nur bei bestimmten Handger\xE4ten der Pause Befehl gesendet wird. Ich benutze drei Funktelefone \xFCber die Dect Funktion der Fritzbox 7020, Garten, Eltern und bei mir. W\xE4re also sch\xF6n wenn nur auf Pause gestellt wird wenn von meinem Telefon eine Anruf get\xE4tigt wird.
+
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.
@@ -46,7 +47,7 @@
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:
+Stefan Rinke:
- 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
@@ -57,17 +58,14 @@
mu\xDF warum gibt es kein Buttons wo ich die Listen direKt anw\xE4hlen kann oder \xFCbersehe ich da was.
Gru\xDF Burkh2407
-IchBinsShort, 05.01.2012, 18:02:
-Noch eine andere Frage ist es auch m\xF6glich das bei ausgehenden Anrufen nur bei bestimmten Handger\xE4ten der Pause Befehl gesendet wird. Ich benutze drei Funktelefone \xFCber die Dect Funktion der Fritzbox 7020, Garten, Eltern und bei mir. W\xE4re also sch\xF6n wenn nur auf Pause gestellt wird wenn von meinem Telefon eine Anruf get\xE4tigt wird.
-
creativ, 10.01.2012, 19:53:
-Was nur noch eingebaut werden sollte, das dort Kontakte abgew\xE4hlt werden k\xF6nnen die im MP dann nicht angezeigt werden! Ich habe n\xE4mlich das Fritz!Fon MT-F und dort sind Kontakte im internen Speicher die nicht gel\xF6scht werden k\xF6nnen, z.b. (wie klingt HD-Telefonie und daf\xFCr gibt es eine Telefonnumer die hinterlegt ist).
+Was nur noch eingebaut werden sollte, das im Telefonbuch Kontakte abgew\xE4hlt werden k\xF6nnen die im MP dann nicht angezeigt werden! Ich habe n\xE4mlich das Fritz!Fon MT-F und dort sind Kontakte im internen Speicher die nicht gel\xF6scht werden k\xF6nnen, z.b. (wie klingt HD-Telefonie und daf\xFCr gibt es eine Telefonnumer die hinterlegt ist).
IchBinsShort, 11.01.2012, 00:28:
L\xF6schen von Anruflisten \xFCber die GUI
-creativ, 20.01.2012, 19:53:
-Ausblenden bestimmter Kontakte in der GUI
+IchBinsShort, 17.01.2012, 15:05:
+Ich h\xE4tte noch Idee, wei\xDF nicht ob dies M\xF6glich ist. Aber sch\xF6n w\xE4re es wenn Mediaportal aus dem Standby oder Hibernate erwacht anzeigen w\xFCrde wenn es verpasste Anrufe gibt. Also das vlt. ein Popup Fenster sich \xF6ffnet und anzeigt das es verpasste Anrufe gibt... Ist dies wohl M\xF6glich ?
-AlfredENeuma, 13.01.2012, 12:10:
-Vielleicht w\xE4re das eine M\xF6glichkeit f\xFCr die Zukunft: Im Telefonbuch des Plugins eine zus\xE4tzliche Spalte f\xFCr Bilder (lokal oder auf FB USB Stick). Diese Eintr\xE4ge k\xF6nnten dann verwendet werden, wenn die FB keine Eintr\xE4ge f\xFCr Bilder hat
\ No newline at end of file
+IchBinsShort, 17.01.2012, 15:23:
+Eventuell w\xE4re es dann auch noch gut wenn neue Anrufe in der Anrufliste als Neu markiert werden k\xF6nnen. Also so was wie ein "gelesen Status" woraus ersichtlich welche der Anrufe seit dem letztem Aufruf der Anrufliste neu hinzugekommen sind :-)
\ No newline at end of file
Modified: trunk/plugins/FritzBox/Docs/Changes.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Changes.txt 2012-01-17 23:36:10 UTC (rev 4413)
+++ trunk/plugins/FritzBox/Docs/Changes.txt 2012-01-18 09:00:52 UTC (rev 4414)
@@ -0,0 +1,12 @@
+Fixed bugs:
+- on multiple contact deletions multiple synchronisations are necessary
+- multiple contacts with the same name cause update actions on every synchronization
+- multiple MSN filter entries when FRITZ!Box Manager configuration window is closed and re-opened without closing the MediaPortal Configuration window
+- MediaPortal crashes on calls with phone numbers not contained in the phone book
+
+Optimizations:
+- phone book is now saved on every change instead of MediaPortal exit
+- entry checks for the following settings:
+ - update interval
+ - dial port
+- first MSN filter entry is automatically displayed when Configuration window is opened
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2012-01-17 23:36:10 UTC (rev 4413)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2012-01-18 09:00:52 UTC (rev 4414)
@@ -210,6 +210,8 @@
{
if (phoneBookItem != null) // phone book entry exists
{
+ if (Settings.ExtensiveLogging) Log.Info("Caller is identified by phone book as {0}", phoneBookItem.Name);
+
if (phoneBookItem.ShowCallNotification) showNotification = true;
}
else if (Settings.ShowUnknownCaller) showNotification = true; // unknown caller
@@ -239,15 +241,14 @@
// ...message text
strText = Environment.NewLine;
- if (callAction.Caller.PhoneNumber == "") strText += GUILocalizeStrings.Get(3); // 3 = Unknown
- else if (callAction.Caller.PhoneBookItem.Name == "") strText += callAction.Caller.PhoneNumber;
- else
+ if (callAction.Caller.PhoneNumber != "")
{
- strText += callAction.Caller.PhoneBookItem.Name;
+ if (phoneBookItem != null) strText += phoneBookItem.Name;
- if (Settings.ShowMSNOnNotify) strText += Environment.NewLine + callAction.Caller.PhoneNumber;
+ if (Settings.ShowPhoneNumberOnNotify) strText += Environment.NewLine + callAction.Caller.PhoneNumber;
}
-
+ else strText += GUILocalizeStrings.Get(3); // 3 = Unknown
+
// show call notification
ShowNotify(callAction.Type, strHeading, strImage, strText);
}
@@ -272,7 +273,7 @@
if (Settings.MSNList.Contains(mSN))
{
- Log.Info("MSN is on the list");
+ Log.Info("MSN is on the filter list");
return true;
}
else
@@ -428,9 +429,6 @@
Utils.OnStopExternal -= OnStopExternal;
SystemEvents.PowerModeChanged -= new PowerModeChangedEventHandler(SystemEvents_PowerModeChanged); // power changes
-
- // save phone book
- phoneBook.SavePhoneBookToXMLFile();
}
#endregion
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2012-01-17 23:36:10 UTC (rev 4413)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2012-01-18 09:00:52 UTC (rev 4414)
@@ -46,7 +46,7 @@
this.checkBoxCloseOnConnectionClosed = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.lblMaxNotifies = new MediaPortal.UserInterface.Controls.MPLabel();
this.numericUpDownMaxNotifies = new MediaPortal.UserInterface.Controls.MPNumericUpDown();
- this.checkBoxShowMSNOnNotify = new MediaPortal.UserInterface.Controls.MPCheckBox();
+ this.checkBoxShowPhoneNumberOnNotify = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.buttonMSNsRemove = new MediaPortal.UserInterface.Controls.MPButton();
this.checkBoxFilterMSNs = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.buttonMSNsAdd = new MediaPortal.UserInterface.Controls.MPButton();
@@ -62,7 +62,6 @@
this.checkBoxPauseMediaOnIncomingCall = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.tabPageConnection = new System.Windows.Forms.TabPage();
this.label2 = new System.Windows.Forms.Label();
- this.dialPort = new System.Windows.Forms.TextBox();
this.vBPath = new System.Windows.Forms.TextBox();
this.passwd = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
@@ -76,7 +75,8 @@
this.tabPageMiscellaneous = new System.Windows.Forms.TabPage();
this.checkBoxExtensiveLogging = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.label4 = new System.Windows.Forms.Label();
- this.updateInterval = new MediaPortal.UserInterface.Controls.MPTextBox();
+ this.dialPortNumericUpDown = new MediaPortal.UserInterface.Controls.MPNumericUpDown();
+ this.updateInterval = new MediaPortal.UserInterface.Controls.MPNumericUpDown();
this.tabPageDiagnostics.SuspendLayout();
this.tabPagePhoneBook.SuspendLayout();
this.tabPageCallNotification.SuspendLayout();
@@ -90,6 +90,8 @@
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.tabControlConfiguration.SuspendLayout();
this.tabPageMiscellaneous.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.dialPortNumericUpDown)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.updateInterval)).BeginInit();
this.SuspendLayout();
//
// labelVersion
@@ -212,7 +214,7 @@
this.groupBoxPhonebook.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.groupBoxPhonebook.Location = new System.Drawing.Point(7, 229);
this.groupBoxPhonebook.Name = "groupBoxPhonebook";
- this.groupBoxPhonebook.Size = new System.Drawing.Size(177, 71);
+ this.groupBoxPhonebook.Size = new System.Drawing.Size(177, 67);
this.groupBoxPhonebook.TabIndex = 2;
this.groupBoxPhonebook.TabStop = false;
this.groupBoxPhonebook.Text = "Phone book settings";
@@ -221,7 +223,7 @@
//
this.checkBoxShowUnknownCaller.AutoSize = true;
this.checkBoxShowUnknownCaller.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.checkBoxShowUnknownCaller.Location = new System.Drawing.Point(24, 45);
+ this.checkBoxShowUnknownCaller.Location = new System.Drawing.Point(23, 41);
this.checkBoxShowUnknownCaller.Name = "checkBoxShowUnknownCaller";
this.checkBoxShowUnknownCaller.Size = new System.Drawing.Size(126, 17);
this.checkBoxShowUnknownCaller.TabIndex = 1;
@@ -247,7 +249,7 @@
this.groupBoxNotify.Controls.Add(this.checkBoxCloseOnConnectionClosed);
this.groupBoxNotify.Controls.Add(this.lblMaxNotifies);
this.groupBoxNotify.Controls.Add(this.numericUpDownMaxNotifies);
- this.groupBoxNotify.Controls.Add(this.checkBoxShowMSNOnNotify);
+ this.groupBoxNotify.Controls.Add(this.checkBoxShowPhoneNumberOnNotify);
this.groupBoxNotify.Controls.Add(this.buttonMSNsRemove);
this.groupBoxNotify.Controls.Add(this.checkBoxFilterMSNs);
this.groupBoxNotify.Controls.Add(this.buttonMSNsAdd);
@@ -306,16 +308,16 @@
0,
0});
//
- // checkBoxShowMSNOnNotify
+ // checkBoxShowPhoneNumberOnNotify
//
- this.checkBoxShowMSNOnNotify.AutoSize = true;
- this.checkBoxShowMSNOnNotify.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.checkBoxShowMSNOnNotify.Location = new System.Drawing.Point(6, 88);
- this.checkBoxShowMSNOnNotify.Name = "checkBoxShowMSNOnNotify";
- this.checkBoxShowMSNOnNotify.Size = new System.Drawing.Size(121, 17);
- this.checkBoxShowMSNOnNotify.TabIndex = 6;
- this.checkBoxShowMSNOnNotify.Text = "Show MSN on notify";
- this.checkBoxShowMSNOnNotify.UseVisualStyleBackColor = true;
+ this.checkBoxShowPhoneNumberOnNotify.AutoSize = true;
+ this.checkBoxShowPhoneNumberOnNotify.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.checkBoxShowPhoneNumberOnNotify.Location = new System.Drawing.Point(6, 88);
+ this.checkBoxShowPhoneNumberOnNotify.Name = "checkBoxShowPhoneNumberOnNotify";
+ this.checkBoxShowPhoneNumberOnNotify.Size = new System.Drawing.Size(122, 17);
+ this.checkBoxShowPhoneNumberOnNotify.TabIndex = 6;
+ this.checkBoxShowPhoneNumberOnNotify.Text = "Show phone number";
+ this.checkBoxShowPhoneNumberOnNotify.UseVisualStyleBackColor = true;
//
// buttonMSNsRemove
//
@@ -480,8 +482,8 @@
//
// tabPageConnection
//
+ this.tabPageConnection.Controls.Add(this.dialPortNumericUpDown);
this.tabPageConnection.Controls.Add(this.label2);
- this.tabPageConnection.Controls.Add(this.dialPort);
this.tabPageConnection.Controls.Add(this.vBPath);
this.tabPageConnection.Controls.Add(this.passwd);
this.tabPageConnection.Controls.Add(this.label3);
@@ -508,13 +510,6 @@
this.label2.TabIndex = 32;
this.label2.Text = "Voice box path (e. g. \\\\fritz.box\\FRITZ.NAS\\USBStore\\FRITZ\\voicebox)";
//
- // dialPort
- //
- this.dialPort.Location = new System.Drawing.Point(125, 151);
- this.dialPort.Name = "dialPort";
- this.dialPort.Size = new System.Drawing.Size(30, 20);
- this.dialPort.TabIndex = 30;
- //
// vBPath
//
this.vBPath.Location = new System.Drawing.Point(17, 216);
@@ -623,9 +618,9 @@
//
// tabPageMiscellaneous
//
+ this.tabPageMiscellaneous.Controls.Add(this.updateInterval);
this.tabPageMiscellaneous.Controls.Add(this.checkBoxExtensiveLogging);
this.tabPageMiscellaneous.Controls.Add(this.label4);
- this.tabPageMiscellaneous.Controls.Add(this.updateInterval);
this.tabPageMiscellaneous.Location = new System.Drawing.Point(4, 22);
this.tabPageMiscellaneous.Name = "tabPageMiscellaneous";
this.tabPageMiscellaneous.Padding = new System.Windows.Forms.Padding(3);
@@ -654,13 +649,46 @@
this.label4.TabIndex = 20;
this.label4.Text = "Auto update frequency (seconds)";
//
+ // dialPortNumericUpDown
+ //
+ this.dialPortNumericUpDown.Location = new System.Drawing.Point(129, 149);
+ this.dialPortNumericUpDown.Minimum = new decimal(new int[] {
+ 1,
+ 0,
+ 0,
+ 0});
+ this.dialPortNumericUpDown.Name = "dialPortNumericUpDown";
+ this.dialPortNumericUpDown.Size = new System.Drawing.Size(53, 20);
+ this.dialPortNumericUpDown.TabIndex = 33;
+ this.dialPortNumericUpDown.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
+ this.dialPortNumericUpDown.Value = new decimal(new int[] {
+ 1,
+ 0,
+ 0,
+ 0});
+ //
// updateInterval
//
- this.updateInterval.BorderColor = System.Drawing.Color.Empty;
- this.updateInterval.Location = new System.Drawing.Point(32, 47);
+ this.updateInterval.Location = new System.Drawing.Point(33, 45);
+ this.updateInterval.Maximum = new decimal(new int[] {
+ 999,
+ 0,
+ 0,
+ 0});
+ this.updateInterval.Minimum = new decimal(new int[] {
+ 30,
+ 0,
+ 0,
+ 0});
this.updateInterval.Name = "updateInterval";
- this.updateInterval.Size = new System.Drawing.Size(159, 20);
- this.updateInterval.TabIndex = 19;
+ this.updateInterval.Size = new System.Drawing.Size(47, 20);
+ this.updateInterval.TabIndex = 22;
+ this.updateInterval.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
+ this.updateInterval.Value = new decimal(new int[] {
+ 300,
+ 0,
+ 0,
+ 0});
//
// FritzBoxConfig
//
@@ -700,6 +728,8 @@
this.tabControlConfiguration.ResumeLayout(false);
this.tabPageMiscellaneous.ResumeLayout(false);
this.tabPageMiscellaneous.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.dialPortNumericUpDown)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.updateInterval)).EndInit();
this.ResumeLayout(false);
}
@@ -719,7 +749,7 @@
private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxCloseOnConnectionClosed;
private MediaPortal.UserInterface.Controls.MPLabel lblMaxNotifies;
private MediaPortal.UserInterface.Controls.MPNumericUpDown numericUpDownMaxNotifies;
- private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxShowMSNOnNotify;
+ private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxShowPhoneNumberOnNotify;
private MediaPortal.UserInterface.Controls.MPButton buttonMSNsRemove;
private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxFilterMSNs;
private MediaPortal.UserInterface.Controls.MPButton buttonMSNsAdd;
@@ -740,10 +770,8 @@
private System.Windows.Forms.Button buttonEditPhoneBook;
private System.Windows.Forms.TabPage tabPageMiscellaneous;
private System.Windows.Forms.Label label4;
- private MediaPortal.UserInterface.Controls.MPTextBox updateInterval;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.Label label2;
- private System.Windows.Forms.TextBox dialPort;
private System.Windows.Forms.TextBox vBPath;
private System.Windows.Forms.TextBox passwd;
private System.Windows.Forms.Label label3;
@@ -754,5 +782,7 @@
private MediaPortal.UserInterface.Controls.MPLabel labelPort;
private MediaPortal.UserInterface.Controls.MPLabel labelAddress;
private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxExtensiveLogging;
+ private MediaPortal.UserInterface.Controls.MPNumericUpDown dialPortNumericUpDown;
+ private MediaPortal.UserInterface.Controls.MPNumericUpDown updateInterval;
}
}
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2012-01-17 23:36:10 UTC (rev 4413)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2012-01-18 09:00:52 UTC (rev 4414)
@@ -57,7 +57,7 @@
numericUpDownPort.Value = FritzBoxClient.Port;
passwd.Text = Settings.Password;
- dialPort.Text = Settings.DialPort;
+ dialPortNumericUpDown.Text = Settings.DialPort;
vBPath.Text = Settings.VBPath;
@@ -76,8 +76,9 @@
comboBoxMSNs.Items.Clear();
comboBoxMSNs.Items.AddRange(Settings.MSNList.ToArray());
+ comboBoxMSNs.Text = Settings.MSNList[0];
- checkBoxShowMSNOnNotify.Checked = Settings.ShowMSNOnNotify;
+ checkBoxShowPhoneNumberOnNotify.Checked = Settings.ShowPhoneNumberOnNotify;
checkBoxPauseMediaOnIncomingCall.Checked = Settings.PauseMediaOnIncomingCall;
checkBoxResumeMediaOnIncomingCall.Checked = Settings.ResumeMediaOnIncomingCall;
@@ -91,7 +92,7 @@
mpIncomingSoundTextBox.Text = Settings.IncomingSoundPath;
// miscellaneous settings
- updateInterval.Text = Convert.ToString(Settings.UpdateInterval);
+ updateInterval.Text = Settings.UpdateInterval.ToString();
}
private void SaveSettings()
@@ -103,7 +104,7 @@
FritzBoxClient.Port = (int)numericUpDownPort.Value;
Settings.Password = passwd.Text;
- Settings.DialPort = dialPort.Text;
+ Settings.DialPort = dialPortNumericUpDown.Text;
Settings.VBPath = vBPath.Text;
@@ -114,14 +115,15 @@
Settings.CloseOnConnectionClosed = checkBoxCloseOnConnectionClosed.Checked;
Settings.FilterMSN = checkBoxFilterMSNs.Checked;
+
Settings.MSNList.Clear();
- foreach (object obj in comboBoxMSNs.Items)
+ foreach (string item in comboBoxMSNs.Items)
{
- Settings.MSNList.Add((string)obj);
+ Settings.MSNList.Add(item);
}
- Settings.ShowMSNOnNotify = checkBoxShowMSNOnNotify.Checked;
+ Settings.ShowPhoneNumberOnNotify = checkBoxShowPhoneNumberOnNotify.Checked;
Settings.PauseMediaOnIncomingCall = checkBoxPauseMediaOnIncomingCall.Checked;
Settings.ResumeMediaOnIncomingCall = checkBoxResumeMediaOnIncomingCall.Checked;
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs 2012-01-17 23:36:10 UTC (rev 4413)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs 2012-01-18 09:00:52 UTC (rev 4414)
@@ -85,8 +85,6 @@
{
if (normalizePhoneNumber(phoneNumber.Value) == normalizePhoneNumber(caller.PhoneNumber))
{
- if (Settings.ExtensiveLogging) Log.Info("Caller is identified by phone book as {0}", phoneBookItem.Name);
-
caller.PhoneBookItem = phoneBookItem;
return caller;
}
@@ -115,32 +113,6 @@
if (phoneBook.Count != 0) Log.Info("Loaded " + phoneBook.Count + " contacts from " + Settings.PhoneBookFilePath);
}
- public void SavePhoneBookToXMLFile()
- {
- if (phoneBookSaveIsRequired)
- {
- InternalPhoneBook internalPhoneBook = new InternalPhoneBook();
-
- foreach (PhoneBookItem phoneBookItem in phoneBook.Values)
- {
- internalPhoneBook.items.Add(phoneBookItem);
- }
-
- if (internalPhoneBook.items.Count > 0)
- {
- XmlSerializer xmlSerializer = new XmlSerializer(typeof(InternalPhoneBook));
- TextWriter textWriter = new StreamWriter(Settings.PhoneBookFilePath);
- xmlSerializer.Serialize(textWriter, internalPhoneBook);
- textWriter.Close();
-
- Log.Info("Saved " + internalPhoneBook.items.Count + " contacts to {0}", Settings.PhoneBookFilePath);
- }
- else Log.Info("No changes, no contacts saved");
- }
-
- phoneBookSaveIsRequired = false;
- }
-
public bool SynchronizePhoneBook()
{
bool phoneBookChanges = false; // second field is required to determine if GUI phone book update is required
@@ -164,48 +136,50 @@
FritzManager.PhoneBook fritzPhoneBook = fritzPhoneBooks.Items[0]; // always choose first phone book
PhoneBookItem newPhoneBookItem;
bool updateRequired, contactFound;
- string name, uniqueID = null, imageURL;
+ string name, uniqueID = null, imageURL, lastContactName = "";
// check if FRITZ!Box phone book has unique ID field. Older FRITZ!Box models e. g. 7170 and 7320 doesn't have an unique ID field in it's address book
- if (fritzPhoneBook.contact[0].uniqueid == null) Log.Debug("FRITZ!Box phone book doesn't have an unique ID field. Synchronizing contacts in compatibility mode. Multiple contacts with the same name won't be shown and cause update actions on every synchronization!");
+ if (fritzPhoneBook.contact[0].uniqueid == null) Log.Debug("FRITZ!Box phone book doesn't have an unique ID field. Synchronizing contacts in compatibility mode. Multiple contacts with the same name won't be synchronized!");
lock (sync)
{
- // update/add entries from FRITZ!Box phone book to local phone book
- foreach (Contact contact in fritzPhoneBook.contact)
- {
- name = contact.person[0].realName;
- imageURL = contact.person[0].imageURL;
+ // update/add entries from FRITZ!Box phone book to local phone book
+ foreach (Contact contact in fritzPhoneBook.contact)
+ {
+ name = contact.person[0].realName;
+ imageURL = contact.person[0].imageURL;
- if (fritzPhoneBook.contact[0].uniqueid != null) uniqueID = contact.uniqueid;
- else uniqueID = name; // in compatibility mode the name is used as unique ID
+ if (fritzPhoneBook.contact[0].uniqueid != null) uniqueID = contact.uniqueid;
+ else uniqueID = name; // in compatibility mode the name is used as unique ID
- updateRequired = false;
+ updateRequired = false;
- // search if FRITZ!Box contact already exists in phone book
- if (phoneBook.ContainsKey(uniqueID))
+ // search if FRITZ!Box contact already exists in phone book
+ if (phoneBook.ContainsKey(uniqueID))
+ {
+ // check for differences
+ // ...on name and image URL fields
+ if (phoneBook[uniqueID].Name != name || imageURL != phoneBook[uniqueID].ImageURL) updateRequired = true;
+
+ // ...on phone numbers
+ for (int i = 0; i < contact.telephony.Length; i++)
{
- // check for differences
- // ...on name and image URL fields
- if (phoneBook[uniqueID].Name != name || imageURL != phoneBook[uniqueID].ImageURL) updateRequired = true;
-
- // ...on phone numbers
- for (int i = 0; i < contact.telephony.Length; i++)
+ try
{
- try
- {
- if (!contact.telephony[i].Equals(phoneBook[uniqueID].PhoneNumbers[i])) updateRequired = true;
- }
- catch
- {
- // on property changes the differences check may fail
- Log.Debug("Phone book difference check failed. Forcing contact update");
- updateRequired = true;
- break;
- }
+ if (!contact.telephony[i].Equals(phoneBook[uniqueID].PhoneNumbers[i])) updateRequired = true;
}
+ catch
+ {
+ // on property changes the differences check may fail
+ Log.Debug("Phone book difference check failed. Forcing contact update");
+ updateRequired = true;
+ break;
+ }
+ }
- if (updateRequired)
+ if (updateRequired)
+ {
+ if (uniqueID != lastContactName)
{
if (Settings.ExtensiveLogging) Log.Info("Updating contact " + phoneBook[uniqueID].Name);
else Log.Info("Updating contact");
@@ -216,74 +190,87 @@
phoneBookChanges = true;
}
+ else
+ {
+ // avoid double synchronization on multiple contacts with the same name in compatibility mode
+ if (Settings.ExtensiveLogging) Log.Info("Contact " + phoneBook[uniqueID].Name + " is skipped because there are multiple contacts with the same name");
+ else Log.Info("One contact is skipped because there are multiple contacts with the same name");
+ }
}
- else
- {
- if (Settings.ExtensiveLogging) Log.Info("Adding contact " + name);
- else Log.Info("Adding contact");
+ }
+ else
+ {
+ if (Settings.ExtensiveLogging) Log.Info("Adding contact " + name);
+ else Log.Info("Adding contact");
- newPhoneBookItem = new PhoneBookItem();
- newPhoneBookItem.UniqueID = uniqueID;
- newPhoneBookItem.Name = name;
- newPhoneBookItem.PhoneNumbers = contact.telephony;
- newPhoneBookItem.ImageURL = imageURL;
+ newPhoneBookItem = new PhoneBookItem();
+ newPhoneBookItem.UniqueID = uniqueID;
+ newPhoneBookItem.Name = name;
+ newPhoneBookItem.PhoneNumbers = contact.telephony;
+ newPhoneBookItem.ImageURL = imageURL;
- phoneBook.Add(uniqueID, newPhoneBookItem);
+ phoneBook.Add(uniqueID, newPhoneBookItem);
- phoneBookSortIsRequired = true;
- phoneBookChanges = true;
- }
+ phoneBookSortIsRequired = true;
+ phoneBookChanges = true;
}
- // check for obsolete entries in local phone book (not existing in FRITZ!Box phone book anymore)
- string[] contactsToDelete = new string[phoneBook.Count];
- int k = 0;
- string uniqueIDOnFritzBox;
+ lastContactName = name; // remember last contact name to avoid double synchronization on multiple contacts with the same name in compatibility mode
+ }
- foreach (PhoneBookItem phoneBookItem in phoneBook.Values)
+ // check for obsolete entries in local phone book (not existing in FRITZ!Box phone book anymore)
+ string[] contactsToDelete = new string[phoneBook.Count];
+ int k = 0;
+ string uniqueIDOnFritzBox;
+
+ foreach (PhoneBookItem phoneBookItem in phoneBook.Values)
+ {
+ contactFound = false;
+
+ foreach (Contact contact in fritzPhoneBook.contact)
{
- contactFound = false;
+ name = contact.person[0].realName;
- foreach (Contact contact in fritzPhoneBook.contact)
+ if (contact.uniqueid != null)
{
- name = contact.person[0].realName;
-
- if (contact.uniqueid != null) uniqueID = phoneBookItem.UniqueID;
- else uniqueID = phoneBookItem.Name; // in compatibility mode the name is used as unique ID
-
- if (fritzPhoneBook.contact[0].uniqueid != null) uniqueIDOnFritzBox = contact.uniqueid;
- else uniqueIDOnFritzBox = name; // in compatibility mode the name is used as unique ID
-
- if (uniqueID == uniqueIDOnFritzBox)
- {
- contactFound = true;
- break;
- }
+ uniqueID = phoneBookItem.UniqueID;
+ uniqueIDOnFritzBox = contact.uniqueid;
}
+ else
+ {
+ // in compatibility mode the name is used as unique ID
+ uniqueID = phoneBookItem.Name;
+ uniqueIDOnFritzBox = name;
+ }
- if (!contactFound)
+ if (uniqueID == uniqueIDOnFritzBox)
{
- contactsToDelete[k] = uniqueID;
- k++;
+ contactFound = true;
break;
}
}
- foreach (string _uniqueID in contactsToDelete) // contacts cannot be deleted in above foreach loop, a second loop is required
- {
- if (_uniqueID != null)
- {
- if (Settings.ExtensiveLogging) Log.Info("Removing contact " + phoneBook[_uniqueID].Name);
- else Log.Info("Removing contact");
+ if (!contactFound)
+ {
+ contactsToDelete[k] = uniqueID;
+ k++;
+ }
+ }
- phoneBook.Remove(_uniqueID);
+ foreach (string _uniqueID in contactsToDelete) // contacts cannot be deleted in above foreach loop, a second loop is required
+ {
+ if (_uniqueID != null)
+ {
+ if (Settings.ExtensiveLogging) Log.Info("Removing contact " + phoneBook[_uniqueID].Name);
+ else Log.Info("Removing contact");
- phoneBookChanges = true;
- }
- else break;
- }
+ phoneBook.Remove(_uniqueID);
+
+ phoneBookChanges = true;
+ }
+ else break;
+ }
}
-
Log.Info("Synchronized " + phoneBook.Count + " contacts with FRITZ!Box");
}
}
@@ -312,6 +299,10 @@
if (phoneBookChanges)
{
phoneBookSaveIsRequired = true;
+
+ // save phone book
+ SavePhoneBookToXMLFile();
+
return true;
}
else return false;
@@ -454,7 +445,33 @@
}
}
}
+
+ public void SavePhoneBookToXMLFile()
+ {
+ if (phoneBookSaveIsRequired)
+ {
+ InternalPhoneBook internalPhoneBook = new InternalPhoneBook();
+ foreach (PhoneBookItem phoneBookItem in phoneBook.Values)
+ {
+ internalPhoneBook.items.Add(phoneBookItem);
+ }
+
+ if (internalPhoneBook.items.Count > 0)
+ {
+ XmlSerializer xmlSerializer = new XmlSerializer(typeof(InternalPhoneBook));
+ TextWriter textWriter = new StreamWriter(Settings.PhoneBookFilePath);
+ xmlSerializer.Serialize(textWriter, internalPhoneBook);
+ textWriter.Close();
+
+ Log.Info("Saved " + internalPhoneBook.items.Count + " contacts to {0}", Settings.PhoneBookFilePath);
+ }
+ else Log.Info("No changes, no contacts saved");
+ }
+
+ phoneBookSaveIsRequired = false;
+ }
+
#endregion public methods
#region private methods
Modified: trunk/plugins/FritzBox/FritzBox/Settings.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Settings.cs 2012-01-17 23:36:10 UTC (rev 4413)
+++ trunk/plugins/FritzBox/FritzBox/Settings.cs 2012-01-18 09:00:52 UTC (rev 4414)
@@ -82,7 +82,7 @@
public static bool CloseOnConnectionClosed { get; set; }
- public static bool ShowMSNOnNotify { get; set; }
+ public static bool ShowPhoneNumberOnNotify { get; set; }
public static bool ShowUnknownCaller { get; set; }
@@ -154,7 +154,7 @@
if (decryptedPassword != null) Password = decryptedPassword;
else Password = xmlreader.GetValue("FritzManager", "passwd"); // if the password was not encrypted read it in clear text (for older FritzBox Manager versions)
- DialPort = xmlreader.GetValue("FritzManager", "dialport");
+ DialPort = xmlreader.GetValueAsString("FritzManager", "dialport", "1");
VBPath = xmlreader.GetValue("FritzManager", "vBPath");
// phone book settings
@@ -167,11 +167,13 @@
CloseOnConnectionClosed = xmlreader.GetValueAsBool("fritzbox", "closeOnConnectionClosed", true);
FilterMSN = xmlreader.GetValueAsBool("fritzbox", "filterMSNs", false);
+
string strMSN = xmlreader.GetValueAsString("fritzbox", "MSN", "");
char[] charSeparators = new[] { ';' };
+ MSNList.Clear(); // necessary to avoid multiple entries when FRITZ!Box Manager configuration window is closed and re-opened without closing the MediaPortal Configuration window
MSNList.AddRange(strMSN.Split(charSeparators, StringSplitOptions.RemoveEmptyEntries));
- ShowMSNOnNotify = xmlreader.GetValueAsBool("fritzbox", "showMSNOnNotify", true);
+ ShowPhoneNumberOnNotify = xmlreader.GetValueAsBool("fritzbox", "showPhoneNumberOnNotify", true);
ShowUnknownCaller = xmlreader.GetValueAsBool("fritzbox", "showUnknownCaller", true);
@@ -186,6 +188,8 @@
// miscellaneous settings
UpdateInterval = xmlreader.GetValueAsInt("FritzManager", "updateInterval", 300);
+ if (UpdateInterval < 30) UpdateInterval = 30; // ensure that update timer interval is not smaller than 30 seconds
+
ExtensiveLogging = xmlreader.GetValueAsBool("fritzbox", "extensiveLogging", false);
// GUI settings
@@ -225,6 +229,8 @@
xmlreader.RemoveEntry("FritzManager", "defaultAreacode");
xmlreader.RemoveEntry("fritzbox", "saveUnknownCaller");
+
+ xmlreader.RemoveEntry("fritzbox", "showMSNOnNotify");
}
}
@@ -249,14 +255,17 @@
xmlwriter.SetValueAsBool("fritzbox", "closeOnConnectionClosed", CloseOnConnectionClosed);
xmlwriter.SetValueAsBool("fritzbox", "filterMSNs", FilterMSN);
+
string strMSN = "";
+
foreach (string mSN in MSNList)
{
strMSN += mSN + ";";
}
+
xmlwriter.SetValue("fritzbox", "MSN", strMSN);
- xmlwriter.SetValueAsBool("fritzbox", "showMSNOnNotify", ShowMSNOnNotify);
+ xmlwriter.SetValueAsBool("fritzbox", "showPhoneNumberOnNotify", ShowPhoneNumberOnNotify);
xmlwriter.SetValueAsBool("fritzbox", "usePhonebook", PhoneBookEnabled);
@@ -269,7 +278,6 @@
xmlwriter.SetValueAsBool("fritzbox", "resumeMediaOnOutgoingCall", ResumeMediaOnOutgoingCall);
// miscellaneous settings
- if (UpdateInterval < 30) UpdateInterval = 30; // ensure that update timer interval is not smaller than 30 seconds
xmlwriter.SetValue("FritzManager", "updateInterval", UpdateInterval);
xmlwriter.SetValueAsBool("fritzbox", "extensiveLogging", ExtensiveLogging);
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/Debug/GenerateResource-ResGen.read.1.tlog
===================================================================
(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-17 23:36:10 UTC (rev 4413)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2012-01-18 09:00:52 UTC (rev 4414)
@@ -559,7 +559,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4403</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4413</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -582,7 +582,7 @@
<Major>0</Major>
<Minor>4</Minor>
<Build>0</Build>
- <Revision>4403</Revision>
+ <Revision>4413</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>2012-01-14T18:41:32.7676728+01:00</ReleaseDate>
+ <ReleaseDate>2012-01-18T09:46:50.1990036+01:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
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/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/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/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/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.4.0.4413.mpe1
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/releases/FritzBox_v0.4.0.4413.mpe1
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/FritzBox/releases/update.xml
===================================================================
--- trunk/plugins/FritzBox/releases/update.xml 2012-01-17 23:36:10 UTC (rev 4413)
+++ trunk/plugins/FritzBox/releases/update.xml 2012-01-18 09:00:52 UTC (rev 4414)
@@ -88,7 +88,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4403</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4413</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -111,7 +111,7 @@
<Major>0</Major>
<Minor>4</Minor>
<Build>0</Build>
- <Revision>4403</Revision>
+ <Revision>4413</Revision>
</Version>
<ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box informations from MediaPortal.
@@ -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-14T18:41:32.7676728+01:00</ReleaseDate>
+ <ReleaseDate>2012-01-18T09:46:50.1990036+01:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Param...
[truncated message content] |
|
From: <hor...@us...> - 2012-01-18 11:29:29
|
Revision: 4415
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4415&view=rev
Author: horned-reaper
Date: 2012-01-18 11:29:15 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.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.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
Added Paths:
-----------
trunk/plugins/FritzBox/releases/FritzBox_v0.4.0.4414.mpe1
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2012-01-18 09:00:52 UTC (rev 4414)
+++ trunk/plugins/FritzBox/Build/Build.log 2012-01-18 11:29:15 UTC (rev 4415)
@@ -1,6 +1,6 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4413
+SVN Version: 4414
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 18.01.2012 09:46:45.
+Build started 18.01.2012 12:14:44.
Project "D:\FritzBox\FritzBox.sln" on node 1 (Rebuild target(s)).
ValidateSolutionConfiguration:
Building solution configuration "Release|Mixed Platforms".
@@ -195,7 +195,7 @@
0 Warning(s)
0 Error(s)
-Time Elapsed 00:00:02.46
+Time Elapsed 00:00:02.47
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 09:46:50
+Build started at 12:14:48
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2012-01-18 09:00:52 UTC (rev 4414)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2012-01-18 11:29:15 UTC (rev 4415)
@@ -76,7 +76,7 @@
comboBoxMSNs.Items.Clear();
comboBoxMSNs.Items.AddRange(Settings.MSNList.ToArray());
- comboBoxMSNs.Text = Settings.MSNList[0];
+ if (comboBoxMSNs.Items.Count > 0) comboBoxMSNs.Text = Settings.MSNList[0]; // select the first entry
checkBoxShowPhoneNumberOnNotify.Checked = Settings.ShowPhoneNumberOnNotify;
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.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-18 09:00:52 UTC (rev 4414)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2012-01-18 11:29:15 UTC (rev 4415)
@@ -559,7 +559,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4413</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4414</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -582,7 +582,7 @@
<Major>0</Major>
<Minor>4</Minor>
<Build>0</Build>
- <Revision>4413</Revision>
+ <Revision>4414</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>2012-01-18T09:46:50.1990036+01:00</ReleaseDate>
+ <ReleaseDate>2012-01-18T12:14:48.8716896+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)
Added: trunk/plugins/FritzBox/releases/FritzBox_v0.4.0.4414.mpe1
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/releases/FritzBox_v0.4.0.4414.mpe1
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/FritzBox/releases/update.xml
===================================================================
--- trunk/plugins/FritzBox/releases/update.xml 2012-01-18 09:00:52 UTC (rev 4414)
+++ trunk/plugins/FritzBox/releases/update.xml 2012-01-18 11:29:15 UTC (rev 4415)
@@ -88,7 +88,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4413</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4414</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -111,7 +111,7 @@
<Major>0</Major>
<Minor>4</Minor>
<Build>0</Build>
- <Revision>4413</Revision>
+ <Revision>4414</Revision>
</Version>
<ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box informations from MediaPortal.
@@ -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-18T09:46:50.1990036+01:00</ReleaseDate>
+ <ReleaseDate>2012-01-18T12:14:48.8716896+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-21 10:50:56
|
Revision: 4416
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4416&view=rev
Author: horned-reaper
Date: 2012-01-21 10:50:48 +0000 (Sat, 21 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/FritzBoxConfig.Designer.cs
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.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.dll
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb
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/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/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/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/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
trunk/plugins/FritzBox/releases/update.xml
Added Paths:
-----------
trunk/plugins/FritzBox/Docs/Documentation/Call strings.xls
trunk/plugins/FritzBox/releases/FritzBox_v0.4.1.4415.mpe1
Modified: trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat
===================================================================
--- trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat 2012-01-18 11:29:15 UTC (rev 4415)
+++ trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat 2012-01-21 10:50:48 UTC (rev 4416)
@@ -3,61 +3,5 @@
D:
cd \FritzBox\Build
-REM Set program path based on current machine environment
-set ProgramDir=%ProgramFiles%
-if not "%ProgramFiles(x86)%".=="". set ProgramDir=%ProgramFiles(x86)%
-
-REM Set build path
-set BuildPath=..\FritzBox\bin\Release
-
-REM Set plugin DLL path
-set PluginDLL=%BuildPath%\FritzBox.dll
-
-REM set log file where the infos are written to, and clear that file
-set LOG=Build.log
-echo. > %LOG%
-
-echo.
-echo -= FRITZ!Box Manager =-
-echo -=====================-
-echo.
-
-echo.
-echo Writing SVN revision assemblies...
-DeployVersionSVN.exe /svn=".." >> %LOG%
-
-echo.
-echo Building FRITZ!Box Manager...
-"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" /target:Rebuild /property:Configuration=Release;AllowUnsafeBlocks=true "..\FritzBox.sln" >> %LOG%
-
-echo.
-echo Reverting assemblies...
-DeployVersionSVN.exe /svn=".." /revert >> %LOG%
-
-rmdir /S /Q ..\_release
-xcopy "%PluginDLL%" ..\_release\plugins\windows\ >> %LOG%
-xcopy ..\FritzBox\Resources\speexdec.exe ..\_release\base\ >> %LOG%
-xcopy ..\FritzBox\Skin ..\_release\skin /S /I >> %LOG%
-xcopy ..\FritzBox\Languages ..\_release\language /S /I >> %LOG%
-
-echo.
-echo Reading the version number...
-if not exist "%PluginDLL%" goto version_error
-for /f "Tokens=5" %%a in ('filever "%PluginDLL%"') do set version=%%a
-goto :version_done
-:version_error
-echo FritzBox.dll not found. version could not be read >> %LOG%
-echo FritzBox.dll not found. version could not be read. Build is cancelled
-pause
-goto :EOF
-:version_done
-
-echo.
-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 Move installer and update.xml files to the releases folder
-move /Y "..\MpeRelease\FritzBox.mpe1" "..\releases\FritzBox_v%Version%.mpe1"
-move /Y "..\MpeRelease\update.xml" "..\releases\update.xml"
+echo Updating SVN path...
+TortoiseProc.exe /path:".." /command:commit /closeonend:1
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2012-01-18 11:29:15 UTC (rev 4415)
+++ trunk/plugins/FritzBox/Build/Build.log 2012-01-21 10:50:48 UTC (rev 4416)
@@ -1,6 +1,6 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4414
+SVN Version: 4415
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 18.01.2012 12:14:44.
+Build started 21.01.2012 11:32:07.
Project "D:\FritzBox\FritzBox.sln" on node 1 (Rebuild target(s)).
ValidateSolutionConfiguration:
Building solution configuration "Release|Mixed Platforms".
@@ -195,7 +195,7 @@
0 Warning(s)
0 Error(s)
-Time Elapsed 00:00:02.47
+Time Elapsed 00:00:02.53
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 12:14:48
+Build started at 11:32:12
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Modified: trunk/plugins/FritzBox/Docs/Ausstehend.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Ausstehend.txt 2012-01-18 11:29:15 UTC (rev 4415)
+++ trunk/plugins/FritzBox/Docs/Ausstehend.txt 2012-01-21 10:50:48 UTC (rev 4416)
@@ -3,16 +3,17 @@
Fehler beheben:
- auch bei einem "Unbekannten Anrufer" (unterdr\xFCckte bzw. nicht \xFCbertragene Rufnummer) \xF6ffnet sich \xFCber das Kontextrufen "zur\xFCckrufen". Sollte man deaktivieren
-- btnModus umbenennen?
- ObjectDisposed-Exception bei Client-Stop
- ein kleiner schwarzer Balken \xFCberdeckt das erste Zeichen oder die erste Ziffer zur H\xE4lfte
- Problem beim Laden gro\xDFer meta0-Dateien, siehe "Problembeschreibung 1.txt"
+
+Optimierungen:
+- btnModus umbenennen?
- blauer Hintergrund f\xFCr Default und DefaultWide Skins
- GUI-Properties \xFCberpr\xFCfen und Dokumentation vervollst\xE4ndigen
- vertrauliche Daten im Log trotz "Extensive Logging"-Einstellung
Neue Funktionen/Erweiterungen:
-- Schalter zum Deaktivieren von Benachrichtigungen bei ausgehenden Anrufen
- Rufnummer-Typ hinzuf\xFCgen
- GUI-Adressbuch
- Anruf-Benachrichtigungen
@@ -68,4 +69,7 @@
Ich h\xE4tte noch Idee, wei\xDF nicht ob dies M\xF6glich ist. Aber sch\xF6n w\xE4re es wenn Mediaportal aus dem Standby oder Hibernate erwacht anzeigen w\xFCrde wenn es verpasste Anrufe gibt. Also das vlt. ein Popup Fenster sich \xF6ffnet und anzeigt das es verpasste Anrufe gibt... Ist dies wohl M\xF6glich ?
IchBinsShort, 17.01.2012, 15:23:
-Eventuell w\xE4re es dann auch noch gut wenn neue Anrufe in der Anrufliste als Neu markiert werden k\xF6nnen. Also so was wie ein "gelesen Status" woraus ersichtlich welche der Anrufe seit dem letztem Aufruf der Anrufliste neu hinzugekommen sind :-)
\ No newline at end of file
+Eventuell w\xE4re es dann auch noch gut wenn neue Anrufe in der Anrufliste als Neu markiert werden k\xF6nnen. Also so was wie ein "gelesen Status" woraus ersichtlich welche der Anrufe seit dem letztem Aufruf der Anrufliste neu hinzugekommen sind :-)
+
+IchBinsShort, 20.01.2012, 12:38:
+Nebenstelle in der Anrufliste anzeigen
\ No newline at end of file
Modified: trunk/plugins/FritzBox/Docs/Changes.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Changes.txt 2012-01-18 11:29:15 UTC (rev 4415)
+++ trunk/plugins/FritzBox/Docs/Changes.txt 2012-01-21 10:50:48 UTC (rev 4416)
@@ -1,12 +0,0 @@
-Fixed bugs:
-- on multiple contact deletions multiple synchronisations are necessary
-- multiple contacts with the same name cause update actions on every synchronization
-- multiple MSN filter entries when FRITZ!Box Manager configuration window is closed and re-opened without closing the MediaPortal Configuration window
-- MediaPortal crashes on calls with phone numbers not contained in the phone book
-
-Optimizations:
-- phone book is now saved on every change instead of MediaPortal exit
-- entry checks for the following settings:
- - update interval
- - dial port
-- first MSN filter entry is automatically displayed when Configuration window is opened
\ No newline at end of file
Added: trunk/plugins/FritzBox/Docs/Documentation/Call strings.xls
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/Docs/Documentation/Call strings.xls
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2012-01-18 11:29:15 UTC (rev 4415)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2012-01-21 10:50:48 UTC (rev 4416)
@@ -63,12 +63,12 @@
#region Variables
private readonly List<CallAction> _actionList = new List<CallAction>();
- private readonly List<CallAction> _notifyQueue = new List<CallAction>();
- private bool _showNotify = true;
- private object _tempNotify;
+ private readonly List<CallAction> _notificationQueue = new List<CallAction>();
+ private bool _showNotification = true;
+ private object _tempNotification;
private static bool windowIsDisplayed = false;
- private int notifyCount = 0;
+ private int notificationCount = 0;
#endregion Variables
@@ -80,15 +80,15 @@
private void OnStartExternal(Process proc, bool waitForExit)
{
- if (waitForExit) _showNotify = false;
- else _showNotify = true;
+ if (waitForExit) _showNotification = false;
+ else _showNotification = true;
}
private void OnStopExternal(Process proc, bool waitForExit)
{
- _showNotify = true;
+ _showNotification = true;
- _notifyQueue.Clear();
+ _notificationQueue.Clear();
}
private void OnCallAction(CallAction callAction)
@@ -96,33 +96,29 @@
Log.Info("FRITZ!Box: OnCallAction()");
callAction.WriteToLog();
- if (!_showNotify)
+ if (!_showNotification)
{
Log.Info("External process is running. Notification is queued and will be shown later");
- _notifyQueue.Add(callAction);
+ _notificationQueue.Add(callAction);
return;
}
switch (callAction.Type)
{
case CallAction.CallType.Incoming:
- if (Settings.PhoneBookEnabled) callAction.Caller = phoneBook.FindContactEntry(callAction.Caller);
-
OnCall(callAction);
break;
case CallAction.CallType.Outgoing:
- if (Settings.PhoneBookEnabled) callAction.Caller = phoneBook.FindContactEntry(callAction.Caller);
-
OnCall(callAction);
break;
case CallAction.CallType.ConnectionStarted:
break;
case CallAction.CallType.ConnectionClosed:
- if (Settings.CloseOnConnectionClosed)
+ if (Settings.CloseNotificationOnConnectionClosed)
{
Log.Info("\"Close On Connection Close\" setting is enabled. Try to close active notification");
- if (_tempNotify != null)
+ if (_tempNotification != null)
{
MediaPortal.GUI.Library.Action act = new MediaPortal.GUI.Library.Action();
act.wID = MediaPortal.GUI.Library.Action.ActionType.ACTION_CLOSE_DIALOG;
@@ -168,11 +164,9 @@
private void OnCall(CallAction callAction)
{
- PhoneBookItem phoneBookItem = callAction.Caller.PhoneBookItem;
-
- Log.Info("FRITZ!Box: OnCall()");
+ Log.Info("New call");
- if (_tempNotify != null)
+ if (_tempNotification != null)
{
Log.Info("Yet another dialog is active. Action is sent to queue");
@@ -183,6 +177,10 @@
if (isMSNEnabled(callAction.MSN)) // check if MSN is enabled
{
+ // find contact in phone book
+ if (Settings.PhoneBookEnabled) callAction.Caller = phoneBook.FindContactEntry(callAction.Caller);
+ PhoneBookItem phoneBookItem = callAction.Caller.PhoneBookItem;
+
// play sound
string incomingSoundPath = null;
@@ -193,7 +191,7 @@
if (!String.IsNullOrEmpty(incomingSoundPath) && File.Exists(incomingSoundPath))
{
- Log.Debug("Playing sound for incoming call: {0}", incomingSoundPath);
+ Log.Debug("Playing sound on incoming call: {0}", incomingSoundPath);
Utils.PlaySound(incomingSoundPath, false, true);
}
}
@@ -201,57 +199,71 @@
// check if call notification shall be shown
bool showNotification = false;
- if (!Settings.PhoneBookEnabled)
+ switch (callAction.Type)
{
- Log.Info("Phone book is disabled. Notify will be shown");
- showNotification = true;
+ case CallAction.CallType.Incoming:
+ showNotification = Settings.ShowNotficationOnIncomingCall;
+ break;
+ case CallAction.CallType.Outgoing:
+ showNotification = Settings.ShowNotficationOnOutgoingCall;
+ break;
}
- else
+
+ if (showNotification)
{
- if (phoneBookItem != null) // phone book entry exists
+ if (!Settings.PhoneBookEnabled)
{
- if (Settings.ExtensiveLogging) Log.Info("Caller is identified by phone book as {0}", phoneBookItem.Name);
+ Log.Info("Phone book is disabled. Notification will be shown");
+ showNotification = true;
+ }
+ else
+ {
+ if (phoneBookItem != null)
+ {
+ if (Settings.ExtensiveLogging) Log.Info("Caller is identified by phone book as {0}", phoneBookItem.Name);
- if (phoneBookItem.ShowCallNotification) showNotification = true;
+ if (phoneBookItem.ShowCallNotification) showNotification = true;
+ }
+ else if (Settings.ShowUnknownCaller) showNotification = true; // unknown caller
}
- else if (Settings.ShowUnknownCaller) showNotification = true; // unknown caller
- }
- // configure call notificaton
- if (showNotification)
- {
- string strHeading = string.Empty;
- string strImage = string.Empty;
- string strText = string.Empty;
-
- // ...heading
- switch (callAction.Type)
+ // configure call notificaton
+ if (showNotification)
{
- case CallAction.CallType.Incoming:
- strHeading = GUILocalizeStrings.Get(1); // 1 = Incoming call
- break;
- case CallAction.CallType.Outgoing:
- strHeading = GUILocalizeStrings.Get(2); // 2 = Outgoing call
- break;
- }
+ string strHeading = string.Empty;
+ string strImage = string.Empty;
+ string strText = string.Empty;
- // ..image
- strImage = phoneBook.GetCallerImagePath(callAction.Caller);
+ // ...heading
+ switch (callAction.Type)
+ {
+ case CallAction.CallType.Incoming:
+ strHeading = GUILocalizeStrings.Get(1); // 1 = Incoming call
+ break;
+ case CallAction.CallType.Outgoing:
+ strHeading = GUILocalizeStrings.Get(2); // 2 = Outgoing call
+ break;
+ }
- // ...message text
- strText = Environment.NewLine;
+ // ..image
+ strImage = phoneBook.GetCallerImagePath(callAction.Caller);
- if (callAction.Caller.PhoneNumber != "")
- {
- if (phoneBookItem != null) strText += phoneBookItem.Name;
+ // ...message text
+ strText = Environment.NewLine;
- if (Settings.ShowPhoneNumberOnNotify) strText += Environment.NewLine + callAction.Caller.PhoneNumber;
+ if (callAction.Caller.PhoneNumber != "")
+ {
+ if (phoneBookItem != null) strText += phoneBookItem.Name;
+
+ if (Settings.ShowPhoneNumberOnNotification) strText += Environment.NewLine + callAction.Caller.PhoneNumber;
+ }
+ else strText += GUILocalizeStrings.Get(3); // 3 = Unknown
+
+ // show call notification
+ showNotificationWindow(callAction.Type, strHeading, strImage, strText);
}
- else strText += GUILocalizeStrings.Get(3); // 3 = Unknown
-
- // show call notification
- ShowNotify(callAction.Type, strHeading, strImage, strText);
}
+
// update call list and voice box items and refresh GUI
worker.queue.Enqueue(new Task(Task.TaskAction.LoadCallListItems, null));
worker.queue.Enqueue(new Task(Task.TaskAction.LoadVoiceBoxItems, null));
@@ -278,80 +290,96 @@
}
else
{
- Log.Info("MSN is not on the list. Notify won't be shown");
+ Log.Info("MSN is not on the list. Notification won't be shown");
return false;
}
}
-
- private void ShowNotify(CallAction.CallType callType, string strHeading, string strImage, string strText)
+ private void showNotificationWindow(CallAction.CallType callType, string strHeading, string strImage, string strText)
{
bool resumePlayer = false;
+
+ if (notificationCount >= Settings.MaxNotifies) return;
- if (notifyCount >= Settings.MaxNotifies) return;
-
- // pause player
- if (g_Player.Playing && !g_Player.Paused)
+ if (!isMovingPicturesOrMPTVSeriesDialogOpened()) // this check avoids that the current movie starts when dialog asking if the movie shall be continued on the last position is opened
{
- switch (callType)
+ // pause player
+ if (g_Player.Playing && !g_Player.Paused)
{
- 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;
+ 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
- GUIDialogNotify dlgNotify = (GUIDialogNotify)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_NOTIFY);
- if (dlgNotify == null) return;
+ // show dialog
+ GUIDialogNotify dlgNotification = (GUIDialogNotify)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_NOTIFY);
+ if (dlgNotification == null) return;
- dlgNotify.Reset();
- dlgNotify.ClearAll();
- dlgNotify.SetHeading(strHeading);
- dlgNotify.SetImage(strImage);
- dlgNotify.SetText(strText);
- if (Settings.CloseOnTimeout) dlgNotify.TimeOut = Settings.NotifyTimeout;
- else dlgNotify.TimeOut = -1;
+ dlgNotification.Reset();
+ dlgNotification.ClearAll();
+ dlgNotification.SetHeading(strHeading);
+ dlgNotification.SetImage(strImage);
+ dlgNotification.SetText(strText);
+ if (Settings.CloseNotificationOnTimeout) dlgNotification.TimeOut = Settings.NotificationTimeout;
+ else dlgNotification.TimeOut = -1;
- _tempNotify = dlgNotify;
- dlgNotify.DoModal(GUIWindowManager.ActiveWindow);
+ _tempNotification = dlgNotification;
+ dlgNotification.DoModal(GUIWindowManager.ActiveWindow);
- // resume player
- if (resumePlayer && g_Player.Playing && g_Player.Paused)
- {
- switch (callType)
+ // resume player
+ if (resumePlayer && g_Player.Playing && g_Player.Paused)
{
- case CallAction.CallType.Incoming:
- if (Settings.ResumeMediaOnIncomingCall) g_Player.Pause();
- break;
- case CallAction.CallType.Outgoing:
- if (Settings.ResumeMediaOnOutgoingCall) g_Player.Pause();
- break;
+ switch (callType)
+ {
+ case CallAction.CallType.Incoming:
+ if (Settings.ResumeMediaOnIncomingCall) g_Player.Pause();
+ break;
+ case CallAction.CallType.Outgoing:
+ if (Settings.ResumeMediaOnOutgoingCall) g_Player.Pause();
+ break;
+ }
}
+
+ _tempNotification = null;
+
+ if (_actionList.Count > 0)
+ {
+ CallAction tmpAction = _actionList[0];
+ _actionList.RemoveAt(0);
+ OnCallAction(tmpAction);
+ }
}
+ else Log.Info("Moving Pictures or MP-TV Series dialog is opened, call notification won't be shown");
+ }
- _tempNotify = null;
-
- if (_actionList.Count > 0)
+ private bool isMovingPicturesOrMPTVSeriesDialogOpened()
+ {
+ if (GUIWindowManager.IsRouted) // check if dialog window is opened
{
- CallAction tmpAction = _actionList[0];
- _actionList.RemoveAt(0);
- OnCallAction(tmpAction);
+ if (GUIWindowManager.ActiveWindow == 96742 || GUIWindowManager.ActiveWindow == 9811) // 96742 = window ID of "Moving Pictures", 9811 = window ID of "MP-TV Series"
+ {
+ if (GUIWindowManager.ActiveWindowEx == (int)GUIWindow.Window.WINDOW_DIALOG_YES_NO) return true;
+ }
}
+
+ return false;
}
- #endregion
+ #endregion Helper Methods
#endregion CallMonitor
@@ -365,7 +393,7 @@
public void Start()
{
Log.Info("FRITZ!Box Manager {0} plugin is starting", Assembly.GetExecutingAssembly().GetName().Version);
-
+
Settings.Load();
// register events
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2012-01-18 11:29:15 UTC (rev 4415)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2012-01-21 10:50:48 UTC (rev 4416)
@@ -42,11 +42,11 @@
this.groupBoxPhonebook = new MediaPortal.UserInterface.Controls.MPGroupBox();
this.checkBoxShowUnknownCaller = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.checkBoxUsePhonebook = new MediaPortal.UserInterface.Controls.MPCheckBox();
- this.groupBoxNotify = new MediaPortal.UserInterface.Controls.MPGroupBox();
+ this.groupBoxNotification = new MediaPortal.UserInterface.Controls.MPGroupBox();
this.checkBoxCloseOnConnectionClosed = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.lblMaxNotifies = new MediaPortal.UserInterface.Controls.MPLabel();
this.numericUpDownMaxNotifies = new MediaPortal.UserInterface.Controls.MPNumericUpDown();
- this.checkBoxShowPhoneNumberOnNotify = new MediaPortal.UserInterface.Controls.MPCheckBox();
+ this.checkBoxShowPhoneNumberOnNotification = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.buttonMSNsRemove = new MediaPortal.UserInterface.Controls.MPButton();
this.checkBoxFilterMSNs = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.buttonMSNsAdd = new MediaPortal.UserInterface.Controls.MPButton();
@@ -77,11 +77,13 @@
this.label4 = new System.Windows.Forms.Label();
this.dialPortNumericUpDown = new MediaPortal.UserInterface.Controls.MPNumericUpDown();
this.updateInterval = new MediaPortal.UserInterface.Controls.MPNumericUpDown();
+ this.checkBoxShowNotificationOnOutgoingCall = new MediaPortal.UserInterface.Controls.MPCheckBox();
+ this.checkBoxShowNotificationOnIncomingCall = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.tabPageDiagnostics.SuspendLayout();
this.tabPagePhoneBook.SuspendLayout();
this.tabPageCallNotification.SuspendLayout();
this.groupBoxPhonebook.SuspendLayout();
- this.groupBoxNotify.SuspendLayout();
+ this.groupBoxNotification.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownMaxNotifies)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownTimeout)).BeginInit();
this.groupBoxMedia.SuspendLayout();
@@ -197,7 +199,7 @@
// tabPageCallNotification
//
this.tabPageCallNotification.Controls.Add(this.groupBoxPhonebook);
- this.tabPageCallNotification.Controls.Add(this.groupBoxNotify);
+ this.tabPageCallNotification.Controls.Add(this.groupBoxNotification);
this.tabPageCallNotification.Controls.Add(this.groupBoxMedia);
this.tabPageCallNotification.Location = new System.Drawing.Point(4, 22);
this.tabPageCallNotification.Name = "tabPageCallNotification";
@@ -212,7 +214,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(7, 229);
+ this.groupBoxPhonebook.Location = new System.Drawing.Point(7, 250);
this.groupBoxPhonebook.Name = "groupBoxPhonebook";
this.groupBoxPhonebook.Size = new System.Drawing.Size(177, 67);
this.groupBoxPhonebook.TabIndex = 2;
@@ -242,33 +244,35 @@
this.checkBoxUsePhonebook.UseVisualStyleBackColor = true;
this.checkBoxUsePhonebook.CheckedChanged += new System.EventHandler(this.checkBoxUsePhonebook_CheckedChanged);
//
- // groupBoxNotify
+ // groupBoxNotification
//
- this.groupBoxNotify.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ this.groupBoxNotification.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
- this.groupBoxNotify.Controls.Add(this.checkBoxCloseOnConnectionClosed);
- this.groupBoxNotify.Controls.Add(this.lblMaxNotifies);
- this.groupBoxNotify.Controls.Add(this.numericUpDownMaxNotifies);
- this.groupBoxNotify.Controls.Add(this.checkBoxShowPhoneNumberOnNotify);
- this.groupBoxNotify.Controls.Add(this.buttonMSNsRemove);
- this.groupBoxNotify.Controls.Add(this.checkBoxFilterMSNs);
- this.groupBoxNotify.Controls.Add(this.buttonMSNsAdd);
- this.groupBoxNotify.Controls.Add(this.comboBoxMSNs);
- this.groupBoxNotify.Controls.Add(this.numericUpDownTimeout);
- this.groupBoxNotify.Controls.Add(this.checkBoxCloseOnTimout);
- this.groupBoxNotify.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.groupBoxNotify.Location = new System.Drawing.Point(6, 6);
- this.groupBoxNotify.Name = "groupBoxNotify";
- this.groupBoxNotify.Size = new System.Drawing.Size(561, 114);
- this.groupBoxNotify.TabIndex = 0;
- this.groupBoxNotify.TabStop = false;
- this.groupBoxNotify.Text = "Notify settings";
+ this.groupBoxNotification.Controls.Add(this.checkBoxShowNotificationOnOutgoingCall);
+ this.groupBoxNotification.Controls.Add(this.checkBoxCloseOnConnectionClosed);
+ this.groupBoxNotification.Controls.Add(this.checkBoxShowNotificationOnIncomingCall);
+ this.groupBoxNotification.Controls.Add(this.lblMaxNotifies);
+ this.groupBoxNotification.Controls.Add(this.numericUpDownMaxNotifies);
+ this.groupBoxNotification.Controls.Add(this.checkBoxShowPhoneNumberOnNotification);
+ this.groupBoxNotification.Controls.Add(this.buttonMSNsRemove);
+ this.groupBoxNotification.Controls.Add(this.checkBoxFilterMSNs);
+ this.groupBoxNotification.Controls.Add(this.buttonMSNsAdd);
+ this.groupBoxNotification.Controls.Add(this.comboBoxMSNs);
+ this.groupBoxNotification.Controls.Add(this.numericUpDownTimeout);
+ this.groupBoxNotification.Controls.Add(this.checkBoxCloseOnTimout);
+ this.groupBoxNotification.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.groupBoxNotification.Location = new System.Drawing.Point(6, 6);
+ this.groupBoxNotification.Name = "groupBoxNotification";
+ this.groupBoxNotification.Size = new System.Drawing.Size(561, 135);
+ this.groupBoxNotification.TabIndex = 0;
+ this.groupBoxNotification.TabStop = false;
+ this.groupBoxNotification.Text = "Notification settings";
//
// checkBoxCloseOnConnectionClosed
//
this.checkBoxCloseOnConnectionClosed.AutoSize = true;
this.checkBoxCloseOnConnectionClosed.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.checkBoxCloseOnConnectionClosed.Location = new System.Drawing.Point(6, 43);
+ this.checkBoxCloseOnConnectionClosed.Location = new System.Drawing.Point(7, 66);
this.checkBoxCloseOnConnectionClosed.Name = "checkBoxCloseOnConnectionClosed";
this.checkBoxCloseOnConnectionClosed.Size = new System.Drawing.Size(198, 17);
this.checkBoxCloseOnConnectionClosed.TabIndex = 9;
@@ -279,7 +283,7 @@
// lblMaxNotifies
//
this.lblMaxNotifies.AutoSize = true;
- this.lblMaxNotifies.Location = new System.Drawing.Point(21, 68);
+ this.lblMaxNotifies.Location = new System.Drawing.Point(22, 91);
this.lblMaxNotifies.Name = "lblMaxNotifies";
this.lblMaxNotifies.Size = new System.Drawing.Size(90, 13);
this.lblMaxNotifies.TabIndex = 8;
@@ -287,7 +291,7 @@
//
// numericUpDownMaxNotifies
//
- this.numericUpDownMaxNotifies.Location = new System.Drawing.Point(206, 66);
+ this.numericUpDownMaxNotifies.Location = new System.Drawing.Point(207, 89);
this.numericUpDownMaxNotifies.Maximum = new decimal(new int[] {
20,
0,
@@ -308,21 +312,21 @@
0,
0});
//
- // checkBoxShowPhoneNumberOnNotify
+ // checkBoxShowPhoneNumberOnNotification
//
- this.checkBoxShowPhoneNumberOnNotify.AutoSize = true;
- this.checkBoxShowPhoneNumberOnNotify.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.checkBoxShowPhoneNumberOnNotify.Location = new System.Drawing.Point(6, 88);
- this.checkBoxShowPhoneNumberOnNotify.Name = "checkBoxShowPhoneNumberOnNotify";
- this.checkBoxShowPhoneNumberOnNotify.Size = new System.Drawing.Size(122, 17);
- this.checkBoxShowPhoneNumberOnNotify.TabIndex = 6;
- this.checkBoxShowPhoneNumberOnNotify.Text = "Show phone number";
- this.checkBoxShowPhoneNumberOnNotify.UseVisualStyleBackColor = true;
+ this.checkBoxShowPhoneNumberOnNotification.AutoSize = true;
+ this.checkBoxShowPhoneNumberOnNotification.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.checkBoxShowPhoneNumberOnNotification.Location = new System.Drawing.Point(7, 111);
+ this.checkBoxShowPhoneNumberOnNotification.Name = "checkBoxShowPhoneNumberOnNotification";
+ this.checkBoxShowPhoneNumberOnNotification.Size = new System.Drawing.Size(122, 17);
+ this.checkBoxShowPhoneNumberOnNotification.TabIndex = 6;
+ this.checkBoxShowPhoneNumberOnNotification.Text = "Show phone number";
+ this.checkBoxShowPhoneNumberOnNotification.UseVisualStyleBackColor = true;
//
// buttonMSNsRemove
//
this.buttonMSNsRemove.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonMSNsRemove.Location = new System.Drawing.Point(386, 66);
+ this.buttonMSNsRemove.Location = new System.Drawing.Point(387, 86);
this.buttonMSNsRemove.Name = "buttonMSNsRemove";
this.buttonMSNsRemove.Size = new System.Drawing.Size(63, 21);
this.buttonMSNsRemove.TabIndex = 5;
@@ -334,18 +338,18 @@
//
this.checkBoxFilterMSNs.AutoSize = true;
this.checkBoxFilterMSNs.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.checkBoxFilterMSNs.Location = new System.Drawing.Point(302, 20);
+ this.checkBoxFilterMSNs.Location = new System.Drawing.Point(303, 43);
this.checkBoxFilterMSNs.Name = "checkBoxFilterMSNs";
- this.checkBoxFilterMSNs.Size = new System.Drawing.Size(195, 17);
+ this.checkBoxFilterMSNs.Size = new System.Drawing.Size(221, 17);
this.checkBoxFilterMSNs.TabIndex = 2;
- this.checkBoxFilterMSNs.Text = "Show notify only for following MSNs:";
+ this.checkBoxFilterMSNs.Text = "Show notification only for following MSNs:";
this.checkBoxFilterMSNs.UseVisualStyleBackColor = true;
this.checkBoxFilterMSNs.Click += new System.EventHandler(this.checkBoxFilterMSNs_CheckedChanged);
//
// buttonMSNsAdd
//
this.buttonMSNsAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonMSNsAdd.Location = new System.Drawing.Point(302, 66);
+ this.buttonMSNsAdd.Location = new System.Drawing.Point(303, 89);
this.buttonMSNsAdd.Name = "buttonMSNsAdd";
this.buttonMSNsAdd.Size = new System.Drawing.Size(63, 21);
this.buttonMSNsAdd.TabIndex = 4;
@@ -359,7 +363,7 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.comboBoxMSNs.BorderColor = System.Drawing.Color.Empty;
this.comboBoxMSNs.FormattingEnabled = true;
- this.comboBoxMSNs.Location = new System.Drawing.Point(302, 39);
+ this.comboBoxMSNs.Location = new System.Drawing.Point(303, 62);
this.comboBoxMSNs.Name = "comboBoxMSNs";
this.comboBoxMSNs.Size = new System.Drawing.Size(226, 21);
this.comboBoxMSNs.Sorted = true;
@@ -368,7 +372,7 @@
// numericUpDownTimeout
//
this.numericUpDownTimeout.Enabled = false;
- this.numericUpDownTimeout.Location = new System.Drawing.Point(206, 20);
+ this.numericUpDownTimeout.Location = new System.Drawing.Point(207, 43);
this.numericUpDownTimeout.Minimum = new decimal(new int[] {
1,
0,
@@ -388,7 +392,7 @@
//
this.checkBoxCloseOnTimout.AutoSize = true;
this.checkBoxCloseOnTimout.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.checkBoxCloseOnTimout.Location = new System.Drawing.Point(6, 20);
+ this.checkBoxCloseOnTimout.Location = new System.Drawing.Point(7, 43);
this.checkBoxCloseOnTimout.Name = "checkBoxCloseOnTimout";
this.checkBoxCloseOnTimout.Size = new System.Drawing.Size(172, 17);
this.checkBoxCloseOnTimout.TabIndex = 0;
@@ -407,7 +411,7 @@
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, 126);
+ this.groupBoxMedia.Location = new System.Drawing.Point(6, 147);
this.groupBoxMedia.Name = "groupBoxMedia";
this.groupBoxMedia.Size = new System.Drawing.Size(561, 97);
this.groupBoxMedia.TabIndex = 1;
@@ -690,6 +694,28 @@
0,
0});
//
+ // checkBoxShowNotificationOnOutgoingCall
+ //
+ this.checkBoxShowNotificationOnOutgoingCall.AutoSize = true;
+ this.checkBoxShowNotificationOnOutgoingCall.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.checkBoxShowNotificationOnOutgoingCall.Location = new System.Drawing.Point(207, 20);
+ this.checkBoxShowNotificationOnOutgoingCall.Name = "checkBoxShowNotificationOnOutgoingCall";
+ this.checkBoxShowNotificationOnOutgoingCall.Size = new System.Drawing.Size(183, 17);
+ this.checkBoxShowNotificationOnOutgoingCall.TabIndex = 13;
+ this.checkBoxShowNotificationOnOutgoingCall.Text = "Show notification on outgoing call";
+ this.checkBoxShowNotificationOnOutgoingCall.UseVisualStyleBackColor = true;
+ //
+ // checkBoxShowNotificationOnIncomingCall
+ //
+ this.checkBoxShowNotificationOnIncomingCall.AutoSize = true;
+ this.checkBoxShowNotificationOnIncomingCall.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.checkBoxShowNotificationOnIncomingCall.Location = new System.Drawing.Point(7, 20);
+ this.checkBoxShowNotificationOnIncomingCall.Name = "checkBoxShowNotificationOnIncomingCall";
+ this.checkBoxShowNotificationOnIncomingCall.Size = new System.Drawing.Size(184, 17);
+ this.checkBoxShowNotificationOnIncomingCall.TabIndex = 12;
+ this.checkBoxShowNotificationOnIncomingCall.Text = "Show notification on incoming call";
+ this.checkBoxShowNotificationOnIncomingCall.UseVisualStyleBackColor = true;
+ //
// FritzBoxConfig
//
this.AcceptButton = this.okButton;
@@ -715,8 +741,8 @@
this.tabPageCallNotification.ResumeLayout(false);
this.groupBoxPhonebook.ResumeLayout(false);
this.groupBoxPhonebook.PerformLayout();
- this.groupBoxNotify.ResumeLayout(false);
- this.groupBoxNotify.PerformLayout();
+ this.groupBoxNotification.ResumeLayout(false);
+ this.groupBoxNotification.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownMaxNotifies)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownTimeout)).EndInit();
this.groupBoxMedia.ResumeLayout(false);
@@ -745,11 +771,11 @@
private MediaPortal.UserInterface.Controls.MPGroupBox groupBoxPhonebook;
private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxShowUnknownCaller;
private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxUsePhonebook;
- private MediaPortal.UserInterface.Controls.MPGroupBox groupBoxNotify;
+ private MediaPortal.UserInterface.Controls.MPGroupBox groupBoxNotification;
private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxCloseOnConnectionClosed;
private MediaPortal.UserInterface.Controls.MPLabel lblMaxNotifies;
private MediaPortal.UserInterface.Controls.MPNumericUpDown numericUpDownMaxNotifies;
- private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxShowPhoneNumberOnNotify;
+ private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxShowPhoneNumberOnNotification;
private MediaPortal.UserInterface.Controls.MPButton buttonMSNsRemove;
private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxFilterMSNs;
private MediaPortal.UserInterface.Controls.MPButton buttonMSNsAdd;
@@ -784,5 +810,7 @@
private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxExtensiveLogging;
private MediaPortal.UserInterface.Controls.MPNumericUpDown dialPortNumericUpDown;
private MediaPortal.UserInterface.Controls.MPNumericUpDown updateInterval;
+ private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxShowNotificationOnOutgoingCall;
+ private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxShowNotificationOnIncomingCall;
}
}
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2012-01-18 11:29:15 UTC (rev 4415)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2012-01-21 10:50:48 UTC (rev 4416)
@@ -62,10 +62,13 @@
vBPath.Text = Settings.VBPath;
// call notification settings
+ checkBoxShowNotificationOnIncomingCall.Checked = Settings.ShowNotficationOnIncomingCall;
+ checkBoxShowNotificationOnOutgoingCall.Checked = Settings.ShowNotficationOnOutgoingCall;
+
numericUpDownMaxNotifies.Value = Settings.MaxNotifies;
- checkBoxCloseOnTimout.Checked = Settings.CloseOnTimeout;
- numericUpDownTimeout.Value = Settings.NotifyTimeout;
- checkBoxCloseOnConnectionClosed.Checked = Settings.CloseOnConnectionClosed;
+ checkBoxCloseOnTimout.Checked = Settings.CloseNotificationOnTimeout;
+ numericUpDownTimeout.Value = Settings.NotificationTimeout;
+ checkBoxCloseOnConnectionClosed.Checked = Settings.CloseNotificationOnConnectionClosed;
numericUpDownTimeout.Enabled = checkBoxCloseOnTimout.Checked;
@@ -78,7 +81,7 @@
comboBoxMSNs.Items.AddRange(Settings.MSNList.ToArray());
if (comboBoxMSNs.Items.Count > 0) comboBoxMSNs.Text = Settings.MSNList[0]; // select the first entry
- checkBoxShowPhoneNumberOnNotify.Checked = Settings.ShowPhoneNumberOnNotify;
+ checkBoxShowPhoneNumberOnNotification.Checked = Settings.ShowPhoneNumberOnNotification;
checkBoxPauseMediaOnIncomingCall.Checked = Settings.PauseMediaOnIncomingCall;
checkBoxResumeMediaOnIncomingCall.Checked = Settings.ResumeMediaOnIncomingCall;
@@ -109,10 +112,13 @@
Settings.VBPath = vBPath.Text;
// call notification settings
+ Settings.ShowNotficationOnIncomingCall = checkBoxShowNotificationOnIncomingCall.Checked;
+ Settings.ShowNotficationOnOutgoingCall = checkBoxShowNotificationOnOutgoingCall.Checked;
+
Settings.MaxNotifies = (int)numericUpDownMaxNotifies.Value;
- Settings.CloseOnTimeout = checkBoxCloseOnTimout.Checked;
- Settings.NotifyTimeout = (int)numericUpDownTimeout.Value;
- Settings.CloseOnConnectionClosed = checkBoxCloseOnConnectionClosed.Checked;
+ Settings.CloseNotificationOnTimeout = checkBoxCloseOnTimout.Checked;
+ Settings.NotificationTimeout = (int)numericUpDownTimeout.Value;
+ Settings.CloseNotificationOnConnectionClosed = checkBoxCloseOnConnectionClosed.Checked;
Settings.FilterMSN = checkBoxFilterMSNs.Checked;
@@ -123,7 +129,7 @@
Settings.MSNList.Add(item);
}
- Settings.ShowPhoneNumberOnNotify = checkBoxShowPhoneNumberOnNotify.Checked;
+ Settings.ShowPhoneNumberOnNotification = checkBoxShowPhoneNumberOnNotification.Checked;
Settings.PauseMediaOnIncomingCall = checkBoxPauseMediaOnIncomingCall.Checked;
Settings.ResumeMediaOnIncomingCall = checkBoxResumeMediaOnIncomingCall.Checked;
@@ -196,7 +202,7 @@
private void buttonMSNsAdd_Click(object sender, EventArgs e)
{
- if (isMSNValid(comboBoxMSNs.Text)) comboBoxMSNs.Items.Add(comboBoxMSNs.Text);
+ if (isMSNValid(comboBoxMSNs.Text) && !comboBoxMSNs.Items.Contains(comboBoxMSNs.Text)) comboBoxMSNs.Items.Add(comboBoxMSNs.Text);
}
private void buttonMSNsRemove_Click(object sender, EventArgs e)
Modified: trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs 2012-01-18 11:29:15 UTC (rev 4415)
+++ trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs 2012-01-21 10:50:48 UTC (rev 4416)
@@ -337,19 +337,16 @@
{
case "RING":
callAction.Type = CallAction.CallType.Incoming;
-
callAction.Caller.PhoneNumber = strList[3];
callAction.MSN = strList[4];
break;
case "CALL":
callAction.Type = CallAction.CallType.Outgoing;
-
callAction.Caller.PhoneNumber = strList[5];
callAction.MSN = strList[4];
break;
case "CONNECT":
callAction.Type = CallAction.CallType.ConnectionStarted;
-
callAction.Caller.PhoneNumber = strList[4];
break;
case "DISCONNECT":
Modified: trunk/plugins/FritzBox/FritzBox/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Properties/AssemblyInfo.cs 2012-01-18 11:29:15 UTC (rev 4415)
+++ trunk/plugins/FritzBox/FritzBox/Properties/AssemblyInfo.cs 2012-01-21 10:50:48 UTC (rev 4416)
@@ -57,8 +57,8 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("0.4.0.0")]
-[assembly: AssemblyFileVersion("0.4.0.0")]
+[assembly: AssemblyVersion("0.4.1.0")]
+[assembly: AssemblyFileVersion("0.4.1.0")]
// specifiy comp tags for
[assembly: CompatibleVersion("1.1.7.0","1.1.0.0")]
Modified: trunk/plugins/FritzBox/FritzBox/Settings.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Settings.cs 2012-01-18 11:29:15 UTC (rev 4415)
+++ trunk/plugins/FritzBox/FritzBox/Settings.cs 2012-01-21 10:50:48 UTC (rev 4416)
@@ -51,12 +51,22 @@
public static bool ExtensiveLogging { get; set; }
/// <summary>
+ /// show notification on incoming call
+ /// </summary>
+ public static bool ShowNotficationOnIncomingCall { get; set; }
+
+ /// <summary>
+ /// show notification on incoming call
+ /// </summary>
+ public static bool ShowNotficationOnOutgoingCall { get; set; }
+
+ /// <summary>
/// stop media on incoming call when an event happend
/// </summary>
public static bool PauseMediaOnIncomingCall { get; set; }
/// <summary>
- /// resume media on incoming call when notify is closed
+ /// resume media on incoming call when notification is closed
/// </summary>
public static bool ResumeMediaOnIncomingCall { get; set; }
@@ -66,7 +76,7 @@
public static bool PauseMediaOnOutgoingCall { get; set; }
/// <summary>
- /// resume media on outgoing call when notify is closed
+ /// resume media on outgoing call when notification is closed
/// </summary>
///
public static bool ResumeMediaOnOutgoingCall { get; set; }
@@ -76,13 +86,13 @@
/// <summary>
/// autoclose the dialog after the timeout expired
/// </summary>
- public static int NotifyTimeout { get; set; }
+ public static int NotificationTimeout { get; set; }
- public static bool CloseOnTimeout { get; set; }
+ public static bool CloseNotificationOnTimeout { get; set; }
- public static bool CloseOnConnectionClosed { get; set; }
+ public static bool CloseNotificationOnConnectionClosed { get; set; }
- public static bool ShowPhoneNumberOnNotify { get; set; }
+ public static bool ShowPhoneNumberOnNotification { get; set; }
public static bool ShowUnknownCaller { get; set; }
@@ -135,7 +145,7 @@
PauseMediaOnOutgoingCall = true;
ResumeMediaOnOutgoingCall = true;
MaxNotifies = 20;
- NotifyTimeout = 10;
+ NotificationTimeout = 10;
}
#endregion
@@ -161,20 +171,28 @@
PhoneBookFilePath = Config.GetFolder(Config.Dir.Config) + "\\FRITZ!Box Manager Phone Book.xml";
// call notification settings
+ ShowNotficationOnIncomingCall = xmlreader.GetValueAsBool("fritzbox", "showNotificationOnIncomingCall", true);
+ ShowNotficationOnOutgoingCall = xmlreader.GetValueAsBool("fritzbox", "showNotificationOnOutgoingCall", true);
+
MaxNotifies = xmlreader.GetValueAsInt("fritzbox", "maxNotifies", 20);
- CloseOnTimeout = xmlreader.GetValueAsBool("fritzbox", "closeOnTimeout", false);
- NotifyTimeout = xmlreader.GetValueAsInt("fritzbox", "timeout", 10);
- CloseOnConnectionClosed = xmlreader.GetValueAsBool("fritzbox", "closeOnConnectionClosed", true);
+ CloseNotificationOnTimeout = xmlreader.GetValueAsBool("fritzbox", "closeOnTimeout", false);
+ NotificationTimeout = xmlreader.GetValueAsInt("fritzbox", "notificationTimeout", 10);
+ CloseNotificationOnConnectionClosed = xmlreader.GetValueAsBool("fritzbox", "closeOnConnectionClosed", true);
FilterMSN = xmlreader.GetValueAsBool("fritzbox", "filterMSNs", false);
string strMSN = xmlreader.GetValueAsString("fritzbox", "MSN", "");
char[] charSeparators = new[] { ';' };
MSNList.Clear(); // necessary to avoid multiple entries when FRITZ!Box Manager configuration window is closed and re-opened without closing the MediaPortal Configuration window
- MSNList.AddRange(strMSN.Split(charSeparators, StringSplitOptions.RemoveEmptyEntries));
+ //MSNList.AddRange(strMSN.Split(charSeparators, StringSplitOptions.RemoveEmptyEntries));
- ShowPhoneNumberOnNotify = xmlreader.GetValueAsBool("fritzbox", "showPhoneNumberOnNotify", true);
+ foreach (string mSN in strMSN.Split(charSeparators, StringSplitOptions.RemoveEmptyEntries))
+ {
+ if (!MSNList.Contains(mSN)) MSNList.Add(mSN);
+ }
+ ShowPhoneNumberOnNotification = xmlreader.GetValueAsBool("fritzbox", "showPhoneNumberOnNotification", true);
+
ShowUnknownCaller = xmlreader.GetValueAsBool("fritzbox", "showUnknownCaller", true);
PhoneBookEnabled = xmlreader.GetValueAsBool("fritzbox", "usePhonebook", true);
@@ -231,6 +249,12 @@
xmlreader.RemoveEntry("fritzbox", "saveUnknownCaller");
xmlreader.RemoveEntry("fritzbox", "showMSNOnNotify");
+
+ xmlreader.RemoveEntry("fritzbox", "timeout");
+
+ xmlreader.RemoveEntry("fritzbox", "showPhoneNumberOnNotify");
+
+ xmlreader.RemoveEntry("fritzbox", "showPhoneNumberOnNotify");
}
}
@@ -249,10 +273,13 @@
xmlwriter.SetValue("fritzbox", "port", FritzBoxClient.Port);
// call notification settings
+ xmlwriter.SetValueAsBool("fritzbox", "showNotificationOnIncomingCall", ShowNotficationOnIncomingCall);
+ xmlwriter.SetValueAsBool("fritzbox", "showNotificationOnOutgoingCall", ShowNotficationOnOutgoingCall);
+
xmlwriter.SetValue("fritzbox", "maxNotifies", MaxNotifies);
- xmlwriter.SetValueAsBool("fritzbox", "closeOnTimeout", CloseOnTimeout);
- xmlwriter.SetValue("fritzbox", "timeout", NotifyTimeout);
- xmlwriter.SetValueAsBool("fritzbox", "closeOnConnectionClosed", CloseOnConnectionClosed);
+ xmlwriter.SetValueAsBool("fritzbox", "closeOnTimeout", CloseNotificationOnTimeout);
+ xmlwriter.SetValue("fritzbox", "notificationTimeout", NotificationTimeout);
+ xmlwriter.SetValueAsBool("fritzbox", "closeOnConnectionClosed", CloseNotificationOnConnectionClosed);
xmlwriter.SetValueAsBool("fritzbox", "filterMSNs", FilterMSN);
@@ -265,7 +292,7 @@
xmlwriter.SetValue("fritzbox", "MSN", strMSN);
- xmlwriter.SetValueAsBool("fritzbox", "showPhoneNumberOnNotify", ShowPhoneNumberOnNotify);
+ xmlwriter.SetValueAsBool("fritzbox", "showPhoneNumberOnNotification", ShowPhoneNumberOnNotification);
xmlwriter.SetValueAsBool("fritzbox", "usePhonebook", PhoneBookEnabled);
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/Debug/GenerateResource-ResGen.read.1.tlog
===================================================================
(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-18 11:29:15 UTC (rev 4415)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2012-01-21 10:50:48 UTC (rev 4416)
@@ -559,7 +559,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4414</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4415</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -581,8 +581,8 @@
<Vers...
[truncated message content] |
|
From: <hor...@us...> - 2012-01-28 08:48:48
|
Revision: 4426
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4426&view=rev
Author: horned-reaper
Date: 2012-01-28 08:48:41 +0000 (Sat, 28 Jan 2012)
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/FritzBoxConfig.Designer.cs
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/CallAction.cs
trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/MyBinaryReader.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/VBReader.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/VoiceboxItem.cs
trunk/plugins/FritzBox/FritzBox/Languages/strings_ru.xml
trunk/plugins/FritzBox/FritzBox/Settings.cs
trunk/plugins/FritzBox/FritzBox/Skin/Black & White/FritzManager.xml
trunk/plugins/FritzBox/FritzBox/Skin/Blue3/FritzManager.xml
trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml
trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml
trunk/plugins/FritzBox/FritzBox/Skin/Maya/FritzManager.xml
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 2012-01-25 23:00:16 UTC (rev 4425)
+++ trunk/plugins/FritzBox/Docs/Ausstehend.txt 2012-01-28 08:48:41 UTC (rev 4426)
@@ -1,17 +1,14 @@
-Testen:
-Einen kleinen Bug habe ich auch gefunden: Ich wollte gerade unter MyTVSeries die Sendung einer Serie weiterschauen - es wurde der Dialog angezeigt ob man die Folge bei Stelle X fortsetzen m\xF6chte - in diesem Moment kam ein Anruf - nach Beendigung des Anrufs wurde die Sendung dann automatisch gestartet/fortgesetzt
-
Fehler beheben:
+- ein kleiner schwarzer Balken \xFCberdeckt das erste Zeichen oder die erste Ziffer zur H\xE4lfte
- auch bei einem "Unbekannten Anrufer" (unterdr\xFCckte bzw. nicht \xFCbertragene Rufnummer) \xF6ffnet sich \xFCber das Kontextrufen "zur\xFCckrufen". Sollte man deaktivieren
- ObjectDisposed-Exception bei Client-Stop
-- ein kleiner schwarzer Balken \xFCberdeckt das erste Zeichen oder die erste Ziffer zur H\xE4lfte
-- Problem beim Laden gro\xDFer meta0-Dateien, siehe "Problembeschreibung 1.txt"
+- Localization fehlt noch im StreamedMP-Skin
Optimierungen:
- btnModus umbenennen?
- blauer Hintergrund f\xFCr Default und DefaultWide Skins
- GUI-Properties \xFCberpr\xFCfen und Dokumentation vervollst\xE4ndigen
-- vertrauliche Daten im Log trotz "Extensive Logging"-Einstellung
+- Einstellungen-Eintr\xE4ge in XML-Datei in Kategorie "FRITZ"Box Manager" zusammenfassen
Neue Funktionen/Erweiterungen:
- Rufnummer-Typ hinzuf\xFCgen
@@ -27,9 +24,12 @@
- wenn m\xF6glich GUI-Telefonbuch (und edit Phonebook) nach Kontakt gruppieren
- Bei Anrufbenachrichtigungen: Auflistung von Kontaktnamen wenn eine Rufnummer mehrmals im Telefonbuch vorkommt
- Verbindungstest um Login, Anruflisten- und Telefonbuch-Download erweitern
+- Klingelton solange wiederholen bis H\xF6rer abgenommen wird
-Anwenderw\xFCnsche:
+Anwenderw\xFCnsche
+---------------
+
IchBinsShort, 05.01.2012, 18:02:
Noch eine andere Frage ist es auch m\xF6glich das bei ausgehenden Anrufen nur bei bestimmten Handger\xE4ten der Pause Befehl gesendet wird. Ich benutze drei Funktelefone \xFCber die Dect Funktion der Fritzbox 7020, Garten, Eltern und bei mir. W\xE4re also sch\xF6n wenn nur auf Pause gestellt wird wenn von meinem Telefon eine Anruf get\xE4tigt wird.
Modified: trunk/plugins/FritzBox/Docs/Changes.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Changes.txt 2012-01-25 23:00:16 UTC (rev 4425)
+++ trunk/plugins/FritzBox/Docs/Changes.txt 2012-01-28 08:48:41 UTC (rev 4426)
@@ -0,0 +1,5 @@
+Fixed bugs:
+- error in Russian localization
+- FRITZ!Box 7390 specific
+ - contact images are not synchronized with FRITZ!Box
+ - voice box access doesn't work
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2012-01-25 23:00:16 UTC (rev 4425)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2012-01-28 08:48:41 UTC (rev 4426)
@@ -66,16 +66,11 @@
private readonly List<CallAction> _notificationQueue = new List<CallAction>();
private bool _showNotification = true;
private object _tempNotification;
- private static bool windowIsDisplayed = false;
-
+ //private static bool windowIsDisplayed = false;
private int notificationCount = 0;
#endregion Variables
- #region Properties
-
- #endregion Variables
-
#region Private Functions/Methods
private void OnStartExternal(Process proc, bool waitForExit)
@@ -170,7 +165,7 @@
{
Log.Info("Yet another dialog is active. Action is sent to queue");
- if (_actionList.Count < Settings.MaxNotifies - 1) _actionList.Add(callAction);
+ if (_actionList.Count < Settings.MaximumNotifications - 1) _actionList.Add(callAction);
return;
}
@@ -253,9 +248,9 @@
if (callAction.Caller.PhoneNumber != "")
{
- if (phoneBookItem != null) strText += phoneBookItem.Name;
+ if (phoneBookItem != null) strText += phoneBookItem.Name + Environment.NewLine;
- if (Settings.ShowPhoneNumberOnNotification) strText += Environment.NewLine + callAction.Caller.PhoneNumber;
+ if (Settings.ShowPhoneNumberOnNotification) strText += callAction.Caller.PhoneNumber;
}
else strText += GUILocalizeStrings.Get(3); // 3 = Unknown
@@ -271,7 +266,7 @@
}
}
- #endregion
+ #endregion Private Functions/Methods
#region Helper Methods
@@ -298,9 +293,9 @@
private void showNotificationWindow(CallAction.CallType callType, string strHeading, string strImage, string strText)
{
bool resumePlayer = false;
-
- if (notificationCount >= Settings.MaxNotifies) return;
+ if (notificationCount >= Settings.MaximumNotifications) return;
+
if (!isMovingPicturesOrMPTVSeriesDialogOpened()) // this check avoids that the current movie starts when dialog asking if the movie shall be continued on the last position is opened
{
// pause player
@@ -459,7 +454,7 @@
SystemEvents.PowerModeChanged -= new PowerModeChangedEventHandler(SystemEvents_PowerModeChanged); // power changes
}
- #endregion
+ #endregion IPlugin Interface
#region ISetupForm Member
@@ -531,9 +526,9 @@
return true;
}
- #endregion
+ #endregion ISetupForm Member
- #endregion
+ #endregion IPlugin Interface
#region FritzManager
@@ -541,8 +536,6 @@
#region Nested type: Filter
- #endregion Nested type: Filter
-
#region Nested type: View
private enum View
@@ -552,10 +545,12 @@
LargeIcons = 2,
}
+ #endregion Nested type: View
+
+ #endregion Nested type: Filter
+
#endregion enums
- #endregion FritzManager
-
#region skin
[SkinControl(3)]
@@ -581,7 +576,7 @@
private static System.Timers.Timer sessionTimer = new System.Timers.Timer();
// list of call items (callers)
private List<CallItem> callItemList;
- // state of facede view
+ // state of facade view
private View currentView = View.List;
// list of temporary files to delete
private List<string> filesToDelete = new List<string>();
@@ -610,10 +605,22 @@
Log.Debug("Init called");
Start();
- //loadConfig();
return Load(GUIGraphicsContext.Skin + @"\FritzManager.xml");
}
+
+ #region properties
+
+ private static bool windowIsDisplayed
+ {
+ get
+ {
+ if (GUIWindowManager.ActiveWindow == thePlugin.GetWindowId()) return true;
+ else return false;
+ }
+ }
+
+ #endregion properties
private void startBackGroundWorker()
{
@@ -665,12 +672,12 @@
protected override void OnPageLoad()
{
- windowIsDisplayed = true;
-
showThumbPanel();
// display error on missing FRITZ!Box settings
if (String.IsNullOrEmpty(Settings.Password) && String.IsNullOrEmpty(Settings.VBPath)) showError(GUILocalizeStrings.Get(24)); // 24 = FRITZ!Box password and voice box path are missing in settings!
+
+ btnUpdate.Label = GUILocalizeStrings.Get(25); // 25 = Update
RefreshView(Settings.CurrentMode);
@@ -710,8 +717,6 @@
protected override void OnPageDestroy(int new_windowId)
{
- windowIsDisplayed = false;
-
CleanupTempFiles();
base.OnPageDestroy(new_windowId);
}
@@ -1030,10 +1035,6 @@
GUIPropertyManager.SetProperty("#FritzManager.TotalMessageCount", voiceBoxItemsCount.ToString());
}
-
- // set properties for skin file labels
- GUIPropertyManager.SetProperty("#FritzManager.LabelCallList", GUILocalizeStrings.Get(18)); // 18 = Call list
- GUIPropertyManager.SetProperty("#FritzManager.LabelUpdate", GUILocalizeStrings.Get(25)); // 25 = Update
}
catch (Exception e)
{
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2012-01-25 23:00:16 UTC (rev 4425)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2012-01-28 08:48:41 UTC (rev 4426)
@@ -79,6 +79,8 @@
this.updateInterval = new MediaPortal.UserInterface.Controls.MPNumericUpDown();
this.checkBoxShowNotificationOnOutgoingCall = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.checkBoxShowNotificationOnIncomingCall = new MediaPortal.UserInterface.Controls.MPCheckBox();
+ this.label6 = new System.Windows.Forms.Label();
+ this.textBoxNASShareName = new System.Windows.Forms.TextBox();
this.tabPageDiagnostics.SuspendLayout();
this.tabPagePhoneBook.SuspendLayout();
this.tabPageCallNotification.SuspendLayout();
@@ -326,7 +328,7 @@
// buttonMSNsRemove
//
this.buttonMSNsRemove.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonMSNsRemove.Location = new System.Drawing.Point(387, 86);
+ this.buttonMSNsRemove.Location = new System.Drawing.Point(387, 91);
this.buttonMSNsRemove.Name = "buttonMSNsRemove";
this.buttonMSNsRemove.Size = new System.Drawing.Size(63, 21);
this.buttonMSNsRemove.TabIndex = 5;
@@ -349,7 +351,7 @@
// buttonMSNsAdd
//
this.buttonMSNsAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonMSNsAdd.Location = new System.Drawing.Point(303, 89);
+ this.buttonMSNsAdd.Location = new System.Drawing.Point(303, 91);
this.buttonMSNsAdd.Name = "buttonMSNsAdd";
this.buttonMSNsAdd.Size = new System.Drawing.Size(63, 21);
this.buttonMSNsAdd.TabIndex = 4;
@@ -486,6 +488,8 @@
//
// tabPageConnection
//
+ this.tabPageConnection.Controls.Add(this.label6);
+ this.tabPageConnection.Controls.Add(this.textBoxNASShareName);
this.tabPageConnection.Controls.Add(this.dialPortNumericUpDown);
this.tabPageConnection.Controls.Add(this.label2);
this.tabPageConnection.Controls.Add(this.vBPath);
@@ -716,6 +720,22 @@
this.checkBoxShowNotificationOnIncomingCall.Text = "Show notification on incoming call";
this.checkBoxShowNotificationOnIncomingCall.UseVisualStyleBackColor = true;
//
+ // label6
+ //
+ this.label6.AutoSize = true;
+ this.label6.Location = new System.Drawing.Point(15, 260);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(87, 13);
+ this.label6.TabIndex = 35;
+ this.label6.Text = "NAS share name";
+ //
+ // textBoxNASShareName
+ //
+ this.textBoxNASShareName.Location = new System.Drawing.Point(108, 257);
+ this.textBoxNASShareName.Name = "textBoxNASShareName";
+ this.textBoxNASShareName.Size = new System.Drawing.Size(119, 20);
+ this.textBoxNASShareName.TabIndex = 34;
+ //
// FritzBoxConfig
//
this.AcceptButton = this.okButton;
@@ -812,5 +832,7 @@
private MediaPortal.UserInterface.Controls.MPNumericUpDown updateInterval;
private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxShowNotificationOnOutgoingCall;
private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxShowNotificationOnIncomingCall;
+ private System.Windows.Forms.Label label6;
+ private System.Windows.Forms.TextBox textBoxNASShareName;
}
}
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2012-01-25 23:00:16 UTC (rev 4425)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2012-01-28 08:48:41 UTC (rev 4426)
@@ -56,16 +56,18 @@
textBoxAddress.Text = FritzBoxClient.Address;
numericUpDownPort.Value = FritzBoxClient.Port;
passwd.Text = Settings.Password;
-
+
dialPortNumericUpDown.Text = Settings.DialPort;
vBPath.Text = Settings.VBPath;
+ textBoxNASShareName.Text = Settings.NASShareName;
+
// call notification settings
checkBoxShowNotificationOnIncomingCall.Checked = Settings.ShowNotficationOnIncomingCall;
checkBoxShowNotificationOnOutgoingCall.Checked = Settings.ShowNotficationOnOutgoingCall;
- numericUpDownMaxNotifies.Value = Settings.MaxNotifies;
+ numericUpDownMaxNotifies.Value = Settings.MaximumNotifications;
checkBoxCloseOnTimout.Checked = Settings.CloseNotificationOnTimeout;
numericUpDownTimeout.Value = Settings.NotificationTimeout;
checkBoxCloseOnConnectionClosed.Checked = Settings.CloseNotificationOnConnectionClosed;
@@ -111,11 +113,13 @@
Settings.VBPath = vBPath.Text;
+ Settings.NASShareName = textBoxNASShareName.Text;
+
// call notification settings
Settings.ShowNotficationOnIncomingCall = checkBoxShowNotificationOnIncomingCall.Checked;
Settings.ShowNotficationOnOutgoingCall = checkBoxShowNotificationOnOutgoingCall.Checked;
- Settings.MaxNotifies = (int)numericUpDownMaxNotifies.Value;
+ Settings.MaximumNotifications = (int)numericUpDownMaxNotifies.Value;
Settings.CloseNotificationOnTimeout = checkBoxCloseOnTimout.Checked;
Settings.NotificationTimeout = (int)numericUpDownTimeout.Value;
Settings.CloseNotificationOnConnectionClosed = checkBoxCloseOnConnectionClosed.Checked;
Modified: trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/CallAction.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/CallAction.cs 2012-01-25 23:00:16 UTC (rev 4425)
+++ trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/CallAction.cs 2012-01-28 08:48:41 UTC (rev 4426)
@@ -57,8 +57,8 @@
Log.Info(" CallType: {0}", Type.ToString());
Log.Info(" Date: {0}", Time.ToShortDateString());
Log.Info(" Time: {0}", Time.ToShortTimeString());
- Log.Info(" Caller: {0}", Caller.PhoneNumber);
- Log.Info(" MSN: {0}", MSN);
+ if (Settings.ExtensiveLogging) Log.Info(" Caller: {0}", Caller.PhoneNumber);
+ if (Settings.ExtensiveLogging) Log.Info(" MSN: {0}", MSN);
}
}
}
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs 2012-01-25 23:00:16 UTC (rev 4425)
+++ trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs 2012-01-28 08:48:41 UTC (rev 4426)
@@ -128,7 +128,7 @@
{
if (_client != null)
{
- // Release the socket
+ // release the socket
_client.Shutdown(SocketShutdown.Both);
_client.Close();
}
@@ -201,7 +201,7 @@
private static void Connect()
{
- // Enforce a minimum wait time between connects.
+ // enforce a minimum wait time between connects
DateTime nextconnect = _connectionFailed.Add(minConnectWaitTime);
if (DateTime.Now < nextconnect)
@@ -215,20 +215,20 @@
{
Log(LogLevel.Debug, "Connecting");
- // Establish the remote endpoint for the socket.
+ // establish the remote endpoint for the socket
IPHostEntry ipHostInfo = Dns.GetHostEntry(Address);
IPAddress ipAddress = ipHostInfo.AddressList[0];
IPEndPoint remoteEP = new IPEndPoint(ipAddress, Port);
- // Create a TCP/IP socket.
+ // create a TCP/IP socket
_client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
- // Connect to the remote endpoint.
+ // connect to the remote endpoint
_client.BeginConnect(Address, Port, ConnectCallback, _client);
Connected = true;
- // Raise event
+ // raise event
ConnectedEvent();
}
catch (SocketException)
@@ -251,10 +251,10 @@
{
try
{
- // Retrieve the socket from the state object.
+ // retrieve the socket from the state object
Socket client = (Socket)ar.AsyncState;
- // Complete the connection.
+ // complete the connection
client.EndConnect(ar);
Log(LogLevel.Debug, "Socket connected to {0}", client.RemoteEndPoint.ToString());
@@ -276,11 +276,11 @@
{
try
{
- // Create the state object.
+ // create the state object
StateObject state = new StateObject();
state.workSocket = client;
- // Begin receiving the data from the remote device.
+ // begin receiving the data from the remote device
client.BeginReceive(state.buffer, 0, StateObject.BufferSize, 0, new AsyncCallback(ReceiveCallback), state);
}
catch (SocketException ex)
@@ -312,17 +312,16 @@
{
try
{
- // Retrieve the state object and the client socket
- // from the asynchronous state object.
+ // retrieve the state object and the client socket from the asynchronous state object
StateObject state = (StateObject)ar.AsyncState;
Socket client = state.workSocket;
- // Read data from the remote device.
+ // read data from the remote device
int bytesRead = client.EndReceive(ar);
if (bytesRead > 0)
{
- // There might be more data, so store the data received so far.
+ // 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);
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/MyBinaryReader.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/MyBinaryReader.cs 2012-01-25 23:00:16 UTC (rev 4425)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/MyBinaryReader.cs 2012-01-28 08:48:41 UTC (rev 4426)
@@ -1,32 +1,44 @@
-/*
- * Erstellt mit SharpDevelop.
- * Benutzer: sr
- * Datum: 27.11.2009
- * Zeit: 11:54
- */
-using System.IO;
+using System.IO;
namespace FritzManager
{
- /// <summary>
- /// Description of MyBinaryReader.
- /// </summary>
- public class MyBinaryReader : BinaryReader
- {
- public MyBinaryReader(Stream s) : base(s)
+ /// <summary>
+ /// Description of MyBinaryReader.
+ /// </summary>
+ public class MyBinaryReader : BinaryReader
{
- }
+ public MyBinaryReader(Stream s) : base(s)
+ {
+ }
- public string ReadCString()
- {
- string res = "";
- while (true)
- {
- char ch = this.ReadChar();
- if (ch == '\0') break;
- res += ch;
- }
- return res;
+ public bool BigEndianFormat;
+
+ public string ReadCString()
+ {
+ string res = "";
+
+ while (true)
+ {
+ char ch = this.ReadChar();
+ if (ch == '\0') break;
+ res += ch;
+ }
+
+ return res;
+ }
+
+ public override int ReadInt32()
+ {
+ if (!BigEndianFormat)
+ {
+ return base.ReadInt32();
+ }
+ else
+ {
+ byte[] bytes = base.ReadBytes(4);
+
+ return (int)(((bytes[3] | (bytes[2] << 8)) | (bytes[1] << 0x10)) | (bytes[0] << 0x18));
+ }
+ }
}
- }
-}
\ No newline at end of file
+}
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs 2012-01-25 23:00:16 UTC (rev 4425)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs 2012-01-28 08:48:41 UTC (rev 4426)
@@ -107,7 +107,14 @@
{
lock (sync)
{
- phoneBook = InternalPhoneBook.loadPhoneBook(Settings.PhoneBookFilePath);
+ try
+ {
+ phoneBook = InternalPhoneBook.loadPhoneBook(Settings.PhoneBookFilePath);
+ }
+ catch (Exception e)
+ {
+ Log.Error("An error occured during phone book load: {0}", e.Message);
+ }
}
if (phoneBook.Count != 0) Log.Info("Loaded " + phoneBook.Count + " contacts from " + Settings.PhoneBookFilePath);
@@ -353,7 +360,7 @@
if (fritz != null && fritz.LoggedIn)
{
// search contact images folder on the FRITZ!Box
- if (contactImagesPathRemote == null)
+ if (contactImagesPathRemote == null && !String.IsNullOrEmpty(Settings.NASShareName))
{
Log.Debug("Searching contact images folder on the FRITZ!Box");
@@ -364,10 +371,14 @@
if (!String.IsNullOrEmpty(phoneBookItem.ImageURL))
{
contactImagePathRemote = phoneBookItem.ImageURL;
- contactImagePathRemote = contactImagePathRemote.Replace("/var/media/ftp", FritzBoxClient.Address + "/FRITZ.NAS"); // URL format
- contactImagePathRemote = contactImagePathRemote.Replace("file://", @"\\");
- contactImagePathRemote = contactImagePathRemote.Replace("/", "\\"); // UNC format
+
+ // convert to UNC format
+ if (contactImagePathRemote.Contains("InternerSpeicher")) contactImagePathRemote = contactImagePathRemote.Replace("file:///var/InternerSpeicher", @"\\" + FritzBoxClient.Address + "\\" + Settings.NASShareName); // FRITZ!Boxe models with internal storage e. g. FRITZ!Box 7390
+ else contactImagePathRemote = contactImagePathRemote.Replace("file:///var/media/ftp", @"\\" + FritzBoxClient.Address + "\\" + Settings.NASShareName);
+
+ contactImagePathRemote = contactImagePathRemote.Replace("/", "\\");
+ // check if folder exists and put it to the variable
if (File.Exists(contactImagePathRemote))
{
FileInfo contactImage = new FileInfo(contactImagePathRemote);
@@ -377,7 +388,7 @@
break;
}
- else Log.Debug("Contact images folder could not be found");
+ else Log.Debug("Contact images folder could not be found: \"{0}\"", contactImagesPathRemote);
}
}
}
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/VBReader.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/VBReader.cs 2012-01-25 23:00:16 UTC (rev 4425)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/VBReader.cs 2012-01-28 08:48:41 UTC (rev 4426)
@@ -36,17 +36,33 @@
stream.Position = p * 348;
int len = r.ReadInt32();
+ // check if meta file is encoded in BigEndian format
+ if (len == 1543569408) // 348 = LittleEndian format, 1543569408 = BigEndian format (FRITZ!Box 7390)
+ {
+ r.BigEndianFormat = true;
+ stream.Position = p * 348; // reset stream read position
+ len = r.ReadInt32();
+ }
+
if (len == 348)
{
VoiceBoxItem item = new VoiceBoxItem();
item.voicebox = i; // which voice box
- item.seq = r.ReadInt32();
+
+ if (r.BigEndianFormat) // the sequence value is always encoded in LittleEndian format
+ {
+ r.BigEndianFormat = false;
+ item.seq = r.ReadInt32();
+ r.BigEndianFormat = true;
+ }
+ else item.seq = r.ReadInt32();
+
item.type = r.ReadInt32();
r.ReadInt32();
item.filelen = r.ReadInt32();
item.lenInSec = r.ReadInt32();
item.isNew = r.ReadInt32();
- // 24 Bytes
+ // 24 bytes
stream.Position += 24;
long pos = stream.Position + 18 * 4;
item.callerId = r.ReadCString();
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/VoiceboxItem.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/VoiceboxItem.cs 2012-01-25 23:00:16 UTC (rev 4425)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/VoiceboxItem.cs 2012-01-28 08:48:41 UTC (rev 4426)
@@ -2,37 +2,37 @@
namespace FritzManager
{
- /// <summary>
- /// Description of VoiceBoxItem.
- /// </summary>
+ /// <summary>
+ /// Description of VoiceBoxItem.
+ /// </summary>
public class VoiceBoxItem : System.IEquatable<VoiceBoxItem>
- {
- public string callerId;
- public int filelen;
- public string filename;
- public int isNew;
- public int lenInSec;
- public string mynumber;
- public string pathname;
- public int seq;
- public DateTime time;
- public int type;
- public int voicebox;
-
- public static int CompareByDate(VoiceBoxItem i1, VoiceBoxItem i2)
{
- return i2.time.CompareTo(i1.time);
- }
+ public string callerId;
+ public int filelen;
+ public string filename;
+ public int isNew;
+ public int lenInSec;
+ public string mynumber;
+ public string pathname;
+ public int seq;
+ public DateTime time;
+ public int type;
+ public int voicebox;
- public override string ToString()
- {
- return String.Format("voice box item: {0} type: {1}, new: {2}, caller: {3}, mynumber {4}, sec: {5}, time: {6}", seq, type, isNew, callerId, mynumber, lenInSec, time);
- }
+ public static int CompareByDate(VoiceBoxItem i1, VoiceBoxItem i2)
+ {
+ return i2.time.CompareTo(i1.time);
+ }
- public bool Equals(VoiceBoxItem voiceBoxItem)
- {
- if (time == voiceBoxItem.time) return true;
- else return false;
+ public override string ToString()
+ {
+ return String.Format("voice box item: {0} type: {1}, new: {2}, caller: {3}, mynumber {4}, sec: {5}, time: {6}", seq, type, isNew, callerId, mynumber, lenInSec, time);
+ }
+
+ public bool Equals(VoiceBoxItem voiceBoxItem)
+ {
+ if (time == voiceBoxItem.time) return true;
+ else return false;
+ }
}
- }
-}
\ No newline at end of file
+}
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_ru.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_ru.xml 2012-01-25 23:00:16 UTC (rev 4425)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_ru.xml 2012-01-28 08:48:41 UTC (rev 4426)
@@ -15,7 +15,7 @@
<String id="13">Вид: Крупные значки</String>
<String id="14">все</String>
<String id="15">подробный</String>
- <String id="16">основанный/String>
+ <String id="16">основанный</String>
<String id="17">Отклонен</String>
<String id="18">список вызова</String>
<String id="19">FritzBox новости</String>
Modified: trunk/plugins/FritzBox/FritzBox/Settings.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Settings.cs 2012-01-25 23:00:16 UTC (rev 4425)
+++ trunk/plugins/FritzBox/FritzBox/Settings.cs 2012-01-28 08:48:41 UTC (rev 4426)
@@ -81,7 +81,7 @@
///
public static bool ResumeMediaOnOutgoingCall { get; set; }
- public static int MaxNotifies { get; set; }
+ public static int MaximumNotifications { get; set; }
/// <summary>
/// autoclose the dialog after the timeout expired
@@ -112,6 +112,7 @@
}
public static string VBPath { get; set; }
+ public static string NASShareName { get; set; }
public static string Password { get; set; }
public static string DialPort { get; set; }
public static GUIMode CurrentMode { get; set; }
@@ -144,7 +145,7 @@
ResumeMediaOnIncomingCall = true;
PauseMediaOnOutgoingCall = true;
ResumeMediaOnOutgoingCall = true;
- MaxNotifies = 20;
+ MaximumNotifications = 20;
NotificationTimeout = 10;
}
@@ -167,6 +168,8 @@
DialPort = xmlreader.GetValueAsString("FritzManager", "dialport", "1");
VBPath = xmlreader.GetValue("FritzManager", "vBPath");
+ NASShareName = xmlreader.GetValueAsString("FritzManager", "nASShareName", "FRITZ.NAS");
+
// phone book settings
PhoneBookFilePath = Config.GetFolder(Config.Dir.Config) + "\\FRITZ!Box Manager Phone Book.xml";
@@ -174,7 +177,7 @@
ShowNotficationOnIncomingCall = xmlreader.GetValueAsBool("fritzbox", "showNotificationOnIncomingCall", true);
ShowNotficationOnOutgoingCall = xmlreader.GetValueAsBool("fritzbox", "showNotificationOnOutgoingCall", true);
- MaxNotifies = xmlreader.GetValueAsInt("fritzbox", "maxNotifies", 20);
+ MaximumNotifications = xmlreader.GetValueAsInt("fritzbox", "maximumNotifications", 20);
CloseNotificationOnTimeout = xmlreader.GetValueAsBool("fritzbox", "closeOnTimeout", false);
NotificationTimeout = xmlreader.GetValueAsInt("fritzbox", "notificationTimeout", 10);
CloseNotificationOnConnectionClosed = xmlreader.GetValueAsBool("fritzbox", "closeOnConnectionClosed", true);
@@ -255,6 +258,8 @@
xmlreader.RemoveEntry("fritzbox", "showPhoneNumberOnNotify");
xmlreader.RemoveEntry("fritzbox", "showPhoneNumberOnNotify");
+
+ xmlreader.RemoveEntry("fritzbox", "maxNotifies");
}
}
@@ -272,11 +277,13 @@
xmlwriter.SetValue("fritzbox", "address", FritzBoxClient.Address);
xmlwriter.SetValue("fritzbox", "port", FritzBoxClient.Port);
+ xmlwriter.SetValue("FritzManager", "nASShareName", NASShareName);
+
// call notification settings
xmlwriter.SetValueAsBool("fritzbox", "showNotificationOnIncomingCall", ShowNotficationOnIncomingCall);
xmlwriter.SetValueAsBool("fritzbox", "showNotificationOnOutgoingCall", ShowNotficationOnOutgoingCall);
- xmlwriter.SetValue("fritzbox", "maxNotifies", MaxNotifies);
+ xmlwriter.SetValue("fritzbox", "maximumNotifications", MaximumNotifications);
xmlwriter.SetValueAsBool("fritzbox", "closeOnTimeout", CloseNotificationOnTimeout);
xmlwriter.SetValue("fritzbox", "notificationTimeout", NotificationTimeout);
xmlwriter.SetValueAsBool("fritzbox", "closeOnConnectionClosed", CloseNotificationOnConnectionClosed);
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Black & White/FritzManager.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Black & White/FritzManager.xml 2012-01-25 23:00:16 UTC (rev 4425)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Black & White/FritzManager.xml 2012-01-28 08:48:41 UTC (rev 4426)
@@ -79,12 +79,12 @@
<texture>menu_divider.png</texture>
</control>
<control>
- <description>Modus</description>
+ <description>Mode</description>
<type>button</type>
<id>4</id>
<posX>40</posX>
<posY>420</posY>
- <label>Anrufliste</label>
+ <label>Mode</label>
<onright>50</onright>
<onup>3</onup>
<ondown>9</ondown>
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Blue3/FritzManager.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Blue3/FritzManager.xml 2012-01-25 23:00:16 UTC (rev 4425)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Blue3/FritzManager.xml 2012-01-28 08:48:41 UTC (rev 4426)
@@ -60,11 +60,11 @@
</control>
<control>
<id>4</id>
- <description>Modus</description>
+ <description>Mode</description>
<type>button</type>
<onright>50</onright>
<ondown>9</ondown>
- <label>Anrufliste</label>
+ <label>Mode</label>
</control>
<control>
<id>9</id>
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml 2012-01-25 23:00:16 UTC (rev 4425)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml 2012-01-28 08:48:41 UTC (rev 4426)
@@ -64,7 +64,7 @@
<type>button</type>
<onright>50</onright>
<ondown>9</ondown>
- <label>#FritzManager.LabelCallList</label>
+ <label>Mode</label>
</control>
<control>
<id>9</id>
@@ -72,7 +72,7 @@
<type>button</type>
<onright>50</onright>
<ondown>2</ondown>
- <label>#FritzManager.LabelUpdate</label>
+ <label>Update</label>
</control>
</control>
</control>
Modified: trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml 2012-01-25 23:00:16 UTC (rev 4425)
+++ trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml 2012-01-28 08:48:41 UTC (rev 4426)
@@ -64,7 +64,7 @@
<type>button</type>
<onright>50</onright>
<ondown>9</ondown>
- <label>#FritzManager.LabelCallList</label>
+ <label>Mode</label>
</control>
<control>
<id>9</id>
@@ -72,7 +72,7 @@
<type>button</type>
<onright>50</onright>
<ondown>2</ondown>
- <label>#FritzManager.LabelUpdate</label>
+ <label>Update</label>
</control>
</control>
</control>
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Maya/FritzManager.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Maya/FritzManager.xml 2012-01-25 23:00:16 UTC (rev 4425)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Maya/FritzManager.xml 2012-01-28 08:48:41 UTC (rev 4426)
@@ -94,7 +94,7 @@
</control>
<control>
<type>button</type>
- <description>Modus</description>
+ <description>Mode</description>
<id>4</id>
<textureFocus>hiddenmenu_item_selected.png</textureFocus>
<textureNoFocus>hiddenmenu_item.png</textureNoFocus>
@@ -102,7 +102,7 @@
<height>49</height>
<textXOff>25</textXOff>
<textYOff>12</textYOff>
- <label>Anrufliste</label>
+ <label>Mode</label>
<onup>3</onup>
<ondown>9</ondown>
</control>
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...> - 2012-01-28 09:51:02
|
Revision: 4427
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4427&view=rev
Author: horned-reaper
Date: 2012-01-28 09:50:54 +0000 (Sat, 28 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
Added Paths:
-----------
trunk/plugins/FritzBox/Build/Commit FritzBoxManager.bat
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.read.7.tlog
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.write.7.tlog
trunk/plugins/FritzBox/releases/FritzBox_v0.4.1.4426.mpe1
Removed Paths:
-------------
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.read.6.tlog
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.write.6.tlog
Modified: trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat
===================================================================
--- trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat 2012-01-28 08:48:41 UTC (rev 4426)
+++ trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat 2012-01-28 09:50:54 UTC (rev 4427)
@@ -3,5 +3,65 @@
D:
cd \FritzBox\Build
+REM Set program path based on current machine environment
+set ProgramDir=%ProgramFiles%
+if not "%ProgramFiles(x86)%".=="". set ProgramDir=%ProgramFiles(x86)%
+
+REM Set build path
+set BuildPath=..\FritzBox\bin\Release
+
+REM Set plugin DLL path
+set PluginDLL=%BuildPath%\FritzBox.dll
+
+REM Set log file where the infos are written to, and clear that file
+set LOG=Build.log
+echo. > %LOG%
+
+echo.
+echo -= Build FRITZ!Box Manager =-
+echo -===========================-
+echo.
+
+echo.
echo Updating SVN path...
-TortoiseProc.exe /path:".." /command:commit /closeonend:1
+TortoiseProc.exe /path:".." /command:update /closeonend:1
+
+echo.
+echo Writing SVN revision assemblies...
+DeployVersionSVN.exe /svn=".." >> %LOG%
+
+echo.
+echo Building FRITZ!Box Manager...
+"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" /target:Rebuild /property:Configuration=Release;AllowUnsafeBlocks=true "..\FritzBox.sln" >> %LOG%
+
+echo.
+echo Reverting assemblies...
+DeployVersionSVN.exe /svn=".." /revert >> %LOG%
+
+rmdir /S /Q ..\_release
+xcopy "%PluginDLL%" ..\_release\plugins\windows\ >> %LOG%
+xcopy ..\FritzBox\Resources\speexdec.exe ..\_release\base\ >> %LOG%
+xcopy ..\FritzBox\Skin ..\_release\skin /S /I >> %LOG%
+xcopy ..\FritzBox\Languages ..\_release\language /S /I >> %LOG%
+
+echo.
+echo Reading the version number...
+if not exist "%PluginDLL%" goto version_error
+for /f "Tokens=5" %%a in ('filever "%PluginDLL%"') do set version=%%a
+goto :version_done
+:version_error
+echo FritzBox.dll not found. version could not be read >> %LOG%
+echo FritzBox.dll not found. version could not be read. Build is cancelled
+pause
+goto :EOF
+:version_done
+
+echo.
+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 Move installer and update.xml files to the releases folder
+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 2012-01-28 08:48:41 UTC (rev 4426)
+++ trunk/plugins/FritzBox/Build/Build.log 2012-01-28 09:50:54 UTC (rev 4427)
@@ -1,6 +1,6 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4415
+SVN Version: 4426
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 21.01.2012 11:32:07.
+Build started 28.01.2012 10:49:53.
Project "D:\FritzBox\FritzBox.sln" on node 1 (Rebuild target(s)).
ValidateSolutionConfiguration:
Building solution configuration "Release|Mixed Platforms".
@@ -195,7 +195,7 @@
0 Warning(s)
0 Error(s)
-Time Elapsed 00:00:02.53
+Time Elapsed 00:00:03.29
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 11:32:12
+Build started at 10:50:00
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Added: trunk/plugins/FritzBox/Build/Commit FritzBoxManager.bat
===================================================================
--- trunk/plugins/FritzBox/Build/Commit FritzBoxManager.bat (rev 0)
+++ trunk/plugins/FritzBox/Build/Commit FritzBoxManager.bat 2012-01-28 09:50:54 UTC (rev 4427)
@@ -0,0 +1,12 @@
+@echo off
+
+D:
+cd \FritzBox\Build
+
+echo.
+echo -= Commit FRITZ!Box Manager =-
+echo -============================-
+echo.
+
+echo Committing SVN path...
+TortoiseProc.exe /path:".." /command:commit /closeonend:1
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-28 08:48:41 UTC (rev 4426)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2012-01-28 09:50:54 UTC (rev 4427)
@@ -559,7 +559,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4415</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4426</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -582,7 +582,7 @@
<Major>0</Major>
<Minor>4</Minor>
<Build>1</Build>
- <Revision>4415</Revision>
+ <Revision>4426</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>2012-01-21T11:32:12.5286188+01:00</ReleaseDate>
+ <ReleaseDate>2012-01-28T10:50:00.643857+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-28 08:48:41 UTC (rev 4426)
+++ trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.csproj.FileListAbsolute.txt 2012-01-28 09:50:54 UTC (rev 4427)
@@ -23,5 +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.6.tlog
-D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.write.6.tlog
+D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.read.7.tlog
+D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.write.7.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)
Deleted: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.read.6.tlog
===================================================================
(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
Deleted: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.write.6.tlog
===================================================================
(Binary files differ)
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
Added: trunk/plugins/FritzBox/releases/FritzBox_v0.4.1.4426.mpe1
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/releases/FritzBox_v0.4.1.4426.mpe1
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/FritzBox/releases/update.xml
===================================================================
--- trunk/plugins/FritzBox/releases/update.xml 2012-01-28 08:48:41 UTC (rev 4426)
+++ trunk/plugins/FritzBox/releases/update.xml 2012-01-28 09:50:54 UTC (rev 4427)
@@ -88,7 +88,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4415</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4426</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -111,7 +111,7 @@
<Major>0</Major>
<Minor>4</Minor>
<Build>1</Build>
- <Revision>4415</Revision>
+ <Revision>4426</Revision>
</Version>
<ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box informations from MediaPortal.
@@ -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-21T11:32:12.5286188+01:00</ReleaseDate>
+ <ReleaseDate>2012-01-28T10:50:00.643857+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.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X