Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4449] trunk/plugins/FritzBox
|
From: <hor...@us...> - 2012-02-10 15:26:47
|
Revision: 4449
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4449&view=rev
Author: horned-reaper
Date: 2012-02-10 15:26:34 +0000 (Fri, 10 Feb 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/Docs/Ausstehend.txt
trunk/plugins/FritzBox/Docs/Changes.txt
trunk/plugins/FritzBox/FritzBox/EditPhoneBook.cs
trunk/plugins/FritzBox/FritzBox/FritzBox.cs
trunk/plugins/FritzBox/FritzBox/FritzBox.csproj
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/Caller.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/BackGroundWorker.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/FritzboxPhonebook.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/MyBinaryReader.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs
trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_el.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_en-US.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_en.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_es.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_fr.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_it.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_nl.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_ru.xml
trunk/plugins/FritzBox/FritzBox/Properties/AssemblyInfo.cs
trunk/plugins/FritzBox/FritzBox/Settings.cs
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/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/FritzBox/FritzManager/LocalizeStrings.cs
trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Phone_Icon_Home.png
trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Phone_Icon_Mobile.png
trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Phone_Icon_Work.png
trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Phone_Icon_Home.png
trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Phone_Icon_Mobile.png
trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Phone_Icon_Work.png
trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Phone_Icon_Home.png
trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Phone_Icon_Mobile.png
trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Phone_Icon_Work.png
trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/Phone_Icon_Home.png
trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/Phone_Icon_Mobile.png
trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/Phone_Icon_Work.png
trunk/plugins/FritzBox/FritzBox/Skin/Maya/Media/FritzBox/Phone_Icon_Home.png
trunk/plugins/FritzBox/FritzBox/Skin/Maya/Media/FritzBox/Phone_Icon_Mobile.png
trunk/plugins/FritzBox/FritzBox/Skin/Maya/Media/FritzBox/Phone_Icon_Work.png
trunk/plugins/FritzBox/releases/FritzBox_v0.4.1.4448.mpe1
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2012-02-09 17:08:05 UTC (rev 4448)
+++ trunk/plugins/FritzBox/Build/Build.log 2012-02-10 15:26:34 UTC (rev 4449)
@@ -1,6 +1,6 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4434
+SVN Version: 4448
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 02.02.2012 12:38:15.
+Build started 10.02.2012 16:17:35.
Project "D:\FritzBox\FritzBox.sln" on node 1 (Rebuild target(s)).
ValidateSolutionConfiguration:
Building solution configuration "Release|Mixed Platforms".
@@ -46,7 +46,7 @@
CoreResGen:
C:\Program Files\Microsoft SDKs\Windows\v7.0A\bin\ResGen.exe /useSourcePath /r:"C:\Program Files\Team MediaPortal\MediaPortal\Common.Utils.dll" /r:"C:\Program Files\Team MediaPortal\MediaPortal\Core.dll" /r:"C:\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" /r:C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /r:"c:\Program Files\Reference Assemblies\Microsoft\Framework\v3.5\System.Core.dll" /r:C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727\System.Data.dll /r:C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727\System.dll /r:C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727\System.Drawing.dll /r:C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727\System.Windows.Forms.dll /r:C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727\System.Xml.dll /r:"C:\Program Files\Team MediaPortal\MediaPortal\Utils.dll" /compile EditPhoneBook.resx,obj\Release\FritzBox.EditPhoneBook.resources Properties\Resources.resx,obj\Release\FritzBox.Properties.Resources.resources FritzBoxConfig.resx,obj\Release\FritzBox.FritzBoxConfig.resources
CoreCompile:
- c:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /platform:AnyCPU /errorreport:prompt /warn:4 /baseaddress:4194304 /define:TRACE /reference:"C:\Program Files\Team MediaPortal\MediaPortal\Common.Utils.dll" /reference:"C:\Program Files\Team MediaPortal\MediaPortal\Core.dll" /reference:"C:\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" /reference:C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /reference:"c:\Program Files\Reference Assemblies\Microsoft\Framework\v3.5\System.Core.dll" /reference:C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727\System.Data.dll /reference:C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727\System.dll /reference:C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727\System.Drawing.dll /reference:C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727\System.Windows.Forms.dll /reference:C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727\System.Xml.dll /reference:"C:\Program Files\Team MediaPortal\MediaPortal\Utils.dll" /debug:pdbonly /filealign:4096 /optimize+ /out:obj\Release\FritzBox.dll /resource:obj\Release\FritzBox.EditPhoneBook.resources /resource:obj\Release\FritzBox.Properties.Resources.resources /resource:obj\Release\FritzBox.FritzBoxConfig.resources /resource:FritzBox.png,FritzBox.FritzBox.png /resource:FritzBoxDisabled.png,FritzBox.FritzBoxDisabled.png /target:library /warnaserror- EditPhoneBook.cs EditPhoneBook.Designer.cs FritzCallMonitor\FritzBoxClient.cs FritzManager\StringEncryption.cs FritzManager\VBReader.cs FritzManager\BackGroundWorker.cs FritzManager\BlockingQueue.cs FritzManager\CallItem.cs FritzManager\Fritz.cs FritzManager\FritzboxPhoneBook.cs FritzManager\Logger.cs FritzManager\LoggerFactory.cs FritzManager\MyBinaryReader.cs FritzManager\PhoneBookItem.cs FritzManager\Task.cs FritzManager\VoiceBoxItem.cs LocalizeStrings.cs Properties\AssemblyInfo.cs FritzCallMonitor\Caller.cs FritzCallMonitor\CallAction.cs FritzBoxConfig.cs FritzBoxConfig.Designer.cs FritzBox.cs FritzManager\PhoneBook.cs Properties\Resources.Designer.cs Settings.cs
+ c:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /platform:AnyCPU /errorreport:prompt /warn:4 /baseaddress:4194304 /define:TRACE /reference:"C:\Program Files\Team MediaPortal\MediaPortal\Common.Utils.dll" /reference:"C:\Program Files\Team MediaPortal\MediaPortal\Core.dll" /reference:"C:\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" /reference:C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /reference:"c:\Program Files\Reference Assemblies\Microsoft\Framework\v3.5\System.Core.dll" /reference:C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727\System.Data.dll /reference:C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727\System.dll /reference:C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727\System.Drawing.dll /reference:C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727\System.Windows.Forms.dll /reference:C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727\System.Xml.dll /reference:"C:\Program Files\Team MediaPortal\MediaPortal\Utils.dll" /debug:pdbonly /filealign:4096 /optimize+ /out:obj\Release\FritzBox.dll /resource:obj\Release\FritzBox.EditPhoneBook.resources /resource:obj\Release\FritzBox.Properties.Resources.resources /resource:obj\Release\FritzBox.FritzBoxConfig.resources /resource:FritzBox.png,FritzBox.FritzBox.png /resource:FritzBoxDisabled.png,FritzBox.FritzBoxDisabled.png /target:library /warnaserror- EditPhoneBook.cs EditPhoneBook.Designer.cs FritzCallMonitor\FritzBoxClient.cs FritzManager\LocalizeStrings.cs FritzManager\StringEncryption.cs FritzManager\VBReader.cs FritzManager\BackGroundWorker.cs FritzManager\BlockingQueue.cs FritzManager\CallItem.cs FritzManager\Fritz.cs FritzManager\FritzboxPhoneBook.cs FritzManager\Logger.cs FritzManager\LoggerFactory.cs FritzManager\MyBinaryReader.cs FritzManager\PhoneBookItem.cs FritzManager\Task.cs FritzManager\VoiceBoxItem.cs Properties\AssemblyInfo.cs FritzCallMonitor\Caller.cs FritzCallMonitor\CallAction.cs FritzBoxConfig.cs FritzBoxConfig.Designer.cs FritzBox.cs FritzManager\PhoneBook.cs Properties\Resources.Designer.cs Settings.cs
_CopyFilesMarkedCopyLocal:
Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Common.Utils.dll" to "bin\Release\Common.Utils.dll".
Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Core.dll" to "bin\Release\Core.dll".
@@ -195,7 +195,7 @@
0 Warning(s)
0 Error(s)
-Time Elapsed 00:00:03.25
+Time Elapsed 00:00:03.28
Reverting to build 0
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
@@ -212,6 +212,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\Phone_Icon_Home.png
+..\FritzBox\Skin\Black & White\Media\FritzBox\Phone_Icon_Mobile.png
+..\FritzBox\Skin\Black & White\Media\FritzBox\Phone_Icon_Work.png
..\FritzBox\Skin\Black & White\Media\FritzBox\rejected.png
..\FritzBox\Skin\Blue3\FritzManager.xml
..\FritzBox\Skin\Blue3\Media\hover_FritzBox.png
@@ -219,6 +222,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\Phone_Icon_Home.png
+..\FritzBox\Skin\Blue3\Media\FritzBox\Phone_Icon_Mobile.png
+..\FritzBox\Skin\Blue3\Media\FritzBox\Phone_Icon_Work.png
..\FritzBox\Skin\Blue3\Media\FritzBox\rejected.png
..\FritzBox\Skin\Default\FritzManager.xml
..\FritzBox\Skin\Default\Media\hover_FritzBox.png
@@ -226,6 +232,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\Phone_Icon_Home.png
+..\FritzBox\Skin\Default\Media\FritzBox\Phone_Icon_Mobile.png
+..\FritzBox\Skin\Default\Media\FritzBox\Phone_Icon_Work.png
..\FritzBox\Skin\Default\Media\FritzBox\rejected.png
..\FritzBox\Skin\DefaultWide\FritzManager.xml
..\FritzBox\Skin\DefaultWide\Media\hover_FritzBox.png
@@ -233,6 +242,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\Phone_Icon_Home.png
+..\FritzBox\Skin\DefaultWide\Media\FritzBox\Phone_Icon_Mobile.png
+..\FritzBox\Skin\DefaultWide\Media\FritzBox\Phone_Icon_Work.png
..\FritzBox\Skin\DefaultWide\Media\FritzBox\rejected.png
..\FritzBox\Skin\Maya\FritzManager.xml
..\FritzBox\Skin\Maya\Media\hover_FritzBox.png
@@ -240,8 +252,11 @@
..\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\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
-35 File(s) copied
+50 File(s) copied
..\FritzBox\Languages\strings_de.xml
..\FritzBox\Languages\strings_el.xml
..\FritzBox\Languages\strings_en-US.xml
@@ -280,7 +295,7 @@
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
36 File(s) copied
MpeMaker version: 1.2.1.0
-Build started at 12:38:22
+Build started at 16:17:41
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Modified: trunk/plugins/FritzBox/Docs/Ausstehend.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Ausstehend.txt 2012-02-09 17:08:05 UTC (rev 4448)
+++ trunk/plugins/FritzBox/Docs/Ausstehend.txt 2012-02-10 15:26:34 UTC (rev 4449)
@@ -1,24 +1,20 @@
Fehler beheben:
-- auch bei einem "Unbekannten Anrufer" (unterdr\xFCckte bzw. nicht \xFCbertragene Rufnummer) \xF6ffnet sich \xFCber das Kontextrufen "zur\xFCckrufen". Sollte man deaktivieren
-- ObjectDisposed-Exception bei Client-Stop
+- Problem bei schnell aufeinander folgenden Anrufen
Optimierungen:
- btnModus umbenennen?
- blauer Hintergrund f\xFCr Default und DefaultWide Skins
- GUI-Properties \xFCberpr\xFCfen und Dokumentation vervollst\xE4ndigen
-- Einstellungen-Eintr\xE4ge in XML-Datei in Kategorie "FRITZ"Box Manager" zusammenfassen
+- Einstellungen-Eintr\xE4ge in XML-Datei in Kategorie "FRITZ!Box Manager" zusammenfassen
Neue Funktionen/Erweiterungen:
-- Rufnummer-Typ hinzuf\xFCgen
- - GUI-Adressbuch
- - Anruf-Benachrichtigungen
+- Tastenk\xFCrzel-Unterst\xFCtzung f\xFCr Telefonbuch
- Telefonbuch editierbar machen (f\xFCr FRITZ!Box-Versionen ohne Telefonbuch), ImageURL-Feld hinzuf\xFCgen und nur synchronisieren, wenn im FRITZ!Box-Telefonbuch vorhanden
- Nachrichtenl\xE4nge zur Anzeige hinzuf\xFCgen
- "Nachricht l\xF6schen"-Funktion
- "Nachricht als geh\xF6rt markieren"-Funktion
- "Anrufen"-Funktion zur Anrufliste hinzuf\xFCgen
- R\xFCckw\xE4rtssuche wieder integrieren
-- Kontextmen\xFC f\xFCr Telefonbuch
- Wiki-Eintrag
- Skin-Erweiterungen
- Anzahl der neuen Anrufe
@@ -70,4 +66,7 @@
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 :-)
IchBinsShort, 20.01.2012, 12:38:
-Nebenstelle in der Anrufliste anzeigen
\ No newline at end of file
+Nebenstelle in der Anrufliste anzeigen
+
+D3ltoroxp, 04.02.2012, 18:50 Uhr:
+Und noch ein Feature Request, w\xFCrde es gehen, das der Klingelton aufh\xF6rt zu spielen wenn man abnimmt ? Denn wenn ich abnehme und er ist etwas l\xE4nger l\xE4uft er komplett durch, das bisschen bl\xF6d.
\ No newline at end of file
Modified: trunk/plugins/FritzBox/Docs/Changes.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Changes.txt 2012-02-09 17:08:05 UTC (rev 4448)
+++ trunk/plugins/FritzBox/Docs/Changes.txt 2012-02-10 15:26:34 UTC (rev 4449)
@@ -1,12 +1,12 @@
-0.4.1.4434:
+New release 0.4.1.4448:
New features:
-- added call action to voice box context menu and phone book
+- phone book:
+ - phone numbers are grouped by contact name
+ - contact picture preview in contact list
+- phone type display in call notifications, call list and voice box item list
Optimizations:
-- added checks for context menu actions
+- improved localization function, plugin starts faster now
Fixed bugs:
-- the first digit of call notification gets cropped
-- call notification is not shown when dialling from plugin if MSN filter is enabled
-- FRITZ!Box 7390 specific:
- - contact images are not synchronized with FRITZ!Box (second issue)
\ No newline at end of file
+- FRITZ!Box connection is not established on startup in some circumstances
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/EditPhoneBook.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/EditPhoneBook.cs 2012-02-09 17:08:05 UTC (rev 4448)
+++ trunk/plugins/FritzBox/FritzBox/EditPhoneBook.cs 2012-02-10 15:26:34 UTC (rev 4449)
@@ -21,7 +21,7 @@
private void fillTable()
{
- string uniqueID, name, type = "", number = "", ringTonePath;
+ string uniqueID, name, type = String.Empty, number = String.Empty, ringTonePath;
bool showCallNotification;
phoneBook.LoadPhoneBookFromXMLFile();
@@ -76,7 +76,7 @@
string contactPicturePath = phoneBook.GetContactImagePath(contact);
// show picture
- if (contactPicturePath != "") pictureBoxCaller.ImageLocation = contactPicturePath;
+ if (contactPicturePath != String.Empty) pictureBoxCaller.ImageLocation = contactPicturePath;
}
private void dataGridView_CellValueChanged(object sender, DataGridViewCellEventArgs e)
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2012-02-09 17:08:05 UTC (rev 4448)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2012-02-10 15:26:34 UTC (rev 4449)
@@ -87,7 +87,8 @@
private void OnCallAction(CallAction callAction)
{
- Log.Info("FRITZ!Box: OnCallAction()");
+ Log.Debug("OnCallAction()");
+
callAction.WriteToLog();
if (!_showNotification)
@@ -110,7 +111,7 @@
case CallAction.CallType.ConnectionClosed:
if (Settings.CloseNotificationOnConnectionClosed)
{
- Log.Info("\"Close On Connection Close\" setting is enabled. Trying to close active notification");
+ Log.Info("\"Auto-close after connection is closed\" setting is enabled. Trying to close active notification");
if (_tempNotification != null)
{
@@ -121,7 +122,7 @@
}
break;
default:
- Log.Error("Incorrect CallAction.CallType");
+ Log.Error("Incorrect CallAction type");
break;
}
}
@@ -151,15 +152,16 @@
{
fritz.Login();
+ Log.Debug("Forcing data load after login");
+
loadDataInBackground();
-
- worker.queue.Enqueue(new Task(Task.TaskAction.RefreshView, null)); // schedule refresh view task
}
private void OnCall(CallAction callAction)
{
Log.Info("New call");
+ // check for queued actions
if (_tempNotification != null)
{
Log.Info("Yet another dialog is active. Action is sent to queue");
@@ -232,10 +234,10 @@
switch (callAction.Type)
{
case CallAction.CallType.Incoming:
- strHeading = GUILocalizeStrings.Get(1); // 1 = Incoming call
+ strHeading = LocalizeStrings.Get(1); // 1 = Incoming call
break;
case CallAction.CallType.Outgoing:
- strHeading = GUILocalizeStrings.Get(2); // 2 = Outgoing call
+ strHeading = LocalizeStrings.Get(2); // 2 = Outgoing call
break;
}
@@ -245,25 +247,27 @@
// ...message text
strText = Environment.NewLine;
- if (callAction.Caller.PhoneNumber != "")
+ if (callAction.Caller.PhoneNumber != String.Empty)
{
- if (phoneBookItem != null) strText += phoneBookItem.Name + Environment.NewLine;
+ if (phoneBookItem != null)
+ {
+ strText += phoneBookItem.Name + Environment.NewLine;
+ if (Settings.ShowPhoneTypeOnNotification) strText += phoneBook.GetPhoneNumberTypeLabel(callAction.Caller.PhoneType) + Environment.NewLine;
+ }
- if (Settings.ShowPhoneNumberOnNotification) strText += callAction.Caller.PhoneNumber;
+ if (Settings.ShowPhoneNumberOnNotification) strText += callAction.Caller.PhoneNumber + Environment.NewLine;
}
- else strText += GUILocalizeStrings.Get(3); // 3 = Unknown
+ else strText += LocalizeStrings.Get(3) + Environment.NewLine; // 3 = Unknown. The new line on string end avoids that the first number of the message box text gets cropped
- strText += Environment.NewLine; // avoids that the first number of the message box text gets cropped
-
// show call notification
showNotificationWindow(callAction.Type, strHeading, strImage, strText);
}
}
// update call list and voice box items and refresh GUI
- worker.queue.Enqueue(new Task(Task.TaskAction.LoadCallListItems, null));
- worker.queue.Enqueue(new Task(Task.TaskAction.LoadVoiceBoxItems, null));
- worker.queue.Enqueue(new Task(Task.TaskAction.RefreshView, null));
+ worker.EnqueueTask(new Task(Task.TaskAction.LoadCallListItems, null));
+ worker.EnqueueTask(new Task(Task.TaskAction.LoadVoiceBoxItems, null));
+ worker.EnqueueTask(new Task(Task.TaskAction.RefreshView, null));
}
}
@@ -280,7 +284,7 @@
}
else
{
- if (mSN != "")
+ if (mSN != String.Empty)
{
if (Settings.MSNList.Contains(mSN))
{
@@ -399,26 +403,31 @@
public void Start()
{
Log.Info("FRITZ!Box Manager {0} plugin is starting", Assembly.GetExecutingAssembly().GetName().Version);
+
+ thePlugin = this;
+ LocalizeStrings.LoadLocalization();
+
Settings.Load();
// register events
Utils.OnStartExternal += OnStartExternal;
Utils.OnStopExternal += OnStopExternal;
-
FritzBoxClient.LogEvent += OnLogAction;
FritzBoxClient.CallEvent += OnCallAction;
-
FritzBoxClient.ConnectedEvent += OnConnectedAction;
-
SystemEvents.PowerModeChanged += new PowerModeChangedEventHandler(SystemEvents_PowerModeChanged); // power mode changes (Standby & Hibernate)
FritzBoxClient.StartClient();
- thePlugin = this;
+ startBackGroundWorker();
- // open FRITZ!Box connection and login
+ // open FRITZ!Box connection
fritz = new Fritz(Settings.Password, Config.GetFolder(Config.Dir.Config), FritzBoxClient.Address, Settings.DialPort);
+
+ // load phone book from XML file
+ phoneBook = new PhoneBook(fritz);
+ phoneBook.LoadPhoneBookFromXMLFile();
// set session timer interval and start the timer
sessionTimer.Interval = 30000;
@@ -435,12 +444,6 @@
updateTimer.Start();
}
- // load phone book from XML file
- phoneBook = new PhoneBook(fritz);
- phoneBook.LoadPhoneBookFromXMLFile();
-
- startBackGroundWorker();
-
loadDataInBackground();
}
@@ -529,7 +532,7 @@
public bool GetHome(out string strButtonText, out string strButtonImage, out string strButtonImageFocus, out string strPictureImage)
{
- strButtonText = GUILocalizeStrings.Get(28); // 28 = Telefon
+ strButtonText = LocalizeStrings.Get(28); // 28 = phone
strButtonImage = String.Empty;
strButtonImageFocus = String.Empty;
strPictureImage = "hover_FritzBox.png";
@@ -605,6 +608,8 @@
private Thread workerThread;
// sync the access to call list
private System.Object sync = new System.Object();
+ // last selected phone book item in phone book list; used for phone book browsing
+ private int selectedPhoneBookItemIndex = -1;
#endregion fields
@@ -637,7 +642,7 @@
{
if (worker == null || !worker.Running)
{
- worker = new BackGroundWorker(fritz, this);
+ worker = new BackGroundWorker(this);
workerThread = new Thread(worker.Run);
workerThread.Start();
}
@@ -686,9 +691,9 @@
showThumbPanel();
// display error on missing FRITZ!Box settings
- if (String.IsNullOrEmpty(Settings.Password) && String.IsNullOrEmpty(Settings.VBPath)) showError(GUILocalizeStrings.Get(24)); // 24 = FRITZ!Box password and voice box path are missing in settings!
+ if (String.IsNullOrEmpty(Settings.Password) && String.IsNullOrEmpty(Settings.VBPath)) showError(LocalizeStrings.Get(24)); // 24 = FRITZ!Box password and voice box path are missing in settings!
- btnUpdate.Label = GUILocalizeStrings.Get(25); // 25 = Update
+ btnUpdate.Label = LocalizeStrings.Get(25); // 25 = Update
RefreshView(Settings.CurrentMode);
@@ -699,12 +704,15 @@
{
BackGroundWorker worker = thePlugin.worker;
- worker.queue.Enqueue(new Task(Task.TaskAction.LoadCallListItems, null));
- if (!String.IsNullOrEmpty(Settings.VBPath)) worker.queue.Enqueue(new Task(Task.TaskAction.LoadVoiceBoxItems, null));
- worker.queue.Enqueue(new Task(Task.TaskAction.SynchronizePhoneBook, null));
- if (!String.IsNullOrEmpty(Settings.NASShareName)) worker.queue.Enqueue(new Task(Task.TaskAction.SynchronizeContactImages, null));
+ worker.EnqueueTask(new Task(Task.TaskAction.LoadCallListItems, null));
+ if (!String.IsNullOrEmpty(Settings.VBPath)) worker.EnqueueTask(new Task(Task.TaskAction.LoadVoiceBoxItems, null));
+ worker.EnqueueTask(new Task(Task.TaskAction.SynchronizePhoneBook, null));
+ if (!String.IsNullOrEmpty(Settings.NASShareName)) worker.EnqueueTask(new Task(Task.TaskAction.SynchronizeContactImages, null));
+ worker.EnqueueTask(new Task(Task.TaskAction.UpdateGUIProperties, null));
- worker.queue.Enqueue(new Task(Task.TaskAction.UpdateGUIProperties, null));
+ // reset update timer to get the countdown timer reset
+ updateTimer.Stop();
+ updateTimer.Start();
}
private static void OnSessionTimerEvent(object source, System.Timers.ElapsedEventArgs e)
@@ -714,7 +722,6 @@
if (fritz.LoggedIn)
{
fritz.KeepAlive();
-
fritz.Refresh();
}
}
@@ -722,7 +729,6 @@
private static void OnUpdateTimerEvent(object source, System.Timers.ElapsedEventArgs e)
{
Log.Debug("Processing update timer event");
-
loadDataInBackground();
}
@@ -788,8 +794,7 @@
lock (sync)
{
voiceBoxItemList = newVoiceBoxItemList;
-
- worker.queue.Enqueue(new Task(Task.TaskAction.RefreshView, null));
+ worker.EnqueueTask(new Task(Task.TaskAction.RefreshView, null));
}
}
else Log.Debug("No voice box items on the FRITZ!Box");
@@ -800,7 +805,7 @@
public void SynchronizePhoneBook()
{
- if (phoneBook.SynchronizePhoneBook()) worker.queue.Enqueue(new Task(Task.TaskAction.RefreshView, null));
+ if (phoneBook.SynchronizePhoneBook()) worker.EnqueueTask(new Task(Task.TaskAction.RefreshView, null));
}
public void SynchronizeContactImages()
@@ -821,7 +826,18 @@
if (Settings.CurrentMode == GUIMode.CallList) populateCallListItems();
else if (Settings.CurrentMode == GUIMode.VoiceBox) populateVoiceBoxItems();
- else if (Settings.CurrentMode == GUIMode.PhoneBook) populatePhoneBookItems();
+ else if (Settings.CurrentMode == GUIMode.PhoneBook)
+ {
+ if (facadeView.Count > 0)
+ {
+ if (!facadeView[0].IsFolder && facadeView[0].Label == "..")
+ {
+ if (phoneBook.Items.ContainsKey(facadeView[0].Path)) populatePhoneBookItemNumbers(phoneBook.Items[facadeView[0].Path]); // when phone number list is opened update phone number list
+ }
+ else populatePhoneBookItems();
+ }
+ else populatePhoneBookItems();
+ }
// set focus to the item as before the list update, if none item is selected select the first one
// the GUIFacadeControl control does not support to have none list item selected. The first item is always marked but not really selected (e. g. the picture is not shown)
@@ -877,8 +893,7 @@
lock (sync)
{
callItemList = newCallItemList;
-
- worker.queue.Enqueue(new Task(Task.TaskAction.RefreshView, null));
+ worker.EnqueueTask(new Task(Task.TaskAction.RefreshView, null));
}
}
else Log.Debug("No voice box items on the FRITZ!Box");
@@ -905,29 +920,61 @@
protected void populatePhoneBookItems()
{
- facadeView.Clear();
-
if (phoneBook.Count > 0)
{
- int i = 0;
+ GUIListItem elem;
+ string contactImagePath;
+ facadeView.Clear();
+
+ // add contacts to list view
foreach (PhoneBookItem phoneBookItem in phoneBook.Items.Values)
{
- foreach (PhoneNumber phoneNumber in phoneBookItem.PhoneNumbers)
- {
- GUIListItem elem = new GUIListItem();
- elem.Label = phoneBookItem.Name;
- elem.Label2 = phoneNumber.Value;
+ elem = new GUIListItem();
+ elem.IsFolder = true;
+ elem.Path = phoneBookItem.UniqueID;
+ elem.Label = phoneBookItem.Name;
- if (elem.Label2.Length > 0)
- {
- elem.ThumbnailImage = phoneBook.GetContactImagePath(phoneBookItem);
+ contactImagePath = phoneBook.GetContactImagePath(phoneBookItem);
+ elem.ThumbnailImage = contactImagePath;
+ if (contactImagePath != Settings.SkinMediaFolderPath + @"\FritzBox\CallMonitor.Missing.png") elem.IconImage = contactImagePath;
- elem.Path = Convert.ToString(i++);
+ facadeView.Add(elem);
+ }
- facadeView.Add(elem);
- }
- }
+ if (selectedPhoneBookItemIndex < facadeView.Count) facadeView.SelectedListItemIndex = selectedPhoneBookItemIndex;
+ else facadeView.SelectedItem = facadeView.Count - 1; // select last phone book item
+ }
+ }
+
+ protected void populatePhoneBookItemNumbers(PhoneBookItem phoneBookItem)
+ {
+ GUIListItem elem;
+ selectedPhoneBookItemIndex = facadeView.SelectedListItemIndex;
+
+ facadeView.Clear();
+
+ // add up folder item
+ elem = new GUIListItem("..");
+
+ elem.IconImage = "defaultFolderBack.png";
+ elem.IconImageBig = "defaultFolderBackBig.png";
+
+ facadeView.Add(elem);
+
+ foreach (PhoneNumber phoneNumber in phoneBookItem.PhoneNumbers)
+ {
+ elem = new GUIListItem();
+
+ elem.IconImage = phoneBook.GetPhoneNumberIconName(phoneNumber.type);
+ elem.Label = phoneBook.GetPhoneNumberTypeLabel(phoneNumber.type);
+ elem.Label2 = phoneNumber.Value;
+
+ if (elem.Label2.Length > 0)
+ {
+ elem.ThumbnailImage = phoneBook.GetContactImagePath(phoneBookItem);
+
+ facadeView.Add(elem);
}
}
}
@@ -962,14 +1009,14 @@
elem.Label = (voiceBoxItem.isNew == 1 ? "* " : " ") + voiceBoxItem.time.ToString(format, ci);
// add caller name/phone number and MSN
- if (caller.PhoneBookItem != null) callerName = caller.PhoneBookItem.Name;
+ if (caller.PhoneBookItem != null) callerName = caller.PhoneBookItem.Name + " (" + phoneBook.GetPhoneNumberTypeLabel(caller.PhoneType).ToLower() + ")";
else
{
- if (caller.PhoneNumber != "") callerName = caller.PhoneNumber;
- else callerName = GUILocalizeStrings.Get(3); // 3 = Unknown
+ if (caller.PhoneNumber != String.Empty) callerName = caller.PhoneNumber;
+ else callerName = LocalizeStrings.Get(3); // 3 = Unknown
}
- elem.Label2 = callerName + " " + GUILocalizeStrings.Get(26) + " " + mSNName; // 26 = to
+ elem.Label2 = callerName + " " + LocalizeStrings.Get(26) + " " + mSNName; // 26 = to
elem.Path = Convert.ToString(i);
@@ -990,7 +1037,7 @@
public void updateGUIProperties()
{
Caller caller = new Caller();
- string lastNewCallerName = "";
+ string lastNewCallerName = String.Empty;
int newVoiceBoxItemsCount = 0, voiceBoxItemsCount = 0;
Log.Debug("Updating GUI properties");
@@ -1009,7 +1056,7 @@
if (voiceBoxItem.isNew > 0)
{
- if (lastNewCallerName == "" && caller.PhoneBookItem != null) lastNewCallerName = caller.PhoneBookItem.Name;
+ if (lastNewCallerName == String.Empty && caller.PhoneBookItem != null) lastNewCallerName = caller.PhoneBookItem.Name;
newVoiceBoxItemsCount++;
}
@@ -1026,8 +1073,8 @@
}
else
{
- if (newVoiceBoxItemsCount > 1) GUIPropertyManager.SetProperty("#FritzManager.NewMessages", newVoiceBoxItemsCount + " " + GUILocalizeStrings.Get(7)); // 7 = Messages
- else GUIPropertyManager.SetProperty("#FritzManager.NewMessages", newVoiceBoxItemsCount + " " + GUILocalizeStrings.Get(27)); // 27 = Message
+ if (newVoiceBoxItemsCount > 1) GUIPropertyManager.SetProperty("#FritzManager.NewMessages", newVoiceBoxItemsCount + " " + LocalizeStrings.Get(7)); // 7 = Messages
+ else GUIPropertyManager.SetProperty("#FritzManager.NewMessages", newVoiceBoxItemsCount + " " + LocalizeStrings.Get(27)); // 27 = Message
GUIPropertyManager.SetProperty("#FritzManager.Caller", lastNewCallerName);
GUIPropertyManager.SetProperty("#FritzManager.NewMessageCount", newVoiceBoxItemsCount.ToString());
@@ -1041,8 +1088,8 @@
}
else
{
- if (voiceBoxItemsCount > 1) GUIPropertyManager.SetProperty("#FritzManager.TotalMessages", voiceBoxItemsCount + " " + GUILocalizeStrings.Get(7)); // 7 = Messages
- else GUIPropertyManager.SetProperty("#FritzManager.TotalMessages", voiceBoxItemsCount + " " + GUILocalizeStrings.Get(27)); // 27 = Message
+ if (voiceBoxItemsCount > 1) GUIPropertyManager.SetProperty("#FritzManager.TotalMessages", voiceBoxItemsCount + " " + LocalizeStrings.Get(7)); // 7 = Messages
+ else GUIPropertyManager.SetProperty("#FritzManager.TotalMessages", voiceBoxItemsCount + " " + LocalizeStrings.Get(27)); // 27 = Message
GUIPropertyManager.SetProperty("#FritzManager.TotalMessageCount", voiceBoxItemsCount.ToString());
}
@@ -1079,11 +1126,11 @@
elem.Label = item.timestamp.ToString(format, ci) + " - " + item.duration.ToString("HH:mm", ci);
// add caller name/phone number
- if (caller.PhoneBookItem != null) elem.Label2 = caller.PhoneBookItem.Name;
+ if (caller.PhoneBookItem != null) elem.Label2 = caller.PhoneBookItem.Name + " (" + phoneBook.GetPhoneNumberTypeLabel(caller.PhoneType).ToLower() + ")";
else
{
- if (caller.PhoneNumber != "") elem.Label2 = caller.PhoneNumber;
- else elem.Label2 = GUILocalizeStrings.Get(3); // 3 = Unknown
+ if (caller.PhoneNumber != String.Empty) elem.Label2 = caller.PhoneNumber;
+ else elem.Label2 = LocalizeStrings.Get(3); // 3 = Unknown
}
elem.DVDLabel = item.mynumber + item.extension;
@@ -1129,46 +1176,48 @@
base.OnShowContextMenu();
- if (Settings.CurrentMode == GUIMode.VoiceBox)
+ switch (Settings.CurrentMode)
{
- int r = showVoiceboxContextMenu();
- phoneNumber = voiceBoxItemList[Convert.ToInt16(facadeView.SelectedListItem.Path)].callerId;
+ case GUIMode.VoiceBox:
+ int result = showVoiceBoxContextMenu();
- switch (r)
- {
- case 0: // play
- g_Player.Play(decode(voiceBoxItemList[Convert.ToInt16(facadeView.SelectedListItem.Path)]));
- break;
- case 1: // call
- fritz.Dial(phoneNumber);
- break;
- }
- }
- else if (Settings.CurrentMode == GUIMode.CallList)
- {
- int r = showCallListContextMenu();
- int idx = Convert.ToInt16(facadeView.SelectedListItem.Path);
- phoneNumber = callItemList[idx].number;
+ switch (result)
+ {
+ case 0: // play
+ g_Player.Play(decode(voiceBoxItemList[Convert.ToInt16(facadeView.SelectedListItem.Path)]));
+ break;
+ case 1: // call
+ phoneNumber = facadeView.SelectedListItem.Label2;
+ fritz.Dial(phoneNumber);
+ break;
+ }
+ break;
+ case GUIMode.CallList:
+ result = showCallListContextMenu();
- switch (r)
- {
- case 0: // call
- fritz.Dial(phoneNumber);
- break;
- }
- }
- else if (Settings.CurrentMode == GUIMode.PhoneBook)
- {
- int r = showPhoneBookContextMenu();
- int idx = Convert.ToInt16(facadeView.SelectedListItem.Path);
- phoneNumber = facadeView.SelectedListItem.Label2;
+ switch (result)
+ {
+ case 0: // call
+ phoneNumber = facadeView.SelectedListItem.Label2;
+ fritz.Dial(phoneNumber);
+ break;
+ }
+ break;
+ case GUIMode.PhoneBook:
+ result = showPhoneBookContextMenu();
- switch (r)
- {
- case 0: // call
- fritz.Dial(phoneNumber);
- break;
- }
+ switch (result)
+ {
+ case 0: // call
+ if (facadeView.SelectedListItem.IsFolder) populatePhoneBookItemNumbers(phoneBook.Items[facadeView.SelectedListItem.Path]);
+ else
+ {
+ phoneNumber = facadeView.SelectedListItem.Label2;
+ fritz.Dial(phoneNumber);
+ }
+ break;
+ }
+ break;
}
}
@@ -1192,10 +1241,24 @@
{
GUIListItem actual = facadeView.SelectedListItem;
- if (Settings.CurrentMode == GUIMode.VoiceBox)
+ switch (Settings.CurrentMode)
{
- string tmp = decode(voiceBoxItemList[Convert.ToInt16(actual.Path)]);
- g_Player.Play(tmp);
+ case GUIMode.VoiceBox:
+ string tmp = decode(voiceBoxItemList[Convert.ToInt16(actual.Path)]);
+ g_Player.Play(tmp);
+ break;
+ case GUIMode.PhoneBook:
+ if (facadeView.SelectedListItem.IsFolder) populatePhoneBookItemNumbers(phoneBook.Items[facadeView.SelectedListItem.Path]);
+ else
+ {
+ if (facadeView.SelectedListItem.Label != "..") OnShowContextMenu();
+ else
+ {
+ facadeView.Clear(); // indicates that the phone number list is being left; necessary to avoid that the phone number list is updated only
+ populatePhoneBookItems();
+ }
+ }
+ break;
}
}
}
@@ -1304,15 +1367,15 @@
{
bool callActionEnabled = false;
- if (callItemList[Convert.ToInt16(facadeView.SelectedListItem.Path)].number != "") 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);
if (dlgMenu != null)
{
dlgMenu.Reset();
- dlgMenu.SetHeading(GUILocalizeStrings.Get(4)); // 4 = Caller
- if (fritz.LoggedIn && callActionEnabled) dlgMenu.Add(GUILocalizeStrings.Get(5)); // 5 = Call
+ dlgMenu.SetHeading(LocalizeStrings.Get(4)); // 4 = Caller
+ if (fritz.LoggedIn && callActionEnabled) dlgMenu.Add(LocalizeStrings.Get(5)); // 5 = Call
dlgMenu.DoModal(GetID);
if (dlgMenu.SelectedLabel == -1) return -1; // nothing was selected
@@ -1323,22 +1386,22 @@
return -1;
}
- private int showVoiceboxContextMenu()
+ private int showVoiceBoxContextMenu()
{
bool callActionEnabled = false;
- if (voiceBoxItemList[Convert.ToInt16(facadeView.SelectedListItem.Path)].callerId != "") callActionEnabled = true;
+ if (voiceBoxItemList[Convert.ToInt16(facadeView.SelectedListItem.Path)].callerId != String.Empty) callActionEnabled = true;
GUIDialogMenu dlgMenu = (GUIDialogMenu)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU);
if (dlgMenu != null)
{
dlgMenu.Reset();
- dlgMenu.SetHeading(GUILocalizeStrings.Get(7)); // 7 = Message
- dlgMenu.Add(GUILocalizeStrings.Get(8)); // 8 = Play message
- //dlgMenu.Add(GUILocalizeStrings.Get(9)); // 9 = Mark message as heard
- //dlgMenu.Add(GUILocalizeStrings.Get(10)); // 10 = Delete message
- if (fritz.LoggedIn && callActionEnabled) dlgMenu.Add(GUILocalizeStrings.Get(5)); // 8 = Call
+ dlgMenu.SetHeading(LocalizeStrings.Get(7)); // 7 = Message
+ dlgMenu.Add(LocalizeStrings.Get(8)); // 8 = Play message
+ //dlgMenu.Add(LocalizeStrings.Get(9)); // 9 = Mark message as heard
+ //dlgMenu.Add(LocalizeStrings.Get(10)); // 10 = Delete message
+ if (fritz.LoggedIn && callActionEnabled) dlgMenu.Add(LocalizeStrings.Get(5)); // 8 = Call
dlgMenu.DoModal(GetID);
if (dlgMenu.SelectedLabel == -1) return -1; // nothing was selected
@@ -1356,8 +1419,8 @@
if (dlgMenu != null)
{
dlgMenu.Reset();
- dlgMenu.SetHeading(GUILocalizeStrings.Get(6)); // 4 = Contact
- if (fritz.LoggedIn) dlgMenu.Add(GUILocalizeStrings.Get(5)); // 5 = Call
+ dlgMenu.SetHeading(LocalizeStrings.Get(6)); // 4 = Contact
+ if (fritz.LoggedIn && facadeView.SelectedListItem.Label != "..") dlgMenu.Add(LocalizeStrings.Get(5)); // 5 = Call
dlgMenu.DoModal(GetID);
if (dlgMenu.SelectedLabel == -1) return -1; // nothing was selected
@@ -1380,13 +1443,13 @@
switch (view)
{
case View.List:
- strLine = GUILocalizeStrings.Get(11); // 11 = View: List
+ strLine = LocalizeStrings.Get(11); // 11 = View: List
break;
case View.Icons:
- strLine = GUILocalizeStrings.Get(12); // 12 = View: Small icons
+ strLine = LocalizeStrings.Get(12); // 12 = View: Small icons
break;
case View.LargeIcons:
- strLine = GUILocalizeStrings.Get(13); // 13 = View: Large icons
+ strLine = LocalizeStrings.Get(13); // 13 = View: Large icons
break;
}
@@ -1395,16 +1458,16 @@
switch (Settings.CurrentFilter)
{
case CallListFilter.All:
- strLine = GUILocalizeStrings.Get(14); // 14 = All
+ strLine = LocalizeStrings.Get(14); // 14 = All
break;
case CallListFilter.Incoming:
- strLine = GUILocalizeStrings.Get(15); // 15 = Incoming
+ strLine = LocalizeStrings.Get(15); // 15 = Incoming
break;
case CallListFilter.Outgoing:
- strLine = GUILocalizeStrings.Get(16); // 16 = Outgoing
+ strLine = LocalizeStrings.Get(16); // 16 = Outgoing
break;
case CallListFilter.Rejected:
- strLine = GUILocalizeStrings.Get(17); // 17 = Rejected
+ strLine = LocalizeStrings.Get(17); // 17 = Rejected
break;
}
@@ -1418,16 +1481,16 @@
switch (Settings.CurrentMode)
{
case GUIMode.VoiceBox:
- if (headerLabel != null) headerLabel.Label = GUILocalizeStrings.Get(19); // 19 = FritzBox messages
- btnModus.Label = GUILocalizeStrings.Get(18); // 18 = Call list
+ if (headerLabel != null) headerLabel.Label = LocalizeStrings.Get(19); // 19 = FRITZ!Box messages
+ btnModus.Label = LocalizeStrings.Get(18); // 18 = Call list
break;
case GUIMode.CallList:
- if (headerLabel != null) headerLabel.Label = GUILocalizeStrings.Get(21); // 21 = FritzBox call list
- btnModus.Label = GUILocalizeStrings.Get(20); // 20 = Phone book
+ if (headerLabel != null) headerLabel.Label = LocalizeStrings.Get(21); // 21 = FRITZ!Box call list
+ btnModus.Label = LocalizeStrings.Get(20); // 20 = Phone book
break;
case GUIMode.PhoneBook:
- if (headerLabel != null) headerLabel.Label = GUILocalizeStrings.Get(22); // 22 = FritzBox phone book
- btnModus.Label = GUILocalizeStrings.Get(7); // 7 = Messages
+ if (headerLabel != null) headerLabel.Label = LocalizeStrings.Get(22); // 22 = FRITZ!Box phone book
+ btnModus.Label = LocalizeStrings.Get(7); // 7 = Messages
break;
}
}
@@ -1435,7 +1498,7 @@
private void showError(string msg)
{
GUIDialogOK dlg = (GUIDialogOK)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_OK);
- dlg.SetHeading(GUILocalizeStrings.Get(23)); // 23 = Error
+ dlg.SetHeading(LocalizeStrings.Get(23)); // 23 = Error
dlg.SetLine(1, msg); // the text must be added to the first line, otherwise scrolling is not enabled
dlg.SetLine(2, String.Empty);
dlg.SetLine(3, String.Empty);
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.csproj
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.csproj 2012-02-09 17:08:05 UTC (rev 4448)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.csproj 2012-02-10 15:26:34 UTC (rev 4449)
@@ -96,6 +96,7 @@
<DependentUpon>EditPhoneBook.cs</DependentUpon>
</Compile>
<Compile Include="FritzCallMonitor\FritzBoxClient.cs" />
+ <Compile Include="FritzManager\LocalizeStrings.cs" />
<Compile Include="FritzManager\StringEncryption.cs">
<SubType>Code</SubType>
</Compile>
@@ -111,7 +112,6 @@
<Compile Include="FritzManager\PhoneBookItem.cs" />
<Compile Include="FritzManager\Task.cs" />
<Compile Include="FritzManager\VoiceBoxItem.cs" />
- <Compile Include="LocalizeStrings.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="FritzCallMonitor\Caller.cs" />
<Compile Include="FritzCallMonitor\CallAction.cs" />
@@ -133,6 +133,7 @@
<ItemGroup>
<EmbeddedResource Include="EditPhoneBook.resx">
<DependentUpon>EditPhoneBook.cs</DependentUpon>
+ <SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2012-02-09 17:08:05 UTC (rev 4448)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2012-02-10 15:26:34 UTC (rev 4449)
@@ -39,14 +39,12 @@
this.tabPagePhoneBook = new System.Windows.Forms.TabPage();
this.buttonEditPhoneBook = new System.Windows.Forms.Button();
this.tabPageCallNotification = new System.Windows.Forms.TabPage();
- this.groupBoxPhonebook = new MediaPortal.UserInterface.Controls.MPGroupBox();
- this.checkBoxShowUnknownCaller = new MediaPortal.UserInterface.Controls.MPCheckBox();
- this.checkBoxUsePhonebook = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.groupBoxNotification = new MediaPortal.UserInterface.Controls.MPGroupBox();
+ this.checkBoxShowNotificationOnOutgoingCall = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.checkBoxCloseOnConnectionClosed = new MediaPortal.UserInterface.Controls.MPCheckBox();
+ this.checkBoxShowNotificationOnIncomingCall = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.lblMaxNotifies = new MediaPortal.UserInterface.Controls.MPLabel();
this.numericUpDownMaxNotifies = new MediaPortal.UserInterface.Controls.MPNumericUpDown();
- this.checkBoxShowPhoneNumberOnNotification = 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();
@@ -61,6 +59,9 @@
this.checkBoxResumeMediaOnIncomingCall = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.checkBoxPauseMediaOnIncomingCall = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.tabPageConnection = new System.Windows.Forms.TabPage();
+ this.numericUpDownDialPort = new System.Windows.Forms.NumericUpDown();
+ this.label6 = new System.Windows.Forms.Label();
+ this.textBoxNASShareName = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
this.vBPath = new System.Windows.Forms.TextBox();
this.passwd = new System.Windows.Forms.TextBox();
@@ -73,29 +74,27 @@
this.labelAddress = new MediaPortal.UserInterface.Controls.MPLabel();
this.tabControlConfiguration = new MediaPortal.UserInterface.Controls.MPTabControl();
this.tabPageMiscellaneous = new System.Windows.Forms.TabPage();
+ this.updateInterval = new MediaPortal.UserInterface.Controls.MPNumericUpDown();
this.checkBoxExtensiveLogging = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.label4 = new System.Windows.Forms.Label();
- this.updateInterval = new MediaPortal.UserInterface.Controls.MPNumericUpDown();
- this.checkBoxShowNotificationOnOutgoingCall = new MediaPortal.UserInterface.Controls.MPCheckBox();
- this.checkBoxShowNotificationOnIncomingCall = new MediaPortal.UserInterface.Controls.MPCheckBox();
- this.label6 = new System.Windows.Forms.Label();
- this.textBoxNASShareName = new System.Windows.Forms.TextBox();
- this.numericUpDownDialPort = new System.Windows.Forms.NumericUpDown();
+ this.checkBoxShowPhoneTypeOnNotification = new MediaPortal.UserInterface.Controls.MPCheckBox();
+ this.checkBoxShowUnknownCaller = new MediaPortal.UserInterface.Controls.MPCheckBox();
+ this.checkBoxUsePhonebook = new MediaPortal.UserInterface.Controls.MPCheckBox();
+ this.checkBoxShowPhoneNumberOnNotification = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.tabPageDiagnostics.SuspendLayout();
this.tabPagePhoneBook.SuspendLayout();
this.tabPageCallNotification.SuspendLayout();
- this.groupBoxPhonebook.SuspendLayout();
this.groupBoxNotification.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownMaxNotifies)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownTimeout)).BeginInit();
this.groupBoxMedia.SuspendLayout();
this.tabPageConnection.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDownDialPort)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownPort)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.tabControlConfiguration.SuspendLayout();
this.tabPageMiscellaneous.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.updateInterval)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.numericUpDownDialPort)).BeginInit();
this.SuspendLayout();
//
// labelVersion
@@ -200,7 +199,6 @@
//
// tabPageCallNotification
//
- this.tabPageCallNotification.Controls.Add(this.groupBoxPhonebook);
this.tabPageCallNotification.Controls.Add(this.groupBoxNotification);
this.tabPageCallNotification.Controls.Add(this.groupBoxMedia);
this.tabPageCallNotification.Location = new System.Drawing.Point(4, 22);
@@ -211,51 +209,19 @@
this.tabPageCallNotification.Text = "Call notfication";
this.tabPageCallNotification.UseVisualStyleBackColor = true;
//
- // groupBoxPhonebook
- //
- this.groupBoxPhonebook.Controls.Add(this.checkBoxShowUnknownCaller);
- this.groupBoxPhonebook.Controls.Add(this.checkBoxUsePhonebook);
- this.groupBoxPhonebook.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- ...
[truncated message content] |
