Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[2893] trunk/plugins/FritzBox
|
From: <che...@us...> - 2009-06-03 11:20:45
|
Revision: 2893
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2893&view=rev
Author: chef_koch
Date: 2009-06-03 11:20:39 +0000 (Wed, 03 Jun 2009)
Log Message:
-----------
added option to listen within config
updated xmp to use *.mpe1
updated version to 0.3.3.0
Modified Paths:
--------------
trunk/plugins/FritzBox/FritzBox/FritzBox.cs
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
trunk/plugins/FritzBox/FritzBox/PhoneBook.cs
trunk/plugins/FritzBox/FritzBox.xmp
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/FritzBoxDebugger.csproj
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2009-06-03 10:27:01 UTC (rev 2892)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2009-06-03 11:20:39 UTC (rev 2893)
@@ -243,7 +243,7 @@
#region Variables
- public const string _version = "0.3.2.5";
+ public const string _version = "0.3.3.0";
private readonly List<CallAction> actionList = new List<CallAction>();
private object tempNotify = null;
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2009-06-03 10:27:01 UTC (rev 2892)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2009-06-03 11:20:39 UTC (rev 2893)
@@ -33,6 +33,8 @@
this.tabGeneral = new System.Windows.Forms.TabPage();
this.checkBoxExtensiveLogging = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.mpGroupBox1 = new MediaPortal.UserInterface.Controls.MPGroupBox();
+ this.mpButton2 = new MediaPortal.UserInterface.Controls.MPButton();
+ this.mpButton1 = new MediaPortal.UserInterface.Controls.MPButton();
this.numericUpDownPort = new System.Windows.Forms.NumericUpDown();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.buttonTest = new MediaPortal.UserInterface.Controls.MPButton();
@@ -41,6 +43,14 @@
this.labelAddress = new MediaPortal.UserInterface.Controls.MPLabel();
this.labelHelp = new MediaPortal.UserInterface.Controls.MPLabel();
this.tabIncoming = new System.Windows.Forms.TabPage();
+ this.groupBoxImport = new MediaPortal.UserInterface.Controls.MPGroupBox();
+ this.mpLabel3 = new MediaPortal.UserInterface.Controls.MPLabel();
+ this.mpLabel2 = new MediaPortal.UserInterface.Controls.MPLabel();
+ this.labelSuffixHome = new MediaPortal.UserInterface.Controls.MPLabel();
+ this.textBoxSuffixMobile = new MediaPortal.UserInterface.Controls.MPTextBox();
+ this.textBoxSuffixHome = new MediaPortal.UserInterface.Controls.MPTextBox();
+ this.mpImportFBMonitor = new MediaPortal.UserInterface.Controls.MPButton();
+ this.textBoxSuffixWork = new MediaPortal.UserInterface.Controls.MPTextBox();
this.groupBoxPhonebook = new MediaPortal.UserInterface.Controls.MPGroupBox();
this.checkBoxSaveUnknownCaller = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.checkBoxShowUnknownCaller = new MediaPortal.UserInterface.Controls.MPCheckBox();
@@ -60,6 +70,7 @@
this.checkBoxResumeMedia = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.checkBoxStopMedia = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.tabPhonebook = new System.Windows.Forms.TabPage();
+ this.buttonClearAll = new MediaPortal.UserInterface.Controls.MPButton();
this.pictureBoxCaller = new System.Windows.Forms.PictureBox();
this.buttonCallerChange = new MediaPortal.UserInterface.Controls.MPButton();
this.checkBoxCallerShow = new MediaPortal.UserInterface.Controls.MPCheckBox();
@@ -76,21 +87,13 @@
this.buttonSave = new MediaPortal.UserInterface.Controls.MPButton();
this.buttonCancel = new MediaPortal.UserInterface.Controls.MPButton();
this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
- this.buttonClearAll = new MediaPortal.UserInterface.Controls.MPButton();
- this.mpImportFBMonitor = new MediaPortal.UserInterface.Controls.MPButton();
- this.textBoxSuffixWork = new MediaPortal.UserInterface.Controls.MPTextBox();
- this.textBoxSuffixHome = new MediaPortal.UserInterface.Controls.MPTextBox();
- this.textBoxSuffixMobile = new MediaPortal.UserInterface.Controls.MPTextBox();
- this.groupBoxImport = new MediaPortal.UserInterface.Controls.MPGroupBox();
- this.labelSuffixHome = new MediaPortal.UserInterface.Controls.MPLabel();
- this.mpLabel2 = new MediaPortal.UserInterface.Controls.MPLabel();
- this.mpLabel3 = new MediaPortal.UserInterface.Controls.MPLabel();
this.tabControlFritzBoxSettings.SuspendLayout();
this.tabGeneral.SuspendLayout();
this.mpGroupBox1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownPort)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.tabIncoming.SuspendLayout();
+ this.groupBoxImport.SuspendLayout();
this.groupBoxPhonebook.SuspendLayout();
this.groupBoxNotify.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownMaxNotifies)).BeginInit();
@@ -99,7 +102,6 @@
this.tabPhonebook.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxCaller)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
- this.groupBoxImport.SuspendLayout();
this.SuspendLayout();
//
// tabControlFritzBoxSettings
@@ -143,6 +145,8 @@
//
this.mpGroupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
+ this.mpGroupBox1.Controls.Add(this.mpButton2);
+ this.mpGroupBox1.Controls.Add(this.mpButton1);
this.mpGroupBox1.Controls.Add(this.numericUpDownPort);
this.mpGroupBox1.Controls.Add(this.pictureBox1);
this.mpGroupBox1.Controls.Add(this.buttonTest);
@@ -158,16 +162,38 @@
this.mpGroupBox1.TabStop = false;
this.mpGroupBox1.Text = "connection";
//
+ // mpButton2
+ //
+ this.mpButton2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.mpButton2.Location = new System.Drawing.Point(434, 46);
+ this.mpButton2.Name = "mpButton2";
+ this.mpButton2.Size = new System.Drawing.Size(121, 21);
+ this.mpButton2.TabIndex = 11;
+ this.mpButton2.Text = "Stop Listening";
+ this.mpButton2.UseVisualStyleBackColor = true;
+ this.mpButton2.Click += new System.EventHandler(this.mpButton2_Click);
+ //
+ // mpButton1
+ //
+ this.mpButton1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.mpButton1.Location = new System.Drawing.Point(434, 19);
+ this.mpButton1.Name = "mpButton1";
+ this.mpButton1.Size = new System.Drawing.Size(121, 21);
+ this.mpButton1.TabIndex = 10;
+ this.mpButton1.Text = "Start Listening";
+ this.mpButton1.UseVisualStyleBackColor = true;
+ this.mpButton1.Click += new System.EventHandler(this.mpButton1_Click);
+ //
// numericUpDownPort
//
- this.numericUpDownPort.Location = new System.Drawing.Point(308, 47);
+ this.numericUpDownPort.Location = new System.Drawing.Point(163, 47);
this.numericUpDownPort.Maximum = new decimal(new int[] {
999999,
0,
0,
0});
this.numericUpDownPort.Name = "numericUpDownPort";
- this.numericUpDownPort.Size = new System.Drawing.Size(116, 20);
+ this.numericUpDownPort.Size = new System.Drawing.Size(138, 20);
this.numericUpDownPort.TabIndex = 9;
this.numericUpDownPort.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
this.numericUpDownPort.Value = new decimal(new int[] {
@@ -189,11 +215,11 @@
// buttonTest
//
this.buttonTest.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonTest.Location = new System.Drawing.Point(480, 20);
+ this.buttonTest.Location = new System.Drawing.Point(307, 19);
this.buttonTest.Name = "buttonTest";
- this.buttonTest.Size = new System.Drawing.Size(75, 21);
+ this.buttonTest.Size = new System.Drawing.Size(121, 21);
this.buttonTest.TabIndex = 2;
- this.buttonTest.Text = "Test";
+ this.buttonTest.Text = "Test Connection";
this.buttonTest.UseVisualStyleBackColor = true;
this.buttonTest.Click += new System.EventHandler(this.buttonTest_Click);
//
@@ -202,9 +228,9 @@
this.textBoxAddress.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.textBoxAddress.BorderColor = System.Drawing.Color.Empty;
- this.textBoxAddress.Location = new System.Drawing.Point(165, 20);
+ this.textBoxAddress.Location = new System.Drawing.Point(163, 20);
this.textBoxAddress.Name = "textBoxAddress";
- this.textBoxAddress.Size = new System.Drawing.Size(309, 20);
+ this.textBoxAddress.Size = new System.Drawing.Size(138, 20);
this.textBoxAddress.TabIndex = 0;
//
// labelPort
@@ -249,6 +275,93 @@
this.tabIncoming.Text = "Incoming Call";
this.tabIncoming.UseVisualStyleBackColor = true;
//
+ // groupBoxImport
+ //
+ this.groupBoxImport.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.groupBoxImport.Controls.Add(this.mpLabel3);
+ this.groupBoxImport.Controls.Add(this.mpLabel2);
+ this.groupBoxImport.Controls.Add(this.labelSuffixHome);
+ this.groupBoxImport.Controls.Add(this.textBoxSuffixMobile);
+ this.groupBoxImport.Controls.Add(this.textBoxSuffixHome);
+ this.groupBoxImport.Controls.Add(this.mpImportFBMonitor);
+ this.groupBoxImport.Controls.Add(this.textBoxSuffixWork);
+ this.groupBoxImport.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.groupBoxImport.Location = new System.Drawing.Point(189, 208);
+ this.groupBoxImport.Name = "groupBoxImport";
+ this.groupBoxImport.Size = new System.Drawing.Size(378, 95);
+ this.groupBoxImport.TabIndex = 3;
+ this.groupBoxImport.TabStop = false;
+ this.groupBoxImport.Text = "Fritz!Box CallMonitor import";
+ //
+ // mpLabel3
+ //
+ this.mpLabel3.AutoSize = true;
+ this.mpLabel3.Location = new System.Drawing.Point(6, 74);
+ this.mpLabel3.Name = "mpLabel3";
+ this.mpLabel3.Size = new System.Drawing.Size(69, 13);
+ this.mpLabel3.TabIndex = 9;
+ this.mpLabel3.Text = "Suffix mobile:";
+ //
+ // mpLabel2
+ //
+ this.mpLabel2.AutoSize = true;
+ this.mpLabel2.Location = new System.Drawing.Point(6, 48);
+ this.mpLabel2.Name = "mpLabel2";
+ this.mpLabel2.Size = new System.Drawing.Size(62, 13);
+ this.mpLabel2.TabIndex = 8;
+ this.mpLabel2.Text = "Suffix work:";
+ //
+ // labelSuffixHome
+ //
+ this.labelSuffixHome.AutoSize = true;
+ this.labelSuffixHome.Location = new System.Drawing.Point(6, 22);
+ this.labelSuffixHome.Name = "labelSuffixHome";
+ this.labelSuffixHome.Size = new System.Drawing.Size(65, 13);
+ this.labelSuffixHome.TabIndex = 7;
+ this.labelSuffixHome.Text = "Suffix home:";
+ //
+ // textBoxSuffixMobile
+ //
+ this.textBoxSuffixMobile.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.textBoxSuffixMobile.BorderColor = System.Drawing.Color.Empty;
+ this.textBoxSuffixMobile.Location = new System.Drawing.Point(85, 71);
+ this.textBoxSuffixMobile.Name = "textBoxSuffixMobile";
+ this.textBoxSuffixMobile.Size = new System.Drawing.Size(141, 20);
+ this.textBoxSuffixMobile.TabIndex = 6;
+ //
+ // textBoxSuffixHome
+ //
+ this.textBoxSuffixHome.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.textBoxSuffixHome.BorderColor = System.Drawing.Color.Empty;
+ this.textBoxSuffixHome.Location = new System.Drawing.Point(85, 19);
+ this.textBoxSuffixHome.Name = "textBoxSuffixHome";
+ this.textBoxSuffixHome.Size = new System.Drawing.Size(141, 20);
+ this.textBoxSuffixHome.TabIndex = 5;
+ //
+ // mpImportFBMonitor
+ //
+ this.mpImportFBMonitor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.mpImportFBMonitor.Location = new System.Drawing.Point(279, 66);
+ this.mpImportFBMonitor.Name = "mpImportFBMonitor";
+ this.mpImportFBMonitor.Size = new System.Drawing.Size(93, 23);
+ this.mpImportFBMonitor.TabIndex = 3;
+ this.mpImportFBMonitor.Text = "Import";
+ this.mpImportFBMonitor.UseVisualStyleBackColor = true;
+ this.mpImportFBMonitor.Click += new System.EventHandler(this.mpImportFBMonitor_Click);
+ //
+ // textBoxSuffixWork
+ //
+ this.textBoxSuffixWork.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.textBoxSuffixWork.BorderColor = System.Drawing.Color.Empty;
+ this.textBoxSuffixWork.Location = new System.Drawing.Point(85, 45);
+ this.textBoxSuffixWork.Name = "textBoxSuffixWork";
+ this.textBoxSuffixWork.Size = new System.Drawing.Size(141, 20);
+ this.textBoxSuffixWork.TabIndex = 4;
+ //
// groupBoxPhonebook
//
this.groupBoxPhonebook.Controls.Add(this.checkBoxSaveUnknownCaller);
@@ -507,6 +620,17 @@
this.tabPhonebook.Text = "Phonebook";
this.tabPhonebook.UseVisualStyleBackColor = true;
//
+ // buttonClearAll
+ //
+ this.buttonClearAll.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.buttonClearAll.Location = new System.Drawing.Point(467, 37);
+ this.buttonClearAll.Name = "buttonClearAll";
+ this.buttonClearAll.Size = new System.Drawing.Size(100, 25);
+ this.buttonClearAll.TabIndex = 14;
+ this.buttonClearAll.Text = "Clear All";
+ this.buttonClearAll.UseVisualStyleBackColor = true;
+ this.buttonClearAll.Click += new System.EventHandler(this.buttonClearAll_Click);
+ //
// pictureBoxCaller
//
this.pictureBoxCaller.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
@@ -667,106 +791,8 @@
this.buttonCancel.UseVisualStyleBackColor = true;
this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
//
- // buttonClearAll
+ // FritzBoxConfig
//
- this.buttonClearAll.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonClearAll.Location = new System.Drawing.Point(467, 37);
- this.buttonClearAll.Name = "buttonClearAll";
- this.buttonClearAll.Size = new System.Drawing.Size(100, 25);
- this.buttonClearAll.TabIndex = 14;
- this.buttonClearAll.Text = "Clear All";
- this.buttonClearAll.UseVisualStyleBackColor = true;
- this.buttonClearAll.Click += new System.EventHandler(this.buttonClearAll_Click);
- //
- // mpImportFBMonitor
- //
- this.mpImportFBMonitor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.mpImportFBMonitor.Location = new System.Drawing.Point(279, 66);
- this.mpImportFBMonitor.Name = "mpImportFBMonitor";
- this.mpImportFBMonitor.Size = new System.Drawing.Size(93, 23);
- this.mpImportFBMonitor.TabIndex = 3;
- this.mpImportFBMonitor.Text = "Import";
- this.mpImportFBMonitor.UseVisualStyleBackColor = true;
- this.mpImportFBMonitor.Click += new System.EventHandler(this.mpImportFBMonitor_Click);
- //
- // textBoxSuffixWork
- //
- this.textBoxSuffixWork.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.textBoxSuffixWork.BorderColor = System.Drawing.Color.Empty;
- this.textBoxSuffixWork.Location = new System.Drawing.Point(85, 45);
- this.textBoxSuffixWork.Name = "textBoxSuffixWork";
- this.textBoxSuffixWork.Size = new System.Drawing.Size(141, 20);
- this.textBoxSuffixWork.TabIndex = 4;
- //
- // textBoxSuffixHome
- //
- this.textBoxSuffixHome.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.textBoxSuffixHome.BorderColor = System.Drawing.Color.Empty;
- this.textBoxSuffixHome.Location = new System.Drawing.Point(85, 19);
- this.textBoxSuffixHome.Name = "textBoxSuffixHome";
- this.textBoxSuffixHome.Size = new System.Drawing.Size(141, 20);
- this.textBoxSuffixHome.TabIndex = 5;
- //
- // textBoxSuffixMobile
- //
- this.textBoxSuffixMobile.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.textBoxSuffixMobile.BorderColor = System.Drawing.Color.Empty;
- this.textBoxSuffixMobile.Location = new System.Drawing.Point(85, 71);
- this.textBoxSuffixMobile.Name = "textBoxSuffixMobile";
- this.textBoxSuffixMobile.Size = new System.Drawing.Size(141, 20);
- this.textBoxSuffixMobile.TabIndex = 6;
- //
- // groupBoxImport
- //
- this.groupBoxImport.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.groupBoxImport.Controls.Add(this.mpLabel3);
- this.groupBoxImport.Controls.Add(this.mpLabel2);
- this.groupBoxImport.Controls.Add(this.labelSuffixHome);
- this.groupBoxImport.Controls.Add(this.textBoxSuffixMobile);
- this.groupBoxImport.Controls.Add(this.textBoxSuffixHome);
- this.groupBoxImport.Controls.Add(this.mpImportFBMonitor);
- this.groupBoxImport.Controls.Add(this.textBoxSuffixWork);
- this.groupBoxImport.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.groupBoxImport.Location = new System.Drawing.Point(189, 208);
- this.groupBoxImport.Name = "groupBoxImport";
- this.groupBoxImport.Size = new System.Drawing.Size(378, 95);
- this.groupBoxImport.TabIndex = 3;
- this.groupBoxImport.TabStop = false;
- this.groupBoxImport.Text = "Fritz!Box CallMonitor import";
- //
- // labelSuffixHome
- //
- this.labelSuffixHome.AutoSize = true;
- this.labelSuffixHome.Location = new System.Drawing.Point(6, 22);
- this.labelSuffixHome.Name = "labelSuffixHome";
- this.labelSuffixHome.Size = new System.Drawing.Size(65, 13);
- this.labelSuffixHome.TabIndex = 7;
- this.labelSuffixHome.Text = "Suffix home:";
- //
- // mpLabel2
- //
- this.mpLabel2.AutoSize = true;
- this.mpLabel2.Location = new System.Drawing.Point(6, 48);
- this.mpLabel2.Name = "mpLabel2";
- this.mpLabel2.Size = new System.Drawing.Size(62, 13);
- this.mpLabel2.TabIndex = 8;
- this.mpLabel2.Text = "Suffix work:";
- //
- // mpLabel3
- //
- this.mpLabel3.AutoSize = true;
- this.mpLabel3.Location = new System.Drawing.Point(6, 74);
- this.mpLabel3.Name = "mpLabel3";
- this.mpLabel3.Size = new System.Drawing.Size(69, 13);
- this.mpLabel3.TabIndex = 9;
- this.mpLabel3.Text = "Suffix mobile:";
- //
- // FritzBoxSetupFrom
- //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(602, 439);
@@ -778,7 +804,7 @@
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.MinimizeBox = false;
- this.Name = "FritzBoxSetupFrom";
+ this.Name = "FritzBoxConfig";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "FRITZ!Box configuration";
this.tabControlFritzBoxSettings.ResumeLayout(false);
@@ -789,6 +815,8 @@
((System.ComponentModel.ISupportInitialize)(this.numericUpDownPort)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.tabIncoming.ResumeLayout(false);
+ this.groupBoxImport.ResumeLayout(false);
+ this.groupBoxImport.PerformLayout();
this.groupBoxPhonebook.ResumeLayout(false);
this.groupBoxPhonebook.PerformLayout();
this.groupBoxNotify.ResumeLayout(false);
@@ -801,8 +829,6 @@
this.tabPhonebook.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxCaller)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
- this.groupBoxImport.ResumeLayout(false);
- this.groupBoxImport.PerformLayout();
this.ResumeLayout(false);
}
@@ -865,5 +891,7 @@
private MediaPortal.UserInterface.Controls.MPLabel mpLabel3;
private MediaPortal.UserInterface.Controls.MPLabel mpLabel2;
private MediaPortal.UserInterface.Controls.MPLabel labelSuffixHome;
+ private MediaPortal.UserInterface.Controls.MPButton mpButton2;
+ private MediaPortal.UserInterface.Controls.MPButton mpButton1;
}
}
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2009-06-03 10:27:01 UTC (rev 2892)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2009-06-03 11:20:39 UTC (rev 2893)
@@ -7,6 +7,8 @@
{
public partial class FritzBoxConfig : Form
{
+ private delegate void SetTextCallback(FritzBoxClient.LogLevel logLevel, string logMessage);
+
public FritzBoxConfig()
{
InitializeComponent();
@@ -105,11 +107,13 @@
private void buttonSave_Click(object sender, EventArgs e)
{
SaveSettings();
+ mpButton2_Click(null, null);
Close();
}
private void buttonCancel_Click(object sender, EventArgs e)
{
+ mpButton2_Click(null, null);
Close();
}
@@ -342,5 +346,37 @@
dataGridView.Rows.Clear();
}
}
+
+ private void OnLogAction(FritzBoxClient.LogLevel logLevel, string logMessage)
+ {
+ if (labelHelp.InvokeRequired)
+ {
+ SetTextCallback d = new SetTextCallback(OnLogAction);
+ Invoke(d, new object[] {logLevel, logMessage});
+ }
+ else
+ {
+ labelHelp.Text = logMessage;
+ }
+ }
+
+
+ private void mpButton1_Click(object sender, EventArgs e)
+ {
+ FritzBoxClient.StopClient();
+ FritzBoxClient.LogEvent -= new FritzBoxClient.LogEventHandler(OnLogAction);
+
+ FritzBoxClient.Address = textBoxAddress.Text;
+ FritzBoxClient.Port = (int) numericUpDownPort.Value;
+
+ FritzBoxClient.LogEvent += new FritzBoxClient.LogEventHandler(OnLogAction);
+ FritzBoxClient.StartClient();
+ }
+
+ private void mpButton2_Click(object sender, EventArgs e)
+ {
+ FritzBoxClient.StopClient();
+ FritzBoxClient.LogEvent -= new FritzBoxClient.LogEventHandler(OnLogAction);
+ }
}
}
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/PhoneBook.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/PhoneBook.cs 2009-06-03 10:27:01 UTC (rev 2892)
+++ trunk/plugins/FritzBox/FritzBox/PhoneBook.cs 2009-06-03 11:20:39 UTC (rev 2893)
@@ -188,7 +188,7 @@
string line;
line = sr.ReadLine(); // sep=;
line = sr.ReadLine();
- // Name;TelNumHome;VanityHome;KurzWahlHome;TelNumWork;VanityWork;KurzWahlWork;TelNumMobile;VanityMobile;KurzWahlMobile;Kommentar;Firma;Bild;Kategorie;ImageUrl;Prio;Email;RingTone;RingVol
+ // Name;TelNumHome;VanityHome;KurzWahlHome;TelNumWork;VanityWork;KurzWahlWork;TelNumMobile;VanityMobile;KurzWahlMobile;Kommentar;Firma;Bild;Kategorie;ImageUrl;Prio;Email;RingTone;RingVol
// Read and display lines from the file until the end of
// the file is reached.
Modified: trunk/plugins/FritzBox/FritzBox.xmp
===================================================================
--- trunk/plugins/FritzBox/FritzBox.xmp 2009-06-03 10:27:01 UTC (rev 2892)
+++ trunk/plugins/FritzBox/FritzBox.xmp 2009-06-03 11:20:39 UTC (rev 2893)
@@ -8,7 +8,7 @@
<Source>FritzBox\gfx\Thumbs\YAC\_noImage.png</Source>
<Id>04010</Id>
<Option>OutputFileName=|DefaultFile=False|</Option>
- <Guid>50ad31a4-8bb5-46f9-a0de-926c73efd882</Guid>
+ <Guid>7a7156bf-e392-4642-a000-0479fe5ae78c</Guid>
</File>
<File>
<FileName>_unknown.png</FileName>
@@ -17,7 +17,7 @@
<Source>FritzBox\gfx\Thumbs\YAC\_unknown.png</Source>
<Id>04010</Id>
<Option />
- <Guid>c1ccf2f7-224a-40a0-9638-72534fc56b73</Guid>
+ <Guid>7adf16d6-658b-4ddc-8e0b-0a2bac04b515</Guid>
</File>
<File>
<FileName>FritzBox.dll</FileName>
@@ -26,7 +26,7 @@
<Source>FritzBox\bin\Release\FritzBox.dll</Source>
<Id>01020</Id>
<Option />
- <Guid>79cdff81-638b-438f-861d-e4269eadd0fb</Guid>
+ <Guid>56a8e93d-26db-4295-b77e-f813a9dda85b</Guid>
</File>
</FileList>
<StringList />
@@ -36,12 +36,12 @@
<SetupGroups />
<SetupGroupMappings />
<Option>
- <BuildFileName>D:\mediaportal\mediaportal_plugins\FritzBox\FritzBox_v0.3.2.5.mpi</BuildFileName>
- <ProiectFileName>D:\mediaportal\mediaportal_plugins\FritzBox\FritzBox.xmp</ProiectFileName>
+ <BuildFileName>G:\MediaPortal\mp-plugins\trunk\plugins\FritzBox\FritzBox_v0.3.3.0.MPE1</BuildFileName>
+ <ProiectFileName>G:\MediaPortal\mp-plugins\trunk\plugins\FritzBox\FritzBox.xmp</ProiectFileName>
<ProiectName>FRITZ!Box CallMonitor</ProiectName>
<Author>chefkoch @ Team MediaPortal</Author>
<UpdateURL>http://www.team-mediaportal.com/files/Download/MediaPortalInstaller(MPI)/Input/FRITZ!BoxCallMonitor/</UpdateURL>
- <Version>0.3.2.5</Version>
+ <Version>0.3.3.0</Version>
<Description>The FRITZ!Box plugin is a process plugin, which is able to notify you within MediaPortal on an incomming call on your FRITZ!Box.
All strings are multi language.
@@ -53,16 +53,20 @@
The plugin supports pictures for each caller. You can place a picture in "ThumbsYAC"-directory which is in jpg, png or bmp format. The filename have to be the specified name NOT the callerid. </Description>
<Group>Input</Group>
<Release>Stable </Release>
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
