Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4414] trunk/plugins/FritzBox
|
From: <hor...@us...> - 2012-01-18 09:01:05
|
Revision: 4414
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4414&view=rev
Author: horned-reaper
Date: 2012-01-18 09:00:52 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/Docs/Ausstehend.txt
trunk/plugins/FritzBox/Docs/Changes.txt
trunk/plugins/FritzBox/FritzBox/FritzBox.cs
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs
trunk/plugins/FritzBox/FritzBox/Settings.cs
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Debug/GenerateResource-ResGen.read.1.tlog
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/ResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/ResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/releases/update.xml
Added Paths:
-----------
trunk/plugins/FritzBox/releases/FritzBox_v0.4.0.4413.mpe1
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2012-01-17 23:36:10 UTC (rev 4413)
+++ trunk/plugins/FritzBox/Build/Build.log 2012-01-18 09:00:52 UTC (rev 4414)
@@ -1,6 +1,6 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4403
+SVN Version: 4413
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs
@@ -10,7 +10,7 @@
[Microsoft .NET Framework, Version 4.0.30319.239]
Copyright (C) Microsoft Corporation 2007. All rights reserved.
-Build started 14.01.2012 18:41:28.
+Build started 18.01.2012 09:46:45.
Project "D:\FritzBox\FritzBox.sln" on node 1 (Rebuild target(s)).
ValidateSolutionConfiguration:
Building solution configuration "Release|Mixed Platforms".
@@ -154,8 +154,8 @@
Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.DebugForm.resources".
Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.exe".
Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.pdb".
- Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.read.7.tlog".
- Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.write.7.tlog".
+ Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.read.6.tlog".
+ Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.write.6.tlog".
CoreResGen:
"C:\Program Files\Microsoft SDKs\Windows\v7.0A\bin\NETFX 4.0 Tools\resgen.exe" /useSourcePath /r:"C:\Program Files\Team MediaPortal\MediaPortal\Core.dll" /r:D:\FritzBox\FritzBox\bin\Release\FritzBox.dll /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\mscorlib.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Core.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Data.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Drawing.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Windows.Forms.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Xml.dll" /compile DebugForm.resx,obj\Release\FritzBoxDebugger.DebugForm.resources
Processing resource file "DebugForm.resx" into "obj\Release\FritzBoxDebugger.DebugForm.resources".
@@ -195,7 +195,7 @@
0 Warning(s)
0 Error(s)
-Time Elapsed 00:00:02.20
+Time Elapsed 00:00:02.46
Reverting to build 0
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
@@ -280,7 +280,7 @@
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
36 File(s) copied
MpeMaker version: 1.2.1.0
-Build started at 18:41:32
+Build started at 09:46:50
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Modified: trunk/plugins/FritzBox/Docs/Ausstehend.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Ausstehend.txt 2012-01-17 23:36:10 UTC (rev 4413)
+++ trunk/plugins/FritzBox/Docs/Ausstehend.txt 2012-01-18 09:00:52 UTC (rev 4414)
@@ -3,8 +3,6 @@
Fehler beheben:
- auch bei einem "Unbekannten Anrufer" (unterdr\xFCckte bzw. nicht \xFCbertragene Rufnummer) \xF6ffnet sich \xFCber das Kontextrufen "zur\xFCckrufen". Sollte man deaktivieren
-- bei Auswahl einer MSN im Konfigurationsdialog werden die MSN-Eintr\xE4ge verdoppelt
-- Configuration: erste MSN wird nicht im Dropdown-Men\xFC angezeigt
- btnModus umbenennen?
- ObjectDisposed-Exception bei Client-Stop
- ein kleiner schwarzer Balken \xFCberdeckt das erste Zeichen oder die erste Ziffer zur H\xE4lfte
@@ -18,7 +16,7 @@
- Rufnummer-Typ hinzuf\xFCgen
- GUI-Adressbuch
- Anruf-Benachrichtigungen
-- Telefonbuch editierbar machen (f\xFCr FRITZ!Box-Versionen ohne Telefonbuch), ImageURL-Feld editierbar machen
+- Telefonbuch editierbar machen (f\xFCr FRITZ!Box-Versionen ohne Telefonbuch), ImageURL-Feld hinzuf\xFCgen und nur synchronisieren, wenn im FRITZ!Box-Telefonbuch vorhanden
- R\xFCckw\xE4rtssuche wieder integrieren
- Kontextmen\xFC f\xFCr Telefonbuch
- Wiki-Eintrag
@@ -31,6 +29,9 @@
Anwenderw\xFCnsche:
+IchBinsShort, 05.01.2012, 18:02:
+Noch eine andere Frage ist es auch m\xF6glich das bei ausgehenden Anrufen nur bei bestimmten Handger\xE4ten der Pause Befehl gesendet wird. Ich benutze drei Funktelefone \xFCber die Dect Funktion der Fritzbox 7020, Garten, Eltern und bei mir. W\xE4re also sch\xF6n wenn nur auf Pause gestellt wird wenn von meinem Telefon eine Anruf get\xE4tigt wird.
+
Scrounger, 05.12.2011:
Was ich wirklich verdammt gerne noch h\xE4tte, w\xE4re die M\xF6glichkeit, sich auf dem Basic Home Screen die verpassten anrufe anzeigen zu lassen oder die letzten 3 Anrufe. K\xF6nntet ihr das evtl. in eine kommende Version integrieren?
Was ich damit meine ist, dass du evtl. 3 globale Variablen (AnruferName bzw. Nr. und Bild) zur Verf\xFCgung stellen k\xF6nntest, die dann jeder Skindesigner in seinem BasicHome integrieren k\xF6nnte. Z.B. wie das beim DriveFreeSpace Plugin geht oder bei den Plugins von Micropolis.
@@ -46,7 +47,7 @@
Die Notifications bei eingehenden/ausgehenden Rufen funktionieren mit dem Skin problemlos.
Wenn man allerdings in den Plugins-Bereichs geht, um z.B. die Anrufliste anzuzeigen, passiert erst mal gar nichts und dann kommt so ein ewig durchlaufender Fortschrittsbalken ohne da\xDF etwas passiert.
-Stefan:
+Stefan Rinke:
- Abspielen von Sprachnachrichten nach dem Anklicken im Home-Screen:
add onAction handler to catch custom action from home screen button
damit k\xF6nnten man ein Control auf dem HomeScreen erscheinen lassen
@@ -57,17 +58,14 @@
mu\xDF warum gibt es kein Buttons wo ich die Listen direKt anw\xE4hlen kann oder \xFCbersehe ich da was.
Gru\xDF Burkh2407
-IchBinsShort, 05.01.2012, 18:02:
-Noch eine andere Frage ist es auch m\xF6glich das bei ausgehenden Anrufen nur bei bestimmten Handger\xE4ten der Pause Befehl gesendet wird. Ich benutze drei Funktelefone \xFCber die Dect Funktion der Fritzbox 7020, Garten, Eltern und bei mir. W\xE4re also sch\xF6n wenn nur auf Pause gestellt wird wenn von meinem Telefon eine Anruf get\xE4tigt wird.
-
creativ, 10.01.2012, 19:53:
-Was nur noch eingebaut werden sollte, das dort Kontakte abgew\xE4hlt werden k\xF6nnen die im MP dann nicht angezeigt werden! Ich habe n\xE4mlich das Fritz!Fon MT-F und dort sind Kontakte im internen Speicher die nicht gel\xF6scht werden k\xF6nnen, z.b. (wie klingt HD-Telefonie und daf\xFCr gibt es eine Telefonnumer die hinterlegt ist).
+Was nur noch eingebaut werden sollte, das im Telefonbuch Kontakte abgew\xE4hlt werden k\xF6nnen die im MP dann nicht angezeigt werden! Ich habe n\xE4mlich das Fritz!Fon MT-F und dort sind Kontakte im internen Speicher die nicht gel\xF6scht werden k\xF6nnen, z.b. (wie klingt HD-Telefonie und daf\xFCr gibt es eine Telefonnumer die hinterlegt ist).
IchBinsShort, 11.01.2012, 00:28:
L\xF6schen von Anruflisten \xFCber die GUI
-creativ, 20.01.2012, 19:53:
-Ausblenden bestimmter Kontakte in der GUI
+IchBinsShort, 17.01.2012, 15:05:
+Ich h\xE4tte noch Idee, wei\xDF nicht ob dies M\xF6glich ist. Aber sch\xF6n w\xE4re es wenn Mediaportal aus dem Standby oder Hibernate erwacht anzeigen w\xFCrde wenn es verpasste Anrufe gibt. Also das vlt. ein Popup Fenster sich \xF6ffnet und anzeigt das es verpasste Anrufe gibt... Ist dies wohl M\xF6glich ?
-AlfredENeuma, 13.01.2012, 12:10:
-Vielleicht w\xE4re das eine M\xF6glichkeit f\xFCr die Zukunft: Im Telefonbuch des Plugins eine zus\xE4tzliche Spalte f\xFCr Bilder (lokal oder auf FB USB Stick). Diese Eintr\xE4ge k\xF6nnten dann verwendet werden, wenn die FB keine Eintr\xE4ge f\xFCr Bilder hat
\ No newline at end of file
+IchBinsShort, 17.01.2012, 15:23:
+Eventuell w\xE4re es dann auch noch gut wenn neue Anrufe in der Anrufliste als Neu markiert werden k\xF6nnen. Also so was wie ein "gelesen Status" woraus ersichtlich welche der Anrufe seit dem letztem Aufruf der Anrufliste neu hinzugekommen sind :-)
\ No newline at end of file
Modified: trunk/plugins/FritzBox/Docs/Changes.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Changes.txt 2012-01-17 23:36:10 UTC (rev 4413)
+++ trunk/plugins/FritzBox/Docs/Changes.txt 2012-01-18 09:00:52 UTC (rev 4414)
@@ -0,0 +1,12 @@
+Fixed bugs:
+- on multiple contact deletions multiple synchronisations are necessary
+- multiple contacts with the same name cause update actions on every synchronization
+- multiple MSN filter entries when FRITZ!Box Manager configuration window is closed and re-opened without closing the MediaPortal Configuration window
+- MediaPortal crashes on calls with phone numbers not contained in the phone book
+
+Optimizations:
+- phone book is now saved on every change instead of MediaPortal exit
+- entry checks for the following settings:
+ - update interval
+ - dial port
+- first MSN filter entry is automatically displayed when Configuration window is opened
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2012-01-17 23:36:10 UTC (rev 4413)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2012-01-18 09:00:52 UTC (rev 4414)
@@ -210,6 +210,8 @@
{
if (phoneBookItem != null) // phone book entry exists
{
+ if (Settings.ExtensiveLogging) Log.Info("Caller is identified by phone book as {0}", phoneBookItem.Name);
+
if (phoneBookItem.ShowCallNotification) showNotification = true;
}
else if (Settings.ShowUnknownCaller) showNotification = true; // unknown caller
@@ -239,15 +241,14 @@
// ...message text
strText = Environment.NewLine;
- if (callAction.Caller.PhoneNumber == "") strText += GUILocalizeStrings.Get(3); // 3 = Unknown
- else if (callAction.Caller.PhoneBookItem.Name == "") strText += callAction.Caller.PhoneNumber;
- else
+ if (callAction.Caller.PhoneNumber != "")
{
- strText += callAction.Caller.PhoneBookItem.Name;
+ if (phoneBookItem != null) strText += phoneBookItem.Name;
- if (Settings.ShowMSNOnNotify) strText += Environment.NewLine + callAction.Caller.PhoneNumber;
+ if (Settings.ShowPhoneNumberOnNotify) strText += Environment.NewLine + callAction.Caller.PhoneNumber;
}
-
+ else strText += GUILocalizeStrings.Get(3); // 3 = Unknown
+
// show call notification
ShowNotify(callAction.Type, strHeading, strImage, strText);
}
@@ -272,7 +273,7 @@
if (Settings.MSNList.Contains(mSN))
{
- Log.Info("MSN is on the list");
+ Log.Info("MSN is on the filter list");
return true;
}
else
@@ -428,9 +429,6 @@
Utils.OnStopExternal -= OnStopExternal;
SystemEvents.PowerModeChanged -= new PowerModeChangedEventHandler(SystemEvents_PowerModeChanged); // power changes
-
- // save phone book
- phoneBook.SavePhoneBookToXMLFile();
}
#endregion
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2012-01-17 23:36:10 UTC (rev 4413)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2012-01-18 09:00:52 UTC (rev 4414)
@@ -46,7 +46,7 @@
this.checkBoxCloseOnConnectionClosed = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.lblMaxNotifies = new MediaPortal.UserInterface.Controls.MPLabel();
this.numericUpDownMaxNotifies = new MediaPortal.UserInterface.Controls.MPNumericUpDown();
- this.checkBoxShowMSNOnNotify = new MediaPortal.UserInterface.Controls.MPCheckBox();
+ this.checkBoxShowPhoneNumberOnNotify = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.buttonMSNsRemove = new MediaPortal.UserInterface.Controls.MPButton();
this.checkBoxFilterMSNs = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.buttonMSNsAdd = new MediaPortal.UserInterface.Controls.MPButton();
@@ -62,7 +62,6 @@
this.checkBoxPauseMediaOnIncomingCall = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.tabPageConnection = new System.Windows.Forms.TabPage();
this.label2 = new System.Windows.Forms.Label();
- this.dialPort = new System.Windows.Forms.TextBox();
this.vBPath = new System.Windows.Forms.TextBox();
this.passwd = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
@@ -76,7 +75,8 @@
this.tabPageMiscellaneous = new System.Windows.Forms.TabPage();
this.checkBoxExtensiveLogging = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.label4 = new System.Windows.Forms.Label();
- this.updateInterval = new MediaPortal.UserInterface.Controls.MPTextBox();
+ this.dialPortNumericUpDown = new MediaPortal.UserInterface.Controls.MPNumericUpDown();
+ this.updateInterval = new MediaPortal.UserInterface.Controls.MPNumericUpDown();
this.tabPageDiagnostics.SuspendLayout();
this.tabPagePhoneBook.SuspendLayout();
this.tabPageCallNotification.SuspendLayout();
@@ -90,6 +90,8 @@
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.tabControlConfiguration.SuspendLayout();
this.tabPageMiscellaneous.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.dialPortNumericUpDown)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.updateInterval)).BeginInit();
this.SuspendLayout();
//
// labelVersion
@@ -212,7 +214,7 @@
this.groupBoxPhonebook.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.groupBoxPhonebook.Location = new System.Drawing.Point(7, 229);
this.groupBoxPhonebook.Name = "groupBoxPhonebook";
- this.groupBoxPhonebook.Size = new System.Drawing.Size(177, 71);
+ this.groupBoxPhonebook.Size = new System.Drawing.Size(177, 67);
this.groupBoxPhonebook.TabIndex = 2;
this.groupBoxPhonebook.TabStop = false;
this.groupBoxPhonebook.Text = "Phone book settings";
@@ -221,7 +223,7 @@
//
this.checkBoxShowUnknownCaller.AutoSize = true;
this.checkBoxShowUnknownCaller.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.checkBoxShowUnknownCaller.Location = new System.Drawing.Point(24, 45);
+ this.checkBoxShowUnknownCaller.Location = new System.Drawing.Point(23, 41);
this.checkBoxShowUnknownCaller.Name = "checkBoxShowUnknownCaller";
this.checkBoxShowUnknownCaller.Size = new System.Drawing.Size(126, 17);
this.checkBoxShowUnknownCaller.TabIndex = 1;
@@ -247,7 +249,7 @@
this.groupBoxNotify.Controls.Add(this.checkBoxCloseOnConnectionClosed);
this.groupBoxNotify.Controls.Add(this.lblMaxNotifies);
this.groupBoxNotify.Controls.Add(this.numericUpDownMaxNotifies);
- this.groupBoxNotify.Controls.Add(this.checkBoxShowMSNOnNotify);
+ this.groupBoxNotify.Controls.Add(this.checkBoxShowPhoneNumberOnNotify);
this.groupBoxNotify.Controls.Add(this.buttonMSNsRemove);
this.groupBoxNotify.Controls.Add(this.checkBoxFilterMSNs);
this.groupBoxNotify.Controls.Add(this.buttonMSNsAdd);
@@ -306,16 +308,16 @@
0,
0});
//
- // checkBoxShowMSNOnNotify
+ // checkBoxShowPhoneNumberOnNotify
//
- this.checkBoxShowMSNOnNotify.AutoSize = true;
- this.checkBoxShowMSNOnNotify.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.checkBoxShowMSNOnNotify.Location = new System.Drawing.Point(6, 88);
- this.checkBoxShowMSNOnNotify.Name = "checkBoxShowMSNOnNotify";
- this.checkBoxShowMSNOnNotify.Size = new System.Drawing.Size(121, 17);
- this.checkBoxShowMSNOnNotify.TabIndex = 6;
- this.checkBoxShowMSNOnNotify.Text = "Show MSN on notify";
- this.checkBoxShowMSNOnNotify.UseVisualStyleBackColor = true;
+ this.checkBoxShowPhoneNumberOnNotify.AutoSize = true;
+ this.checkBoxShowPhoneNumberOnNotify.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.checkBoxShowPhoneNumberOnNotify.Location = new System.Drawing.Point(6, 88);
+ this.checkBoxShowPhoneNumberOnNotify.Name = "checkBoxShowPhoneNumberOnNotify";
+ this.checkBoxShowPhoneNumberOnNotify.Size = new System.Drawing.Size(122, 17);
+ this.checkBoxShowPhoneNumberOnNotify.TabIndex = 6;
+ this.checkBoxShowPhoneNumberOnNotify.Text = "Show phone number";
+ this.checkBoxShowPhoneNumberOnNotify.UseVisualStyleBackColor = true;
//
// buttonMSNsRemove
//
@@ -480,8 +482,8 @@
//
// tabPageConnection
//
+ this.tabPageConnection.Controls.Add(this.dialPortNumericUpDown);
this.tabPageConnection.Controls.Add(this.label2);
- this.tabPageConnection.Controls.Add(this.dialPort);
this.tabPageConnection.Controls.Add(this.vBPath);
this.tabPageConnection.Controls.Add(this.passwd);
this.tabPageConnection.Controls.Add(this.label3);
@@ -508,13 +510,6 @@
this.label2.TabIndex = 32;
this.label2.Text = "Voice box path (e. g. \\\\fritz.box\\FRITZ.NAS\\USBStore\\FRITZ\\voicebox)";
//
- // dialPort
- //
- this.dialPort.Location = new System.Drawing.Point(125, 151);
- this.dialPort.Name = "dialPort";
- this.dialPort.Size = new System.Drawing.Size(30, 20);
- this.dialPort.TabIndex = 30;
- //
// vBPath
//
this.vBPath.Location = new System.Drawing.Point(17, 216);
@@ -623,9 +618,9 @@
//
// tabPageMiscellaneous
//
+ this.tabPageMiscellaneous.Controls.Add(this.updateInterval);
this.tabPageMiscellaneous.Controls.Add(this.checkBoxExtensiveLogging);
this.tabPageMiscellaneous.Controls.Add(this.label4);
- this.tabPageMiscellaneous.Controls.Add(this.updateInterval);
this.tabPageMiscellaneous.Location = new System.Drawing.Point(4, 22);
this.tabPageMiscellaneous.Name = "tabPageMiscellaneous";
this.tabPageMiscellaneous.Padding = new System.Windows.Forms.Padding(3);
@@ -654,13 +649,46 @@
this.label4.TabIndex = 20;
this.label4.Text = "Auto update frequency (seconds)";
//
+ // dialPortNumericUpDown
+ //
+ this.dialPortNumericUpDown.Location = new System.Drawing.Point(129, 149);
+ this.dialPortNumericUpDown.Minimum = new decimal(new int[] {
+ 1,
+ 0,
+ 0,
+ 0});
+ this.dialPortNumericUpDown.Name = "dialPortNumericUpDown";
+ this.dialPortNumericUpDown.Size = new System.Drawing.Size(53, 20);
+ this.dialPortNumericUpDown.TabIndex = 33;
+ this.dialPortNumericUpDown.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
+ this.dialPortNumericUpDown.Value = new decimal(new int[] {
+ 1,
+ 0,
+ 0,
+ 0});
+ //
// updateInterval
//
- this.updateInterval.BorderColor = System.Drawing.Color.Empty;
- this.updateInterval.Location = new System.Drawing.Point(32, 47);
+ this.updateInterval.Location = new System.Drawing.Point(33, 45);
+ this.updateInterval.Maximum = new decimal(new int[] {
+ 999,
+ 0,
+ 0,
+ 0});
+ this.updateInterval.Minimum = new decimal(new int[] {
+ 30,
+ 0,
+ 0,
+ 0});
this.updateInterval.Name = "updateInterval";
- this.updateInterval.Size = new System.Drawing.Size(159, 20);
- this.updateInterval.TabIndex = 19;
+ this.updateInterval.Size = new System.Drawing.Size(47, 20);
+ this.updateInterval.TabIndex = 22;
+ this.updateInterval.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
+ this.updateInterval.Value = new decimal(new int[] {
+ 300,
+ 0,
+ 0,
+ 0});
//
// FritzBoxConfig
//
@@ -700,6 +728,8 @@
this.tabControlConfiguration.ResumeLayout(false);
this.tabPageMiscellaneous.ResumeLayout(false);
this.tabPageMiscellaneous.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.dialPortNumericUpDown)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.updateInterval)).EndInit();
this.ResumeLayout(false);
}
@@ -719,7 +749,7 @@
private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxCloseOnConnectionClosed;
private MediaPortal.UserInterface.Controls.MPLabel lblMaxNotifies;
private MediaPortal.UserInterface.Controls.MPNumericUpDown numericUpDownMaxNotifies;
- private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxShowMSNOnNotify;
+ private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxShowPhoneNumberOnNotify;
private MediaPortal.UserInterface.Controls.MPButton buttonMSNsRemove;
private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxFilterMSNs;
private MediaPortal.UserInterface.Controls.MPButton buttonMSNsAdd;
@@ -740,10 +770,8 @@
private System.Windows.Forms.Button buttonEditPhoneBook;
private System.Windows.Forms.TabPage tabPageMiscellaneous;
private System.Windows.Forms.Label label4;
- private MediaPortal.UserInterface.Controls.MPTextBox updateInterval;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.Label label2;
- private System.Windows.Forms.TextBox dialPort;
private System.Windows.Forms.TextBox vBPath;
private System.Windows.Forms.TextBox passwd;
private System.Windows.Forms.Label label3;
@@ -754,5 +782,7 @@
private MediaPortal.UserInterface.Controls.MPLabel labelPort;
private MediaPortal.UserInterface.Controls.MPLabel labelAddress;
private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxExtensiveLogging;
+ private MediaPortal.UserInterface.Controls.MPNumericUpDown dialPortNumericUpDown;
+ private MediaPortal.UserInterface.Controls.MPNumericUpDown updateInterval;
}
}
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2012-01-17 23:36:10 UTC (rev 4413)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2012-01-18 09:00:52 UTC (rev 4414)
@@ -57,7 +57,7 @@
numericUpDownPort.Value = FritzBoxClient.Port;
passwd.Text = Settings.Password;
- dialPort.Text = Settings.DialPort;
+ dialPortNumericUpDown.Text = Settings.DialPort;
vBPath.Text = Settings.VBPath;
@@ -76,8 +76,9 @@
comboBoxMSNs.Items.Clear();
comboBoxMSNs.Items.AddRange(Settings.MSNList.ToArray());
+ comboBoxMSNs.Text = Settings.MSNList[0];
- checkBoxShowMSNOnNotify.Checked = Settings.ShowMSNOnNotify;
+ checkBoxShowPhoneNumberOnNotify.Checked = Settings.ShowPhoneNumberOnNotify;
checkBoxPauseMediaOnIncomingCall.Checked = Settings.PauseMediaOnIncomingCall;
checkBoxResumeMediaOnIncomingCall.Checked = Settings.ResumeMediaOnIncomingCall;
@@ -91,7 +92,7 @@
mpIncomingSoundTextBox.Text = Settings.IncomingSoundPath;
// miscellaneous settings
- updateInterval.Text = Convert.ToString(Settings.UpdateInterval);
+ updateInterval.Text = Settings.UpdateInterval.ToString();
}
private void SaveSettings()
@@ -103,7 +104,7 @@
FritzBoxClient.Port = (int)numericUpDownPort.Value;
Settings.Password = passwd.Text;
- Settings.DialPort = dialPort.Text;
+ Settings.DialPort = dialPortNumericUpDown.Text;
Settings.VBPath = vBPath.Text;
@@ -114,14 +115,15 @@
Settings.CloseOnConnectionClosed = checkBoxCloseOnConnectionClosed.Checked;
Settings.FilterMSN = checkBoxFilterMSNs.Checked;
+
Settings.MSNList.Clear();
- foreach (object obj in comboBoxMSNs.Items)
+ foreach (string item in comboBoxMSNs.Items)
{
- Settings.MSNList.Add((string)obj);
+ Settings.MSNList.Add(item);
}
- Settings.ShowMSNOnNotify = checkBoxShowMSNOnNotify.Checked;
+ Settings.ShowPhoneNumberOnNotify = checkBoxShowPhoneNumberOnNotify.Checked;
Settings.PauseMediaOnIncomingCall = checkBoxPauseMediaOnIncomingCall.Checked;
Settings.ResumeMediaOnIncomingCall = checkBoxResumeMediaOnIncomingCall.Checked;
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs 2012-01-17 23:36:10 UTC (rev 4413)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs 2012-01-18 09:00:52 UTC (rev 4414)
@@ -85,8 +85,6 @@
{
if (normalizePhoneNumber(phoneNumber.Value) == normalizePhoneNumber(caller.PhoneNumber))
{
- if (Settings.ExtensiveLogging) Log.Info("Caller is identified by phone book as {0}", phoneBookItem.Name);
-
caller.PhoneBookItem = phoneBookItem;
return caller;
}
@@ -115,32 +113,6 @@
if (phoneBook.Count != 0) Log.Info("Loaded " + phoneBook.Count + " contacts from " + Settings.PhoneBookFilePath);
}
- public void SavePhoneBookToXMLFile()
- {
- if (phoneBookSaveIsRequired)
- {
- InternalPhoneBook internalPhoneBook = new InternalPhoneBook();
-
- foreach (PhoneBookItem phoneBookItem in phoneBook.Values)
- {
- internalPhoneBook.items.Add(phoneBookItem);
- }
-
- if (internalPhoneBook.items.Count > 0)
- {
- XmlSerializer xmlSerializer = new XmlSerializer(typeof(InternalPhoneBook));
- TextWriter textWriter = new StreamWriter(Settings.PhoneBookFilePath);
- xmlSerializer.Serialize(textWriter, internalPhoneBook);
- textWriter.Close();
-
- Log.Info("Saved " + internalPhoneBook.items.Count + " contacts to {0}", Settings.PhoneBookFilePath);
- }
- else Log.Info("No changes, no contacts saved");
- }
-
- phoneBookSaveIsRequired = false;
- }
-
public bool SynchronizePhoneBook()
{
bool phoneBookChanges = false; // second field is required to determine if GUI phone book update is required
@@ -164,48 +136,50 @@
FritzManager.PhoneBook fritzPhoneBook = fritzPhoneBooks.Items[0]; // always choose first phone book
PhoneBookItem newPhoneBookItem;
bool updateRequired, contactFound;
- string name, uniqueID = null, imageURL;
+ string name, uniqueID = null, imageURL, lastContactName = "";
// check if FRITZ!Box phone book has unique ID field. Older FRITZ!Box models e. g. 7170 and 7320 doesn't have an unique ID field in it's address book
- if (fritzPhoneBook.contact[0].uniqueid == null) Log.Debug("FRITZ!Box phone book doesn't have an unique ID field. Synchronizing contacts in compatibility mode. Multiple contacts with the same name won't be shown and cause update actions on every synchronization!");
+ if (fritzPhoneBook.contact[0].uniqueid == null) Log.Debug("FRITZ!Box phone book doesn't have an unique ID field. Synchronizing contacts in compatibility mode. Multiple contacts with the same name won't be synchronized!");
lock (sync)
{
- // update/add entries from FRITZ!Box phone book to local phone book
- foreach (Contact contact in fritzPhoneBook.contact)
- {
- name = contact.person[0].realName;
- imageURL = contact.person[0].imageURL;
+ // update/add entries from FRITZ!Box phone book to local phone book
+ foreach (Contact contact in fritzPhoneBook.contact)
+ {
+ name = contact.person[0].realName;
+ imageURL = contact.person[0].imageURL;
- if (fritzPhoneBook.contact[0].uniqueid != null) uniqueID = contact.uniqueid;
- else uniqueID = name; // in compatibility mode the name is used as unique ID
+ if (fritzPhoneBook.contact[0].uniqueid != null) uniqueID = contact.uniqueid;
+ else uniqueID = name; // in compatibility mode the name is used as unique ID
- updateRequired = false;
+ updateRequired = false;
- // search if FRITZ!Box contact already exists in phone book
- if (phoneBook.ContainsKey(uniqueID))
+ // search if FRITZ!Box contact already exists in phone book
+ if (phoneBook.ContainsKey(uniqueID))
+ {
+ // check for differences
+ // ...on name and image URL fields
+ if (phoneBook[uniqueID].Name != name || imageURL != phoneBook[uniqueID].ImageURL) updateRequired = true;
+
+ // ...on phone numbers
+ for (int i = 0; i < contact.telephony.Length; i++)
{
- // check for differences
- // ...on name and image URL fields
- if (phoneBook[uniqueID].Name != name || imageURL != phoneBook[uniqueID].ImageURL) updateRequired = true;
-
- // ...on phone numbers
- for (int i = 0; i < contact.telephony.Length; i++)
+ try
{
- try
- {
- if (!contact.telephony[i].Equals(phoneBook[uniqueID].PhoneNumbers[i])) updateRequired = true;
- }
- catch
- {
- // on property changes the differences check may fail
- Log.Debug("Phone book difference check failed. Forcing contact update");
- updateRequired = true;
- break;
- }
+ if (!contact.telephony[i].Equals(phoneBook[uniqueID].PhoneNumbers[i])) updateRequired = true;
}
+ catch
+ {
+ // on property changes the differences check may fail
+ Log.Debug("Phone book difference check failed. Forcing contact update");
+ updateRequired = true;
+ break;
+ }
+ }
- if (updateRequired)
+ if (updateRequired)
+ {
+ if (uniqueID != lastContactName)
{
if (Settings.ExtensiveLogging) Log.Info("Updating contact " + phoneBook[uniqueID].Name);
else Log.Info("Updating contact");
@@ -216,74 +190,87 @@
phoneBookChanges = true;
}
+ else
+ {
+ // avoid double synchronization on multiple contacts with the same name in compatibility mode
+ if (Settings.ExtensiveLogging) Log.Info("Contact " + phoneBook[uniqueID].Name + " is skipped because there are multiple contacts with the same name");
+ else Log.Info("One contact is skipped because there are multiple contacts with the same name");
+ }
}
- else
- {
- if (Settings.ExtensiveLogging) Log.Info("Adding contact " + name);
- else Log.Info("Adding contact");
+ }
+ else
+ {
+ if (Settings.ExtensiveLogging) Log.Info("Adding contact " + name);
+ else Log.Info("Adding contact");
- newPhoneBookItem = new PhoneBookItem();
- newPhoneBookItem.UniqueID = uniqueID;
- newPhoneBookItem.Name = name;
- newPhoneBookItem.PhoneNumbers = contact.telephony;
- newPhoneBookItem.ImageURL = imageURL;
+ newPhoneBookItem = new PhoneBookItem();
+ newPhoneBookItem.UniqueID = uniqueID;
+ newPhoneBookItem.Name = name;
+ newPhoneBookItem.PhoneNumbers = contact.telephony;
+ newPhoneBookItem.ImageURL = imageURL;
- phoneBook.Add(uniqueID, newPhoneBookItem);
+ phoneBook.Add(uniqueID, newPhoneBookItem);
- phoneBookSortIsRequired = true;
- phoneBookChanges = true;
- }
+ phoneBookSortIsRequired = true;
+ phoneBookChanges = true;
}
- // check for obsolete entries in local phone book (not existing in FRITZ!Box phone book anymore)
- string[] contactsToDelete = new string[phoneBook.Count];
- int k = 0;
- string uniqueIDOnFritzBox;
+ lastContactName = name; // remember last contact name to avoid double synchronization on multiple contacts with the same name in compatibility mode
+ }
- foreach (PhoneBookItem phoneBookItem in phoneBook.Values)
+ // check for obsolete entries in local phone book (not existing in FRITZ!Box phone book anymore)
+ string[] contactsToDelete = new string[phoneBook.Count];
+ int k = 0;
+ string uniqueIDOnFritzBox;
+
+ foreach (PhoneBookItem phoneBookItem in phoneBook.Values)
+ {
+ contactFound = false;
+
+ foreach (Contact contact in fritzPhoneBook.contact)
{
- contactFound = false;
+ name = contact.person[0].realName;
- foreach (Contact contact in fritzPhoneBook.contact)
+ if (contact.uniqueid != null)
{
- name = contact.person[0].realName;
-
- if (contact.uniqueid != null) uniqueID = phoneBookItem.UniqueID;
- else uniqueID = phoneBookItem.Name; // in compatibility mode the name is used as unique ID
-
- if (fritzPhoneBook.contact[0].uniqueid != null) uniqueIDOnFritzBox = contact.uniqueid;
- else uniqueIDOnFritzBox = name; // in compatibility mode the name is used as unique ID
-
- if (uniqueID == uniqueIDOnFritzBox)
- {
- contactFound = true;
- break;
- }
+ uniqueID = phoneBookItem.UniqueID;
+ uniqueIDOnFritzBox = contact.uniqueid;
}
+ else
+ {
+ // in compatibility mode the name is used as unique ID
+ uniqueID = phoneBookItem.Name;
+ uniqueIDOnFritzBox = name;
+ }
- if (!contactFound)
+ if (uniqueID == uniqueIDOnFritzBox)
{
- contactsToDelete[k] = uniqueID;
- k++;
+ contactFound = true;
break;
}
}
- foreach (string _uniqueID in contactsToDelete) // contacts cannot be deleted in above foreach loop, a second loop is required
- {
- if (_uniqueID != null)
- {
- if (Settings.ExtensiveLogging) Log.Info("Removing contact " + phoneBook[_uniqueID].Name);
- else Log.Info("Removing contact");
+ if (!contactFound)
+ {
+ contactsToDelete[k] = uniqueID;
+ k++;
+ }
+ }
- phoneBook.Remove(_uniqueID);
+ foreach (string _uniqueID in contactsToDelete) // contacts cannot be deleted in above foreach loop, a second loop is required
+ {
+ if (_uniqueID != null)
+ {
+ if (Settings.ExtensiveLogging) Log.Info("Removing contact " + phoneBook[_uniqueID].Name);
+ else Log.Info("Removing contact");
- phoneBookChanges = true;
- }
- else break;
- }
+ phoneBook.Remove(_uniqueID);
+
+ phoneBookChanges = true;
+ }
+ else break;
+ }
}
-
Log.Info("Synchronized " + phoneBook.Count + " contacts with FRITZ!Box");
}
}
@@ -312,6 +299,10 @@
if (phoneBookChanges)
{
phoneBookSaveIsRequired = true;
+
+ // save phone book
+ SavePhoneBookToXMLFile();
+
return true;
}
else return false;
@@ -454,7 +445,33 @@
}
}
}
+
+ public void SavePhoneBookToXMLFile()
+ {
+ if (phoneBookSaveIsRequired)
+ {
+ InternalPhoneBook internalPhoneBook = new InternalPhoneBook();
+ foreach (PhoneBookItem phoneBookItem in phoneBook.Values)
+ {
+ internalPhoneBook.items.Add(phoneBookItem);
+ }
+
+ if (internalPhoneBook.items.Count > 0)
+ {
+ XmlSerializer xmlSerializer = new XmlSerializer(typeof(InternalPhoneBook));
+ TextWriter textWriter = new StreamWriter(Settings.PhoneBookFilePath);
+ xmlSerializer.Serialize(textWriter, internalPhoneBook);
+ textWriter.Close();
+
+ Log.Info("Saved " + internalPhoneBook.items.Count + " contacts to {0}", Settings.PhoneBookFilePath);
+ }
+ else Log.Info("No changes, no contacts saved");
+ }
+
+ phoneBookSaveIsRequired = false;
+ }
+
#endregion public methods
#region private methods
Modified: trunk/plugins/FritzBox/FritzBox/Settings.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Settings.cs 2012-01-17 23:36:10 UTC (rev 4413)
+++ trunk/plugins/FritzBox/FritzBox/Settings.cs 2012-01-18 09:00:52 UTC (rev 4414)
@@ -82,7 +82,7 @@
public static bool CloseOnConnectionClosed { get; set; }
- public static bool ShowMSNOnNotify { get; set; }
+ public static bool ShowPhoneNumberOnNotify { get; set; }
public static bool ShowUnknownCaller { get; set; }
@@ -154,7 +154,7 @@
if (decryptedPassword != null) Password = decryptedPassword;
else Password = xmlreader.GetValue("FritzManager", "passwd"); // if the password was not encrypted read it in clear text (for older FritzBox Manager versions)
- DialPort = xmlreader.GetValue("FritzManager", "dialport");
+ DialPort = xmlreader.GetValueAsString("FritzManager", "dialport", "1");
VBPath = xmlreader.GetValue("FritzManager", "vBPath");
// phone book settings
@@ -167,11 +167,13 @@
CloseOnConnectionClosed = xmlreader.GetValueAsBool("fritzbox", "closeOnConnectionClosed", true);
FilterMSN = xmlreader.GetValueAsBool("fritzbox", "filterMSNs", false);
+
string strMSN = xmlreader.GetValueAsString("fritzbox", "MSN", "");
char[] charSeparators = new[] { ';' };
+ MSNList.Clear(); // necessary to avoid multiple entries when FRITZ!Box Manager configuration window is closed and re-opened without closing the MediaPortal Configuration window
MSNList.AddRange(strMSN.Split(charSeparators, StringSplitOptions.RemoveEmptyEntries));
- ShowMSNOnNotify = xmlreader.GetValueAsBool("fritzbox", "showMSNOnNotify", true);
+ ShowPhoneNumberOnNotify = xmlreader.GetValueAsBool("fritzbox", "showPhoneNumberOnNotify", true);
ShowUnknownCaller = xmlreader.GetValueAsBool("fritzbox", "showUnknownCaller", true);
@@ -186,6 +188,8 @@
// miscellaneous settings
UpdateInterval = xmlreader.GetValueAsInt("FritzManager", "updateInterval", 300);
+ if (UpdateInterval < 30) UpdateInterval = 30; // ensure that update timer interval is not smaller than 30 seconds
+
ExtensiveLogging = xmlreader.GetValueAsBool("fritzbox", "extensiveLogging", false);
// GUI settings
@@ -225,6 +229,8 @@
xmlreader.RemoveEntry("FritzManager", "defaultAreacode");
xmlreader.RemoveEntry("fritzbox", "saveUnknownCaller");
+
+ xmlreader.RemoveEntry("fritzbox", "showMSNOnNotify");
}
}
@@ -249,14 +255,17 @@
xmlwriter.SetValueAsBool("fritzbox", "closeOnConnectionClosed", CloseOnConnectionClosed);
xmlwriter.SetValueAsBool("fritzbox", "filterMSNs", FilterMSN);
+
string strMSN = "";
+
foreach (string mSN in MSNList)
{
strMSN += mSN + ";";
}
+
xmlwriter.SetValue("fritzbox", "MSN", strMSN);
- xmlwriter.SetValueAsBool("fritzbox", "showMSNOnNotify", ShowMSNOnNotify);
+ xmlwriter.SetValueAsBool("fritzbox", "showPhoneNumberOnNotify", ShowPhoneNumberOnNotify);
xmlwriter.SetValueAsBool("fritzbox", "usePhonebook", PhoneBookEnabled);
@@ -269,7 +278,6 @@
xmlwriter.SetValueAsBool("fritzbox", "resumeMediaOnOutgoingCall", ResumeMediaOnOutgoingCall);
// miscellaneous settings
- if (UpdateInterval < 30) UpdateInterval = 30; // ensure that update timer interval is not smaller than 30 seconds
xmlwriter.SetValue("FritzManager", "updateInterval", UpdateInterval);
xmlwriter.SetValueAsBool("fritzbox", "extensiveLogging", ExtensiveLogging);
Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/GenerateResource-ResGen.read.1.tlog
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2012-01-17 23:36:10 UTC (rev 4413)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2012-01-18 09:00:52 UTC (rev 4414)
@@ -559,7 +559,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4403</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4413</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -582,7 +582,7 @@
<Major>0</Major>
<Minor>4</Minor>
<Build>0</Build>
- <Revision>4403</Revision>
+ <Revision>4413</Revision>
</Version>
<ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box informations from MediaPortal.
@@ -596,7 +596,7 @@
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
- <ReleaseDate>2012-01-14T18:41:32.7676728+01:00</ReleaseDate>
+ <ReleaseDate>2012-01-18T09:46:50.1990036+01:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/ResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/ResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Added: trunk/plugins/FritzBox/releases/FritzBox_v0.4.0.4413.mpe1
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/releases/FritzBox_v0.4.0.4413.mpe1
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/FritzBox/releases/update.xml
===================================================================
--- trunk/plugins/FritzBox/releases/update.xml 2012-01-17 23:36:10 UTC (rev 4413)
+++ trunk/plugins/FritzBox/releases/update.xml 2012-01-18 09:00:52 UTC (rev 4414)
@@ -88,7 +88,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4403</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4413</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -111,7 +111,7 @@
<Major>0</Major>
<Minor>4</Minor>
<Build>0</Build>
- <Revision>4403</Revision>
+ <Revision>4413</Revision>
</Version>
<ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box informations from MediaPortal.
@@ -125,7 +125,7 @@
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
- <ReleaseDate>2012-01-14T18:41:32.7676728+01:00</ReleaseDate>
+ <ReleaseDate>2012-01-18T09:46:50.1990036+01:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Param...
[truncated message content] |
