Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4462] trunk/plugins/FritzBox
|
From: <hor...@us...> - 2012-02-26 15:27:03
|
Revision: 4462
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4462&view=rev
Author: horned-reaper
Date: 2012-02-26 15:26:52 +0000 (Sun, 26 Feb 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/EditPhoneBook.Designer.cs
trunk/plugins/FritzBox/FritzBox/EditPhoneBook.cs
trunk/plugins/FritzBox/FritzBox/EditPhoneBook.resx
trunk/plugins/FritzBox/FritzBox/FritzBox.cs
trunk/plugins/FritzBox/FritzBox/FritzBox.csproj
trunk/plugins/FritzBox/FritzBox/FritzBox.csproj.user
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/BackGroundWorker.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.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/Settings.cs
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/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/FritzBoxConfigTester.csproj
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/DebugForm.Designer.cs
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/DebugForm.cs
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/DebugForm.resx
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/FritzBoxDebugger.csproj
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/FritzBox/bin/Debug Configuration/
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/AxInterop.WMPLib.dll
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/Bass.Net.dll
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/BassRegistration.dll
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/BassVisAPI.Net.dll
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/Common.Utils.dll
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/Core.dll
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/Dialogs.dll
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/DirectShowLib.dll
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/Interop.SHDocVw.dll
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/Interop.WMPLib.dll
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/Ionic.Zip.dll
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/MediaPortal.Support.dll
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/Utils.dll
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/edtftpnet-1.2.2.dll
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/log4net.dll
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/taglib-sharp.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug Configuration/
trunk/plugins/FritzBox/FritzBox/obj/Debug Configuration/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/FritzBox/FritzBox/obj/Debug Configuration/FritzBox.EditPhoneBook.resources
trunk/plugins/FritzBox/FritzBox/obj/Debug Configuration/FritzBox.FritzBoxConfig.resources
trunk/plugins/FritzBox/FritzBox/obj/Debug Configuration/FritzBox.Properties.Resources.resources
trunk/plugins/FritzBox/FritzBox/obj/Debug Configuration/FritzBox.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/FritzBox/obj/Debug Configuration/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug Configuration/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Debug Configuration/GenerateResource-ResGen.read.1.tlog
trunk/plugins/FritzBox/FritzBox/obj/Debug Configuration/GenerateResource-ResGen.read.4.tlog
trunk/plugins/FritzBox/FritzBox/obj/Debug Configuration/GenerateResource-ResGen.write.1.tlog
trunk/plugins/FritzBox/FritzBox/obj/Debug Configuration/TempPE/
trunk/plugins/FritzBox/FritzBox/obj/Debug Configuration/TempPE/Properties.Resources.Designer.cs.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.vshost.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.vshost.exe.config
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/AxInterop.WMPLib.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/Bass.Net.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/BassRegistration.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/BassVisAPI.Net.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/Common.Utils.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/Core.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/Dialogs.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/DirectShowLib.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/FritzBoxConfigTester.exe.config
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/FritzBoxConfigTester.vshost.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/FritzBoxConfigTester.vshost.exe.config
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/FritzBoxConfigTester.vshost.exe.manifest
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/Interop.SHDocVw.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/Interop.WMPLib.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/Ionic.Zip.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/MediaPortal.Support.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/Utils.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/edtftpnet-1.2.2.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/log4net.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/taglib-sharp.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.vshost.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.vshost.exe.config
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.vshost.exe.manifest
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug Configuration/
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug Configuration/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug Configuration/FritzBoxConfigTester.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug Configuration/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug Configuration/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug Configuration/ResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug Configuration/TempPE/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.vshost.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.vshost.exe.config
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/AxInterop.WMPLib.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/Bass.Net.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/BassRegistration.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/BassVisAPI.Net.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/Common.Utils.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/Core.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/Dialogs.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/DirectShowLib.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/FritzBoxDebugger.exe.config
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/Interop.SHDocVw.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/Interop.WMPLib.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/Ionic.Zip.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/MediaPortal.Support.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/Utils.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/edtftpnet-1.2.2.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/log4net.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/taglib-sharp.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.vshost.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.vshost.exe.config
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.vshost.exe.manifest
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug Configuration/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug Configuration/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug Configuration/FritzBoxDebugger.DebugForm.resources
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug Configuration/FritzBoxDebugger.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug Configuration/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug Configuration/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug Configuration/GenerateResource.read.1.tlog
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug Configuration/GenerateResource.write.1.tlog
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug Configuration/TempPE/
trunk/plugins/FritzBox/releases/FritzBox_v0.4.1.4461.mpe1
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2012-02-19 22:31:59 UTC (rev 4461)
+++ trunk/plugins/FritzBox/Build/Build.log 2012-02-26 15:26:52 UTC (rev 4462)
@@ -1,6 +1,6 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4449
+SVN Version: 4461
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 11.02.2012 00:03:28.
+Build started 26.02.2012 16:16:20.
Project "D:\FritzBox\FritzBox.sln" on node 1 (Rebuild target(s)).
ValidateSolutionConfiguration:
Building solution configuration "Release|Mixed Platforms".
@@ -106,8 +106,8 @@
Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Core.dll" to ".\bin\Release\Core.dll".
Copying file from "D:\FritzBox\FritzBox\bin\Release\FritzBox.dll" to ".\bin\Release\FritzBox.dll".
Copying file from "D:\FritzBox\FritzBox\bin\Release\Utils.dll" to ".\bin\Release\Utils.dll".
- Copying file from "D:\FritzBox\FritzBox\bin\Release\Common.Utils.dll" to ".\bin\Release\Common.Utils.dll".
Copying file from "D:\FritzBox\FritzBox\bin\Release\Dialogs.dll" to ".\bin\Release\Dialogs.dll".
+ Copying file from "D:\FritzBox\FritzBox\bin\Release\Common.Utils.dll" to ".\bin\Release\Common.Utils.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\DirectShowLib.dll" to ".\bin\Release\DirectShowLib.dll".
Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\BassVisAPI.Net.dll" to ".\bin\Release\BassVisAPI.Net.dll".
@@ -156,8 +156,6 @@
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".
@@ -169,8 +167,8 @@
Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Core.dll" to ".\bin\Release\Core.dll".
Copying file from "D:\FritzBox\FritzBox\bin\Release\FritzBox.dll" to ".\bin\Release\FritzBox.dll".
Copying file from "D:\FritzBox\FritzBox\bin\Release\Utils.dll" to ".\bin\Release\Utils.dll".
- Copying file from "D:\FritzBox\FritzBox\bin\Release\Common.Utils.dll" to ".\bin\Release\Common.Utils.dll".
Copying file from "D:\FritzBox\FritzBox\bin\Release\Dialogs.dll" to ".\bin\Release\Dialogs.dll".
+ Copying file from "D:\FritzBox\FritzBox\bin\Release\Common.Utils.dll" to ".\bin\Release\Common.Utils.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\DirectShowLib.dll" to ".\bin\Release\DirectShowLib.dll".
Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\BassVisAPI.Net.dll" to ".\bin\Release\BassVisAPI.Net.dll".
@@ -197,7 +195,7 @@
0 Warning(s)
0 Error(s)
-Time Elapsed 00:00:02.04
+Time Elapsed 00:00:01.89
Reverting to build 0
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
@@ -300,7 +298,7 @@
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
36 File(s) copied
MpeMaker version: 1.2.1.0
-Build started at 00:03:32
+Build started at 16:16:25
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-02-19 22:31:59 UTC (rev 4461)
+++ trunk/plugins/FritzBox/Docs/Ausstehend.txt 2012-02-26 15:26:52 UTC (rev 4462)
@@ -1,24 +1,14 @@
-Fehler beheben:
-- Problem bei schnell aufeinander folgenden Anrufen
-
-Optimierungen:
-- Einstellungen-Eintr\xE4ge in XML-Datei in Kategorie "FRITZ!Box Manager" zusammenfassen
-
Neue Funktionen/Erweiterungen:
-- Tastenk\xFCrzel-Unterst\xFCtzung f\xFCr Telefonbuch
-- Telefonbuch editierbar machen (f\xFCr FRITZ!Box-Versionen ohne Telefonbuch), ImageURL-Feld hinzuf\xFCgen und nur synchronisieren, wenn im FRITZ!Box-Telefonbuch vorhanden
+- Telefonbuch editierbar machen (f\xFCr FRITZ!Box-Versionen ohne Telefonbuch)
+- Bei Anrufbenachrichtigungen: Auflistung von Kontaktnamen, wenn eine Rufnummer mehrmals im Telefonbuch vorkommt
- Nachrichtenl\xE4nge zur Anzeige hinzuf\xFCgen
- "Nachricht l\xF6schen"-Funktion
- "Nachricht als geh\xF6rt markieren"-Funktion
-- "Anrufen"-Funktion zur Anrufliste hinzuf\xFCgen
- R\xFCckw\xE4rtssuche wieder integrieren
- Wiki-Eintrag
- Skin-Erweiterungen
- Anzahl der neuen Anrufe
- 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
- Klingelton solange wiederholen bis H\xF6rer abgenommen wird
@@ -40,7 +30,7 @@
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 Rinke:
-- Abspielen von Sprachnachrichten nach dem Anklicken im Home-Screen:
+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.
@@ -66,4 +56,10 @@
Nebenstelle in der Anrufliste anzeigen
D3ltoroxp, 04.02.2012, 18:50 Uhr:
-Und noch ein Feature Request, w\xFCrde es gehen, das der Klingelton aufh\xF6rt zu spielen wenn man abnimmt ? Denn wenn ich abnehme und er ist etwas l\xE4nger l\xE4uft er komplett durch, das bisschen bl\xF6d.
\ No newline at end of file
+Und noch ein Feature Request, w\xFCrde es gehen, das der Klingelton aufh\xF6rt zu spielen wenn man abnimmt ? Denn wenn ich abnehme und er ist etwas l\xE4nger l\xE4uft er komplett durch, das bisschen bl\xF6d.
+
+Vasilich, 11.02.2012, 01:24 Uhr:
+MSN in Nachrichtenansicht abschaltbar machen
+
+AlfredENeuma, 11.02.2012, 17:36 Uhr:
+MSN in Anrufliste anzeigen und abschaltbar machen
\ No newline at end of file
Modified: trunk/plugins/FritzBox/Docs/Changes.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Changes.txt 2012-02-19 22:31:59 UTC (rev 4461)
+++ trunk/plugins/FritzBox/Docs/Changes.txt 2012-02-26 15:26:52 UTC (rev 4462)
@@ -1,5 +1,16 @@
-New release 0.4.1.44x:
-Optimization:
+New release 0.4.1.4461:
+New feature:
+- call extension filter
+- option for manual contact image path entry (for FRITZ!Boxes with contact image setting)
+Optimizations:
+- some language file adjustments
+- enhanced connection test in MediaPortal Configuration
+- settings XML file:
+ - consolidated section "FRITZ!Box Manager"
+ - clear entry names
+- call monitor stability improvements
Fixed bug:
+- problem on task queuing
+- notification window is not closed on quick sequent call actions (e. g. incoming FAX messages)
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/EditPhoneBook.Designer.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/EditPhoneBook.Designer.cs 2012-02-19 22:31:59 UTC (rev 4461)
+++ trunk/plugins/FritzBox/FritzBox/EditPhoneBook.Designer.cs 2012-02-26 15:26:52 UTC (rev 4462)
@@ -40,6 +40,7 @@
this.columnPhoneNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.columnShowCallNotification = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.columnRingTonePath = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.ColumnContactImage = 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();
@@ -70,7 +71,8 @@
this.columnPhoneType,
this.columnPhoneNumber,
this.columnShowCallNotification,
- this.columnRingTonePath});
+ this.columnRingTonePath,
+ this.ColumnContactImage});
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)));
@@ -151,6 +153,14 @@
this.columnRingTonePath.Name = "columnRingTonePath";
this.columnRingTonePath.Width = 225;
//
+ // ColumnContactImage
+ //
+ this.ColumnContactImage.HeaderText = "Contact image path";
+ this.ColumnContactImage.MinimumWidth = 150;
+ this.ColumnContactImage.Name = "ColumnContactImage";
+ this.ColumnContactImage.Visible = false;
+ this.ColumnContactImage.Width = 225;
+ //
// pictureBoxCaller
//
this.pictureBoxCaller.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -193,12 +203,13 @@
private System.Windows.Forms.PictureBox pictureBoxCaller;
private System.Windows.Forms.DataGridView dataGridView;
+ private System.Windows.Forms.Label label1;
private System.Windows.Forms.DataGridViewTextBoxColumn columnContactID;
private System.Windows.Forms.DataGridViewTextBoxColumn columnName;
private System.Windows.Forms.DataGridViewTextBoxColumn columnPhoneType;
private System.Windows.Forms.DataGridViewTextBoxColumn columnPhoneNumber;
private System.Windows.Forms.DataGridViewCheckBoxColumn columnShowCallNotification;
private System.Windows.Forms.DataGridViewTextBoxColumn columnRingTonePath;
- private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.DataGridViewTextBoxColumn ColumnContactImage;
}
}
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/EditPhoneBook.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/EditPhoneBook.cs 2012-02-19 22:31:59 UTC (rev 4461)
+++ trunk/plugins/FritzBox/FritzBox/EditPhoneBook.cs 2012-02-26 15:26:52 UTC (rev 4462)
@@ -21,7 +21,7 @@
private void fillTable()
{
- string uniqueID, name, type = String.Empty, number = String.Empty, ringTonePath;
+ string uniqueID, name, type = String.Empty, number = String.Empty, ringTonePath, imageURL;
bool showCallNotification;
phoneBook.LoadPhoneBookFromXMLFile();
@@ -32,6 +32,7 @@
name = phoneBookItem.Name;
showCallNotification = phoneBookItem.ShowCallNotification;
ringTonePath = phoneBookItem.RingTonePath;
+ imageURL = phoneBookItem.ImageURL;
foreach (PhoneNumber phoneNumber in phoneBookItem.PhoneNumbers)
{
@@ -40,7 +41,7 @@
type = phoneNumber.type;
number = phoneNumber.Value;
- dataGridView.Rows.Add(uniqueID, name, type, number, showCallNotification, ringTonePath);
+ dataGridView.Rows.Add(uniqueID, name, type, number, showCallNotification, ringTonePath, imageURL);
}
}
}
@@ -50,6 +51,8 @@
private void EditPhoneBook_Load(object sender, EventArgs e)
{
+ dataGridView.Columns[6].Visible = Settings.ManualContactImagePathEntry;
+
fillTable();
if (dataGridView.Rows.Count > 0)
@@ -58,7 +61,7 @@
dataGridView_SelectionChanged(null, null);
// monitor table changes
- this.dataGridView.SelectionChanged += new System.EventHandler(this.dataGridView_SelectionChanged);
+ dataGridView.SelectionChanged += new EventHandler(dataGridView_SelectionChanged);
dataGridView.CellValueChanged += new DataGridViewCellEventHandler(dataGridView_CellValueChanged);
}
else
@@ -76,7 +79,7 @@
string contactPicturePath = phoneBook.GetContactImagePath(contact);
// show picture
- if (contactPicturePath != String.Empty) pictureBoxCaller.ImageLocation = contactPicturePath;
+ pictureBoxCaller.ImageLocation = contactPicturePath;
}
private void dataGridView_CellValueChanged(object sender, DataGridViewCellEventArgs e)
@@ -108,6 +111,16 @@
}
break;
+ case 6:
+ contact.ImageURL = (string)newValue;
+
+ // update "Image URL" field in all rows
+ for (int i = 0; i < dataGridView.Rows.Count; i++)
+ {
+ dataGridView.Rows[i].Cells[6].Value = phoneBook.Items[dataGridView.Rows[i].Cells[0].Value.ToString()].ImageURL;
+ }
+
+ break;
}
// transfer changed contact to phone book
@@ -121,7 +134,7 @@
phoneBook.SavePhoneBookToXMLFile();
// unregister event monitors
- this.dataGridView.SelectionChanged -= new System.EventHandler(this.dataGridView_SelectionChanged);
+ dataGridView.SelectionChanged -= new EventHandler(dataGridView_SelectionChanged);
dataGridView.CellValueChanged -= new DataGridViewCellEventHandler(dataGridView_CellValueChanged);
}
}
Modified: trunk/plugins/FritzBox/FritzBox/EditPhoneBook.resx
===================================================================
--- trunk/plugins/FritzBox/FritzBox/EditPhoneBook.resx 2012-02-19 22:31:59 UTC (rev 4461)
+++ trunk/plugins/FritzBox/FritzBox/EditPhoneBook.resx 2012-02-26 15:26:52 UTC (rev 4462)
@@ -135,4 +135,7 @@
<metadata name="columnRingTonePath.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
+ <metadata name="ColumnContactImage.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
</root>
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2012-02-19 22:31:59 UTC (rev 4461)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2012-02-26 15:26:52 UTC (rev 4462)
@@ -65,8 +65,9 @@
private readonly List<CallAction> _actionList = new List<CallAction>();
private readonly List<CallAction> _notificationQueue = new List<CallAction>();
private bool _showNotification = true;
- private object _tempNotification;
+ private GUIDialogNotify _tempNotification;
private int notificationCount = 0;
+ private CallAction.CallType lastCallActionType; // necessary to avoid that notification window isn't closed on quick sequent call actions
#endregion Variables
@@ -81,14 +82,15 @@
private void OnStopExternal(Process proc, bool waitForExit)
{
_showNotification = true;
-
_notificationQueue.Clear();
}
private void OnCallAction(CallAction callAction)
{
+ lastCallActionType = callAction.Type;
+
Log.Debug("OnCallAction()");
-
+
callAction.WriteToLog();
if (!_showNotification)
@@ -107,22 +109,21 @@
OnCall(callAction);
break;
case CallAction.CallType.ConnectionStarted:
+ if (!isExtensionEnabled(callAction.Extension))
+ {
+ Log.Info("Extension isn't enabled for notification. If notification window is opened it will be closed");
+ closeNotificationWindow();
+ }
break;
case CallAction.CallType.ConnectionClosed:
if (Settings.CloseNotificationOnConnectionClosed)
{
- Log.Info("\"Auto-close after connection is closed\" setting is enabled. Trying to close active notification");
-
- if (_tempNotification != null)
- {
- MediaPortal.GUI.Library.Action act = new MediaPortal.GUI.Library.Action();
- act.wID = MediaPortal.GUI.Library.Action.ActionType.ACTION_CLOSE_DIALOG;
- GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_NOTIFY).OnAction(act);
- }
+ Log.Info("\"Auto-close after connection is closed\" setting is enabled");
+ closeNotificationWindow();
}
break;
default:
- Log.Error("Incorrect CallAction type");
+ Log.Error("Incorrect call type");
break;
}
}
@@ -198,10 +199,10 @@
switch (callAction.Type)
{
case CallAction.CallType.Incoming:
- showNotification = Settings.ShowNotficationOnIncomingCall;
+ showNotification = Settings.ShowNotificationOnIncomingCall;
break;
case CallAction.CallType.Outgoing:
- showNotification = Settings.ShowNotficationOnOutgoingCall;
+ showNotification = Settings.ShowNotificationOnOutgoingCall && isExtensionEnabled(callAction.Extension);
break;
}
@@ -263,11 +264,6 @@
showNotificationWindow(callAction.Type, strHeading, strImage, strText);
}
}
-
- // update call list and voice box items and refresh GUI
- worker.EnqueueTask(new Task(Task.TaskAction.LoadCallListItems, null));
- worker.EnqueueTask(new Task(Task.TaskAction.LoadVoiceBoxItems, null));
- worker.EnqueueTask(new Task(Task.TaskAction.RefreshView, null));
}
}
@@ -277,7 +273,7 @@
private bool isMSNEnabled(string mSN)
{
- if (!Settings.FilterMSN)
+ if (!Settings.FilterMSNs)
{
Log.Info("MSN filter is disabled");
return true;
@@ -305,6 +301,36 @@
}
}
+ private bool isExtensionEnabled(string extension)
+ {
+ if (!Settings.FilterExtensions)
+ {
+ Log.Info("Extension filter is disabled");
+ return true;
+ }
+ else
+ {
+ if (extension != String.Empty)
+ {
+ if (Settings.ExtensionList.Contains(extension))
+ {
+ Log.Info("Extension is on the filter list");
+ return true;
+ }
+ else
+ {
+ Log.Info("Extension is not on the list. Notification will be automatically closed");
+ return false;
+ }
+ }
+ else
+ {
+ Log.Info("Missing extension. Filtering is disabled");
+ return true;
+ }
+ }
+ }
+
private void showNotificationWindow(CallAction.CallType callType, string strHeading, string strImage, string strText)
{
bool resumePlayer = false;
@@ -348,8 +374,13 @@
else dlgNotification.TimeOut = -1;
_tempNotification = dlgNotification;
- dlgNotification.DoModal(GUIWindowManager.ActiveWindow);
+ if (lastCallActionType != CallAction.CallType.ConnectionClosed) // this check avoids that the notification window isn't closed on quick sequent call actions (e. g. incoming FAX messages)
+ {
+ Log.Debug("Showing notification window");
+ dlgNotification.DoModal(GUIWindowManager.ActiveWindow);
+ }
+
// resume player
if (resumePlayer && g_Player.Playing && g_Player.Paused)
{
@@ -378,7 +409,7 @@
private bool isMovingPicturesOrMPTVSeriesDialogOpened()
{
- if (GUIWindowManager.IsRouted) // check if dialog window is opened
+ if (GUIWindowManager.IsRouted)
{
if (GUIWindowManager.ActiveWindow == 96742 || GUIWindowManager.ActiveWindow == 9811) // 96742 = window ID of "Moving Pictures", 9811 = window ID of "MP-TV Series"
{
@@ -389,6 +420,42 @@
return false;
}
+ private bool isNotificationWindowOpened()
+ {
+ if (GUIWindowManager.IsRouted)
+ {
+ if (GUIWindowManager.ActiveWindowEx == (int)GUIWindow.Window.WINDOW_DIALOG_NOTIFY) return true;
+ }
+
+ return false;
+ }
+
+ private void closeNotificationWindow()
+ {
+ if (_tempNotification != null && isNotificationWindowOpened())
+ {
+ Log.Debug("Closing notification window");
+
+ MediaPortal.GUI.Library.Action act = new MediaPortal.GUI.Library.Action();
+ act.wID = MediaPortal.GUI.Library.Action.ActionType.ACTION_CLOSE_DIALOG;
+
+ _tempNotification.OnAction(act);
+
+ if (!isNotificationWindowOpened()) Log.Debug("Notification window has been closed");
+ else
+ {
+ Log.Debug("Notification couldn't be closed yet. Trying to close it again in one second");
+
+ // set session timer interval and start the timer
+ notificationWindowCloseTimer.Interval = 1000;
+ notificationWindowCloseTimer.AutoReset = false;
+ notificationWindowCloseTimer.Elapsed += OnCloseNotificationWindowTimerEvent;
+ notificationWindowCloseTimer.Start();
+ }
+ }
+ else Log.Debug("Notification window wasn't opened");
+ }
+
#endregion Helper Methods
#endregion CallMonitor
@@ -403,7 +470,7 @@
public void Start()
{
Log.Info("FRITZ!Box Manager {0} plugin is starting", Assembly.GetExecutingAssembly().GetName().Version);
-
+
thePlugin = this;
LocalizeStrings.LoadLocalization();
@@ -439,7 +506,7 @@
if (updateInterval != 0)
{
- updateTimer.Interval = updateInterval * 1000; // interval is in sec
+ updateTimer.Interval = updateInterval * 1000; // interval is in seconds
updateTimer.Elapsed += OnUpdateTimerEvent;
updateTimer.Start();
}
@@ -460,7 +527,7 @@
FritzBoxClient.CallEvent -= OnCallAction;
FritzBoxClient.LogEvent -= OnLogAction;
- FritzBoxClient.ConnectedEvent += OnConnectedAction;
+ FritzBoxClient.ConnectedEvent -= OnConnectedAction;
Utils.OnStartExternal -= OnStartExternal;
Utils.OnStopExternal -= OnStopExternal;
@@ -588,6 +655,8 @@
private static System.Timers.Timer updateTimer = new System.Timers.Timer();
// session timer for login thread
private static System.Timers.Timer sessionTimer = new System.Timers.Timer();
+ // timer to close remaining notification windows
+ private static System.Timers.Timer notificationWindowCloseTimer = new System.Timers.Timer();
// list of call items (callers)
private List<CallItem> callItemList;
// state of facade view
@@ -732,6 +801,11 @@
loadDataInBackground();
}
+ private static void OnCloseNotificationWindowTimerEvent(object source, System.Timers.ElapsedEventArgs e)
+ {
+ thePlugin.closeNotificationWindow();
+ }
+
protected override void OnPageDestroy(int new_windowId)
{
CleanupTempFiles();
@@ -797,7 +871,7 @@
worker.EnqueueTask(new Task(Task.TaskAction.RefreshView, null));
}
}
- else Log.Debug("No voice box items on the FRITZ!Box");
+ else Log.Debug("No voice box item list changes");
}
}
else Log.Debug("No connection to FRITZ!Box. Voice box items couldn't be loaded");
@@ -896,7 +970,7 @@
worker.EnqueueTask(new Task(Task.TaskAction.RefreshView, null));
}
}
- else Log.Debug("No voice box items on the FRITZ!Box");
+ else Log.Debug("No call list changes");
}
}
@@ -1034,7 +1108,7 @@
}
}
- public void updateGUIProperties()
+ public void UpdateGUIProperties()
{
Caller caller = new Caller();
string lastNewCallerName = String.Empty;
@@ -1154,7 +1228,7 @@
facadeView.Add(elem);
}
}
- else Log.Debug("call item list is not initialized");
+ else Log.Debug("Call item list is not initialized");
}
private void showThumbPanel()
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.csproj
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.csproj 2012-02-19 22:31:59 UTC (rev 4461)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.csproj 2012-02-26 15:26:52 UTC (rev 4462)
@@ -69,6 +69,17 @@
<PlatformTarget>AnyCPU</PlatformTarget>
<FileAlignment>4096</FileAlignment>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Configuration|AnyCPU'">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>C:\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <FileAlignment>4096</FileAlignment>
+ <DebugType>Full</DebugType>
+ <PlatformTarget>AnyCPU</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
+ <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="Common.Utils">
<HintPath>C:\Program Files\Team MediaPortal\MediaPortal\Common.Utils.dll</HintPath>
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.csproj.user
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.csproj.user 2012-02-19 22:31:59 UTC (rev 4461)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.csproj.user 2012-02-26 15:26:52 UTC (rev 4462)
@@ -14,4 +14,12 @@
<StartProgram>C:\Program Files\Team MediaPortal\MediaPortal\MediaPortal.exe</StartProgram>
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Configuration|AnyCPU'">
+ <StartProgram>C:\Program Files\Team MediaPortal\MediaPortal\Configuration.exe</StartProgram>
+ <StartAction>Project</StartAction>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+ <StartAction>Program</StartAction>
+ <StartProgram>C:\Program Files\Team MediaPortal\MediaPortal\MediaPortal.exe</StartProgram>
+ </PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2012-02-19 22:31:59 UTC (rev 4461)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2012-02-26 15:26:52 UTC (rev 4462)
@@ -40,6 +40,14 @@
this.buttonEditPhoneBook = new System.Windows.Forms.Button();
this.tabPageCallNotification = new System.Windows.Forms.TabPage();
this.groupBoxNotification = new MediaPortal.UserInterface.Controls.MPGroupBox();
+ this.buttonExtensionsRemove = new MediaPortal.UserInterface.Controls.MPButton();
+ this.checkBoxFilterExtensions = new MediaPortal.UserInterface.Controls.MPCheckBox();
+ this.buttonExtensionsAdd = new MediaPortal.UserInterface.Controls.MPButton();
+ this.comboBoxExtensions = new MediaPortal.UserInterface.Controls.MPComboBox();
+ this.checkBoxShowPhoneTypeOnNotification = new MediaPortal.UserInterface.Controls.MPCheckBox();
+ this.checkBoxShowUnknownCaller = new MediaPortal.UserInterface.Controls.MPCheckBox();
+ this.checkBoxUsePhonebook = new MediaPortal.UserInterface.Controls.MPCheckBox();
+ this.checkBoxShowPhoneNumberOnNotification = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.checkBoxShowNotificationOnOutgoingCall = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.checkBoxCloseOnConnectionClosed = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.checkBoxShowNotificationOnIncomingCall = new MediaPortal.UserInterface.Controls.MPCheckBox();
@@ -77,10 +85,7 @@
this.updateInterval = new MediaPortal.UserInterface.Controls.MPNumericUpDown();
this.checkBoxExtensiveLogging = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.label4 = new System.Windows.Forms.Label();
- this.checkBoxShowPhoneTypeOnNotification = new MediaPortal.UserInterface.Controls.MPCheckBox();
- this.checkBoxShowUnknownCaller = new MediaPortal.UserInterface.Controls.MPCheckBox();
- this.checkBoxUsePhonebook = new MediaPortal.UserInterface.Controls.MPCheckBox();
- this.checkBoxShowPhoneNumberOnNotification = new MediaPortal.UserInterface.Controls.MPCheckBox();
+ this.checkBoxManualContactImagePathEntry = new System.Windows.Forms.CheckBox();
this.tabPageDiagnostics.SuspendLayout();
this.tabPagePhoneBook.SuspendLayout();
this.tabPageCallNotification.SuspendLayout();
@@ -178,6 +183,7 @@
//
// tabPagePhoneBook
//
+ this.tabPagePhoneBook.Controls.Add(this.checkBoxManualContactImagePathEntry);
this.tabPagePhoneBook.Controls.Add(this.buttonEditPhoneBook);
this.tabPagePhoneBook.Location = new System.Drawing.Point(4, 22);
this.tabPagePhoneBook.Name = "tabPagePhoneBook";
@@ -189,7 +195,7 @@
//
// buttonEditPhoneBook
//
- this.buttonEditPhoneBook.Location = new System.Drawing.Point(228, 64);
+ this.buttonEditPhoneBook.Location = new System.Drawing.Point(221, 83);
this.buttonEditPhoneBook.Name = "buttonEditPhoneBook";
this.buttonEditPhoneBook.Size = new System.Drawing.Size(117, 46);
this.buttonEditPhoneBook.TabIndex = 0;
@@ -213,6 +219,10 @@
//
this.groupBoxNotification.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
+ this.groupBoxNotification.Controls.Add(this.buttonExtensionsRemove);
+ this.groupBoxNotification.Controls.Add(this.checkBoxFilterExtensions);
+ this.groupBoxNotification.Controls.Add(this.buttonExtensionsAdd);
+ this.groupBoxNotification.Controls.Add(this.comboBoxExtensions);
this.groupBoxNotification.Controls.Add(this.checkBoxShowPhoneTypeOnNotification);
this.groupBoxNotification.Controls.Add(this.checkBoxShowUnknownCaller);
this.groupBoxNotification.Controls.Add(this.checkBoxUsePhonebook);
@@ -231,27 +241,119 @@
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, 159);
+ this.groupBoxNotification.Size = new System.Drawing.Size(559, 242);
this.groupBoxNotification.TabIndex = 0;
this.groupBoxNotification.TabStop = false;
this.groupBoxNotification.Text = "Notification settings";
//
+ // buttonExtensionsRemove
+ //
+ this.buttonExtensionsRemove.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.buttonExtensionsRemove.Location = new System.Drawing.Point(335, 209);
+ this.buttonExtensionsRemove.Name = "buttonExtensionsRemove";
+ this.buttonExtensionsRemove.Size = new System.Drawing.Size(63, 21);
+ this.buttonExtensionsRemove.TabIndex = 22;
+ this.buttonExtensionsRemove.Text = "Remove";
+ this.buttonExtensionsRemove.UseVisualStyleBackColor = true;
+ this.buttonExtensionsRemove.Click += new System.EventHandler(this.buttonExtensionsRemove_Click);
+ //
+ // checkBoxFilterExtensions
+ //
+ this.checkBoxFilterExtensions.AutoSize = true;
+ this.checkBoxFilterExtensions.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.checkBoxFilterExtensions.Location = new System.Drawing.Point(253, 161);
+ this.checkBoxFilterExtensions.Name = "checkBoxFilterExtensions";
+ this.checkBoxFilterExtensions.Size = new System.Drawing.Size(305, 17);
+ this.checkBoxFilterExtensions.TabIndex = 19;
+ this.checkBoxFilterExtensions.Text = "Show outgoing call notification only for following extensions:";
+ this.checkBoxFilterExtensions.UseVisualStyleBackColor = true;
+ this.checkBoxFilterExtensions.CheckedChanged += new System.EventHandler(this.checkBoxFilterExtensions_CheckedChanged);
+ //
+ // buttonExtensionsAdd
+ //
+ this.buttonExtensionsAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.buttonExtensionsAdd.Location = new System.Drawing.Point(251, 209);
+ this.buttonExtensionsAdd.Name = "buttonExtensionsAdd";
+ this.buttonExtensionsAdd.Size = new System.Drawing.Size(63, 21);
+ this.buttonExtensionsAdd.TabIndex = 21;
+ this.buttonExtensionsAdd.Text = "Add";
+ this.buttonExtensionsAdd.UseVisualStyleBackColor = true;
+ this.buttonExtensionsAdd.Click += new System.EventHandler(this.buttonExtensionsAdd_Click);
+ //
+ // comboBoxExtensions
+ //
+ this.comboBoxExtensions.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.comboBoxExtensions.BorderColor = System.Drawing.Color.Empty;
+ this.comboBoxExtensions.FormattingEnabled = true;
+ this.comboBoxExtensions.Location = new System.Drawing.Point(253, 180);
+ this.comboBoxExtensions.MaxLength = 2;
+ this.comboBoxExtensions.Name = "comboBoxExtensions";
+ this.comboBoxExtensions.Size = new System.Drawing.Size(51, 21);
+ this.comboBoxExtensions.Sorted = true;
+ this.comboBoxExtensions.TabIndex = 20;
+ //
+ // checkBoxShowPhoneTypeOnNotification
+ //
+ this.checkBoxShowPhoneTypeOnNotification.AutoSize = true;
+ this.checkBoxShowPhoneTypeOnNotification.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.checkBoxShowPhoneTypeOnNotification.Location = new System.Drawing.Point(215, 136);
+ this.checkBoxShowPhoneTypeOnNotification.Name = "checkBoxShowPhoneTypeOnNotification";
+ this.checkBoxShowPhoneTypeOnNotification.Size = new System.Drawing.Size(107, 17);
+ this.checkBoxShowPhoneTypeOnNotification.TabIndex = 18;
+ this.checkBoxShowPhoneTypeOnNotification.Text = "Show phone type";
+ this.checkBoxShowPhoneTypeOnNotification.UseVisualStyleBackColor = true;
+ //
+ // checkBoxShowUnknownCaller
+ //
+ this.checkBoxShowUnknownCaller.AutoSize = true;
+ this.checkBoxShowUnknownCaller.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.checkBoxShowUnknownCaller.Location = new System.Drawing.Point(32, 136);
+ this.checkBoxShowUnknownCaller.Name = "checkBoxShowUnknownCaller";
+ this.checkBoxShowUnknownCaller.Size = new System.Drawing.Size(126, 17);
+ this.checkBoxShowUnknownCaller.TabIndex = 16;
+ this.checkBoxShowUnknownCaller.Text = "Show unknown caller";
+ this.checkBoxShowUnknownCaller.UseVisualStyleBackColor = true;
+ //
+ // checkBoxUsePhonebook
+ //
+ this.checkBoxUsePhonebook.AutoSize = true;
+ this.checkBoxUsePhonebook.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.checkBoxUsePhonebook.Location = new System.Drawing.Point(15, 115);
+ this.checkBoxUsePhonebook.Name = "checkBoxUsePhonebook";
+ this.checkBoxUsePhonebook.Size = new System.Drawing.Size(103, 17);
+ this.checkBoxUsePhonebook.TabIndex = 15;
+ this.checkBoxUsePhonebook.Text = "Use phone book";
+ this.checkBoxUsePhonebook.UseVisualStyleBackColor = true;
+ this.checkBoxUsePhonebook.CheckedChanged += new System.EventHandler(this.checkBoxUsePhonebook_CheckedChanged);
+ //
+ // checkBoxShowPhoneNumberOnNotification
+ //
+ this.checkBoxShowPhoneNumberOnNotification.AutoSize = true;
+ this.checkBoxShowPhoneNumberOnNotification.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.checkBoxShowPhoneNumberOnNotification.Location = new System.Drawing.Point(368, 136);
+ this.checkBoxShowPhoneNumberOnNotification.Name = "checkBoxShowPhoneNumberOnNotification";
+ this.checkBoxShowPhoneNumberOnNotification.Size = new System.Drawing.Size(122, 17);
+ this.checkBoxShowPhoneNumberOnNotification.TabIndex = 17;
+ this.checkBoxShowPhoneNumberOnNotification.Text = "Show phone number";
+ this.checkBoxShowPhoneNumberOnNotification.UseVisualStyleBackColor = true;
+ //
// checkBoxShowNotificationOnOutgoingCall
//
this.checkBoxShowNotificationOnOutgoingCall.AutoSize = true;
this.checkBoxShowNotificationOnOutgoingCall.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.checkBoxShowNotificationOnOutgoingCall.Location = new System.Drawing.Point(207, 20);
+ this.checkBoxShowNotificationOnOutgoingCall.Location = new System.Drawing.Point(215, 20);
this.checkBoxShowNotificationOnOutgoingCall.Name = "checkBoxShowNotificationOnOutgoingCall";
- this.checkBoxShowNotificationOnOutgoingCall.Size = new System.Drawing.Size(183, 17);
+ this.checkBoxShowNotificationOnOutgoingCall.Size = new System.Drawing.Size(129, 17);
this.checkBoxShowNotificationOnOutgoingCall.TabIndex = 13;
- this.checkBoxShowNotificationOnOutgoingCall.Text = "Show notification on outgoing call";
+ this.checkBoxShowNotificationOnOutgoingCall.Text = "Show on outgoing call";
this.checkBoxShowNotificationOnOutgoingCall.UseVisualStyleBackColor = true;
//
// checkBoxCloseOnConnectionClosed
//
this.checkBoxCloseOnConnectionClosed.AutoSize = true;
this.checkBoxCloseOnConnectionClosed.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.checkBoxCloseOnConnectionClosed.Location = new System.Drawing.Point(7, 70);
+ this.checkBoxCloseOnConnectionClosed.Location = new System.Drawing.Point(15, 70);
this.checkBoxCloseOnConnectionClosed.Name = "checkBoxCloseOnConnectionClosed";
this.checkBoxCloseOnConnectionClosed.Size = new System.Drawing.Size(198, 17);
this.checkBoxCloseOnConnectionClosed.TabIndex = 9;
@@ -263,17 +365,17 @@
//
this.checkBoxShowNotificationOnIncomingCall.AutoSize = true;
this.checkBoxShowNotificationOnIncomingCall.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.checkBoxShowNotificationOnIncomingCall.Location = new System.Drawing.Point(7, 20);
+ this.checkBoxShowNotificationOnIncomingCall.Location = new System.Drawing.Point(15, 20);
this.checkBoxShowNotificationOnIncomingCall.Name = "checkBoxShowNotificationOnIncomingCall";
- this.checkBoxShowNotificationOnIncomingCall.Size = new System.Drawing.Size(184, 17);
+ this.checkBoxShowNotificationOnIncomingCall.Size = new System.Drawing.Size(130, 17);
this.checkBoxShowNotificationOnIncomingCall.TabIndex = 12;
- this.checkBoxShowNotificationOnIncomingCall.Text = "Show notification on incoming call";
+ this.checkBoxShowNotificationOnIncomingCall.Text = "Show on incoming call";
this.checkBoxShowNotificationOnIncomingCall.UseVisualStyleBackColor = true;
//
// lblMaxNotifies
//
this.lblMaxNotifies.AutoSize = true;
- this.lblMaxNotifies.Location = new System.Drawing.Point(22, 93);
+ this.lblMaxNotifies.Location = new System.Drawing.Point(30, 93);
this.lblMaxNotifies.Name = "lblMaxNotifies";
this.lblMaxNotifies.Size = new System.Drawing.Size(90, 13);
this.lblMaxNotifies.TabIndex = 8;
@@ -281,7 +383,7 @@
//
// numericUpDownMaxNotifies
//
- this.numericUpDownMaxNotifies.Location = new System.Drawing.Point(207, 89);
+ this.numericUpDownMaxNotifies.Location = new System.Drawing.Point(215, 89);
this.numericUpDownMaxNotifies.Maximum = new decimal(new int[] {
20,
0,
@@ -305,7 +407,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, 91);
+ this.buttonMSNsRemove.Location = new System.Drawing.Point(97, 209);
this.buttonMSNsRemove.Name = "buttonMSNsRemove";
this.buttonMSNsRemove.Size = new System.Drawing.Size(63, 21);
this.buttonMSNsRemove.TabIndex = 5;
@@ -317,18 +419,19 @@
//
this.checkBoxFilterMSNs.AutoSize = true;
this.checkBoxFilterMSNs.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.checkBoxFilterMSNs.Location = new System.Drawing.Point(303, 43);
+ this.checkBoxFilterMSNs....
[truncated message content] |
