[Mp-plugins-svn] SF.net SVN: mp-plugins:[4371] trunk/plugins/FritzBox

[<hor...@us...>]

Revision: 4371
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4371&view=rev
Author:   horned-reaper
Date:     2011-12-10 09:09:06 +0000 (Sat, 10 Dec 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat
    trunk/plugins/FritzBox/Build/Build.log
    trunk/plugins/FritzBox/Docs/Vorgehensweise beim Update.txt
    trunk/plugins/FritzBox/FritzBox/FritzBox.cs
    trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
    trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
    trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.resx
    trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/PhoneBook.cs
    trunk/plugins/FritzBox/FritzBox/FritzManager/PhonebookItem.cs
    trunk/plugins/FritzBox/FritzBox/Properties/AssemblyInfo.cs
    trunk/plugins/FritzBox/FritzBox/Settings.cs
    trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
    trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.pdb
    trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
    trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
    trunk/plugins/FritzBox/FritzBox/obj/Debug/GenerateResource-ResGen.read.1.tlog
    trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.FileListAbsolute.txt
    trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.GenerateResource.Cache
    trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
    trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb
    trunk/plugins/FritzBox/FritzBox/obj/Release/ResolveAssemblyReference.cache
    trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
    trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBox.dll
    trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBox.pdb
    trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.exe
    trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.pdb
    trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
    trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
    trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe
    trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
    trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/ResolveAssemblyReference.cache
    trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
    trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
    trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/ResolveAssemblyReference.cache
    trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBox.dll
    trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBox.pdb
    trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.exe
    trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.pdb
    trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
    trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
    trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe
    trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
    trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
    trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb

Added Paths:
-----------
    trunk/plugins/FritzBox/FritzBox/bin/Release/AxInterop.WMPLib.dll
    trunk/plugins/FritzBox/FritzBox/bin/Release/Bass.Net.dll
    trunk/plugins/FritzBox/FritzBox/bin/Release/BassRegistration.dll
    trunk/plugins/FritzBox/FritzBox/bin/Release/BassVisAPI.Net.dll
    trunk/plugins/FritzBox/FritzBox/bin/Release/Common.Utils.dll
    trunk/plugins/FritzBox/FritzBox/bin/Release/Core.dll
    trunk/plugins/FritzBox/FritzBox/bin/Release/Dialogs.dll
    trunk/plugins/FritzBox/FritzBox/bin/Release/DirectShowLib.dll
    trunk/plugins/FritzBox/FritzBox/bin/Release/Interop.SHDocVw.dll
    trunk/plugins/FritzBox/FritzBox/bin/Release/Interop.WMPLib.dll
    trunk/plugins/FritzBox/FritzBox/bin/Release/Ionic.Zip.dll
    trunk/plugins/FritzBox/FritzBox/bin/Release/MediaPortal.Support.dll
    trunk/plugins/FritzBox/FritzBox/bin/Release/Utils.dll
    trunk/plugins/FritzBox/FritzBox/bin/Release/edtftpnet-1.2.2.dll
    trunk/plugins/FritzBox/FritzBox/bin/Release/log4net.dll
    trunk/plugins/FritzBox/FritzBox/bin/Release/taglib-sharp.dll
    trunk/plugins/FritzBox/FritzBox/obj/Debug/ResolveAssemblyReference.cache
    trunk/plugins/FritzBox/releases/FritzBox_v0.3.5.4370.mpe1
    trunk/plugins/FritzBox/releases/update.xml

Removed Paths:
-------------
    trunk/plugins/FritzBox/MpeRelease/FritzBox.mpe1
    trunk/plugins/FritzBox/MpeRelease/update.xml

Modified: trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat
===================================================================
--- trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat	2011-12-09 13:30:38 UTC (rev 4370)
+++ trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat	2011-12-10 09:09:06 UTC (rev 4371)
@@ -1,5 +1,8 @@
 @echo off
 
+D:
+cd \FritzBox\Build
+
 REM Select program path based on current machine environment
 set ProgramDir=%ProgramFiles%
 if not "%ProgramFiles(x86)%".=="". set ProgramDir=%ProgramFiles(x86)%
@@ -49,5 +52,5 @@
 
 echo.
 echo Move installer and update.xml files to the releases folder
-move "..\MpeRelease\FritzBox.mpe1" "..\releases\FritzBox_v%Version%.mpe1" /Y
-move "..\MpeRelease\update.xml" "..\releases\update.xml" /Y
+move /Y "..\MpeRelease\FritzBox.mpe1" "..\releases\FritzBox_v%Version%.mpe1"
+move /Y "..\MpeRelease\update.xml" "..\releases\update.xml"

Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log	2011-12-09 13:30:38 UTC (rev 4370)
+++ trunk/plugins/FritzBox/Build/Build.log	2011-12-10 09:09:06 UTC (rev 4371)
@@ -1,11 +1,16 @@
  
 Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4366
+SVN Version: 4370
+Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
+Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
+Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs
+Updating: D:\FritzBox\Tools\FritzBoxConfigTester\Properties\AssemblyInfo.cs
+Updating: D:\FritzBox\Tools\FritzBoxDebugger\Properties\AssemblyInfo.cs
 Microsoft (R) Build Engine Version 3.5.30729.1
 [Microsoft .NET Framework, Version 2.0.50727.3625]
 Copyright (C) Microsoft Corporation 2007. All rights reserved.
 
-Build started 09.12.2011 00:23:17.
+Build started 10.12.2011 09:59:09.
 Project "D:\FritzBox\FritzBox.sln" on node 0 (Rebuild target(s)).
   Building solution configuration "Release|Mixed Platforms".
 Project "D:\FritzBox\FritzBox.sln" (1) is building "D:\FritzBox\FritzBox\FritzBox.csproj" (2) on node 0 (Rebuild target(s)).
@@ -13,14 +18,53 @@
 CoreClean:
   Deleting file "D:\FritzBox\FritzBox\bin\Release\FritzBox.dll".
   Deleting file "D:\FritzBox\FritzBox\bin\Release\FritzBox.pdb".
+  Deleting file "D:\FritzBox\FritzBox\bin\Release\Common.Utils.dll".
+  Deleting file "D:\FritzBox\FritzBox\bin\Release\Core.dll".
+  Deleting file "D:\FritzBox\FritzBox\bin\Release\Dialogs.dll".
+  Deleting file "D:\FritzBox\FritzBox\bin\Release\Utils.dll".
+  Deleting file "D:\FritzBox\FritzBox\bin\Release\AxInterop.WMPLib.dll".
+  Deleting file "D:\FritzBox\FritzBox\bin\Release\Ionic.Zip.dll".
+  Deleting file "D:\FritzBox\FritzBox\bin\Release\log4net.dll".
+  Deleting file "D:\FritzBox\FritzBox\bin\Release\DirectShowLib.dll".
+  Deleting file "D:\FritzBox\FritzBox\bin\Release\edtftpnet-1.2.2.dll".
+  Deleting file "D:\FritzBox\FritzBox\bin\Release\Interop.WMPLib.dll".
+  Deleting file "D:\FritzBox\FritzBox\bin\Release\taglib-sharp.dll".
+  Deleting file "D:\FritzBox\FritzBox\bin\Release\Interop.SHDocVw.dll".
+  Deleting file "D:\FritzBox\FritzBox\bin\Release\BassRegistration.dll".
+  Deleting file "D:\FritzBox\FritzBox\bin\Release\Bass.Net.dll".
+  Deleting file "D:\FritzBox\FritzBox\bin\Release\BassVisAPI.Net.dll".
+  Deleting file "D:\FritzBox\FritzBox\bin\Release\MediaPortal.Support.dll".
   Deleting file "D:\FritzBox\FritzBox\obj\Release\ResolveAssemblyReference.cache".
   Deleting file "D:\FritzBox\FritzBox\obj\Release\FritzBox.Properties.Resources.resources".
   Deleting file "D:\FritzBox\FritzBox\obj\Release\FritzBox.FritzBoxConfig.resources".
   Deleting file "D:\FritzBox\FritzBox\obj\Release\FritzBox.csproj.GenerateResource.Cache".
+  Deleting file "D:\FritzBox\FritzBox\obj\Release\FritzBox.dll".
   Deleting file "D:\FritzBox\FritzBox\obj\Release\FritzBox.pdb".
+EntityClean:
+  Successfully cleaned the output for 0 EDMX files.
+EntityDeploy:
+  Processing 0 EDMX files.
+  Finished processing 0 EDMX files.
 CoreResGen:
   Processing resource file "Properties\Resources.resx" into "obj\Release\FritzBox.Properties.Resources.resources".
   Processing resource file "FritzBoxConfig.resx" into "obj\Release\FritzBox.FritzBoxConfig.resources".
+_CopyFilesMarkedCopyLocal:
+  Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Common.Utils.dll" to "bin\Release\Common.Utils.dll".
+  Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Core.dll" to "bin\Release\Core.dll".
+  Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" to "bin\Release\Dialogs.dll".
+  Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Utils.dll" to "bin\Release\Utils.dll".
+  Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\AxInterop.WMPLib.dll" to "bin\Release\AxInterop.WMPLib.dll".
+  Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Ionic.Zip.dll" to "bin\Release\Ionic.Zip.dll".
+  Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\log4net.dll" to "bin\Release\log4net.dll".
+  Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\DirectShowLib.dll" to "bin\Release\DirectShowLib.dll".
+  Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\edtftpnet-1.2.2.dll" to "bin\Release\edtftpnet-1.2.2.dll".
+  Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Interop.WMPLib.dll" to "bin\Release\Interop.WMPLib.dll".
+  Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\taglib-sharp.dll" to "bin\Release\taglib-sharp.dll".
+  Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Interop.SHDocVw.dll" to "bin\Release\Interop.SHDocVw.dll".
+  Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\BassRegistration.dll" to "bin\Release\BassRegistration.dll".
+  Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Bass.Net.dll" to "bin\Release\Bass.Net.dll".
+  Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\BassVisAPI.Net.dll" to "bin\Release\BassVisAPI.Net.dll".
+  Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\MediaPortal.Support.dll" to "bin\Release\MediaPortal.Support.dll".
 CopyFilesToOutputDirectory:
   Copying file from "obj\Release\FritzBox.dll" to "bin\Release\FritzBox.dll".
   FritzBox -> D:\FritzBox\FritzBox\bin\Release\FritzBox.dll
@@ -99,7 +143,7 @@
     2 Warning(s)
     0 Error(s)
 
-Time Elapsed 00:00:02.19
+Time Elapsed 00:00:02.17
 Reverting to build 0
 Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
 Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
@@ -184,7 +228,7 @@
 ..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
 36 File(s) copied
 MpeMaker version: 1.2.1.0
-Build started at 00:23:22
+Build started at 09:59:13
 Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
 Output: "..\MpeRelease\FritzBox.mpe1"
 Writing UpdateXML to "update.xml"

Modified: trunk/plugins/FritzBox/Docs/Vorgehensweise beim Update.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Vorgehensweise beim Update.txt	2011-12-09 13:30:38 UTC (rev 4370)
+++ trunk/plugins/FritzBox/Docs/Vorgehensweise beim Update.txt	2011-12-10 09:09:06 UTC (rev 4371)
@@ -1,12 +1,12 @@
-1. \xC4nderungen in Visual Studio vornehmen (inklusive Build)
-2. SVN Commit ausf\xFChren
-3. Build.bat ausf\xFChren
-4. Pr\xFCfen, ob Installer-Datei mit der korrekten Versionsnummer angelegt wurde. Beispiel:
+1. \xC4nderungen in Visual Studio vornehmen
+2. Build.bat ausf\xFChren
+3. Pr\xFCfen, ob Installer-Datei mit der korrekten Versionsnummer angelegt wurde. Beispiel:
   - OK: FritzBox_v0.3.5.4364.mpe1
   - Falsch: FritzBox_v0.3.5.0.mpe1
-5. Wenn falsch, dann Installer-Datei l\xF6schen und SVN update ausf\xFChren und Build.bat erneut ausf\xFChren
-6. \xC4nderugnen MediaPortal-Webseite hochladen
+4. Wenn falsch, dann Installer-Datei l\xF6schen, SVN update ausf\xFChren und Build.bat erneut ausf\xFChren
+5. \xC4nderungen auf MediaPortal-Webseite hochladen
   - Versionsnummer
   - Change-Log-Eintrag
   - neue Installer-Datei
-  - neue update.xml-Datei
\ No newline at end of file
+  - neue update.xml-Datei
+6. SVN Commit ausf\xFChren
\ No newline at end of file

Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs	2011-12-09 13:30:38 UTC (rev 4370)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs	2011-12-10 09:09:06 UTC (rev 4371)
@@ -268,9 +268,10 @@
             // if notifies are disabled for this call, stop here
             if (!IsCallerEnabled(callAction.Caller)) return;
 
+            // play sound
             if (callAction.Type == CallAction.CallType.Incoming && Settings.IncomingSound != null && Settings.IncomingSound.Length > 0) Utils.PlaySound(Settings.IncomingSound, false, true);
 
-            ShowNotify(strHeading, strImage, strText);
+            ShowNotify(callAction.Type, strHeading, strImage, strText);
         }
 
         #endregion
