Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4372] trunk/plugins/FritzBox
|
From: <hor...@us...> - 2011-12-10 11:02:44
|
Revision: 4372
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4372&view=rev
Author: horned-reaper
Date: 2011-12-10 11:02:37 +0000 (Sat, 10 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Docs/Ausstehend.txt
trunk/plugins/FritzBox/Docs/Changes.txt
trunk/plugins/FritzBox/FritzBox/FritzBox.cs
trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/BackGroundWorker.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/PhonebookItem.cs
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
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/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/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/obj/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
Modified: trunk/plugins/FritzBox/Docs/Ausstehend.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Ausstehend.txt 2011-12-10 09:09:06 UTC (rev 4371)
+++ trunk/plugins/FritzBox/Docs/Ausstehend.txt 2011-12-10 11:02:37 UTC (rev 4372)
@@ -1,7 +1,6 @@
Testen:
- Auto-Update
- Zugriff auf Anrufliste und Telefonbuch nach Verbindungsabbruch
-- Cache-Funktion f\xFCr FRITZ!Box Telefonbuch
Fehler beheben:
- \xDCberschrift wird beim Klicken auf Anruflisten-Filter nicht aktualisiert (aus Telefonbuch und Anrufbeantworter)
@@ -12,9 +11,11 @@
- ein kleiner schwarzer Balken \xFCberdeckt das erste Zeichen oder die erste Ziffer zur H\xE4lfte
Neue Funktion:
-- Schalter f\xFCr Ereignisse bei ausgehenden Anrufen
- Umschalter zwischen FritzBox-Telefonbuch und lokalem Telefonbuch
-- Funktion zum Integrieren von Anrufer-Bildern
+ - R\xFCckw\xE4rtssuche integrieren
+ - Anrufer-Bilder von FRITZ!Box verwenden
+ - Einstellung f\xFCr unterdr\xFCckte Rufnummern
+ - Handbuch aktualisieren
- Kontextmen\xFC f\xFCr Telefonbuch
- Wiki-Eintrag
- Skin-Erweiterungen
Modified: trunk/plugins/FritzBox/Docs/Changes.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Changes.txt 2011-12-10 09:09:06 UTC (rev 4371)
+++ trunk/plugins/FritzBox/Docs/Changes.txt 2011-12-10 11:02:37 UTC (rev 4372)
@@ -1,3 +0,0 @@
-- unified logging format
-- password is not logged anymore
-- fixed display of new messages count
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2011-12-10 09:09:06 UTC (rev 4371)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2011-12-10 11:02:37 UTC (rev 4372)
@@ -431,7 +431,7 @@
/// </summary>
public void Start()
{
- Log.Info("FRITZ!Box Plugin {0} starting.", Assembly.GetExecutingAssembly().GetName().Version);
+ Log.Info("FRITZ!Box Manager {0} plugin is starting", Assembly.GetExecutingAssembly().GetName().Version);
Settings.Load();
Utils.OnStartExternal += OnStartExternal;
@@ -450,7 +450,7 @@
/// </summary>
public void Stop()
{
- Log.Info("FRITZ!Box Plugin {0} stopping.", Assembly.GetExecutingAssembly().GetName().Version);
+ Log.Info("FRITZ!Box Manager {0} plugin is stopping", Assembly.GetExecutingAssembly().GetName().Version);
FritzBoxClient.StopClient();
FritzBoxClient.CallEvent -= OnCallAction;
@@ -733,7 +733,7 @@
if (thePlugin.phoneBookDirty)
{
thePlugin.phoneBookDirty = false;
- InternalPhoneBook.savePhonebook(thePlugin.phoneBook.Values, thePlugin.phoneBookPath);
+ InternalPhoneBook.savePhoneBook(thePlugin.phoneBook.Values, thePlugin.phoneBookPath);
}
thePlugin.fritz.keepAlive();
@@ -838,7 +838,7 @@
callItemList = CallItem.load(new MemoryStream(data));
// populate phone book
- bool updatePhonebook = false;
+ bool updatePhoneBook = false;
int idx = 0;
foreach (CallItem i in callItemList)
@@ -857,20 +857,20 @@
pi.name = i.name;
pi.fritzEntry = true;
pi.inverseLookupDone = false;
- updatePhonebook = true;
+ updatePhoneBook = true;
}
else if (useInversSearch && !pi.inverseLookupDone && !pi.fritzEntry && i.number != "") worker.queue.Enqueue(new Task(Task.TaskAction.InversLookup, new object[] { i.number, idx }));
idx++;
}
- if (updatePhonebook) InternalPhoneBook.savePhonebook(phoneBook.Values, phoneBookPath);
+ if (updatePhoneBook) InternalPhoneBook.savePhoneBook(phoneBook.Values, phoneBookPath);
}
refreshView();
}
- public void updatePhonebook(string number, string name, int index)
+ public void updatePhoneBook(string number, string name, int index)
{
if (name != null && name != "" && phoneBook.Contains(number))
{
Modified: trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs 2011-12-10 09:09:06 UTC (rev 4371)
+++ trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs 2011-12-10 11:02:37 UTC (rev 4372)
@@ -123,7 +123,7 @@
{
if (_client != null)
{
- // Release the socket.
+ // Release the socket
_client.Shutdown(SocketShutdown.Both);
_client.Close();
}
@@ -152,14 +152,14 @@
"Address & port test failed! :(" + Environment.NewLine +
" Did you enter correct connection information?" + Environment.NewLine +
" Are you using the latest FRITZ!Box firmware?" + Environment.NewLine +
- " Did you open the port on your FRITZ!Box? If not call #96*5* from your phone.");
+ " Did you open the port on your FRITZ!Box? If not call #96*5* from your phone");
return false;
}
tcpClient.Close();
- Log(LogLevel.Info, "Testing address & port succeeded.");
+ Log(LogLevel.Info, "Testing address & port succeeded");
return true;
}
@@ -220,7 +220,7 @@
catch (SocketException)
{
Log(LogLevel.Debug, "Connect: SocketException");
- Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect.");
+ Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect");
ReConnect();
}
catch (Exception ex)
@@ -247,7 +247,7 @@
catch (SocketException)
{
Log(LogLevel.Debug, "Connect: SocketException");
- Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect.");
+ Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect");
ReConnect();
}
catch (Exception ex)
@@ -287,7 +287,7 @@
Log(LogLevel.HeavyDebug, ex.Source);
Log(LogLevel.HeavyDebug, ex.StackTrace);
Log(LogLevel.Debug, "Receive: SocketException");
- Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect.");
+ Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect");
ReConnect();
}
catch (Exception ex)
@@ -370,19 +370,19 @@
else
{
Log(LogLevel.Debug, "ReceiveCallback: No bytes to read");
- Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect.");
+ Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect");
ReConnect();
}
}
catch (ObjectDisposedException)
{
Log(LogLevel.Debug, "ReceiveCallback: ObjectDisposedException");
- Log(LogLevel.Info, "FRITZ!BOX connection shut down.");
+ Log(LogLevel.Info, "FRITZ!BOX connection shut down");
}
catch (SocketException)
{
Log(LogLevel.Debug, "ReceiveCallback: SocketException");
- Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect.");
+ Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect");
ReConnect();
}
catch (Exception ex)
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/BackGroundWorker.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/BackGroundWorker.cs 2011-12-10 09:09:06 UTC (rev 4371)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/BackGroundWorker.cs 2011-12-10 11:02:37 UTC (rev 4372)
@@ -59,7 +59,7 @@
if (plugin.phoneBook[number].name != null) name = plugin.phoneBook[number].name;
else name = search.LookupNumber((string)task.param[0], out info);
- plugin.updatePhonebook(number, name, index);
+ plugin.updatePhoneBook(number, name, index);
break;
}
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/PhonebookItem.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/PhonebookItem.cs 2011-12-10 09:09:06 UTC (rev 4371)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/PhonebookItem.cs 2011-12-10 11:02:37 UTC (rev 4372)
@@ -12,24 +12,6 @@
public List<PhonebookItem> items = new List<PhonebookItem>();
- public static void savePhonebook(GCollections.ICollection<PhonebookItem> items, string fileName)
- {
- InternalPhoneBook book = new InternalPhoneBook();
- Log.Debug("Saving internal phone book to {0}", fileName);
-
- foreach (PhonebookItem i in items)
- {
- book.items.Add(i);
- }
-
- XmlSerializer s = new XmlSerializer(typeof(InternalPhoneBook));
- TextWriter w = new StreamWriter(fileName);
-
- s.Serialize(w, book);
-
- w.Close();
- }
-
public static HashMap<string, PhonebookItem> loadPhoneBook(string fileName)
{
HashMap<string, PhonebookItem> result = new HashMap<string, PhonebookItem>();
@@ -49,12 +31,27 @@
result[i.number] = i;
}
}
- else
+ else Log.Debug("Could not load FRITZ!Box Manager phone book. File {0} cannot be found", fileName);
+
+ return result;
+ }
+
+ public static void savePhoneBook(GCollections.ICollection<PhonebookItem> items, string fileName)
+ {
+ InternalPhoneBook book = new InternalPhoneBook();
+ Log.Debug("Saving FRITZ!Box Manager phone book from {0}", fileName);
+
+ foreach (PhonebookItem i in items)
{
- Log.Debug("Could not load FRITZ!Box Manager phone book. File {0} cannot be found", fileName);
+ book.items.Add(i);
}
- return result;
+ XmlSerializer s = new XmlSerializer(typeof(InternalPhoneBook));
+ TextWriter w = new StreamWriter(fileName);
+
+ s.Serialize(w, book);
+
+ w.Close();
}
}
Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/ResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
