Thread: [Mp-plugins-svn] SF.net SVN: mp-plugins:[4435] trunk/plugins/FritzBox (Page 3)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 4435
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4435&view=rev
Author:   horned-reaper
Date:     2012-02-02 11:43:11 +0000 (Thu, 02 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/FritzBox.cs
    trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
    trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
    trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/CallAction.cs
    trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.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/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/releases/FritzBox_v0.4.1.4434.mpe1

Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================

--- trunk/plugins/FritzBox/Build/Build.log	2012-01-29 16:54:34 UTC (rev 4434)
+++ trunk/plugins/FritzBox/Build/Build.log	2012-02-02 11:43:11 UTC (rev 4435)
@@ -1,6 +1,6 @@
  
 Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4426
+SVN Version: 4434
 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 28.01.2012 10:49:53.
+Build started 02.02.2012 12:38:15.
 Project "D:\FritzBox\FritzBox.sln" on node 1 (Rebuild target(s)).
 ValidateSolutionConfiguration:
   Building solution configuration "Release|Mixed Platforms".
@@ -154,8 +154,8 @@
   Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.DebugForm.resources".
   Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.exe".
   Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.pdb".
-  Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.read.6.tlog".
-  Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.write.6.tlog".
+  Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.read.7.tlog".
+  Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.write.7.tlog".
 CoreResGen:
   "C:\Program Files\Microsoft SDKs\Windows\v7.0A\bin\NETFX 4.0 Tools\resgen.exe" /useSourcePath /r:"C:\Program Files\Team MediaPortal\MediaPortal\Core.dll" /r:D:\FritzBox\FritzBox\bin\Release\FritzBox.dll /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\mscorlib.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Core.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Data.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Drawing.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Windows.Forms.dll" /r:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Xml.dll" /compile DebugForm.resx,obj\Release\FritzBoxDebugger.DebugForm.resources
   Processing resource file "DebugForm.resx" into "obj\Release\FritzBoxDebugger.DebugForm.resources".
@@ -195,7 +195,7 @@
     0 Warning(s)
     0 Error(s)
 
-Time Elapsed 00:00:03.29
+Time Elapsed 00:00:03.25
 Reverting to build 0
 Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
 Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
@@ -280,7 +280,7 @@
 ..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
 36 File(s) copied
 MpeMaker version: 1.2.1.0
-Build started at 10:50:00
+Build started at 12:38:22
 Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
 Output: "..\MpeRelease\FritzBox.mpe1"
 Writing UpdateXML to "update.xml"

Modified: trunk/plugins/FritzBox/Docs/Ausstehend.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Ausstehend.txt	2012-01-29 16:54:34 UTC (rev 4434)
+++ trunk/plugins/FritzBox/Docs/Ausstehend.txt	2012-02-02 11:43:11 UTC (rev 4435)
@@ -1,8 +1,6 @@
 Fehler beheben:
-- ein kleiner schwarzer Balken \xFCberdeckt das erste Zeichen oder die erste Ziffer zur H\xE4lfte
 - 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
-- Localization fehlt noch im StreamedMP-Skin
 
 Optimierungen:
 - btnModus umbenennen?
@@ -15,6 +13,10 @@
  - GUI-Adressbuch
  - Anruf-Benachrichtigungen
 - 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
@@ -29,10 +31,6 @@
 
 Anwenderw\xFCnsche
 ---------------
-
-IchBinsShort, 05.01.2012, 18:02:
-Noch eine andere Frage ist es auch m\xF6glich das bei ausgehenden Anrufen nur bei bestimmten Handger\xE4ten der Pause Befehl gesendet wird. Ich benutze drei Funktelefone \xFCber die Dect Funktion der Fritzbox 7020, Garten, Eltern und bei mir. W\xE4re also sch\xF6n wenn nur auf Pause gestellt wird wenn von meinem Telefon eine Anruf get\xE4tigt wird.
-
 Scrounger, 05.12.2011:
 Was ich wirklich verdammt gerne noch h\xE4tte, w\xE4re die M\xF6glichkeit, sich auf dem Basic Home Screen die verpassten anrufe anzeigen zu lassen oder die letzten 3 Anrufe. K\xF6nntet ihr das evtl. in eine kommende Version integrieren? 
 Was ich damit meine ist, dass du evtl. 3 globale Variablen (AnruferName bzw. Nr. und Bild) zur Verf\xFCgung stellen k\xF6nntest, die dann jeder Skindesigner in seinem BasicHome integrieren k\xF6nnte. Z.B. wie das beim DriveFreeSpace Plugin geht oder bei den Plugins von Micropolis.

Modified: trunk/plugins/FritzBox/Docs/Changes.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Changes.txt	2012-01-29 16:54:34 UTC (rev 4434)
+++ trunk/plugins/FritzBox/Docs/Changes.txt	2012-02-02 11:43:11 UTC (rev 4435)
@@ -1,5 +1,12 @@
+0.4.1.4434:
+New features:
+- added call action to voice box context menu and phone book
+
+Optimizations:
+- added checks for context menu actions
+
 Fixed bugs:
-- error in Russian localization
-- FRITZ!Box 7390 specific
-  - contact images are not synchronized with FRITZ!Box
-  - voice box access doesn't work
\ No newline at end of file
+- 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

Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs	2012-01-29 16:54:34 UTC (rev 4434)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs	2012-02-02 11:43:11 UTC (rev 4435)
@@ -66,7 +66,6 @@
         private readonly List<CallAction> _notificationQueue = new List<CallAction>();
         private bool _showNotification = true;
         private object _tempNotification;
-        //private static bool windowIsDisplayed = false;
         private int notificationCount = 0;
 
         #endregion Variables
@@ -111,7 +110,7 @@
                 case CallAction.CallType.ConnectionClosed:
                     if (Settings.CloseNotificationOnConnectionClosed)
                     {
-                        Log.Info("\"Close On Connection Close\" setting is enabled. Try to close active notification");
+                        Log.Info("\"Close On Connection Close\" setting is enabled. Trying to close active notification");
 
                         if (_tempNotification != null)
                         {
@@ -254,6 +253,8 @@
                         }
                         else strText += GUILocalizeStrings.Get(3); // 3 = Unknown
 
+                        strText += Environment.NewLine; // avoids that the first number of the message box text gets cropped
+
                         // show call notification
                         showNotificationWindow(callAction.Type, strHeading, strImage, strText);
                     }
@@ -277,16 +278,26 @@
                 Log.Info("MSN filter is disabled");
                 return true;
             }