@@ -350,17 +351,32 @@
             else return false;
         }
 
-        private void ShowNotify(string strHeading, string strImage, string strText)
+        private void ShowNotify(CallAction.CallType callType, string strHeading, string strImage, string strText)
         {
             bool resumePlayer = false;
 
             if (notifyCount >= Settings.MaxNotifies) return;
 
             // pause player
-            if (g_Player.Playing && !g_Player.Paused && Settings.StopMedia)
+            if (g_Player.Playing && !g_Player.Paused)
             {
-                g_Player.Pause();
-                resumePlayer = true;
+                switch (callType)
+                {
+                    case CallAction.CallType.Incoming:
+                        if (Settings.PauseMediaOnIncomingCall)
+                        {
+                            g_Player.Pause();
+                            resumePlayer = true;
+                        }
+                        break;
+                    case CallAction.CallType.Outgoing:
+                        if (Settings.PauseMediaOnOutgoingCall)
+                        {
+                            g_Player.Pause();
+                            resumePlayer = true;
+                        }
+                        break;
+                }
             }
 
             // show dialog
@@ -379,9 +395,21 @@
             dlgNotify.DoModal(GUIWindowManager.ActiveWindow);
 
             // resume player
-            if (resumePlayer && g_Player.Playing && g_Player.Paused && Settings.StopMedia && Settings.ResumeMedia) g_Player.Pause();
+            if (resumePlayer && g_Player.Playing && g_Player.Paused)
+            {
+                switch (callType)
+                {
+                    case CallAction.CallType.Incoming:
+                        if (Settings.PauseMediaOnIncomingCall && Settings.ResumeMediaOnIncomingCall) g_Player.Pause();
+                        break;
+                    case CallAction.CallType.Outgoing:
+                        if (Settings.PauseMediaOnOutgoingCall && Settings.ResumeMediaOnOutgoingCall) g_Player.Pause();
+                        break;
+                }
+            }
 
             _tempNotify = null;
+
             if (_actionList.Count > 0)
             {
                 CallAction tmpAction = _actionList[0];
@@ -992,6 +1020,7 @@
         private string lookupCaller(string caller)
         {
             if (phoneBook.Contains(caller)) caller = phoneBook[caller].name;
+
             if (caller == "" || caller == null) caller = GUILocalizeStrings.Get(3); // 3 = Unknown
 
             return caller;

Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs	2011-12-09 13:30:38 UTC (rev 4370)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs	2011-12-10 09:09:06 UTC (rev 4371)
@@ -60,10 +60,12 @@
             this.numericUpDownTimeout = new MediaPortal.UserInterface.Controls.MPNumericUpDown();
             this.checkBoxCloseOnTimout = new MediaPortal.UserInterface.Controls.MPCheckBox();
             this.groupBoxMedia = new MediaPortal.UserInterface.Controls.MPGroupBox();
+            this.checkBoxResumeMediaOnOutgoingCall = new MediaPortal.UserInterface.Controls.MPCheckBox();
+            this.checkBoxPauseMediaOnOutgoingCall = new MediaPortal.UserInterface.Controls.MPCheckBox();
             this.mpLabel5 = new MediaPortal.UserInterface.Controls.MPLabel();
             this.mpIncomingSoundTextBox = new MediaPortal.UserInterface.Controls.MPTextBox();
-            this.checkBoxResumeMedia = new MediaPortal.UserInterface.Controls.MPCheckBox();
-            this.checkBoxStopMediaOnIncomingCall = new MediaPortal.UserInterface.Controls.MPCheckBox();
+            this.checkBoxResumeMediaOnIncomingCall = new MediaPortal.UserInterface.Controls.MPCheckBox();
+            this.checkBoxPauseMediaOnIncomingCall = new MediaPortal.UserInterface.Controls.MPCheckBox();
             this.tabPhonebook = new System.Windows.Forms.TabPage();
             this.buttonRemoveAll = new MediaPortal.UserInterface.Controls.MPButton();
             this.pictureBoxCaller = new System.Windows.Forms.PictureBox();
@@ -279,7 +281,7 @@
             this.groupBoxPhonebook.Controls.Add(this.checkBoxShowUnknownCaller);
             this.groupBoxPhonebook.Controls.Add(this.checkBoxUsePhonebook);
             this.groupBoxPhonebook.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.groupBoxPhonebook.Location = new System.Drawing.Point(6, 208);
+            this.groupBoxPhonebook.Location = new System.Drawing.Point(6, 242);
             this.groupBoxPhonebook.Name = "groupBoxPhonebook";
             this.groupBoxPhonebook.Size = new System.Drawing.Size(177, 95);
             this.groupBoxPhonebook.TabIndex = 2;
@@ -478,22 +480,46 @@
             // 
             this.groupBoxMedia.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+            this.groupBoxMedia.Controls.Add(this.checkBoxResumeMediaOnOutgoingCall);
+            this.groupBoxMedia.Controls.Add(this.checkBoxPauseMediaOnOutgoingCall);
             this.groupBoxMedia.Controls.Add(this.mpLabel5);
             this.groupBoxMedia.Controls.Add(this.mpIncomingSoundTextBox);
-            this.groupBoxMedia.Controls.Add(this.checkBoxResumeMedia);
-            this.groupBoxMedia.Controls.Add(this.checkBoxStopMediaOnIncomingCall);
+            this.groupBoxMedia.Controls.Add(this.checkBoxResumeMediaOnIncomingCall);
+            this.groupBoxMedia.Controls.Add(this.checkBoxPauseMediaOnIncomingCall);
             this.groupBoxMedia.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
             this.groupBoxMedia.Location = new System.Drawing.Point(6, 134);
             this.groupBoxMedia.Name = "groupBoxMedia";
-            this.groupBoxMedia.Size = new System.Drawing.Size(561, 66);
+            this.groupBoxMedia.Size = new System.Drawing.Size(561, 87);
             this.groupBoxMedia.TabIndex = 1;
             this.groupBoxMedia.TabStop = false;
             this.groupBoxMedia.Text = "Media settings";
             // 
+            // checkBoxResumeMediaOnOutgoingCall
+            // 
+            this.checkBoxResumeMediaOnOutgoingCall.AutoSize = true;
+            this.checkBoxResumeMediaOnOutgoingCall.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.checkBoxResumeMediaOnOutgoingCall.Location = new System.Drawing.Point(391, 40);
+            this.checkBoxResumeMediaOnOutgoingCall.Name = "checkBoxResumeMediaOnOutgoingCall";
+            this.checkBoxResumeMediaOnOutgoingCall.Size = new System.Drawing.Size(162, 17);
+            this.checkBoxResumeMediaOnOutgoingCall.TabIndex = 11;
+            this.checkBoxResumeMediaOnOutgoingCall.Text = "Auto-resume on closing notify";
+            this.checkBoxResumeMediaOnOutgoingCall.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxPauseMediaOnOutgoingCall
+            // 
+            this.checkBoxPauseMediaOnOutgoingCall.AutoSize = true;
+            this.checkBoxPauseMediaOnOutgoingCall.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.checkBoxPauseMediaOnOutgoingCall.Location = new System.Drawing.Point(373, 20);
+            this.checkBoxPauseMediaOnOutgoingCall.Name = "checkBoxPauseMediaOnOutgoingCall";
+            this.checkBoxPauseMediaOnOutgoingCall.Size = new System.Drawing.Size(132, 17);
+            this.checkBoxPauseMediaOnOutgoingCall.TabIndex = 10;
+            this.checkBoxPauseMediaOnOutgoingCall.Text = "Pause on outgoing call";
+            this.checkBoxPauseMediaOnOutgoingCall.UseVisualStyleBackColor = true;
+            // 
             // mpLabel5
             // 
             this.mpLabel5.AutoSize = true;
-            this.mpLabel5.Location = new System.Drawing.Point(193, 24);
+            this.mpLabel5.Location = new System.Drawing.Point(3, 63);
             this.mpLabel5.Name = "mpLabel5";
             this.mpLabel5.Size = new System.Drawing.Size(104, 13);
             this.mpLabel5.TabIndex = 9;
@@ -504,33 +530,33 @@
             this.mpIncomingSoundTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.mpIncomingSoundTextBox.BorderColor = System.Drawing.Color.Empty;
-            this.mpIncomingSoundTextBox.Location = new System.Drawing.Point(303, 20);
+            this.mpIncomingSoundTextBox.Location = new System.Drawing.Point(113, 59);
             this.mpIncomingSoundTextBox.Name = "mpIncomingSoundTextBox";
             this.mpIncomingSoundTextBox.Size = new System.Drawing.Size(248, 20);
             this.mpIncomingSoundTextBox.TabIndex = 6;
             // 
-            // checkBoxResumeMedia
+            // checkBoxResumeMediaOnIncomingCall
             // 
-            this.checkBoxResumeMedia.AutoSize = true;
-            this.checkBoxResumeMedia.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.checkBoxResumeMedia.Location = new System.Drawing.Point(24, 40);
-            this.checkBoxResumeMedia.Name = "checkBoxResumeMedia";
-            this.checkBoxResumeMedia.Size = new System.Drawing.Size(162, 17);
-            this.checkBoxResumeMedia.TabIndex = 1;
-            this.checkBoxResumeMedia.Text = "Auto-resume on closing notify";
-            this.checkBoxResumeMedia.UseVisualStyleBackColor = true;
+            this.checkBoxResumeMediaOnIncomingCall.AutoSize = true;
+            this.checkBoxResumeMediaOnIncomingCall.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.checkBoxResumeMediaOnIncomingCall.Location = new System.Drawing.Point(24, 40);
+            this.checkBoxResumeMediaOnIncomingCall.Name = "checkBoxResumeMediaOnIncomingCall";
+            this.checkBoxResumeMediaOnIncomingCall.Size = new System.Drawing.Size(162, 17);
+            this.checkBoxResumeMediaOnIncomingCall.TabIndex = 1;
+            this.checkBoxResumeMediaOnIncomingCall.Text = "Auto-resume on closing notify";
+            this.checkBoxResumeMediaOnIncomingCall.UseVisualStyleBackColor = true;
             // 
-            // checkBoxStopMediaOnIncomingCall
+            // checkBoxPauseMediaOnIncomingCall
             // 
-            this.checkBoxStopMediaOnIncomingCall.AutoSize = true;
-            this.checkBoxStopMediaOnIncomingCall.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.checkBoxStopMediaOnIncomingCall.Location = new System.Drawing.Point(6, 20);
-            this.checkBoxStopMediaOnIncomingCall.Name = "checkBoxStopMediaOnIncomingCall";
-            this.checkBoxStopMediaOnIncomingCall.Size = new System.Drawing.Size(85, 17);
-            this.checkBoxStopMediaOnIncomingCall.TabIndex = 0;
-            this.checkBoxStopMediaOnIncomingCall.Text = "Stop on calls";
-            this.checkBoxStopMediaOnIncomingCall.UseVisualStyleBackColor = true;
-            this.checkBoxStopMediaOnIncomingCall.CheckedChanged += new System.EventHandler(this.checkBoxStopMedia_CheckedChanged);
+            this.checkBoxPauseMediaOnIncomingCall.AutoSize = true;
+            this.checkBoxPauseMediaOnIncomingCall.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+            this.checkBoxPauseMediaOnIncomingCall.Location = new System.Drawing.Point(6, 20);
+            this.checkBoxPauseMediaOnIncomingCall.Name = "checkBoxPauseMediaOnIncomingCall";
+            this.checkBoxPauseMediaOnIncomingCall.Size = new System.Drawing.Size(133, 17);
+            this.checkBoxPauseMediaOnIncomingCall.TabIndex = 0;
+            this.checkBoxPauseMediaOnIncomingCall.Text = "Pause on incoming call";
+            this.checkBoxPauseMediaOnIncomingCall.UseVisualStyleBackColor = true;
+            this.checkBoxPauseMediaOnIncomingCall.CheckedChanged += new System.EventHandler(this.checkBoxStopMedia_CheckedChanged);
             // 
             // tabPhonebook
             // 
@@ -1056,8 +1082,8 @@
     private MediaPortal.UserInterface.Controls.MPNumericUpDown numericUpDownTimeout;
     private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxCloseOnTimout;
     private MediaPortal.UserInterface.Controls.MPGroupBox groupBoxMedia;
-    private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxResumeMedia;
-    private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxStopMediaOnIncomingCall;
+    private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxResumeMediaOnIncomingCall;
+    private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxPauseMediaOnIncomingCall;
     private System.Windows.Forms.TabPage tabPhonebook;
     private System.Windows.Forms.PictureBox pictureBoxCaller;
     private MediaPortal.UserInterface.Controls.MPButton buttonCallerChange;
@@ -1098,5 +1124,7 @@
     private MediaPortal.UserInterface.Controls.MPTextBox textBoxSuffixHome;
     private MediaPortal.UserInterface.Controls.MPButton mpImportFBMonitor;
     private MediaPortal.UserInterface.Controls.MPTextBox textBoxSuffixWork;
+    private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxResumeMediaOnOutgoingCall;
+    private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxPauseMediaOnOutgoingCall;
   }
 }
\ No newline at end of file

Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs	2011-12-09 13:30:38 UTC (rev 4370)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs	2011-12-10 09:09:06 UTC (rev 4371)
@@ -77,8 +77,10 @@
             checkBoxShowMSNOnNotify.Checked = Settings.ShowMSNOnNotify;
 
             // media settings
-            checkBoxStopMediaOnIncomingCall.Checked = Settings.StopMedia;
-            checkBoxResumeMedia.Checked = Settings.ResumeMedia;
+            checkBoxPauseMediaOnIncomingCall.Checked = Settings.PauseMediaOnIncomingCall;
+            checkBoxResumeMediaOnIncomingCall.Checked = Settings.ResumeMediaOnIncomingCall;
+            checkBoxPauseMediaOnOutgoingCall.Checked = Settings.PauseMediaOnOutgoingCall;
+            checkBoxResumeMediaOnOutgoingCall.Checked = Settings.ResumeMediaOnOutgoingCall;
 
             // phone book settings
             checkBoxUsePhonebook.Checked = PhoneBook.Enabled;
@@ -95,12 +97,16 @@
 
             RefreshDataGridView();
 
-            // FritzBox Manager settings
+            // FRITZ!Box settings
             passwd.Text = Settings.FmPassword;
             vBPath.Text = Settings.FmVBPath;
             dialPort.Text = Settings.FmDialPort;
+
+            // inverse search settings
             useInversSearch.Checked = Settings.FmUseInversSearch;
             defaultAreacode.Text = Settings.FmDefaultAreacode;
+
+            // GUI settings
             updateInterval.Text = Convert.ToString(Settings.FmUpdateInterval);
         }
 
