Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4787] trunk/plugins/FritzBox
|
From: <hor...@us...> - 2014-04-21 19:49:02
|
Revision: 4787
http://sourceforge.net/p/mp-plugins/code/4787
Author: horned-reaper
Date: 2014-04-21 19:48:57 +0000 (Mon, 21 Apr 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/Docs/Changes.txt
trunk/plugins/FritzBox/Docs/Vorgehensweise beim Update.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/FritzBoxClient.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs
trunk/plugins/FritzBox/FritzBox/Settings.cs
trunk/plugins/FritzBox/FritzBox/bin/Release/Dialogs.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/DesignTimeResolveAssemblyReferences.cache
trunk/plugins/FritzBox/FritzBox/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.EditPhoneBook.resources
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.GenerateResource.Cache
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.EditPhoneBook.resources
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.FritzBoxConfig.resources
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.Properties.Resources.resources
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.GenerateResource.Cache
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/FritzBoxConfigTester.csproj
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/app.config
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/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe.config
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
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/log4net.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/taglib-sharp.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/FritzBoxDebugger.csproj
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/app.config
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/Dialogs.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe.config
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.DebugForm.resources
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csprojResolveAssemblyReference.cache
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.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/releases/update.xml
Added Paths:
-----------
trunk/plugins/FritzBox/FritzBox/FritzManager/UNCAccessWithCredentials.cs
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/CSScriptLibrary.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Microsoft.WindowsAPICodePack.Shell.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Microsoft.WindowsAPICodePack.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4564.mpe1
trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4786.mpe1
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/Build/Build.log 2014-04-21 19:48:57 UTC (rev 4787)
@@ -1,17 +1,17 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4563
+SVN Version: 4786
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)-Buildmodul, Version 4.0.30319.17929
-[Microsoft .NET Framework, Version 4.0.30319.18033]
+[Microsoft .NET Framework, Version 4.0.30319.18449]
Copyright (C) Microsoft Corporation. Alle Rechte vorbehalten.
Die Projekte in dieser Projektmappe werden nacheinander erstellt. Um eine parallele Erstellung zu erm\x94glichen, m\x81ssen Sie den Schalter "/m" hinzuf\x81gen.
-Der Buildvorgang wurde am 18.04.2013 23:11:23 gestartet.
+Der Buildvorgang wurde am 21.04.2014 21:24:13 gestartet.
Projekt "D:\FritzBox\FritzBox.sln" auf Knoten "1", Rebuild Ziel(e).
ValidateSolutionConfiguration:
Die Projektmappenkonfiguration "Release|Any CPU" wird erstellt.
@@ -26,9 +26,14 @@
Die Datei "D:\FritzBox\FritzBox\obj\Release\FritzBox.dll" wird gel\x94scht.
Die Datei "D:\FritzBox\FritzBox\obj\Release\FritzBox.csprojResolveAssemblyReference.cache" wird gel\x94scht.
CoreResGen:
- C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\ResGen.exe /useSourcePath /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Common.Utils.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Core.dll" /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Data.dll /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Data.Linq.dll" /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.dll /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Drawing.dll /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Windows.Forms.dll /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Xml.dll /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Xml.Linq.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Utils.dll" /compile EditPhoneBook.resx,obj\Release\FritzBox.EditPhoneBook.resources Properties\Resources.resx,obj\Release\FritzBox.Properties.Resources.resources FritzBoxConfig.resx,obj\Release\FritzBox.FritzBoxConfig.resources
+ "C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\bin\NETFX 4.0 Tools\resgen.exe" /useSourcePath /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Common.Utils.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\mscorlib.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Core.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Data.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Data.Linq.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Drawing.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Windows.Forms.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Xml.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Xml.Linq.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Utils.dll" /compile EditPhoneBook.resx,obj\Release\FritzBox.EditPhoneBook.resources Properties\Resources.resx,obj\Release\FritzBox.Properties.Resources.resources FritzBoxConfig.resx,obj\Release\FritzBox.FritzBoxConfig.resources
+ Die Ressourcendatei "EditPhoneBook.resx" wird zu "obj\Release\FritzBox.EditPhoneBook.resources" verarbeitet.
+ Die Ressourcendatei "Properties\Resources.resx" wird zu "obj\Release\FritzBox.Properties.Resources.resources" verarbeitet.
+ Die Ressourcendatei "FritzBoxConfig.resx" wird zu "obj\Release\FritzBox.FritzBoxConfig.resources" verarbeitet.
+GenerateTargetFrameworkMonikerAttribute:
+Das Ziel "GenerateTargetFrameworkMonikerAttribute" wird \x81bersprungen, da alle Ausgabedateien hinsichtlich der Eingabedateien aktuell sind.
CoreCompile:
- C:\Windows\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /platform:x86 /baseaddress:4194304 /highentropyva- /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Common.Utils.dll" /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Core.dll" /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Data.dll /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Data.Linq.dll" /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Drawing.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Windows.Forms.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Xml.dll /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Xml.Linq.dll" /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Utils.dll" /filealign:4096 /out:obj\Release\FritzBox.dll /resource:obj\Release\FritzBox.EditPhoneBook.resources /resource:obj\Release\FritzBox.Properties.Resources.resources /resource:obj\Release\FritzBox.FritzBoxConfig.resources /resource:FritzBox.png,FritzBox.FritzBox.png /resource:FritzBoxDisabled.png,FritzBox.FritzBoxDisabled.png /target:library /warnaserror- /utf8output EditPhoneBook.cs EditPhoneBook.Designer.cs FritzCallMonitor\FritzBoxClient.cs FritzManager\LocalizeStrings.cs FritzManager\StringEncryption.cs FritzManager\VBReader.cs FritzManager\BackGroundWorker.cs FritzManager\BlockingQueue.cs FritzManager\CallItem.cs FritzManager\Fritz.cs FritzManager\FritzboxPhoneBook.cs FritzManager\Logger.cs FritzManager\LoggerFactory.cs FritzManager\MyBinaryReader.cs FritzManager\PhoneBookItem.cs FritzManager\Task.cs FritzManager\VoiceBoxItem.cs Properties\AssemblyInfo.cs FritzCallMonitor\Caller.cs FritzCallMonitor\CallAction.cs FritzBoxConfig.cs FritzBoxConfig.Designer.cs FritzBox.cs FritzManager\PhoneBook.cs Properties\Resources.Designer.cs Settings.cs
+ C:\Windows\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /platform:x86 /baseaddress:4194304 /highentropyva- /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Common.Utils.dll" /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\mscorlib.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Core.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Data.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Data.Linq.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Drawing.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Windows.Forms.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Xml.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Xml.Linq.dll" /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Utils.dll" /filealign:4096 /out:obj\Release\FritzBox.dll /resource:obj\Release\FritzBox.EditPhoneBook.resources /resource:obj\Release\FritzBox.Properties.Resources.resources /resource:obj\Release\FritzBox.FritzBoxConfig.resources /resource:FritzBox.png,FritzBox.FritzBox.png /resource:FritzBoxDisabled.png,FritzBox.FritzBoxDisabled.png /target:library /warnaserror- /utf8output EditPhoneBook.cs EditPhoneBook.Designer.cs FritzCallMonitor\FritzBoxClient.cs FritzManager\LocalizeStrings.cs FritzManager\StringEncryption.cs FritzManager\UNCAccessWithCredentials.cs FritzManager\VBReader.cs FritzManager\BackGroundWorker.cs FritzManager\BlockingQueue.cs FritzManager\CallItem.cs FritzManager\Fritz.cs FritzManager\FritzboxPhoneBook.cs FritzManager\Logger.cs FritzManager\LoggerFactory.cs FritzManager\MyBinaryReader.cs FritzManager\PhoneBookItem.cs FritzManager\Task.cs FritzManager\VoiceBoxItem.cs Properties\AssemblyInfo.cs FritzCallMonitor\Caller.cs FritzCallMonitor\CallAction.cs FritzBoxConfig.cs FritzBoxConfig.Designer.cs FritzBox.cs FritzManager\PhoneBook.cs Properties\Resources.Designer.cs Settings.cs "C:\Users\Test\AppData\Local\Temp\.NETFramework,Version=v4.0.AssemblyAttributes.cs"
_CopyFilesMarkedCopyLocal:
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" in "bin\Release\Dialogs.dll" kopiert.
CopyFilesToOutputDirectory:
@@ -60,8 +65,10 @@
Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.csprojResolveAssemblyReference.cache" wird gel\x94scht.
Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.exe" wird gel\x94scht.
Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.pdb" wird gel\x94scht.
+GenerateTargetFrameworkMonikerAttribute:
+Das Ziel "GenerateTargetFrameworkMonikerAttribute" wird \x81bersprungen, da alle Ausgabedateien hinsichtlich der Eingabedateien aktuell sind.
CoreCompile:
- C:\Windows\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /platform:x86 /define:TRACE /highentropyva- /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /reference:D:\FritzBox\FritzBox\bin\Release\FritzBox.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Core.dll" /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Data.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Drawing.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Windows.Forms.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Xml.dll /debug:pdbonly /optimize+ /out:obj\Release\FritzBoxConfigTester.exe /target:winexe /utf8output Program.cs Properties\AssemblyInfo.cs
+ C:\Windows\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /platform:x86 /define:TRACE /highentropyva- /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /reference:D:\FritzBox\FritzBox\bin\Release\FritzBox.dll /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\mscorlib.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Core.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Data.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Drawing.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Windows.Forms.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Xml.dll" /debug:pdbonly /optimize+ /out:obj\Release\FritzBoxConfigTester.exe /target:winexe /utf8output Program.cs Properties\AssemblyInfo.cs "C:\Users\Test\AppData\Local\Temp\.NETFramework,Version=v4.0.AssemblyAttributes.cs"
_CopyFilesMarkedCopyLocal:
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" in "bin\Release\Core.dll" kopiert.
Die Datei wird von "D:\FritzBox\FritzBox\bin\Release\FritzBox.dll" in "bin\Release\FritzBox.dll" kopiert.
@@ -72,13 +79,16 @@
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\DirectShowLib.dll" in "bin\Release\DirectShowLib.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\BassVisAPI.Net.dll" in "bin\Release\BassVisAPI.Net.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\taglib-sharp.dll" in "bin\Release\taglib-sharp.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\CSScriptLibrary.dll" in "bin\Release\CSScriptLibrary.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\AxInterop.WMPLib.dll" in "bin\Release\AxInterop.WMPLib.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\edtftpnet-1.2.2.dll" in "bin\Release\edtftpnet-1.2.2.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\BassRegistration.dll" in "bin\Release\BassRegistration.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\MediaPortal.Support.dll" in "bin\Release\MediaPortal.Support.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Interop.WMPLib.dll" in "bin\Release\Interop.WMPLib.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Microsoft.WindowsAPICodePack.Shell.dll" in "bin\Release\Microsoft.WindowsAPICodePack.Shell.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\log4net.dll" in "bin\Release\log4net.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Ionic.Zip.dll" in "bin\Release\Ionic.Zip.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Microsoft.WindowsAPICodePack.dll" in "bin\Release\Microsoft.WindowsAPICodePack.dll" kopiert.
Die Datei wird von "D:\FritzBox\FritzBox\bin\Release\FritzBox.pdb" in "bin\Release\FritzBox.pdb" kopiert.
_CopyAppConfigFile:
Die Datei wird von "app.config" in "bin\Release\FritzBoxConfigTester.exe.config" kopiert.
@@ -100,9 +110,12 @@
Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.exe" wird gel\x94scht.
Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.pdb" wird gel\x94scht.
CoreResGen:
- C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\ResGen.exe /useSourcePath /r:D:\FritzBox\FritzBox\bin\Release\FritzBox.dll /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Core.dll" /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Data.dll /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.dll /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Drawing.dll /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Windows.Forms.dll /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Xml.dll /compile DebugForm.resx,obj\Release\FritzBoxDebugger.DebugForm.resources
+ "C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\bin\NETFX 4.0 Tools\resgen.exe" /useSourcePath /r:D:\FritzBox\FritzBox\bin\Release\FritzBox.dll /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\mscorlib.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Core.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Data.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Drawing.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Windows.Forms.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Xml.dll" /compile DebugForm.resx,obj\Release\FritzBoxDebugger.DebugForm.resources
+ Die Ressourcendatei "DebugForm.resx" wird zu "obj\Release\FritzBoxDebugger.DebugForm.resources" verarbeitet.
+GenerateTargetFrameworkMonikerAttribute:
+Das Ziel "GenerateTargetFrameworkMonikerAttribute" wird \x81bersprungen, da alle Ausgabedateien hinsichtlich der Eingabedateien aktuell sind.
CoreCompile:
- C:\Windows\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /platform:x86 /define:TRACE /highentropyva- /reference:D:\FritzBox\FritzBox\bin\Release\FritzBox.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Core.dll" /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Data.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Drawing.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Windows.Forms.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Xml.dll /debug:pdbonly /optimize+ /out:obj\Release\FritzBoxDebugger.exe /resource:obj\Release\FritzBoxDebugger.DebugForm.resources /target:winexe /utf8output DebugForm.cs DebugForm.Designer.cs Program.cs Properties\AssemblyInfo.cs
+ C:\Windows\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /platform:x86 /define:TRACE /highentropyva- /reference:D:\FritzBox\FritzBox\bin\Release\FritzBox.dll /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\mscorlib.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Core.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Data.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Drawing.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Windows.Forms.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Xml.dll" /debug:pdbonly /optimize+ /out:obj\Release\FritzBoxDebugger.exe /resource:obj\Release\FritzBoxDebugger.DebugForm.resources /target:winexe /utf8output DebugForm.cs DebugForm.Designer.cs Program.cs Properties\AssemblyInfo.cs "C:\Users\Test\AppData\Local\Temp\.NETFramework,Version=v4.0.AssemblyAttributes.cs"
_CopyFilesMarkedCopyLocal:
Die Datei wird von "D:\FritzBox\FritzBox\bin\Release\FritzBox.dll" in "bin\Release\FritzBox.dll" kopiert.
Die Datei wird von "D:\FritzBox\FritzBox\bin\Release\Dialogs.dll" in "bin\Release\Dialogs.dll" kopiert.
@@ -120,7 +133,7 @@
0 Warnung(en)
0 Fehler
-Verstrichene Zeit 00:00:02.14
+Verstrichene Zeit 00:00:04.54
Reverting to build 0
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
@@ -270,8 +283,8 @@
..\FritzBox\Languages\Unsupported\strings_uk.xml
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
37 Datei(en) kopiert
-MpeMaker version: 1.3.0.0
-Build started at 23:11:27
+MpeMaker version: 1.7.0.0
+Build started at 21:24:21
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 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/Docs/Changes.txt 2014-04-21 19:48:57 UTC (rev 4787)
@@ -1,3 +1,5 @@
-1.0.0.4563:
-Fixed bug:
-- incoming call notifications aren't shown when option "Show on outgoing call" is disabled and an outgoing call has been done (thanks to Django.edwards!)
\ No newline at end of file
+1.0.0.4786:
+Optimizations:
+- FRITZ!OS 6 and MediaPortal 1.6/1.6 compatibility
+- FRITZ!OS version display format (e. g. 06.05) in log file
+- login test in Configuration menu
\ No newline at end of file
Modified: trunk/plugins/FritzBox/Docs/Vorgehensweise beim Update.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Vorgehensweise beim Update.txt 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/Docs/Vorgehensweise beim Update.txt 2014-04-21 19:48:57 UTC (rev 4787)
@@ -1,5 +1,5 @@
1. \xC4nderungen in Visual Studio vornehmen
-2. Build.bat ausf\xFChren
+2. "Build FritzBoxManager.bat" ausf\xFChren
3. Pr\xFCfen, ob Installer-Datei mit der korrekten Versionsnummer unter "D:\FritzBox\releases" angelegt wurde. Beispiel:
- OK: FritzBox_v0.3.5.4364.mpe1
- Falsch: FritzBox_v0.3.5.0.mpe1
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2014-04-21 19:48:57 UTC (rev 4787)
@@ -68,6 +68,7 @@
private int notificationCount = 0;
private CallAction.CallType lastCallActionType; // necessary to avoid that notification window isn't closed on quick sequent call actions
private string currentConnectionID;
+ private UNCAccessWithCredentials nASShareConnection;
#endregion Variables
@@ -161,13 +162,38 @@
}
private void OnConnectedAction()
- {
+ {
updateTimer.Start();
+
+ string nASSharePath = @"\\" + FritzBoxClient.Address + "\\" + Settings.NASShareName;
+ if (!Directory.Exists(nASSharePath) && Settings.NASShareIsEnabled)
+ {
+ Log.Debug("Connecting with FRITZ!Box NAS share");
+
+ nASShareConnection = new UNCAccessWithCredentials();
+
+ if (nASShareConnection.NetUseWithCredentials(nASSharePath, Settings.UserName, "", Settings.Password))
+ {
+ Log.Info("Connected with FRITZ!Box NAS share");
+ }
+ else
+ {
+ Log.Error("Failed to connect with FRITZ!Box NAS share");
+ }
+ }
}
private void OnDisconnectedAction()
{
updateTimer.Stop();
+ if (_tempNotification != null && isNotificationWindowOpened()) closeNotificationWindow();
+ currentConnectionID = null;
+
+ if (nASShareConnection != null)
+ {
+ Log.Debug("Disconnecting from FRITZ!Box NAS share");
+ nASShareConnection.NetUseDelete(); // disconnecting is done asynchronously and takes about 15 seconds
+ }
}
private void OnLoggedInAction()
@@ -803,9 +829,9 @@
BackGroundWorker worker = thePlugin.worker;
worker.EnqueueTask(new Task(Task.TaskAction.LoadCallListItems, null));
- if (!String.IsNullOrEmpty(Settings.VBPath)) worker.EnqueueTask(new Task(Task.TaskAction.LoadVoiceBoxItems, null));
+ if (Settings.NASShareIsEnabled && !String.IsNullOrEmpty(Settings.VBPath)) worker.EnqueueTask(new Task(Task.TaskAction.LoadVoiceBoxItems, null));
if (Settings.SynchronizePhoneBook) worker.EnqueueTask(new Task(Task.TaskAction.SynchronizePhoneBook, null));
- if (!Settings.ManualContactImagePathEntry && !String.IsNullOrEmpty(Settings.NASShareName)) worker.EnqueueTask(new Task(Task.TaskAction.SynchronizeContactImages, null));
+ if (Settings.NASShareIsEnabled && !Settings.ManualContactImagePathEntry && !String.IsNullOrEmpty(Settings.NASShareName)) worker.EnqueueTask(new Task(Task.TaskAction.SynchronizeContactImages, null));
worker.EnqueueTask(new Task(Task.TaskAction.UpdateGUIProperties, null));
// reset update timer to get the timer countdown reset
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.csproj
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.csproj 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.csproj 2014-04-21 19:48:57 UTC (rev 4787)
@@ -18,7 +18,7 @@
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
<SourceAnalysisOverrideSettingsFile>C:\Dokumente und Einstellungen\sr\Anwendungsdaten\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<NoStdLib>False</NoStdLib>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
@@ -105,6 +105,7 @@
<Compile Include="FritzManager\StringEncryption.cs">
<SubType>Code</SubType>
</Compile>
+ <Compile Include="FritzManager\UNCAccessWithCredentials.cs" />
<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 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2014-04-21 19:48:57 UTC (rev 4787)
@@ -70,13 +70,17 @@
this.checkBoxPauseMediaOnIncomingCall = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.tabPageConnection = new System.Windows.Forms.TabPage();
this.numericUpDownDialPort = new System.Windows.Forms.NumericUpDown();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.checkBoxEnableNASShare = new System.Windows.Forms.CheckBox();
this.label6 = new System.Windows.Forms.Label();
this.textBoxNASShareName = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
- this.vBPath = new System.Windows.Forms.TextBox();
- this.passwd = new System.Windows.Forms.TextBox();
+ this.textBoxVBPath = new System.Windows.Forms.TextBox();
+ this.textBoxUserName = new System.Windows.Forms.TextBox();
+ this.label7 = new System.Windows.Forms.Label();
+ this.textBoxPasswd = new System.Windows.Forms.TextBox();
+ this.label1 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
- this.label1 = new System.Windows.Forms.Label();
this.numericUpDownPort = new System.Windows.Forms.NumericUpDown();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.textBoxAddress = new MediaPortal.UserInterface.Controls.MPTextBox();
@@ -96,6 +100,7 @@
this.groupBoxMedia.SuspendLayout();
this.tabPageConnection.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownDialPort)).BeginInit();
+ this.groupBox1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownPort)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.tabControlConfiguration.SuspendLayout();
@@ -594,13 +599,12 @@
// tabPageConnection
//
this.tabPageConnection.Controls.Add(this.numericUpDownDialPort);
- this.tabPageConnection.Controls.Add(this.label6);
- this.tabPageConnection.Controls.Add(this.textBoxNASShareName);
- this.tabPageConnection.Controls.Add(this.label2);
- this.tabPageConnection.Controls.Add(this.vBPath);
- this.tabPageConnection.Controls.Add(this.passwd);
+ this.tabPageConnection.Controls.Add(this.groupBox1);
+ this.tabPageConnection.Controls.Add(this.textBoxUserName);
+ this.tabPageConnection.Controls.Add(this.label7);
+ this.tabPageConnection.Controls.Add(this.textBoxPasswd);
+ this.tabPageConnection.Controls.Add(this.label1);
this.tabPageConnection.Controls.Add(this.label3);
- this.tabPageConnection.Controls.Add(this.label1);
this.tabPageConnection.Controls.Add(this.numericUpDownPort);
this.tabPageConnection.Controls.Add(this.pictureBox1);
this.tabPageConnection.Controls.Add(this.textBoxAddress);
@@ -616,7 +620,7 @@
//
// numericUpDownDialPort
//
- this.numericUpDownDialPort.Location = new System.Drawing.Point(129, 152);
+ this.numericUpDownDialPort.Location = new System.Drawing.Point(449, 57);
this.numericUpDownDialPort.Maximum = new decimal(new int[] {
99,
0,
@@ -624,70 +628,111 @@
0});
this.numericUpDownDialPort.Name = "numericUpDownDialPort";
this.numericUpDownDialPort.Size = new System.Drawing.Size(44, 20);
- this.numericUpDownDialPort.TabIndex = 36;
+ this.numericUpDownDialPort.TabIndex = 42;
//
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.checkBoxEnableNASShare);
+ this.groupBox1.Controls.Add(this.label6);
+ this.groupBox1.Controls.Add(this.textBoxNASShareName);
+ this.groupBox1.Controls.Add(this.label2);
+ this.groupBox1.Controls.Add(this.textBoxVBPath);
+ this.groupBox1.Location = new System.Drawing.Point(15, 145);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(538, 153);
+ this.groupBox1.TabIndex = 39;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "FRITZ! NAS";
+ //
+ // checkBoxEnableNASShare
+ //
+ this.checkBoxEnableNASShare.AutoSize = true;
+ this.checkBoxEnableNASShare.Location = new System.Drawing.Point(23, 28);
+ this.checkBoxEnableNASShare.Name = "checkBoxEnableNASShare";
+ this.checkBoxEnableNASShare.Size = new System.Drawing.Size(335, 17);
+ this.checkBoxEnableNASShare.TabIndex = 42;
+ this.checkBoxEnableNASShare.Text = "Enable NAS share (used for voice box function and caller images)";
+ this.checkBoxEnableNASShare.UseVisualStyleBackColor = true;
+ this.checkBoxEnableNASShare.CheckedChanged += new System.EventHandler(this.checkBoxEnableNASShare_CheckedChanged);
+ //
// label6
//
this.label6.AutoSize = true;
- this.label6.Location = new System.Drawing.Point(15, 260);
+ this.label6.Location = new System.Drawing.Point(22, 117);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(87, 13);
- this.label6.TabIndex = 35;
+ this.label6.TabIndex = 41;
this.label6.Text = "NAS share name";
//
// textBoxNASShareName
//
- this.textBoxNASShareName.Location = new System.Drawing.Point(110, 257);
+ this.textBoxNASShareName.Location = new System.Drawing.Point(117, 114);
this.textBoxNASShareName.Name = "textBoxNASShareName";
this.textBoxNASShareName.Size = new System.Drawing.Size(119, 20);
- this.textBoxNASShareName.TabIndex = 34;
+ this.textBoxNASShareName.TabIndex = 40;
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(15, 196);
+ this.label2.Location = new System.Drawing.Point(22, 59);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(354, 13);
- this.label2.TabIndex = 32;
- this.label2.Text = "Voice box path (e. g. \\\\fritz.box\\FRITZ.NAS\\USBStore\\FRITZ\\voicebox)";
+ this.label2.Size = new System.Drawing.Size(302, 13);
+ this.label2.TabIndex = 39;
+ this.label2.Text = "Voice box path (e. g. \\\\fritz.box\\FRITZ.NAS\\FRITZ\\voicebox)";
//
- // vBPath
+ // textBoxVBPath
//
- this.vBPath.Location = new System.Drawing.Point(17, 216);
- this.vBPath.Name = "vBPath";
- this.vBPath.Size = new System.Drawing.Size(369, 20);
- this.vBPath.TabIndex = 29;
+ this.textBoxVBPath.Location = new System.Drawing.Point(24, 79);
+ this.textBoxVBPath.Name = "textBoxVBPath";
+ this.textBoxVBPath.Size = new System.Drawing.Size(369, 20);
+ this.textBoxVBPath.TabIndex = 37;
//
- // passwd
+ // textBoxUserName
//
- this.passwd.Location = new System.Drawing.Point(206, 97);
- this.passwd.Name = "passwd";
- this.passwd.PasswordChar = '*';
- this.passwd.Size = new System.Drawing.Size(100, 20);
- this.passwd.TabIndex = 27;
- this.passwd.Text = "passwd";
+ this.textBoxUserName.Location = new System.Drawing.Point(209, 97);
+ this.textBoxUserName.Name = "textBoxUserName";
+ this.textBoxUserName.Size = new System.Drawing.Size(100, 20);
+ this.textBoxUserName.TabIndex = 37;
//
- // label3
+ // label7
//
- this.label3.Location = new System.Drawing.Point(15, 145);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(108, 23);
- this.label3.TabIndex = 31;
- this.label3.Text = "Dial port (telephone)";
- this.label3.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
+ this.label7.Location = new System.Drawing.Point(142, 91);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(65, 23);
+ this.label7.TabIndex = 38;
+ this.label7.Text = "User name";
+ this.label7.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
//
+ // textBoxPasswd
+ //
+ this.textBoxPasswd.Location = new System.Drawing.Point(393, 97);
+ this.textBoxPasswd.Name = "textBoxPasswd";
+ this.textBoxPasswd.PasswordChar = '*';
+ this.textBoxPasswd.Size = new System.Drawing.Size(100, 20);
+ this.textBoxPasswd.TabIndex = 27;
+ this.textBoxPasswd.Text = "passwd";
+ //
// label1
//
- this.label1.Location = new System.Drawing.Point(142, 91);
+ this.label1.Location = new System.Drawing.Point(329, 91);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(58, 23);
this.label1.TabIndex = 28;
this.label1.Text = "Password";
this.label1.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
//
+ // label3
+ //
+ this.label3.Location = new System.Drawing.Point(331, 50);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(108, 23);
+ this.label3.TabIndex = 38;
+ this.label3.Text = "Dial port (telephone)";
+ this.label3.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
+ //
// numericUpDownPort
//
- this.numericUpDownPort.Location = new System.Drawing.Point(206, 58);
+ this.numericUpDownPort.Location = new System.Drawing.Point(209, 58);
this.numericUpDownPort.Maximum = new decimal(new int[] {
999999,
0,
@@ -718,7 +763,7 @@
this.textBoxAddress.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.textBoxAddress.BorderColor = System.Drawing.Color.Empty;
- this.textBoxAddress.Location = new System.Drawing.Point(206, 18);
+ this.textBoxAddress.Location = new System.Drawing.Point(209, 18);
this.textBoxAddress.Name = "textBoxAddress";
this.textBoxAddress.Size = new System.Drawing.Size(138, 20);
this.textBoxAddress.TabIndex = 10;
@@ -847,6 +892,8 @@
this.tabPageConnection.ResumeLayout(false);
this.tabPageConnection.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownDialPort)).EndInit();
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownPort)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.tabControlConfiguration.ResumeLayout(false);
@@ -890,10 +937,7 @@
private System.Windows.Forms.TabPage tabPageMiscellaneous;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label label5;
- private System.Windows.Forms.Label label2;
- private System.Windows.Forms.TextBox vBPath;
- private System.Windows.Forms.TextBox passwd;
- private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.TextBox textBoxPasswd;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.NumericUpDown numericUpDownPort;
private System.Windows.Forms.PictureBox pictureBox1;
@@ -904,9 +948,6 @@
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;
- private System.Windows.Forms.NumericUpDown numericUpDownDialPort;
private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxShowPhoneTypeOnNotification;
private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxShowUnknownCaller;
private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxUsePhonebook;
@@ -917,5 +958,15 @@
private MediaPortal.UserInterface.Controls.MPComboBox comboBoxExtensions;
private System.Windows.Forms.CheckBox checkBoxManualContactImagePathEntry;
private System.Windows.Forms.CheckBox checkBoxSynchronizePhoneBook;
+ private System.Windows.Forms.TextBox textBoxUserName;
+ private System.Windows.Forms.Label label7;
+ private System.Windows.Forms.NumericUpDown numericUpDownDialPort;
+ private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.CheckBox checkBoxEnableNASShare;
+ private System.Windows.Forms.Label label6;
+ private System.Windows.Forms.TextBox textBoxNASShareName;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.TextBox textBoxVBPath;
+ private System.Windows.Forms.Label label3;
}
}
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2014-04-21 19:48:57 UTC (rev 4787)
@@ -38,10 +38,14 @@
{
InitializeComponent();
LoadSettings();
- FritzBoxClient.LogEvent += OnLogAction;
+ FritzBoxClient.LogEvent += new FritzBoxClient.LogEventHandler(OnLogAction);
+ FritzBoxClient.ConnectedEvent += new FritzBoxClient.ConnectedEventHandler(OnConnectedAction);
+
+ Fritz.LoggedInEvent += OnLoggedInAction;
}
private static Logger Log = LoggerFactory.getLogger("FritzBoxConfig");
+ private static Fritz fritz;
#region Settings
@@ -56,16 +60,20 @@
// connection settings
textBoxAddress.Text = FritzBoxClient.Address;
numericUpDownPort.Value = FritzBoxClient.Port;
- passwd.Text = Settings.Password;
+ textBoxUserName.Text = Settings.UserName;
+ textBoxPasswd.Text = Settings.Password;
+
numericUpDownDialPort.Text = Settings.DialPort;
ToolTip toolTipNumericUpDownDialPort = new ToolTip();
toolTipNumericUpDownDialPort.SetToolTip(numericUpDownDialPort, "Be sure to configure the correct dial port in the FRITZ!Box Manager settings to choose the appropriate telephone connected with the FRITZ!Box." + Environment.NewLine + "You may refer to the following list:" + Environment.NewLine + "1 & 2: analog phone outlets on the FRITZ!Box" + Environment.NewLine + "50: ISDN- & cordless phones (group)" + Environment.NewLine + "60: DECT phone");
- vBPath.Text = Settings.VBPath;
-
+ // NAS share settings
+ checkBoxEnableNASShare.Checked = Settings.NASShareIsEnabled;
textBoxNASShareName.Text = Settings.NASShareName;
+ textBoxVBPath.Text = Settings.VBPath;
+ checkBoxEnableNASShare_CheckedChanged(this, null);
// call notification settings
checkBoxShowNotificationOnIncomingCall.Checked = Settings.ShowNotificationOnIncomingCall;
@@ -129,13 +137,16 @@
// connection settings
FritzBoxClient.Address = textBoxAddress.Text;
FritzBoxClient.Port = (int)numericUpDownPort.Value;
- Settings.Password = passwd.Text;
+ Settings.UserName = textBoxUserName.Text;
+ Settings.Password = textBoxPasswd.Text;
+
Settings.DialPort = numericUpDownDialPort.Text;
- Settings.VBPath = vBPath.Text;
-
+ // NAS share settings
+ Settings.NASShareIsEnabled = checkBoxEnableNASShare.Checked;
Settings.NASShareName = textBoxNASShareName.Text;
+ Settings.VBPath = textBoxVBPath.Text;
// call notification settings
Settings.ShowNotificationOnIncomingCall = checkBoxShowNotificationOnIncomingCall.Checked;
@@ -318,6 +329,8 @@
FritzBoxClient.Port = (int)numericUpDownPort.Value;
// run tests
+ if (fritz == null) fritz = new Fritz(Settings.Password, Config.GetFolder(Config.Dir.Config), FritzBoxClient.Address, Settings.DialPort);
+
if (FritzBoxClient.TestConnection()) FritzBoxClient.StartClient();
}
@@ -352,7 +365,19 @@
}
else labelHelp.Text += logMessage + Environment.NewLine;
}
-
+
+ private void OnConnectedAction()
+ {
+ // log in to FRITZ!Box
+ OnLogAction(FritzBoxClient.LogLevel.Info, "Logging in to FRITZ!Box (see Configuration log for details!)");
+ }
+
+ private void OnLoggedInAction()
+ {
+ OnLogAction(FritzBoxClient.LogLevel.Info, "Successfully logged in. Logging off...");
+ fritz.LogOff();
+ }
+
private void buttonEditPhoneBook_Click(object sender, EventArgs e)
{
EditPhoneBook editPhoneBook = new EditPhoneBook();
@@ -372,6 +397,12 @@
Settings.SynchronizePhoneBook = checkBoxSynchronizePhoneBook.Checked;
}
+ private void checkBoxEnableNASShare_CheckedChanged(object sender, EventArgs e)
+ {
+ textBoxNASShareName.Enabled = checkBoxEnableNASShare.Checked;
+ textBoxVBPath.Enabled = checkBoxEnableNASShare.Checked;
+ }
+
#region Nested type: SetTextCallback
private delegate void SetTextCallback(FritzBoxClient.LogLevel logLevel, string logMessage);
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.resx
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.resx 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.resx 2014-04-21 19:48:57 UTC (rev 4787)
@@ -112,12 +112,12 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.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/FritzBoxClient.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs 2014-04-21 19:48:57 UTC (rev 4787)
@@ -306,7 +306,7 @@
Connected = true;
// raise event
- if (ConnectedEvent != null) ConnectedEvent(); // the Configuration tool doesn't use this event
+ ConnectedEvent();
// start connection monitoring. Since the socket does not detect connection interruptions it's necessary to monitor it by another thread
connectionCheckTimer.Start();
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs 2014-04-21 19:48:57 UTC (rev 4787)
@@ -1,5 +1,4 @@
-
-using System;
+using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs 2014-04-21 19:48:57 UTC (rev 4787)
@@ -109,7 +109,7 @@
public void LogOff()
{
loggedIn = false;
- LoggedOffEvent(); // raise event
+ if (LoggedOffEvent != null) LoggedOffEvent(); // the Configuration tool doesn't use this event
}
public void KeepAlive()
@@ -185,7 +185,7 @@
"-----------------------------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", "UTF-8");
if (!returnData.StartsWith("<!DOCTYPE html")) return returnData;
}
@@ -367,7 +367,7 @@
// get FRITZ!Box name
FritzBox.Settings.FritzBoxName = getXMLValue(doc, "Name", "http://jason.avm.de/updatecheck/");
- Log.Debug("FRITZ!Box firmware version is " + FritzBox.Settings.FritzBoxFirmwareMainVersion + "." + FritzBox.Settings.FritzBoxFirmwareSubVersion + " on " + FritzBox.Settings.FritzBoxName);
+ Log.Debug("FRITZ!Box firmware version is " + string.Format("{0:00}", FritzBox.Settings.FritzBoxFirmwareMainVersion) + "." + string.Format("{0:00}", FritzBox.Settings.FritzBoxFirmwareSubVersion) + " on " + FritzBox.Settings.FritzBoxName);
}
catch
{
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs 2014-04-21 19:48:57 UTC (rev 4787)
@@ -633,14 +633,11 @@
string contactImagePathRemote;
// convert to UNC format
- if (imageURL.Contains("file:///var/media/ftp/"))
- {
- contactImagePathRemote = imageURL.Replace("file:///var/media/ftp/", @"\\" + FritzBoxClient.Address + "\\" + Settings.NASShareName + "\\");
- contactImagePathRemote = contactImagePathRemote.Replace("/", "\\");
+ contactImagePathRemote = imageURL.Replace("file:///var/media/ftp", @"\\" + FritzBoxClient.Address + "\\" + Settings.NASShareName);
+ contactImagePathRemote = contactImagePathRemote.Replace("file:///var/InternerSpeicher", @"\\" + FritzBoxClient.Address + "\\" + Settings.NASShareName);
+ contactImagePathRemote = contactImagePathRemote.Replace("/", "\\");
- return contactImagePathRemote;
- }
- else return String.Empty;
+ return contactImagePathRemote;
}
#endregion private methods
Added: trunk/plugins/FritzBox/FritzBox/FritzManager/UNCAccessWithCredentials.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/UNCAccessWithCredentials.cs (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/UNCAccessWithCredentials.cs 2014-04-21 19:48:57 UTC (rev 4787)
@@ -0,0 +1,138 @@
+using System;
+using System.Runtime.InteropServices;
+using BOOL = System.Boolean;
+using DWORD = System.UInt32;
+using LPWSTR = System.String;
+using NET_API_STATUS = System.UInt32;
+
+namespace FritzBox
+{
+ public class UNCAccessWithCredentials : IDisposable
+ {
+ [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+ internal struct USE_INFO_2
+ {
+ internal LPWSTR ui2_local;
+ internal LPWSTR ui2_remote;
+ internal LPWSTR ui2_password;
+ internal DWORD ui2_status;
+ internal DWORD ui2_asg_type;
+ internal DWORD ui2_refcount;
+ internal DWORD ui2_usecount;
+ internal LPWSTR ui2_username;
+ internal LPWSTR ui2_domainname;
+ }
+
+ [DllImport("NetApi32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+ internal static extern NET_API_STATUS NetUseAdd(
+ LPWSTR UncServerName,
+ DWORD Level,
+ ref USE_INFO_2 Buf,
+ out DWORD ParmError);
+
+ [DllImport("NetApi32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+ internal static extern NET_API_STATUS NetUseDel(
+ LPWSTR UncServerName,
+ LPWSTR UseName,
+ DWORD ForceCond);
+
+ private bool disposed = false;
+
+ private string sUNCPath;
+ private string sUser;
+ private string sPassword;
+ private string sDomain;
+ private int iLastError;
+
+ /// <summary>
+ /// A disposeable class that allows access to a UNC resource with credentials.
+ /// </summary>
+ public UNCAccessWithCredentials()
+ {
+ }
+
+ /// <summary>
+ /// The last system error code returned from NetUseAdd or NetUseDel. Success = 0
+ /// </summary>
+ public int LastError
+ {
+ get { return iLastError; }
+ }
+
+ public void Dispose()
+ {
+ if (!this.disposed)
+ {
+ NetUseDelete();
+ }
+ disposed = true;
+ GC.SuppressFinalize(this);
+ }
+
+ /// <summary>
+ /// Connects to a UNC path using the credenti...
[truncated message content] |