-
-            if (Settings.MSNList.Contains(mSN))
-            {
-                Log.Info("MSN is on the filter list");
-                return true;
-            }
             else
             {
-                Log.Info("MSN is not on the list. Notification won't be shown");
-                return false;
+                if (mSN != "")
+                {
+                    if (Settings.MSNList.Contains(mSN))
+                    {
+                        Log.Info("MSN is on the filter list");
+                        return true;
+                    }
+                    else
+                    {
+                        Log.Info("MSN is not on the list. Notification won't be shown");
+                        return false;
+                    }
+                }
+                else
+                {
+                    Log.Info("Unknown MSN. Filtering is disabled");
+                    return true;
+                }
             }
         }
 
@@ -691,7 +702,7 @@
             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));
-            worker.queue.Enqueue(new Task(Task.TaskAction.SynchronizeContactImages, null));
+            if (!String.IsNullOrEmpty(Settings.NASShareName)) worker.queue.Enqueue(new Task(Task.TaskAction.SynchronizeContactImages, null));
 
             worker.queue.Enqueue(new Task(Task.TaskAction.UpdateGUIProperties, null));
         }
@@ -704,7 +715,7 @@
             {
                 fritz.KeepAlive();
 
-                fritz.refresh();
+                fritz.Refresh();
             }
         }
 
@@ -825,7 +836,7 @@
 
         public void LoadCallListData()
         {
-            byte[] data = fritz.loadCallListData(true);
+            byte[] data = fritz.LoadCallListData(true);
 
             refreshCallListData(data);
         }