@@ -127,8 +133,10 @@
             Settings.ShowMSNOnNotify = checkBoxShowMSNOnNotify.Checked;
 
             // media settings
-            Settings.StopMedia = checkBoxStopMediaOnIncomingCall.Checked;
-            Settings.ResumeMedia = checkBoxResumeMedia.Checked;
+            Settings.PauseMediaOnIncomingCall = checkBoxPauseMediaOnIncomingCall.Checked;
+            Settings.ResumeMediaOnIncomingCall = checkBoxResumeMediaOnIncomingCall.Checked;
+            Settings.PauseMediaOnOutgoingCall = checkBoxPauseMediaOnOutgoingCall.Checked;
+            Settings.ResumeMediaOnOutgoingCall = checkBoxResumeMediaOnOutgoingCall.Checked;
 
             // phone book settings
             PhoneBook.Enabled = checkBoxUsePhonebook.Checked;
@@ -141,14 +149,18 @@
 
             SaveDataGridView();
 
-            // FritzManager settings
+            // FRITZ!Box settings
             Settings.FmPassword = passwd.Text;
             Settings.FmVBPath = vBPath.Text;
             Settings.FmDialPort = dialPort.Text;
+
+            // inverse search settings
             Settings.FmUseInversSearch = useInversSearch.Checked;
