Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4563] trunk/plugins/FritzBox
|
From: <hor...@us...> - 2013-04-18 21:10:14
|
Revision: 4563
http://sourceforge.net/p/mp-plugins/code/4563
Author: horned-reaper
Date: 2013-04-18 21:09:57 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/Docs/Changes.txt
trunk/plugins/FritzBox/FritzBox/FritzBox.cs
trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs
trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_el.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_en-US.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_es.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_fr.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_it.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_nl.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_ru.xml
trunk/plugins/FritzBox/FritzBox/Settings.cs
trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml
trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml
trunk/plugins/FritzBox/FritzBox/Skin/Titan/FritzManager.xml
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
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.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/releases/update.xml
Added Paths:
-----------
trunk/plugins/FritzBox/FritzBox/Languages/strings_en-GB.xml
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_in.png
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_out.png
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_unanswered.png
trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_in.png
trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_out.png
trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_unanswered.png
trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_in.png
trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_out.png
trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_unanswered.png
trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_in.png
trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_out.png
trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_unanswered.png
trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/Call_in.png
trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/Call_out.png
trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/Call_unanswered.png
trunk/plugins/FritzBox/FritzBox/Skin/Maya/Media/FritzBox/Call_in.png
trunk/plugins/FritzBox/FritzBox/Skin/Maya/Media/FritzBox/Call_out.png
trunk/plugins/FritzBox/FritzBox/Skin/Maya/Media/FritzBox/Call_unanswered.png
trunk/plugins/FritzBox/FritzBox/Skin/Streamed MP/Media/FritzBox/Call_in.png
trunk/plugins/FritzBox/FritzBox/Skin/Streamed MP/Media/FritzBox/Call_out.png
trunk/plugins/FritzBox/FritzBox/Skin/Streamed MP/Media/FritzBox/Call_unanswered.png
trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/Call_in.png
trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/Call_out.png
trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/Call_unanswered.png
trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/DefaultInboxBig.png
trunk/plugins/FritzBox/FritzBox/bin/x86/
trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4562.mpe1
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/Build/Build.log 2013-04-18 21:09:57 UTC (rev 4563)
@@ -1,6 +1,6 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4556
+SVN Version: 4562
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs
@@ -11,7 +11,7 @@
Copyright (C) Microsoft Corporation. Alle Rechte vorbehalten.
Die Projekte in dieser Projektmappe werden nacheinander erstellt. Um eine parallele Erstellung zu erm\x94glichen, m\x81ssen Sie den Schalter "/m" hinzuf\x81gen.
-Der Buildvorgang wurde am 23.03.2013 14:04:23 gestartet.
+Der Buildvorgang wurde am 18.04.2013 23:01:40 gestartet.
Projekt "D:\FritzBox\FritzBox.sln" auf Knoten "1", Rebuild Ziel(e).
ValidateSolutionConfiguration:
Die Projektmappenkonfiguration "Release|Any CPU" wird erstellt.
@@ -120,7 +120,7 @@
0 Warnung(en)
0 Fehler
-Verstrichene Zeit 00:00:01.34
+Verstrichene Zeit 00:00:50.43
Reverting to build 0
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
@@ -137,6 +137,9 @@
..\FritzBox\Skin\Avalon\Media\FritzBox\CallMonitor.Missing.png
..\FritzBox\Skin\Avalon\Media\FritzBox\CallMonitor.Unknown.png
..\FritzBox\Skin\Avalon\Media\FritzBox\callout.png
+..\FritzBox\Skin\Avalon\Media\FritzBox\Call_in.png
+..\FritzBox\Skin\Avalon\Media\FritzBox\Call_out.png
+..\FritzBox\Skin\Avalon\Media\FritzBox\Call_unanswered.png
..\FritzBox\Skin\Avalon\Media\FritzBox\Phone_Icon_Home.png
..\FritzBox\Skin\Avalon\Media\FritzBox\Phone_Icon_Mobile.png
..\FritzBox\Skin\Avalon\Media\FritzBox\Phone_Icon_Work.png
@@ -147,6 +150,9 @@
..\FritzBox\Skin\Black & White\Media\FritzBox\CallMonitor.Missing.png
..\FritzBox\Skin\Black & White\Media\FritzBox\CallMonitor.Unknown.png
..\FritzBox\Skin\Black & White\Media\FritzBox\callout.png
+..\FritzBox\Skin\Black & White\Media\FritzBox\Call_in.png
+..\FritzBox\Skin\Black & White\Media\FritzBox\Call_out.png
+..\FritzBox\Skin\Black & White\Media\FritzBox\Call_unanswered.png
..\FritzBox\Skin\Black & White\Media\FritzBox\Phone_Icon_Home.png
..\FritzBox\Skin\Black & White\Media\FritzBox\Phone_Icon_Mobile.png
..\FritzBox\Skin\Black & White\Media\FritzBox\Phone_Icon_Work.png
@@ -157,6 +163,9 @@
..\FritzBox\Skin\Blue3\Media\FritzBox\CallMonitor.Missing.png
..\FritzBox\Skin\Blue3\Media\FritzBox\CallMonitor.Unknown.png
..\FritzBox\Skin\Blue3\Media\FritzBox\callout.png
+..\FritzBox\Skin\Blue3\Media\FritzBox\Call_in.png
+..\FritzBox\Skin\Blue3\Media\FritzBox\Call_out.png
+..\FritzBox\Skin\Blue3\Media\FritzBox\Call_unanswered.png
..\FritzBox\Skin\Blue3\Media\FritzBox\Phone_Icon_Home.png
..\FritzBox\Skin\Blue3\Media\FritzBox\Phone_Icon_Mobile.png
..\FritzBox\Skin\Blue3\Media\FritzBox\Phone_Icon_Work.png
@@ -167,6 +176,9 @@
..\FritzBox\Skin\Default\Media\FritzBox\CallMonitor.Missing.png
..\FritzBox\Skin\Default\Media\FritzBox\CallMonitor.Unknown.png
..\FritzBox\Skin\Default\Media\FritzBox\callout.png
+..\FritzBox\Skin\Default\Media\FritzBox\Call_in.png
+..\FritzBox\Skin\Default\Media\FritzBox\Call_out.png
+..\FritzBox\Skin\Default\Media\FritzBox\Call_unanswered.png
..\FritzBox\Skin\Default\Media\FritzBox\Phone_Icon_Home.png
..\FritzBox\Skin\Default\Media\FritzBox\Phone_Icon_Mobile.png
..\FritzBox\Skin\Default\Media\FritzBox\Phone_Icon_Work.png
@@ -177,6 +189,9 @@
..\FritzBox\Skin\DefaultWide\Media\FritzBox\CallMonitor.Missing.png
..\FritzBox\Skin\DefaultWide\Media\FritzBox\CallMonitor.Unknown.png
..\FritzBox\Skin\DefaultWide\Media\FritzBox\callout.png
+..\FritzBox\Skin\DefaultWide\Media\FritzBox\Call_in.png
+..\FritzBox\Skin\DefaultWide\Media\FritzBox\Call_out.png
+..\FritzBox\Skin\DefaultWide\Media\FritzBox\Call_unanswered.png
..\FritzBox\Skin\DefaultWide\Media\FritzBox\Phone_Icon_Home.png
..\FritzBox\Skin\DefaultWide\Media\FritzBox\Phone_Icon_Mobile.png
..\FritzBox\Skin\DefaultWide\Media\FritzBox\Phone_Icon_Work.png
@@ -187,10 +202,16 @@
..\FritzBox\Skin\Maya\Media\FritzBox\CallMonitor.Missing.png
..\FritzBox\Skin\Maya\Media\FritzBox\CallMonitor.Unknown.png
..\FritzBox\Skin\Maya\Media\FritzBox\callout.png
+..\FritzBox\Skin\Maya\Media\FritzBox\Call_in.png
+..\FritzBox\Skin\Maya\Media\FritzBox\Call_out.png
+..\FritzBox\Skin\Maya\Media\FritzBox\Call_unanswered.png
..\FritzBox\Skin\Maya\Media\FritzBox\Phone_Icon_Home.png
..\FritzBox\Skin\Maya\Media\FritzBox\Phone_Icon_Mobile.png
..\FritzBox\Skin\Maya\Media\FritzBox\Phone_Icon_Work.png
..\FritzBox\Skin\Maya\Media\FritzBox\rejected.png
+..\FritzBox\Skin\Streamed MP\Media\FritzBox\Call_in.png
+..\FritzBox\Skin\Streamed MP\Media\FritzBox\Call_out.png
+..\FritzBox\Skin\Streamed MP\Media\FritzBox\Call_unanswered.png
..\FritzBox\Skin\Streamed MP\Media\FritzBox\Phone_Icon_Home.png
..\FritzBox\Skin\Streamed MP\Media\FritzBox\Phone_Icon_Mobile.png
..\FritzBox\Skin\Streamed MP\Media\FritzBox\Phone_Icon_Work.png
@@ -202,13 +223,18 @@
..\FritzBox\Skin\Titan\Media\FritzBox\CallMonitor.Missing.png
..\FritzBox\Skin\Titan\Media\FritzBox\CallMonitor.Unknown.png
..\FritzBox\Skin\Titan\Media\FritzBox\callout.png
+..\FritzBox\Skin\Titan\Media\FritzBox\Call_in.png
+..\FritzBox\Skin\Titan\Media\FritzBox\Call_out.png
+..\FritzBox\Skin\Titan\Media\FritzBox\Call_unanswered.png
+..\FritzBox\Skin\Titan\Media\FritzBox\DefaultInboxBig.png
..\FritzBox\Skin\Titan\Media\FritzBox\Phone_Icon_Home.png
..\FritzBox\Skin\Titan\Media\FritzBox\Phone_Icon_Mobile.png
..\FritzBox\Skin\Titan\Media\FritzBox\Phone_Icon_Work.png
..\FritzBox\Skin\Titan\Media\FritzBox\rejected.png
-75 Datei(en) kopiert
+100 Datei(en) kopiert
..\FritzBox\Languages\strings_de.xml
..\FritzBox\Languages\strings_el.xml
+..\FritzBox\Languages\strings_en-GB.xml
..\FritzBox\Languages\strings_en-US.xml
..\FritzBox\Languages\strings_en.xml
..\FritzBox\Languages\strings_es.xml
@@ -243,9 +269,9 @@
..\FritzBox\Languages\Unsupported\strings_tr.xml
..\FritzBox\Languages\Unsupported\strings_uk.xml
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
-36 Datei(en) kopiert
+37 Datei(en) kopiert
MpeMaker version: 1.3.0.0
-Build started at 14:04:26
+Build started at 23:03:01
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Modified: trunk/plugins/FritzBox/Docs/Changes.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Changes.txt 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/Docs/Changes.txt 2013-04-18 21:09:57 UTC (rev 4563)
@@ -1,7 +1,3 @@
-1.0.0.4556:
-Optimiziation:
-- skin adjustments
-
-Fixed bugs:
-- call type "outgoing" filter does not work
-- Avalon skin is selected per default on Installer
\ No newline at end of file
+1.0.0.4562:
+Fixed bug:
+- incoming call notifications aren't shown when option "Show on outgoing call" is disabled and an outgoing call has been done
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2013-04-18 21:09:57 UTC (rev 4563)
@@ -49,7 +49,7 @@
All = 0,
Incoming = 1,
Outgoing = 2,
- Rejected = 3
+ Unanswered = 3
}
[PluginIcons("FritzBox.FritzBox.png", "FritzBox.FritzBoxDisabled.png")]
@@ -127,6 +127,11 @@
Log.Info("\"Auto-close after connection is closed\" setting is enabled");
closeNotificationWindow();
}
+
+ currentConnectionID = null;
+
+ // update call list
+ worker.EnqueueTask(new Task(Task.TaskAction.LoadCallListItems, null));
break;
default:
Log.Error("Incorrect call type");
@@ -284,9 +289,6 @@
// show call notification
showNotificationWindow(callAction.Type, strHeading, strImage, strText);
-
- // update call list
- worker.EnqueueTask(new Task(Task.TaskAction.LoadCallListItems, null));
}
}
}
@@ -477,8 +479,6 @@
notificationWindowCloseTimer.Elapsed += OnCloseNotificationWindowTimerEvent;
notificationWindowCloseTimer.Start();
}
-
- currentConnectionID = null;
}
else Log.Debug("Notification window wasn't opened");
}
@@ -963,7 +963,7 @@
/// <param name="data">holds CSV list</param>
protected void refreshCallListData(byte[] data)
{
- List<CallItem> newCallItemList = CallItem.load(new MemoryStream(data));
+ List<CallItem> newCallItemList = CallItem.Load(new MemoryStream(data));
int i = 0;
bool callItemListChanged = false;
@@ -1173,8 +1173,8 @@
}
else
{
- if (newVoiceBoxItemsCount > 1) GUIPropertyManager.SetProperty("#FritzManager.NewMessages", newVoiceBoxItemsCount + " " + LocalizeStrings.Get(7)); // 7 = Messages
- else GUIPropertyManager.SetProperty("#FritzManager.NewMessages", newVoiceBoxItemsCount + " " + LocalizeStrings.Get(27)); // 27 = Message
+ if (newVoiceBoxItemsCount > 1) GUIPropertyManager.SetProperty("#FritzManager.NewMessages", newVoiceBoxItemsCount + " " + LocalizeStrings.Get(19) + " " + LocalizeStrings.Get(7)); // 7 = Messages
+ else GUIPropertyManager.SetProperty("#FritzManager.NewMessages", newVoiceBoxItemsCount + " " + LocalizeStrings.Get(19) + " " + LocalizeStrings.Get(27)); // 27 = Message
GUIPropertyManager.SetProperty("#FritzManager.Caller", lastNewCallerName);
GUIPropertyManager.SetProperty("#FritzManager.NewMessageCount", newVoiceBoxItemsCount.ToString());
@@ -1215,16 +1215,16 @@
foreach (CallItem item in callItemList)
{
GUIListItem elem = new GUIListItem();
- Caller caller = phoneBook.FindContactEntries(item.number); ;
+ Caller caller = phoneBook.FindContactEntries(item.Number); ;
i++;
// apply call type filter
if (Settings.CurrentFilter == CallListFilter.Incoming) if (item.type != 1) continue;
- if (Settings.CurrentFilter == CallListFilter.Rejected) if (item.type != 2) continue;
- if (Settings.CurrentFilter == CallListFilter.Outgoing) if (item.type != 4 && item.type != 3) continue; // since FRITZ!OS 5.5 this type number is 4
+ if (Settings.CurrentFilter == CallListFilter.Unanswered) if (item.type != 2) continue;
+ if (Settings.CurrentFilter == CallListFilter.Outgoing) if (item.type != 4 && item.type != 3) continue; // since FRITZ!OS 5.50 this type number is 4
- elem.Label = item.timestamp.ToString(format, ci) + " - " + item.duration.ToString("HH:mm", ci);
+ elem.Label = item.TimeStamp.ToString(format, ci) + " - " + item.Duration.ToString("HH:mm", ci);
// add caller name/phone number
if (caller.MatchedPhoneBookItems != null) elem.Label2 = caller.MatchedPhoneBookEntryNamesAndPhoneTypes;
@@ -1234,7 +1234,7 @@
else elem.Label2 = LocalizeStrings.Get(3); // 3 = Unknown
}
- elem.DVDLabel = item.mynumber + item.extension;
+ elem.DVDLabel = item.MyNumber + item.Extension;
elem.Path = Convert.ToString(i);
@@ -1245,9 +1245,9 @@
string prefix = "FritzBox\\";
string icon = "defaultAudioBig.png";
- if (item.type == 1) icon = prefix + "callin.png";
- else if (item.type == 4 || item.type == 3) icon = prefix + "callout.png"; // since FRITZ!OS 5.5 this type number is 4
- else if (item.type == 2) icon = prefix + "rejected.png";
+ if (item.type == 1) icon = prefix + "Call_in.png";
+ else if (item.type == 4 || item.type == 3) icon = prefix + "Call_out.png"; // since FRITZ!OS 5.50 this type number is 4
+ else if (item.type == 2) icon = prefix + "Call_unanswered.png";
elem.IconImageBig = icon;
elem.IconImage = icon;
@@ -1427,9 +1427,9 @@
Settings.CurrentFilter = CallListFilter.Outgoing;
break;
case CallListFilter.Outgoing:
- Settings.CurrentFilter = CallListFilter.Rejected;
+ Settings.CurrentFilter = CallListFilter.Unanswered;
break;
- case CallListFilter.Rejected:
+ case CallListFilter.Unanswered:
Settings.CurrentFilter = CallListFilter.All;
break;
}
@@ -1468,7 +1468,7 @@
{
bool callActionEnabled = false;
- if (callItemList[Convert.ToInt16(facadeView.SelectedListItem.Path)].number != String.Empty) callActionEnabled = true;
+ if (callItemList[Convert.ToInt16(facadeView.SelectedListItem.Path)].Number != String.Empty) callActionEnabled = true;
GUIDialogMenu dlgMenu = (GUIDialogMenu)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU);
@@ -1565,8 +1565,8 @@
case CallListFilter.Outgoing:
strLine = LocalizeStrings.Get(16); // 16 = Outgoing
break;
- case CallListFilter.Rejected:
- strLine = LocalizeStrings.Get(17); // 17 = Rejected
+ case CallListFilter.Unanswered:
+ strLine = LocalizeStrings.Get(17); // 17 = Unanswered
break;
}
@@ -1580,15 +1580,15 @@
switch (Settings.CurrentMode)
{
case GUIMode.VoiceBox:
- if (headerLabel != null) headerLabel.Label = LocalizeStrings.Get(19); // 19 = FRITZ!Box messages
+ if (headerLabel != null) headerLabel.Label = LocalizeStrings.Get(7); // 7 = Messages
btnMode.Label = LocalizeStrings.Get(18); // 18 = Call list
break;
case GUIMode.CallList:
- if (headerLabel != null) headerLabel.Label = LocalizeStrings.Get(21); // 21 = FRITZ!Box call list
+ if (headerLabel != null) headerLabel.Label = LocalizeStrings.Get(18); // 18 = Call list
btnMode.Label = LocalizeStrings.Get(20); // 20 = Phone book
break;
case GUIMode.PhoneBook:
- if (headerLabel != null) headerLabel.Label = LocalizeStrings.Get(22); // 22 = FRITZ!Box phone book
+ if (headerLabel != null) headerLabel.Label = LocalizeStrings.Get(20); // // 20 = Phone book
btnMode.Label = LocalizeStrings.Get(7); // 7 = Messages
break;
}
Modified: trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs 2013-04-18 21:09:57 UTC (rev 4563)
@@ -88,7 +88,6 @@
private static ManualResetEvent connectDone = new ManualResetEvent(false); // ensures that the thread doesn't end before the socket is connected (avoids error message "A request to send or receive data was disallowed because the socket is not connected and (when sending on a datagram socket using a sendto call) no address was supplied")
private static System.Timers.Timer connectionCheckTimer = new System.Timers.Timer();
private static IPEndPoint remoteEP;
-
#region Properties
static FritzBoxClient()
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs 2013-04-18 21:09:57 UTC (rev 4563)
@@ -8,28 +8,28 @@
namespace FritzManager
{
/// <summary>
- /// Model of one call item record. read from fritz CSV exports
+ /// Model of one call item record. Read from FRITZ CSV exports
/// </summary>
public class CallItem : System.IEquatable<CallItem>
{
- public DateTime duration;
- public string extension; // in German "Nebenstelle"
- public string mynumber;
- public string name;
- public string number;
- public DateTime timestamp;
+ public DateTime Duration;
+ public string Extension; // in German "Nebenstelle"
+ public string MyNumber;
+ public string Name;
+ public string Number;
+ public DateTime TimeStamp;
public int type;
private static Logger Log = LoggerFactory.getLogger("CallItem");
public static List<CallItem> loadFromFile(string filename)
{
Stream s = new FileStream(filename, FileMode.Open);
- List<CallItem> r = load(s);
+ List<CallItem> r = Load(s);
s.Close();
return r;
}
- public static List<CallItem> load(Stream s)
+ public static List<CallItem> Load(Stream s)
{
List<CallItem> result = new List<CallItem>();
@@ -42,7 +42,11 @@
string cutOffPrefix = "49";
string line;
- for (int i = 0; i < 3; i++) reader.ReadLine(); // skip first three lines
+ if (FritzBox.Settings.FritzBoxFirmwareMainVersion > 5 || (FritzBox.Settings.FritzBoxFirmwareMainVersion == 5 && FritzBox.Settings.FritzBoxFirmwareSubVersion >= 50))
+ {
+ for (int i = 0; i < 2; i++) reader.ReadLine(); // skip first two lines on firmware version 5.50 or higher
+ }
+ else for (int i = 0; i < 3; i++) reader.ReadLine(); // skip first three lines
while (reader.Peek() >= 0)
{
@@ -51,15 +55,15 @@
CallItem item = new CallItem();
item.type = Convert.ToInt16(f[0]);
- item.timestamp = DateTime.ParseExact(f[1], formatTimeStamp, provider);
- item.name = f[2];
+ item.TimeStamp = DateTime.ParseExact(f[1], formatTimeStamp, provider);
+ item.Name = f[2];
- if (f[3].StartsWith(cutOffPrefix)) item.number = "0" + f[3].Substring(cutOffPrefix.Length);
- else item.number = f[3];
+ if (f[3].StartsWith(cutOffPrefix)) item.Number = "0" + f[3].Substring(cutOffPrefix.Length);
+ else item.Number = f[3];
- item.extension = f[4];
- item.mynumber = f[5];
- item.duration = DateTime.ParseExact(f[6], formatDuration, provider);
+ item.Extension = f[4];
+ item.MyNumber = f[5];
+ item.Duration = DateTime.ParseExact(f[6], formatDuration, provider);
result.Add(item);
}
@@ -77,7 +81,7 @@
public bool Equals(CallItem callItem)
{
- if (timestamp == callItem.timestamp) return true;
+ if (TimeStamp == callItem.TimeStamp) return true;
else return false;
}
}
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs 2013-04-18 21:09:57 UTC (rev 4563)
@@ -23,6 +23,7 @@
private string hostname;
private string baseurl;
+ private string baseurl2;
private bool loggedIn;
private string passwd;
private string cacheDir;
@@ -30,14 +31,13 @@
private string sid;
private string dialport;
private System.Object cacheSync = new System.Object();
- private bool fritzOS55; // indicates of the FRITZ!Box OS version is 5.5 or higher
+ private static Logger Log = LoggerFactory.getLogger("Fritz");
- static Logger Log = LoggerFactory.getLogger("Fritz");
-
public Fritz(string passwd, string cacheDir, string host, string dialport)
{
this.hostname = host;
this.baseurl = "http://" + host + "/cgi-bin/webcm";
+ this.baseurl2 = "http://" + host;
this.passwd = passwd;
this.cacheDir = cacheDir;
this.cacheFileName = cacheDir + "\\FritzBox-CallList.csv";
@@ -74,13 +74,15 @@
byte[] hash = md5.ComputeHash(Encoding.GetEncoding("UTF-16LE").GetBytes(md5in));
string response = challenge + "-" + BitConverter.ToString(hash).Replace("-", String.Empty).ToLower();
- // new login procedure since FRITZ!OS 5.5
- XDocument doc = XDocument.Load("http://fritz.box/login_sid.lua?username=&response=" + response);
- sid = GetXMLValue(doc, "SID");
-
- if (sid == "0000000000000000")
+ if (FritzBox.Settings.FritzBoxFirmwareMainVersion > 5 || (FritzBox.Settings.FritzBoxFirmwareMainVersion == 5 && FritzBox.Settings.FritzBoxFirmwareSubVersion >= 50))
{
- // login procedure before FRITZ!OS 5.5
+ // new login procedure since FRITZ!OS 5.50
+ XDocument doc = XDocument.Load(baseurl2 + "/login_sid.lua?username=&response=" + response);
+ sid = getXMLValue(doc, "SID");
+ }
+ else
+ {
+ // login procedure before FRITZ!OS 5.50
sid = PostRequest(baseurl, "login:command/response=" + response + "&getpage=../html/de/menus/menu2.html");
if (sid != String.Empty)
@@ -90,7 +92,6 @@
sid = matchList[0].Groups[1].Value;
}
}
- else fritzOS55 = true;
}
}
catch { }
@@ -233,15 +234,16 @@
// download CSV file
try
{
- switch (fritzOS55)
+ if (FritzBox.Settings.FritzBoxFirmwareMainVersion > 5 || (FritzBox.Settings.FritzBoxFirmwareMainVersion == 5 && FritzBox.Settings.FritzBoxFirmwareSubVersion >= 50))
{
- case true:
- result = client.DownloadData("http://" + hostname + "/fon_num/foncalls_list.lua?sid=" + sid + "&csv="); // new procedure since FRITZ!OS 5.5
- break;
- case false:
- result = client.DownloadData(baseurl + "?sid=" + sid + "&getpage=../html/de/FRITZ%21Box_Anrufliste.csv"); // old procedure before FRITZ!OS 5.5
- break;
+ // new procedure since FRITZ!OS 5.50
+ result = client.DownloadData(baseurl2 + "/fon_num/foncalls_list.lua?sid=" + sid + "&csv=");
}
+ else
+ {
+ // old procedure before FRITZ!OS 5.50
+ result = client.DownloadData(baseurl + "?sid=" + sid + "&getpage=../html/de/FRITZ%21Box_Anrufliste.csv");
+ }
}
catch {}
@@ -291,8 +293,8 @@
try
{
- XDocument doc = XDocument.Load("http://" + hostname + "/login_sid.lua");
- return GetXMLValue(doc, "Challenge");
+ XDocument doc = XDocument.Load(baseurl2 + "/login_sid.lua");
+ return getXMLValue(doc, "Challenge");
}
catch {}
@@ -337,14 +339,45 @@
}
}
- private string GetXMLValue(XDocument doc, string name)
+ private string getXMLValue(XDocument doc, string name)
{
XElement info = doc.FirstNode as XElement;
return info.Element(name).Value;
}
+ private string getXMLValue(XDocument doc, string name, XNamespace nameSpace)
+ {
+ XElement info = doc.FirstNode as XElement;
+ return info.Element(nameSpace + name).Value;
+ }
+
+ private void getFritzBoxInfo()
+ {
+ try
+ {
+ XDocument doc = XDocument.Load(baseurl2 + "/jason_boxinfo.xml");
+
+ // get FRITZ!Box firmware version
+ string fritzBoxFirmwareVersion = getXMLValue(doc, "Version", "http://jason.avm.de/updatecheck/");
+ string[] fritzBoxFirmwareVersionArray = fritzBoxFirmwareVersion.Split(new char[] { '.' });
+
+ FritzBox.Settings.FritzBoxFirmwareMainVersion = Convert.ToInt32(fritzBoxFirmwareVersionArray[1]);
+ FritzBox.Settings.FritzBoxFirmwareSubVersion = Convert.ToInt32(fritzBoxFirmwareVersionArray[2]);
+
+ // get FRITZ!Box name
+ FritzBox.Settings.FritzBoxName = getXMLValue(doc, "Name", "http://jason.avm.de/updatecheck/");
+
+ Log.Debug("FRITZ!Box firmware version is " + FritzBox.Settings.FritzBoxFirmwareMainVersion + "." + FritzBox.Settings.FritzBoxFirmwareSubVersion + " on " + FritzBox.Settings.FritzBoxName);
+ }
+ catch
+ {
+ Log.Debug("Could not query FRITZ!Box firmware version");
+ }
+ }
+
private void OnConnectedEvent()
{
+ getFritzBoxInfo();
Login();
}
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs 2013-04-18 21:09:57 UTC (rev 4563)
@@ -630,24 +630,17 @@
private string convertImageURL(string imageURL)
{
- string contactImagePathRemote = imageURL;
+ string contactImagePathRemote;
// convert to UNC format
- if (Directory.Exists(@"\\" + FritzBoxClient.Address + "\\" + Settings.NASShareName))
+ if (imageURL.Contains("file:///var/media/ftp/"))
{
- if (contactImagePathRemote.Contains("InternerSpeicher")) contactImagePathRemote = contactImagePathRemote.Replace("file:///var/InternerSpeicher", @"\\" + FritzBoxClient.Address + "\\" + Settings.NASShareName); // FRITZ!Boxe models with internal storage e. g. FRITZ!Box 7390
- else contactImagePathRemote = contactImagePathRemote.Replace("file:///var/media/ftp", @"\\" + FritzBoxClient.Address + "\\" + Settings.NASShareName);
+ contactImagePathRemote = imageURL.Replace("file:///var/media/ftp/", @"\\" + FritzBoxClient.Address + "\\" + Settings.NASShareName + "\\");
+ contactImagePathRemote = contactImagePathRemote.Replace("/", "\\");
+
+ return contactImagePathRemote;
}
- else
- {
- // some FRITZ!Box models e. g. 7390 don't have no common share under "Settings.NASShareName". They directly share their data under the FRITZ!Box host name
- if (contactImagePathRemote.Contains("InternerSpeicher")) contactImagePathRemote = contactImagePathRemote.Replace("file:///var/InternerSpeicher", @"\\" + FritzBoxClient.Address); // FRITZ!Boxe models with internal storage e. g. FRITZ!Box 7390
- else contactImagePathRemote = contactImagePathRemote.Replace("file:///var/media/ftp", @"\\" + FritzBoxClient.Address);
- }
-
- contactImagePathRemote = contactImagePathRemote.Replace("/", "\\");
-
- return contactImagePathRemote;
+ else return String.Empty;
}
#endregion private methods
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml 2013-04-18 21:09:57 UTC (rev 4563)
@@ -17,12 +17,10 @@
<String id="14">Alle</String>
<String id="15">Eingehend</String>
<String id="16">Ausgehend</String>
- <String id="17">Abgelehnt</String>
+ <String id="17">Unbeantwortet</String>
<String id="18">Anrufliste</String>
- <String id="19">FRITZ!Box Nachrichten</String>
+ <String id="19">neue</String>
<String id="20">Telefonbuch</String>
- <String id="21">FRITZ!Box Anrufliste</String>
- <String id="22">FRITZ!Box Telefonbuch</String>
<String id="23">Fehler</String>
<String id="24">Bitte FRITZ!Box-Passwort und Anrufbeantworter-Pfad unter Configuration eintragen!</String>
<String id="25">Aktualisieren</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_el.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_el.xml 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_el.xml 2013-04-18 21:09:57 UTC (rev 4563)
@@ -17,12 +17,10 @@
<String id="14">Όλες</String>
<String id="15">Εισερχόμενη</String>
<String id="16">Ξεκινώντας</String>
- <String id="17">Απορρίφθηκε</String>
+ <String id="17">Αναπάντητες</String>
<String id="18">Λίστα κλήσεων</String>
- <String id="19">FritzBox ειδήσεις</String>
+ <String id="19">νέα</String>
<String id="20">Τηλεφωνικός κατάλογος</String>
- <String id="21">FRITZ!Box λίστα κλήσεων</String>
- <String id="22">FRITZ!Box Telefonbuch</String>
<String id="23">Errore</String>
<String id="24">FRITZ!Box κωδικό και φωνή μονοπάτι κουτί λείπουν στις ρυθμίσεις!</String>
<String id="25">Ενημέρωση</String>
Added: trunk/plugins/FritzBox/FritzBox/Languages/strings_en-GB.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_en-GB.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_en-GB.xml 2013-04-18 21:09:57 UTC (rev 4563)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Language name="English (United Kingdom)" characters="255">
+ <Section name="unmapped">
+ <String id="1">Incoming call</String>
+ <String id="2">Outgoing call</String>
+ <String id="3">Unknown</String>
+ <String id="4">Caller</String>
+ <String id="5">Call</String>
+ <String id="6">Contact</String>
+ <String id="7">Messages</String>
+ <String id="8">Play message</String>
+ <String id="9">Mark message as heard</String>
+ <String id="10">Delete message</String>
+ <String id="11">View: List</String>
+ <String id="12">View: Small icons</String>
+ <String id="13">View: Large icons</String>
+ <String id="14">All</String>
+ <String id="15">Incoming</String>
+ <String id="16">Outgoing</String>
+ <String id="17">Unanswered</String>
+ <String id="18">Call list</String>
+ <String id="19">new</String>
+ <String id="20">Phone book</String>
+ <String id="23">Error</String>
+ <String id="24">FRITZ!Box password and voice box path are missing in settings!</String>
+ <String id="25">Update</String>
+ <String id="26">to</String>
+ <String id="27">Message</String>
+ <String id="28">Phone</String>
+ <String id="29">Private</String>
+ <String id="30">Mobile</String>
+ <String id="31">Business</String>
+ </Section>
+</Language>
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_en-US.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_en-US.xml 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_en-US.xml 2013-04-18 21:09:57 UTC (rev 4563)
@@ -17,12 +17,10 @@
<String id="14">All</String>
<String id="15">Incoming</String>
<String id="16">Outgoing</String>
- <String id="17">Rejected</String>
+ <String id="17">Unanswered</String>
<String id="18">Call list</String>
- <String id="19">FRITZ!Box messages</String>
+ <String id="19">new</String>
<String id="20">Phone book</String>
- <String id="21">FRITZ!Box call list</String>
- <String id="22">FRITZ!Box phone book</String>
<String id="23">Error</String>
<String id="24">FRITZ!Box password and voice box path are missing in settings!</String>
<String id="25">Update</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_es.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_es.xml 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_es.xml 2013-04-18 21:09:57 UTC (rev 4563)
@@ -17,12 +17,10 @@
<String id="14">Todos</String>
<String id="15">Detallado</String>
<String id="16">Basado</String>
- <String id="17">Rechazado</String>
+ <String id="17">Sin respuesta</String>
<String id="18">Lista de llamadas</String>
- <String id="19">FRITZ!Box noticias</String>
+ <String id="19">nuevo </String>
<String id="20">Guía telefónica</String>
- <String id="21">FRITZ!Box lista de llamadas</String>
- <String id="22">FRITZ!Box guía telefónica</String>
<String id="23">Error</String>
<String id="24">FRITZ!Box y la ruta de caja de la voz no se encuentran en la configuración!</String>
<String id="25">Actualización</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_fr.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_fr.xml 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_fr.xml 2013-04-18 21:09:57 UTC (rev 4563)
@@ -17,12 +17,10 @@
<String id="14">Tous les</String>
<String id="15">Détail</String>
<String id="16">Basé</String>
- <String id="17">Rejetée</String>
+ <String id="17">Sans réponse</String>
<String id="18">Liste des appels</String>
- <String id="19">FRITZ!Box nouvelles</String>
+ <String id="19">neufs</String>
<String id="20">Annuaire téléphonique</String>
- <String id="21">Liste des appels FRITZ!Box</String>
- <String id="22">Annuaire FRITZ!Box</String>
<String id="23">Erreur</String>
<String id="24">FRITZ!Box passe et le chemin boîte vocale sont manquantes dans les réglages!</String>
<String id="25">Mise à jour</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_it.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_it.xml 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_it.xml 2013-04-18 21:09:57 UTC (rev 4563)
@@ -17,12 +17,10 @@
<String id="14">Tutti</String>
<String id="15">Dettagliato</String>
<String id="16">Basato</String>
- <String id="17">Rifiutato</String>
+ <String id="17">Senza risposta</String>
<String id="18">Lista chiamate</String>
- <String id="19">FRITZ!Box notizie</String>
+ <String id="19">nuovi</String>
<String id="20">Elenco telefonico</String>
- <String id="21">FRITZ!Box chiamata lista</String>
- <String id="22">FRITZ!Box rubrica</String>
<String id="23">Errore</String>
<String id="24">FRITZ!Box password della casella e casella percorso vocale mancano nelle impostazioni!</String>
<String id="25">Aggiornamento</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_nl.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_nl.xml 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_nl.xml 2013-04-18 21:09:57 UTC (rev 4563)
@@ -17,12 +17,10 @@
<String id="14">Alle</String>
<String id="15">Gedetailleerd</String>
<String id="16">Op basis van</String>
- <String id="17">Verworpen</String>
+ <String id="17">Onbeantwoorde</String>
<String id="18">Bellijst</String>
- <String id="19">FRITZ!Box nieuws</String>
+ <String id="19">nieuwe</String>
<String id="20">Telefoonboek</String>
- <String id="21">FRITZ!Box oproeplijst</String>
- <String id="22">FRITZ!Box telefoonboek</String>
<String id="23">Fout</String>
<String id="24">FRITZ!Box wachtwoord en strottenhoofd het pad ontbreken in instellingen!</String>
<String id="25">Update</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_ru.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_ru.xml 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_ru.xml 2013-04-18 21:09:57 UTC (rev 4563)
@@ -17,12 +17,10 @@
<String id="14">все</String>
<String id="15">входящие</String>
<String id="16">исходящие</String>
- <String id="17">пропущенные</String>
+ <String id="17">без ответов</String>
<String id="18">Список вызовов</String>
- <String id="19">Сообщения FRITZ!Box</String>
+ <String id="19">новых</String>
<String id="20">Телефонная книга</String>
- <String id="21">Список вызовов FRITZ!Box</String>
- <String id="22">Телефонная книга FRITZ!Box</String>
<String id="23">Ошибка</String>
<String id="24">Пароль к FRITZ!Box и путь к голосовому ящику не указаны в настройках!</String>
<String id="25">Обновить</String>
Modified: trunk/plugins/FritzBox/FritzBox/Settings.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Settings.cs 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Settings.cs 2013-04-18 21:09:57 UTC (rev 4563)
@@ -154,6 +154,12 @@
public static string ContactImagesFolderPath { get; private set; }
+ public static int FritzBoxFirmwareMainVersion { get; set; }
+
+ public static int FritzBoxFirmwareSubVersion { get; set; }
+
+ public static string FritzBoxName { get; set; }
+
#endregion Properties
#region Contructor
@@ -242,6 +248,11 @@
ManualContactImagePathEntry = xmlreader.GetValueAsBool(PLUGIN_NAME, "Manual contact image path entry", false);
+ // FRITZ!Box information
+ FritzBoxName = xmlreader.GetValueAsString(PLUGIN_NAME, "FRITZ!Box name", String.Empty);
+ FritzBoxFirmwareMainVersion = xmlreader.GetValueAsInt(PLUGIN_NAME, "FRITZ!Box firmware main version", 0);
+ FritzBoxFirmwareSubVersion = xmlreader.GetValueAsInt(PLUGIN_NAME, "FRITZ!Box firmware sub version", 0);
+
// GUI settings
CurrentMode = (GUIMode)xmlreader.GetValueAsInt(PLUGIN_NAME, "Current mode", 0);
CurrentFilter = (CallListFilter)xmlreader.GetValueAsInt(PLUGIN_NAME, "Current filter", 0);
@@ -329,7 +340,12 @@
xmlwriter.SetValueAsBool(PLUGIN_NAME, "Synchronize phone book", SynchronizePhoneBook);
xmlwriter.SetValueAsBool(PLUGIN_NAME, "Manual contact image path entry", ManualContactImagePathEntry);
-
+
+ // FRITZ!Box information
+ xmlwriter.SetValue(PLUGIN_NAME, "FRITZ!Box name", FritzBoxName);
+ xmlwriter.SetValue(PLUGIN_NAME, "FRITZ!Box firmware main version", FritzBoxFirmwareMainVersion);
+ xmlwriter.SetValue(PLUGIN_NAME, "FRITZ!Box firmware sub version", FritzBoxFirmwareSubVersion);
+
// GUI settings
xmlwriter.SetValue(PLUGIN_NAME, "Current mode", (int)CurrentMode);
xmlwriter.SetValue(PLUGIN_NAME, "Current filter", (int)CurrentFilter);
@@ -351,7 +367,7 @@
}
catch
{
- Log.Info("Country and area code could not be queried from Windows. MSN detection only works limited");
+ Log.Info("Country and area code could not be queried from Windows. MSN detection works limited only");
}
}
Added: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_in.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_in.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_in.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_in.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_in.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_out.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_out.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_out.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_out.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_out.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_unanswered.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_unanswered.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_unanswered.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_unanswered.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_unanswered.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_in.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_in.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_in.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_in.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_in.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_out.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_out.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_out.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_out.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_out.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_unanswered.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_unanswered.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_unanswered.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_unanswered.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_unanswered.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_in.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_in.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_in.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_in.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_in.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_out.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_out.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_out.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_out.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_out.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_unanswered.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_unanswered.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_unanswered.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_unanswered.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_unanswered.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml 2013-04-18 21:09:57 UTC (rev 4563)
@@ -3,8 +3,8 @@
<id>464554871</id>
<defaultcontrol>50</defaultcontrol>
<allowoverlay>yes</allowoverlay>
- <define>#header.label:666</define>
- <define>#header.hover:-</define>
+ <define>#header.label:FRITZ!Box Manager</define>
+ <define>#header.hover:hover_fritzbox.png</define>
<controls>
<control>
<description>Background</description>
@@ -100,17 +100,6 @@
<animation effect="fade" time="450" reversible="false">visible</animation>
</control>
<control>
- <type>image</type>
- <id>1</id>
- <posX>40</posX>
- <posY>150</posY>
- <width>178</width>
- <height>144</height>
- <texture flipY="true" diffuse="Thumb_Mask.png">Picture_cover.png</texture>
- <visible>facadeview.list+Control.HasFocus(50)</visible>
- <animation effect="fade" time="450" reversible="false">visible</animation>
- </control>
- <control>
<description>Header</description>
<type>fadelabel</type>
<posX>26</posX>
Added: trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_in.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_in.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_in.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_in.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_in.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_out.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_out.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_out.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_out.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_out.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_unanswered.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_unanswered.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_unanswered.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_unanswered.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_unanswered.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml 2013-04-18 21:09:57 UTC (rev 4563)
@@ -3,8 +3,8 @@
<id>464554871</id>
<defaultcontrol>50</defaultcontrol>
<allowoverlay>yes</allowoverlay>
- <define>#header.label:666</define>
- <define>#header.hover:-</define>
+ <define>#header.label:FRITZ!Box Manager</define>
+ <define>#header.hover:hover_fritzbox.png</define>
<controls>
<control>
<description>Background</description>
@@ -100,17 +100,6 @@
<animation effect="fade" time="450" reversible="false">visible</animation>
</control>
<control>
- <type>image</type>
- <id>1</id>
- <posX>40</posX>
- <posY>150</posY>
- <width>178</width>
- <height>144</height>
- <texture flipY="true" diffuse="Thumb_Mask.png">Picture_cover.png</texture>
- <visible>facadeview.list+Control.HasFocus(50)</visible>
- <animation effect="fade" time="450" reversible="false">visible</animation>
- </control>
- <control>
<description>Header</description>
<type>fadelabel</type>
<posX>26</posX>
Added: trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/Call_in.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/Call_in.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/Call_in.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/Call_in.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/Call_in.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/Call_out.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/Call_out.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzB...
[truncated message content] |