@@ -1114,34 +1125,51 @@
 
         protected override void OnShowContextMenu()
         {
+            string phoneNumber;
+
             base.OnShowContextMenu();
 
             if (Settings.CurrentMode == GUIMode.VoiceBox)
             {
-                int r = ShowVoiceboxContextMenu();
+                int r = showVoiceboxContextMenu();
+                phoneNumber = voiceBoxItemList[Convert.ToInt16(facadeView.SelectedListItem.Path)].callerId;
 
                 switch (r)
                 {
                     case 0: // play
                         g_Player.Play(decode(voiceBoxItemList[Convert.ToInt16(facadeView.SelectedListItem.Path)]));
                         break;
-                    case 1:
+                    case 1: // call
+                        fritz.Dial(phoneNumber);
                         break;
                 }
             }
             else if (Settings.CurrentMode == GUIMode.CallList)
             {
-                int r = ShowCallListContextMenu();
+                int r = showCallListContextMenu();
                 int idx = Convert.ToInt16(facadeView.SelectedListItem.Path);
-                CallItem item = callItemList[idx];
+                phoneNumber = callItemList[idx].number;
 
                 switch (r)
                 {
-                    case 0: // call back
-                        fritz.dial(item.number);
+                    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 (r)
+                {
+                    case 0: // call
+                        fritz.Dial(phoneNumber);
+                        break;
+                }
+            }
         }
 
         protected override void OnClicked(int controlId, GUIControl control, MediaPortal.GUI.Library.Action.ActionType actionType)
@@ -1272,15 +1300,19 @@
             if (control == btnUpdate) updateGUI(true);
         }
 
-        private int ShowCallListContextMenu()
+        private int showCallListContextMenu()
         {
+            bool callActionEnabled = false;
+
+            if (callItemList[Convert.ToInt16(facadeView.SelectedListItem.Path)].number != "") callActionEnabled = true;
+
             GUIDialogMenu dlgMenu = (GUIDialogMenu)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU);
-
+            
             if (dlgMenu != null)
             {
                 dlgMenu.Reset();
-                dlgMenu.SetHeading(GUILocalizeStrings.Get(4)); // 4 = Calls
-                dlgMenu.Add(GUILocalizeStrings.Get(5)); // 5 = Call back
+                dlgMenu.SetHeading(GUILocalizeStrings.Get(4)); // 4 = Caller
+                if (fritz.LoggedIn && callActionEnabled) dlgMenu.Add(GUILocalizeStrings.Get(5)); // 5 = Call
                 dlgMenu.DoModal(GetID);
 
                 if (dlgMenu.SelectedLabel == -1) return -1; // nothing was selected
@@ -1291,20 +1323,25 @@
             return -1;
         }
 
-        private int ShowVoiceboxContextMenu()
+        private int showVoiceboxContextMenu()
         {
+            bool callActionEnabled = false;
+
+            if (voiceBoxItemList[Convert.ToInt16(facadeView.SelectedListItem.Path)].callerId != "") callActionEnabled = true;
+            
             GUIDialogMenu dlgMenu = (GUIDialogMenu)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU);
 
             if (dlgMenu != null)
             {
                 dlgMenu.Reset();
-                dlgMenu.SetHeading(GUILocalizeStrings.Get(7)); // 7 = Messages
+                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
+                //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.DoModal(GetID);
 
-                if (dlgMenu.SelectedLabel == -1) return -1; // Nothing was selected          
+                if (dlgMenu.SelectedLabel == -1) return -1; // nothing was selected          
 
                 return dlgMenu.SelectedLabel;
             }
@@ -1312,6 +1349,25 @@
             return -1;
         }
 
+        private int showPhoneBookContextMenu()
+        {
+            GUIDialogMenu dlgMenu = (GUIDialogMenu)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU);
+
+            if (dlgMenu != null)
+            {
+                dlgMenu.Reset();
+                dlgMenu.SetHeading(GUILocalizeStrings.Get(6)); // 4 = Contact
+                if (fritz.LoggedIn) dlgMenu.Add(GUILocalizeStrings.Get(5)); // 5 = Call
+                dlgMenu.DoModal(GetID);
+
+                if (dlgMenu.SelectedLabel == -1) return -1; // nothing was selected
+
+                return dlgMenu.SelectedLabel;
+            }
+
+            return -1;
+        }
+
         private void updateButtonStates()
         {
             facadeView.IsVisible = false;

Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs	2012-01-29 16:54:34 UTC (rev 4434)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs	2012-02-02 11:43:11 UTC (rev 4435)
@@ -75,12 +75,12 @@
             this.tabPageMiscellaneous = new System.Windows.Forms.TabPage();
             this.checkBoxExtensiveLogging = new MediaPortal.UserInterface.Controls.MPCheckBox();
             this.label4 = new System.Windows.Forms.Label();
-            this.dialPortNumericUpDown = new MediaPortal.UserInterface.Controls.MPNumericUpDown();
             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.tabPageDiagnostics.SuspendLayout();
             this.tabPagePhoneBook.SuspendLayout();
             this.tabPageCallNotification.SuspendLayout();
@@ -94,8 +94,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.tabControlConfiguration.SuspendLayout();
             this.tabPageMiscellaneous.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dialPortNumericUpDown)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.updateInterval)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownDialPort)).BeginInit();
             this.SuspendLayout();
             // 
             // labelVersion