-            Settings.FmUpdateInterval = Convert.ToInt16(updateInterval.Text);
             Settings.FmDefaultAreacode = defaultAreacode.Text;
 
+            // GUI settings
+            Settings.FmUpdateInterval = Convert.ToInt16(updateInterval.Text);
+
             Settings.Save();
         }
 
@@ -181,7 +193,7 @@
 
         private void checkBoxStopMedia_CheckedChanged(object sender, EventArgs e)
         {
-            checkBoxResumeMedia.Enabled = checkBoxStopMediaOnIncomingCall.Checked;
+            checkBoxResumeMediaOnIncomingCall.Enabled = checkBoxPauseMediaOnIncomingCall.Checked;
         }
 
         private void checkBoxUsePhonebook_CheckedChanged(object sender, EventArgs e)

Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.resx
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.resx	2011-12-09 13:30:38 UTC (rev 4370)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.resx	2011-12-10 09:09:06 UTC (rev 4371)
@@ -112,21 +112,21 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="colName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="colName.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="colCallerId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="colCallerId.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="colShow.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="colShow.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAwAEBAQAAAAAAAoAQAAxgAAABAQAAABAAgAaAUAAO4BAAAgIBAAAAAAAOgCAABWBwAAICAAAAEA

Modified: trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/PhoneBook.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/PhoneBook.cs	2011-12-09 13:30:38 UTC (rev 4370)
+++ trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/PhoneBook.cs	2011-12-10 09:09:06 UTC (rev 4371)
@@ -234,7 +234,7 @@
 
             caller.ID = normalizeMSN(caller.ID);
 