@@ -488,9 +488,9 @@
             // 
             // tabPageConnection
             // 
+            this.tabPageConnection.Controls.Add(this.numericUpDownDialPort);
             this.tabPageConnection.Controls.Add(this.label6);
             this.tabPageConnection.Controls.Add(this.textBoxNASShareName);
-            this.tabPageConnection.Controls.Add(this.dialPortNumericUpDown);
             this.tabPageConnection.Controls.Add(this.label2);
             this.tabPageConnection.Controls.Add(this.vBPath);
             this.tabPageConnection.Controls.Add(this.passwd);
@@ -657,24 +657,6 @@
             this.label4.TabIndex = 20;
             this.label4.Text = "Auto update frequency (seconds)";
             // 
-            // dialPortNumericUpDown
-            // 
-            this.dialPortNumericUpDown.Location = new System.Drawing.Point(129, 149);
-            this.dialPortNumericUpDown.Minimum = new decimal(new int[] {
-            1,
-            0,
-            0,
-            0});
-            this.dialPortNumericUpDown.Name = "dialPortNumericUpDown";
-            this.dialPortNumericUpDown.Size = new System.Drawing.Size(53, 20);
-            this.dialPortNumericUpDown.TabIndex = 33;
-            this.dialPortNumericUpDown.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            this.dialPortNumericUpDown.Value = new decimal(new int[] {
-            1,
-            0,
-            0,
-            0});
-            // 
             // updateInterval
             // 
             this.updateInterval.Location = new System.Drawing.Point(33, 45);
@@ -731,11 +713,23 @@
             // 
             // textBoxNASShareName
             // 
-            this.textBoxNASShareName.Location = new System.Drawing.Point(108, 257);
+            this.textBoxNASShareName.Location = new System.Drawing.Point(110, 257);
             this.textBoxNASShareName.Name = "textBoxNASShareName";
             this.textBoxNASShareName.Size = new System.Drawing.Size(119, 20);
             this.textBoxNASShareName.TabIndex = 34;
             // 
+            // numericUpDownDialPort
+            // 
+            this.numericUpDownDialPort.Location = new System.Drawing.Point(129, 152);
+            this.numericUpDownDialPort.Maximum = new decimal(new int[] {
+            99,
+            0,
+            0,
+            0});
+            this.numericUpDownDialPort.Name = "numericUpDownDialPort";
+            this.numericUpDownDialPort.Size = new System.Drawing.Size(44, 20);
+            this.numericUpDownDialPort.TabIndex = 36;
+            // 
             // FritzBoxConfig
             // 
             this.AcceptButton = this.okButton;
@@ -774,8 +768,8 @@
             this.tabControlConfiguration.ResumeLayout(false);
             this.tabPageMiscellaneous.ResumeLayout(false);
             this.tabPageMiscellaneous.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dialPortNumericUpDown)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.updateInterval)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownDialPort)).EndInit();
             this.ResumeLayout(false);
 
     }
@@ -828,11 +822,11 @@
     private MediaPortal.UserInterface.Controls.MPLabel labelPort;
     private MediaPortal.UserInterface.Controls.MPLabel labelAddress;
     private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxExtensiveLogging;
-    private MediaPortal.UserInterface.Controls.MPNumericUpDown dialPortNumericUpDown;
     private MediaPortal.UserInterface.Controls.MPNumericUpDown updateInterval;
     private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxShowNotificationOnOutgoingCall;
     private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxShowNotificationOnIncomingCall;
     private System.Windows.Forms.Label label6;
     private System.Windows.Forms.TextBox textBoxNASShareName;
+    private System.Windows.Forms.NumericUpDown numericUpDownDialPort;
   }
 }