-            if (Contacts.Count == 0)
+            if (Contacts.Count == 0 && SaveUnknownCaller)
             {
                 Log.Info("Phone book is empty. Caller is added to the phone book");
                 Contacts.Add(caller);

Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/PhonebookItem.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/PhonebookItem.cs	2011-12-09 13:30:38 UTC (rev 4370)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/PhonebookItem.cs	2011-12-10 09:09:06 UTC (rev 4371)
@@ -15,7 +15,7 @@
         public static void savePhonebook(GCollections.ICollection<PhonebookItem> items, string fileName)
         {
             InternalPhoneBook book = new InternalPhoneBook();
-            Log.Debug("Saving internal phoneBook to {0}", fileName);
+            Log.Debug("Saving internal phone book to {0}", fileName);
 
             foreach (PhonebookItem i in items)
             {
@@ -36,7 +36,7 @@
 
             if (File.Exists(fileName))
             {
-                Log.Debug("Loading FritzManager phone book from {0}", fileName);
+                Log.Debug("Loading FRITZ!Box Manager phone book from {0}", fileName);
 
                 XmlSerializer s = new XmlSerializer(typeof(InternalPhoneBook));
                 TextReader r = new StreamReader(fileName);
@@ -51,7 +51,7 @@
             }
             else
             {
-                Log.Debug("Could not load FritzManager phone book. File {0} cannot be found", fileName);
+                Log.Debug("Could not load FRITZ!Box Manager phone book. File {0} cannot be found", fileName);
             }
 
             return result;

Modified: trunk/plugins/FritzBox/FritzBox/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Properties/AssemblyInfo.cs	2011-12-09 13:30:38 UTC (rev 4370)
+++ trunk/plugins/FritzBox/FritzBox/Properties/AssemblyInfo.cs	2011-12-10 09:09:06 UTC (rev 4371)
@@ -31,7 +31,7 @@
 [assembly: AssemblyTitle("FRITZ!Box Manager")]
 [assembly: AssemblyDescription("Displays FRITZ!Box calling information / phoneBook / voicebox.")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Horned Reaper, Steve, Chefkoch @ Team MediaPortal")]
+[assembly: AssemblyCompany("Horned_Reaper, Steve, Chefkoch @ Team MediaPortal")]
 [assembly: AssemblyProduct("FRITZ!Box Manager")]
 [assembly: AssemblyCopyright("Horned Reaper, Steve, Chefkoch @ Team MediaPortal 2009")]
 [assembly: AssemblyTrademark("")]

Modified: trunk/plugins/FritzBox/FritzBox/Settings.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Settings.cs	2011-12-09 13:30:38 UTC (rev 4370)
+++ trunk/plugins/FritzBox/FritzBox/Settings.cs	2011-12-10 09:09:06 UTC (rev 4371)
@@ -50,15 +50,26 @@
         public static bool ExtensiveLogging { get; set; }
 
         /// <summary>
-        /// stop media when an event happend
+        /// stop media on incoming call when an event happend
         /// </summary>
-        public static bool StopMedia { get; set; }
+        public static bool PauseMediaOnIncomingCall { get; set; }
 
         /// <summary>
-        /// resume media when notify is closed
+        /// resume media on incoming call when notify is closed
         /// </summary>
-        public static bool ResumeMedia { get; set; }
+        public static bool ResumeMediaOnIncomingCall { get; set; }
 
+        /// <summary>
+        /// stop media on outgoing call when an event happend
+        /// </summary>
+        public static bool PauseMediaOnOutgoingCall { get; set; }
+
+        /// <summary>
+        /// resume media on outgoing call when notify is closed
+        /// </summary>
+        /// 
+        public static bool ResumeMediaOnOutgoingCall { get; set; }
+        
         public static int MaxNotifies { get; set; }
 
         /// <summary>
@@ -105,8 +116,10 @@
 
         static Settings()
         {
-            StopMedia = true;
-            ResumeMedia = true;
+            PauseMediaOnIncomingCall = true;
+            ResumeMediaOnIncomingCall = true;
+            PauseMediaOnOutgoingCall = true;
+            ResumeMediaOnOutgoingCall = true;
             MaxNotifies = 20;
             NotifyTimeout = 10;
         }
@@ -143,11 +156,13 @@
                 ShowMSNOnNotify = xmlreader.GetValueAsBool("fritzbox", "showMSNOnNotify", true);
 
                 // media settings
-                StopMedia = xmlreader.GetValueAsBool("fritzbox", "stopMedia", true);
-                ResumeMedia = xmlreader.GetValueAsBool("fritzbox", "resumeMedia", true);
+                PauseMediaOnIncomingCall = xmlreader.GetValueAsBool("fritzbox", "pauseMediaOnIncomingCall", true);
+                ResumeMediaOnIncomingCall = xmlreader.GetValueAsBool("fritzbox", "resumeMediaOnIncomingCall", true);
                 IncomingSound = xmlreader.GetValueAsString("fritzbox", "incomingSound", "");
+                PauseMediaOnOutgoingCall = xmlreader.GetValueAsBool("fritzbox", "pauseMediaOnOutgoingCall", false);
+                ResumeMediaOnOutgoingCall = xmlreader.GetValueAsBool("fritzbox", "resumeMediaOnOutgoingCall", false);
 
-                // FritzManager settings
+                // FIRTZ!Box settings
                 string decryptedPassword = StringEncryption.DecryptString(xmlreader.GetValue("FritzManager", "passwd"), encryptionPassphrase);
                 if (decryptedPassword != null) FmPassword = decryptedPassword;
                 else FmPassword = xmlreader.GetValue("FritzManager", "passwd");  // if the password was not encrypted read it in clear text (for older FritzBox Manager versions)
@@ -166,16 +181,22 @@
 
                 FmUseInversSearch = xmlreader.GetValueAsBool("FritzManager", "useInversSearch", false);
                 FmDefaultAreacode = xmlreader.GetValue("FritzManager", "defaultAreacode");
+                
+                // GUI settings
                 FmUpdateInterval = xmlreader.GetValueAsInt("FritzManager", "updateInterval", 0);
 
                 // delete (convert) obsolete setting entries
                 xmlreader.RemoveEntry("fritzbox", "showMsnOnHeading");
+
                 if (!String.IsNullOrEmpty(xmlreader.GetValue("FritzManager", "abpath")))
                 {
                     FmVBPath = xmlreader.GetValue("FritzManager", "abpath");
                     xmlreader.RemoveEntry("FritzManager", "abpath");
                 }
 
+                xmlreader.RemoveEntry("fritzbox", "stopMedia");
+                xmlreader.RemoveEntry("fritzbox", "resumeMedia");
+
                 // loading current skin setting
                 MediaPortalSkin = xmlreader.GetValueAsString("skin", "name", "DefaultWide");
             }
@@ -209,19 +230,25 @@
                 xmlwriter.SetValueAsBool("fritzbox", "showMSNOnNotify", ShowMSNOnNotify);
 
                 // media settings
-                xmlwriter.SetValueAsBool("fritzbox", "stopMedia", StopMedia);
-                xmlwriter.SetValueAsBool("fritzbox", "resumeMedia", ResumeMedia);
+                xmlwriter.SetValueAsBool("fritzbox", "pauseMediaOnIncomingCall", PauseMediaOnIncomingCall);
+                xmlwriter.SetValueAsBool("fritzbox", "resumeMediaOnIncomingCall", ResumeMediaOnIncomingCall);
                 xmlwriter.SetValue("fritzbox", "incomingSound", IncomingSound);
+                xmlwriter.SetValueAsBool("fritzbox", "pauseMediaOnOutgoingCall", PauseMediaOnOutgoingCall);
+                xmlwriter.SetValueAsBool("fritzbox", "resumeMediaOnOutgoingCall", ResumeMediaOnOutgoingCall);
 
-                // new FritzManager settings
+                // new FRITZ!Box settings
                 xmlwriter.SetValue("FritzManager", "passwd", StringEncryption.EncryptString(FmPassword, encryptionPassphrase));
                 xmlwriter.SetValue("FritzManager", "vBPath", FmVBPath);
                 xmlwriter.SetValue("FritzManager", "dialport", FmDialPort);
+                
+                // inverse search settings
                 xmlwriter.SetValueAsBool("FritzManager", "useInversSearch", FmUseInversSearch);
                 xmlwriter.SetValue("FritzManager", "defaultAreacode", FmDefaultAreacode);
-                if (FmUpdateInterval > 0 && FmUpdateInterval < 30) FmUpdateInterval = 30;
+
+                // GUI settings
+                if (FmUpdateInterval > 0 && FmUpdateInterval < 30) FmUpdateInterval = 30;                
                 xmlwriter.SetValue("FritzManager", "updateInterval", FmUpdateInterval);
-                //todo: writing currentmode okay this way?
+
                 xmlwriter.SetValue("FritzManager", "currentMode", (int)FmCurrentMode);
                 xmlwriter.SetValue("FritzManager", "currentFilter", (int)FmCurrentFilter);
             }

Added: trunk/plugins/FritzBox/FritzBox/bin/Release/AxInterop.WMPLib.dll
===================================================================
(Binary files differ)


Property changes on: trunk/plugins/FritzBox/FritzBox/bin/Release/AxInterop.WMPLib.dll
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/plugins/FritzBox/FritzBox/bin/Release/Bass.Net.dll
===================================================================
(Binary files differ)


Property changes on: trunk/plugins/FritzBox/FritzBox/bin/Release/Bass.Net.dll
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/plugins/FritzBox/FritzBox/bin/Release/BassRegistration.dll
===================================================================
(Binary files differ)


Property changes on: trunk/plugins/FritzBox/FritzBox/bin/Release/BassRegistration.dll
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/plugins/FritzBox/FritzBox/bin/Release/BassVisAPI.Net.dll
===================================================================
(Binary files differ)


Property changes on: trunk/plugins/FritzBox/FritzBox/bin/Release/BassVisAPI.Net.dll
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/plugins/FritzBox/FritzBox/bin/Release/Common.Utils.dll
===================================================================
(Binary files differ)


Property changes on: trunk/plugins/FritzBox/FritzBox/bin/Release/Common.Utils.dll
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/plugins/FritzBox/FritzBox/bin/Release/Core.dll
===================================================================
(Binary files differ)


Property changes on: trunk/plugins/FritzBox/FritzBox/bin/Release/Core.dll
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/plugins/FritzBox/FritzBox/bin/Release/Dialogs.dll
===================================================================
(Binary files differ)


Property changes on: trunk/plugins/FritzBox/FritzBox/bin/Release/Dialogs.dll
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/plugins/FritzBox/FritzBox/bin/Release/DirectShowLib.dll
===================================================================
(Binary files differ)


Property changes on: trunk/plugins/FritzBox/FritzBox/bin/Release/DirectShowLib.dll
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)

Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.pdb
===================================================================
(Binary files differ)

Added: trunk/plugins/FritzBox/FritzBox/bin/Release/Interop.SHDocVw.dll
===================================================================
(Binary files differ)


Property changes on: trunk/plugins/FritzBox/FritzBox/bin/Release/Interop.SHDocVw.dll
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/plugins/FritzBox/FritzBox/bin/Release/Interop.WMPLib.dll
===================================================================
(Binary files differ)


Property changes on: trunk/plugins/FritzBox/FritzBox/bin/Release/Interop.WMPLib.dll
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/plugins/FritzBox/FritzBox/bin/Release/Ionic.Zip.dll
===================================================================
(Binary files differ)


Property changes on: trunk/plugins/FritzBox/FritzBox/bin/Release/Ionic.Zip.dll
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/plugins/FritzBox/FritzBox/bin/Release/MediaPortal.Support.dll
===================================================================
(Binary files differ)


Property changes on: trunk/plugins/FritzBox/FritzBox/bin/Release/MediaPortal.Support.dll
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/plugins/FritzBox/FritzBox/bin/Release/Utils.dll
===================================================================
(Binary files differ)


Property changes on: trunk/plugins/FritzBox/FritzBox/bin/Release/Utils.dll
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/plugins/FritzBox/FritzBox/bin/Release/edtftpnet-1.2.2.dll
===================================================================
(Binary files differ)


Property changes on: trunk/plugins/FritzBox/FritzBox/bin/Release/edtftpnet-1.2.2.dll
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/plugins/FritzBox/FritzBox/bin/Release/log4net.dll
===================================================================
(Binary files differ)


Property changes on: trunk/plugins/FritzBox/FritzBox/bin/Release/log4net.dll
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/plugins/FritzBox/FritzBox/bin/Release/taglib-sharp.dll
===================================================================
(Binary files differ)


Property changes on: trunk/plugins/FritzBox/FritzBox/bin/Release/taglib-sharp.dll
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
===================================================================
(Binary files differ)

Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
===================================================================
(Binary files differ)

Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/GenerateResource-ResGen.read.1.tlog
===================================================================
(Binary files differ)

Added: trunk/plugins/FritzBox/FritzBox/obj/Debug/ResolveAssemblyReference.cache
===================================================================
(Binary files differ)


Property changes on: trunk/plugins/FritzBox/FritzBox/obj/Debug/ResolveAssemblyReference.cache
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.FileListAbsolute.txt
===================================================================
--- trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.FileListAbsolute.txt	2011-12-09 13:30:38 UTC (rev 4370)
+++ trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.FileListAbsolute.txt	2011-12-10 09:09:06 UTC (rev 4371)
@@ -6,3 +6,19 @@
 D:\FritzBox\FritzBox\obj\Release\FritzBox.csproj.GenerateResource.Cache
 D:\FritzBox\FritzBox\obj\Release\FritzBox.dll
 D:\FritzBox\FritzBox\obj\Release\FritzBox.pdb
+D:\FritzBox\FritzBox\bin\Release\Common.Utils.dll
+D:\FritzBox\FritzBox\bin\Release\Core.dll
+D:\FritzBox\FritzBox\bin\Release\Dialogs.dll
+D:\FritzBox\FritzBox\bin\Release\Utils.dll
+D:\FritzBox\FritzBox\bin\Release\AxInterop.WMPLib.dll
+D:\FritzBox\FritzBox\bin\Release\Ionic.Zip.dll
+D:\FritzBox\FritzBox\bin\Release\log4net.dll
+D:\FritzBox\FritzBox\bin\Release\DirectShowLib.dll
+D:\FritzBox\FritzBox\bin\Release\edtftpnet-1.2.2.dll
+D:\FritzBox\FritzBox\bin\Release\Interop.WMPLib.dll
+D:\FritzBox\FritzBox\bin\Release\taglib-sharp.dll
+D:\FritzBox\FritzBox\bin\Release\Interop.SHDocVw.dll
+D:\FritzBox\FritzBox\bin\Release\BassRegistration.dll
+D:\FritzBox\FritzBox\bin\Release\Bass.Net.dll
+D:\FritzBox\FritzBox\bin\Release\BassVisAPI.Net.dll
+D:\FritzBox\FritzBox\bin\Release\MediaPortal.Support.dll

Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.GenerateResource.Cache
===================================================================
(Binary files differ)

Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
===================================================================
(Binary files differ)

Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb
===================================================================
(Binary files differ)

Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/ResolveAssemblyReference.cache
===================================================================
(Binary files differ)

Deleted: trunk/plugins/FritzBox/MpeRelease/FritzBox.mpe1
===================================================================
(Binary files differ)

Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2	2011-12-09 13:30:38 UTC (rev 4370)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2	2011-12-10 09:09:06 UTC (rev 4371)
@@ -559,7 +559,7 @@
           <Items>
             <CompatibleVersionItem>
               <MinRequiredVersion>1.1.0.0</MinRequiredVersion>
-              <DesignedForVersion>1.1.7.4366</DesignedForVersion>
+              <DesignedForVersion>1.1.7.4370</DesignedForVersion>
             </CompatibleVersionItem>
           </Items>
         </CompatibleVersion>
@@ -574,7 +574,7 @@
   <GeneralInfo>
     <Name>FritzBox Manager</Name>
     <Id>8cb6bbc2-5473-4a63-a8f9-e0bec7c8c81c</Id>
-    <Author>Horned Reaper, Steve, Chefkoch</Author>
+    <Author>Horned_Reaper, Steve, Chefkoch</Author>
     <HomePage>http://www.team-mediaportal.com/extensions/other/fritzbox-manager-phone-manager-callmonitor-for-avm-fritz-box</HomePage>
     <ForumPage>http://forum.team-mediaportal.com/mediaportal-plugins-47/fritz-box-manager-english-forum-103177/#post817050</ForumPage>
     <UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&amp;task=att_download&amp;link_id=118&amp;cf_id=52</UpdateUrl>
@@ -582,21 +582,21 @@
       <Major>0</Major>
       <Minor>3</Minor>
       <Build>5</Build>
-      <Revision>4366</Revision>
+      <Revision>4370</Revision>
     </Version>
-    <ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box informations from MediaPortal.
-
-Features:
-- notification for incoming and outgoing calls via window, sound and contact picture
-- MediaPortal Player is automatically paused and resumed on calls
-- access call lists, voice box and phone book directly in MediaPortal
-- voice box message notification in any MediaPortal screen
-- connection establishment from call list, voice box or phone book entries
+    <ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box informations from MediaPortal.
+
+Features:
+- notification for incoming and outgoing calls via window, sound and contact picture
+- MediaPortal Player is automatically paused and resumed on calls
+- access call lists, voice box and phone book directly in MediaPortal
+- voice box message notification in any MediaPortal screen
+- connection establishment from call list, voice box or phone book entries
 - language localization</ExtensionDescription>
     <VersionDescription />
     <DevelopmentStatus>Stable</DevelopmentStatus>
     <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&amp;task=att_download&amp;link_id=118&amp;cf_id=24</OnlineLocation>
-    <ReleaseDate>2011-12-09T00:23:22.128469+01:00</ReleaseDate>
+    <ReleaseDate>2011-12-10T09:59:13.995507+01:00</ReleaseDate>
     <Tags>fritzbox, fritzbox manager, callmonitor</Tags>
     <Location>..\MpeRelease\FritzBox.mpe1</Location>
     <Params>

Deleted: trunk/plugins/FritzBox/MpeRelease/update.xml
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/update.xml	2011-12-09 13:30:38 UTC (rev 4370)
+++ trunk/plugins/FritzBox/MpeRelease/update.xml	2011-12-10 09:09:06 UTC (rev 4371)
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ExtensionCollection xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Items>
-    <PackageClass>
-      <Version>2.0</Version>
-      <Groups>
-        <Items>
-          <GroupItem Name="Default">
-            <DisplayName>Default</DisplayName>
-            <DefaulChecked>true</DefaulChecked>
-            <Description>Default</Description>
-            <Files>
-              <Items />
-            </Files>
-          </GroupItem>
-          <GroupItem Name="Blue3 Skin">
-            <DisplayName>Blue3 Skin</DisplayName>
-            <DefaulChecked>false</DefaulChecked>
-            <Description>Blue3 Skin</Description>
-            <Files>
-              <Items />
-            </Files>
-          </GroupItem>
-          <GroupItem Name="Maya Skin">
-            <DisplayName>Maya Skin</DisplayName>
-            <DefaulChecked>false</DefaulChecked>
-            <Description>Maya Skin</Description>
-            <Files>
-              <Items />
-            </Files>
-          </GroupItem>
-          <GroupItem Name="Black &amp; White Skin">
-            <DisplayName>Black &amp; White Skin</DisplayName>
-            <DefaulChecked>false</DefaulChecked>
-            <Description>Black &amp; White Skin</Description>
-            <Files>
-              <Items />
-            </Files>
-          </GroupItem>
-          <GroupItem Name="Default Skin">
-            <DisplayName>Default Skin</DisplayName>
-            <DefaulChecked>true</DefaulChecked>
-            <Description>Default Skin</Description>
-            <Files>
-              <Items />
-            </Files>
-          </GroupItem>
-          <GroupItem Name="DefaultWide Skin">
-            <DisplayName>DefaultWide Skin</DisplayName>
-            <DefaulChecked>true</DefaulChecked>
-            <Description>DefaultWide Skin</Description>
-            <Files>
-              <Items />
-            </Files>
-          </GroupItem>
-        </Items>
-      </Groups>
-      <Sections>
-        <Items />
-      </Sections>
-      <Dependencies>
-        <Items>
-          <DependencyItem>
-            <Type>MediaPortal</Type>
-            <Id />
-            <MinVersion>
-              <Major>1</Major>
-              <Minor>1</Minor>
-              <Build>6</Build>
-              <Revision>27644</Revision>
-            </MinVersion>
-            <MaxVersion>
-              <Major>1</Major>
-              <Minor>1</Minor>
-              <Build>6</Build>
-              <Revision>27644</Revision>
-            </MaxVersion>
-            <WarnOnly>false</WarnOnly>
-            <Message>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message>
-            <Name>MediaPortal</Name>
-          </DependencyItem>
-        </Items>
-      </Dependencies>
-      <PluginDependencies>
-        <Items>
-          <PluginDependencyItem AssemblyName="FritzBox.dll">
-            <CompatibleVersion>
-              <Items>
-                <CompatibleVersionItem>
-                  <MinRequiredVersion>1.1.0.0</MinRequiredVersion>
-                  <DesignedForVersion>1.1.7.4366</DesignedForVersion>
-                </CompatibleVersionItem>
-              </Items>
-            </CompatibleVersion>
-            <SubSystemsUsed>
-              <Items>
-                <SubSystemItem Name="MP.Config" />
-              </Items>
-            </SubSystemsUsed>
-          </PluginDependencyItem>
-        </Items>
-      </PluginDependencies>
-      <GeneralInfo>
-        <Name>FritzBox Manager</Name>
-        <Id>8cb6bbc2-5473-4a63-a8f9-e0bec7c8c81c</Id>
-        <Author>Horned Reaper, Steve, Chefkoch</Author>
-        <HomePage>http://www.team-mediaportal.com/extensions/other/fritzbox-manager-phone-manager-callmonitor-for-avm-fritz-box</HomePage>
-        <ForumPage>http://forum.team-mediaportal.com/mediaportal-plugins-47/fritz-box-manager-english-forum-103177/#post817050</ForumPage>
-        <UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&amp;task=att_download&amp;link_id=118&amp;cf_id=52</UpdateUrl>
-        <Version>
-          <Major>0</Major>
-          <Minor>3</Minor>
-          <Build>5</Build>
-          <Revision>4366</Revision>
-        </Version>
-        <ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box informations from MediaPortal.
-
-Features:
-- notification for incoming and outgoing calls via window, sound and contact picture
-- MediaPortal Player is automatically paused and resumed on calls
-- access call lists, voice box and phone book directly in MediaPortal
-- voice box message notification in any MediaPortal screen
-- connection establishment from call list, voice box or phone book entries
-- language localization</ExtensionDescription>
-        <VersionDescription />
-        <DevelopmentStatus>Stable</DevelopmentStatus>
-        <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&amp;task=att_download&amp;link_id=118&amp;cf_id=24</OnlineLocation>
-        <ReleaseDate>2011-12-09T00:23:22.128469+01:00</ReleaseDate>
-        <Tags>fritzbox, fritzbox manager, callmonitor</Tags>
-        <Location>..\MpeRelease\FritzBox.mpe1</Location>
-        <Params>
-          <Items>
-            <SectionParam Name="Online Icon">
-              <Value />
-              <ValueType>String</ValueType>
-              <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
-        ...
 
[truncated message content]