\ No newline at end of file

Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs	2012-01-29 16:54:34 UTC (rev 4434)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs	2012-02-02 11:43:11 UTC (rev 4435)
@@ -56,9 +56,9 @@
             textBoxAddress.Text = FritzBoxClient.Address;
             numericUpDownPort.Value = FritzBoxClient.Port;
             passwd.Text = Settings.Password;
-                        
-            dialPortNumericUpDown.Text = Settings.DialPort;
 
+            numericUpDownDialPort.Text = Settings.DialPort;
+
             vBPath.Text = Settings.VBPath;
 
             textBoxNASShareName.Text = Settings.NASShareName;
@@ -109,7 +109,7 @@
             FritzBoxClient.Port = (int)numericUpDownPort.Value;
             Settings.Password = passwd.Text;
 
-            Settings.DialPort = dialPortNumericUpDown.Text;
+            Settings.DialPort = numericUpDownDialPort.Text;
 
             Settings.VBPath = vBPath.Text;
 

Modified: trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/CallAction.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/CallAction.cs	2012-01-29 16:54:34 UTC (rev 4434)
+++ trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/CallAction.cs	2012-02-02 11:43:11 UTC (rev 4435)
@@ -25,40 +25,40 @@
 
 namespace FritzBox
 {
-  public class CallAction
-  {
-    #region CallType enum
-
-    public enum CallType
+    public class CallAction
     {
-      Incoming,
-      Outgoing,
-      ConnectionStarted,
-      ConnectionClosed
-    }
+        #region CallType enum
 
-    #endregion
+        public enum CallType
+        {
+            Incoming,
+            Outgoing,
+            ConnectionStarted,
+            ConnectionClosed
+        }
 
-    public CallAction()
-    {
-      Time = DateTime.MinValue;
-      Caller = new Caller();
-      MSN = string.Empty;
-    }
+        #endregion
 
-    public CallType Type { get; set; }
-    public DateTime Time { get; set; }
-    public Caller Caller { get; set; }
-    public string MSN { get; set; }
+        public CallAction()
+        {
+            Time = DateTime.MinValue;
+            Caller = new Caller();
+            MSN = string.Empty;
+        }
 
-    public void WriteToLog()
-    {
-      Log.Info("CallAction Info:");
-      Log.Info("   CallType: {0}", Type.ToString());
-      Log.Info("   Date: {0}", Time.ToShortDateString());
-      Log.Info("   Time: {0}", Time.ToShortTimeString());
-      if (Settings.ExtensiveLogging) Log.Info("   Caller: {0}", Caller.PhoneNumber);
-      if (Settings.ExtensiveLogging) Log.Info("   MSN: {0}", MSN);
+        public CallType Type { get; set; }
+        public DateTime Time { get; set; }
+        public Caller Caller { get; set; }
+        public string MSN { get; set; }
+
+        public void WriteToLog()
+        {
+            Log.Info("CallAction Info:");
+            Log.Info("   CallType: {0}", Type.ToString());
+            Log.Info("   Date: {0}", Time.ToShortDateString());
+            Log.Info("   Time: {0}", Time.ToShortTimeString());
+            if (Settings.ExtensiveLogging) Log.Info("   Caller: {0}", Caller.PhoneNumber);
+            if (Settings.ExtensiveLogging) Log.Info("   MSN: {0}", MSN);
+        }
     }
-  }
-}
\ No newline at end of file
+}

Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs	2012-01-29 16:54:34 UTC (rev 4434)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs	2012-02-02 11:43:11 UTC (rev 4435)
@@ -101,7 +101,7 @@
             }
         }
 
-        public void refresh()
+        public void Refresh()
         {
             TimeSpan ts = (DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0));
             long unixTime = Convert.ToInt32(ts.TotalSeconds);
@@ -122,7 +122,7 @@
             }
         }
 
-        public byte[] loadCallListData(bool forceReload)
+        public byte[] LoadCallListData(bool forceReload)
         {
             byte[] result = { 0 };
 
@@ -192,8 +192,7 @@
         /// dial a number on fritz
         /// </summary>
         /// <param name="number">number to dial</param>
-        /// <param name="dialport">port to use</param>
-        public void dial(string number)
+        public void Dial(string number)
         {
    ...
 
[truncated message content]

Thread: [Mp-plugins-svn] SF.net SVN: mp-plugins:[4435] trunk/plugins/FritzBox (Page 3)

mp-plugins-svn