Menu
▾
▴
mp-plugins-svn
|
From: <hor...@us...> - 2012-02-02 11:43:23
|
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)
{
if (loggedIn)
{
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/MyBinaryReader.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/MyBinaryReader.cs 2012-01-29 16:54:34 UTC (rev 4434)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/MyBinaryReader.cs 2012-02-02 11:43:11 UTC (rev 4435)
@@ -29,10 +29,7 @@
public override int ReadInt32()
{
- if (!BigEndianFormat)
- {
- return base.ReadInt32();
- }
+ if (!BigEndianFormat) return base.ReadInt32();
else
{
byte[] bytes = base.ReadBytes(4);
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs 2012-01-29 16:54:34 UTC (rev 4434)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs 2012-02-02 11:43:11 UTC (rev 4435)
@@ -360,7 +360,7 @@
if (fritz != null && fritz.LoggedIn)
{
// search contact images folder on the FRITZ!Box
- if (contactImagesPathRemote == null && !String.IsNullOrEmpty(Settings.NASShareName))
+ if (contactImagesPathRemote == null)
{
Log.Debug("Searching contact images folder on the FRITZ!Box");
@@ -371,11 +371,20 @@
if (!String.IsNullOrEmpty(phoneBookItem.ImageURL))
{
contactImagePathRemote = phoneBookItem.ImageURL;
-
+
// convert to UNC format
- if (contactImagePathRemote.Contains("InternerSpeicher")) contactImagePathRemote = contactImagePathRemote.Replace("file:///var/InternerSpeicher", @"\\" + FritzBoxClient.Address + "\\" + Settings.NASShareName); // FRITZ!Boxe models with internal storage e. g. FRITZ!Box 7390
- else contactImagePathRemote = contactImagePathRemote.Replace("file:///var/media/ftp", @"\\" + FritzBoxClient.Address + "\\" + Settings.NASShareName);
-
+ if (Directory.Exists(@"\\" + FritzBoxClient.Address + "\\" + Settings.NASShareName))
+ {
+ if (contactImagePathRemote.Contains("InternerSpeicher")) contactImagePathRemote = contactImagePathRemote.Replace("file:///var/InternerSpeicher", @"\\" + FritzBoxClient.Address + "\\" + Settings.NASShareName); // FRITZ!Boxe models with internal storage e. g. FRITZ!Box 7390
+ else contactImagePathRemote = contactImagePathRemote.Replace("file:///var/media/ftp", @"\\" + FritzBoxClient.Address + "\\" + Settings.NASShareName);
+ }
+ else
+ {
+ // some FRITZ!Box models e. g. 7390 don't have no common share under "Settings.NASShareName". They directly share their data under the FRITZ!Box host name
+ if (contactImagePathRemote.Contains("InternerSpeicher")) contactImagePathRemote = contactImagePathRemote.Replace("file:///var/InternerSpeicher", @"\\" + FritzBoxClient.Address); // FRITZ!Boxe models with internal storage e. g. FRITZ!Box 7390
+ else contactImagePathRemote = contactImagePathRemote.Replace("file:///var/media/ftp", @"\\" + FritzBoxClient.Address);
+ }
+
contactImagePathRemote = contactImagePathRemote.Replace("/", "\\");
// check if folder exists and put it to the variable
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml 2012-01-29 16:54:34 UTC (rev 4434)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml 2012-02-02 11:43:11 UTC (rev 4435)
@@ -4,9 +4,10 @@
<String id="1">Eingehender Anruf</String>
<String id="2">Ausgehender Anruf</String>
<String id="3">Unbekannt</String>
- <String id="4">Anrufe</String>
- <String id="5">Zurückrufen</String>
- <String id="7">Nachrichten</String>
+ <String id="4">Anrufer</String>
+ <String id="5">Anrufen</String>
+ <String id="6">Kontakt</String>
+ <String id="7">Nachricht</String>
<String id="8">Nachricht abspielen</String>
<String id="9">Nachricht als gehört markieren</String>
<String id="10">Nachricht löschen</String>
@@ -20,11 +21,11 @@
<String id="18">Anrufliste</String>
<String id="19">FritzBox Nachrichten</String>
<String id="20">Telefonbuch</String>
- <String id="21">FritzBox Anrufliste</String>
- <String id="22">FritzBox Telefonbuch</String>
+ <String id="21">FRITZ!Box Anrufliste</String>
+ <String id="22">FRITZ!Box Telefonbuch</String>
<String id="23">Fehler</String>
<String id="24">Bitte FRITZ!Box-Passwort und Anrufbeantworter-Pfad unter Configuration eintragen!</String>
- <String id="25">Update</String>
+ <String id="25">Aktualisieren</String>
<String id="26">an</String>
<String id="27">Nachricht</String>
<String id="28">Telefon</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_el.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_el.xml 2012-01-29 16:54:34 UTC (rev 4434)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_el.xml 2012-02-02 11:43:11 UTC (rev 4435)
@@ -4,9 +4,10 @@
<String id="1">Λήψη κλήσης</String>
<String id="2">Εξερχόμενη κλήση</String>
<String id="3">Άγνωστη</String>
- <String id="4">Προσκλήσεις</String>
+ <String id="4">καλούντος</String>
<String id="5">Επιστροφή κλήσης</String>
- <String id="7">Ειδήσεις</String>
+ <String id="6">επαφή</String>
+ <String id="7">Μήνυμα</String>
<String id="8">Παίξτε το μήνυμα</String>
<String id="9">Σήμανση μηνύματος ως μέρος της</String>
<String id="10">Διαγραφή του μηνύματος</String>
@@ -20,9 +21,9 @@
<String id="18">Λίστα κλήσεων</String>
<String id="19">FritzBox ειδήσεις</String>
<String id="20">Τηλεφωνικός κατάλογος</String>
- <String id="21">FritzBox λίστα κλήσεων</String>
- <String id="22">FritzBox Telefonbuch</String>
- <String id="23">Fehler</String>
+ <String id="21">FRITZ!Box λίστα κλήσεων</String>
+ <String id="22">FRITZ!Box Telefonbuch</String>
+ <String id="23">Errore</String>
<String id="24">FRITZ!Box κωδικό και φωνή μονοπάτι κουτί λείπουν στις ρυθμίσεις!</String>
<String id="25">Ενημέρωση</String>
<String id="26">στο</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_en-US.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_en-US.xml 2012-01-29 16:54:34 UTC (rev 4434)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_en-US.xml 2012-02-02 11:43:11 UTC (rev 4435)
@@ -4,9 +4,10 @@
<String id="1">Incoming call</String>
<String id="2">Outgoing call</String>
<String id="3">Unknown</String>
- <String id="4">Calls</String>
- <String id="5">Call back</String>
- <String id="7">Messages</String>
+ <String id="4">Caller</String>
+ <String id="5">Call</String>
+ <String id="6">Contact</String>
+ <String id="7">Message</String>
<String id="8">Play message</String>
<String id="9">Mark message as heard</String>
<String id="10">Delete message</String>
@@ -20,8 +21,8 @@
<String id="18">Call list</String>
<String id="19">FritzBox messages</String>
<String id="20">Phone book</String>
- <String id="21">FritzBox call list</String>
- <String id="22">FritzBox phone book</String>
+ <String id="21">FRITZ!Box call list</String>
+ <String id="22">FRITZ!Box phone book</String>
<String id="23">Error</String>
<String id="24">FRITZ!Box password and voice box path are missing in settings!</String>
<String id="25">Update</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_en.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_en.xml 2012-01-29 16:54:34 UTC (rev 4434)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_en.xml 2012-02-02 11:43:11 UTC (rev 4435)
@@ -4,9 +4,10 @@
<String id="1">Incoming call</String>
<String id="2">Outgoing call</String>
<String id="3">Unknown</String>
- <String id="4">Calls</String>
- <String id="5">Call back</String>
- <String id="7">Messages</String>
+ <String id="4">Caller</String>
+ <String id="5">Call</String>
+ <String id="6">Contact</String>
+ <String id="7">Message</String>
<String id="8">Play message</String>
<String id="9">Mark message as heard</String>
<String id="10">Delete message</String>
@@ -20,8 +21,8 @@
<String id="18">Call list</String>
<String id="19">FritzBox messages</String>
<String id="20">Phone book</String>
- <String id="21">FritzBox call list</String>
- <String id="22">FritzBox phone book</String>
+ <String id="21">FRITZ!Box call list</String>
+ <String id="22">FRITZ!Box phone book</String>
<String id="23">Error</String>
<String id="24">FRITZ!Box password and voice box path are missing in settings!</String>
<String id="25">Update</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_es.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_es.xml 2012-01-29 16:54:34 UTC (rev 4434)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_es.xml 2012-02-02 11:43:11 UTC (rev 4435)
@@ -4,9 +4,10 @@
<String id="1">Llamada entrante</String>
<String id="2">Llamada saliente</String>
<String id="3">Desconocido</String>
- <String id="4">Llamadas</String>
+ <String id="4">Llama</String>
<String id="5">Llamar</String>
- <String id="7">Noticias</String>
+ <String id="6">Contacto</String>
+ <String id="7">Mensaje</String>
<String id="8">Mensaje jugar</String>
<String id="9">Marcar mensaje pertenece</String>
<String id="10">Mensaje borrar</String>
@@ -20,8 +21,8 @@
<String id="18">Lista de llamadas</String>
<String id="19">FritzBox noticias</String>
<String id="20">Guía telefónica</String>
- <String id="21">FritzBox lista de llamadas</String>
- <String id="22">FritzBox guía telefónica</String>
+ <String id="21">FRITZ!Box lista de llamadas</String>
+ <String id="22">FRITZ!Box guía telefónica</String>
<String id="23">Error</String>
<String id="24">FRITZ!Box y la ruta de caja de la voz no se encuentran en la configuración!</String>
<String id="25">Actualización</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_fr.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_fr.xml 2012-01-29 16:54:34 UTC (rev 4434)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_fr.xml 2012-02-02 11:43:11 UTC (rev 4435)
@@ -1,12 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
+<?xml version="1.0" encoding="UTF-8"?>
<Language name="French" characters="255">
<Section name="unmapped">
<String id="1">Appel entrant</String>
<String id="2">Appels sortants</String>
<String id="3">Inconnue</String>
- <String id="4">Appels</String>
- <String id="5">Appelez-retour</String>
- <String id="7">Nouvelles</String>
+ <String id="4">L'appelant</String>
+ <String id="5">Appel</String>
+ <String id="6">Contactez</String>
+ <String id="7">Message</String>
<String id="8">Lire le message</String>
<String id="9">Message de Mark appartient</String>
<String id="10">Message supprimer</String>
@@ -18,7 +20,7 @@
<String id="16">Basé</String>
<String id="17">Rejetée</String>
<String id="18">Liste des appels</String>
- <String id="19">FritzBox nouvelles</String>
+ <String id="19">FRITZ!Box nouvelles</String>
<String id="20">Annuaire téléphonique</String>
<String id="21">Liste des appels FritzBox</String>
<String id="22">Annuaire FritzBox</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_it.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_it.xml 2012-01-29 16:54:34 UTC (rev 4434)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_it.xml 2012-02-02 11:43:11 UTC (rev 4435)
@@ -4,9 +4,10 @@
<String id="1">Chiamata in arrivo</String>
<String id="2">Chiamata in uscita</String>
<String id="3">Sconosciuto</String>
- <String id="4">Chiamate</String>
- <String id="5">Richiamare</String>
- <String id="7">Notizie</String>
+ <String id="4">Chiamante</String>
+ <String id="5">Chiamata</String>
+ <String id="6">Contatto</String>
+ <String id="7">Messaggio</String>
<String id="8">Messaggio giocare</String>
<String id="9">Segna il messaggio appartiene</String>
<String id="10">Notizie cancellare</String>
@@ -18,7 +19,7 @@
<String id="16">Basato</String>
<String id="17">Rifiutato</String>
<String id="18">Lista chiamate</String>
- <String id="19">FritzBox notizie</String>
+ <String id="19">FRITZ!Box notizie</String>
<String id="20">Elenco telefonico</String>
<String id="21">FritzBox chiamata lista</String>
<String id="22">FritzBox rubrica</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_nl.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_nl.xml 2012-01-29 16:54:34 UTC (rev 4434)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_nl.xml 2012-02-02 11:43:11 UTC (rev 4435)
@@ -4,9 +4,10 @@
<String id="1">Inkomende oproep</String>
<String id="2">Uitgaand gesprek</String>
<String id="3">Onbekende</String>
- <String id="4">Gesprekken</String>
- <String id="5">Terugbellen</String>
- <String id="7">Nieuws</String>
+ <String id="4">Beller</String>
+ <String id="5">Noemen</String>
+ <String id="6">Contact</String>
+ <String id="7">Bericht</String>
<String id="8">Bericht af te spelen</String>
<String id="9">Bericht behoort Mark</String>
<String id="10">Nieuws verwijderen</String>
@@ -20,8 +21,8 @@
<String id="18">Bellijst</String>
<String id="19">FritzBox nieuws</String>
<String id="20">Telefoonboek</String>
- <String id="21">FritzBox oproeplijst</String>
- <String id="22">FritzBox telefoonboek</String>
+ <String id="21">FRITZ!Box oproeplijst</String>
+ <String id="22">FRITZ!Box telefoonboek</String>
<String id="23">Fout</String>
<String id="24">FRITZ!Box wachtwoord en strottenhoofd het pad ontbreken in instellingen!</String>
<String id="25">Update</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_ru.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_ru.xml 2012-01-29 16:54:34 UTC (rev 4434)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_ru.xml 2012-02-02 11:43:11 UTC (rev 4435)
@@ -4,9 +4,10 @@
<String id="1">Входящий вызов</String>
<String id="2">Исходящий звонок</String>
<String id="3">неизвестный</String>
- <String id="4">Звонки</String>
- <String id="5">обратный звонок</String>
- <String id="7">новости</String>
+ <String id="4">вызывающая</String>
+ <String id="5">вызов</String>
+ <String id="6">контакт</String>
+ <String id="7">сообщение</String>
<String id="8">Cообщение играть</String>
<String id="9">Cообщение принадлежит Марк</String>
<String id="10">сообщение удалять</String>
@@ -20,8 +21,8 @@
<String id="18">список вызова</String>
<String id="19">FritzBox новости</String>
<String id="20">телефонная книга</String>
- <String id="21">FritzBox списка вызовов</String>
- <String id="22">FritzBox телефонной книге</String>
+ <String id="21">FRITZ!Box списка вызовов</String>
+ <String id="22">FRITZ!Box телефонной книге</String>
<String id="23">ошибка</String>
<String id="24">FRITZ!Box пароль и путь к нему голосовой ящик не хватает в настройках!</String>
<String id="25">Обновление</String>
Modified: trunk/plugins/FritzBox/FritzBox/Settings.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Settings.cs 2012-01-29 16:54:34 UTC (rev 4434)
+++ trunk/plugins/FritzBox/FritzBox/Settings.cs 2012-02-02 11:43:11 UTC (rev 4435)
@@ -165,7 +165,7 @@
if (decryptedPassword != null) Password = decryptedPassword;
else Password = xmlreader.GetValue("FritzManager", "passwd"); // if the password was not encrypted read it in clear text (for older FritzBox Manager versions)
- DialPort = xmlreader.GetValueAsString("FritzManager", "dialport", "1");
+ DialPort = xmlreader.GetValueAsString("FritzManager", "dialport", "50");
VBPath = xmlreader.GetValue("FritzManager", "vBPath");
NASShareName = xmlreader.GetValueAsString("FritzManager", "nASShareName", "FRITZ.NAS");
@@ -187,7 +187,6 @@
string strMSN = xmlreader.GetValueAsString("fritzbox", "MSN", "");
char[] charSeparators = new[] { ';' };
MSNList.Clear(); // necessary to avoid multiple entries when FRITZ!Box Manager configuration window is closed and re-opened without closing the MediaPortal Configuration window
- //MSNList.AddRange(strMSN.Split(charSeparators, StringSplitOptions.RemoveEmptyEntries));
foreach (string mSN in strMSN.Split(charSeparators, StringSplitOptions.RemoveEmptyEntries))
{
Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.pdb
===================================================================
(Binary files differ)
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/FritzBox/obj/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2012-01-29 16:54:34 UTC (rev 4434)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2012-02-02 11:43:11 UTC (rev 4435)
@@ -559,7 +559,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4426</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4434</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -582,7 +582,7 @@
<Major>0</Major>
<Minor>4</Minor>
<Build>1</Build>
- <Revision>4426</Revision>
+ <Revision>4434</Revision>
</Version>
<ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box informations from MediaPortal.
@@ -596,7 +596,7 @@
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
- <ReleaseDate>2012-01-28T10:50:00.643857+01:00</ReleaseDate>
+ <ReleaseDate>2012-02-02T12:38:22.0365065+01:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
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/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/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/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/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/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/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)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Added: trunk/plugins/FritzBox/releases/FritzBox_v0.4.1.4434.mpe1
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/releases/FritzBox_v0.4.1.4434.mpe1
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/FritzBox/releases/update.xml
===================================================================
--- trunk/plugins/FritzBox/releases/update.xml 2012-01-29 16:54:34 UTC (rev 4434)
+++ trunk/plugins/FritzBox/releases/update.xml 2012-02-02 11:43:11 UTC (rev 4435)
@@ -88,7 +88,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4426</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4434</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -111,7 +111,7 @@
<Major>0</Major>
<Minor>4</Minor>
<Build>1</Build>
- <Revision>4426</Revision>
+ <Revision>4434</Revision>
</Version>
<ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box informations from MediaPortal.
@@ -125,7 +125,7 @@
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
- <ReleaseDate>2012-01-28T10:50:00.643857+01:00</ReleaseDate>
+ <ReleaseDate>2012-02-02T12:38:22.0365065+01:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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] |
|
From: <hor...@us...> - 2012-02-10 23:13:50
|
Revision: 4450
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4450&view=rev
Author: horned-reaper
Date: 2012-02-10 23:13:42 +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/FritzBox.cs
trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml
trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml
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.csproj.FileListAbsolute.txt
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/Skin/Streamed MP/
trunk/plugins/FritzBox/FritzBox/Skin/Streamed MP/Media/
trunk/plugins/FritzBox/FritzBox/Skin/Streamed MP/Media/FritzBox/
trunk/plugins/FritzBox/FritzBox/Skin/Streamed MP/Media/FritzBox/Phone_Icon_Home.png
trunk/plugins/FritzBox/FritzBox/Skin/Streamed MP/Media/FritzBox/Phone_Icon_Mobile.png
trunk/plugins/FritzBox/FritzBox/Skin/Streamed MP/Media/FritzBox/Phone_Icon_Work.png
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.read.6.tlog
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.write.6.tlog
trunk/plugins/FritzBox/releases/FritzBox_v0.4.1.4449.mpe1
Removed Paths:
-------------
trunk/plugins/FritzBox/FritzBox/LocalizeStrings.cs
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.read.7.tlog
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.write.7.tlog
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2012-02-10 15:26:34 UTC (rev 4449)
+++ trunk/plugins/FritzBox/Build/Build.log 2012-02-10 23:13:42 UTC (rev 4450)
@@ -1,6 +1,6 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4448
+SVN Version: 4449
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 10.02.2012 16:17:35.
+Build started 11.02.2012 00:03:28.
Project "D:\FritzBox\FritzBox.sln" on node 1 (Rebuild target(s)).
ValidateSolutionConfiguration:
Building solution configuration "Release|Mixed Platforms".
@@ -154,6 +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:
@@ -195,7 +197,7 @@
0 Warning(s)
0 Error(s)
-Time Elapsed 00:00:03.28
+Time Elapsed 00:00:02.04
Reverting to build 0
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
@@ -256,7 +258,10 @@
..\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
-50 File(s) copied
+..\FritzBox\Skin\Streamed MP\Media\FritzBox\Phone_Icon_Home.png
+..\FritzBox\Skin\Streamed MP\Media\FritzBox\Phone_Icon_Mobile.png
+..\FritzBox\Skin\Streamed MP\Media\FritzBox\Phone_Icon_Work.png
+53 File(s) copied
..\FritzBox\Languages\strings_de.xml
..\FritzBox\Languages\strings_el.xml
..\FritzBox\Languages\strings_en-US.xml
@@ -295,7 +300,7 @@
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
36 File(s) copied
MpeMaker version: 1.2.1.0
-Build started at 16:17:41
+Build started at 00:03:32
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-10 15:26:34 UTC (rev 4449)
+++ trunk/plugins/FritzBox/Docs/Ausstehend.txt 2012-02-10 23:13:42 UTC (rev 4450)
@@ -2,9 +2,6 @@
- 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
Neue Funktionen/Erweiterungen:
Modified: trunk/plugins/FritzBox/Docs/Changes.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Changes.txt 2012-02-10 15:26:34 UTC (rev 4449)
+++ trunk/plugins/FritzBox/Docs/Changes.txt 2012-02-10 23:13:42 UTC (rev 4450)
@@ -1,12 +1,5 @@
-New release 0.4.1.4448:
-New features:
-- 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
+New release 0.4.1.44x:
+Optimization:
-Optimizations:
-- improved localization function, plugin starts faster now
-Fixed bugs:
-- FRITZ!Box connection is not established on startup in some circumstances
\ No newline at end of file
+Fixed bug:
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2012-02-10 15:26:34 UTC (rev 4449)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2012-02-10 23:13:42 UTC (rev 4450)
@@ -570,7 +570,7 @@
[SkinControl(3)]
protected GUISortButtonControl btnFilter;
[SkinControl(4)]
- protected GUIButtonControl btnModus;
+ protected GUIButtonControl btnMode;
[SkinControl(9)]
protected GUIButtonControl btnUpdate;
[SkinControl(2)]
@@ -1339,9 +1339,8 @@
GUIControl.FocusControl(GetID, controlId);
}
- // mode button
- // Messages -> Call list -> Phone book
- if (control == btnModus)
+ // mode button (voice box messages -> call list -> phone book)
+ if (control == btnMode)
{
switch (Settings.CurrentMode)
{
@@ -1482,15 +1481,15 @@
{
case GUIMode.VoiceBox:
if (headerLabel != null) headerLabel.Label = LocalizeStrings.Get(19); // 19 = FRITZ!Box messages
- btnModus.Label = LocalizeStrings.Get(18); // 18 = Call list
+ btnMode.Label = LocalizeStrings.Get(18); // 18 = Call list
break;
case GUIMode.CallList:
if (headerLabel != null) headerLabel.Label = LocalizeStrings.Get(21); // 21 = FRITZ!Box call list
- btnModus.Label = LocalizeStrings.Get(20); // 20 = Phone book
+ btnMode.Label = LocalizeStrings.Get(20); // 20 = Phone book
break;
case GUIMode.PhoneBook:
if (headerLabel != null) headerLabel.Label = LocalizeStrings.Get(22); // 22 = FRITZ!Box phone book
- btnModus.Label = LocalizeStrings.Get(7); // 7 = Messages
+ btnMode.Label = LocalizeStrings.Get(7); // 7 = Messages
break;
}
}
Deleted: trunk/plugins/FritzBox/FritzBox/LocalizeStrings.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/LocalizeStrings.cs 2012-02-10 15:26:34 UTC (rev 4449)
+++ trunk/plugins/FritzBox/FritzBox/LocalizeStrings.cs 2012-02-10 23:13:42 UTC (rev 4450)
@@ -1,319 +0,0 @@
-#region Copyright (C) 2005-2011 Team MediaPortal
-
-// Original MediaPortal code except lines 31, 33, 38, 99 and 104
-
-// Copyright (C) 2005-2011 Team MediaPortal
-// http://www.team-mediaportal.com
-//
-// MediaPortal is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 2 of the License, or
-// (at your option) any later version.
-//
-// MediaPortal is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>.
-
-#endregion
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using MediaPortal.Configuration;
-using MediaPortal.ExtensionMethods;
-using MediaPortal.Localisation;
-using MediaPortal.Profile;
-using MediaPortal.GUI.Library; // Not included in original code
-
-namespace FritzBox // Original code: namespace MediaPortal.GUI.Library
-{
- /// <summary>
- /// This class will hold all text used in the application
- /// The text is loaded for the current language from
- /// the file language\FritzBox Manager\strings_[language code].xml // Original code: /// the file language/[language]/strings.xml
- /// </summary>
- public class GUILocalizeStrings
- {
- #region Variables
-
- private static LocalisationProvider _stringProvider;
- private static Dictionary<string, string> _cultures;
- private static string[] _languages;
-
- #endregion
-
- #region Constructors/Destructors
-
- // singleton. Dont allow any instance of this class
- private GUILocalizeStrings() {}
-
- public static void Dispose()
- {
- if (_stringProvider != null)
- {
- _stringProvider.SafeDispose();
- }
- }
-
- #endregion
-
- #region Properties
-
- public static bool UseRTL
- {
- get
- {
- if (_stringProvider == null)
- {
- Load(null);
- }
-
- if (_stringProvider != null)
- return _stringProvider.UseRTL;
- else
- return false;
- }
- }
-
- #endregion
-
- #region Public Methods
-
- /// <summary>
- /// Public method to load the text from a strings/xml file into memory
- /// </summary>
- /// <param name="strFileName">Contains the filename+path for the string.xml file</param>
- /// <returns>
- /// true when text is loaded
- /// false when it was unable to load the text
- /// </returns>
- //[Obsolete("This method has changed", true)]
- public static bool Load(string language)
- {
- bool isPrefixEnabled = true;
- using (MediaPortal.Profile.Settings reader = new MPSettings()) // Original code: using (Settings reader = new MPSettings())
- {
- isPrefixEnabled = reader.GetValueAsBool("gui", "myprefix", true);
- }
-
- string directory = Config.GetFolder(Config.Dir.Language) + "\\FritzBox Manager"; // Original code: string directory = Config.GetFolder(Config.Dir.Language);
- string cultureName = null;
- if (language != null)
- {
- cultureName = GetCultureName(language);
- }
-
- Log.Info(" Loading localized Strings - Path: {0} Culture: {1} Language: {2} Prefix: {3}", directory, cultureName,
- language, isPrefixEnabled);
-
- // http://msdn.microsoft.com/en-us/library/system.globalization.cultureinfo.aspx
- _stringProvider = new LocalisationProvider(directory, cultureName, isPrefixEnabled);
-
- if (_stringProvider.Characters > GUIGraphicsContext.CharsInCharacterSet)
- {
- GUIGraphicsContext.CharsInCharacterSet = _stringProvider.Characters;
- }
- return true;
- }
-
- public static string CurrentLanguage()
- {
- if (_stringProvider == null)
- {
- Load(null);
- }
-
- return _stringProvider.CurrentLanguage.EnglishName;
- }
-
- public static void ChangeLanguage(string language)
- {
- GUIFontManager.ClearFontCache();
- if (_stringProvider == null)
- {
- Load(language);
- }
- else
- {
- _stringProvider.ChangeLanguage(GetCultureName(language));
- if (_stringProvider.Characters > GUIGraphicsContext.CharsInCharacterSet)
- {
- GUIGraphicsContext.CharsInCharacterSet = _stringProvider.Characters;
- }
- }
- }
-
- /// <summary>
- /// Get the translation for a given id and format the sting with
- /// the given parameters
- /// </summary>
- /// <param name="dwCode">id of text</param>
- /// <param name="parameters">parameters used in the formating</param>
- /// <returns>
- /// string containing the translated text
- /// </returns>
- public static string Get(int dwCode, object[] parameters)
- {
- if (_stringProvider == null)
- {
- Load(null);
- }
-
- string translation = _stringProvider.GetString("unmapped", dwCode);
- // if parameters or the translation is null, return the translation.
- if ((translation == null) || (parameters == null))
- {
- return translation;
- }
- // return the formatted string. If formatting fails, log the error
- // and return the unformatted string.
- try
- {
- return String.Format(translation, parameters);
- }
- catch (FormatException e)
- {
- Log.Error("Error formatting translation with id {0}", dwCode);
- Log.Error("Unformatted translation: {0}", translation);
- Log.Error(e);
- return translation;
- }
- }
-
- /// <summary>
- /// Get the translation for a given id
- /// </summary>
- /// <param name="dwCode">id of text</param>
- /// <returns>
- /// string containing the translated text
- /// </returns>
- public static string Get(int dwCode)
- {
- if (_stringProvider == null)
- {
- Load(null);
- }
-
- string translation = _stringProvider.GetString("unmapped", dwCode);
-
- if (translation == null)
- {
- Log.Error("No translation found for id {0}", dwCode);
- return string.Empty;
- }
-
- return translation;
- }
-
- public static void LocalizeLabel(ref string strLabel)
- {
- if (_stringProvider == null)
- {
- Load(null);
- }
-
- if (strLabel == null)
- {
- strLabel = string.Empty;
- }
- if (strLabel == "-")
- {
- strLabel = "";
- }
- if (strLabel == "")
- {
- return;
- }
-
- // This can't be a valid string code if the first character isn't a number.
- // This check will save us from catching unnecessary exceptions.
- if (!char.IsNumber(strLabel, 0))
- {
- return;
- }
-
- // Attempt to parse an int from the string. On failure just return leaving the input string unchanged.
- int dwLabelID;
- if (!Int32.TryParse(strLabel, out dwLabelID))
- {
- return;
- }
-
- strLabel = _stringProvider.GetString("unmapped", dwLabelID);
- if (strLabel == null)
- {
- Log.Error("No translation found for id {0}", dwLabelID);
- strLabel = string.Empty;
- }
- }
-
- public static string LocalSupported()
- {
- if (_stringProvider == null)
- {
- Load(null);
- }
-
- CultureInfo culture = _stringProvider.GetBestLanguage();
-
- return culture.EnglishName;
- }
-
- public static string[] SupportedLanguages()
- {
- if (_languages == null)
- {
- if (_stringProvider == null)
- {
- Load(null);
- }
-
- CultureInfo[] cultures = _stringProvider.AvailableLanguages();
-
- SortedList sortedLanguages = new SortedList();
- foreach (CultureInfo culture in cultures)
- {
- sortedLanguages.Add(culture.EnglishName, culture.EnglishName);
- }
-
- _languages = new string[sortedLanguages.Count];
-
- for (int i = 0; i < sortedLanguages.Count; i++)
- {
- _languages[i] = (string)sortedLanguages.GetByIndex(i);
- }
- }
-
- return _languages;
- }
-
- public static string GetCultureName(string language)
- {
- if (_cultures == null)
- {
- _cultures = new Dictionary<string, string>();
-
- CultureInfo[] cultureList = CultureInfo.GetCultures(CultureTypes.AllCultures);
-
- for (int i = 0; i < cultureList.Length; i++)
- {
- _cultures.Add(cultureList[i].EnglishName, cultureList[i].Name);
- }
- }
- string cultures = null;
- if (_cultures.TryGetValue(language, out cultures))
- {
- return cultures;
- }
-
- return null;
- }
-
- #endregion
- }
-}
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml 2012-02-10 15:26:34 UTC (rev 4449)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml 2012-02-10 23:13:42 UTC (rev 4450)
@@ -6,6 +6,14 @@
<define>#header.label:666</define>
<define>#header.hover:-</define>
<controls>
+ <control>
+ <description>BG</description>
+ <type>image</type>
+ <id>1</id>
+ <texture>Background.png</texture>
+ <width>1280</width>
+ <height>720</height>
+ </control>
<import>common.window.xml</import>
<import>common.time.xml</import>
<control>
Modified: trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml 2012-02-10 15:26:34 UTC (rev 4449)
+++ trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml 2012-02-10 23:13:42 UTC (rev 4450)
@@ -6,6 +6,14 @@
<define>#header.label:666</define>
<define>#header.hover:-</define>
<controls>
+ <control>
+ <description>BG</description>
+ <type>image</type>
+ <id>1</id>
+ <texture>Background.png</texture>
+ <width>1280</width>
+ <height>720</height>
+ </control>
<import>common.window.xml</import>
<import>common.time.xml</import>
<control>
Added: trunk/plugins/FritzBox/FritzBox/Skin/Streamed MP/Media/FritzBox/Phone_Icon_Home.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Streamed MP/Media/FritzBox/Phone_Icon_Home.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/FritzBox/Skin/Streamed MP/Media/FritzBox/Phone_Icon_Mobile.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Streamed MP/Media/FritzBox/Phone_Icon_Mobile.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/FritzBox/Skin/Streamed MP/Media/FritzBox/Phone_Icon_Work.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Streamed MP/Media/FritzBox/Phone_Icon_Work.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.pdb
===================================================================
(Binary files differ)
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/FritzBox/obj/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2012-02-10 15:26:34 UTC (rev 4449)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2012-02-10 23:13:42 UTC (rev 4450)
@@ -497,6 +497,37 @@
</Items>
</Files>
</GroupItem>
+ <GroupItem Name="Streamed MP Skin">
+ <ParentGroup />
+ <DisplayName>Streamed MP Skin</DisplayName>
+ <DefaulChecked>false</DefaulChecked>
+ <Description>Streamed MP Skin</Description>
+ <Files>
+ <Items>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Streamed MP\Media\FritzBox\Phone_Icon_Home.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{8ab0c9b4-7ff0-40a2-8bfd-df087808365d}-Phone_Icon_Home.png</ZipFileName>
+ <DestinationFilename>%Skin%\StreamedMP\Media\FritzBox\Phone_Icon_Home.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Streamed MP\Media\FritzBox\Phone_Icon_Mobile.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{9b80b980-8b07-4c56-a7c8-01224cde8ca9}-Phone_Icon_Mobile.png</ZipFileName>
+ <DestinationFilename>%Skin%\StreamedMP\Media\FritzBox\Phone_Icon_Mobile.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Streamed MP\Media\FritzBox\Phone_Icon_Work.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{ca228657-f8bf-468f-8437-ee3d484bd8e0}-Phone_Icon_Work.png</ZipFileName>
+ <DestinationFilename>%Skin%\StreamedMP\Media\FritzBox\Phone_Icon_Work.png</DestinationFilename>
+ </FileItem>
+ </Items>
+ </Files>
+ </GroupItem>
</Items>
</Groups>
<Sections>
@@ -564,9 +595,10 @@
<Items />
</Actions>
<IncludedGroups>
+ <string>Black & White Skin</string>
<string>Blue3 Skin</string>
- <string>Black & White Skin</string>
<string>Maya Skin</string>
+ <string>Streamed MP Skin</string>
</IncludedGroups>
<PanelName>Tree View Selector</PanelName>
<WizardButtonsEnum>BackNextCancel</WizardButtonsEnum>
@@ -671,7 +703,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4448</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4449</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -694,7 +726,7 @@
<Major>0</Major>
<Minor>4</Minor>
<Build>1</Build>
- <Revision>4448</Revision>
+ <Revision>4449</Revision>
</Version>
<ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box informations from MediaPortal.
@@ -708,7 +740,7 @@
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
- <ReleaseDate>2012-02-10T16:17:41.314754+01:00</ReleaseDate>
+ <ReleaseDate>2012-02-11T00:03:32.848032+01:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
@@ -1172,6 +1204,27 @@
<ZipFileName>Installer{CopyFile}\{2011ea30-6207-4c4f-8dc0-1d9a4114a04b}-Phone_Icon_Work.png</ZipFileName>
<DestinationFilename>%Skin%\DefaultWide\Media\FritzBox\Phone_Icon_Work.png</DestinationFilename>
</FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Streamed MP\Media\FritzBox\Phone_Icon_Home.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{8ab0c9b4-7ff0-40a2-8bfd-df087808365d}-Phone_Icon_Home.png</ZipFileName>
+ <DestinationFilename>%Skin%\StreamedMP\Media\FritzBox\Phone_Icon_Home.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Streamed MP\Media\FritzBox\Phone_Icon_Mobile.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{9b80b980-8b07-4c56-a7c8-01224cde8ca9}-Phone_Icon_Mobile.png</ZipFileName>
+ <DestinationFilename>%Skin%\StreamedMP\Media\FritzBox\Phone_Icon_Mobile.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Streamed MP\Media\FritzBox\Phone_Icon_Work.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{ca228657-f8bf-468f-8437-ee3d484bd8e0}-Phone_Icon_Work.png</ZipFileName>
+ <DestinationFilename>%Skin%\StreamedMP\Media\FritzBox\Phone_Icon_Work.png</DestinationFilename>
+ </FileItem>
</Items>
</UniqueFileList>
<ProjectSettings>
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/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/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/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/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/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/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)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.csproj.FileListAbsolute.txt
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.csproj.FileListAbsolute.txt 2012-02-10 15:26:34 UTC (rev 4449)
+++ trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.csproj.FileListAbsolute.txt 2012-02-10 23:13:42 UTC (rev 4450)
@@ -23,5 +23,5 @@
D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\log4net.dll
D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\Ionic.Zip.dll
D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\FritzBox.pdb
-D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.read.7.tlog
-D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.write.7.tlog
+D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.read.6.tlog
+D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource.write.6.tlog
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Added: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.read.6.tlog
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.read.6.tlog
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.read.7.tlog
===================================================================
(Binary files differ)
Added: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.write.6.tlog
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.write.6.tlog
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.write.7.tlog
===================================================================
(Binary files differ)
Added: trunk/plugins/FritzBox/releases/FritzBox_v0.4.1.4449.mpe1
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/releases/FritzBox_v0.4.1.4449.mpe1
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/FritzBox/releases/update.xml
===================================================================
--- trunk/plugins/FritzBox/releases/update.xml 2012-02-10 15:26:34 UTC (rev 4449)
+++ trunk/plugins/FritzBox/releases/update.xml 2012-02-10 23:13:42 UTC (rev 4450)
@@ -53,6 +53,14 @@
<Items />
</Files>
</GroupItem>
+ <GroupItem Name="Streamed MP Skin">
+ <DisplayName>Streamed MP Skin</DisplayName>
+ <DefaulChecked>false</DefaulChecked>
+ <Description>Streamed MP Skin</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
</Items>
</Groups>
<Sections>
@@ -88,7 +96,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4448</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4449</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -111,7 +119,7 @@
<Major>0</Major>
<Minor>4</Minor>
<Build>1</Build>
- <Revision>4448</Revision>
+ <Revision>4449</Revision>
</Version>
<ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box informations from MediaPortal.
@@ -125,7 +133,7 @@
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
- <ReleaseDate>2012-02-10T16:17:41.314754+01:00</ReleaseDate>
+ <ReleaseDate>2012-02-11T00:03:32.848032+01:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hor...@us...> - 2012-02-26 15:27:03
|
Revision: 4462
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4462&view=rev
Author: horned-reaper
Date: 2012-02-26 15:26:52 +0000 (Sun, 26 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.Designer.cs
trunk/plugins/FritzBox/FritzBox/EditPhoneBook.cs
trunk/plugins/FritzBox/FritzBox/EditPhoneBook.resx
trunk/plugins/FritzBox/FritzBox/FritzBox.cs
trunk/plugins/FritzBox/FritzBox/FritzBox.csproj
trunk/plugins/FritzBox/FritzBox/FritzBox.csproj.user
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/CallAction.cs
trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/BackGroundWorker.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs
trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_el.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_en-US.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_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/DesignTimeResolveAssemblyReferences.cache
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Debug/GenerateResource-ResGen.read.1.tlog
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/FritzBoxConfigTester.csproj
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/DebugForm.Designer.cs
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/DebugForm.cs
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/DebugForm.resx
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/FritzBoxDebugger.csproj
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/bin/Debug Configuration/
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/AxInterop.WMPLib.dll
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/Bass.Net.dll
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/BassRegistration.dll
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/BassVisAPI.Net.dll
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/Common.Utils.dll
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/Core.dll
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/Dialogs.dll
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/DirectShowLib.dll
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/Interop.SHDocVw.dll
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/Interop.WMPLib.dll
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/Ionic.Zip.dll
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/MediaPortal.Support.dll
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/Utils.dll
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/edtftpnet-1.2.2.dll
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/log4net.dll
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/taglib-sharp.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug Configuration/
trunk/plugins/FritzBox/FritzBox/obj/Debug Configuration/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/FritzBox/FritzBox/obj/Debug Configuration/FritzBox.EditPhoneBook.resources
trunk/plugins/FritzBox/FritzBox/obj/Debug Configuration/FritzBox.FritzBoxConfig.resources
trunk/plugins/FritzBox/FritzBox/obj/Debug Configuration/FritzBox.Properties.Resources.resources
trunk/plugins/FritzBox/FritzBox/obj/Debug Configuration/FritzBox.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/FritzBox/obj/Debug Configuration/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug Configuration/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Debug Configuration/GenerateResource-ResGen.read.1.tlog
trunk/plugins/FritzBox/FritzBox/obj/Debug Configuration/GenerateResource-ResGen.read.4.tlog
trunk/plugins/FritzBox/FritzBox/obj/Debug Configuration/GenerateResource-ResGen.write.1.tlog
trunk/plugins/FritzBox/FritzBox/obj/Debug Configuration/TempPE/
trunk/plugins/FritzBox/FritzBox/obj/Debug Configuration/TempPE/Properties.Resources.Designer.cs.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.vshost.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.vshost.exe.config
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/AxInterop.WMPLib.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/Bass.Net.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/BassRegistration.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/BassVisAPI.Net.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/Common.Utils.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/Core.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/Dialogs.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/DirectShowLib.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/FritzBoxConfigTester.exe.config
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/FritzBoxConfigTester.vshost.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/FritzBoxConfigTester.vshost.exe.config
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/FritzBoxConfigTester.vshost.exe.manifest
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/Interop.SHDocVw.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/Interop.WMPLib.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/Ionic.Zip.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/MediaPortal.Support.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/Utils.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/edtftpnet-1.2.2.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/log4net.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/taglib-sharp.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.vshost.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.vshost.exe.config
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.vshost.exe.manifest
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug Configuration/
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug Configuration/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug Configuration/FritzBoxConfigTester.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug Configuration/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug Configuration/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug Configuration/ResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug Configuration/TempPE/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.vshost.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.vshost.exe.config
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/AxInterop.WMPLib.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/Bass.Net.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/BassRegistration.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/BassVisAPI.Net.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/Common.Utils.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/Core.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/Dialogs.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/DirectShowLib.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/FritzBoxDebugger.exe.config
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/Interop.SHDocVw.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/Interop.WMPLib.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/Ionic.Zip.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/MediaPortal.Support.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/Utils.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/edtftpnet-1.2.2.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/log4net.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/taglib-sharp.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.vshost.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.vshost.exe.config
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.vshost.exe.manifest
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug Configuration/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug Configuration/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug Configuration/FritzBoxDebugger.DebugForm.resources
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug Configuration/FritzBoxDebugger.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug Configuration/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug Configuration/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug Configuration/GenerateResource.read.1.tlog
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug Configuration/GenerateResource.write.1.tlog
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug Configuration/TempPE/
trunk/plugins/FritzBox/releases/FritzBox_v0.4.1.4461.mpe1
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2012-02-19 22:31:59 UTC (rev 4461)
+++ trunk/plugins/FritzBox/Build/Build.log 2012-02-26 15:26:52 UTC (rev 4462)
@@ -1,6 +1,6 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4449
+SVN Version: 4461
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 11.02.2012 00:03:28.
+Build started 26.02.2012 16:16:20.
Project "D:\FritzBox\FritzBox.sln" on node 1 (Rebuild target(s)).
ValidateSolutionConfiguration:
Building solution configuration "Release|Mixed Platforms".
@@ -106,8 +106,8 @@
Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Core.dll" to ".\bin\Release\Core.dll".
Copying file from "D:\FritzBox\FritzBox\bin\Release\FritzBox.dll" to ".\bin\Release\FritzBox.dll".
Copying file from "D:\FritzBox\FritzBox\bin\Release\Utils.dll" to ".\bin\Release\Utils.dll".
- Copying file from "D:\FritzBox\FritzBox\bin\Release\Common.Utils.dll" to ".\bin\Release\Common.Utils.dll".
Copying file from "D:\FritzBox\FritzBox\bin\Release\Dialogs.dll" to ".\bin\Release\Dialogs.dll".
+ Copying file from "D:\FritzBox\FritzBox\bin\Release\Common.Utils.dll" to ".\bin\Release\Common.Utils.dll".
Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Bass.Net.dll" to ".\bin\Release\Bass.Net.dll".
Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\DirectShowLib.dll" to ".\bin\Release\DirectShowLib.dll".
Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\BassVisAPI.Net.dll" to ".\bin\Release\BassVisAPI.Net.dll".
@@ -156,8 +156,6 @@
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".
@@ -169,8 +167,8 @@
Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Core.dll" to ".\bin\Release\Core.dll".
Copying file from "D:\FritzBox\FritzBox\bin\Release\FritzBox.dll" to ".\bin\Release\FritzBox.dll".
Copying file from "D:\FritzBox\FritzBox\bin\Release\Utils.dll" to ".\bin\Release\Utils.dll".
- Copying file from "D:\FritzBox\FritzBox\bin\Release\Common.Utils.dll" to ".\bin\Release\Common.Utils.dll".
Copying file from "D:\FritzBox\FritzBox\bin\Release\Dialogs.dll" to ".\bin\Release\Dialogs.dll".
+ Copying file from "D:\FritzBox\FritzBox\bin\Release\Common.Utils.dll" to ".\bin\Release\Common.Utils.dll".
Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Bass.Net.dll" to ".\bin\Release\Bass.Net.dll".
Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\DirectShowLib.dll" to ".\bin\Release\DirectShowLib.dll".
Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\BassVisAPI.Net.dll" to ".\bin\Release\BassVisAPI.Net.dll".
@@ -197,7 +195,7 @@
0 Warning(s)
0 Error(s)
-Time Elapsed 00:00:02.04
+Time Elapsed 00:00:01.89
Reverting to build 0
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
@@ -300,7 +298,7 @@
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
36 File(s) copied
MpeMaker version: 1.2.1.0
-Build started at 00:03:32
+Build started at 16:16:25
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-19 22:31:59 UTC (rev 4461)
+++ trunk/plugins/FritzBox/Docs/Ausstehend.txt 2012-02-26 15:26:52 UTC (rev 4462)
@@ -1,24 +1,14 @@
-Fehler beheben:
-- Problem bei schnell aufeinander folgenden Anrufen
-
-Optimierungen:
-- Einstellungen-Eintr\xE4ge in XML-Datei in Kategorie "FRITZ!Box Manager" zusammenfassen
-
Neue Funktionen/Erweiterungen:
-- 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
+- Telefonbuch editierbar machen (f\xFCr FRITZ!Box-Versionen ohne Telefonbuch)
+- Bei Anrufbenachrichtigungen: Auflistung von Kontaktnamen, wenn eine Rufnummer mehrmals im Telefonbuch vorkommt
- 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
- Wiki-Eintrag
- Skin-Erweiterungen
- Anzahl der neuen Anrufe
- geplante \xC4nderungen ver\xF6ffentlichen
-- wenn m\xF6glich GUI-Telefonbuch (und edit Phonebook) nach Kontakt gruppieren
-- Bei Anrufbenachrichtigungen: Auflistung von Kontaktnamen wenn eine Rufnummer mehrmals im Telefonbuch vorkommt
-- Verbindungstest um Login, Anruflisten- und Telefonbuch-Download erweitern
- Klingelton solange wiederholen bis H\xF6rer abgenommen wird
@@ -40,7 +30,7 @@
Wenn man allerdings in den Plugins-Bereichs geht, um z.B. die Anrufliste anzuzeigen, passiert erst mal gar nichts und dann kommt so ein ewig durchlaufender Fortschrittsbalken ohne da\xDF etwas passiert.
Stefan Rinke:
-- Abspielen von Sprachnachrichten nach dem Anklicken im Home-Screen:
+Abspielen von Sprachnachrichten nach dem Anklicken im Home-Screen:
add onAction handler to catch custom action from home screen button
damit k\xF6nnten man ein Control auf dem HomeScreen erscheinen lassen
welches beim einem neuen Anruf direkt auf abspielen geht.
@@ -66,4 +56,10 @@
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
+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.
+
+Vasilich, 11.02.2012, 01:24 Uhr:
+MSN in Nachrichtenansicht abschaltbar machen
+
+AlfredENeuma, 11.02.2012, 17:36 Uhr:
+MSN in Anrufliste anzeigen und abschaltbar machen
\ No newline at end of file
Modified: trunk/plugins/FritzBox/Docs/Changes.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Changes.txt 2012-02-19 22:31:59 UTC (rev 4461)
+++ trunk/plugins/FritzBox/Docs/Changes.txt 2012-02-26 15:26:52 UTC (rev 4462)
@@ -1,5 +1,16 @@
-New release 0.4.1.44x:
-Optimization:
+New release 0.4.1.4461:
+New feature:
+- call extension filter
+- option for manual contact image path entry (for FRITZ!Boxes with contact image setting)
+Optimizations:
+- some language file adjustments
+- enhanced connection test in MediaPortal Configuration
+- settings XML file:
+ - consolidated section "FRITZ!Box Manager"
+ - clear entry names
+- call monitor stability improvements
Fixed bug:
+- problem on task queuing
+- notification window is not closed on quick sequent call actions (e. g. incoming FAX messages)
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/EditPhoneBook.Designer.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/EditPhoneBook.Designer.cs 2012-02-19 22:31:59 UTC (rev 4461)
+++ trunk/plugins/FritzBox/FritzBox/EditPhoneBook.Designer.cs 2012-02-26 15:26:52 UTC (rev 4462)
@@ -40,6 +40,7 @@
this.columnPhoneNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.columnShowCallNotification = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.columnRingTonePath = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.ColumnContactImage = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.pictureBoxCaller = new System.Windows.Forms.PictureBox();
this.label1 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
@@ -70,7 +71,8 @@
this.columnPhoneType,
this.columnPhoneNumber,
this.columnShowCallNotification,
- this.columnRingTonePath});
+ this.columnRingTonePath,
+ this.ColumnContactImage});
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window;
dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -151,6 +153,14 @@
this.columnRingTonePath.Name = "columnRingTonePath";
this.columnRingTonePath.Width = 225;
//
+ // ColumnContactImage
+ //
+ this.ColumnContactImage.HeaderText = "Contact image path";
+ this.ColumnContactImage.MinimumWidth = 150;
+ this.ColumnContactImage.Name = "ColumnContactImage";
+ this.ColumnContactImage.Visible = false;
+ this.ColumnContactImage.Width = 225;
+ //
// pictureBoxCaller
//
this.pictureBoxCaller.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -193,12 +203,13 @@
private System.Windows.Forms.PictureBox pictureBoxCaller;
private System.Windows.Forms.DataGridView dataGridView;
+ private System.Windows.Forms.Label label1;
private System.Windows.Forms.DataGridViewTextBoxColumn columnContactID;
private System.Windows.Forms.DataGridViewTextBoxColumn columnName;
private System.Windows.Forms.DataGridViewTextBoxColumn columnPhoneType;
private System.Windows.Forms.DataGridViewTextBoxColumn columnPhoneNumber;
private System.Windows.Forms.DataGridViewCheckBoxColumn columnShowCallNotification;
private System.Windows.Forms.DataGridViewTextBoxColumn columnRingTonePath;
- private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.DataGridViewTextBoxColumn ColumnContactImage;
}
}
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/EditPhoneBook.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/EditPhoneBook.cs 2012-02-19 22:31:59 UTC (rev 4461)
+++ trunk/plugins/FritzBox/FritzBox/EditPhoneBook.cs 2012-02-26 15:26:52 UTC (rev 4462)
@@ -21,7 +21,7 @@
private void fillTable()
{
- string uniqueID, name, type = String.Empty, number = String.Empty, ringTonePath;
+ string uniqueID, name, type = String.Empty, number = String.Empty, ringTonePath, imageURL;
bool showCallNotification;
phoneBook.LoadPhoneBookFromXMLFile();
@@ -32,6 +32,7 @@
name = phoneBookItem.Name;
showCallNotification = phoneBookItem.ShowCallNotification;
ringTonePath = phoneBookItem.RingTonePath;
+ imageURL = phoneBookItem.ImageURL;
foreach (PhoneNumber phoneNumber in phoneBookItem.PhoneNumbers)
{
@@ -40,7 +41,7 @@
type = phoneNumber.type;
number = phoneNumber.Value;
- dataGridView.Rows.Add(uniqueID, name, type, number, showCallNotification, ringTonePath);
+ dataGridView.Rows.Add(uniqueID, name, type, number, showCallNotification, ringTonePath, imageURL);
}
}
}
@@ -50,6 +51,8 @@
private void EditPhoneBook_Load(object sender, EventArgs e)
{
+ dataGridView.Columns[6].Visible = Settings.ManualContactImagePathEntry;
+
fillTable();
if (dataGridView.Rows.Count > 0)
@@ -58,7 +61,7 @@
dataGridView_SelectionChanged(null, null);
// monitor table changes
- this.dataGridView.SelectionChanged += new System.EventHandler(this.dataGridView_SelectionChanged);
+ dataGridView.SelectionChanged += new EventHandler(dataGridView_SelectionChanged);
dataGridView.CellValueChanged += new DataGridViewCellEventHandler(dataGridView_CellValueChanged);
}
else
@@ -76,7 +79,7 @@
string contactPicturePath = phoneBook.GetContactImagePath(contact);
// show picture
- if (contactPicturePath != String.Empty) pictureBoxCaller.ImageLocation = contactPicturePath;
+ pictureBoxCaller.ImageLocation = contactPicturePath;
}
private void dataGridView_CellValueChanged(object sender, DataGridViewCellEventArgs e)
@@ -108,6 +111,16 @@
}
break;
+ case 6:
+ contact.ImageURL = (string)newValue;
+
+ // update "Image URL" field in all rows
+ for (int i = 0; i < dataGridView.Rows.Count; i++)
+ {
+ dataGridView.Rows[i].Cells[6].Value = phoneBook.Items[dataGridView.Rows[i].Cells[0].Value.ToString()].ImageURL;
+ }
+
+ break;
}
// transfer changed contact to phone book
@@ -121,7 +134,7 @@
phoneBook.SavePhoneBookToXMLFile();
// unregister event monitors
- this.dataGridView.SelectionChanged -= new System.EventHandler(this.dataGridView_SelectionChanged);
+ dataGridView.SelectionChanged -= new EventHandler(dataGridView_SelectionChanged);
dataGridView.CellValueChanged -= new DataGridViewCellEventHandler(dataGridView_CellValueChanged);
}
}
Modified: trunk/plugins/FritzBox/FritzBox/EditPhoneBook.resx
===================================================================
--- trunk/plugins/FritzBox/FritzBox/EditPhoneBook.resx 2012-02-19 22:31:59 UTC (rev 4461)
+++ trunk/plugins/FritzBox/FritzBox/EditPhoneBook.resx 2012-02-26 15:26:52 UTC (rev 4462)
@@ -135,4 +135,7 @@
<metadata name="columnRingTonePath.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
+ <metadata name="ColumnContactImage.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
</root>
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2012-02-19 22:31:59 UTC (rev 4461)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2012-02-26 15:26:52 UTC (rev 4462)
@@ -65,8 +65,9 @@
private readonly List<CallAction> _actionList = new List<CallAction>();
private readonly List<CallAction> _notificationQueue = new List<CallAction>();
private bool _showNotification = true;
- private object _tempNotification;
+ private GUIDialogNotify _tempNotification;
private int notificationCount = 0;
+ private CallAction.CallType lastCallActionType; // necessary to avoid that notification window isn't closed on quick sequent call actions
#endregion Variables
@@ -81,14 +82,15 @@
private void OnStopExternal(Process proc, bool waitForExit)
{
_showNotification = true;
-
_notificationQueue.Clear();
}
private void OnCallAction(CallAction callAction)
{
+ lastCallActionType = callAction.Type;
+
Log.Debug("OnCallAction()");
-
+
callAction.WriteToLog();
if (!_showNotification)
@@ -107,22 +109,21 @@
OnCall(callAction);
break;
case CallAction.CallType.ConnectionStarted:
+ if (!isExtensionEnabled(callAction.Extension))
+ {
+ Log.Info("Extension isn't enabled for notification. If notification window is opened it will be closed");
+ closeNotificationWindow();
+ }
break;
case CallAction.CallType.ConnectionClosed:
if (Settings.CloseNotificationOnConnectionClosed)
{
- Log.Info("\"Auto-close after connection is closed\" setting is enabled. Trying to close active notification");
-
- if (_tempNotification != null)
- {
- MediaPortal.GUI.Library.Action act = new MediaPortal.GUI.Library.Action();
- act.wID = MediaPortal.GUI.Library.Action.ActionType.ACTION_CLOSE_DIALOG;
- GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_NOTIFY).OnAction(act);
- }
+ Log.Info("\"Auto-close after connection is closed\" setting is enabled");
+ closeNotificationWindow();
}
break;
default:
- Log.Error("Incorrect CallAction type");
+ Log.Error("Incorrect call type");
break;
}
}
@@ -198,10 +199,10 @@
switch (callAction.Type)
{
case CallAction.CallType.Incoming:
- showNotification = Settings.ShowNotficationOnIncomingCall;
+ showNotification = Settings.ShowNotificationOnIncomingCall;
break;
case CallAction.CallType.Outgoing:
- showNotification = Settings.ShowNotficationOnOutgoingCall;
+ showNotification = Settings.ShowNotificationOnOutgoingCall && isExtensionEnabled(callAction.Extension);
break;
}
@@ -263,11 +264,6 @@
showNotificationWindow(callAction.Type, strHeading, strImage, strText);
}
}
-
- // update call list and voice box items and refresh GUI
- worker.EnqueueTask(new Task(Task.TaskAction.LoadCallListItems, null));
- worker.EnqueueTask(new Task(Task.TaskAction.LoadVoiceBoxItems, null));
- worker.EnqueueTask(new Task(Task.TaskAction.RefreshView, null));
}
}
@@ -277,7 +273,7 @@
private bool isMSNEnabled(string mSN)
{
- if (!Settings.FilterMSN)
+ if (!Settings.FilterMSNs)
{
Log.Info("MSN filter is disabled");
return true;
@@ -305,6 +301,36 @@
}
}
+ private bool isExtensionEnabled(string extension)
+ {
+ if (!Settings.FilterExtensions)
+ {
+ Log.Info("Extension filter is disabled");
+ return true;
+ }
+ else
+ {
+ if (extension != String.Empty)
+ {
+ if (Settings.ExtensionList.Contains(extension))
+ {
+ Log.Info("Extension is on the filter list");
+ return true;
+ }
+ else
+ {
+ Log.Info("Extension is not on the list. Notification will be automatically closed");
+ return false;
+ }
+ }
+ else
+ {
+ Log.Info("Missing extension. Filtering is disabled");
+ return true;
+ }
+ }
+ }
+
private void showNotificationWindow(CallAction.CallType callType, string strHeading, string strImage, string strText)
{
bool resumePlayer = false;
@@ -348,8 +374,13 @@
else dlgNotification.TimeOut = -1;
_tempNotification = dlgNotification;
- dlgNotification.DoModal(GUIWindowManager.ActiveWindow);
+ if (lastCallActionType != CallAction.CallType.ConnectionClosed) // this check avoids that the notification window isn't closed on quick sequent call actions (e. g. incoming FAX messages)
+ {
+ Log.Debug("Showing notification window");
+ dlgNotification.DoModal(GUIWindowManager.ActiveWindow);
+ }
+
// resume player
if (resumePlayer && g_Player.Playing && g_Player.Paused)
{
@@ -378,7 +409,7 @@
private bool isMovingPicturesOrMPTVSeriesDialogOpened()
{
- if (GUIWindowManager.IsRouted) // check if dialog window is opened
+ if (GUIWindowManager.IsRouted)
{
if (GUIWindowManager.ActiveWindow == 96742 || GUIWindowManager.ActiveWindow == 9811) // 96742 = window ID of "Moving Pictures", 9811 = window ID of "MP-TV Series"
{
@@ -389,6 +420,42 @@
return false;
}
+ private bool isNotificationWindowOpened()
+ {
+ if (GUIWindowManager.IsRouted)
+ {
+ if (GUIWindowManager.ActiveWindowEx == (int)GUIWindow.Window.WINDOW_DIALOG_NOTIFY) return true;
+ }
+
+ return false;
+ }
+
+ private void closeNotificationWindow()
+ {
+ if (_tempNotification != null && isNotificationWindowOpened())
+ {
+ Log.Debug("Closing notification window");
+
+ MediaPortal.GUI.Library.Action act = new MediaPortal.GUI.Library.Action();
+ act.wID = MediaPortal.GUI.Library.Action.ActionType.ACTION_CLOSE_DIALOG;
+
+ _tempNotification.OnAction(act);
+
+ if (!isNotificationWindowOpened()) Log.Debug("Notification window has been closed");
+ else
+ {
+ Log.Debug("Notification couldn't be closed yet. Trying to close it again in one second");
+
+ // set session timer interval and start the timer
+ notificationWindowCloseTimer.Interval = 1000;
+ notificationWindowCloseTimer.AutoReset = false;
+ notificationWindowCloseTimer.Elapsed += OnCloseNotificationWindowTimerEvent;
+ notificationWindowCloseTimer.Start();
+ }
+ }
+ else Log.Debug("Notification window wasn't opened");
+ }
+
#endregion Helper Methods
#endregion CallMonitor
@@ -403,7 +470,7 @@
public void Start()
{
Log.Info("FRITZ!Box Manager {0} plugin is starting", Assembly.GetExecutingAssembly().GetName().Version);
-
+
thePlugin = this;
LocalizeStrings.LoadLocalization();
@@ -439,7 +506,7 @@
if (updateInterval != 0)
{
- updateTimer.Interval = updateInterval * 1000; // interval is in sec
+ updateTimer.Interval = updateInterval * 1000; // interval is in seconds
updateTimer.Elapsed += OnUpdateTimerEvent;
updateTimer.Start();
}
@@ -460,7 +527,7 @@
FritzBoxClient.CallEvent -= OnCallAction;
FritzBoxClient.LogEvent -= OnLogAction;
- FritzBoxClient.ConnectedEvent += OnConnectedAction;
+ FritzBoxClient.ConnectedEvent -= OnConnectedAction;
Utils.OnStartExternal -= OnStartExternal;
Utils.OnStopExternal -= OnStopExternal;
@@ -588,6 +655,8 @@
private static System.Timers.Timer updateTimer = new System.Timers.Timer();
// session timer for login thread
private static System.Timers.Timer sessionTimer = new System.Timers.Timer();
+ // timer to close remaining notification windows
+ private static System.Timers.Timer notificationWindowCloseTimer = new System.Timers.Timer();
// list of call items (callers)
private List<CallItem> callItemList;
// state of facade view
@@ -732,6 +801,11 @@
loadDataInBackground();
}
+ private static void OnCloseNotificationWindowTimerEvent(object source, System.Timers.ElapsedEventArgs e)
+ {
+ thePlugin.closeNotificationWindow();
+ }
+
protected override void OnPageDestroy(int new_windowId)
{
CleanupTempFiles();
@@ -797,7 +871,7 @@
worker.EnqueueTask(new Task(Task.TaskAction.RefreshView, null));
}
}
- else Log.Debug("No voice box items on the FRITZ!Box");
+ else Log.Debug("No voice box item list changes");
}
}
else Log.Debug("No connection to FRITZ!Box. Voice box items couldn't be loaded");
@@ -896,7 +970,7 @@
worker.EnqueueTask(new Task(Task.TaskAction.RefreshView, null));
}
}
- else Log.Debug("No voice box items on the FRITZ!Box");
+ else Log.Debug("No call list changes");
}
}
@@ -1034,7 +1108,7 @@
}
}
- public void updateGUIProperties()
+ public void UpdateGUIProperties()
{
Caller caller = new Caller();
string lastNewCallerName = String.Empty;
@@ -1154,7 +1228,7 @@
facadeView.Add(elem);
}
}
- else Log.Debug("call item list is not initialized");
+ else Log.Debug("Call item list is not initialized");
}
private void showThumbPanel()
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.csproj
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.csproj 2012-02-19 22:31:59 UTC (rev 4461)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.csproj 2012-02-26 15:26:52 UTC (rev 4462)
@@ -69,6 +69,17 @@
<PlatformTarget>AnyCPU</PlatformTarget>
<FileAlignment>4096</FileAlignment>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Configuration|AnyCPU'">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>C:\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <FileAlignment>4096</FileAlignment>
+ <DebugType>Full</DebugType>
+ <PlatformTarget>AnyCPU</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
+ <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="Common.Utils">
<HintPath>C:\Program Files\Team MediaPortal\MediaPortal\Common.Utils.dll</HintPath>
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.csproj.user
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.csproj.user 2012-02-19 22:31:59 UTC (rev 4461)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.csproj.user 2012-02-26 15:26:52 UTC (rev 4462)
@@ -14,4 +14,12 @@
<StartProgram>C:\Program Files\Team MediaPortal\MediaPortal\MediaPortal.exe</StartProgram>
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Configuration|AnyCPU'">
+ <StartProgram>C:\Program Files\Team MediaPortal\MediaPortal\Configuration.exe</StartProgram>
+ <StartAction>Project</StartAction>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+ <StartAction>Program</StartAction>
+ <StartProgram>C:\Program Files\Team MediaPortal\MediaPortal\MediaPortal.exe</StartProgram>
+ </PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2012-02-19 22:31:59 UTC (rev 4461)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2012-02-26 15:26:52 UTC (rev 4462)
@@ -40,6 +40,14 @@
this.buttonEditPhoneBook = new System.Windows.Forms.Button();
this.tabPageCallNotification = new System.Windows.Forms.TabPage();
this.groupBoxNotification = new MediaPortal.UserInterface.Controls.MPGroupBox();
+ this.buttonExtensionsRemove = new MediaPortal.UserInterface.Controls.MPButton();
+ this.checkBoxFilterExtensions = new MediaPortal.UserInterface.Controls.MPCheckBox();
+ this.buttonExtensionsAdd = new MediaPortal.UserInterface.Controls.MPButton();
+ this.comboBoxExtensions = new MediaPortal.UserInterface.Controls.MPComboBox();
+ 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.checkBoxShowNotificationOnOutgoingCall = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.checkBoxCloseOnConnectionClosed = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.checkBoxShowNotificationOnIncomingCall = new MediaPortal.UserInterface.Controls.MPCheckBox();
@@ -77,10 +85,7 @@
this.updateInterval = new MediaPortal.UserInterface.Controls.MPNumericUpDown();
this.checkBoxExtensiveLogging = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.label4 = new System.Windows.Forms.Label();
- 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.checkBoxManualContactImagePathEntry = new System.Windows.Forms.CheckBox();
this.tabPageDiagnostics.SuspendLayout();
this.tabPagePhoneBook.SuspendLayout();
this.tabPageCallNotification.SuspendLayout();
@@ -178,6 +183,7 @@
//
// tabPagePhoneBook
//
+ this.tabPagePhoneBook.Controls.Add(this.checkBoxManualContactImagePathEntry);
this.tabPagePhoneBook.Controls.Add(this.buttonEditPhoneBook);
this.tabPagePhoneBook.Location = new System.Drawing.Point(4, 22);
this.tabPagePhoneBook.Name = "tabPagePhoneBook";
@@ -189,7 +195,7 @@
//
// buttonEditPhoneBook
//
- this.buttonEditPhoneBook.Location = new System.Drawing.Point(228, 64);
+ this.buttonEditPhoneBook.Location = new System.Drawing.Point(221, 83);
this.buttonEditPhoneBook.Name = "buttonEditPhoneBook";
this.buttonEditPhoneBook.Size = new System.Drawing.Size(117, 46);
this.buttonEditPhoneBook.TabIndex = 0;
@@ -213,6 +219,10 @@
//
this.groupBoxNotification.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
+ this.groupBoxNotification.Controls.Add(this.buttonExtensionsRemove);
+ this.groupBoxNotification.Controls.Add(this.checkBoxFilterExtensions);
+ this.groupBoxNotification.Controls.Add(this.buttonExtensionsAdd);
+ this.groupBoxNotification.Controls.Add(this.comboBoxExtensions);
this.groupBoxNotification.Controls.Add(this.checkBoxShowPhoneTypeOnNotification);
this.groupBoxNotification.Controls.Add(this.checkBoxShowUnknownCaller);
this.groupBoxNotification.Controls.Add(this.checkBoxUsePhonebook);
@@ -231,27 +241,119 @@
this.groupBoxNotification.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.groupBoxNotification.Location = new System.Drawing.Point(6, 6);
this.groupBoxNotification.Name = "groupBoxNotification";
- this.groupBoxNotification.Size = new System.Drawing.Size(561, 159);
+ this.groupBoxNotification.Size = new System.Drawing.Size(559, 242);
this.groupBoxNotification.TabIndex = 0;
this.groupBoxNotification.TabStop = false;
this.groupBoxNotification.Text = "Notification settings";
//
+ // buttonExtensionsRemove
+ //
+ this.buttonExtensionsRemove.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.buttonExtensionsRemove.Location = new System.Drawing.Point(335, 209);
+ this.buttonExtensionsRemove.Name = "buttonExtensionsRemove";
+ this.buttonExtensionsRemove.Size = new System.Drawing.Size(63, 21);
+ this.buttonExtensionsRemove.TabIndex = 22;
+ this.buttonExtensionsRemove.Text = "Remove";
+ this.buttonExtensionsRemove.UseVisualStyleBackColor = true;
+ this.buttonExtensionsRemove.Click += new System.EventHandler(this.buttonExtensionsRemove_Click);
+ //
+ // checkBoxFilterExtensions
+ //
+ this.checkBoxFilterExtensions.AutoSize = true;
+ this.checkBoxFilterExtensions.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.checkBoxFilterExtensions.Location = new System.Drawing.Point(253, 161);
+ this.checkBoxFilterExtensions.Name = "checkBoxFilterExtensions";
+ this.checkBoxFilterExtensions.Size = new System.Drawing.Size(305, 17);
+ this.checkBoxFilterExtensions.TabIndex = 19;
+ this.checkBoxFilterExtensions.Text = "Show outgoing call notification only for following extensions:";
+ this.checkBoxFilterExtensions.UseVisualStyleBackColor = true;
+ this.checkBoxFilterExtensions.CheckedChanged += new System.EventHandler(this.checkBoxFilterExtensions_CheckedChanged);
+ //
+ // buttonExtensionsAdd
+ //
+ this.buttonExtensionsAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.buttonExtensionsAdd.Location = new System.Drawing.Point(251, 209);
+ this.buttonExtensionsAdd.Name = "buttonExtensionsAdd";
+ this.buttonExtensionsAdd.Size = new System.Drawing.Size(63, 21);
+ this.buttonExtensionsAdd.TabIndex = 21;
+ this.buttonExtensionsAdd.Text = "Add";
+ this.buttonExtensionsAdd.UseVisualStyleBackColor = true;
+ this.buttonExtensionsAdd.Click += new System.EventHandler(this.buttonExtensionsAdd_Click);
+ //
+ // comboBoxExtensions
+ //
+ this.comboBoxExtensions.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.comboBoxExtensions.BorderColor = System.Drawing.Color.Empty;
+ this.comboBoxExtensions.FormattingEnabled = true;
+ this.comboBoxExtensions.Location = new System.Drawing.Point(253, 180);
+ this.comboBoxExtensions.MaxLength = 2;
+ this.comboBoxExtensions.Name = "comboBoxExtensions";
+ this.comboBoxExtensions.Size = new System.Drawing.Size(51, 21);
+ this.comboBoxExtensions.Sorted = true;
+ this.comboBoxExtensions.TabIndex = 20;
+ //
+ // checkBoxShowPhoneTypeOnNotification
+ //
+ this.checkBoxShowPhoneTypeOnNotification.AutoSize = true;
+ this.checkBoxShowPhoneTypeOnNotification.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.checkBoxShowPhoneTypeOnNotification.Location = new System.Drawing.Point(215, 136);
+ this.checkBoxShowPhoneTypeOnNotification.Name = "checkBoxShowPhoneTypeOnNotification";
+ this.checkBoxShowPhoneTypeOnNotification.Size = new System.Drawing.Size(107, 17);
+ this.checkBoxShowPhoneTypeOnNotification.TabIndex = 18;
+ this.checkBoxShowPhoneTypeOnNotification.Text = "Show phone type";
+ this.checkBoxShowPhoneTypeOnNotification.UseVisualStyleBackColor = true;
+ //
+ // checkBoxShowUnknownCaller
+ //
+ this.checkBoxShowUnknownCaller.AutoSize = true;
+ this.checkBoxShowUnknownCaller.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.checkBoxShowUnknownCaller.Location = new System.Drawing.Point(32, 136);
+ this.checkBoxShowUnknownCaller.Name = "checkBoxShowUnknownCaller";
+ this.checkBoxShowUnknownCaller.Size = new System.Drawing.Size(126, 17);
+ this.checkBoxShowUnknownCaller.TabIndex = 16;
+ this.checkBoxShowUnknownCaller.Text = "Show unknown caller";
+ this.checkBoxShowUnknownCaller.UseVisualStyleBackColor = true;
+ //
+ // checkBoxUsePhonebook
+ //
+ this.checkBoxUsePhonebook.AutoSize = true;
+ this.checkBoxUsePhonebook.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.checkBoxUsePhonebook.Location = new System.Drawing.Point(15, 115);
+ this.checkBoxUsePhonebook.Name = "checkBoxUsePhonebook";
+ this.checkBoxUsePhonebook.Size = new System.Drawing.Size(103, 17);
+ this.checkBoxUsePhonebook.TabIndex = 15;
+ this.checkBoxUsePhonebook.Text = "Use phone book";
+ this.checkBoxUsePhonebook.UseVisualStyleBackColor = true;
+ this.checkBoxUsePhonebook.CheckedChanged += new System.EventHandler(this.checkBoxUsePhonebook_CheckedChanged);
+ //
+ // checkBoxShowPhoneNumberOnNotification
+ //
+ this.checkBoxShowPhoneNumberOnNotification.AutoSize = true;
+ this.checkBoxShowPhoneNumberOnNotification.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.checkBoxShowPhoneNumberOnNotification.Location = new System.Drawing.Point(368, 136);
+ this.checkBoxShowPhoneNumberOnNotification.Name = "checkBoxShowPhoneNumberOnNotification";
+ this.checkBoxShowPhoneNumberOnNotification.Size = new System.Drawing.Size(122, 17);
+ this.checkBoxShowPhoneNumberOnNotification.TabIndex = 17;
+ this.checkBoxShowPhoneNumberOnNotification.Text = "Show phone number";
+ this.checkBoxShowPhoneNumberOnNotification.UseVisualStyleBackColor = true;
+ //
// checkBoxShowNotificationOnOutgoingCall
//
this.checkBoxShowNotificationOnOutgoingCall.AutoSize = true;
this.checkBoxShowNotificationOnOutgoingCall.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.checkBoxShowNotificationOnOutgoingCall.Location = new System.Drawing.Point(207, 20);
+ this.checkBoxShowNotificationOnOutgoingCall.Location = new System.Drawing.Point(215, 20);
this.checkBoxShowNotificationOnOutgoingCall.Name = "checkBoxShowNotificationOnOutgoingCall";
- this.checkBoxShowNotificationOnOutgoingCall.Size = new System.Drawing.Size(183, 17);
+ this.checkBoxShowNotificationOnOutgoingCall.Size = new System.Drawing.Size(129, 17);
this.checkBoxShowNotificationOnOutgoingCall.TabIndex = 13;
- this.checkBoxShowNotificationOnOutgoingCall.Text = "Show notification on outgoing call";
+ this.checkBoxShowNotificationOnOutgoingCall.Text = "Show on outgoing call";
this.checkBoxShowNotificationOnOutgoingCall.UseVisualStyleBackColor = true;
//
// checkBoxCloseOnConnectionClosed
//
this.checkBoxCloseOnConnectionClosed.AutoSize = true;
this.checkBoxCloseOnConnectionClosed.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.checkBoxCloseOnConnectionClosed.Location = new System.Drawing.Point(7, 70);
+ this.checkBoxCloseOnConnectionClosed.Location = new System.Drawing.Point(15, 70);
this.checkBoxCloseOnConnectionClosed.Name = "checkBoxCloseOnConnectionClosed";
this.checkBoxCloseOnConnectionClosed.Size = new System.Drawing.Size(198, 17);
this.checkBoxCloseOnConnectionClosed.TabIndex = 9;
@@ -263,17 +365,17 @@
//
this.checkBoxShowNotificationOnIncomingCall.AutoSize = true;
this.checkBoxShowNotificationOnIncomingCall.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.checkBoxShowNotificationOnIncomingCall.Location = new System.Drawing.Point(7, 20);
+ this.checkBoxShowNotificationOnIncomingCall.Location = new System.Drawing.Point(15, 20);
this.checkBoxShowNotificationOnIncomingCall.Name = "checkBoxShowNotificationOnIncomingCall";
- this.checkBoxShowNotificationOnIncomingCall.Size = new System.Drawing.Size(184, 17);
+ this.checkBoxShowNotificationOnIncomingCall.Size = new System.Drawing.Size(130, 17);
this.checkBoxShowNotificationOnIncomingCall.TabIndex = 12;
- this.checkBoxShowNotificationOnIncomingCall.Text = "Show notification on incoming call";
+ this.checkBoxShowNotificationOnIncomingCall.Text = "Show on incoming call";
this.checkBoxShowNotificationOnIncomingCall.UseVisualStyleBackColor = true;
//
// lblMaxNotifies
//
this.lblMaxNotifies.AutoSize = true;
- this.lblMaxNotifies.Location = new System.Drawing.Point(22, 93);
+ this.lblMaxNotifies.Location = new System.Drawing.Point(30, 93);
this.lblMaxNotifies.Name = "lblMaxNotifies";
this.lblMaxNotifies.Size = new System.Drawing.Size(90, 13);
this.lblMaxNotifies.TabIndex = 8;
@@ -281,7 +383,7 @@
//
// numericUpDownMaxNotifies
//
- this.numericUpDownMaxNotifies.Location = new System.Drawing.Point(207, 89);
+ this.numericUpDownMaxNotifies.Location = new System.Drawing.Point(215, 89);
this.numericUpDownMaxNotifies.Maximum = new decimal(new int[] {
20,
0,
@@ -305,7 +407,7 @@
// buttonMSNsRemove
//
this.buttonMSNsRemove.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonMSNsRemove.Location = new System.Drawing.Point(387, 91);
+ this.buttonMSNsRemove.Location = new System.Drawing.Point(97, 209);
this.buttonMSNsRemove.Name = "buttonMSNsRemove";
this.buttonMSNsRemove.Size = new System.Drawing.Size(63, 21);
this.buttonMSNsRemove.TabIndex = 5;
@@ -317,18 +419,19 @@
//
this.checkBoxFilterMSNs.AutoSize = true;
this.checkBoxFilterMSNs.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.checkBoxFilterMSNs.Location = new System.Drawing.Point(303, 43);
+ this.checkBoxFilterMSNs....
[truncated message content] |
|
From: <hor...@us...> - 2012-03-05 20:45:14
|
Revision: 4464
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4464&view=rev
Author: horned-reaper
Date: 2012-03-05 20:45:05 +0000 (Mon, 05 Mar 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/Docs/Changes.txt
trunk/plugins/FritzBox/FritzBox/EditPhoneBook.Designer.cs
trunk/plugins/FritzBox/FritzBox/EditPhoneBook.cs
trunk/plugins/FritzBox/FritzBox/EditPhoneBook.resx
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/FritzBoxClient.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/PhonebookItem.cs
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.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Debug/GenerateResource-ResGen.read.1.tlog
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/FritzBoxConfigTester.csproj
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/FritzBoxConfigTester.csproj.user
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/Program.cs
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/Properties/AssemblyInfo.cs
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.csproj.FileListAbsolute.txt
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/DesignTimeResolveAssemblyReferencesInput.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/FritzBoxDebugger.csproj
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/Properties/AssemblyInfo.cs
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.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/GenerateResource.read.1.tlog
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/GenerateResource.write.1.tlog
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/obj/Release/DesignTimeResolveAssemblyReferences.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester/
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester/FritzBoxConfigTester.vshost.exe.config
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.vshost.exe.manifest
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/GenerateResource-ResGen.read.1.tlog
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/GenerateResource-ResGen.write.1.tlog
trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4463.mpe1
Removed Paths:
-------------
trunk/plugins/FritzBox/Docs/Ausstehend.txt
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2012-03-04 18:33:38 UTC (rev 4463)
+++ trunk/plugins/FritzBox/Build/Build.log 2012-03-05 20:45:05 UTC (rev 4464)
@@ -1,6 +1,6 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4461
+SVN Version: 4463
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 26.02.2012 16:16:20.
+Build started 05.03.2012 21:32:52.
Project "D:\FritzBox\FritzBox.sln" on node 1 (Rebuild target(s)).
ValidateSolutionConfiguration:
Building solution configuration "Release|Mixed Platforms".
@@ -68,9 +68,6 @@
Copying file from "obj\Release\FritzBox.dll" to "bin\Release\FritzBox.dll".
FritzBox -> D:\FritzBox\FritzBox\bin\Release\FritzBox.dll
Copying file from "obj\Release\FritzBox.pdb" to "bin\Release\FritzBox.pdb".
-PostBuildEvent:
- rem xcopy /y "D:\FritzBox\FritzBox\bin\Release\FritzBox.dll" "D:\FritzBox\\xbmc\bin\Release\plugins\windows"
- rem xcopy /y "D:\FritzBox\FritzBox\bin\Release\FritzBox.dll" "D:\FritzBox\\Configuration\bin\Release\plugins\windows"
Done Building Project "D:\FritzBox\FritzBox\FritzBox.csproj" (Rebuild target(s)).
Project "D:\FritzBox\FritzBox.sln" (1) is building "D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj" (3) on node 1 (Rebuild target(s)).
CoreClean:
@@ -156,6 +153,8 @@
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-ResGen.read.1.tlog".
+ Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource-ResGen.write.1.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 +194,7 @@
0 Warning(s)
0 Error(s)
-Time Elapsed 00:00:01.89
+Time Elapsed 00:00:03.53
Reverting to build 0
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
@@ -298,7 +297,7 @@
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
36 File(s) copied
MpeMaker version: 1.2.1.0
-Build started at 16:16:25
+Build started at 21:32:59
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Deleted: trunk/plugins/FritzBox/Docs/Ausstehend.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Ausstehend.txt 2012-03-04 18:33:38 UTC (rev 4463)
+++ trunk/plugins/FritzBox/Docs/Ausstehend.txt 2012-03-05 20:45:05 UTC (rev 4464)
@@ -1,65 +0,0 @@
-Neue Funktionen/Erweiterungen:
-- Telefonbuch editierbar machen (f\xFCr FRITZ!Box-Versionen ohne Telefonbuch)
-- Bei Anrufbenachrichtigungen: Auflistung von Kontaktnamen, wenn eine Rufnummer mehrmals im Telefonbuch vorkommt
-- Nachrichtenl\xE4nge zur Anzeige hinzuf\xFCgen
-- "Nachricht l\xF6schen"-Funktion
-- "Nachricht als geh\xF6rt markieren"-Funktion
-- R\xFCckw\xE4rtssuche wieder integrieren
-- Wiki-Eintrag
-- Skin-Erweiterungen
- - Anzahl der neuen Anrufe
-- geplante \xC4nderungen ver\xF6ffentlichen
-- Klingelton solange wiederholen bis H\xF6rer abgenommen wird
-
-
-Anwenderw\xFCnsche
----------------
-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.
-
-joit, 06.12.2011:
-was ich noch super f\xE4nd w\xE4re eine sch\xF6ne Mustayaluca-Integration!
-
-tor2010, 06.12.2011:
-Skinanpassung f\xFCr AVALON
-
-rogerleifert, 08.12.2008:
-F\xFCr den PurevisionHD-Skin gibt es m.W. auch noch keine Anpassung.
-Die Notifications bei eingehenden/ausgehenden Rufen funktionieren mit dem Skin problemlos.
-Wenn man allerdings in den Plugins-Bereichs geht, um z.B. die Anrufliste anzuzeigen, passiert erst mal gar nichts und dann kommt so ein ewig durchlaufender Fortschrittsbalken ohne da\xDF etwas passiert.
-
-Stefan Rinke:
-Abspielen von Sprachnachrichten nach dem Anklicken im Home-Screen:
-add onAction handler to catch custom action from home screen button
-damit k\xF6nnten man ein Control auf dem HomeScreen erscheinen lassen
-welches beim einem neuen Anruf direkt auf abspielen geht.
-
-Burkh2407, 30.12.2011:
-ich benutze Stremed MP... mich st\xF6rt das ich zum Umschalten zwischen den einzelnen Listen seitlich ins Untermen\xFC wechseln
-mu\xDF warum gibt es kein Buttons wo ich die Listen direKt anw\xE4hlen kann oder \xFCbersehe ich da was.
-Gru\xDF Burkh2407
-
-creativ, 10.01.2012, 19:53:
-Was nur noch eingebaut werden sollte, das im Telefonbuch Kontakte abgew\xE4hlt werden k\xF6nnen die im MP dann nicht angezeigt werden! Ich habe n\xE4mlich das Fritz!Fon MT-F und dort sind Kontakte im internen Speicher die nicht gel\xF6scht werden k\xF6nnen, z.b. (wie klingt HD-Telefonie und daf\xFCr gibt es eine Telefonnumer die hinterlegt ist).
-
-IchBinsShort, 11.01.2012, 00:28:
-L\xF6schen von Anruflisten \xFCber die GUI
-
-IchBinsShort, 17.01.2012, 15:05:
-Ich h\xE4tte noch Idee, wei\xDF nicht ob dies M\xF6glich ist. Aber sch\xF6n w\xE4re es wenn Mediaportal aus dem Standby oder Hibernate erwacht anzeigen w\xFCrde wenn es verpasste Anrufe gibt. Also das vlt. ein Popup Fenster sich \xF6ffnet und anzeigt das es verpasste Anrufe gibt... Ist dies wohl M\xF6glich ?
-
-IchBinsShort, 17.01.2012, 15:23:
-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
-
-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.
-
-Vasilich, 11.02.2012, 01:24 Uhr:
-MSN in Nachrichtenansicht abschaltbar machen
-
-AlfredENeuma, 11.02.2012, 17:36 Uhr:
-MSN in Anrufliste anzeigen und abschaltbar machen
\ No newline at end of file
Modified: trunk/plugins/FritzBox/Docs/Changes.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Changes.txt 2012-03-04 18:33:38 UTC (rev 4463)
+++ trunk/plugins/FritzBox/Docs/Changes.txt 2012-03-05 20:45:05 UTC (rev 4464)
@@ -1,16 +1,8 @@
-New release 0.4.1.4461:
+New release 1.0.0.44xx:
New feature:
-- call extension filter
-- option for manual contact image path entry (for FRITZ!Boxes with contact image setting)
-Optimizations:
-- some language file adjustments
-- enhanced connection test in MediaPortal Configuration
-- settings XML file:
- - consolidated section "FRITZ!Box Manager"
- - clear entry names
-- call monitor stability improvements
+Optimization:
+
+
Fixed bug:
-- problem on task queuing
-- notification window is not closed on quick sequent call actions (e. g. incoming FAX messages)
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/EditPhoneBook.Designer.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/EditPhoneBook.Designer.cs 2012-03-04 18:33:38 UTC (rev 4463)
+++ trunk/plugins/FritzBox/FritzBox/EditPhoneBook.Designer.cs 2012-03-05 20:45:05 UTC (rev 4464)
@@ -29,20 +29,27 @@
private void InitializeComponent()
{
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
this.dataGridView = new System.Windows.Forms.DataGridView();
this.columnContactID = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.columnName = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.columnPhoneType = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.columnPhoneNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.columnShowCallNotification = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.columnRingTonePath = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ColumnContactImage = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.label1 = new System.Windows.Forms.Label();
this.pictureBoxCaller = new System.Windows.Forms.PictureBox();
- this.label1 = new System.Windows.Forms.Label();
+ this.textBoxPhoneNumber1 = new System.Windows.Forms.TextBox();
+ this.comboBoxPhoneNumber1 = new System.Windows.Forms.ComboBox();
+ this.comboBoxPhoneNumber2 = new System.Windows.Forms.ComboBox();
+ this.textBoxPhoneNumber2 = new System.Windows.Forms.TextBox();
+ this.comboBoxPhoneNumber3 = new System.Windows.Forms.ComboBox();
+ this.textBoxPhoneNumber3 = new System.Windows.Forms.TextBox();
+ this.label2 = new System.Windows.Forms.Label();
+ this.buttonDeleteSelectedContact = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxCaller)).BeginInit();
this.SuspendLayout();
@@ -68,40 +75,41 @@
this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.columnContactID,
this.columnName,
- this.columnPhoneType,
- this.columnPhoneNumber,
this.columnShowCallNotification,
this.columnRingTonePath,
this.ColumnContactImage});
- dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window;
- dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText;
- dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dataGridView.DefaultCellStyle = dataGridViewCellStyle4;
- this.dataGridView.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
- this.dataGridView.Location = new System.Drawing.Point(31, 29);
- this.dataGridView.MultiSelect = false;
- this.dataGridView.Name = "dataGridView";
dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window;
dataGridViewCellStyle5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dataGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle5;
+ dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dataGridView.DefaultCellStyle = dataGridViewCellStyle5;
+ this.dataGridView.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
+ this.dataGridView.Location = new System.Drawing.Point(28, 29);
+ this.dataGridView.MultiSelect = false;
+ this.dataGridView.Name = "dataGridView";
+ dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle6.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dataGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle6;
this.dataGridView.RowHeadersVisible = false;
this.dataGridView.RowTemplate.Height = 23;
this.dataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
- this.dataGridView.Size = new System.Drawing.Size(729, 582);
+ this.dataGridView.Size = new System.Drawing.Size(580, 582);
this.dataGridView.TabIndex = 19;
+ this.dataGridView.RowsAdded += new System.Windows.Forms.DataGridViewRowsAddedEventHandler(this.dataGridView_RowsAdded);
+ this.dataGridView.RowsRemoved += new System.Windows.Forms.DataGridViewRowsRemovedEventHandler(this.dataGridView_RowsRemoved);
//
// columnContactID
//
dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ dataGridViewCellStyle2.NullValue = "null";
this.columnContactID.DefaultCellStyle = dataGridViewCellStyle2;
this.columnContactID.HeaderText = "Contact ID";
this.columnContactID.Name = "columnContactID";
@@ -119,30 +127,14 @@
this.columnName.ReadOnly = true;
this.columnName.Width = 220;
//
- // columnPhoneType
- //
- this.columnPhoneType.HeaderText = "Phone type";
- this.columnPhoneType.MinimumWidth = 70;
- this.columnPhoneType.Name = "columnPhoneType";
- this.columnPhoneType.ReadOnly = true;
- this.columnPhoneType.Width = 70;
- //
- // columnPhoneNumber
- //
- this.columnPhoneNumber.FillWeight = 31.88914F;
- this.columnPhoneNumber.HeaderText = "Phone number";
- this.columnPhoneNumber.MinimumWidth = 100;
- this.columnPhoneNumber.Name = "columnPhoneNumber";
- this.columnPhoneNumber.ReadOnly = true;
- this.columnPhoneNumber.Width = 120;
- //
// columnShowCallNotification
//
+ dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle4.NullValue = true;
+ this.columnShowCallNotification.DefaultCellStyle = dataGridViewCellStyle4;
this.columnShowCallNotification.HeaderText = "Show call notification";
this.columnShowCallNotification.MinimumWidth = 73;
this.columnShowCallNotification.Name = "columnShowCallNotification";
- this.columnShowCallNotification.Resizable = System.Windows.Forms.DataGridViewTriState.True;
- this.columnShowCallNotification.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
this.columnShowCallNotification.Width = 73;
//
// columnRingTonePath
@@ -161,30 +153,124 @@
this.ColumnContactImage.Visible = false;
this.ColumnContactImage.Width = 225;
//
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(826, 598);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(57, 13);
+ this.label1.TabIndex = 24;
+ this.label1.Text = "0 contacts";
+ //
// pictureBoxCaller
//
this.pictureBoxCaller.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.pictureBoxCaller.Location = new System.Drawing.Point(785, 29);
+ this.pictureBoxCaller.Location = new System.Drawing.Point(715, 29);
this.pictureBoxCaller.Name = "pictureBoxCaller";
this.pictureBoxCaller.Size = new System.Drawing.Size(122, 122);
this.pictureBoxCaller.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBoxCaller.TabIndex = 23;
this.pictureBoxCaller.TabStop = false;
//
- // label1
+ // textBoxPhoneNumber1
//
- this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(782, 598);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(89, 13);
- this.label1.TabIndex = 24;
- this.label1.Text = "0 phone numbers";
+ this.textBoxPhoneNumber1.Location = new System.Drawing.Point(759, 208);
+ this.textBoxPhoneNumber1.Name = "textBoxPhoneNumber1";
+ this.textBoxPhoneNumber1.ReadOnly = true;
+ this.textBoxPhoneNumber1.Size = new System.Drawing.Size(150, 20);
+ this.textBoxPhoneNumber1.TabIndex = 25;
//
+ // comboBoxPhoneNumber1
+ //
+ this.comboBoxPhoneNumber1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.comboBoxPhoneNumber1.FormattingEnabled = true;
+ this.comboBoxPhoneNumber1.Items.AddRange(new object[] {
+ "Private",
+ "Mobile",
+ "Business"});
+ this.comboBoxPhoneNumber1.Location = new System.Drawing.Point(632, 208);
+ this.comboBoxPhoneNumber1.MaxDropDownItems = 3;
+ this.comboBoxPhoneNumber1.Name = "comboBoxPhoneNumber1";
+ this.comboBoxPhoneNumber1.Size = new System.Drawing.Size(112, 21);
+ this.comboBoxPhoneNumber1.TabIndex = 26;
+ //
+ // comboBoxPhoneNumber2
+ //
+ this.comboBoxPhoneNumber2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.comboBoxPhoneNumber2.FormattingEnabled = true;
+ this.comboBoxPhoneNumber2.Items.AddRange(new object[] {
+ "Private",
+ "Mobile",
+ "Business"});
+ this.comboBoxPhoneNumber2.Location = new System.Drawing.Point(632, 246);
+ this.comboBoxPhoneNumber2.MaxDropDownItems = 3;
+ this.comboBoxPhoneNumber2.Name = "comboBoxPhoneNumber2";
+ this.comboBoxPhoneNumber2.Size = new System.Drawing.Size(112, 21);
+ this.comboBoxPhoneNumber2.TabIndex = 28;
+ //
+ // textBoxPhoneNumber2
+ //
+ this.textBoxPhoneNumber2.Location = new System.Drawing.Point(759, 246);
+ this.textBoxPhoneNumber2.Name = "textBoxPhoneNumber2";
+ this.textBoxPhoneNumber2.ReadOnly = true;
+ this.textBoxPhoneNumber2.Size = new System.Drawing.Size(150, 20);
+ this.textBoxPhoneNumber2.TabIndex = 27;
+ //
+ // comboBoxPhoneNumber3
+ //
+ this.comboBoxPhoneNumber3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.comboBoxPhoneNumber3.FormattingEnabled = true;
+ this.comboBoxPhoneNumber3.Items.AddRange(new object[] {
+ "Private",
+ "Mobile",
+ "Business"});
+ this.comboBoxPhoneNumber3.Location = new System.Drawing.Point(632, 285);
+ this.comboBoxPhoneNumber3.MaxDropDownItems = 3;
+ this.comboBoxPhoneNumber3.Name = "comboBoxPhoneNumber3";
+ this.comboBoxPhoneNumber3.Size = new System.Drawing.Size(112, 21);
+ this.comboBoxPhoneNumber3.TabIndex = 30;
+ //
+ // textBoxPhoneNumber3
+ //
+ this.textBoxPhoneNumber3.Location = new System.Drawing.Point(759, 285);
+ this.textBoxPhoneNumber3.Name = "textBoxPhoneNumber3";
+ this.textBoxPhoneNumber3.ReadOnly = true;
+ this.textBoxPhoneNumber3.Size = new System.Drawing.Size(150, 20);
+ this.textBoxPhoneNumber3.TabIndex = 29;
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label2.Location = new System.Drawing.Point(629, 188);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(94, 13);
+ this.label2.TabIndex = 31;
+ this.label2.Text = "Phone numbers";
+ //
+ // buttonDeleteSelectedContact
+ //
+ this.buttonDeleteSelectedContact.Location = new System.Drawing.Point(717, 348);
+ this.buttonDeleteSelectedContact.Name = "buttonDeleteSelectedContact";
+ this.buttonDeleteSelectedContact.Size = new System.Drawing.Size(109, 51);
+ this.buttonDeleteSelectedContact.TabIndex = 32;
+ this.buttonDeleteSelectedContact.Text = "Delete selected contact";
+ this.buttonDeleteSelectedContact.UseVisualStyleBackColor = true;
+ this.buttonDeleteSelectedContact.Click += new System.EventHandler(this.buttonDeleteContact_Click);
+ //
// EditPhoneBook
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(933, 639);
+ this.Controls.Add(this.buttonDeleteSelectedContact);
+ this.Controls.Add(this.label2);
+ this.Controls.Add(this.comboBoxPhoneNumber3);
+ this.Controls.Add(this.textBoxPhoneNumber3);
+ this.Controls.Add(this.comboBoxPhoneNumber2);
+ this.Controls.Add(this.textBoxPhoneNumber2);
+ this.Controls.Add(this.comboBoxPhoneNumber1);
+ this.Controls.Add(this.textBoxPhoneNumber1);
this.Controls.Add(this.label1);
this.Controls.Add(this.pictureBoxCaller);
this.Controls.Add(this.dataGridView);
@@ -204,12 +290,18 @@
private System.Windows.Forms.PictureBox pictureBoxCaller;
private System.Windows.Forms.DataGridView dataGridView;
private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.TextBox textBoxPhoneNumber1;
+ private System.Windows.Forms.ComboBox comboBoxPhoneNumber1;
+ private System.Windows.Forms.ComboBox comboBoxPhoneNumber2;
+ private System.Windows.Forms.TextBox textBoxPhoneNumber2;
+ private System.Windows.Forms.ComboBox comboBoxPhoneNumber3;
+ private System.Windows.Forms.TextBox textBoxPhoneNumber3;
private System.Windows.Forms.DataGridViewTextBoxColumn columnContactID;
private System.Windows.Forms.DataGridViewTextBoxColumn columnName;
- private System.Windows.Forms.DataGridViewTextBoxColumn columnPhoneType;
- private System.Windows.Forms.DataGridViewTextBoxColumn columnPhoneNumber;
private System.Windows.Forms.DataGridViewCheckBoxColumn columnShowCallNotification;
private System.Windows.Forms.DataGridViewTextBoxColumn columnRingTonePath;
private System.Windows.Forms.DataGridViewTextBoxColumn ColumnContactImage;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.Button buttonDeleteSelectedContact;
}
}
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/EditPhoneBook.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/EditPhoneBook.cs 2012-03-04 18:33:38 UTC (rev 4463)
+++ trunk/plugins/FritzBox/FritzBox/EditPhoneBook.cs 2012-03-05 20:45:05 UTC (rev 4464)
@@ -10,9 +10,16 @@
namespace FritzBox
{
+ public enum PhoneTypeFormat
+ {
+ Display,
+ XML
+ }
+
public partial class EditPhoneBook : Form
{
private PhoneBook phoneBook = new PhoneBook();
+ private bool phoneNumberChanges;
public EditPhoneBook()
{
@@ -21,7 +28,7 @@
private void fillTable()
{
- string uniqueID, name, type = String.Empty, number = String.Empty, ringTonePath, imageURL;
+ string uniqueID, name, ringTonePath, imageURL;
bool showCallNotification;
phoneBook.LoadPhoneBookFromXMLFile();
@@ -34,108 +41,422 @@
ringTonePath = phoneBookItem.RingTonePath;
imageURL = phoneBookItem.ImageURL;
- foreach (PhoneNumber phoneNumber in phoneBookItem.PhoneNumbers)
+ dataGridView.Rows.Add(uniqueID, name, showCallNotification, ringTonePath, imageURL);
+ }
+ }
+
+ private int getPhoneNumberType(string phoneNumberType)
+ {
+ switch (phoneNumberType.ToLower())
+ {
+ case "home":
+ return 0;
+ case "work":
+ return 1;
+ case "business":
+ return 1;
+ case "mobile":
+ return 2;
+ default:
+ return -1;
+ }
+ }
+
+ private string getPhoneNumberType(int phoneNumberType, PhoneTypeFormat phoneTypeFormat)
+ {
+ switch (phoneNumberType)
+ {
+ case 0:
+ if (phoneTypeFormat == PhoneTypeFormat.Display) return "Home";
+ else return "home";
+ case 1:
+ if (phoneTypeFormat == PhoneTypeFormat.Display) return "Business";
+ else return "work";
+ case 2:
+ if (phoneTypeFormat == PhoneTypeFormat.Display) return "Mobile";
+ else return "mobile";
+ default:
+ return String.Empty;
+ }
+ }
+
+ private void updatePhoneNumbersInContactItem()
+ {
+ if (dataGridView.CurrentRow.Index != dataGridView.NewRowIndex)
+ {
+ string contactID = dataGridView.CurrentRow.Cells[0].Value.ToString();
+ PhoneBookItem contact = phoneBook.Items[contactID];
+
+ contact.PhoneNumbers = new PhoneNumber[3];
+ PhoneNumber[] phoneNumbers = { new PhoneNumber(), new PhoneNumber(), new PhoneNumber() };
+ contact.PhoneNumbers = phoneNumbers;
+
+ PhoneNumber phoneNumber;
+
+ if (textBoxPhoneNumber1.Text != string.Empty)
{
+ if (comboBoxPhoneNumber1.SelectedIndex != -1)
+ {
+ phoneNumber = new PhoneNumber();
+ phoneNumber.type = getPhoneNumberType(comboBoxPhoneNumber1.SelectedIndex, PhoneTypeFormat.XML);
+ phoneNumber.Value = textBoxPhoneNumber1.Text;
+
+ contact.PhoneNumbers[0] = phoneNumber;
+ }
+ else return;
+ }
+
+ if (textBoxPhoneNumber2.Text != string.Empty)
+ {
+ if (comboBoxPhoneNumber2.SelectedIndex != -1)
+ {
+ phoneNumber = new PhoneNumber();
+ phoneNumber.type = getPhoneNumberType(comboBoxPhoneNumber2.SelectedIndex, PhoneTypeFormat.XML);
+ phoneNumber.Value = textBoxPhoneNumber2.Text;
+
+ contact.PhoneNumbers[1] = phoneNumber;
+ }
+ else return;
+ }
+
+ if (textBoxPhoneNumber3.Text != string.Empty)
+ {
+ if (comboBoxPhoneNumber3.SelectedIndex != -1)
+ {
+ phoneNumber = new PhoneNumber();
+ phoneNumber.type = getPhoneNumberType(comboBoxPhoneNumber3.SelectedIndex, PhoneTypeFormat.XML);
+ phoneNumber.Value = textBoxPhoneNumber3.Text;
+
+ contact.PhoneNumbers[2] = phoneNumber;
+ }
+ else return;
+ }
+
+ // transfer changed contact to phone book
+ phoneBook.EditItem(contact);
+
+ phoneNumberChanges = false;
+ }
+ }
+
+ private void updatePhoneNumbersInGUI(PhoneBookItem contact)
+ {
+ // load phone numbers
+ int numberPosition = 0;
+
+ // unregister change events during automatic data load
+ unregisterPhoneNumberFieldChanges();
+
+ clearPhoneNumberFields();
+
+ if (contact.PhoneNumbers != null)
+ {
+ foreach (PhoneNumber phoneNumber in contact.PhoneNumbers)
+ {
if (!String.IsNullOrEmpty(phoneNumber.Value))
{
- type = phoneNumber.type;
- number = phoneNumber.Value;
+ // fill in phone types and numbers
+ switch (numberPosition)
+ {
+ case 0:
+ if (Settings.SynchronizePhoneBook)
+ {
+ comboBoxPhoneNumber1.Items.Clear();
- dataGridView.Rows.Add(uniqueID, name, type, number, showCallNotification, ringTonePath, imageURL);
+ comboBoxPhoneNumber1.Items.Add(getPhoneNumberType(getPhoneNumberType(phoneNumber.type), PhoneTypeFormat.Display));
+ comboBoxPhoneNumber1.SelectedIndex = 0;
+ }
+ else comboBoxPhoneNumber1.SelectedIndex = getPhoneNumberType(phoneNumber.type);
+
+ textBoxPhoneNumber1.Text = phoneNumber.Value;
+ break;
+
+ case 1:
+ if (Settings.SynchronizePhoneBook)
+ {
+ comboBoxPhoneNumber2.Items.Clear();
+
+ comboBoxPhoneNumber2.Items.Add(getPhoneNumberType(getPhoneNumberType(phoneNumber.type), PhoneTypeFormat.Display));
+ comboBoxPhoneNumber2.SelectedIndex = 0;
+ }
+ else comboBoxPhoneNumber2.SelectedIndex = getPhoneNumberType(phoneNumber.type);
+
+ textBoxPhoneNumber2.Text = phoneNumber.Value;
+ break;
+
+ case 2:
+ if (Settings.SynchronizePhoneBook)
+ {
+ comboBoxPhoneNumber3.Items.Clear();
+
+ comboBoxPhoneNumber3.Items.Add(getPhoneNumberType(getPhoneNumberType(phoneNumber.type), PhoneTypeFormat.Display));
+ comboBoxPhoneNumber3.SelectedIndex = 0;
+ }
+ else comboBoxPhoneNumber3.SelectedIndex = getPhoneNumberType(phoneNumber.type);
+
+ textBoxPhoneNumber3.Text = phoneNumber.Value;
+ break;
+ }
}
+ else if (Settings.SynchronizePhoneBook)
+ {
+ switch (numberPosition)
+ {
+ case 0:
+ comboBoxPhoneNumber1.Items.Clear();
+ break;
+ case 1:
+ comboBoxPhoneNumber2.Items.Clear();
+ break;
+ case 2:
+ comboBoxPhoneNumber3.Items.Clear();
+ break;
+ }
+ }
+
+ numberPosition++;
}
}
- label1.Text = dataGridView.Rows.Count + " phone numbers";
+ // register events after row adding
+ registerPhoneNumberFieldChanges();
}
- private void EditPhoneBook_Load(object sender, EventArgs e)
+ private void clearPhoneNumberFields()
{
- dataGridView.Columns[6].Visible = Settings.ManualContactImagePathEntry;
+ // clear phone type and number fields
+ comboBoxPhoneNumber1.SelectedIndex = -1;
+ textBoxPhoneNumber1.ResetText();
+ comboBoxPhoneNumber2.SelectedIndex = -1;
+ textBoxPhoneNumber2.ResetText();
+ comboBoxPhoneNumber3.SelectedIndex = -1;
+ textBoxPhoneNumber3.ResetText();
+ }
- fillTable();
+ private void registerPhoneNumberFieldChanges()
+ {
+ if (!Settings.SynchronizePhoneBook)
+ {
+ comboBoxPhoneNumber1.SelectedIndexChanged += comboBoxPhoneNumbers_SelectedIndexChanged;
+ comboBoxPhoneNumber2.SelectedIndexChanged += comboBoxPhoneNumbers_SelectedIndexChanged;
+ comboBoxPhoneNumber3.SelectedIndexChanged += comboBoxPhoneNumbers_SelectedIndexChanged;
- if (dataGridView.Rows.Count > 0)
+ textBoxPhoneNumber1.TextChanged += textBoxPhoneNumbers_TextChanged;
+ textBoxPhoneNumber2.TextChanged += textBoxPhoneNumbers_TextChanged;
+ textBoxPhoneNumber3.TextChanged += textBoxPhoneNumbers_TextChanged;
+
+ textBoxPhoneNumber1.Enter += textBoxPhoneNumber1_Enter;
+ textBoxPhoneNumber2.Enter += textBoxPhoneNumber2_Enter;
+ textBoxPhoneNumber3.Enter += textBoxPhoneNumber3_Enter;
+ }
+ }
+
+ private void unregisterPhoneNumberFieldChanges()
+ {
+ if (!Settings.SynchronizePhoneBook)
{
- // show picture of first contact
- dataGridView_SelectionChanged(null, null);
+ comboBoxPhoneNumber1.SelectedIndexChanged -= comboBoxPhoneNumbers_SelectedIndexChanged;
+ comboBoxPhoneNumber2.SelectedIndexChanged -= comboBoxPhoneNumbers_SelectedIndexChanged;
+ comboBoxPhoneNumber3.SelectedIndexChanged -= comboBoxPhoneNumbers_SelectedIndexChanged;
- // monitor table changes
- dataGridView.SelectionChanged += new EventHandler(dataGridView_SelectionChanged);
- dataGridView.CellValueChanged += new DataGridViewCellEventHandler(dataGridView_CellValueChanged);
+ textBoxPhoneNumber1.TextChanged -= textBoxPhoneNumbers_TextChanged;
+ textBoxPhoneNumber2.TextChanged -= textBoxPhoneNumbers_TextChanged;
+ textBoxPhoneNumber3.TextChanged -= textBoxPhoneNumbers_TextChanged;
+
+ textBoxPhoneNumber1.Enter -= textBoxPhoneNumber1_Enter;
+ textBoxPhoneNumber2.Enter -= textBoxPhoneNumber2_Enter;
+ textBoxPhoneNumber3.Enter -= textBoxPhoneNumber3_Enter;
}
- else
+ }
+
+ private void updateContactCount()
+ {
+ if (phoneBook.Count > 1) label1.Text = phoneBook.Count + " contacts";
+ else if (phoneBook.Count == 1) label1.Text = phoneBook.Count + " contacts";
+ else if (phoneBook.Count == 0) label1.Text = "No contacts";
+ }
+
+ private void EditPhoneBook_Load(object sender, EventArgs e)
+ {
+ dataGridView.Columns[4].Visible = Settings.ManualContactImagePathEntry || !Settings.SynchronizePhoneBook;
+
+ dataGridView.Columns[1].ReadOnly = Settings.SynchronizePhoneBook;
+
+ dataGridView.AllowUserToAddRows = !Settings.SynchronizePhoneBook;
+ dataGridView.AllowUserToDeleteRows = !Settings.SynchronizePhoneBook;
+
+ buttonDeleteSelectedContact.Visible = !Settings.SynchronizePhoneBook;
+
+ textBoxPhoneNumber1.ReadOnly = Settings.SynchronizePhoneBook;
+ textBoxPhoneNumber2.ReadOnly = Settings.SynchronizePhoneBook;
+ textBoxPhoneNumber3.ReadOnly = Settings.SynchronizePhoneBook;
+
+ // monitor changes
+ dataGridView.SelectionChanged += new EventHandler(dataGridView_SelectionChanged);
+ dataGridView.CellValueChanged += new DataGridViewCellEventHandler(dataGridView_CellValueChanged);
+
+ if (!Settings.SynchronizePhoneBook)
{
+ dataGridView.RowValidating += dataGridView_RowValidating;
+ dataGridView.UserAddedRow += dataGridView_UserAddedRow;
+ }
+
+ registerPhoneNumberFieldChanges();
+
+ fillTable();
+
+ if (dataGridView.Rows.Count == 0 && Settings.SynchronizePhoneBook)
+ {
MessageBox.Show("No phone book entries yet!" + Environment.NewLine + "Add a phone book in the FRITZ!Box settings and start MediaPortal to synchronize contacts!", "Edit phone book", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
this.Close();
}
}
-
+
private void dataGridView_SelectionChanged(object sender, EventArgs e)
{
- // get picture path for selected contact
- string contactID = dataGridView.Rows[dataGridView.SelectedCells[0].RowIndex].Cells[0].Value.ToString();
- PhoneBookItem contact = phoneBook.Items[contactID];
- string contactPicturePath = phoneBook.GetContactImagePath(contact);
+ if (dataGridView.SelectedCells[0].RowIndex != dataGridView.NewRowIndex)
+ {
+ // get picture path for selected contact
+ string contactID = dataGridView.CurrentRow.Cells[0].Value.ToString();
+ PhoneBookItem contact = phoneBook.Items[contactID];
+ string contactPicturePath = phoneBook.GetContactImagePath(contact);
- // show picture
- pictureBoxCaller.ImageLocation = contactPicturePath;
+ // show picture
+ pictureBoxCaller.ImageLocation = contactPicturePath;
+
+ updatePhoneNumbersInGUI(contact);
+ }
+ else clearPhoneNumberFields();
}
private void dataGridView_CellValueChanged(object sender, DataGridViewCellEventArgs e)
{
- string contactID = dataGridView.Rows[e.RowIndex].Cells[0].Value.ToString();
- PhoneBookItem contact = phoneBook.Items[contactID];
- object newValue = dataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].Value;
-
- // update contact
- switch (e.ColumnIndex)
+ if (e.ColumnIndex != 0) // not contact ID field
{
- case 4:
- contact.ShowCallNotification = (bool)newValue;
+ string contactID = dataGridView.Rows[e.RowIndex].Cells[0].Value.ToString();
+ PhoneBookItem contact = phoneBook.Items[contactID];
+ object newValue = dataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].Value;
- // update "Show call notification" field in all rows
- for (int i = 0; i < dataGridView.Rows.Count; i++)
- {
- dataGridView.Rows[i].Cells[4].Value = phoneBook.Items[dataGridView.Rows[i].Cells[0].Value.ToString()].ShowCallNotification;
- }
+ // update contact
+ switch (e.ColumnIndex)
+ {
+ case 1:
+ contact.Name = (string)newValue;
+ phoneBook.SortPhoneBook();
+ break;
- break;
- case 5:
- contact.RingTonePath = (string)newValue;
+ case 2:
+ contact.ShowCallNotification = (bool)newValue;
+ break;
- // update "Ring tone path" field in all rows
- for (int i = 0; i < dataGridView.Rows.Count; i++)
- {
- dataGridView.Rows[i].Cells[5].Value = phoneBook.Items[dataGridView.Rows[i].Cells[0].Value.ToString()].RingTonePath;
- }
+ case 3:
+ contact.RingTonePath = (string)newValue;
+ break;
- break;
- case 6:
- contact.ImageURL = (string)newValue;
+ case 4:
+ contact.ImageURL = (string)newValue;
+ break;
+ }
- // update "Image URL" field in all rows
- for (int i = 0; i < dataGridView.Rows.Count; i++)
- {
- dataGridView.Rows[i].Cells[6].Value = phoneBook.Items[dataGridView.Rows[i].Cells[0].Value.ToString()].ImageURL;
- }
-
- break;
+ // transfer changed contact to phone book
+ phoneBook.EditItem(contact);
}
-
- // transfer changed contact to phone book
- phoneBook.EditItem(contact);
}
private void EditPhoneBook_FormClosing(object sender, FormClosingEventArgs e)
{
- dataGridView.EndEdit(); // confirm open table changes
+ // confirm unsaved changes
+ dataGridView.EndEdit(); // open table changes
+ if (phoneNumberChanges) updatePhoneNumbersInContactItem();
phoneBook.SavePhoneBookToXMLFile();
// unregister event monitors
dataGridView.SelectionChanged -= new EventHandler(dataGridView_SelectionChanged);
dataGridView.CellValueChanged -= new DataGridViewCellEventHandler(dataGridView_CellValueChanged);
+
+ if (!Settings.SynchronizePhoneBook)
+ {
+ dataGridView.RowValidating -= dataGridView_RowValidating;
+ dataGridView.UserAddedRow -= dataGridView_UserAddedRow;
+ }
+
+ unregisterPhoneNumberFieldChanges();
}
+
+ private void comboBoxPhoneNumbers_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ phoneNumberChanges = true;
+ }
+
+ private void textBoxPhoneNumbers_TextChanged(object sender, EventArgs e)
+ {
+ phoneNumberChanges = true;
+ }
+
+ private void textBoxPhoneNumber1_Enter(object sender, EventArgs e)
+ {
+ if (comboBoxPhoneNumber1.SelectedIndex == -1)
+ {
+ MessageBox.Show("Please select a phone number type for the first number field!", "Missing phone number type", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+ comboBoxPhoneNumber1.Focus();
+ }
+ }
+
+ private void textBoxPhoneNumber2_Enter(object sender, EventArgs e)
+ {
+ if (comboBoxPhoneNumber2.SelectedIndex == -1)
+ {
+ MessageBox.Show("Please select a phone number type for the second number field!", "Missing phone number type", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+ comboBoxPhoneNumber2.Focus();
+ }
+ }
+
+ private void textBoxPhoneNumber3_Enter(object sender, EventArgs e)
+ {
+ if (comboBoxPhoneNumber3.SelectedIndex == -1)
+ {
+ MessageBox.Show("Please select a phone number type for the third number field!", "Missing phone number type", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+ comboBoxPhoneNumber3.Focus();
+ }
+ }
+
+ private void dataGridView_UserAddedRow(object sender, DataGridViewRowEventArgs e)
+ {
+ string contactID = DateTime.Now.ToBinary().ToString();
+
+ dataGridView.CurrentRow.Cells[0].Value = contactID;
+
+ PhoneBookItem contact = new PhoneBookItem();
+ contact.UniqueID = contactID;
+
+ phoneBook.AddItem(contact);
+ }
+
+ private void buttonDeleteContact_Click(object sender, EventArgs e)
+ {
+ if (dataGridView.SelectedCells.Count > 0 && dataGridView.CurrentRow.Index != dataGridView.NewRowIndex)
+ {
+ string contactID = dataGridView.Rows[dataGridView.SelectedCells[0].RowIndex].Cells[0].Value.ToString();
+ phoneBook.DeleteItem(contactID);
+
+ dataGridView.Rows.RemoveAt(dataGridView.SelectedCells[0].RowIndex);
+ }
+ }
+
+ private void dataGridView_RowValidating(object sender, DataGridViewCellCancelEventArgs e)
+ {
+ if (phoneNumberChanges) updatePhoneNumbersInContactItem();
+ }
+
+ private void dataGridView_RowsAdded(object sender, DataGridViewRowsAddedEventArgs e)
+ {
+ updateContactCount();
+ }
+
+ private void dataGridView_RowsRemoved(object sender, DataGridViewRowsRemovedEventArgs e)
+ {
+ updateContactCount();
+ }
}
}
Modified: trunk/plugins/FritzBox/FritzBox/EditPhoneBook.resx
===================================================================
--- trunk/plugins/FritzBox/FritzBox/EditPhoneBook.resx 2012-03-04 18:33:38 UTC (rev 4463)
+++ trunk/plugins/FritzBox/FritzBox/EditPhoneBook.resx 2012-03-05 20:45:05 UTC (rev 4464)
@@ -123,12 +123,6 @@
<metadata name="columnName.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
- <metadata name="columnPhoneType.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <metadata name="columnPhoneNumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
<metadata name="columnShowCallNotification.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2012-03-04 18:33:38 UTC (rev 4463)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2012-03-05 20:45:05 UTC (rev 4464)
@@ -775,8 +775,8 @@
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));
+ if (Settings.SynchronizePhoneBook) worker.EnqueueTask(new Task(Task.TaskAction.SynchronizePhoneBook, null));
+ if (!Settings.ManualContactImagePathEntry && !String.IsNullOrEmpty(Settings.NASShareName)) worker.EnqueueTask(new Task(Task.TaskAction.SynchronizeContactImages, null));
worker.EnqueueTask(new Task(Task.TaskAction.UpdateGUIProperties, null));
// reset update timer to get the countdown timer reset
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.csproj
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.csproj 2012-03-04 18:33:38 UTC (rev 4463)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.csproj 2012-03-05 20:45:05 UTC (rev 4464)
@@ -204,7 +204,7 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>rem xcopy /y "$(TargetPath)" "$(SolutionDir)\xbmc\bin\$(ConfigurationName)\plugins\windows"
-rem xcopy /y "$(TargetPath)" "$(SolutionDir)\Configuration\bin\$(ConfigurationName)\plugins\windows"</PostBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2012-03-04 18:33:38 UTC (rev 4463)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2012-03-05 20:45:05 UTC (rev 4464)
@@ -37,6 +37,8 @@
this.buttonConnectionTest = new MediaPortal.UserInterface.Controls.MPButton();
this.labelHelp = new System.Windows.Forms.TextBox();
this.tabPagePhoneBook = new System.Windows.Forms.TabPage();
+ this.checkBoxSynchronizePhoneBook = new System.Windows.Forms.CheckBox();
+ this.checkBoxManualContactImagePathEntry = new System.Windows.Forms.CheckBox();
this.buttonEditPhoneBook = new System.Windows.Forms.Button();
this.tabPageCallNotification = new System.Windows.Forms.TabPage();
this.groupBoxNotification = new MediaPortal.UserInterface.Controls.MPGroupBox();
@@ -85,7 +87,6 @@
this.updateInterval = new MediaPortal.UserInterface.Controls.MPNumericUpDown();
this.checkBoxExtensiveLogging = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.label4 = new System.Windows.Forms.Label();
- this.checkBoxManualContactImagePathEntry = new System.Windows.Forms.CheckBox();
this.tabPageDiagnostics.SuspendLayout();
this.tabPagePhoneBook.SuspendLayout();
this.tabPageCallNotification.SuspendLayout();
@@ -183,6 +184,7 @@
//
// tabPagePhoneBook
//
+ this.tabPagePhoneBook.Controls.Add(this.checkBoxSynchronizePhoneBook);
this.tabPagePhoneBook.Controls.Add(this.checkBoxManualContactImagePathEntry);
this.tabPagePhoneBook.Controls.Add(this.buttonEditPhoneBook);
this.tabPagePhoneBook.Location = new System.Drawing.Point(4, 22);
@@ -193,9 +195,31 @@
this.tabPagePhoneBook.Text = "Phone book";
this.tabPagePhoneBook.UseVisualStyleBackColor = true;
//
+ // checkBoxSynchronizePhoneBook
+ //
+ this.checkBoxSynchronizePhoneBook.AutoSize = true;
+ this.checkBoxSynchronizePhoneBook.Location = new System.Drawing.Point(34, 33);
+ this.checkBoxSynchronizePhoneBook.Name = "checkBoxSynchronizePhoneBook";
+ this.checkBoxSynchronizePhoneBook.Size = new System.Drawing.Size(221, 17);
+ this.checkBoxSynchronizePhoneBook.TabIndex = 27;
+ this.checkBoxSynchronizePhoneBook.Text = "Synchronize phone book with FRITZ!Box";
+ this.checkBoxSynchronizePhoneBook.UseVisualStyleBackColor = true;
+ this.checkBoxSynchronizePhoneBook.CheckedChanged += new System.EventHandler(this.checkBoxSynchronizePhoneBook_CheckedChanged);
+ //
...
[truncated message content] |
|
From: <hor...@us...> - 2012-12-21 15:59:27
|
Revision: 4518
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4518&view=rev
Author: horned-reaper
Date: 2012-12-21 15:59:10 +0000 (Fri, 21 Dec 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/Docs/Changes.txt
trunk/plugins/FritzBox/Docs/Documentation/Call strings.xls
trunk/plugins/FritzBox/Docs/Vorgehensweise beim Update.txt
trunk/plugins/FritzBox/FritzBox/FritzBox.cs
trunk/plugins/FritzBox/FritzBox/FritzBox.csproj
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/CallAction.cs
trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/Caller.cs
trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/BackGroundWorker.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/Task.cs
trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Debug/GenerateResource-ResGen.read.1.tlog
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.FileListAbsolute.txt
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/FritzBoxConfigTester.csproj
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.csproj.FileListAbsolute.txt
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.csproj.FileListAbsolute.txt
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/FritzBoxDebugger.csproj
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.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/GenerateResource.read.1.tlog
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/GenerateResource.write.1.tlog
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.csproj.FileListAbsolute.txt
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/Tools/FritzBoxDebugger/obj/Release/GenerateResource.read.7.tlog
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.write.7.tlog
trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4517.mpe1
Removed Paths:
-------------
trunk/plugins/FritzBox/FritzBox/bin/Release/AxInterop.WMPLib.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/Bass.Net.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/BassRegistration.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/BassVisAPI.Net.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/Common.Utils.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/Core.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/Dialogs.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/DirectShowLib.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/Interop.SHDocVw.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/Interop.WMPLib.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/Ionic.Zip.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/MediaPortal.Support.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/Utils.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/edtftpnet-1.2.2.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/log4net.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/taglib-sharp.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Dialogs.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/Dialogs.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.read.6.tlog
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/GenerateResource.write.6.tlog
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2012-12-16 14:23:33 UTC (rev 4517)
+++ trunk/plugins/FritzBox/Build/Build.log 2012-12-21 15:59:10 UTC (rev 4518)
@@ -1,6 +1,6 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4463
+SVN Version: 4517
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 05.03.2012 21:32:52.
+Build started 21.12.2012 16:42:28.
Project "D:\FritzBox\FritzBox.sln" on node 1 (Rebuild target(s)).
ValidateSolutionConfiguration:
Building solution configuration "Release|Mixed Platforms".
@@ -47,23 +47,6 @@
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\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".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" to "bin\Release\Dialogs.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Utils.dll" to "bin\Release\Utils.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Bass.Net.dll" to "bin\Release\Bass.Net.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\DirectShowLib.dll" to "bin\Release\DirectShowLib.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\BassVisAPI.Net.dll" to "bin\Release\BassVisAPI.Net.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\taglib-sharp.dll" to "bin\Release\taglib-sharp.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\AxInterop.WMPLib.dll" to "bin\Release\AxInterop.WMPLib.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\edtftpnet-1.2.2.dll" to "bin\Release\edtftpnet-1.2.2.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\BassRegistration.dll" to "bin\Release\BassRegistration.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\MediaPortal.Support.dll" to "bin\Release\MediaPortal.Support.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Interop.WMPLib.dll" to "bin\Release\Interop.WMPLib.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Interop.SHDocVw.dll" to "bin\Release\Interop.SHDocVw.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\log4net.dll" to "bin\Release\log4net.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Ionic.Zip.dll" to "bin\Release\Ionic.Zip.dll".
CopyFilesToOutputDirectory:
Copying file from "obj\Release\FritzBox.dll" to "bin\Release\FritzBox.dll".
FritzBox -> D:\FritzBox\FritzBox\bin\Release\FritzBox.dll
@@ -102,9 +85,8 @@
_CopyFilesMarkedCopyLocal:
Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Core.dll" to ".\bin\Release\Core.dll".
Copying file from "D:\FritzBox\FritzBox\bin\Release\FritzBox.dll" to ".\bin\Release\FritzBox.dll".
- Copying file from "D:\FritzBox\FritzBox\bin\Release\Utils.dll" to ".\bin\Release\Utils.dll".
- Copying file from "D:\FritzBox\FritzBox\bin\Release\Dialogs.dll" to ".\bin\Release\Dialogs.dll".
- Copying file from "D:\FritzBox\FritzBox\bin\Release\Common.Utils.dll" to ".\bin\Release\Common.Utils.dll".
+ Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Utils.dll" to ".\bin\Release\Utils.dll".
+ 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\Bass.Net.dll" to ".\bin\Release\Bass.Net.dll".
Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\DirectShowLib.dll" to ".\bin\Release\DirectShowLib.dll".
Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\BassVisAPI.Net.dll" to ".\bin\Release\BassVisAPI.Net.dll".
@@ -114,8 +96,8 @@
Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\BassRegistration.dll" to ".\bin\Release\BassRegistration.dll".
Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\MediaPortal.Support.dll" to ".\bin\Release\MediaPortal.Support.dll".
Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Interop.WMPLib.dll" to ".\bin\Release\Interop.WMPLib.dll".
- Copying file from "D:\FritzBox\FritzBox\bin\Release\Interop.SHDocVw.dll" to ".\bin\Release\Interop.SHDocVw.dll".
- Copying file from "D:\FritzBox\FritzBox\bin\Release\log4net.dll" to ".\bin\Release\log4net.dll".
+ Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Interop.SHDocVw.dll" to ".\bin\Release\Interop.SHDocVw.dll".
+ Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\log4net.dll" to ".\bin\Release\log4net.dll".
Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Ionic.Zip.dll" to ".\bin\Release\Ionic.Zip.dll".
Copying file from "D:\FritzBox\FritzBox\bin\Release\FritzBox.pdb" to ".\bin\Release\FritzBox.pdb".
_CopyAppConfigFile:
@@ -153,8 +135,6 @@
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-ResGen.read.1.tlog".
- Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\GenerateResource-ResGen.write.1.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".
@@ -165,9 +145,8 @@
_CopyFilesMarkedCopyLocal:
Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Core.dll" to ".\bin\Release\Core.dll".
Copying file from "D:\FritzBox\FritzBox\bin\Release\FritzBox.dll" to ".\bin\Release\FritzBox.dll".
- Copying file from "D:\FritzBox\FritzBox\bin\Release\Utils.dll" to ".\bin\Release\Utils.dll".
- Copying file from "D:\FritzBox\FritzBox\bin\Release\Dialogs.dll" to ".\bin\Release\Dialogs.dll".
- Copying file from "D:\FritzBox\FritzBox\bin\Release\Common.Utils.dll" to ".\bin\Release\Common.Utils.dll".
+ Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Utils.dll" to ".\bin\Release\Utils.dll".
+ 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\Bass.Net.dll" to ".\bin\Release\Bass.Net.dll".
Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\DirectShowLib.dll" to ".\bin\Release\DirectShowLib.dll".
Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\BassVisAPI.Net.dll" to ".\bin\Release\BassVisAPI.Net.dll".
@@ -177,8 +156,8 @@
Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\BassRegistration.dll" to ".\bin\Release\BassRegistration.dll".
Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\MediaPortal.Support.dll" to ".\bin\Release\MediaPortal.Support.dll".
Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Interop.WMPLib.dll" to ".\bin\Release\Interop.WMPLib.dll".
- Copying file from "D:\FritzBox\FritzBox\bin\Release\Interop.SHDocVw.dll" to ".\bin\Release\Interop.SHDocVw.dll".
- Copying file from "D:\FritzBox\FritzBox\bin\Release\log4net.dll" to ".\bin\Release\log4net.dll".
+ Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Interop.SHDocVw.dll" to ".\bin\Release\Interop.SHDocVw.dll".
+ Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\log4net.dll" to ".\bin\Release\log4net.dll".
Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Ionic.Zip.dll" to ".\bin\Release\Ionic.Zip.dll".
Copying file from "D:\FritzBox\FritzBox\bin\Release\FritzBox.pdb" to ".\bin\Release\FritzBox.pdb".
_CopyAppConfigFile:
@@ -194,7 +173,7 @@
0 Warning(s)
0 Error(s)
-Time Elapsed 00:00:03.53
+Time Elapsed 00:00:05.44
Reverting to build 0
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
@@ -297,7 +276,7 @@
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
36 File(s) copied
MpeMaker version: 1.2.1.0
-Build started at 21:32:59
+Build started at 16:42:39
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Modified: trunk/plugins/FritzBox/Docs/Changes.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Changes.txt 2012-12-16 14:23:33 UTC (rev 4517)
+++ trunk/plugins/FritzBox/Docs/Changes.txt 2012-12-21 15:59:10 UTC (rev 4518)
@@ -1,8 +1,16 @@
-New release 1.0.0.44xx:
+New release 1.0.0.4517:
New feature:
+- if a phone number is entered to multiple contacts all names are shown on call notifications
-Optimization:
+Optimizations:
+- improved connection monitoring & restoring
+- corrections in Dutch language file
+- cleanup function for remote contact images folder
+- call list is updated after phone call
-Fixed bug:
+Fixed bugs:
+- settings are not saved when config dialog is directly opened (e. g. with PluginConfigLoader.exe)
+- call monitor connection is reported as error instead of info
+- on multiple simultaneous calls (ISDN) call notification can be handled wrongly
\ No newline at end of file
Modified: trunk/plugins/FritzBox/Docs/Documentation/Call strings.xls
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Docs/Vorgehensweise beim Update.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Vorgehensweise beim Update.txt 2012-12-16 14:23:33 UTC (rev 4517)
+++ trunk/plugins/FritzBox/Docs/Vorgehensweise beim Update.txt 2012-12-21 15:59:10 UTC (rev 4518)
@@ -1,12 +1,13 @@
1. \xC4nderungen in Visual Studio vornehmen
2. Build.bat ausf\xFChren
-3. Pr\xFCfen, ob Installer-Datei mit der korrekten Versionsnummer angelegt wurde. Beispiel:
+3. Pr\xFCfen, ob Installer-Datei mit der korrekten Versionsnummer unter "D:\FritzBox\releases" angelegt wurde. Beispiel:
- OK: FritzBox_v0.3.5.4364.mpe1
- Falsch: FritzBox_v0.3.5.0.mpe1
4. Wenn falsch, dann Installer-Datei l\xF6schen, SVN update ausf\xFChren und Build.bat erneut ausf\xFChren. Falls das auch nicht helfen sollte, Installer-Datei l\xF6schen, Commit ausf\xFChren und bei Punkt 2 fortfahren
5. \xC4nderungen auf MediaPortal-Webseite hochladen
- Versionsnummer
- - Change-Log-Eintrag
- neue Installer-Datei
- neue update.xml-Datei
-6. SVN Commit ausf\xFChren
\ No newline at end of file
+6. Change-Log-Eintrag in Wiki
+7. SVN Commit ausf\xFChren
+8. Update in beiden Foren ank\xFCndigen
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2012-12-16 14:23:33 UTC (rev 4517)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2012-12-21 15:59:10 UTC (rev 4518)
@@ -27,7 +27,6 @@
using System.IO;
using System.Reflection;
using System.Threading;
-using System.Xml.Serialization;
using FritzManager;
using MediaPortal.Configuration;
using MediaPortal.Dialogs;
@@ -68,6 +67,7 @@
private GUIDialogNotify _tempNotification;
private int notificationCount = 0;
private CallAction.CallType lastCallActionType; // necessary to avoid that notification window isn't closed on quick sequent call actions
+ private string currentConnectionID;
#endregion Variables
@@ -87,11 +87,17 @@
private void OnCallAction(CallAction callAction)
{
- lastCallActionType = callAction.Type;
+ callAction.WriteToLog();
- Log.Debug("OnCallAction()");
+ // verify that the call action is the same as the current handled call (if there is one)
+ if (currentConnectionID == null) currentConnectionID = callAction.ConnectionID;
+ else if (currentConnectionID != callAction.ConnectionID)
+ {
+ Log.Debug("Another call action is running (connection ID " + currentConnectionID + " is running. Call action is beeing ignored");
+ return;
+ }
- callAction.WriteToLog();
+ lastCallActionType = callAction.Type;
if (!_showNotification)
{
@@ -151,10 +157,21 @@
private void OnConnectedAction()
{
- fritz.Login();
+ // enable timers
+ sessionTimer.Start();
+ updateTimer.Start();
+ }
+ private void OnDisconnectedAction()
+ {
+ // disable timers
+ updateTimer.Stop();
+ sessionTimer.Stop();
+ }
+
+ private void OnLoggedInAction()
+ {
Log.Debug("Forcing data load after login");
-
loadDataInBackground();
}
@@ -175,15 +192,15 @@
if (isMSNEnabled(callAction.MSN)) // check if MSN is enabled
{
// find contact in phone book
- if (Settings.PhoneBookEnabled) callAction.Caller = phoneBook.FindContactEntry(callAction.Caller);
- PhoneBookItem phoneBookItem = callAction.Caller.PhoneBookItem;
+ if (Settings.PhoneBookEnabled) callAction.Caller = phoneBook.FindContactEntries(callAction.Caller);
+ PhoneBookItem[] phoneBookItems = callAction.Caller.MatchedPhoneBookItems;
// play sound
string incomingSoundPath = null;
if (callAction.Type == CallAction.CallType.Incoming)
{
- if (phoneBookItem != null && !String.IsNullOrEmpty(phoneBookItem.RingTonePath)) incomingSoundPath = phoneBookItem.RingTonePath;
+ if (phoneBookItems != null && phoneBookItems[0] != null && !String.IsNullOrEmpty(phoneBookItems[0].RingTonePath)) incomingSoundPath = phoneBookItems[0].RingTonePath;
else if (!String.IsNullOrEmpty(Settings.IncomingSoundPath)) incomingSoundPath = Settings.IncomingSoundPath;
if (!String.IsNullOrEmpty(incomingSoundPath) && File.Exists(incomingSoundPath))
@@ -215,11 +232,11 @@
}
else
{
- if (phoneBookItem != null)
+ if (phoneBookItems != null)
{
- if (Settings.ExtensiveLogging) Log.Info("Caller is identified by phone book as {0}", phoneBookItem.Name);
+ if (Settings.ExtensiveLogging) Log.Info("Caller is identified by phone book as {0}", callAction.Caller.MatchedPhoneBookEntryNamesAndPhoneTypes);
- if (phoneBookItem.ShowCallNotification) showNotification = true;
+ if (phoneBookItems[0] != null && phoneBookItems[0].ShowCallNotification) showNotification = true;
}
else if (Settings.ShowUnknownCaller) showNotification = true; // unknown caller
}
@@ -227,6 +244,7 @@
// configure call notificaton
if (showNotification)
{
+
string strHeading = string.Empty;
string strImage = string.Empty;
string strText = string.Empty;
@@ -250,10 +268,10 @@
if (callAction.Caller.PhoneNumber != String.Empty)
{
- if (phoneBookItem != null)
+ if (phoneBookItems != null)
{
- strText += phoneBookItem.Name + Environment.NewLine;
- if (Settings.ShowPhoneTypeOnNotification) strText += phoneBook.GetPhoneNumberTypeLabel(callAction.Caller.PhoneType) + Environment.NewLine;
+ strText += callAction.Caller.MatchedPhoneBookEntryNames + Environment.NewLine;
+ if (Settings.ShowPhoneTypeOnNotification) strText += callAction.Caller.MatchedPhoneBookEntryPhoneTypes + Environment.NewLine;
}
if (Settings.ShowPhoneNumberOnNotification) strText += callAction.Caller.PhoneNumber + Environment.NewLine;
@@ -262,6 +280,9 @@
// show call notification
showNotificationWindow(callAction.Type, strHeading, strImage, strText);
+
+ // update call list
+ worker.EnqueueTask(new Task(Task.TaskAction.LoadCallListItems, null));
}
}
}
@@ -451,7 +472,9 @@
notificationWindowCloseTimer.AutoReset = false;
notificationWindowCloseTimer.Elapsed += OnCloseNotificationWindowTimerEvent;
notificationWindowCloseTimer.Start();
- }
+ }
+
+ currentConnectionID = null;
}
else Log.Debug("Notification window wasn't opened");
}
@@ -480,10 +503,13 @@
// register events
Utils.OnStartExternal += OnStartExternal;
Utils.OnStopExternal += OnStopExternal;
+
FritzBoxClient.LogEvent += OnLogAction;
+ FritzBoxClient.ConnectedEvent += OnConnectedAction;
+ FritzBoxClient.DisconnectedEvent += OnDisconnectedAction;
FritzBoxClient.CallEvent += OnCallAction;
- FritzBoxClient.ConnectedEvent += OnConnectedAction;
- SystemEvents.PowerModeChanged += new PowerModeChangedEventHandler(SystemEvents_PowerModeChanged); // power mode changes (Standby & Hibernate)
+
+ Fritz.LoggedInEvent += OnLoggedInAction;
FritzBoxClient.StartClient();
@@ -496,10 +522,9 @@
phoneBook = new PhoneBook(fritz);
phoneBook.LoadPhoneBookFromXMLFile();
- // set session timer interval and start the timer
+ // set session timer interval
sessionTimer.Interval = 30000;
sessionTimer.Elapsed += OnSessionTimerEvent;
- sessionTimer.Start();
// set update timer interval and start the timer
int updateInterval = Settings.UpdateInterval;
@@ -524,15 +549,14 @@
FritzBoxClient.StopClient();
// unregister events
- FritzBoxClient.CallEvent -= OnCallAction;
FritzBoxClient.LogEvent -= OnLogAction;
-
FritzBoxClient.ConnectedEvent -= OnConnectedAction;
+ FritzBoxClient.CallEvent -= OnCallAction;
Utils.OnStartExternal -= OnStartExternal;
Utils.OnStopExternal -= OnStopExternal;
- SystemEvents.PowerModeChanged -= new PowerModeChangedEventHandler(SystemEvents_PowerModeChanged); // power changes
+ Fritz.LoggedInEvent += OnLoggedInAction;
}
#endregion IPlugin Interface
@@ -779,15 +803,13 @@
if (!Settings.ManualContactImagePathEntry && !String.IsNullOrEmpty(Settings.NASShareName)) worker.EnqueueTask(new Task(Task.TaskAction.SynchronizeContactImages, null));
worker.EnqueueTask(new Task(Task.TaskAction.UpdateGUIProperties, null));
- // reset update timer to get the countdown timer reset
+ // reset update timer to get the timer countdown reset
updateTimer.Stop();
updateTimer.Start();
}
private static void OnSessionTimerEvent(object source, System.Timers.ElapsedEventArgs e)
{
- Log.Debug("Processing session timer event");
-
if (fritz.LoggedIn)
{
fritz.KeepAlive();
@@ -836,7 +858,7 @@
public void LoadVoiceBoxItems()
{
- if (fritz.LoggedIn)
+ if (FritzBoxClient.Connected)
{
List<VoiceBoxItem> newVoiceBoxItemList = VBReader.loadVoiceBoxDir(Settings.VBPath);
@@ -895,10 +917,13 @@
{
if (Settings.CurrentMode == gUIMode && windowIsDisplayed)
{
+ Log.Debug("Refreshing view");
+
// remember selected list item position
int selectedListItemIndex = facadeView.SelectedListItemIndex;
if (Settings.CurrentMode == GUIMode.CallList) populateCallListItems();
+
else if (Settings.CurrentMode == GUIMode.VoiceBox) populateVoiceBoxItems();
else if (Settings.CurrentMode == GUIMode.PhoneBook)
{
@@ -978,7 +1003,7 @@
{
System.Diagnostics.Process proc = new System.Diagnostics.Process();
proc.EnableRaisingEvents = false;
- proc.StartInfo.FileName = "speexdec";
+ proc.StartInfo.FileName = "speexdec.exe";
string target = Path.GetTempPath() + item.seq + ".wav";
proc.StartInfo.Arguments = "\"" + Settings.VBPath + "\\rec\\" + item.filename + "\" \"" + target + "\"";
proc.StartInfo.WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden;
@@ -1074,7 +1099,7 @@
if (voiceBoxItem.type == 3)
{
GUIListItem elem = new GUIListItem();
- caller = phoneBook.FindContactEntry(voiceBoxItem.callerId);
+ caller = phoneBook.FindContactEntries(voiceBoxItem.callerId);
string mSNName = voiceBoxItem.mynumber;
@@ -1083,7 +1108,7 @@
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 + " (" + phoneBook.GetPhoneNumberTypeLabel(caller.PhoneType).ToLower() + ")";
+ if (caller.MatchedPhoneBookItems != null) callerName = caller.MatchedPhoneBookEntryNamesAndPhoneTypes;
else
{
if (caller.PhoneNumber != String.Empty) callerName = caller.PhoneNumber;
@@ -1126,11 +1151,11 @@
{
if (voiceBoxItem.type == 3)
{
- caller = phoneBook.FindContactEntry(voiceBoxItem.callerId);
+ caller = phoneBook.FindContactEntries(voiceBoxItem.callerId);
if (voiceBoxItem.isNew > 0)
{
- if (lastNewCallerName == String.Empty && caller.PhoneBookItem != null) lastNewCallerName = caller.PhoneBookItem.Name;
+ if (lastNewCallerName == String.Empty && caller.MatchedPhoneBookItems != null) lastNewCallerName = caller.MatchedPhoneBookEntryNamesAndPhoneTypes;
newVoiceBoxItemsCount++;
}
@@ -1189,7 +1214,7 @@
foreach (CallItem item in callItemList)
{
GUIListItem elem = new GUIListItem();
- Caller caller = phoneBook.FindContactEntry(item.number); ;
+ Caller caller = phoneBook.FindContactEntries(item.number); ;
i++;
@@ -1200,7 +1225,7 @@
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 + " (" + phoneBook.GetPhoneNumberTypeLabel(caller.PhoneType).ToLower() + ")";
+ if (caller.MatchedPhoneBookItems != null) elem.Label2 = caller.MatchedPhoneBookEntryNamesAndPhoneTypes;
else
{
if (caller.PhoneNumber != String.Empty) elem.Label2 = caller.PhoneNumber;
@@ -1578,31 +1603,6 @@
dlg.DoModal(GUIWindowManager.ActiveWindow);
}
- private void SystemEvents_PowerModeChanged(object sender, Microsoft.Win32.PowerModeChangedEventArgs e)
- {
- switch (e.Mode)
- {
- case PowerModes.Suspend:
- // disable timers
- updateTimer.Stop();
- sessionTimer.Stop();
-
- Log.Debug("Stopping client on Windows suspend to standby/hibernate");
- FritzBoxClient.StopClient();
- break;
-
- case PowerModes.Resume:
- Log.Debug("Windows has been resumed from standby/hibernate. Starting client");
- FritzBoxClient.StartClient();
-
- // enable timers
- sessionTimer.Start();
- updateTimer.Stop();
-
- break;
- }
- }
-
#endregion FritzManager
}
}
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.csproj
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.csproj 2012-12-16 14:23:33 UTC (rev 4517)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.csproj 2012-12-21 15:59:10 UTC (rev 4518)
@@ -83,12 +83,15 @@
<ItemGroup>
<Reference Include="Common.Utils">
<HintPath>C:\Program Files\Team MediaPortal\MediaPortal\Common.Utils.dll</HintPath>
+ <Private>False</Private>
</Reference>
<Reference Include="Core">
<HintPath>C:\Program Files\Team MediaPortal\MediaPortal\Core.dll</HintPath>
+ <Private>False</Private>
</Reference>
<Reference Include="Dialogs">
<HintPath>C:\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll</HintPath>
+ <Private>False</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -97,6 +100,7 @@
<Reference Include="System.Xml" />
<Reference Include="Utils">
<HintPath>C:\Program Files\Team MediaPortal\MediaPortal\Utils.dll</HintPath>
+ <Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2012-12-16 14:23:33 UTC (rev 4517)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2012-12-21 15:59:10 UTC (rev 4518)
@@ -182,6 +182,8 @@
Settings.UpdateInterval = Convert.ToInt16(updateInterval.Text);
Settings.Save();
+
+ MediaPortal.Profile.Settings.SaveCache(); // this avoids that settings are not saved when config dialog is directly opened (e. g. with FritzBoxConfigTester or PluginConfigLoader.exe)
}
#endregion
Modified: trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/CallAction.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/CallAction.cs 2012-12-16 14:23:33 UTC (rev 4517)
+++ trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/CallAction.cs 2012-12-21 15:59:10 UTC (rev 4518)
@@ -52,16 +52,18 @@
public Caller Caller { get; set; }
public string MSN { get; set; }
public string Extension { get; set; }
+ public string ConnectionID { get; set; }
public void WriteToLog()
{
- Log.Info("Call action info:");
+ Log.Info("Call action:");
Log.Info(" Call type: {0}", Type.ToString());
Log.Info(" Date: {0}", Time.ToShortDateString());
Log.Info(" Time: {0}", Time.ToLongTimeString());
if (Settings.ExtensiveLogging && (Type == CallType.Incoming || Type == CallType.Outgoing)) Log.Info(" Caller: {0}", Caller.PhoneNumber);
if (Settings.ExtensiveLogging && (Type == CallType.Incoming || Type == CallType.Outgoing)) Log.Info(" MSN: {0}", MSN);
if (Type == CallType.Outgoing || Type == CallType.ConnectionStarted) Log.Info(" Extension: {0}", Extension.ToString());
+ if (Settings.ExtensiveLogging) Log.Info(" Connection ID: {0}", ConnectionID);
}
}
}
Modified: trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/Caller.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/Caller.cs 2012-12-16 14:23:33 UTC (rev 4517)
+++ trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/Caller.cs 2012-12-21 15:59:10 UTC (rev 4518)
@@ -34,7 +34,10 @@
}
public string PhoneNumber { get; set; }
- public FritzManager.PhoneBookItem PhoneBookItem { get; set; }
- public string PhoneType { get; set; }
+ public FritzManager.PhoneBookItem[] MatchedPhoneBookItems { get; set; }
+ public string[] PhoneTypes { get; set; }
+ public string MatchedPhoneBookEntryNames { get; set; }
+ public string MatchedPhoneBookEntryPhoneTypes { get; set; }
+ public string MatchedPhoneBookEntryNamesAndPhoneTypes { get; set; }
}
}
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs 2012-12-16 14:23:33 UTC (rev 4517)
+++ trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs 2012-12-21 15:59:10 UTC (rev 4518)
@@ -26,6 +26,7 @@
using System.Net.Sockets;
using System.Text;
using System.Threading;
+using Microsoft.Win32;
namespace FritzBox
{
@@ -48,7 +49,7 @@
private class StateObject
{
/// <summary>
- /// Size of receive buffer.
+ /// Size of receive buffer
/// </summary>
public const int BufferSize = 256;
@@ -58,12 +59,12 @@
public readonly byte[] buffer = new byte[BufferSize];
/// <summary>
- /// Received data string.
+ /// Received data string
/// </summary>
public StringBuilder sb = new StringBuilder();
/// <summary>
- /// Client socket.
+ /// Client socket
/// </summary>
public Socket workSocket;
}
@@ -75,22 +76,25 @@
public delegate void CallEventHandler(CallAction callAction);
public delegate void LogEventHandler(LogLevel logLevel, string logMessage);
public delegate void ConnectedEventHandler();
+ public delegate void DisconnectedEventHandler();
#endregion Delegates
private static readonly TimeSpan minConnectWaitTime = new TimeSpan(0, 0, 30);
private static Socket _client;
private static DateTime _connectionFailed;
- private static bool _stopIsRequested;
+ private static bool _disconnectIsInProgress;
private static Thread thread;
private static ManualResetEvent connectDone = new ManualResetEvent(false); // ensures that the thread doesn't end before the socket is connected (avoids error message "A request to send or receive data was disallowed because the socket is not connected and (when sending on a datagram socket using a sendto call) no address was supplied")
+ private static System.Timers.Timer connectionCheckTimer = new System.Timers.Timer();
+ private static IPEndPoint remoteEP;
#region Properties
static FritzBoxClient()
{
- Address = "fritz.box";
- Port = 1012;
+ connectionCheckTimer.Interval = 30000;
+ connectionCheckTimer.Elapsed += OnConnectionCheckTimerEvent;
}
public static string Address { get; set; }
@@ -102,55 +106,42 @@
public static event CallEventHandler CallEvent;
public static event LogEventHandler LogEvent;
public static event ConnectedEventHandler ConnectedEvent;
+ public static event DisconnectedEventHandler DisconnectedEvent;
#region Public methods
public static void StartClient()
{
- _stopIsRequested = false;
- Log(LogLevel.Debug, "Starting call monitor");
-
- try
+ if (_client == null)
{
- _connectionFailed = DateTime.MinValue;
- thread = new Thread(Connect);
- thread.Start();
- }
- catch (Exception ex)
- {
- Log(LogLevel.Debug, "Thread could not be started: {0}", ex.Message);
- }
- }
+ // start monitoring Windows power mode changes (Standby & Hibernate)
+ SystemEvents.PowerModeChanged += new PowerModeChangedEventHandler(OnPowerModeChanged);
- public static void StopClient()
- {
- if (_client != null || thread != null)
- {
- _stopIsRequested = true;
+ Log(LogLevel.Debug, "Starting call monitor");
- Log(LogLevel.Debug, "Stopping call monitor");
-
- if (thread != null && thread.ThreadState == ThreadState.WaitSleepJoin) thread.Interrupt();
-
try
{
- if (_client != null)
- {
- // release the socket
- _client.Shutdown(SocketShutdown.Both);
- _client.Close();
- }
+ _connectionFailed = DateTime.MinValue;
+ thread = new Thread(Connect);
+ thread.Start();
}
catch (Exception ex)
{
- Log(LogLevel.Error, "Error on stopping client: {0}", ex.Message);
+ Log(LogLevel.Debug, "Thread could not be started: {0}", ex.Message);
}
-
- Connected = false;
- connectDone.Reset();
}
}
+ public static void StopClient()
+ {
+ Disconnect();
+
+ // stop monitoring Windows power mode changes (Standby & Hibernate)
+ SystemEvents.PowerModeChanged -= new PowerModeChangedEventHandler(OnPowerModeChanged);
+
+ _client = null; // necessary to check if call monitor is already started
+ }
+
public static bool TestConnection()
{
try
@@ -193,43 +184,42 @@
private static void ReConnect()
{
- if (!_stopIsRequested)
+ Disconnect();
+
+ try
{
- connectDone.Reset();
+ _connectionFailed = DateTime.Now;
- try
- {
- _connectionFailed = DateTime.Now;
-
- thread = new Thread(Connect);
- thread.Start();
- }
- catch (Exception ex)
- {
- Log(LogLevel.Debug, "Thread could not be started: {0}", ex.Message);
- }
+ thread = new Thread(Connect);
+ thread.Start();
}
+ catch (Exception ex)
+ {
+ Log(LogLevel.Debug, "Thread could not be started: {0}", ex.Message);
+ }
}
private static void Connect()
{
- // enforce a minimum wait time between connects
- DateTime nextConnect = _connectionFailed.Add(minConnectWaitTime);
+ _disconnectIsInProgress = false;
- if (DateTime.Now < nextConnect)
+ if (!Connected)
{
- TimeSpan waitTime = nextConnect - DateTime.Now;
- Log(LogLevel.Info, "Waiting {0} seconds before reconnecting", waitTime.Seconds);
+ // enforce a minimum wait time between connects
+ DateTime nextConnect = _connectionFailed.Add(minConnectWaitTime);
- try
+ if (DateTime.Now < nextConnect)
{
- Thread.Sleep(waitTime);
+ TimeSpan waitTime = nextConnect - DateTime.Now;
+ Log(LogLevel.Info, "Waiting {0} seconds before reconnecting", waitTime.Seconds);
+
+ try
+ {
+ Thread.Sleep(waitTime);
+ }
+ catch (ThreadInterruptedException) { } // allow sleep interruption through stop method
}
- catch (ThreadInterruptedException) { } // allow sleep interruption through stop method
- }
- if (!_stopIsRequested)
- {
Log(LogLevel.Info, "Connecting");
// establish the remote endpoint for the socket
@@ -247,13 +237,13 @@
}
IPAddress ipAddress = ipHostInfo.AddressList[0];
- IPEndPoint remoteEP = new IPEndPoint(ipAddress, Port);
+ remoteEP = new IPEndPoint(ipAddress, Port);
// create a TCP/IP socket
_client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
// connect to the remote endpoint
- if (!_stopIsRequested)
+ if (!_disconnectIsInProgress)
{
_client.BeginConnect(Address, Port, ConnectCallback, _client);
connectDone.WaitOne();
@@ -261,6 +251,42 @@
}
}
+ private static void Disconnect()
+ {
+ if (Connected)
+ {
+ Log(LogLevel.Debug, "Disconnecting call monitor");
+
+ _disconnectIsInProgress = true;
+
+ connectionCheckTimer.Stop(); // avoids reconnecting through connection check timer
+
+ if (_client != null || thread != null)
+ {
+ if (thread != null && thread.ThreadState == ThreadState.WaitSleepJoin) thread.Interrupt();
+
+ try
+ {
+ // release the socket
+ _client.Shutdown(SocketShutdown.Both);
+ _client.Close();
+ }
+ catch (Exception ex)
+ {
+ Log(LogLevel.Error, "Error on disconnecting call monitor: {0}", ex.Message);
+ }
+ }
+
+ Log(LogLevel.Info, "Call monitor is disconnected");
+
+ Connected = false;
+ connectDone.Reset();
+
+ // raise event
+ if (DisconnectedEvent != null) DisconnectedEvent(); // the Configuration tool doesn't use this event
+ }
+ }
+
private static void ConnectCallback(IAsyncResult ar)
{
try
@@ -274,18 +300,20 @@
// signal that the connection has been made
connectDone.Set();
- Log(LogLevel.Error, "Call monitor is connected with {0}", client.RemoteEndPoint.ToString());
+ Log(LogLevel.Info, "Call monitor is connected with {0}", client.RemoteEndPoint.ToString());
Receive(client);
Connected = true;
// raise event
- if (ConnectedEvent != null) ConnectedEvent(); // the Configuration tool doesn't use the ConnectedEvent
+ if (ConnectedEvent != null) ConnectedEvent(); // the Configuration tool doesn't use this event
+
+ // start connection monitoring. Since the socket does not detect connection interruptions it's necessary to monitor it by another thread
+ connectionCheckTimer.Start();
}
catch (SocketException)
{
- Connected = false;
Log(LogLevel.Error, "Connecting failed: Socket Exception");
ReConnect();
}
@@ -308,8 +336,6 @@
}
catch (SocketException ex)
{
- Connected = false;
-
Log(LogLevel.HeavyDebug, "{0}", ex.NativeErrorCode);
Log(LogLevel.HeavyDebug, "{0}", ex.SocketErrorCode);
Log(LogLevel.HeavyDebug, "{0}", ex.Data);
@@ -324,8 +350,8 @@
}
catch (Exception ex)
{
- Connected = false;
Log(LogLevel.Debug, "Receiving failed: {0}", ex.Message);
+ ReConnect();
}
}
@@ -339,7 +365,8 @@
// read data from the remote device
int bytesRead = 0;
- if (!_stopIsRequested) bytesRead = client.EndReceive(ar);
+
+ if (!_disconnectIsInProgress) bytesRead = client.EndReceive(ar);
else return;
if (bytesRead > 0)
@@ -375,22 +402,26 @@
{
case "RING":
callAction.Type = CallAction.CallType.Incoming;
+ callAction.ConnectionID = propertiesList[2];
callAction.Caller.PhoneNumber = propertiesList[3];
callAction.MSN = propertiesList[4];
break;
case "CALL":
callAction.Type = CallAction.CallType.Outgoing;
+ callAction.ConnectionID = propertiesList[2];
callAction.Caller.PhoneNumber = propertiesList[5];
callAction.MSN = propertiesList[4];
callAction.Extension = propertiesList[3]; // Nebenstelle
break;
case "CONNECT":
callAction.Type = CallAction.CallType.ConnectionStarted;
+ callAction.ConnectionID = propertiesList[2];
callAction.Caller.PhoneNumber = propertiesList[4];
callAction.Extension = propertiesList[3]; // Nebenstelle
break;
case "DISCONNECT":
callAction.Type = CallAction.CallType.ConnectionClosed;
+ callAction.ConnectionID = propertiesList[2];
break;
default:
callAction = null;
@@ -403,26 +434,24 @@
}
else
{
- Connected = false;
Log(LogLevel.Error, "Receiving callback failed: No bytes to read");
ReConnect();
}
}
catch (ObjectDisposedException)
{
- Connected = false;
Log(LogLevel.Error, "Receiving callback failed: Object Disposed Exeption");
+ ReConnect();
}
catch (SocketException)
{
- Connected = false;
Log(LogLevel.Error, "Receiving callback failed: Socket Exception");
ReConnect();
}
catch (Exception ex)
{
- Connected = false;
Log(LogLevel.Debug, "Receiving failed: {0}", ex.Message);
+ ReConnect();
}
}
@@ -436,6 +465,44 @@
if (LogEvent != null) LogEvent(LogLevel.Error, ex.ToString());
}
+ private static void OnConnectionCheckTimerEvent(object source, System.Timers.ElapsedEventArgs e)
+ {
+ Socket socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+
+ try
+ {
+ connectionCheckTimer.Stop(); // avoid that the connection check is run multiple
+
+ // check connection
+ Log(LogLevel.Debug, "Checking connection");
+ socket.Connect(remoteEP);
+ Log(LogLevel.Debug, "Connection is OK");
+
+ connectionCheckTimer.Start();
+ }
+ catch
+ {
+ Log(LogLevel.Debug, "Connection has been lost");
+ ReConnect();
+ }
+ }
+
+ private static void OnPowerModeChanged(object sender, Microsoft.Win32.PowerModeChangedEventArgs e)
+ {
+ switch (e.Mode)
+ {
+ case PowerModes.Suspend:
+ Log(LogLevel.Debug, "Windows is suspending to standby/hibernate");
+ Disconnect();
+ break;
+
+ case PowerModes.Resume:
+ Log(LogLevel.Debug, "Windows has been resumed from standby/hibernate");
+ Connect();
+ break;
+ }
+ }
+
#endregion Private methods
}
}
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/BackGroundWorker.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/BackGroundWorker.cs 2012-12-16 14:23:33 UTC (rev 4517)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/BackGroundWorker.cs 2012-12-21 15:59:10 UTC (rev 4518)
@@ -1,17 +1,18 @@
using System;
using System.Collections;
using System.Collections.Generic;
+using System.Threading;
namespace FritzManager
{
/// <summary>
- /// Description of BackGroundWorker.
+ /// Description of BackGroundWorker
/// </summary>
public class BackGroundWorker
{
- static Logger Log = LoggerFactory.getLogger("BackGroundWorker");
+ public bool Running { get; private set; }
- public bool Running { get; private set; }
+ private static Logger Log = LoggerFactory.getLogger("BackGroundWorker");
private FritzBox.FritzBox plugin;
private BlockingQueue queue = new BlockingQueue();
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs 2012-12-16 14:23:33 UTC (rev 4517)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs 2012-12-21 15:59:10 UTC (rev 4518)
@@ -8,7 +8,7 @@
namespace FritzManager
{
/// <summary>
- /// Model of one call item record. read from fritz csv exports
+ /// Model of one call item record. read from fritz CSV exports
/// </summary>
public class CallItem : System.IEquatable<CallItem>
{
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs 2012-12-16 14:23:33 UTC (rev 4517)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs 2012-12-21 15:59:10 UTC (rev 4518)
@@ -9,10 +9,16 @@
namespace FritzManager
{
/// <summary>
- /// class for communication with FritzBox.
+ /// class for communication with FritzBox
/// </summary>
public class Fritz
{
+ #region Delegates
+
+ public delegate void LoggedInEventHandler();
+
+ #endregion Delegates
+
private string hostname;
private string baseurl;
private bool loggedIn;
@@ -21,7 +27,6 @@
private string cacheFileName;
private string sid;
//private bool useSidAuthentication = true;
- private DateTime lastCallListUpdate = DateTime.Now.AddMinutes(-20.0);
private string dialport;
static Logger Log = LoggerFactory.getLogger("Fritz");
@@ -34,11 +39,14 @@
this.cacheDir = cacheDir;
this.cacheFileName = cacheDir + "\\FritzBox-CallList.csv";
this.dialport = dialport;
-
- // start monitoring Windows power mode changes (Standby & Hibernate)
- SystemEvents.PowerModeChanged += new PowerModeChangedEventHandler(SystemEvents_PowerModeChanged);
+
+ // start monitoring connection state changes
+ FritzBox.FritzBoxClient.ConnectedEvent += new FritzBox.FritzBoxClient.ConnectedEventHandler(OnConnectedEvent);
+ FritzBox.FritzBoxClient.DisconnectedEvent += new FritzBox.FritzBoxClient.DisconnectedEventHandler(OnDisconnectedEvent);
}
+ public static event LoggedInEventHandler LoggedInEvent;
+
public bool LoggedIn
{
get
@@ -73,6 +81,8 @@
loggedIn = sid != null;
Log.Info("Successfully logged in to FRITZ!Box");
+
+ LoggedInEvent(); // raise event
}
else
{
@@ -95,7 +105,7 @@
}
catch (WebException)
{
- Log.Debug("No connection to FRITZ!Box. Keepalive heartbeat could not be sen...
[truncated message content] |
|
From: <hor...@us...> - 2013-03-09 09:19:42
|
Revision: 4529
http://sourceforge.net/p/mp-plugins/code/4529
Author: horned-reaper
Date: 2013-03-09 09:19:37 +0000 (Sat, 09 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/Docs/Changes.txt
trunk/plugins/FritzBox/FritzBox/FritzBox.cs
trunk/plugins/FritzBox/FritzBox/FritzBox.csproj
trunk/plugins/FritzBox/FritzBox/FritzBox.csproj.user
trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs
trunk/plugins/FritzBox/FritzBox/Properties/Resources.Designer.cs
trunk/plugins/FritzBox/FritzBox/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.Properties.Resources.resources
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
trunk/plugins/FritzBox/FritzBox.sln
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/FritzBoxConfigTester.csproj
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/FritzBoxConfigTester.csproj.user
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/app.config
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.exe.config
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/FritzBoxDebugger.csproj
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/app.config
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/Common.Utils.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/Dialogs.dll
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.exe.config
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/Utils.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.DebugForm.resources
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
Added Paths:
-----------
trunk/plugins/FritzBox/Archived code/FritzBox.cs
trunk/plugins/FritzBox/Docs/Documentation/AVM_Technical_Note_-_Session_ID.pdf
trunk/plugins/FritzBox/FritzBox/Skin/Titan/
trunk/plugins/FritzBox/FritzBox/Skin/Titan/FritzManager.xml
trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/
trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/
trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/CallMonitor.Missing.png
trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/CallMonitor.Unknown.png
trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/Phone_Icon_Home.png
trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/Phone_Icon_Mobile.png
trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/Phone_Icon_Work.png
trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/callin.png
trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/callout.png
trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/icon_fritz.png
trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/rejected.png
trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/hover_fritzbox.png
trunk/plugins/FritzBox/FritzBox/Skin/Titan/common.facade.fritz.xml
trunk/plugins/FritzBox/FritzBox/Skin/Titan/common.fritz.xml
trunk/plugins/FritzBox/FritzBox/bin/x64/
trunk/plugins/FritzBox/FritzBox/bin/x64/Release/
trunk/plugins/FritzBox/FritzBox/bin/x64/Release/Dialogs.dll
trunk/plugins/FritzBox/FritzBox/bin/x64/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/bin/x64/Release/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.GenerateResource.Cache
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csproj.GenerateResource.Cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csprojResolveAssemblyReference.cache
Removed Paths:
-------------
trunk/plugins/FritzBox/FritzBox/bin/Debug Configuration/
trunk/plugins/FritzBox/FritzBox/obj/Debug Configuration/
trunk/plugins/FritzBox/FritzBox/obj/Release/
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug Configuration/
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug Configuration/
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug Configuration/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug Configuration/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/
Added: trunk/plugins/FritzBox/Archived code/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/Archived code/FritzBox.cs (rev 0)
+++ trunk/plugins/FritzBox/Archived code/FritzBox.cs 2013-03-09 09:19:37 UTC (rev 4529)
@@ -0,0 +1,22 @@
+ public void Refresh()
+ {
+ if (loggedIn)
+ {
+ TimeSpan ts = (DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0));
+ long unixTime = Convert.ToInt32(ts.TotalSeconds);
+ string refreshUrl = baseurl + "?sid=" + sid + "&getpage=..%2Fhtml%2Fde%2Fmenus%2Fmenu2.html&errorpage=..%2Fhtml%2Fde%2Fmenus%2Fmenu2.html&var%3Apagename=foncalls&var%3Aerrorpagename=foncalls&var%3Amenu=home&var%3Apagemaster=&var%3Aactivtype=pppoe&var%3AtabInetstat=0&var%3Aweckernr=&logger%3Asettings%2Ffilter=2";
+
+ Log.Debug("Sending refresh request, time = " + Convert.ToString(unixTime));
+
+ WebClient client = new WebClient();
+
+ try
+ {
+ client.DownloadData(refreshUrl);
+ }
+ catch (WebException)
+ {
+ Log.Debug("Refresh request could not be sent");
+ }
+ }
+ }
\ No newline at end of file
Modified: trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat
===================================================================
--- trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat 2013-03-07 21:16:50 UTC (rev 4528)
+++ trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat 2013-03-09 09:19:37 UTC (rev 4529)
@@ -1,4 +1,4 @@
-@echo off
+:@echo off
D:
cd \FritzBox\Build
@@ -58,7 +58,6 @@
echo.
echo Building MpeExtension package including update.xml...
-del "..\MpeRelease\update.xml" /Q
"%ProgramDir%\Team MediaPortal\MediaPortal\MpeMaker.exe" "..\MpeRelease\FritzBox.xmp2" /V=%version% /B /UpdateXML >> %LOG%
echo.
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2013-03-07 21:16:50 UTC (rev 4528)
+++ trunk/plugins/FritzBox/Build/Build.log 2013-03-09 09:19:37 UTC (rev 4529)
@@ -1,179 +1,172 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4517
+SVN Version: 4523
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\Tools\FritzBoxConfigTester\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\Tools\FritzBoxDebugger\Properties\AssemblyInfo.cs
-Microsoft (R) Build Engine Version 4.0.30319.1
-[Microsoft .NET Framework, Version 4.0.30319.239]
-Copyright (C) Microsoft Corporation 2007. All rights reserved.
+Microsoft (R)-Buildmodul, Version 4.0.30319.17929
+[Microsoft .NET Framework, Version 4.0.30319.18033]
+Copyright (C) Microsoft Corporation. Alle Rechte vorbehalten.
-Build started 21.12.2012 16:42:28.
-Project "D:\FritzBox\FritzBox.sln" on node 1 (Rebuild target(s)).
+Die Projekte in dieser Projektmappe werden nacheinander erstellt. Um eine parallele Erstellung zu erm\x94glichen, m\x81ssen Sie den Schalter "/m" hinzuf\x81gen.
+Der Buildvorgang wurde am 09.03.2013 08:38:58 gestartet.
+Projekt "D:\FritzBox\FritzBox.sln" auf Knoten "1", Rebuild Ziel(e).
ValidateSolutionConfiguration:
- Building solution configuration "Release|Mixed Platforms".
-Project "D:\FritzBox\FritzBox.sln" (1) is building "D:\FritzBox\FritzBox\FritzBox.csproj" (2) on node 1 (Rebuild target(s)).
+ Die Projektmappenkonfiguration "Release|Mixed Platforms" wird erstellt.
+Das Projekt "D:\FritzBox\FritzBox.sln" (1) erstellt "D:\FritzBox\FritzBox\FritzBox.csproj" (2) auf Knoten "1", Rebuild Ziel(e).
CoreClean:
- Deleting file "D:\FritzBox\FritzBox\bin\Release\FritzBox.dll".
- Deleting file "D:\FritzBox\FritzBox\bin\Release\FritzBox.pdb".
- Deleting file "D:\FritzBox\FritzBox\bin\Release\Common.Utils.dll".
- Deleting file "D:\FritzBox\FritzBox\bin\Release\Core.dll".
- Deleting file "D:\FritzBox\FritzBox\bin\Release\Dialogs.dll".
- Deleting file "D:\FritzBox\FritzBox\bin\Release\Utils.dll".
- Deleting file "D:\FritzBox\FritzBox\bin\Release\AxInterop.WMPLib.dll".
- Deleting file "D:\FritzBox\FritzBox\bin\Release\Ionic.Zip.dll".
- Deleting file "D:\FritzBox\FritzBox\bin\Release\log4net.dll".
- Deleting file "D:\FritzBox\FritzBox\bin\Release\DirectShowLib.dll".
- Deleting file "D:\FritzBox\FritzBox\bin\Release\edtftpnet-1.2.2.dll".
- Deleting file "D:\FritzBox\FritzBox\bin\Release\Interop.WMPLib.dll".
- Deleting file "D:\FritzBox\FritzBox\bin\Release\taglib-sharp.dll".
- Deleting file "D:\FritzBox\FritzBox\bin\Release\Interop.SHDocVw.dll".
- Deleting file "D:\FritzBox\FritzBox\bin\Release\BassRegistration.dll".
- Deleting file "D:\FritzBox\FritzBox\bin\Release\Bass.Net.dll".
- Deleting file "D:\FritzBox\FritzBox\bin\Release\BassVisAPI.Net.dll".
- Deleting file "D:\FritzBox\FritzBox\bin\Release\MediaPortal.Support.dll".
- Deleting file "D:\FritzBox\FritzBox\obj\Release\ResolveAssemblyReference.cache".
- Deleting file "D:\FritzBox\FritzBox\obj\Release\FritzBox.Properties.Resources.resources".
- Deleting file "D:\FritzBox\FritzBox\obj\Release\FritzBox.FritzBoxConfig.resources".
- Deleting file "D:\FritzBox\FritzBox\obj\Release\FritzBox.dll".
- Deleting file "D:\FritzBox\FritzBox\obj\Release\FritzBox.pdb".
- Deleting file "D:\FritzBox\FritzBox\obj\Release\FritzBox.editPhoneBook.resources".
- Deleting file "D:\FritzBox\FritzBox\obj\Release\GenerateResource-ResGen.read.1.tlog".
- Deleting file "D:\FritzBox\FritzBox\obj\Release\GenerateResource-ResGen.read.4.tlog".
- Deleting file "D:\FritzBox\FritzBox\obj\Release\GenerateResource-ResGen.write.1.tlog".
+ Die Datei "D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.dll" wird gel\x94scht.
+ Die Datei "D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.pdb" wird gel\x94scht.
+ Die Datei "D:\FritzBox\FritzBox\bin\x64\Release\Dialogs.dll" wird gel\x94scht.
+ Die Datei "D:\FritzBox\FritzBox\obj\x64\Release\FritzBox.csprojResolveAssemblyReference.cache" wird gel\x94scht.
+ Die Datei "D:\FritzBox\FritzBox\obj\x64\Release\FritzBox.EditPhoneBook.resources" wird gel\x94scht.
+ Die Datei "D:\FritzBox\FritzBox\obj\x64\Release\FritzBox.Properties.Resources.resources" wird gel\x94scht.
+ Die Datei "D:\FritzBox\FritzBox\obj\x64\Release\FritzBox.FritzBoxConfig.resources" wird gel\x94scht.
+ Die Datei "D:\FritzBox\FritzBox\obj\x64\Release\FritzBox.csproj.GenerateResource.Cache" wird gel\x94scht.
+ Die Datei "D:\FritzBox\FritzBox\obj\x64\Release\FritzBox.dll" wird gel\x94scht.
+ Die Datei "D:\FritzBox\FritzBox\obj\x64\Release\FritzBox.pdb" wird gel\x94scht.
+C:\Windows\Microsoft.NET\Framework\v4.0.30319\Microsoft.Common.targets(1578,5): warning MSB3270: Konflikt zwischen Prozessorarchitektur des Projekts "AMD64", das erstellt wird, und der Prozessorarchitektur des Verweises, "Common.Utils, Version=1.2.200.0, Culture=neutral, processorArchitecture=x86", "x86". Dieser Konflikt kann zu Laufzeitfehlern f\x81hren. \x8Endern Sie ggf. mithilfe des Konfigurations-Managers die als Ziel angegebene Prozessorarchitektur Ihres Projekts so, dass die Prozessorarchitekturen zwischen Ihrem Projekt und den Verweisen ausgerichtet werden, oder w\x84hlen Sie eine Abh\x84ngigkeit von Verweisen mit einer Prozessorarchitektur, die der als Ziel angegebene Prozessorarchitektur Ihres Projekts entspricht. [D:\FritzBox\FritzBox\FritzBox.csproj]
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
+ C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\ResGen.exe /useSourcePath /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Common.Utils.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" /r:C:\Windows\Microsoft.NET\Framework64\v2.0.50727\mscorlib.dll /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Core.dll" /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Data.dll /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Data.Linq.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 (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Xml.Linq.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Utils.dll" /compile EditPhoneBook.resx,obj\x64\Release\FritzBox.EditPhoneBook.resources Properties\Resources.resx,obj\x64\Release\FritzBox.Properties.Resources.resources FritzBoxConfig.resx,obj\x64\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\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
+ C:\Windows\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /platform:x64 /errorreport:prompt /define:TRACE /highentropyva- /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Common.Utils.dll" /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" /reference:C:\Windows\Microsoft.NET\Framework64\v2.0.50727\mscorlib.dll /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Core.dll" /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Data.dll /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Data.Linq.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 (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Xml.Linq.dll" /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Utils.dll" /debug:pdbonly /filealign:4096 /optimize+ /out:obj\x64\Release\FritzBox.dll /resource:obj\x64\Release\FritzBox.EditPhoneBook.resources /resource:obj\x64\Release\FritzBox.Properties.Resources.resources /resource:obj\x64\Release\FritzBox.FritzBoxConfig.resources /resource:FritzBox.png,FritzBox.FritzBox.png /resource:FritzBoxDisabled.png,FritzBox.FritzBoxDisabled.png /target:library /warnaserror- /utf8output 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
+CSC : warning CS1607: Assemblygenerierung -- Die Assembly Common.Utils.dll, auf die verwiesen wird, hat einen anderen Zielprozessor. [D:\FritzBox\FritzBox\FritzBox.csproj]
+CSC : warning CS1607: Assemblygenerierung -- Die Assembly System.Data.dll, auf die verwiesen wird, hat einen anderen Zielprozessor. [D:\FritzBox\FritzBox\FritzBox.csproj]
+_CopyFilesMarkedCopyLocal:
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" in "bin\x64\Release\Dialogs.dll" kopiert.
CopyFilesToOutputDirectory:
- Copying file from "obj\Release\FritzBox.dll" to "bin\Release\FritzBox.dll".
- FritzBox -> D:\FritzBox\FritzBox\bin\Release\FritzBox.dll
- Copying file from "obj\Release\FritzBox.pdb" to "bin\Release\FritzBox.pdb".
-Done Building Project "D:\FritzBox\FritzBox\FritzBox.csproj" (Rebuild target(s)).
-Project "D:\FritzBox\FritzBox.sln" (1) is building "D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj" (3) on node 1 (Rebuild target(s)).
+ Die Datei wird von "obj\x64\Release\FritzBox.dll" in "bin\x64\Release\FritzBox.dll" kopiert.
+ FritzBox -> D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.dll
+ Die Datei wird von "obj\x64\Release\FritzBox.pdb" in "bin\x64\Release\FritzBox.pdb" kopiert.
+Die Erstellung des Projekts "D:\FritzBox\FritzBox\FritzBox.csproj" ist abgeschlossen, Rebuild Ziel(e).
+Das Projekt "D:\FritzBox\FritzBox.sln" (1) erstellt "D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj" (3) auf Knoten "1", Rebuild Ziel(e).
CoreClean:
- Deleting file "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\FritzBoxConfigTester.exe.config".
- Deleting file "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\FritzBoxConfigTester.exe".
- Deleting file "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\FritzBoxConfigTester.pdb".
- Deleting file "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\Core.dll".
- Deleting file "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\FritzBox.dll".
- Deleting file "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\Utils.dll".
- Deleting file "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\Common.Utils.dll".
- Deleting file "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\Dialogs.dll".
- Deleting file "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\Bass.Net.dll".
- Deleting file "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\DirectShowLib.dll".
- Deleting file "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\BassVisAPI.Net.dll".
- Deleting file "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\taglib-sharp.dll".
- Deleting file "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\AxInterop.WMPLib.dll".
- Deleting file "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\edtftpnet-1.2.2.dll".
- Deleting file "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\BassRegistration.dll".
- Deleting file "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\MediaPortal.Support.dll".
- Deleting file "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\Interop.WMPLib.dll".
- Deleting file "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\Interop.SHDocVw.dll".
- Deleting file "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\log4net.dll".
- Deleting file "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\Ionic.Zip.dll".
- Deleting file "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\FritzBox.pdb".
- Deleting file "D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\ResolveAssemblyReference.cache".
- Deleting file "D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.exe".
- Deleting file "D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.pdb".
-GenerateTargetFrameworkMonikerAttribute:
-Skipping target "GenerateTargetFrameworkMonikerAttribute" because all output files are up-to-date with respect to the input files.
+ Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\FritzBoxConfigTester.exe.config" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\FritzBoxConfigTester.exe" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\FritzBoxConfigTester.pdb" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\FritzBox.dll" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\FritzBox.pdb" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\Utils.dll" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\Dialogs.dll" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\Common.Utils.dll" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\Bass.Net.dll" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\DirectShowLib.dll" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\BassVisAPI.Net.dll" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\taglib-sharp.dll" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\AxInterop.WMPLib.dll" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\edtftpnet-1.2.2.dll" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\BassRegistration.dll" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\MediaPortal.Support.dll" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\Interop.WMPLib.dll" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\log4net.dll" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\Ionic.Zip.dll" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\Interop.SHDocVw.dll" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.exe" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.pdb" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.csprojResolveAssemblyReference.cache" wird gel\x94scht.
+C:\Windows\Microsoft.NET\Framework\v4.0.30319\Microsoft.Common.targets(1578,5): warning MSB3270: Konflikt zwischen Prozessorarchitektur des Projekts "x86", das erstellt wird, und der Prozessorarchitektur des Verweises, "D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.dll", "AMD64". Dieser Konflikt kann zu Laufzeitfehlern f\x81hren. \x8Endern Sie ggf. mithilfe des Konfigurations-Managers die als Ziel angegebene Prozessorarchitektur Ihres Projekts so, dass die Prozessorarchitekturen zwischen Ihrem Projekt und den Verweisen ausgerichtet werden, oder w\x84hlen Sie eine Abh\x84ngigkeit von Verweisen mit einer Prozessorarchitektur, die der als Ziel angegebene Prozessorarchitektur Ihres Projekts entspricht. [D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj]
CoreCompile:
- c:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /define:TRACE /reference:"C:\Program Files\Team MediaPortal\MediaPortal\Core.dll" /reference:D:\FritzBox\FritzBox\bin\Release\FritzBox.dll /reference:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\mscorlib.dll" /reference:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Core.dll" /reference:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Data.dll" /reference:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.dll" /reference:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Drawing.dll" /reference:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Windows.Forms.dll" /reference:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Xml.dll" /debug:pdbonly /optimize+ /out:obj\Release\FritzBoxConfigTester.exe /target:winexe Program.cs Properties\AssemblyInfo.cs "C:\Documents and Settings\Manuel Preis\Local Settings\Temp\.NETFramework,Version=v4.0.AssemblyAttributes.cs"
+ C:\Windows\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /platform:x86 /define:TRACE /highentropyva- /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /reference:D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /reference:"C:\Program Files (x86)\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 /debug:pdbonly /optimize+ /out:obj\Release\FritzBoxConfigTester.exe /target:winexe /utf8output Program.cs Properties\AssemblyInfo.cs
+CSC : warning CS1607: Assemblygenerierung -- Die Assembly FritzBox.dll, auf die verwiesen wird, hat einen anderen Zielprozessor. [D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj]
_CopyFilesMarkedCopyLocal:
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Core.dll" to ".\bin\Release\Core.dll".
- Copying file from "D:\FritzBox\FritzBox\bin\Release\FritzBox.dll" to ".\bin\Release\FritzBox.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Utils.dll" to ".\bin\Release\Utils.dll".
- 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\Bass.Net.dll" to ".\bin\Release\Bass.Net.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\DirectShowLib.dll" to ".\bin\Release\DirectShowLib.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\BassVisAPI.Net.dll" to ".\bin\Release\BassVisAPI.Net.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\taglib-sharp.dll" to ".\bin\Release\taglib-sharp.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\AxInterop.WMPLib.dll" to ".\bin\Release\AxInterop.WMPLib.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\edtftpnet-1.2.2.dll" to ".\bin\Release\edtftpnet-1.2.2.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\BassRegistration.dll" to ".\bin\Release\BassRegistration.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\MediaPortal.Support.dll" to ".\bin\Release\MediaPortal.Support.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Interop.WMPLib.dll" to ".\bin\Release\Interop.WMPLib.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Interop.SHDocVw.dll" to ".\bin\Release\Interop.SHDocVw.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\log4net.dll" to ".\bin\Release\log4net.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Ionic.Zip.dll" to ".\bin\Release\Ionic.Zip.dll".
- Copying file from "D:\FritzBox\FritzBox\bin\Release\FritzBox.pdb" to ".\bin\Release\FritzBox.pdb".
+ Die Datei wird von "D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.dll" in ".\bin\Release\FritzBox.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Utils.dll" in ".\bin\Release\Utils.dll" kopiert.
+ Die Datei wird von "D:\FritzBox\FritzBox\bin\x64\Release\Dialogs.dll" in ".\bin\Release\Dialogs.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Common.Utils.dll" in ".\bin\Release\Common.Utils.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Bass.Net.dll" in ".\bin\Release\Bass.Net.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\DirectShowLib.dll" in ".\bin\Release\DirectShowLib.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\BassVisAPI.Net.dll" in ".\bin\Release\BassVisAPI.Net.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\taglib-sharp.dll" in ".\bin\Release\taglib-sharp.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\AxInterop.WMPLib.dll" in ".\bin\Release\AxInterop.WMPLib.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\edtftpnet-1.2.2.dll" in ".\bin\Release\edtftpnet-1.2.2.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\BassRegistration.dll" in ".\bin\Release\BassRegistration.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\MediaPortal.Support.dll" in ".\bin\Release\MediaPortal.Support.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Interop.WMPLib.dll" in ".\bin\Release\Interop.WMPLib.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\log4net.dll" in ".\bin\Release\log4net.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Ionic.Zip.dll" in ".\bin\Release\Ionic.Zip.dll" kopiert.
+ Die Datei wird von "D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.pdb" in ".\bin\Release\FritzBox.pdb" kopiert.
_CopyAppConfigFile:
- Copying file from "app.config" to ".\bin\Release\FritzBoxConfigTester.exe.config".
+ Die Datei wird von "app.config" in ".\bin\Release\FritzBoxConfigTester.exe.config" kopiert.
CopyFilesToOutputDirectory:
- Copying file from "obj\Release\FritzBoxConfigTester.exe" to ".\bin\Release\FritzBoxConfigTester.exe".
+ Die Datei wird von "obj\Release\FritzBoxConfigTester.exe" in ".\bin\Release\FritzBoxConfigTester.exe" kopiert.
FritzBoxConfigTester -> D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\FritzBoxConfigTester.exe
- Copying file from "obj\Release\FritzBoxConfigTester.pdb" to ".\bin\Release\FritzBoxConfigTester.pdb".
-Done Building Project "D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj" (Rebuild target(s)).
-Project "D:\FritzBox\FritzBox.sln" (1) is building "D:\FritzBox\Tools\FritzBoxDebugger\FritzBoxDebugger.csproj" (4) on node 1 (Rebuild target(s)).
+ Die Datei wird von "obj\Release\FritzBoxConfigTester.pdb" in ".\bin\Release\FritzBoxConfigTester.pdb" kopiert.
+Die Erstellung des Projekts "D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj" ist abgeschlossen, Rebuild Ziel(e).
+Das Projekt "D:\FritzBox\FritzBox.sln" (1) erstellt "D:\FritzBox\Tools\FritzBoxDebugger\FritzBoxDebugger.csproj" (4) auf Knoten "1", Rebuild Ziel(e).
CoreClean:
- Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\FritzBoxDebugger.exe.config".
- Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\FritzBoxDebugger.exe".
- Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\FritzBoxDebugger.pdb".
- Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\Core.dll".
- Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\FritzBox.dll".
- Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\Utils.dll".
- Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\Common.Utils.dll".
- Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\Dialogs.dll".
- Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\Bass.Net.dll".
- Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\DirectShowLib.dll".
- Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\BassVisAPI.Net.dll".
- Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\taglib-sharp.dll".
- Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\AxInterop.WMPLib.dll".
- Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\edtftpnet-1.2.2.dll".
- Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\BassRegistration.dll".
- Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\MediaPortal.Support.dll".
- Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\Interop.WMPLib.dll".
- Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\Interop.SHDocVw.dll".
- Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\log4net.dll".
- Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\Ionic.Zip.dll".
- Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\FritzBox.pdb".
- 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".
+ Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\bin\x86\Release\FritzBoxDebugger.exe.config" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\bin\x86\Release\FritzBoxDebugger.exe" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\bin\x86\Release\FritzBoxDebugger.pdb" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\bin\x86\Release\FritzBox.dll" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\bin\x86\Release\Dialogs.dll" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\bin\x86\Release\FritzBox.pdb" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\x86\Release\FritzBoxDebugger.DebugForm.resources" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\x86\Release\FritzBoxDebugger.csproj.GenerateResource.Cache" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\x86\Release\FritzBoxDebugger.exe" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\x86\Release\FritzBoxDebugger.pdb" wird gel\x94scht.
+C:\Windows\Microsoft.NET\Framework\v4.0.30319\Microsoft.Common.targets(1578,5): warning MSB3270: Konflikt zwischen Prozessorarchitektur des Projekts "x86", das erstellt wird, und der Prozessorarchitektur des Verweises, "D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.dll", "AMD64". Dieser Konflikt kann zu Laufzeitfehlern f\x81hren. \x8Endern Sie ggf. mithilfe des Konfigurations-Managers die als Ziel angegebene Prozessorarchitektur Ihres Projekts so, dass die Prozessorarchitekturen zwischen Ihrem Projekt und den Verweisen ausgerichtet werden, oder w\x84hlen Sie eine Abh\x84ngigkeit von Verweisen mit einer Prozessorarchitektur, die der als Ziel angegebene Prozessorarchitektur Ihres Projekts entspricht. [D:\FritzBox\Tools\FritzBoxDebugger\FritzBoxDebugger.csproj]
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".
-GenerateTargetFrameworkMonikerAttribute:
-Skipping target "GenerateTargetFrameworkMonikerAttribute" because all output files are up-to-date with respect to the input files.
+ C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\ResGen.exe /useSourcePath /r:D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.dll /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /r:"C:\Program Files (x86)\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 /compile DebugForm.resx,obj\x86\Release\FritzBoxDebugger.DebugForm.resources
CoreCompile:
- c:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /define:TRACE /reference:"C:\Program Files\Team MediaPortal\MediaPortal\Core.dll" /reference:D:\FritzBox\FritzBox\bin\Release\FritzBox.dll /reference:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\mscorlib.dll" /reference:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Core.dll" /reference:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Data.dll" /reference:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.dll" /reference:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Drawing.dll" /reference:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Windows.Forms.dll" /reference:"C:\Program Files\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Xml.dll" /debug:pdbonly /optimize+ /out:obj\Release\FritzBoxDebugger.exe /resource:obj\Release\FritzBoxDebugger.DebugForm.resources /target:winexe DebugForm.cs DebugForm.Designer.cs Program.cs Properties\AssemblyInfo.cs "C:\Documents and Settings\Manuel Preis\Local Settings\Temp\.NETFramework,Version=v4.0.AssemblyAttributes.cs"
+ C:\Windows\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /platform:x86 /define:TRACE /highentropyva- /reference:D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /reference:"C:\Program Files (x86)\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 /debug:pdbonly /optimize+ /out:obj\x86\Release\FritzBoxDebugger.exe /resource:obj\x86\Release\FritzBoxDebugger.DebugForm.resources /target:winexe /utf8output DebugForm.cs DebugForm.Designer.cs Program.cs Properties\AssemblyInfo.cs
+CSC : warning CS1607: Assemblygenerierung -- Die Assembly FritzBox.dll, auf die verwiesen wird, hat einen anderen Zielprozessor. [D:\FritzBox\Tools\FritzBoxDebugger\FritzBoxDebugger.csproj]
_CopyFilesMarkedCopyLocal:
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Core.dll" to ".\bin\Release\Core.dll".
- Copying file from "D:\FritzBox\FritzBox\bin\Release\FritzBox.dll" to ".\bin\Release\FritzBox.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Utils.dll" to ".\bin\Release\Utils.dll".
- 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\Bass.Net.dll" to ".\bin\Release\Bass.Net.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\DirectShowLib.dll" to ".\bin\Release\DirectShowLib.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\BassVisAPI.Net.dll" to ".\bin\Release\BassVisAPI.Net.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\taglib-sharp.dll" to ".\bin\Release\taglib-sharp.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\AxInterop.WMPLib.dll" to ".\bin\Release\AxInterop.WMPLib.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\edtftpnet-1.2.2.dll" to ".\bin\Release\edtftpnet-1.2.2.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\BassRegistration.dll" to ".\bin\Release\BassRegistration.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\MediaPortal.Support.dll" to ".\bin\Release\MediaPortal.Support.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Interop.WMPLib.dll" to ".\bin\Release\Interop.WMPLib.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Interop.SHDocVw.dll" to ".\bin\Release\Interop.SHDocVw.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\log4net.dll" to ".\bin\Release\log4net.dll".
- Copying file from "C:\Program Files\Team MediaPortal\MediaPortal\Ionic.Zip.dll" to ".\bin\Release\Ionic.Zip.dll".
- Copying file from "D:\FritzBox\FritzBox\bin\Release\FritzBox.pdb" to ".\bin\Release\FritzBox.pdb".
+ Die Datei wird von "D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.dll" in "bin\x86\Release\FritzBox.dll" kopiert.
+ Die Datei wird von "D:\FritzBox\FritzBox\bin\x64\Release\Dialogs.dll" in "bin\x86\Release\Dialogs.dll" kopiert.
+ Die Datei wird von "D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.pdb" in "bin\x86\Release\FritzBox.pdb" kopiert.
_CopyAppConfigFile:
- Copying file from "app.config" to ".\bin\Release\FritzBoxDebugger.exe.config".
+ Die Datei wird von "app.config" in "bin\x86\Release\FritzBoxDebugger.exe.config" kopiert.
CopyFilesToOutputDirectory:
- Copying file from "obj\Release\FritzBoxDebugger.exe" to ".\bin\Release\FritzBoxDebugger.exe".
- FritzBoxDebugger -> D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\FritzBoxDebugger.exe
- Copying file from "obj\Release\FritzBoxDebugger.pdb" to ".\bin\Release\FritzBoxDebugger.pdb".
-Done Building Project "D:\FritzBox\Tools\FritzBoxDebugger\FritzBoxDebugger.csproj" (Rebuild target(s)).
-Done Building Project "D:\FritzBox\FritzBox.sln" (Rebuild target(s)).
+ Die Datei wird von "obj\x86\Release\FritzBoxDebugger.exe" in "bin\x86\Release\FritzBoxDebugger.exe" kopiert.
+ FritzBoxDebugger -> D:\FritzBox\Tools\FritzBoxDebugger\bin\x86\Release\FritzBoxDebugger.exe
+ Die Datei wird von "obj\x86\Release\FritzBoxDebugger.pdb" in "bin\x86\Release\FritzBoxDebugger.pdb" kopiert.
+Die Erstellung des Projekts "D:\FritzBox\Tools\FritzBoxDebugger\FritzBoxDebugger.csproj" ist abgeschlossen, Rebuild Ziel(e).
+Die Erstellung des Projekts "D:\FritzBox\FritzBox.sln" ist abgeschlossen, Rebuild Ziel(e).
-Build succeeded.
- 0 Warning(s)
- 0 Error(s)
+Der Buildvorgang wurde erfolgreich ausgef\x81hrt.
-Time Elapsed 00:00:05.44
+"D:\FritzBox\FritzBox.sln" (Rebuild Ziel) (1) ->
+"D:\FritzBox\FritzBox\FritzBox.csproj" (Rebuild Ziel) (2) ->
+(ResolveAssemblyReferences Ziel) ->
+ C:\Windows\Microsoft.NET\Framework\v4.0.30319\Microsoft.Common.targets(1578,5): warning MSB3270: Konflikt zwischen Prozessorarchitektur des Projekts "AMD64", das erstellt wird, und der Prozessorarchitektur des Verweises, "Common.Utils, Version=1.2.200.0, Culture=neutral, processorArchitecture=x86", "x86". Dieser Konflikt kann zu Laufzeitfehlern f\x81hren. \x8Endern Sie ggf. mithilfe des Konfigurations-Managers die als Ziel angegebene Prozessorarchitektur Ihres Projekts so, dass die Prozessorarchitekturen zwischen Ihrem Projekt und den Verweisen ausgerichtet werden, oder w\x84hlen Sie eine Abh\x84ngigkeit von Verweisen mit einer Prozessorarchitektur, die der als Ziel angegebene Prozessorarchitektur Ihres Projekts entspricht. [D:\FritzBox\FritzBox\FritzBox.csproj]
+
+
+"D:\FritzBox\FritzBox.sln" (Rebuild Ziel) (1) ->
+"D:\FritzBox\FritzBox\FritzBox.csproj" (Rebuild Ziel) (2) ->
+(CoreCompile Ziel) ->
+ CSC : warning CS1607: Assemblygenerierung -- Die Assembly Common.Utils.dll, auf die verwiesen wird, hat einen anderen Zielprozessor. [D:\FritzBox\FritzBox\FritzBox.csproj]
+ CSC : warning CS1607: Assemblygenerierung -- Die Assembly System.Data.dll, auf die verwiesen wird, hat einen anderen Zielprozessor. [D:\FritzBox\FritzBox\FritzBox.csproj]
+
+
+"D:\FritzBox\FritzBox.sln" (Rebuild Ziel) (1) ->
+"D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj" (Rebuild Ziel) (3) ->
+(ResolveAssemblyReferences Ziel) ->
+ C:\Windows\Microsoft.NET\Framework\v4.0.30319\Microsoft.Common.targets(1578,5): warning MSB3270: Konflikt zwischen Prozessorarchitektur des Projekts "x86", das erstellt wird, und der Prozessorarchitektur des Verweises, "D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.dll", "AMD64". Dieser Konflikt kann zu Laufzeitfehlern f\x81hren. \x8Endern Sie ggf. mithilfe des Konfigurations-Managers die als Ziel angegebene Prozessorarchitektur Ihres Projekts so, dass die Prozessorarchitekturen zwischen Ihrem Projekt und den Verweisen ausgerichtet werden, oder w\x84hlen Sie eine Abh\x84ngigkeit von Verweisen mit einer Prozessorarchitektur, die der als Ziel angegebene Prozessorarchitektur Ihres Projekts entspricht. [D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj]
+
+
+"D:\FritzBox\FritzBox.sln" (Rebuild Ziel) (1) ->
+"D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj" (Rebuild Ziel) (3) ->
+(CoreCompile Ziel) ->
+ CSC : warning CS1607: Assemblygenerierung -- Die Assembly FritzBox.dll, auf die verwiesen wird, hat einen anderen Zielprozessor. [D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj]
+
+
+"D:\FritzBox\FritzBox.sln" (Rebuild Ziel) (1) ->
+"D:\FritzBox\Tools\FritzBoxDebugger\FritzBoxDebugger.csproj" (Rebuild Ziel) (4) ->
+(ResolveAssemblyReferences Ziel) ->
+ C:\Windows\Microsoft.NET\Framework\v4.0.30319\Microsoft.Common.targets(1578,5): warning MSB3270: Konflikt zwischen Prozessorarchitektur des Projekts "x86", das erstellt wird, und der Prozessorarchitektur des Verweises, "D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.dll", "AMD64". Dieser Konflikt kann zu Laufzeitfehlern f\x81hren. \x8Endern Sie ggf. mithilfe des Konfigurations-Managers die als Ziel angegebene Prozessorarchitektur Ihres Projekts so, dass die Prozessorarchitekturen zwischen Ihrem Projekt und den Verweisen ausgerichtet werden, oder w\x84hlen Sie eine Abh\x84ngigkeit von Verweisen mit einer Prozessorarchitektur, die der als Ziel angegebene Prozessorarchitektur Ihres Projekts entspricht. [D:\FritzBox\Tools\FritzBoxDebugger\FritzBoxDebugger.csproj]
+
+
+"D:\FritzBox\FritzBox.sln" (Rebuild Ziel) (1) ->
+"D:\FritzBox\Tools\FritzBoxDebugger\FritzBoxDebugger.csproj" (Rebuild Ziel) (4) ->
+(CoreCompile Ziel) ->
+ CSC : warning CS1607: Assemblygenerierung -- Die Assembly FritzBox.dll, auf die verwiesen wird, hat einen anderen Zielprozessor. [D:\FritzBox\Tools\FritzBoxDebugger\FritzBoxDebugger.csproj]
+
+ 7 Warnung(en)
+ 0 Fehler
+
+Verstrichene Zeit 00:00:03.03
Reverting to build 0
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
@@ -181,9 +174,9 @@
Updating: D:\FritzBox\Tools\FritzBoxConfigTester\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\Tools\FritzBoxDebugger\Properties\AssemblyInfo.cs
..\FritzBox\bin\Release\FritzBox.dll
-1 File(s) copied
+1 Datei(en) kopiert
..\FritzBox\Resources\speexdec.exe
-1 File(s) copied
+1 Datei(en) kopiert
..\FritzBox\Skin\Black & White\FritzManager.xml
..\FritzBox\Skin\Black & White\Media\hover_FritzBox.png
..\FritzBox\Skin\Black & White\Media\FritzBox\callin.png
@@ -237,7 +230,20 @@
..\FritzBox\Skin\Streamed MP\Media\FritzBox\Phone_Icon_Home.png
..\FritzBox\Skin\Streamed MP\Media\FritzBox\Phone_Icon_Mobile.png
..\FritzBox\Skin\Streamed MP\Media\FritzBox\Phone_Icon_Work.png
-53 File(s) copied
+..\FritzBox\Skin\Titan\common.facade.fritz.xml
+..\FritzBox\Skin\Titan\common.fritz.xml
+..\FritzBox\Skin\Titan\FritzManager.xml
+..\FritzBox\Skin\Titan\Media\hover_fritzbox.png
+..\FritzBox\Skin\Titan\Media\FritzBox\callin.png
+..\FritzBox\Skin\Titan\Media\FritzBox\CallMonitor.Missing.png
+..\FritzBox\Skin\Titan\Media\FritzBox\CallMonitor.Unknown.png
+..\FritzBox\Skin\Titan\Media\FritzBox\callout.png
+..\FritzBox\Skin\Titan\Media\FritzBox\icon_fritz.png
+..\FritzBox\Skin\Titan\Media\FritzBox\Phone_Icon_Home.png
+..\FritzBox\Skin\Titan\Media\FritzBox\Phone_Icon_Mobile.png
+..\FritzBox\Skin\Titan\Media\FritzBox\Phone_Icon_Work.png
+..\FritzBox\Skin\Titan\Media\FritzBox\rejected.png
+66 Datei(en) kopiert
..\FritzBox\Languages\strings_de.xml
..\FritzBox\Languages\strings_el.xml
..\FritzBox\Languages\strings_en-US.xml
@@ -274,9 +280,9 @@
..\FritzBox\Languages\Unsupported\strings_tr.xml
..\FritzBox\Languages\Unsupported\strings_uk.xml
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
-36 File(s) copied
-MpeMaker version: 1.2.1.0
-Build started at 16:42:39
+36 Datei(en) kopiert
+MpeMaker version: 1.2.200.0
+Build started at 08:39:03
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Modified: trunk/plugins/FritzBox/Docs/Changes.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Changes.txt 2013-03-07 21:16:50 UTC (rev 4528)
+++ trunk/plugins/FritzBox/Docs/Changes.txt 2013-03-09 09:19:37 UTC (rev 4529)
@@ -1,16 +1,9 @@
-New release 1.0.0.4517:
+New release 1.0.0.4xxx:
New feature:
-- if a phone number is entered to multiple contacts all names are shown on call notifications
+- Titan skin support
-
Optimizations:
-- improved connection monitoring & restoring
-- corrections in Dutch language file
-- cleanup function for remote contact images folder
-- call list is updated after phone call
+- FRITZ!OS 5.5 support
-
Fixed bugs:
-- settings are not saved when config dialog is directly opened (e. g. with PluginConfigLoader.exe)
-- call monitor connection is reported as error instead of info
-- on multiple simultaneous calls (ISDN) call notification can be handled wrongly
\ No newline at end of file
+- black bar is shown in call notification on some skins
\ No newline at end of file
Added: trunk/plugins/FritzBox/Docs/Documentation/AVM_Technical_Note_-_Session_ID.pdf
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/Docs/Documentation/AVM_Technical_Note_-_Session_ID.pdf
===================================================================
--- trunk/plugins/FritzBox/Docs/Documentation/AVM_Technical_Note_-_Session_ID.pdf 2013-03-07 21:16:50 UTC (rev 4528)
+++ trunk/plugins/FritzBox/Docs/Documentation/AVM_Technical_Note_-_Session_ID.pdf 2013-03-09 09:19:37 UTC (rev 4529)
Property changes on: trunk/plugins/FritzBox/Docs/Documentation/AVM_Technical_Note_-_Session_ID.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2013-03-07 21:16:50 UTC (rev 4528)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2013-03-09 09:19:37 UTC (rev 4529)
@@ -157,24 +157,27 @@
private void OnConnectedAction()
{
- // enable timers
- sessionTimer.Start();
updateTimer.Start();
}
private void OnDisconnectedAction()
{
- // disable timers
updateTimer.Stop();
- sessionTimer.Stop();
}
private void OnLoggedInAction()
{
+ sessionTimer.Start();
+
Log.Debug("Forcing data load after login");
loadDataInBackground();
}
+ private void OnLoggedOffAction()
+ {
+ sessionTimer.Stop();
+ }
+
private void OnCall(CallAction callAction)
{
Log.Info("New call");
@@ -264,7 +267,7 @@
strImage = phoneBook.GetCallerImagePath(callAction.Caller);
// ...message text
- strText = Environment.NewLine;
+ //strText = Environment.NewLine;
if (callAction.Caller.PhoneNumber != String.Empty)
{
@@ -276,7 +279,8 @@
if (Settings.ShowPhoneNumberOnNotification) strText += callAction.Caller.PhoneNumber + Environment.NewLine;
}
- 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
+ //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
+ else strText += LocalizeStrings.Get(3); // 3 = Unknown
// show call notification
showNotificationWindow(callAction.Type, strHeading, strImage, strText);
@@ -510,7 +514,8 @@
FritzBoxClient.CallEvent += OnCallAction;
Fritz.LoggedInEvent += OnLoggedInAction;
-
+ Fritz.LoggedOffEvent += OnLoggedOffAction;
+
FritzBoxClient.StartClient();
startBackGroundWorker();
@@ -523,7 +528,7 @@
phoneBook.LoadPhoneBookFromXMLFile();
// set session timer interval
- sessionTimer.Interval = 30000;
+ sessionTimer.Interval = 590000;
sessionTimer.Elapsed += OnSessionTimerEvent;
// set update timer interval and start the timer
@@ -810,11 +815,7 @@
private static void OnSessionTimerEvent(object source, System.Timers.ElapsedEventArgs e)
{
- if (fritz.LoggedIn)
- {
- fritz.KeepAlive();
- fritz.Refresh();
- }
+ fritz.KeepAlive();
}
private static void OnUpdateTimerEvent(object source, System.Timers.ElapsedEventArgs e)
@@ -896,7 +897,7 @@
else Log.Debug("No voice box item list changes");
}
}
- else Log.Debug("No connection to FRITZ!Box. Voice box items couldn't be loaded");
+ else Log.Debug("Voice box items couldn't be loaded");
}
public void SynchronizePhoneBook()
@@ -1218,8 +1219,8 @@
i++;
+ if (Settings.CurrentFilter == CallListFilter.Incoming) if (item.type != 1) continue;
if (Settings.CurrentFilter == CallListFilter.Rejected) if (item.type != 2) continue;
- if (Settings.CurrentFilter == CallListFilter.Incoming) if (item.type != 1) continue;
if (Settings.CurrentFilter == CallListFilter.Outgoing) if (item.type != 3) contin...
[truncated message content] |
|
From: <hor...@us...> - 2013-03-09 09:56:30
|
Revision: 4530
http://sourceforge.net/p/mp-plugins/code/4530
Author: horned-reaper
Date: 2013-03-09 09:56:25 +0000 (Sat, 09 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/FritzBox/FritzBox.csproj
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox.sln
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/FritzBoxConfigTester.csproj
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/FritzBoxDebugger.csproj
Added Paths:
-----------
trunk/plugins/FritzBox/FritzBox/bin/Release/Dialogs.dll
trunk/plugins/FritzBox/FritzBox/obj/Release/
trunk/plugins/FritzBox/FritzBox/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.EditPhoneBook.resources
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.FritzBoxConfig.resources
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.Properties.Resources.resources
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.GenerateResource.Cache
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Release/TempPE/
trunk/plugins/FritzBox/FritzBox/obj/Release/TempPE/Properties.Resources.Designer.cs.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/AxInterop.WMPLib.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Bass.Net.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/BassRegistration.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/BassVisAPI.Net.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Common.Utils.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Dialogs.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/DirectShowLib.dll
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.exe.config
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Interop.WMPLib.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Ionic.Zip.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/MediaPortal.Support.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Utils.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/edtftpnet-1.2.2.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/log4net.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/taglib-sharp.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/TempPE/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/Dialogs.dll
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.exe.config
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.DebugForm.resources
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.csproj.GenerateResource.Cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/TempPE/
Removed Paths:
-------------
trunk/plugins/FritzBox/FritzBox/bin/x64/
trunk/plugins/FritzBox/FritzBox/obj/Debug/
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/
trunk/plugins/FritzBox/releases/update.xml
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2013-03-09 09:19:37 UTC (rev 4529)
+++ trunk/plugins/FritzBox/Build/Build.log 2013-03-09 09:56:25 UTC (rev 4530)
@@ -1,6 +1,6 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4523
+SVN Version: 4529
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs
@@ -11,29 +11,19 @@
Copyright (C) Microsoft Corporation. Alle Rechte vorbehalten.
Die Projekte in dieser Projektmappe werden nacheinander erstellt. Um eine parallele Erstellung zu erm\x94glichen, m\x81ssen Sie den Schalter "/m" hinzuf\x81gen.
-Der Buildvorgang wurde am 09.03.2013 08:38:58 gestartet.
+Der Buildvorgang wurde am 09.03.2013 10:42:06 gestartet.
Projekt "D:\FritzBox\FritzBox.sln" auf Knoten "1", Rebuild Ziel(e).
ValidateSolutionConfiguration:
Die Projektmappenkonfiguration "Release|Mixed Platforms" wird erstellt.
Das Projekt "D:\FritzBox\FritzBox.sln" (1) erstellt "D:\FritzBox\FritzBox\FritzBox.csproj" (2) auf Knoten "1", Rebuild Ziel(e).
CoreClean:
- Die Datei "D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.dll" wird gel\x94scht.
- Die Datei "D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.pdb" wird gel\x94scht.
- Die Datei "D:\FritzBox\FritzBox\bin\x64\Release\Dialogs.dll" wird gel\x94scht.
- Die Datei "D:\FritzBox\FritzBox\obj\x64\Release\FritzBox.csprojResolveAssemblyReference.cache" wird gel\x94scht.
- Die Datei "D:\FritzBox\FritzBox\obj\x64\Release\FritzBox.EditPhoneBook.resources" wird gel\x94scht.
- Die Datei "D:\FritzBox\FritzBox\obj\x64\Release\FritzBox.Properties.Resources.resources" wird gel\x94scht.
- Die Datei "D:\FritzBox\FritzBox\obj\x64\Release\FritzBox.FritzBoxConfig.resources" wird gel\x94scht.
- Die Datei "D:\FritzBox\FritzBox\obj\x64\Release\FritzBox.csproj.GenerateResource.Cache" wird gel\x94scht.
- Die Datei "D:\FritzBox\FritzBox\obj\x64\Release\FritzBox.dll" wird gel\x94scht.
- Die Datei "D:\FritzBox\FritzBox\obj\x64\Release\FritzBox.pdb" wird gel\x94scht.
-C:\Windows\Microsoft.NET\Framework\v4.0.30319\Microsoft.Common.targets(1578,5): warning MSB3270: Konflikt zwischen Prozessorarchitektur des Projekts "AMD64", das erstellt wird, und der Prozessorarchitektur des Verweises, "Common.Utils, Version=1.2.200.0, Culture=neutral, processorArchitecture=x86", "x86". Dieser Konflikt kann zu Laufzeitfehlern f\x81hren. \x8Endern Sie ggf. mithilfe des Konfigurations-Managers die als Ziel angegebene Prozessorarchitektur Ihres Projekts so, dass die Prozessorarchitekturen zwischen Ihrem Projekt und den Verweisen ausgerichtet werden, oder w\x84hlen Sie eine Abh\x84ngigkeit von Verweisen mit einer Prozessorarchitektur, die der als Ziel angegebene Prozessorarchitektur Ihres Projekts entspricht. [D:\FritzBox\FritzBox\FritzBox.csproj]
+ Das Verzeichnis "obj\x64\Release\" wird erstellt.
+PrepareForBuild:
+ Das Verzeichnis "bin\x64\Release\" wird erstellt.
CoreResGen:
- C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\ResGen.exe /useSourcePath /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Common.Utils.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" /r:C:\Windows\Microsoft.NET\Framework64\v2.0.50727\mscorlib.dll /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Core.dll" /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Data.dll /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Data.Linq.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 (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Xml.Linq.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Utils.dll" /compile EditPhoneBook.resx,obj\x64\Release\FritzBox.EditPhoneBook.resources Properties\Resources.resx,obj\x64\Release\FritzBox.Properties.Resources.resources FritzBoxConfig.resx,obj\x64\Release\FritzBox.FritzBoxConfig.resources
+ C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\ResGen.exe /useSourcePath /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Common.Utils.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Core.dll" /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Data.dll /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Data.Linq.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 (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Xml.Linq.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Utils.dll" /compile EditPhoneBook.resx,obj\x64\Release\FritzBox.EditPhoneBook.resources Properties\Resources.resx,obj\x64\Release\FritzBox.Properties.Resources.resources FritzBoxConfig.resx,obj\x64\Release\FritzBox.FritzBoxConfig.resources
CoreCompile:
- C:\Windows\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /platform:x64 /errorreport:prompt /define:TRACE /highentropyva- /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Common.Utils.dll" /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" /reference:C:\Windows\Microsoft.NET\Framework64\v2.0.50727\mscorlib.dll /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Core.dll" /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Data.dll /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Data.Linq.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 (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Xml.Linq.dll" /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Utils.dll" /debug:pdbonly /filealign:4096 /optimize+ /out:obj\x64\Release\FritzBox.dll /resource:obj\x64\Release\FritzBox.EditPhoneBook.resources /resource:obj\x64\Release\FritzBox.Properties.Resources.resources /resource:obj\x64\Release\FritzBox.FritzBoxConfig.resources /resource:FritzBox.png,FritzBox.FritzBox.png /resource:FritzBoxDisabled.png,FritzBox.FritzBoxDisabled.png /target:library /warnaserror- /utf8output 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
-CSC : warning CS1607: Assemblygenerierung -- Die Assembly Common.Utils.dll, auf die verwiesen wird, hat einen anderen Zielprozessor. [D:\FritzBox\FritzBox\FritzBox.csproj]
-CSC : warning CS1607: Assemblygenerierung -- Die Assembly System.Data.dll, auf die verwiesen wird, hat einen anderen Zielprozessor. [D:\FritzBox\FritzBox\FritzBox.csproj]
+ C:\Windows\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /platform:x86 /errorreport:prompt /define:TRACE /highentropyva- /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Common.Utils.dll" /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Core.dll" /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Data.dll /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Data.Linq.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 (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Xml.Linq.dll" /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Utils.dll" /debug:pdbonly /filealign:4096 /optimize+ /out:obj\x64\Release\FritzBox.dll /resource:obj\x64\Release\FritzBox.EditPhoneBook.resources /resource:obj\x64\Release\FritzBox.Properties.Resources.resources /resource:obj\x64\Release\FritzBox.FritzBoxConfig.resources /resource:FritzBox.png,FritzBox.FritzBox.png /resource:FritzBoxDisabled.png,FritzBox.FritzBoxDisabled.png /target:library /warnaserror- /utf8output 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:
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" in "bin\x64\Release\Dialogs.dll" kopiert.
CopyFilesToOutputDirectory:
@@ -47,7 +37,6 @@
Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\FritzBoxConfigTester.exe" wird gel\x94scht.
Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\FritzBoxConfigTester.pdb" wird gel\x94scht.
Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\FritzBox.dll" wird gel\x94scht.
- Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\FritzBox.pdb" wird gel\x94scht.
Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\Utils.dll" wird gel\x94scht.
Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\Dialogs.dll" wird gel\x94scht.
Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\Common.Utils.dll" wird gel\x94scht.
@@ -62,56 +51,45 @@
Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\Interop.WMPLib.dll" wird gel\x94scht.
Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\log4net.dll" wird gel\x94scht.
Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\Ionic.Zip.dll" wird gel\x94scht.
- Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\Interop.SHDocVw.dll" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\FritzBox.pdb" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.csprojResolveAssemblyReference.cache" wird gel\x94scht.
Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.exe" wird gel\x94scht.
Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.pdb" wird gel\x94scht.
- Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.csprojResolveAssemblyReference.cache" wird gel\x94scht.
-C:\Windows\Microsoft.NET\Framework\v4.0.30319\Microsoft.Common.targets(1578,5): warning MSB3270: Konflikt zwischen Prozessorarchitektur des Projekts "x86", das erstellt wird, und der Prozessorarchitektur des Verweises, "D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.dll", "AMD64". Dieser Konflikt kann zu Laufzeitfehlern f\x81hren. \x8Endern Sie ggf. mithilfe des Konfigurations-Managers die als Ziel angegebene Prozessorarchitektur Ihres Projekts so, dass die Prozessorarchitekturen zwischen Ihrem Projekt und den Verweisen ausgerichtet werden, oder w\x84hlen Sie eine Abh\x84ngigkeit von Verweisen mit einer Prozessorarchitektur, die der als Ziel angegebene Prozessorarchitektur Ihres Projekts entspricht. [D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj]
CoreCompile:
C:\Windows\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /platform:x86 /define:TRACE /highentropyva- /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /reference:D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /reference:"C:\Program Files (x86)\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 /debug:pdbonly /optimize+ /out:obj\Release\FritzBoxConfigTester.exe /target:winexe /utf8output Program.cs Properties\AssemblyInfo.cs
-CSC : warning CS1607: Assemblygenerierung -- Die Assembly FritzBox.dll, auf die verwiesen wird, hat einen anderen Zielprozessor. [D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj]
_CopyFilesMarkedCopyLocal:
- Die Datei wird von "D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.dll" in ".\bin\Release\FritzBox.dll" kopiert.
- Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Utils.dll" in ".\bin\Release\Utils.dll" kopiert.
- Die Datei wird von "D:\FritzBox\FritzBox\bin\x64\Release\Dialogs.dll" in ".\bin\Release\Dialogs.dll" kopiert.
- Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Common.Utils.dll" in ".\bin\Release\Common.Utils.dll" kopiert.
- Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Bass.Net.dll" in ".\bin\Release\Bass.Net.dll" kopiert.
- Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\DirectShowLib.dll" in ".\bin\Release\DirectShowLib.dll" kopiert.
- Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\BassVisAPI.Net.dll" in ".\bin\Release\BassVisAPI.Net.dll" kopiert.
- Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\taglib-sharp.dll" in ".\bin\Release\taglib-sharp.dll" kopiert.
- Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\AxInterop.WMPLib.dll" in ".\bin\Release\AxInterop.WMPLib.dll" kopiert.
- Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\edtftpnet-1.2.2.dll" in ".\bin\Release\edtftpnet-1.2.2.dll" kopiert.
- Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\BassRegistration.dll" in ".\bin\Release\BassRegistration.dll" kopiert.
- Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\MediaPortal.Support.dll" in ".\bin\Release\MediaPortal.Support.dll" kopiert.
- Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Interop.WMPLib.dll" in ".\bin\Release\Interop.WMPLib.dll" kopiert.
- Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\log4net.dll" in ".\bin\Release\log4net.dll" kopiert.
- Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Ionic.Zip.dll" in ".\bin\Release\Ionic.Zip.dll" kopiert.
- Die Datei wird von "D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.pdb" in ".\bin\Release\FritzBox.pdb" kopiert.
+ Die Datei wird von "D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.dll" in "bin\Release\FritzBox.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Utils.dll" in "bin\Release\Utils.dll" kopiert.
+ Die Datei wird von "D:\FritzBox\FritzBox\bin\x64\Release\Dialogs.dll" in "bin\Release\Dialogs.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Common.Utils.dll" in "bin\Release\Common.Utils.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Bass.Net.dll" in "bin\Release\Bass.Net.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\DirectShowLib.dll" in "bin\Release\DirectShowLib.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\BassVisAPI.Net.dll" in "bin\Release\BassVisAPI.Net.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\taglib-sharp.dll" in "bin\Release\taglib-sharp.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\AxInterop.WMPLib.dll" in "bin\Release\AxInterop.WMPLib.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\edtftpnet-1.2.2.dll" in "bin\Release\edtftpnet-1.2.2.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\BassRegistration.dll" in "bin\Release\BassRegistration.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\MediaPortal.Support.dll" in "bin\Release\MediaPortal.Support.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Interop.WMPLib.dll" in "bin\Release\Interop.WMPLib.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\log4net.dll" in "bin\Release\log4net.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Ionic.Zip.dll" in "bin\Release\Ionic.Zip.dll" kopiert.
+ Die Datei wird von "D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.pdb" in "bin\Release\FritzBox.pdb" kopiert.
_CopyAppConfigFile:
- Die Datei wird von "app.config" in ".\bin\Release\FritzBoxConfigTester.exe.config" kopiert.
+ Die Datei wird von "app.config" in "bin\Release\FritzBoxConfigTester.exe.config" kopiert.
CopyFilesToOutputDirectory:
- Die Datei wird von "obj\Release\FritzBoxConfigTester.exe" in ".\bin\Release\FritzBoxConfigTester.exe" kopiert.
+ Die Datei wird von "obj\Release\FritzBoxConfigTester.exe" in "bin\Release\FritzBoxConfigTester.exe" kopiert.
FritzBoxConfigTester -> D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\FritzBoxConfigTester.exe
- Die Datei wird von "obj\Release\FritzBoxConfigTester.pdb" in ".\bin\Release\FritzBoxConfigTester.pdb" kopiert.
+ Die Datei wird von "obj\Release\FritzBoxConfigTester.pdb" in "bin\Release\FritzBoxConfigTester.pdb" kopiert.
Die Erstellung des Projekts "D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj" ist abgeschlossen, Rebuild Ziel(e).
Das Projekt "D:\FritzBox\FritzBox.sln" (1) erstellt "D:\FritzBox\Tools\FritzBoxDebugger\FritzBoxDebugger.csproj" (4) auf Knoten "1", Rebuild Ziel(e).
CoreClean:
- Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\bin\x86\Release\FritzBoxDebugger.exe.config" wird gel\x94scht.
- Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\bin\x86\Release\FritzBoxDebugger.exe" wird gel\x94scht.
- Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\bin\x86\Release\FritzBoxDebugger.pdb" wird gel\x94scht.
- Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\bin\x86\Release\FritzBox.dll" wird gel\x94scht.
- Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\bin\x86\Release\Dialogs.dll" wird gel\x94scht.
- Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\bin\x86\Release\FritzBox.pdb" wird gel\x94scht.
- Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\x86\Release\FritzBoxDebugger.DebugForm.resources" wird gel\x94scht.
- Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\x86\Release\FritzBoxDebugger.csproj.GenerateResource.Cache" wird gel\x94scht.
- Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\x86\Release\FritzBoxDebugger.exe" wird gel\x94scht.
- Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\x86\Release\FritzBoxDebugger.pdb" wird gel\x94scht.
-C:\Windows\Microsoft.NET\Framework\v4.0.30319\Microsoft.Common.targets(1578,5): warning MSB3270: Konflikt zwischen Prozessorarchitektur des Projekts "x86", das erstellt wird, und der Prozessorarchitektur des Verweises, "D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.dll", "AMD64". Dieser Konflikt kann zu Laufzeitfehlern f\x81hren. \x8Endern Sie ggf. mithilfe des Konfigurations-Managers die als Ziel angegebene Prozessorarchitektur Ihres Projekts so, dass die Prozessorarchitekturen zwischen Ihrem Projekt und den Verweisen ausgerichtet werden, oder w\x84hlen Sie eine Abh\x84ngigkeit von Verweisen mit einer Prozessorarchitektur, die der als Ziel angegebene Prozessorarchitektur Ihres Projekts entspricht. [D:\FritzBox\Tools\FritzBoxDebugger\FritzBoxDebugger.csproj]
+ Das Verzeichnis "obj\x86\Release\" wird erstellt.
+PrepareForBuild:
+ Das Verzeichnis "bin\x86\Release\" wird erstellt.
CoreResGen:
C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\ResGen.exe /useSourcePath /r:D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.dll /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /r:"C:\Program Files (x86)\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 /compile DebugForm.resx,obj\x86\Release\FritzBoxDebugger.DebugForm.resources
CoreCompile:
C:\Windows\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /platform:x86 /define:TRACE /highentropyva- /reference:D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /reference:"C:\Program Files (x86)\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 /debug:pdbonly /optimize+ /out:obj\x86\Release\FritzBoxDebugger.exe /resource:obj\x86\Release\FritzBoxDebugger.DebugForm.resources /target:winexe /utf8output DebugForm.cs DebugForm.Designer.cs Program.cs Properties\AssemblyInfo.cs
-CSC : warning CS1607: Assemblygenerierung -- Die Assembly FritzBox.dll, auf die verwiesen wird, hat einen anderen Zielprozessor. [D:\FritzBox\Tools\FritzBoxDebugger\FritzBoxDebugger.csproj]
_CopyFilesMarkedCopyLocal:
Die Datei wird von "D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.dll" in "bin\x86\Release\FritzBox.dll" kopiert.
Die Datei wird von "D:\FritzBox\FritzBox\bin\x64\Release\Dialogs.dll" in "bin\x86\Release\Dialogs.dll" kopiert.
@@ -126,47 +104,10 @@
Die Erstellung des Projekts "D:\FritzBox\FritzBox.sln" ist abgeschlossen, Rebuild Ziel(e).
Der Buildvorgang wurde erfolgreich ausgef\x81hrt.
-
-"D:\FritzBox\FritzBox.sln" (Rebuild Ziel) (1) ->
-"D:\FritzBox\FritzBox\FritzBox.csproj" (Rebuild Ziel) (2) ->
-(ResolveAssemblyReferences Ziel) ->
- C:\Windows\Microsoft.NET\Framework\v4.0.30319\Microsoft.Common.targets(1578,5): warning MSB3270: Konflikt zwischen Prozessorarchitektur des Projekts "AMD64", das erstellt wird, und der Prozessorarchitektur des Verweises, "Common.Utils, Version=1.2.200.0, Culture=neutral, processorArchitecture=x86", "x86". Dieser Konflikt kann zu Laufzeitfehlern f\x81hren. \x8Endern Sie ggf. mithilfe des Konfigurations-Managers die als Ziel angegebene Prozessorarchitektur Ihres Projekts so, dass die Prozessorarchitekturen zwischen Ihrem Projekt und den Verweisen ausgerichtet werden, oder w\x84hlen Sie eine Abh\x84ngigkeit von Verweisen mit einer Prozessorarchitektur, die der als Ziel angegebene Prozessorarchitektur Ihres Projekts entspricht. [D:\FritzBox\FritzBox\FritzBox.csproj]
-
-
-"D:\FritzBox\FritzBox.sln" (Rebuild Ziel) (1) ->
-"D:\FritzBox\FritzBox\FritzBox.csproj" (Rebuild Ziel) (2) ->
-(CoreCompile Ziel) ->
- CSC : warning CS1607: Assemblygenerierung -- Die Assembly Common.Utils.dll, auf die verwiesen wird, hat einen anderen Zielprozessor. [D:\FritzBox\FritzBox\FritzBox.csproj]
- CSC : warning CS1607: Assemblygenerierung -- Die Assembly System.Data.dll, auf die verwiesen wird, hat einen anderen Zielprozessor. [D:\FritzBox\FritzBox\FritzBox.csproj]
-
-
-"D:\FritzBox\FritzBox.sln" (Rebuild Ziel) (1) ->
-"D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj" (Rebuild Ziel) (3) ->
-(ResolveAssemblyReferences Ziel) ->
- C:\Windows\Microsoft.NET\Framework\v4.0.30319\Microsoft.Common.targets(1578,5): warning MSB3270: Konflikt zwischen Prozessorarchitektur des Projekts "x86", das erstellt wird, und der Prozessorarchitektur des Verweises, "D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.dll", "AMD64". Dieser Konflikt kann zu Laufzeitfehlern f\x81hren. \x8Endern Sie ggf. mithilfe des Konfigurations-Managers die als Ziel angegebene Prozessorarchitektur Ihres Projekts so, dass die Prozessorarchitekturen zwischen Ihrem Projekt und den Verweisen ausgerichtet werden, oder w\x84hlen Sie eine Abh\x84ngigkeit von Verweisen mit einer Prozessorarchitektur, die der als Ziel angegebene Prozessorarchitektur Ihres Projekts entspricht. [D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj]
-
-
-"D:\FritzBox\FritzBox.sln" (Rebuild Ziel) (1) ->
-"D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj" (Rebuild Ziel) (3) ->
-(CoreCompile Ziel) ->
- CSC : warning CS1607: Assemblygenerierung -- Die Assembly FritzBox.dll, auf die verwiesen wird, hat einen anderen Zielprozessor. [D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj]
-
-
-"D:\FritzBox\FritzBox.sln" (Rebuild Ziel) (1) ->
-"D:\FritzBox\Tools\FritzBoxDebugger\FritzBoxDebugger.csproj" (Rebuild Ziel) (4) ->
-(ResolveAssemblyReferences Ziel) ->
- C:\Windows\Microsoft.NET\Framework\v4.0.30319\Microsoft.Common.targets(1578,5): warning MSB3270: Konflikt zwischen Prozessorarchitektur des Projekts "x86", das erstellt wird, und der Prozessorarchitektur des Verweises, "D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.dll", "AMD64". Dieser Konflikt kann zu Laufzeitfehlern f\x81hren. \x8Endern Sie ggf. mithilfe des Konfigurations-Managers die als Ziel angegebene Prozessorarchitektur Ihres Projekts so, dass die Prozessorarchitekturen zwischen Ihrem Projekt und den Verweisen ausgerichtet werden, oder w\x84hlen Sie eine Abh\x84ngigkeit von Verweisen mit einer Prozessorarchitektur, die der als Ziel angegebene Prozessorarchitektur Ihres Projekts entspricht. [D:\FritzBox\Tools\FritzBoxDebugger\FritzBoxDebugger.csproj]
-
-
-"D:\FritzBox\FritzBox.sln" (Rebuild Ziel) (1) ->
-"D:\FritzBox\Tools\FritzBoxDebugger\FritzBoxDebugger.csproj" (Rebuild Ziel) (4) ->
-(CoreCompile Ziel) ->
- CSC : warning CS1607: Assemblygenerierung -- Die Assembly FritzBox.dll, auf die verwiesen wird, hat einen anderen Zielprozessor. [D:\FritzBox\Tools\FritzBoxDebugger\FritzBoxDebugger.csproj]
-
- 7 Warnung(en)
+ 0 Warnung(en)
0 Fehler
-Verstrichene Zeit 00:00:03.03
+Verstrichene Zeit 00:00:01.87
Reverting to build 0
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
@@ -282,7 +223,7 @@
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
36 Datei(en) kopiert
MpeMaker version: 1.2.200.0
-Build started at 08:39:03
+Build started at 10:42:09
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.csproj
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.csproj 2013-03-09 09:19:37 UTC (rev 4529)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.csproj 2013-03-09 09:56:25 UTC (rev 4530)
@@ -78,7 +78,7 @@
<Optimize>true</Optimize>
<FileAlignment>4096</FileAlignment>
<DebugType>pdbonly</DebugType>
- <PlatformTarget>x64</PlatformTarget>
+ <PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
@@ -88,6 +88,10 @@
<OutputPath>C:\Program Files %28x86%29\Team MediaPortal\MediaPortal\plugins\Windows\</OutputPath>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="Common.Utils, Version=1.2.200.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
Added: trunk/plugins/FritzBox/FritzBox/bin/Release/Dialogs.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/bin/Release/Dialogs.dll
===================================================================
--- trunk/plugins/FritzBox/FritzBox/bin/Release/Dialogs.dll 2013-03-09 09:19:37 UTC (rev 4529)
+++ trunk/plugins/FritzBox/FritzBox/bin/Release/Dialogs.dll 2013-03-09 09:56:25 UTC (rev 4530)
Property changes on: trunk/plugins/FritzBox/FritzBox/bin/Release/Dialogs.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Added: trunk/plugins/FritzBox/FritzBox/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
===================================================================
--- trunk/plugins/FritzBox/FritzBox/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache 2013-03-09 09:19:37 UTC (rev 4529)
+++ trunk/plugins/FritzBox/FritzBox/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache 2013-03-09 09:56:25 UTC (rev 4530)
Property changes on: trunk/plugins/FritzBox/FritzBox/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.EditPhoneBook.resources
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.EditPhoneBook.resources
===================================================================
--- trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.EditPhoneBook.resources 2013-03-09 09:19:37 UTC (rev 4529)
+++ trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.EditPhoneBook.resources 2013-03-09 09:56:25 UTC (rev 4530)
Property changes on: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.EditPhoneBook.resources
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.FritzBoxConfig.resources
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.FritzBoxConfig.resources
===================================================================
--- trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.FritzBoxConfig.resources 2013-03-09 09:19:37 UTC (rev 4529)
+++ trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.FritzBoxConfig.resources 2013-03-09 09:56:25 UTC (rev 4530)
Property changes on: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.FritzBoxConfig.resources
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.Properties.Resources.resources
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.Properties.Resources.resources
===================================================================
--- trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.Properties.Resources.resources 2013-03-09 09:19:37 UTC (rev 4529)
+++ trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.Properties.Resources.resources 2013-03-09 09:56:25 UTC (rev 4530)
Property changes on: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.Properties.Resources.resources
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.FileListAbsolute.txt
===================================================================
--- trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.FileListAbsolute.txt (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.FileListAbsolute.txt 2013-03-09 09:56:25 UTC (rev 4530)
@@ -0,0 +1,7 @@
+D:\FritzBox\FritzBox\bin\Release\FritzBox.dll
+D:\FritzBox\FritzBox\bin\Release\Dialogs.dll
+D:\FritzBox\FritzBox\obj\Release\FritzBox.EditPhoneBook.resources
+D:\FritzBox\FritzBox\obj\Release\FritzBox.Properties.Resources.resources
+D:\FritzBox\FritzBox\obj\Release\FritzBox.FritzBoxConfig.resources
+D:\FritzBox\FritzBox\obj\Release\FritzBox.csproj.GenerateResource.Cache
+D:\FritzBox\FritzBox\obj\Release\FritzBox.dll
Added: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.GenerateResource.Cache
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.GenerateResource.Cache
===================================================================
--- trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.GenerateResource.Cache 2013-03-09 09:19:37 UTC (rev 4529)
+++ trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.GenerateResource.Cache 2013-03-09 09:56:25 UTC (rev 4530)
Property changes on: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.GenerateResource.Cache
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
===================================================================
--- trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll 2013-03-09 09:19:37 UTC (rev 4529)
+++ trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll 2013-03-09 09:56:25 UTC (rev 4530)
Property changes on: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/obj/Release/TempPE/Properties.Resources.Designer.cs.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/obj/Release/TempPE/Properties.Resources.Designer.cs.dll
===================================================================
--- trunk/plugins/FritzBox/FritzBox/obj/Release/TempPE/Properties.Resources.Designer.cs.dll 2013-03-09 09:19:37 UTC (rev 4529)
+++ trunk/plugins/FritzBox/FritzBox/obj/Release/TempPE/Properties.Resources.Designer.cs.dll 2013-03-09 09:56:25 UTC (rev 4530)
Property changes on: trunk/plugins/FritzBox/FritzBox/obj/Release/TempPE/Properties.Resources.Designer.cs.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/FritzBox/FritzBox.sln
===================================================================
--- trunk/plugins/FritzBox/FritzBox.sln 2013-03-09 09:19:37 UTC (rev 4529)
+++ trunk/plugins/FritzBox/FritzBox.sln 2013-03-09 09:56:25 UTC (rev 4530)
@@ -19,7 +19,8 @@
{7A458560-A537-429E-A016-1A4513CB586F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7A458560-A537-429E-A016-1A4513CB586F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{7A458560-A537-429E-A016-1A4513CB586F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {7A458560-A537-429E-A016-1A4513CB586F}.Release|Any CPU.ActiveCfg = Release|x64
+ {7A458560-A537-429E-A016-1A4513CB586F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7A458560-A537-429E-A016-1A4513CB586F}.Release|Any CPU.Build.0 = Release|Any CPU
{7A458560-A537-429E-A016-1A4513CB586F}.Release|Mixed Platforms.ActiveCfg = Release|x64
{7A458560-A537-429E-A016-1A4513CB586F}.Release|Mixed Platforms.Build.0 = Release|x64
{5D751473-DCC5-4044-A6E3-403D97C5B9F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -34,7 +35,8 @@
{FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Release|Any CPU.ActiveCfg = Release|x86
+ {FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Release|Any CPU.Build.0 = Release|Any CPU
{FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Release|Mixed Platforms.ActiveCfg = Release|x86
{FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Release|Mixed Platforms.Build.0 = Release|x86
EndGlobalSection
Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2013-03-09 09:19:37 UTC (rev 4529)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2013-03-09 09:56:25 UTC (rev 4530)
@@ -804,7 +804,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4517</DesignedForVersion>
+ <DesignedForVersion>1.1.7.0</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -827,7 +827,7 @@
<Major>1</Major>
<Minor>0</Minor>
<Build>0</Build>
- <Revision>4517</Revision>
+ <Revision>0</Revision>
</Version>
<ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box information from MediaPortal.
@@ -841,7 +841,7 @@
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
- <ReleaseDate>2013-03-09T08:39:03.638488+01:00</ReleaseDate>
+ <ReleaseDate>2013-03-09T10:42:09.8311012+01:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/FritzBoxConfigTester.csproj
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/FritzBoxConfigTester.csproj 2013-03-09 09:19:37 UTC (rev 4529)
+++ trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/FritzBoxConfigTester.csproj 2013-03-09 09:56:25 UTC (rev 4530)
@@ -54,7 +54,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>.\bin\Release\</OutputPath>
+ <OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
Added: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/AxInterop.WMPLib.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/AxInterop.WMPLib.dll
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/AxInterop.WMPLib.dll 2013-03-09 09:19:37 UTC (rev 4529)
+++ trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/AxInterop.WMPLib.dll 2013-03-09 09:56:25 UTC (rev 4530)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/AxInterop.WMPLib.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Bass.Net.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Bass.Net.dll
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Bass.Net.dll 2013-03-09 09:19:37 UTC (rev 4529)
+++ trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Bass.Net.dll 2013-03-09 09:56:25 UTC (rev 4530)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Bass.Net.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/BassRegistration.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/BassRegistration.dll
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/BassRegistration.dll 2013-03-09 09:19:37 UTC (rev 4529)
+++ trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/BassRegistration.dll 2013-03-09 09:56:25 UTC (rev 4530)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/BassRegistration.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/BassVisAPI.Net.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/BassVisAPI.Net.dll
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/BassVisAPI.Net.dll 2013-03-09 09:19:37 UTC (rev 4529)
+++ trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/BassVisAPI.Net.dll 2013-03-09 09:56:25 UTC (rev 4530)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/BassVisAPI.Net.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Common.Utils.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Common.Utils.dll
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Common.Utils.dll 2013-03-09 09:19:37 UTC (rev 4529)
+++ trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Common.Utils.dll 2013-03-09 09:56:25 UTC (rev 4530)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Common.Utils.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Dialogs.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Dialogs.dll
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Dialogs.dll 2013-03-09 09:19:37 UTC (rev 4529)
+++ trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Dialogs.dll 2013-03-09 09:56:25 UTC (rev 4530)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Dialogs.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/DirectShowLib.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/DirectShowLib.dll
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/DirectShowLib.dll 2013-03-09 09:19:37 UTC (rev 4529)
+++ trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/DirectShowLib.dll 2013-03-09 09:56:25 UTC (rev 4530)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/DirectShowLib.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll 2013-03-09 09:19:37 UTC (rev 4529)
+++ trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll 2013-03-09 09:56:25 UTC (rev 4530)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.pdb
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.pdb 2013-03-09 09:19:37 UTC (rev 4529)
+++ trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.pdb 2013-03-09 09:56:25 UTC (rev 4530)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.pdb
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe 2013-03-09 09:19:37 UTC (rev 4529)
+++ trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe 2013-03-09 09:56:25 UTC (rev 4530)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe.config
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe.config (rev 0)
+++ trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe.config 2013-03-09 09:56:25 UTC (rev 4530)
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
Added: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb 2013-03-09 09:19:37 UTC (rev 4529)
+++ trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb 2013-03-09 09:56:25 UTC (rev 4530)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Interop.WMPLib.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Interop.WMPLib.dll
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Interop.WMPLib.dll 2013-03-09 09:19:37 UTC (rev 4529)
+++ trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Interop.WMPLib.dll 2013-03-09 09:56:25 UTC (rev 4530)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Interop.WMPLib.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Ionic.Zip.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Ionic.Zip.dll
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Ionic.Zip.dll 2013-03-09 09:19:37 UTC (rev 4529)
+++ trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Ionic.Zip.dll 2013-03-09 09:56:25 UTC (rev 4530)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Ionic.Zip.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/MediaPortal.Support.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/MediaPortal.Support.dll
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/MediaPortal.Support.dll 2013-03-09 09:19:37 UTC (rev 4529)
+++ trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/MediaPortal.Support.dll 2013-03-09 09:56:25 UTC (rev 4530)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/MediaPortal.Support.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Utils.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Utils.dll
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Utils.dll 2013-03-09 09:19:37 UTC (rev 4529)
+++ trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Utils.dll 2013-03-09 09:56:25 UTC (rev 4530)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Utils.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/edtftpnet-1.2.2.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/edtftpnet-1.2.2.dll
===================================================================
--- trunk/plugins/FritzBox/Tools/Fr...
[truncated message content] |
|
From: <hor...@us...> - 2013-03-09 10:10:40
|
Revision: 4531
http://sourceforge.net/p/mp-plugins/code/4531
Author: horned-reaper
Date: 2013-03-09 10:10:37 +0000 (Sat, 09 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
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/Release/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2013-03-09 09:56:25 UTC (rev 4530)
+++ trunk/plugins/FritzBox/Build/Build.log 2013-03-09 10:10:37 UTC (rev 4531)
@@ -1,6 +1,6 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4529
+SVN Version: 4530
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs
@@ -11,15 +11,22 @@
Copyright (C) Microsoft Corporation. Alle Rechte vorbehalten.
Die Projekte in dieser Projektmappe werden nacheinander erstellt. Um eine parallele Erstellung zu erm\x94glichen, m\x81ssen Sie den Schalter "/m" hinzuf\x81gen.
-Der Buildvorgang wurde am 09.03.2013 10:42:06 gestartet.
+Der Buildvorgang wurde am 09.03.2013 11:08:02 gestartet.
Projekt "D:\FritzBox\FritzBox.sln" auf Knoten "1", Rebuild Ziel(e).
ValidateSolutionConfiguration:
Die Projektmappenkonfiguration "Release|Mixed Platforms" wird erstellt.
Das Projekt "D:\FritzBox\FritzBox.sln" (1) erstellt "D:\FritzBox\FritzBox\FritzBox.csproj" (2) auf Knoten "1", Rebuild Ziel(e).
CoreClean:
- Das Verzeichnis "obj\x64\Release\" wird erstellt.
-PrepareForBuild:
- Das Verzeichnis "bin\x64\Release\" wird erstellt.
+ Die Datei "D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.dll" wird gel\x94scht.
+ Die Datei "D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.pdb" wird gel\x94scht.
+ Die Datei "D:\FritzBox\FritzBox\bin\x64\Release\Dialogs.dll" wird gel\x94scht.
+ Die Datei "D:\FritzBox\FritzBox\obj\x64\Release\FritzBox.csprojResolveAssemblyReference.cache" wird gel\x94scht.
+ Die Datei "D:\FritzBox\FritzBox\obj\x64\Release\FritzBox.EditPhoneBook.resources" wird gel\x94scht.
+ Die Datei "D:\FritzBox\FritzBox\obj\x64\Release\FritzBox.Properties.Resources.resources" wird gel\x94scht.
+ Die Datei "D:\FritzBox\FritzBox\obj\x64\Release\FritzBox.FritzBoxConfig.resources" wird gel\x94scht.
+ Die Datei "D:\FritzBox\FritzBox\obj\x64\Release\FritzBox.csproj.GenerateResource.Cache" wird gel\x94scht.
+ Die Datei "D:\FritzBox\FritzBox\obj\x64\Release\FritzBox.dll" wird gel\x94scht.
+ Die Datei "D:\FritzBox\FritzBox\obj\x64\Release\FritzBox.pdb" wird gel\x94scht.
CoreResGen:
C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\ResGen.exe /useSourcePath /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Common.Utils.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Core.dll" /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Data.dll /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Data.Linq.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 (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Xml.Linq.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Utils.dll" /compile EditPhoneBook.resx,obj\x64\Release\FritzBox.EditPhoneBook.resources Properties\Resources.resx,obj\x64\Release\FritzBox.Properties.Resources.resources FritzBoxConfig.resx,obj\x64\Release\FritzBox.FritzBoxConfig.resources
CoreCompile:
@@ -83,9 +90,16 @@
Die Erstellung des Projekts "D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj" ist abgeschlossen, Rebuild Ziel(e).
Das Projekt "D:\FritzBox\FritzBox.sln" (1) erstellt "D:\FritzBox\Tools\FritzBoxDebugger\FritzBoxDebugger.csproj" (4) auf Knoten "1", Rebuild Ziel(e).
CoreClean:
- Das Verzeichnis "obj\x86\Release\" wird erstellt.
-PrepareForBuild:
- Das Verzeichnis "bin\x86\Release\" wird erstellt.
+ Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\bin\x86\Release\FritzBoxDebugger.exe.config" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\bin\x86\Release\FritzBoxDebugger.exe" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\bin\x86\Release\FritzBoxDebugger.pdb" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\bin\x86\Release\FritzBox.dll" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\bin\x86\Release\Dialogs.dll" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\bin\x86\Release\FritzBox.pdb" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\x86\Release\FritzBoxDebugger.DebugForm.resources" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\x86\Release\FritzBoxDebugger.csproj.GenerateResource.Cache" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\x86\Release\FritzBoxDebugger.exe" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\x86\Release\FritzBoxDebugger.pdb" wird gel\x94scht.
CoreResGen:
C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\ResGen.exe /useSourcePath /r:D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.dll /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /r:"C:\Program Files (x86)\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 /compile DebugForm.resx,obj\x86\Release\FritzBoxDebugger.DebugForm.resources
CoreCompile:
@@ -107,7 +121,7 @@
0 Warnung(en)
0 Fehler
-Verstrichene Zeit 00:00:01.87
+Verstrichene Zeit 00:00:01.95
Reverting to build 0
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
@@ -223,7 +237,7 @@
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
36 Datei(en) kopiert
MpeMaker version: 1.2.200.0
-Build started at 10:42:09
+Build started at 11:08:06
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2013-03-09 09:56:25 UTC (rev 4530)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2013-03-09 10:10:37 UTC (rev 4531)
@@ -841,7 +841,7 @@
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
- <ReleaseDate>2013-03-09T10:42:09.8311012+01:00</ReleaseDate>
+ <ReleaseDate>2013-03-09T11:08:06.6021364+01:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hor...@us...> - 2013-03-09 10:14:25
|
Revision: 4532
http://sourceforge.net/p/mp-plugins/code/4532
Author: horned-reaper
Date: 2013-03-09 10:14:23 +0000 (Sat, 09 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
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/Release/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
Added Paths:
-----------
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/TempPE/
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/build.force
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2013-03-09 10:10:37 UTC (rev 4531)
+++ trunk/plugins/FritzBox/Build/Build.log 2013-03-09 10:14:23 UTC (rev 4532)
@@ -1,6 +1,6 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4530
+SVN Version: 4531
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs
@@ -11,22 +11,15 @@
Copyright (C) Microsoft Corporation. Alle Rechte vorbehalten.
Die Projekte in dieser Projektmappe werden nacheinander erstellt. Um eine parallele Erstellung zu erm\x94glichen, m\x81ssen Sie den Schalter "/m" hinzuf\x81gen.
-Der Buildvorgang wurde am 09.03.2013 11:08:02 gestartet.
+Der Buildvorgang wurde am 09.03.2013 11:12:02 gestartet.
Projekt "D:\FritzBox\FritzBox.sln" auf Knoten "1", Rebuild Ziel(e).
ValidateSolutionConfiguration:
Die Projektmappenkonfiguration "Release|Mixed Platforms" wird erstellt.
Das Projekt "D:\FritzBox\FritzBox.sln" (1) erstellt "D:\FritzBox\FritzBox\FritzBox.csproj" (2) auf Knoten "1", Rebuild Ziel(e).
CoreClean:
- Die Datei "D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.dll" wird gel\x94scht.
- Die Datei "D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.pdb" wird gel\x94scht.
- Die Datei "D:\FritzBox\FritzBox\bin\x64\Release\Dialogs.dll" wird gel\x94scht.
- Die Datei "D:\FritzBox\FritzBox\obj\x64\Release\FritzBox.csprojResolveAssemblyReference.cache" wird gel\x94scht.
- Die Datei "D:\FritzBox\FritzBox\obj\x64\Release\FritzBox.EditPhoneBook.resources" wird gel\x94scht.
- Die Datei "D:\FritzBox\FritzBox\obj\x64\Release\FritzBox.Properties.Resources.resources" wird gel\x94scht.
- Die Datei "D:\FritzBox\FritzBox\obj\x64\Release\FritzBox.FritzBoxConfig.resources" wird gel\x94scht.
- Die Datei "D:\FritzBox\FritzBox\obj\x64\Release\FritzBox.csproj.GenerateResource.Cache" wird gel\x94scht.
- Die Datei "D:\FritzBox\FritzBox\obj\x64\Release\FritzBox.dll" wird gel\x94scht.
- Die Datei "D:\FritzBox\FritzBox\obj\x64\Release\FritzBox.pdb" wird gel\x94scht.
+ Das Verzeichnis "obj\x64\Release\" wird erstellt.
+PrepareForBuild:
+ Das Verzeichnis "bin\x64\Release\" wird erstellt.
CoreResGen:
C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\ResGen.exe /useSourcePath /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Common.Utils.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Core.dll" /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Data.dll /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Data.Linq.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 (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Xml.Linq.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Utils.dll" /compile EditPhoneBook.resx,obj\x64\Release\FritzBox.EditPhoneBook.resources Properties\Resources.resx,obj\x64\Release\FritzBox.Properties.Resources.resources FritzBoxConfig.resx,obj\x64\Release\FritzBox.FritzBoxConfig.resources
CoreCompile:
@@ -90,16 +83,9 @@
Die Erstellung des Projekts "D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj" ist abgeschlossen, Rebuild Ziel(e).
Das Projekt "D:\FritzBox\FritzBox.sln" (1) erstellt "D:\FritzBox\Tools\FritzBoxDebugger\FritzBoxDebugger.csproj" (4) auf Knoten "1", Rebuild Ziel(e).
CoreClean:
- Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\bin\x86\Release\FritzBoxDebugger.exe.config" wird gel\x94scht.
- Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\bin\x86\Release\FritzBoxDebugger.exe" wird gel\x94scht.
- Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\bin\x86\Release\FritzBoxDebugger.pdb" wird gel\x94scht.
- Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\bin\x86\Release\FritzBox.dll" wird gel\x94scht.
- Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\bin\x86\Release\Dialogs.dll" wird gel\x94scht.
- Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\bin\x86\Release\FritzBox.pdb" wird gel\x94scht.
- Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\x86\Release\FritzBoxDebugger.DebugForm.resources" wird gel\x94scht.
- Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\x86\Release\FritzBoxDebugger.csproj.GenerateResource.Cache" wird gel\x94scht.
- Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\x86\Release\FritzBoxDebugger.exe" wird gel\x94scht.
- Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\x86\Release\FritzBoxDebugger.pdb" wird gel\x94scht.
+ Das Verzeichnis "obj\x86\Release\" wird erstellt.
+PrepareForBuild:
+ Das Verzeichnis "bin\x86\Release\" wird erstellt.
CoreResGen:
C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\ResGen.exe /useSourcePath /r:D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.dll /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /r:"C:\Program Files (x86)\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 /compile DebugForm.resx,obj\x86\Release\FritzBoxDebugger.DebugForm.resources
CoreCompile:
@@ -121,7 +107,7 @@
0 Warnung(en)
0 Fehler
-Verstrichene Zeit 00:00:01.95
+Verstrichene Zeit 00:00:01.81
Reverting to build 0
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
@@ -237,7 +223,7 @@
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
36 Datei(en) kopiert
MpeMaker version: 1.2.200.0
-Build started at 11:08:06
+Build started at 11:12:05
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2013-03-09 10:10:37 UTC (rev 4531)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2013-03-09 10:14:23 UTC (rev 4532)
@@ -841,7 +841,7 @@
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
- <ReleaseDate>2013-03-09T11:08:06.6021364+01:00</ReleaseDate>
+ <ReleaseDate>2013-03-09T11:12:05.5896184+01:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Added: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache 2013-03-09 10:10:37 UTC (rev 4531)
+++ trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache 2013-03-09 10:14:23 UTC (rev 4532)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/build.force
===================================================================
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hor...@us...> - 2013-03-09 10:47:21
|
Revision: 4533
http://sourceforge.net/p/mp-plugins/code/4533
Author: horned-reaper
Date: 2013-03-09 10:47:18 +0000 (Sat, 09 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/FritzBox/FritzBox.csproj
trunk/plugins/FritzBox/FritzBox/FritzBox.csproj.user
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox.sln
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
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/Release/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/FritzBoxDebugger.csproj
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
Added Paths:
-----------
trunk/plugins/FritzBox/FritzBox/obj/Debug/
trunk/plugins/FritzBox/FritzBox/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.EditPhoneBook.resources
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.FritzBoxConfig.resources
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.Properties.Resources.resources
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.GenerateResource.Cache
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Debug/TempPE/
trunk/plugins/FritzBox/FritzBox/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/build.force
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.DebugForm.resources
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csproj.GenerateResource.Cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/build.force
Removed Paths:
-------------
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.csprojResolveAssemblyReference.cache
Property Changed:
----------------
trunk/plugins/FritzBox/FritzBox/
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2013-03-09 10:14:23 UTC (rev 4532)
+++ trunk/plugins/FritzBox/Build/Build.log 2013-03-09 10:47:18 UTC (rev 4533)
@@ -1,6 +1,6 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4531
+SVN Version: 4532
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs
@@ -11,25 +11,29 @@
Copyright (C) Microsoft Corporation. Alle Rechte vorbehalten.
Die Projekte in dieser Projektmappe werden nacheinander erstellt. Um eine parallele Erstellung zu erm\x94glichen, m\x81ssen Sie den Schalter "/m" hinzuf\x81gen.
-Der Buildvorgang wurde am 09.03.2013 11:12:02 gestartet.
+Der Buildvorgang wurde am 09.03.2013 11:35:57 gestartet.
Projekt "D:\FritzBox\FritzBox.sln" auf Knoten "1", Rebuild Ziel(e).
ValidateSolutionConfiguration:
- Die Projektmappenkonfiguration "Release|Mixed Platforms" wird erstellt.
+ Die Projektmappenkonfiguration "Release|Any CPU" wird erstellt.
Das Projekt "D:\FritzBox\FritzBox.sln" (1) erstellt "D:\FritzBox\FritzBox\FritzBox.csproj" (2) auf Knoten "1", Rebuild Ziel(e).
CoreClean:
- Das Verzeichnis "obj\x64\Release\" wird erstellt.
-PrepareForBuild:
- Das Verzeichnis "bin\x64\Release\" wird erstellt.
+ Die Datei "D:\FritzBox\FritzBox\bin\Release\FritzBox.dll" wird gel\x94scht.
+ Die Datei "D:\FritzBox\FritzBox\bin\Release\Dialogs.dll" wird gel\x94scht.
+ Die Datei "D:\FritzBox\FritzBox\obj\Release\FritzBox.EditPhoneBook.resources" wird gel\x94scht.
+ Die Datei "D:\FritzBox\FritzBox\obj\Release\FritzBox.Properties.Resources.resources" wird gel\x94scht.
+ Die Datei "D:\FritzBox\FritzBox\obj\Release\FritzBox.FritzBoxConfig.resources" wird gel\x94scht.
+ Die Datei "D:\FritzBox\FritzBox\obj\Release\FritzBox.csproj.GenerateResource.Cache" wird gel\x94scht.
+ Die Datei "D:\FritzBox\FritzBox\obj\Release\FritzBox.dll" wird gel\x94scht.
+ Die Datei "D:\FritzBox\FritzBox\obj\Release\FritzBox.csprojResolveAssemblyReference.cache" wird gel\x94scht.
CoreResGen:
- C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\ResGen.exe /useSourcePath /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Common.Utils.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Core.dll" /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Data.dll /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Data.Linq.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 (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Xml.Linq.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Utils.dll" /compile EditPhoneBook.resx,obj\x64\Release\FritzBox.EditPhoneBook.resources Properties\Resources.resx,obj\x64\Release\FritzBox.Properties.Resources.resources FritzBoxConfig.resx,obj\x64\Release\FritzBox.FritzBoxConfig.resources
+ C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\ResGen.exe /useSourcePath /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Common.Utils.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Core.dll" /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Data.dll /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Data.Linq.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 (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Xml.Linq.dll" /r:"C:\Program Files (x86)\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:x86 /errorreport:prompt /define:TRACE /highentropyva- /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Common.Utils.dll" /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Core.dll" /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Data.dll /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Data.Linq.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 (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Xml.Linq.dll" /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Utils.dll" /debug:pdbonly /filealign:4096 /optimize+ /out:obj\x64\Release\FritzBox.dll /resource:obj\x64\Release\FritzBox.EditPhoneBook.resources /resource:obj\x64\Release\FritzBox.Properties.Resources.resources /resource:obj\x64\Release\FritzBox.FritzBoxConfig.resources /resource:FritzBox.png,FritzBox.FritzBox.png /resource:FritzBoxDisabled.png,FritzBox.FritzBoxDisabled.png /target:library /warnaserror- /utf8output 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
+ C:\Windows\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /platform:x86 /baseaddress:4194304 /highentropyva- /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Common.Utils.dll" /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Core.dll" /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Data.dll /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Data.Linq.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 (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Xml.Linq.dll" /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Utils.dll" /filealign:4096 /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- /utf8output 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:
- Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" in "bin\x64\Release\Dialogs.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" in "bin\Release\Dialogs.dll" kopiert.
CopyFilesToOutputDirectory:
- Die Datei wird von "obj\x64\Release\FritzBox.dll" in "bin\x64\Release\FritzBox.dll" kopiert.
- FritzBox -> D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.dll
- Die Datei wird von "obj\x64\Release\FritzBox.pdb" in "bin\x64\Release\FritzBox.pdb" kopiert.
+ Die Datei wird von "obj\Release\FritzBox.dll" in "bin\Release\FritzBox.dll" kopiert.
+ FritzBox -> D:\FritzBox\FritzBox\bin\Release\FritzBox.dll
Die Erstellung des Projekts "D:\FritzBox\FritzBox\FritzBox.csproj" ist abgeschlossen, Rebuild Ziel(e).
Das Projekt "D:\FritzBox\FritzBox.sln" (1) erstellt "D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj" (3) auf Knoten "1", Rebuild Ziel(e).
CoreClean:
@@ -56,11 +60,11 @@
Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.exe" wird gel\x94scht.
Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.pdb" wird gel\x94scht.
CoreCompile:
- C:\Windows\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /platform:x86 /define:TRACE /highentropyva- /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /reference:D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /reference:"C:\Program Files (x86)\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 /debug:pdbonly /optimize+ /out:obj\Release\FritzBoxConfigTester.exe /target:winexe /utf8output Program.cs Properties\AssemblyInfo.cs
+ C:\Windows\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /platform:x86 /define:TRACE /highentropyva- /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /reference:D:\FritzBox\FritzBox\bin\Release\FritzBox.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /reference:"C:\Program Files (x86)\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 /debug:pdbonly /optimize+ /out:obj\Release\FritzBoxConfigTester.exe /target:winexe /utf8output Program.cs Properties\AssemblyInfo.cs
_CopyFilesMarkedCopyLocal:
- Die Datei wird von "D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.dll" in "bin\Release\FritzBox.dll" kopiert.
+ Die Datei wird von "D:\FritzBox\FritzBox\bin\Release\FritzBox.dll" in "bin\Release\FritzBox.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Utils.dll" in "bin\Release\Utils.dll" kopiert.
- Die Datei wird von "D:\FritzBox\FritzBox\bin\x64\Release\Dialogs.dll" in "bin\Release\Dialogs.dll" kopiert.
+ Die Datei wird von "D:\FritzBox\FritzBox\bin\Release\Dialogs.dll" in "bin\Release\Dialogs.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Common.Utils.dll" in "bin\Release\Common.Utils.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Bass.Net.dll" in "bin\Release\Bass.Net.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\DirectShowLib.dll" in "bin\Release\DirectShowLib.dll" kopiert.
@@ -73,7 +77,7 @@
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Interop.WMPLib.dll" in "bin\Release\Interop.WMPLib.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\log4net.dll" in "bin\Release\log4net.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Ionic.Zip.dll" in "bin\Release\Ionic.Zip.dll" kopiert.
- Die Datei wird von "D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.pdb" in "bin\Release\FritzBox.pdb" kopiert.
+ Die Datei wird von "D:\FritzBox\FritzBox\bin\Release\FritzBox.pdb" in "bin\Release\FritzBox.pdb" kopiert.
_CopyAppConfigFile:
Die Datei wird von "app.config" in "bin\Release\FritzBoxConfigTester.exe.config" kopiert.
CopyFilesToOutputDirectory:
@@ -83,23 +87,31 @@
Die Erstellung des Projekts "D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj" ist abgeschlossen, Rebuild Ziel(e).
Das Projekt "D:\FritzBox\FritzBox.sln" (1) erstellt "D:\FritzBox\Tools\FritzBoxDebugger\FritzBoxDebugger.csproj" (4) auf Knoten "1", Rebuild Ziel(e).
CoreClean:
- Das Verzeichnis "obj\x86\Release\" wird erstellt.
-PrepareForBuild:
- Das Verzeichnis "bin\x86\Release\" wird erstellt.
+ Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\FritzBoxDebugger.exe.config" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\FritzBoxDebugger.exe" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\FritzBoxDebugger.pdb" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\FritzBox.dll" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\Dialogs.dll" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\FritzBox.pdb" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.DebugForm.resources" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.csproj.GenerateResource.Cache" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.exe" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.pdb" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.csprojResolveAssemblyReference.cache" wird gel\x94scht.
CoreResGen:
- C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\ResGen.exe /useSourcePath /r:D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.dll /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /r:"C:\Program Files (x86)\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 /compile DebugForm.resx,obj\x86\Release\FritzBoxDebugger.DebugForm.resources
+ C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\ResGen.exe /useSourcePath /r:D:\FritzBox\FritzBox\bin\Release\FritzBox.dll /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /r:"C:\Program Files (x86)\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 /compile DebugForm.resx,obj\Release\FritzBoxDebugger.DebugForm.resources
CoreCompile:
- C:\Windows\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /platform:x86 /define:TRACE /highentropyva- /reference:D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /reference:"C:\Program Files (x86)\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 /debug:pdbonly /optimize+ /out:obj\x86\Release\FritzBoxDebugger.exe /resource:obj\x86\Release\FritzBoxDebugger.DebugForm.resources /target:winexe /utf8output DebugForm.cs DebugForm.Designer.cs Program.cs Properties\AssemblyInfo.cs
+ C:\Windows\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /platform:x86 /define:TRACE /highentropyva- /reference:D:\FritzBox\FritzBox\bin\Release\FritzBox.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /reference:"C:\Program Files (x86)\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 /debug:pdbonly /optimize+ /out:obj\Release\FritzBoxDebugger.exe /resource:obj\Release\FritzBoxDebugger.DebugForm.resources /target:winexe /utf8output DebugForm.cs DebugForm.Designer.cs Program.cs Properties\AssemblyInfo.cs
_CopyFilesMarkedCopyLocal:
- Die Datei wird von "D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.dll" in "bin\x86\Release\FritzBox.dll" kopiert.
- Die Datei wird von "D:\FritzBox\FritzBox\bin\x64\Release\Dialogs.dll" in "bin\x86\Release\Dialogs.dll" kopiert.
- Die Datei wird von "D:\FritzBox\FritzBox\bin\x64\Release\FritzBox.pdb" in "bin\x86\Release\FritzBox.pdb" kopiert.
+ Die Datei wird von "D:\FritzBox\FritzBox\bin\Release\FritzBox.dll" in "bin\Release\FritzBox.dll" kopiert.
+ Die Datei wird von "D:\FritzBox\FritzBox\bin\Release\Dialogs.dll" in "bin\Release\Dialogs.dll" kopiert.
+ Die Datei wird von "D:\FritzBox\FritzBox\bin\Release\FritzBox.pdb" in "bin\Release\FritzBox.pdb" kopiert.
_CopyAppConfigFile:
- Die Datei wird von "app.config" in "bin\x86\Release\FritzBoxDebugger.exe.config" kopiert.
+ Die Datei wird von "app.config" in "bin\Release\FritzBoxDebugger.exe.config" kopiert.
CopyFilesToOutputDirectory:
- Die Datei wird von "obj\x86\Release\FritzBoxDebugger.exe" in "bin\x86\Release\FritzBoxDebugger.exe" kopiert.
- FritzBoxDebugger -> D:\FritzBox\Tools\FritzBoxDebugger\bin\x86\Release\FritzBoxDebugger.exe
- Die Datei wird von "obj\x86\Release\FritzBoxDebugger.pdb" in "bin\x86\Release\FritzBoxDebugger.pdb" kopiert.
+ Die Datei wird von "obj\Release\FritzBoxDebugger.exe" in "bin\Release\FritzBoxDebugger.exe" kopiert.
+ FritzBoxDebugger -> D:\FritzBox\Tools\FritzBoxDebugger\bin\Release\FritzBoxDebugger.exe
+ Die Datei wird von "obj\Release\FritzBoxDebugger.pdb" in "bin\Release\FritzBoxDebugger.pdb" kopiert.
Die Erstellung des Projekts "D:\FritzBox\Tools\FritzBoxDebugger\FritzBoxDebugger.csproj" ist abgeschlossen, Rebuild Ziel(e).
Die Erstellung des Projekts "D:\FritzBox\FritzBox.sln" ist abgeschlossen, Rebuild Ziel(e).
@@ -107,7 +119,7 @@
0 Warnung(en)
0 Fehler
-Verstrichene Zeit 00:00:01.81
+Verstrichene Zeit 00:00:02.40
Reverting to build 0
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
@@ -223,7 +235,7 @@
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
36 Datei(en) kopiert
MpeMaker version: 1.2.200.0
-Build started at 11:12:05
+Build started at 11:36:01
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Index: trunk/plugins/FritzBox/FritzBox
===================================================================
--- trunk/plugins/FritzBox/FritzBox 2013-03-09 10:14:23 UTC (rev 4532)
+++ trunk/plugins/FritzBox/FritzBox 2013-03-09 10:47:18 UTC (rev 4533)
Property changes on: trunk/plugins/FritzBox/FritzBox
___________________________________________________________________
Deleted: svn:ignore
## -1 +0,0 ##
-docs
\ No newline at end of property
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.csproj
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.csproj 2013-03-09 10:14:23 UTC (rev 4532)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.csproj 2013-03-09 10:47:18 UTC (rev 4533)
@@ -60,30 +60,6 @@
<PlatformTarget>x86</PlatformTarget>
<OutputPath>bin\x86\Release\</OutputPath>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>bin\x64\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <FileAlignment>4096</FileAlignment>
- <DebugType>Full</DebugType>
- <PlatformTarget>x64</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
- <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
- <CodeAnalysisFailOnMissingRules>true</CodeAnalysisFailOnMissingRules>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
- <OutputPath>bin\x64\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <Optimize>true</Optimize>
- <FileAlignment>4096</FileAlignment>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>x86</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
- <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
- <CodeAnalysisFailOnMissingRules>true</CodeAnalysisFailOnMissingRules>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<OutputPath>C:\Program Files %28x86%29\Team MediaPortal\MediaPortal\plugins\Windows\</OutputPath>
<PlatformTarget>x86</PlatformTarget>
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.csproj.user
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.csproj.user 2013-03-09 10:14:23 UTC (rev 4532)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.csproj.user 2013-03-09 10:47:18 UTC (rev 4533)
@@ -10,14 +10,6 @@
<FallbackCulture>en-US</FallbackCulture>
<VerifyUploadedFiles>false</VerifyUploadedFiles>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
- <StartProgram>C:\Program Files (x86)\Team MediaPortal\MediaPortal\MediaPortal.exe</StartProgram>
- <StartAction>Program</StartAction>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
- <StartProgram>C:\Program Files\Team MediaPortal\MediaPortal\MediaPortal.exe</StartProgram>
- <StartAction>Program</StartAction>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<StartProgram>C:\Program Files (x86)\Team MediaPortal\MediaPortal\MediaPortal.exe</StartProgram>
</PropertyGroup>
Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Added: trunk/plugins/FritzBox/FritzBox/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
===================================================================
--- trunk/plugins/FritzBox/FritzBox/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache 2013-03-09 10:14:23 UTC (rev 4532)
+++ trunk/plugins/FritzBox/FritzBox/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache 2013-03-09 10:47:18 UTC (rev 4533)
Property changes on: trunk/plugins/FritzBox/FritzBox/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.EditPhoneBook.resources
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.EditPhoneBook.resources
===================================================================
--- trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.EditPhoneBook.resources 2013-03-09 10:14:23 UTC (rev 4532)
+++ trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.EditPhoneBook.resources 2013-03-09 10:47:18 UTC (rev 4533)
Property changes on: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.EditPhoneBook.resources
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.FritzBoxConfig.resources
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.FritzBoxConfig.resources
===================================================================
--- trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.FritzBoxConfig.resources 2013-03-09 10:14:23 UTC (rev 4532)
+++ trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.FritzBoxConfig.resources 2013-03-09 10:47:18 UTC (rev 4533)
Property changes on: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.FritzBoxConfig.resources
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.Properties.Resources.resources
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.Properties.Resources.resources
===================================================================
--- trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.Properties.Resources.resources 2013-03-09 10:14:23 UTC (rev 4532)
+++ trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.Properties.Resources.resources 2013-03-09 10:47:18 UTC (rev 4533)
Property changes on: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.Properties.Resources.resources
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.FileListAbsolute.txt
===================================================================
--- trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.FileListAbsolute.txt (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.FileListAbsolute.txt 2013-03-09 10:47:18 UTC (rev 4533)
@@ -0,0 +1,8 @@
+C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\FritzBox.dll
+C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\FritzBox.pdb
+D:\FritzBox\FritzBox\obj\Debug\FritzBox.EditPhoneBook.resources
+D:\FritzBox\FritzBox\obj\Debug\FritzBox.Properties.Resources.resources
+D:\FritzBox\FritzBox\obj\Debug\FritzBox.FritzBoxConfig.resources
+D:\FritzBox\FritzBox\obj\Debug\FritzBox.csproj.GenerateResource.Cache
+D:\FritzBox\FritzBox\obj\Debug\FritzBox.dll
+D:\FritzBox\FritzBox\obj\Debug\FritzBox.pdb
Added: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.GenerateResource.Cache
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.GenerateResource.Cache
===================================================================
--- trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.GenerateResource.Cache 2013-03-09 10:14:23 UTC (rev 4532)
+++ trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.GenerateResource.Cache 2013-03-09 10:47:18 UTC (rev 4533)
Property changes on: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.GenerateResource.Cache
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
===================================================================
--- trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll 2013-03-09 10:14:23 UTC (rev 4532)
+++ trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll 2013-03-09 10:47:18 UTC (rev 4533)
Property changes on: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
===================================================================
--- trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb 2013-03-09 10:14:23 UTC (rev 4532)
+++ trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb 2013-03-09 10:47:18 UTC (rev 4533)
Property changes on: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
===================================================================
--- trunk/plugins/FritzBox/FritzBox/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll 2013-03-09 10:14:23 UTC (rev 4532)
+++ trunk/plugins/FritzBox/FritzBox/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll 2013-03-09 10:47:18 UTC (rev 4533)
Property changes on: trunk/plugins/FritzBox/FritzBox/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.FileListAbsolute.txt
===================================================================
--- trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.FileListAbsolute.txt 2013-03-09 10:14:23 UTC (rev 4532)
+++ trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.FileListAbsolute.txt 2013-03-09 10:47:18 UTC (rev 4533)
@@ -5,3 +5,4 @@
D:\FritzBox\FritzBox\obj\Release\FritzBox.FritzBoxConfig.resources
D:\FritzBox\FritzBox\obj\Release\FritzBox.csproj.GenerateResource.Cache
D:\FritzBox\FritzBox\obj\Release\FritzBox.dll
+D:\FritzBox\FritzBox\obj\Release\FritzBox.csprojResolveAssemblyReference.cache
Added: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csprojResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csprojResolveAssemblyReference.cache
===================================================================
--- trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csprojResolveAssemblyReference.cache 2013-03-09 10:14:23 UTC (rev 4532)
+++ trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csprojResolveAssemblyReference.cache 2013-03-09 10:47:18 UTC (rev 4533)
Property changes on: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csprojResolveAssemblyReference.cache
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox.sln
===================================================================
--- trunk/plugins/FritzBox/FritzBox.sln 2013-03-09 10:14:23 UTC (rev 4532)
+++ trunk/plugins/FritzBox/FritzBox.sln 2013-03-09 10:47:18 UTC (rev 4533)
@@ -10,35 +10,21 @@
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
- Debug|Mixed Platforms = Debug|Mixed Platforms
Release|Any CPU = Release|Any CPU
- Release|Mixed Platforms = Release|Mixed Platforms
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{7A458560-A537-429E-A016-1A4513CB586F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7A458560-A537-429E-A016-1A4513CB586F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {7A458560-A537-429E-A016-1A4513CB586F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {7A458560-A537-429E-A016-1A4513CB586F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{7A458560-A537-429E-A016-1A4513CB586F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7A458560-A537-429E-A016-1A4513CB586F}.Release|Any CPU.Build.0 = Release|Any CPU
- {7A458560-A537-429E-A016-1A4513CB586F}.Release|Mixed Platforms.ActiveCfg = Release|x64
- {7A458560-A537-429E-A016-1A4513CB586F}.Release|Mixed Platforms.Build.0 = Release|x64
{5D751473-DCC5-4044-A6E3-403D97C5B9F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5D751473-DCC5-4044-A6E3-403D97C5B9F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {5D751473-DCC5-4044-A6E3-403D97C5B9F9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {5D751473-DCC5-4044-A6E3-403D97C5B9F9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{5D751473-DCC5-4044-A6E3-403D97C5B9F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5D751473-DCC5-4044-A6E3-403D97C5B9F9}.Release|Any CPU.Build.0 = Release|Any CPU
- {5D751473-DCC5-4044-A6E3-403D97C5B9F9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {5D751473-DCC5-4044-A6E3-403D97C5B9F9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Release|Any CPU.Build.0 = Release|Any CPU
- {FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Release|Mixed Platforms.ActiveCfg = Release|x86
- {FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Release|Mixed Platforms.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2013-03-09 10:14:23 UTC (rev 4532)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2013-03-09 10:47:18 UTC (rev 4533)
@@ -804,7 +804,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.0</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4532</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -827,7 +827,7 @@
<Major>1</Major>
<Minor>0</Minor>
<Build>0</Build>
- <Revision>0</Revision>
+ <Revision>4532</Revision>
</Version>
<ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box information from MediaPortal.
@@ -841,7 +841,7 @@
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
- <ReleaseDate>2013-03-09T11:12:05.5896184+01:00</ReleaseDate>
+ <ReleaseDate>2013-03-09T11:36:01.9028196+01:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Added: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.csproj.FileListAbsolute.txt
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.csproj.FileListAbsolute.txt (rev 0)
+++ trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.csproj.FileListAbsolute.txt 2013-03-09 10:47:18 UTC (rev 4533)
@@ -0,0 +1,6 @@
+C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\FritzBoxConfigTester.exe.config
+C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\FritzBoxConfigTester.exe
+C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\FritzBoxConfigTester.pdb
+D:\FritzBox\Tools\FritzBoxConfigTester\obj\Debug\FritzBoxConfigTester.csprojResolveAssemblyReference.cache
+D:\FritzBox\Tools\FritzBoxConfigTester\obj\Debug\FritzBoxConfigTester.exe
+D:\FritzBox\Tools\FritzBoxConfigTester\obj\Debug\FritzBoxConfigTester.pdb
Added: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.csprojResolveAssemblyReference.cache 2013-03-09 10:14:23 UTC (rev 4532)
+++ trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.csprojResolveAssemblyReference.cache 2013-03-09 10:47:18 UTC (rev 4533)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe 2013-03-09 10:14:23 UTC (rev 4532)
+++ trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe 2013-03-09 10:47:18 UTC (rev 4533)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb 2013-03-09 10:14:23 UTC (rev 4532)
+++ trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb 2013-03-09 10:47:18 UTC (rev 4533)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Added: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/build.force
===================================================================
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/FritzBoxDebugger.csproj
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxDebugger/FritzBoxDebugger.csproj 2013-03-09 10:14:23 UTC (rev 4532)
+++ trunk/plugins/FritzBox/Tools/FritzBoxDebugger/FritzBoxDebugger.csproj 2013-03-09 10:47:18 UTC (rev 4533)
@@ -71,7 +71,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
- <OutputPath>bin\Debug\</OutputPath>
+ <OutputPath>C:\Program Files %28x86%29\Team MediaPortal\MediaPortal\plugins\Windows\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Added: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache 2013-03-09 10:14:23 UTC (rev 4532)
+++ trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache 2013-03-09 10:47:18 UTC (rev 4533)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.DebugForm.resources
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.DebugForm.resources
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.DebugForm.resources 2013-03-09 10:14:23 UTC (rev 4532)
+++ trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.DebugForm.resources 2013-03-09 10:47:18 UTC (rev 4533)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.DebugForm.resources
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csproj.FileListAbsolute.txt
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csproj.FileListAbsolute.txt (rev 0)
+++ trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csproj.FileListAbsolute.txt 2013-03-09 10:47:18 UTC (rev 4533)
@@ -0,0 +1,8 @@
+C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\FritzBoxDebugger.exe.config
+C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\FritzBoxDebugger.exe
+C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\FritzBoxDebugger.pdb
+D:\FritzBox\Tools\FritzBoxDebugger\obj\Debug\FritzBoxDebugger.csprojResolveAssemblyReference.cache
+D:\FritzBox\Tools\FritzBoxDebugger\obj\Debug\FritzBoxDebugger.DebugForm.resources
+D:\FritzBox\Tools\FritzBoxDebugger\obj\Debug\FritzBoxDebugger.csproj.GenerateResource.Cache
+D:\FritzBox\Tools\FritzBoxDebugger\obj\Debug\FritzBoxDebugger.exe
+D:\FritzBox\Tools\FritzBoxDebugger\obj\Debug\FritzBoxDebugger.pdb
Added: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csproj.GenerateResource.Cache
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csproj.GenerateResource.Cache
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csproj.GenerateResource.Cache 2013-03-09 10:14:23 UTC (rev 4532)
+++ trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csproj.GenerateResource.Cache 2013-03-09 10:47:18 UTC (rev 4533)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csproj.GenerateResource.Cache
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csprojResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csprojResolveAssemblyReference.cache
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csprojResolveAssemblyReference.cache 2013-03-09 10:14:23 UTC (rev 4532)
+++ trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csprojResolveAssemblyReference.cache 2013-03-09 10:47:18 UTC (rev 4533)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csprojResolveAssemblyReference.cache
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe 2013-03-09 10:14:23 UTC (rev 4532)
+++ trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe 2013-03-09 10:47:18 UTC (rev 4533)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb 2013-03-09 10:14:23 UTC (rev 4532)
+++ trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb 2013-03-09 10:47:18 UTC (rev 4533)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.csproj.FileListAbsolute.txt
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.csproj.FileListAbsolute.txt 2013-03-09 10:14:23 UTC (rev 4532)
+++ trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.csproj.FileListAbsolute.txt 2013-03-09 10:47:18 UTC (rev 4533)
@@ -8,4 +8,3 @@
D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.csproj.GenerateResource.Cache
D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.exe
D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.pdb
-D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.csprojResolveAssemblyReference.cache
Deleted: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.csprojResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Added: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/build.force
===================================================================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hor...@us...> - 2013-03-10 15:11:57
|
Revision: 4534
http://sourceforge.net/p/mp-plugins/code/4534
Author: horned-reaper
Date: 2013-03-10 15:11:53 +0000 (Sun, 10 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/Docs/Changes.txt
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
trunk/plugins/FritzBox/FritzBox/Settings.cs
trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml
trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml
trunk/plugins/FritzBox/FritzBox/Skin/Titan/FritzManager.xml
trunk/plugins/FritzBox/FritzBox/Skin/Titan/common.facade.fritz.xml
trunk/plugins/FritzBox/FritzBox/Skin/Titan/common.fritz.xml
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.GenerateResource.Cache
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
Added Paths:
-----------
trunk/plugins/FritzBox/FritzBox/obj/Debug/DesignTimeResolveAssemblyReferences.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Removed Paths:
-------------
trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/icon_fritz.png
Property Changed:
----------------
trunk/plugins/FritzBox/FritzBox/Skin/
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2013-03-09 10:47:18 UTC (rev 4533)
+++ trunk/plugins/FritzBox/Build/Build.log 2013-03-10 15:11:53 UTC (rev 4534)
@@ -1,6 +1,6 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4532
+SVN Version: 4533
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs
@@ -11,7 +11,7 @@
Copyright (C) Microsoft Corporation. Alle Rechte vorbehalten.
Die Projekte in dieser Projektmappe werden nacheinander erstellt. Um eine parallele Erstellung zu erm\x94glichen, m\x81ssen Sie den Schalter "/m" hinzuf\x81gen.
-Der Buildvorgang wurde am 09.03.2013 11:35:57 gestartet.
+Der Buildvorgang wurde am 09.03.2013 11:51:43 gestartet.
Projekt "D:\FritzBox\FritzBox.sln" auf Knoten "1", Rebuild Ziel(e).
ValidateSolutionConfiguration:
Die Projektmappenkonfiguration "Release|Any CPU" wird erstellt.
@@ -97,7 +97,6 @@
Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.csproj.GenerateResource.Cache" wird gel\x94scht.
Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.exe" wird gel\x94scht.
Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.pdb" wird gel\x94scht.
- Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.csprojResolveAssemblyReference.cache" wird gel\x94scht.
CoreResGen:
C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\ResGen.exe /useSourcePath /r:D:\FritzBox\FritzBox\bin\Release\FritzBox.dll /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /r:"C:\Program Files (x86)\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 /compile DebugForm.resx,obj\Release\FritzBoxDebugger.DebugForm.resources
CoreCompile:
@@ -119,7 +118,7 @@
0 Warnung(en)
0 Fehler
-Verstrichene Zeit 00:00:02.40
+Verstrichene Zeit 00:00:01.85
Reverting to build 0
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
@@ -235,7 +234,7 @@
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
36 Datei(en) kopiert
MpeMaker version: 1.2.200.0
-Build started at 11:36:01
+Build started at 11:51:47
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Modified: trunk/plugins/FritzBox/Docs/Changes.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Changes.txt 2013-03-09 10:47:18 UTC (rev 4533)
+++ trunk/plugins/FritzBox/Docs/Changes.txt 2013-03-10 15:11:53 UTC (rev 4534)
@@ -1,9 +1,10 @@
New release 1.0.0.4xxx:
New feature:
-- Titan skin support
+- Titan skin support (thanks to RicoHTPC)
Optimizations:
- FRITZ!OS 5.5 support
+- Default skin adjustions for MediaPortal 1.3.0
Fixed bugs:
- black bar is shown in call notification on some skins
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2013-03-09 10:47:18 UTC (rev 4533)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2013-03-10 15:11:53 UTC (rev 4534)
@@ -285,7 +285,7 @@
//
this.checkBoxFilterExtensions.AutoSize = true;
this.checkBoxFilterExtensions.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.checkBoxFilterExtensions.Location = new System.Drawing.Point(253, 161);
+ this.checkBoxFilterExtensions.Location = new System.Drawing.Point(235, 161);
this.checkBoxFilterExtensions.Name = "checkBoxFilterExtensions";
this.checkBoxFilterExtensions.Size = new System.Drawing.Size(305, 17);
this.checkBoxFilterExtensions.TabIndex = 19;
@@ -310,7 +310,7 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.comboBoxExtensions.BorderColor = System.Drawing.Color.Empty;
this.comboBoxExtensions.FormattingEnabled = true;
- this.comboBoxExtensions.Location = new System.Drawing.Point(253, 180);
+ this.comboBoxExtensions.Location = new System.Drawing.Point(235, 180);
this.comboBoxExtensions.MaxLength = 2;
this.comboBoxExtensions.Name = "comboBoxExtensions";
this.comboBoxExtensions.Size = new System.Drawing.Size(51, 21);
@@ -321,7 +321,7 @@
//
this.checkBoxShowPhoneTypeOnNotification.AutoSize = true;
this.checkBoxShowPhoneTypeOnNotification.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.checkBoxShowPhoneTypeOnNotification.Location = new System.Drawing.Point(215, 136);
+ this.checkBoxShowPhoneTypeOnNotification.Location = new System.Drawing.Point(295, 19);
this.checkBoxShowPhoneTypeOnNotification.Name = "checkBoxShowPhoneTypeOnNotification";
this.checkBoxShowPhoneTypeOnNotification.Size = new System.Drawing.Size(107, 17);
this.checkBoxShowPhoneTypeOnNotification.TabIndex = 18;
@@ -355,7 +355,7 @@
//
this.checkBoxShowPhoneNumberOnNotification.AutoSize = true;
this.checkBoxShowPhoneNumberOnNotification.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.checkBoxShowPhoneNumberOnNotification.Location = new System.Drawing.Point(368, 136);
+ this.checkBoxShowPhoneNumberOnNotification.Location = new System.Drawing.Point(410, 20);
this.checkBoxShowPhoneNumberOnNotification.Name = "checkBoxShowPhoneNumberOnNotification";
this.checkBoxShowPhoneNumberOnNotification.Size = new System.Drawing.Size(122, 17);
this.checkBoxShowPhoneNumberOnNotification.TabIndex = 17;
@@ -366,7 +366,7 @@
//
this.checkBoxShowNotificationOnOutgoingCall.AutoSize = true;
this.checkBoxShowNotificationOnOutgoingCall.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.checkBoxShowNotificationOnOutgoingCall.Location = new System.Drawing.Point(215, 20);
+ this.checkBoxShowNotificationOnOutgoingCall.Location = new System.Drawing.Point(157, 19);
this.checkBoxShowNotificationOnOutgoingCall.Name = "checkBoxShowNotificationOnOutgoingCall";
this.checkBoxShowNotificationOnOutgoingCall.Size = new System.Drawing.Size(129, 17);
this.checkBoxShowNotificationOnOutgoingCall.TabIndex = 13;
@@ -407,7 +407,7 @@
//
// numericUpDownMaxNotifies
//
- this.numericUpDownMaxNotifies.Location = new System.Drawing.Point(215, 89);
+ this.numericUpDownMaxNotifies.Location = new System.Drawing.Point(123, 89);
this.numericUpDownMaxNotifies.Maximum = new decimal(new int[] {
20,
0,
@@ -479,7 +479,7 @@
// numericUpDownTimeout
//
this.numericUpDownTimeout.Enabled = false;
- this.numericUpDownTimeout.Location = new System.Drawing.Point(215, 43);
+ this.numericUpDownTimeout.Location = new System.Drawing.Point(190, 43);
this.numericUpDownTimeout.Minimum = new decimal(new int[] {
1,
0,
@@ -501,9 +501,9 @@
this.checkBoxCloseOnTimout.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.checkBoxCloseOnTimout.Location = new System.Drawing.Point(15, 45);
this.checkBoxCloseOnTimout.Name = "checkBoxCloseOnTimout";
- this.checkBoxCloseOnTimout.Size = new System.Drawing.Size(172, 17);
+ this.checkBoxCloseOnTimout.Size = new System.Drawing.Size(175, 17);
this.checkBoxCloseOnTimout.TabIndex = 0;
- this.checkBoxCloseOnTimout.Text = "Auto-close after timeout expired";
+ this.checkBoxCloseOnTimout.Text = "Auto-close after timeout expired:";
this.checkBoxCloseOnTimout.UseVisualStyleBackColor = true;
this.checkBoxCloseOnTimout.CheckedChanged += new System.EventHandler(this.checkBoxCloseOnTimout_CheckedChanged);
//
Modified: trunk/plugins/FritzBox/FritzBox/Settings.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Settings.cs 2013-03-09 10:47:18 UTC (rev 4533)
+++ trunk/plugins/FritzBox/FritzBox/Settings.cs 2013-03-10 15:11:53 UTC (rev 4534)
@@ -492,7 +492,7 @@
if (xmlwriter.GetValueAsString(sectionName, entryName, null) != null)
{
- PauseMediaOnIncomingCall = xmlwriter.GetValueAsBool(sectionName, entryName, false);
+ PauseMediaOnIncomingCall = xmlwriter.GetValueAsBool(sectionName, entryName, true);
xmlwriter.RemoveEntry(sectionName, entryName);
}
@@ -500,7 +500,7 @@
if (xmlwriter.GetValueAsString(sectionName, entryName, null) != null)
{
- ResumeMediaOnIncomingCall = xmlwriter.GetValueAsBool(sectionName, entryName, false);
+ ResumeMediaOnIncomingCall = xmlwriter.GetValueAsBool(sectionName, entryName, true);
xmlwriter.RemoveEntry(sectionName, entryName);
}
Index: trunk/plugins/FritzBox/FritzBox/Skin
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin 2013-03-09 10:47:18 UTC (rev 4533)
+++ trunk/plugins/FritzBox/FritzBox/Skin 2013-03-10 15:11:53 UTC (rev 4534)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin
___________________________________________________________________
Deleted: svn:ignore
## -1 +0,0 ##
-GenericSkin
\ No newline at end of property
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml 2013-03-09 10:47:18 UTC (rev 4533)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml 2013-03-10 15:11:53 UTC (rev 4534)
@@ -1,121 +1,122 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<window>
- <id>464554871</id>
- <defaultcontrol>50</defaultcontrol>
- <allowoverlay>yes</allowoverlay>
- <define>#header.label:666</define>
- <define>#header.hover:-</define>
- <controls>
- <control>
- <description>BG</description>
- <type>image</type>
- <id>1</id>
- <texture>Background.png</texture>
- <width>1280</width>
- <height>720</height>
- </control>
- <import>common.window.xml</import>
- <import>common.time.xml</import>
- <control>
- <description>action menu</description>
+ <id>464554871</id>
+ <defaultcontrol>50</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <define>#header.label:666</define>
+ <define>#header.hover:-</define>
+ <controls>
+ <control>
+ <description>BG</description>
+ <type>image</type>
+ <id>1</id>
+ <texture>Background.png</texture>
+ <width>1280</width>
+ <height>720</height>
+ </control>
+ <import>common.window.xml</import>
+ <import>common.time.xml</import>
+ <control>
+ <description>Action menu</description>
<type>actiongroup</type>
<dimColor>00ffffff</dimColor>
- <width>263</width>
- <height>473</height>
+ <width>206</width>
+ <height>720</height>
<buttonX>0</buttonX>
- <buttonY>0</buttonY>
- <buttonwidth>60</buttonwidth>
- <buttonheight>576</buttonheight>
- <onexit>50</onexit>
+ <buttonY>-60</buttonY>
+ <buttonwidth>79</buttonwidth>
+ <buttonheight>720</buttonheight>
+ <onexit>0</onexit>
<defaultcontrol>2</defaultcontrol>
<textureFocus>Action_focus.png</textureFocus>
<textureNoFocus>Action_nofocus.png</textureNoFocus>
<control>
- <type>image</type>
- <visible>!Control.HasFocus(50)</visible>
- <posX>15</posX>
- <posY>63</posY>
- <width>208</width>
- <height>473</height>
- <texture>Backslide.png</texture>
- <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
- <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
- <colorDiffuse>fffffffff</colorDiffuse>
+ <type>image</type>
+ <visible>!Control.HasFocus(50)</visible>
+ <posX>19</posX>
+ <posY>78</posY>
+ <width>280</width>
+ <height>591</height>
+ <texture>Backslide.png</texture>
+ <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
+ <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
+ <colorDiffuse>fffffffff</colorDiffuse>
</control>
- <control>
- <description>group element</description>
- <type>group</type>
- <visible>!Control.HasFocus(50)</visible>
- <posX>40</posX>
- <posY>97</posY>
- <layout>StackLayout</layout>
- <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
- <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
- <control>
- <id>2</id>
- <description>View-As</description>
- <type>button</type>
- <onright>50</onright>
- <onup>9</onup>
- <label>100</label>
- </control>
- <control>
- <id>3</id>
- <description>Sort</description>
- <type>sortbutton</type>
- <onright>50</onright>
- <ondown>4</ondown>
- </control>
- <control>
- <id>4</id>
- <description>Mode</description>
- <type>button</type>
- <onright>50</onright>
- <ondown>9</ondown>
- <label>Mode</label>
- </control>
- <control>
- <id>9</id>
- <description>Update list</description>
- <type>button</type>
- <onright>50</onright>
- <ondown>2</ondown>
- <label>Update</label>
- </control>
+ <control>
+ <description>group element</description>
+ <type>group</type>
+ <visible>!Control.HasFocus(50)</visible>
+ <posX>37</posX>
+ <posY>121</posY>
+ <layout>StackLayout</layout>
+ <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
+ <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
+ <control>
+ <id>2</id>
+ <description>View as</description>
+ <type>button</type>
+ <onright>50</onright>
+ <onup>9</onup>
+ <label>100</label>
+ </control>
+ <control>
+ <id>3</id>
+ <description>Sort</description>
+ <type>sortbutton</type>
+ <onright>50</onright>
+ <ondown>4</ondown>
+ </control>
+ <control>
+ <id>4</id>
+ <description>Mode</description>
+ <type>button</type>
+ <onright>50</onright>
+ <ondown>9</ondown>
+ <label>Mode</label>
+ </control>
+ <control>
+ <id>9</id>
+ <description>Update list</description>
+ <type>button</type>
+ <onright>50</onright>
+ <ondown>2</ondown>
+ <label>Update</label>
+ </control>
</control>
- </control>
- <import>common.facade.pictures.xml</import>
- <control>
- <id>500</id>
- <type>image</type>
- <posX>44</posX>
- <posY>153</posY>
- <width>167</width>
- <height>142</height>
- <keepaspectratio>yes</keepaspectratio>
- <centered>yes</centered>
- <texture flipY="true" diffuse="Thumb_Mask.png">#selectedthumb</texture>
- <visible>facadeview.list+Control.HasFocus(50)</visible>
- <animation effect="fade" time="450" reversible="false">visible</animation>
- </control>
- <control>
- <type>image</type>
- <id>1</id>
- <posX>40</posX>
- <posY>150</posY>
- <width>178</width>
- <height>144</height>
- <texture flipY="true" diffuse="Thumb_Mask.png">Picture_cover.png</texture>
- <visible>facadeview.list+Control.HasFocus(50)</visible>
- <animation effect="fade" time="450" reversible="false">visible</animation>
- </control>
- <control>
- <type>fadelabel</type>
- <posX>26</posX>
- <posY>18</posY>
- <width>305</width>
- <font>font18</font>
- <label>FritzBox Manager</label>
- </control>
+ </control>
+ <import>common.facade.pictures.xml</import>
+ <control>
+ <description>Contact picture</description>
+ <id>500</id>
+ <type>image</type>
+ <posX>690</posX>
+ <posY>170</posY>
+ <width>167</width>
+ <height>142</height>
+ <keepaspectratio>yes</keepaspectratio>
+ <centered>yes</centered>
+ <texture flipY="true" diffuse="Thumb_Mask.png">#selectedthumb</texture>
+ <visible>yes</visible>
+ <animation effect="fade" time="450" reversible="false">visible</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <id>1</id>
+ <posX>40</posX>
+ <posY>150</posY>
+ <width>178</width>
+ <height>144</height>
+ <texture flipY="true" diffuse="Thumb_Mask.png">Picture_cover.png</texture>
+ <visible>facadeview.list+Control.HasFocus(50)</visible>
+ <animation effect="fade" time="450" reversible="false">visible</animation>
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <posX>26</posX>
+ <posY>18</posY>
+ <width>350</width>
+ <font>font18</font>
+ <label>FRITZ!Box Manager</label>
+ </control>
</controls>
</window>
Modified: trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml 2013-03-09 10:47:18 UTC (rev 4533)
+++ trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml 2013-03-10 15:11:53 UTC (rev 4534)
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<window>
- <id>464554871</id>
- <defaultcontrol>50</defaultcontrol>
- <allowoverlay>yes</allowoverlay>
- <define>#header.label:666</define>
- <define>#header.hover:-</define>
- <controls>
- <control>
- <description>BG</description>
- <type>image</type>
- <id>1</id>
- <texture>Background.png</texture>
- <width>1280</width>
- <height>720</height>
- </control>
- <import>common.window.xml</import>
- <import>common.time.xml</import>
- <control>
- <description>action menu</description>
+ <id>464554871</id>
+ <defaultcontrol>50</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <define>#header.label:666</define>
+ <define>#header.hover:-</define>
+ <controls>
+ <control>
+ <description>BG</description>
+ <type>image</type>
+ <id>1</id>
+ <texture>Background.png</texture>
+ <width>1280</width>
+ <height>720</height>
+ </control>
+ <import>common.window.xml</import>
+ <import>common.time.xml</import>
+ <control>
+ <description>Action menu</description>
<type>actiongroup</type>
<dimColor>00ffffff</dimColor>
<width>263</width>
@@ -31,91 +31,92 @@
<textureFocus>Action_focus.png</textureFocus>
<textureNoFocus>Action_nofocus.png</textureNoFocus>
<control>
- <type>image</type>
- <visible>!Control.HasFocus(50)</visible>
- <posX>15</posX>
- <posY>63</posY>
- <width>329</width>
- <height>473</height>
- <texture>Backslide.png</texture>
- <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
- <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
- <colorDiffuse>fffffffff</colorDiffuse>
+ <type>image</type>
+ <visible>!Control.HasFocus(50)</visible>
+ <posX>15</posX>
+ <posY>63</posY>
+ <width>329</width>
+ <height>473</height>
+ <texture>Backslide.png</texture>
+ <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
+ <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
+ <colorDiffuse>fffffffff</colorDiffuse>
</control>
- <control>
- <description>group element</description>
- <type>group</type>
- <visible>!Control.HasFocus(50)</visible>
- <posX>40</posX>
- <posY>97</posY>
- <layout>StackLayout</layout>
- <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
- <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
- <control>
- <id>2</id>
- <description>View-As</description>
- <type>button</type>
- <onright>50</onright>
- <onup>9</onup>
- <label>100</label>
- </control>
- <control>
- <id>3</id>
- <description>Sort</description>
- <type>sortbutton</type>
- <onright>50</onright>
- <ondown>4</ondown>
- </control>
- <control>
- <id>4</id>
- <description>Mode</description>
- <type>button</type>
- <onright>50</onright>
- <ondown>9</ondown>
- <label>Mode</label>
- </control>
- <control>
- <id>9</id>
- <description>Update list</description>
- <type>button</type>
- <onright>50</onright>
- <ondown>2</ondown>
- <label>Update</label>
- </control>
+ <control>
+ <description>group element</description>
+ <type>group</type>
+ <visible>!Control.HasFocus(50)</visible>
+ <posX>40</posX>
+ <posY>97</posY>
+ <layout>StackLayout</layout>
+ <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
+ <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
+ <control>
+ <id>2</id>
+ <description>View as</description>
+ <type>button</type>
+ <onright>50</onright>
+ <onup>9</onup>
+ <label>100</label>
+ </control>
+ <control>
+ <id>3</id>
+ <description>Sort</description>
+ <type>sortbutton</type>
+ <onright>50</onright>
+ <ondown>4</ondown>
+ </control>
+ <control>
+ <id>4</id>
+ <description>Mode</description>
+ <type>button</type>
+ <onright>50</onright>
+ <ondown>9</ondown>
+ <label>Mode</label>
+ </control>
+ <control>
+ <id>9</id>
+ <description>Update list</description>
+ <type>button</type>
+ <onright>50</onright>
+ <ondown>2</ondown>
+ <label>Update</label>
+ </control>
</control>
- </control>
- <import>common.facade.pictures.xml</import>
- <control>
- <id>500</id>
- <type>image</type>
- <posX>44</posX>
- <posY>153</posY>
- <width>167</width>
- <height>142</height>
- <keepaspectratio>yes</keepaspectratio>
- <centered>yes</centered>
- <texture flipY="true" diffuse="Thumb_Mask.png">#selectedthumb</texture>
- <visible>facadeview.list+Control.HasFocus(50)</visible>
- <animation effect="fade" time="450" reversible="false">visible</animation>
- </control>
- <control>
- <type>image</type>
- <id>1</id>
- <posX>40</posX>
- <posY>150</posY>
- <width>178</width>
- <height>144</height>
- <texture flipY="true" diffuse="Thumb_Mask.png">Picture_cover.png</texture>
- <visible>facadeview.list+Control.HasFocus(50)</visible>
- <animation effect="fade" time="450" reversible="false">visible</animation>
- </control>
- <control>
- <type>fadelabel</type>
- <posX>26</posX>
- <posY>18</posY>
- <width>350</width>
- <font>font18</font>
- <label>FritzBox Manager</label>
- </control>
+ </control>
+ <import>common.facade.pictures.xml</import>
+ <control>
+ <description>Contact picture</description>
+ <id>500</id>
+ <type>image</type>
+ <posX>950</posX>
+ <posY>170</posY>
+ <width>167</width>
+ <height>142</height>
+ <keepaspectratio>yes</keepaspectratio>
+ <centered>yes</centered>
+ <texture flipY="true" diffuse="Thumb_Mask.png">#selectedthumb</texture>
+ <visible>yes</visible>
+ <animation effect="fade" time="450" reversible="false">visible</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <id>1</id>
+ <posX>40</posX>
+ <posY>150</posY>
+ <width>178</width>
+ <height>144</height>
+ <texture flipY="true" diffuse="Thumb_Mask.png">Picture_cover.png</texture>
+ <visible>facadeview.list+Control.HasFocus(50)</visible>
+ <animation effect="fade" time="450" reversible="false">visible</animation>
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <posX>26</posX>
+ <posY>18</posY>
+ <width>350</width>
+ <font>font18</font>
+ <label>FRITZ!Box Manager</label>
+ </control>
</controls>
</window>
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Titan/FritzManager.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Titan/FritzManager.xml 2013-03-09 10:47:18 UTC (rev 4533)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Titan/FritzManager.xml 2013-03-10 15:11:53 UTC (rev 4534)
@@ -1,167 +1,140 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<window>
- <id>464554871</id>
- <defaultcontrol>50</defaultcontrol>
- <allowoverlay>yes</allowoverlay>
- <define>#header.label:Fritz!Box Manager</define>
- <define>#header.hover:hover_fritzbox.png</define>
- <controls>
- <import>common.fritz.xml</import>
- <import>common.time.xml</import>
-
- <control>
- <description>DEFAULT BACKGROUND</description>
- <type>image</type>
- <id>0</id>
- <posX>0</posX>
- <posY>0</posY>
- <width>1920</width>
- <height>1080</height>
- <texture>hover_fritzbox.png</texture>
- <shouldCache>true</shouldCache>
- </control>
-
- <control>
- <description>Shaddow</description>
- <type>image</type>
- <id>0</id>
- <posX>770</posX>
- <posY>300</posY>
- <width>1130</width>
- <height>670</height>
- <texture>info_bg.png</texture>
- <animation effect="fade" time="250">WindowOpen</animation>
- <animation effect="fade" time="250">WindowClose</animation>
- </control>
-
- <control>
- <description>Shaddow1</description>
- <type>image</type>
- <id>0</id>
- <posX>60</posX>
- <posY>300</posY>
- <width>180</width>
- <height>180</height>
- <texture>info_bg.png</texture>
- <visible>facadeview.list+Control.HasFocus(50)</visible>
- <animation effect="fade" time="250">WindowOpen</animation>
- <animation effect="fade" time="250">WindowClose</animation>
- </control>
-
- <control>
- <description>action menu</description>
- <type>actiongroup</type>
- <dimColor>00ffffff</dimColor>
- <width>263</width>
- <height>473</height>
- <buttonX>0</buttonX>
- <buttonY>0</buttonY>
- <buttonwidth>60</buttonwidth>
- <buttonheight>576</buttonheight>
- <onexit>50</onexit>
- <defaultcontrol>2</defaultcontrol>
- <textureFocus>action_menu.png</textureFocus>
- <textureNoFocus>Action_nofocus.png</textureNoFocus>
-
+ <id>464554871</id>
+ <defaultcontrol>50</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <define>#header.label:FRITZ!Box Manager</define>
+ <define>#header.hover:hover_fritzbox.png</define>
+ <controls>
+ <import>common.fritz.xml</import>
+ <import>common.time.xml</import>
+ <control>
+ <description>Default background</description>
+ <type>image</type>
+ <id>0</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1920</width>
+ <height>1080</height>
+ <texture>hover_fritzbox.png</texture>
+ <shouldCache>true</shouldCache>
+ </control>
+ <control>
+ <description>Shaddow behind facadeview</description>
+ <type>image</type>
+ <id>0</id>
+ <posX>770</posX>
+ <posY>300</posY>
+ <width>1130</width>
+ <height>670</height>
+ <texture>info_bg.png</texture>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Action menu</description>
+ <type>actiongroup</type>
+ <dimColor>00ffffff</dimColor>
+ <width>263</width>
+ <height>473</height>
+ <buttonX>0</buttonX>
+ <buttonY>0</buttonY>
+ <buttonwidth>60</buttonwidth>
+ <buttonheight>576</buttonheight>
+ <onexit>50</onexit>
+ <defaultcontrol>2</defaultcontrol>
+ <textureFocus>action_menu.png</textureFocus>
+ <textureNoFocus>Action_nofocus.png</textureNoFocus>
+ <control>
+ <type>image</type>
+ <visible>!Control.HasFocus(50)</visible>
+ <posX>-15</posX>
+ <posY>283</posY>
+ <width>500</width>
+ <height>300</height>
+ <texture>menu_bg.png</texture>
+ <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
+ <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
+ <colorDiffuse>fffffffff</colorDiffuse>
+ </control>
+ <control>
+ <description>group element</description>
+ <type>group</type>
+ <visible>!Control.HasFocus(50)</visible>
+ <posX>40</posX>
+ <posY>317</posY>
+ <layout>StackLayout</layout>
+ <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
+ <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
<control>
- <type>image</type>
- <visible>!Control.HasFocus(50)</visible>
- <posX>-15</posX>
- <posY>283</posY>
- <width>500</width>
- <height>300</height>
- <texture>menu_bg.png</texture>
- <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
- <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
- <colorDiffuse>fffffffff</colorDiffuse>
+ <id>2</id>
+ <description>View-As</description>
+ <type>button</type>
+ <onright>50</onright>
+ <onup>9</onup>
+ <label>100</label>
</control>
-
<control>
- <description>group element</description>
- <type>group</type>
- <visible>!Control.HasFocus(50)</visible>
- <posX>40</posX>
- <posY>317</posY>
- <layout>StackLayout</layout>
- <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
- <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
-
- <control>
- <id>2</id>
- <description>View-As</description>
- <type>button</type>
- <onright>50</onright>
- <onup>9</onup>
- <label>100</label>
- </control>
-
- <control>
- <id>3</id>
- <description>Sort</description>
- <type>sortbutton</type>
- <onright>50</onright>
- <ondown>4</ondown>
- </control>
-
- <control>
- <id>4</id>
- <description>Mode</description>
- <type>button</type>
- <onright>50</onright>
- <ondown>9</ondown>
- <label>Mode</label>
- </control>
-
- <control>
- <id>9</id>
- <description>Update list</description>
- <type>button</type>
- <onright>50</onright>
- <ondown>2</ondown>
- <label>Update</label>
- </control>
-
+ <id>3</id>
+ <description>Sort</description>
+ <type>sortbutton</type>
+ <onright>50</onright>
+ <ondown>4</ondown>
</control>
- </control>
- <import>common.facade.fritz.xml</import>
-
-<control>
- <id>500</id>
- <type>image</type>
- <posX>66</posX>
- <posY>320</posY>
- <width>167</width>
- <height>142</height>
- <keepaspectratio>yes</keepaspectratio>
- <centered>yes</centered>
- <texture>#selectedthumb</texture>
- <visible>facadeview.list+Control.HasFocus(50)</visible>
- <animation effect="fade" time="450" reversible="false">visible</animation>
- </control>
-
-<control>
- <type>image</type>
- <id>1</id>
- <posX>62</posX>
- <posY>317</posY>
- <width>178</width>
- <height>144</height>
- <texture>Picture_cover.png</texture>
- <visible>facadeview.list+Control.HasFocus(50)</visible>
- <animation effect="fade" time="450" reversible="false">visible</animation>
- </control>
-
-<control>
- <id>0</id>
- <type>image</type>
- <posX>60</posX>
- <posY>40</posY>
- <width>68</width>
- <height>60</height>
- <texture>icon_fritz.png</texture>
- <animation effect="fade" time="250">WindowOpen</animation>
- <animation effect="fade" time="250">WindowClose</animation>
- </control>
-
+ <control>
+ <id>4</id>
+ <description>Mode</description>
+ <type>button</type>
+ <onright>50</onright>
+ <ondown>9</ondown>
+ <label>Mode</label>
+ </control>
+ <control>
+ <id>9</id>
+ <description>Update list</description>
+ <type>button</type>
+ <onright>50</onright>
+ <ondown>2</ondown>
+ <label>Update</label>
+ </control>
+ </control>
+ </control>
+ <import>common.facade.fritz.xml</import>
+ <control>
+ <description>Contact picture</description>
+ <id>500</id>
+ <type>image</type>
+ <posX>500</posX>
+ <posY>320</posY>
+ <width>167</width>
+ <height>142</height>
+ <keepaspectratio>yes</keepaspectratio>
+ <centered>yes</centered>
+ <texture>#selectedthumb</texture>
+ <visible>yes</visible>
+ <animation effect="fade" time="450" reversible="false">visible</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <id>1</id>
+ <posX>62</posX>
+ <posY>317</posY>
+ <width>178</width>
+ <height>144</height>
+ <texture>Picture_cover.png</texture>
+ <visible>facadeview.list+Control.HasFocus(50)</visible>
+ <animation effect="fade" time="450" reversible="false">visible</animation>
+ </control>
+ <control>
+ <id>0</id>
+ <type>image</type>
+ <posX>60</posX>
+ <posY>40</posY>
+ <width>68</width>
+ <height>60</height>
+ <texture>icon_fritz.png</texture>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
+ </control>
</controls>
-</window>
+</window>
\ No newline at end of file
Deleted: trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/icon_fritz.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Titan/common.facade.fritz.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Titan/common.facade.fritz.xml 2013-03-09 10:47:18 UTC (rev 4533)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Titan/common.facade.fritz.xml 2013-03-10 15:11:53 UTC (rev 4534)
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<window>
<controls>
-
- <!-- :: List Scrolling Popup :: -->
-
+ <!-- :: List Scrolling Popup :: -->
<control>
<description>listscroller bg</description>
<type>image</type>
@@ -16,8 +14,7 @@
<visible>facadeview.list+string.contains(#scrolling.up,yes)|string.contains(#scrolling.down,yes)</visible>
<animation effect="fade" time="250">Visible</animation>
<animation effect="fade" time="0">Hidden</animation>
- </control>
-
+ </control>
<control>
<type>label</type>
<id>1</id>
@@ -34,12 +31,8 @@
<animation effect="fade" time="250">Visible</animation>
<animation effect="fade" time="0">Hidden</animation>
</control>
-
- <!-- :: Count :: -->
-
-
+ <!-- :: Count :: -->
<!-- :: Listview Lines :: -->
-
<control>
<description>List Lines</description>
<type>image</type>
@@ -52,8 +45,7 @@
<visible>facadeview.list + control.isvisible(50)</visible>
<animation effect="fade" time="250">WindowOpen</animation>
<animation effect="fade" time="250">WindowClose</animation>
- </control>
-
+ </control>
<control>
<description>group element</description>
<type>group</type>
@@ -81,7 +73,6 @@
<spinPosX>1828</spinPosX>
<spinPosY>1000</spinPosY>
</control>
-
<control>
<description>Thumbnail Panel</description>
<type>thumbnailpanel</type>
@@ -124,8 +115,7 @@
<spinPosX>1828</spinPosX>
<spinPosY>1000</spinPosY>
<unfocusedAlpha>255</unfocusedAlpha>
- </control>
-
+ </control>
<control>
<description>Filmstrip view</description>
<type>filmstrip</type>
@@ -171,8 +161,7 @@
<spinPosY>1000</spinPosY>
<thumbAnimation effect="zoom" acceleration="-2" start="100,100" reversible="false" end="135,135" center="0,800" time="200">focus</thumbAnimation>
<thumbAnimation effect="zoom" start="135,135" reversible="false" end="100,100" center="0,800" time="100">unfocus</thumbAnimation>
- </control>
-
+ </control>
<control>
<description>Cover Flow view</description>
<type>coverflow</type>
@@ -231,8 +220,6 @@
<cards flipY="true" diffuse="Thumb_Mask.png" mask="pictures_filmstrip_mask.png"></cards>
</control>
</control>
-
</control>
-
</controls>
</window>
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Titan/common.fritz.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Titan/common.fritz.xml 2013-03-09 10:47:18 UTC (rev 4533)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Titan/common.fritz.xml 2013-03-10 15:11:53 UTC (rev 4534)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<window>
<controls>
+
<control>
<description>BG</description>
<type>image</type>
@@ -10,7 +11,7 @@
</control>
<!-- :: Overlays :: -->
-
+
<control>
<description>background listview</description>
<type>image</type>
@@ -53,7 +54,7 @@
<animation effect="fade" time="250">WindowClose</animation>
<animation effect="slide" time="250" start="-1890,0">WindowOpen</animation>
<animation effect="slide" time="250" end="-1890,0">WindowClose</animation>
- </control>
+ </control>
</controls>
-</window>
+</window>
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Added: trunk/plugins/FritzBox/FritzBox/obj/Debug/DesignTimeResolveAssemblyReferences.cache
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/obj/Debug/DesignTimeResolveAssemblyReferences.cache
===================================================================
--- trunk/plugins/FritzBox/FritzBox/obj/Debug/DesignTimeResolveAssemblyReferences.cache 2013-03-09 10:47:18 UTC (rev 4533)
+++ trunk/plugins/FritzBox/FritzBox/obj/Debug/DesignTimeResolveAssemblyReferences.cache 2013-03-10 15:11:53 UTC (rev 4534)
Property changes on: trunk/plugins/FritzBox/FritzBox/obj/Debug/DesignTimeResolveAssemblyReferences.cache
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.GenerateResource.Cache
===================================================================
(Binary files differ)
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/FritzBox/obj/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2013-03-09 10:47:18 UTC (rev 4533)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2013-03-10 15:11:53 UTC (rev 4534)
@@ -804,7 +804,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4532</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4533</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -827,7 +827,7 @@
<Major>1</Major>
<Minor>0</Minor>
<Build>0</Build>
- <Revision>4532</Revision>
+ <Revision>4533</Revision>
</Version>
<ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box information from MediaPortal.
@@ -841,7 +841,7 @@
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
- <ReleaseDate>2013-03-09T11:36:01.9028196+01:00</ReleaseDate>
+ <ReleaseDate>2013-03-09T11:51:47.0125387+01:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Added: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache 2013-03-09 10:47:18 UTC (rev 4533)
+++ trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache 2013-03-10 15:11:53 UTC (rev 4534)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
===================================================================
(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/Release/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csprojResolveAssemblyReference.cache
===================================================================
(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)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hor...@us...> - 2013-03-11 07:59:51
|
Revision: 4536
http://sourceforge.net/p/mp-plugins/code/4536
Author: horned-reaper
Date: 2013-03-11 07:59:47 +0000 (Mon, 11 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/Docs/Changes.txt
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.GenerateResource.Cache
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.GenerateResource.Cache
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
Added Paths:
-----------
trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4535.mpe1
trunk/plugins/FritzBox/releases/update.xml
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2013-03-10 21:22:44 UTC (rev 4535)
+++ trunk/plugins/FritzBox/Build/Build.log 2013-03-11 07:59:47 UTC (rev 4536)
@@ -1,6 +1,6 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4533
+SVN Version: 4535
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs
@@ -11,7 +11,7 @@
Copyright (C) Microsoft Corporation. Alle Rechte vorbehalten.
Die Projekte in dieser Projektmappe werden nacheinander erstellt. Um eine parallele Erstellung zu erm\x94glichen, m\x81ssen Sie den Schalter "/m" hinzuf\x81gen.
-Der Buildvorgang wurde am 09.03.2013 11:51:43 gestartet.
+Der Buildvorgang wurde am 10.03.2013 23:02:54 gestartet.
Projekt "D:\FritzBox\FritzBox.sln" auf Knoten "1", Rebuild Ziel(e).
ValidateSolutionConfiguration:
Die Projektmappenkonfiguration "Release|Any CPU" wird erstellt.
@@ -118,7 +118,7 @@
0 Warnung(en)
0 Fehler
-Verstrichene Zeit 00:00:01.85
+Verstrichene Zeit 00:00:02.39
Reverting to build 0
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
@@ -190,12 +190,11 @@
..\FritzBox\Skin\Titan\Media\FritzBox\CallMonitor.Missing.png
..\FritzBox\Skin\Titan\Media\FritzBox\CallMonitor.Unknown.png
..\FritzBox\Skin\Titan\Media\FritzBox\callout.png
-..\FritzBox\Skin\Titan\Media\FritzBox\icon_fritz.png
..\FritzBox\Skin\Titan\Media\FritzBox\Phone_Icon_Home.png
..\FritzBox\Skin\Titan\Media\FritzBox\Phone_Icon_Mobile.png
..\FritzBox\Skin\Titan\Media\FritzBox\Phone_Icon_Work.png
..\FritzBox\Skin\Titan\Media\FritzBox\rejected.png
-66 Datei(en) kopiert
+65 Datei(en) kopiert
..\FritzBox\Languages\strings_de.xml
..\FritzBox\Languages\strings_el.xml
..\FritzBox\Languages\strings_en-US.xml
@@ -234,7 +233,7 @@
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
36 Datei(en) kopiert
MpeMaker version: 1.2.200.0
-Build started at 11:51:47
+Build started at 23:02:58
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Modified: trunk/plugins/FritzBox/Docs/Changes.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Changes.txt 2013-03-10 21:22:44 UTC (rev 4535)
+++ trunk/plugins/FritzBox/Docs/Changes.txt 2013-03-11 07:59:47 UTC (rev 4536)
@@ -1,4 +1,4 @@
-New release 1.0.0.4xxx:
+New release 1.0.0.4535:
New feature:
- Titan skin support (thanks to RicoHTPC)
@@ -6,5 +6,5 @@
- FRITZ!OS 5.5 support
- Default skin adjustions for MediaPortal 1.3.0
-Fixed bugs:
+Fixed bug:
- black bar is shown in call notification on some skins
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2013-03-10 21:22:44 UTC (rev 4535)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2013-03-11 07:59:47 UTC (rev 4536)
@@ -273,7 +273,7 @@
// buttonExtensionsRemove
//
this.buttonExtensionsRemove.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonExtensionsRemove.Location = new System.Drawing.Point(335, 209);
+ this.buttonExtensionsRemove.Location = new System.Drawing.Point(309, 209);
this.buttonExtensionsRemove.Name = "buttonExtensionsRemove";
this.buttonExtensionsRemove.Size = new System.Drawing.Size(63, 21);
this.buttonExtensionsRemove.TabIndex = 22;
@@ -285,7 +285,7 @@
//
this.checkBoxFilterExtensions.AutoSize = true;
this.checkBoxFilterExtensions.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.checkBoxFilterExtensions.Location = new System.Drawing.Point(235, 161);
+ this.checkBoxFilterExtensions.Location = new System.Drawing.Point(225, 161);
this.checkBoxFilterExtensions.Name = "checkBoxFilterExtensions";
this.checkBoxFilterExtensions.Size = new System.Drawing.Size(305, 17);
this.checkBoxFilterExtensions.TabIndex = 19;
@@ -296,7 +296,7 @@
// buttonExtensionsAdd
//
this.buttonExtensionsAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonExtensionsAdd.Location = new System.Drawing.Point(251, 209);
+ this.buttonExtensionsAdd.Location = new System.Drawing.Point(225, 209);
this.buttonExtensionsAdd.Name = "buttonExtensionsAdd";
this.buttonExtensionsAdd.Size = new System.Drawing.Size(63, 21);
this.buttonExtensionsAdd.TabIndex = 21;
@@ -310,7 +310,7 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.comboBoxExtensions.BorderColor = System.Drawing.Color.Empty;
this.comboBoxExtensions.FormattingEnabled = true;
- this.comboBoxExtensions.Location = new System.Drawing.Point(235, 180);
+ this.comboBoxExtensions.Location = new System.Drawing.Point(225, 180);
this.comboBoxExtensions.MaxLength = 2;
this.comboBoxExtensions.Name = "comboBoxExtensions";
this.comboBoxExtensions.Size = new System.Drawing.Size(51, 21);
Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.GenerateResource.Cache
===================================================================
(Binary files differ)
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/FritzBox/obj/Release/FritzBox.csproj.GenerateResource.Cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2013-03-10 21:22:44 UTC (rev 4535)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2013-03-11 07:59:47 UTC (rev 4536)
@@ -92,9 +92,9 @@
</GroupItem>
<GroupItem Name="Titan Skin">
<ParentGroup />
- <DisplayName>Titan Skin</DisplayName>
+ <DisplayName>Titan skin</DisplayName>
<DefaulChecked>false</DefaulChecked>
- <Description>Titan Skin</Description>
+ <Description>Titan skin</Description>
<Files>
<Items>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
@@ -181,21 +181,14 @@
<ZipFileName>Installer{CopyFile}\{3c9f92a6-9b66-44ba-84f8-fece835debd8}-common.fritz.xml</ZipFileName>
<DestinationFilename>%Skin%\Titan\common.fritz.xml</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
- <Param1 />
- <UpdateOption>OverwriteIfOlder</UpdateOption>
- <LocalFileName>..\_release\skin\Titan\Media\FritzBox\icon_fritz.png</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{178f3a22-555f-426d-832f-73eb625f7d82}-icon_fritz.png</ZipFileName>
- <DestinationFilename>%Skin%\Titan\Media\FritzBox\icon_fritz.png</DestinationFilename>
- </FileItem>
</Items>
</Files>
</GroupItem>
<GroupItem Name="Blue3 Skin">
<ParentGroup />
- <DisplayName>Blue3 Skin</DisplayName>
+ <DisplayName>Blue3 skin</DisplayName>
<DefaulChecked>false</DefaulChecked>
- <Description>Blue3 Skin</Description>
+ <Description>Blue3 skin</Description>
<Files>
<Items>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
@@ -273,9 +266,9 @@
</GroupItem>
<GroupItem Name="Maya Skin">
<ParentGroup />
- <DisplayName>Maya Skin</DisplayName>
+ <DisplayName>Maya skin</DisplayName>
<DefaulChecked>false</DefaulChecked>
- <Description>Maya Skin</Description>
+ <Description>Maya skin</Description>
<Files>
<Items>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
@@ -353,9 +346,9 @@
</GroupItem>
<GroupItem Name="Black & White Skin">
<ParentGroup />
- <DisplayName>Black & White Skin</DisplayName>
+ <DisplayName>Black & White skin</DisplayName>
<DefaulChecked>false</DefaulChecked>
- <Description>Black & White Skin</Description>
+ <Description>Black & White skin</Description>
<Files>
<Items>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
@@ -433,9 +426,9 @@
</GroupItem>
<GroupItem Name="Default Skin">
<ParentGroup>Default</ParentGroup>
- <DisplayName>Default Skin</DisplayName>
+ <DisplayName>Default skin</DisplayName>
<DefaulChecked>true</DefaulChecked>
- <Description>Default Skin</Description>
+ <Description>Default skin</Description>
<Files>
<Items>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
@@ -513,9 +506,9 @@
</GroupItem>
<GroupItem Name="DefaultWide Skin">
<ParentGroup>Default</ParentGroup>
- <DisplayName>DefaultWide Skin</DisplayName>
+ <DisplayName>DefaultWide skin</DisplayName>
<DefaulChecked>true</DefaulChecked>
- <Description>DefaultWide Skin</Description>
+ <Description>DefaultWide skin</Description>
<Files>
<Items>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
@@ -600,9 +593,9 @@
</GroupItem>
<GroupItem Name="Streamed MP Skin">
<ParentGroup />
- <DisplayName>Streamed MP Skin</DisplayName>
+ <DisplayName>Streamed MP skin</DisplayName>
<DefaulChecked>false</DefaulChecked>
- <Description>Streamed MP Skin</Description>
+ <Description>Streamed MP skin</Description>
<Files>
<Items>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
@@ -700,6 +693,7 @@
<string>Blue3 Skin</string>
<string>Maya Skin</string>
<string>Streamed MP Skin</string>
+ <string>Titan Skin</string>
</IncludedGroups>
<PanelName>Tree View Selector</PanelName>
<WizardButtonsEnum>BackNextCancel</WizardButtonsEnum>
@@ -804,7 +798,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4533</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4535</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -827,7 +821,7 @@
<Major>1</Major>
<Minor>0</Minor>
<Build>0</Build>
- <Revision>4533</Revision>
+ <Revision>4535</Revision>
</Version>
<ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box information from MediaPortal.
@@ -841,7 +835,7 @@
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
- <ReleaseDate>2013-03-09T11:51:47.0125387+01:00</ReleaseDate>
+ <ReleaseDate>2013-03-10T23:02:58.9670455+01:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
@@ -1039,13 +1033,6 @@
<ZipFileName>Installer{CopyFile}\{3c9f92a6-9b66-44ba-84f8-fece835debd8}-common.fritz.xml</ZipFileName>
<DestinationFilename>%Skin%\Titan\common.fritz.xml</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
- <Param1 />
- <UpdateOption>OverwriteIfOlder</UpdateOption>
- <LocalFileName>..\_release\skin\Titan\Media\FritzBox\icon_fritz.png</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{178f3a22-555f-426d-832f-73eb625f7d82}-icon_fritz.png</ZipFileName>
- <DestinationFilename>%Skin%\Titan\Media\FritzBox\icon_fritz.png</DestinationFilename>
- </FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
===================================================================
(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/Release/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csprojResolveAssemblyReference.cache
===================================================================
(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)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Added: trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4535.mpe1
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4535.mpe1
===================================================================
--- trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4535.mpe1 2013-03-10 21:22:44 UTC (rev 4535)
+++ trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4535.mpe1 2013-03-11 07:59:47 UTC (rev 4536)
Property changes on: trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4535.mpe1
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/releases/update.xml
===================================================================
--- trunk/plugins/FritzBox/releases/update.xml (rev 0)
+++ trunk/plugins/FritzBox/releases/update.xml 2013-03-11 07:59:47 UTC (rev 4536)
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ExtensionCollection xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <Items>
+ <PackageClass>
+ <Version>2.0</Version>
+ <Groups>
+ <Items>
+ <GroupItem Name="Default">
+ <DisplayName>Default</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Default</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Titan Skin">
+ <DisplayName>Titan Skin</DisplayName>
+ <DefaulChecked>false</DefaulChecked>
+ <Description>Titan Skin</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Blue3 Skin">
+ <DisplayName>Blue3 Skin</DisplayName>
+ <DefaulChecked>false</DefaulChecked>
+ <Description>Blue3 Skin</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Maya Skin">
+ <DisplayName>Maya Skin</DisplayName>
+ <DefaulChecked>false</DefaulChecked>
+ <Description>Maya Skin</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Black & White Skin">
+ <DisplayName>Black & White Skin</DisplayName>
+ <DefaulChecked>false</DefaulChecked>
+ <Description>Black & White Skin</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Default Skin">
+ <DisplayName>Default Skin</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Default Skin</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="DefaultWide Skin">
+ <DisplayName>DefaultWide Skin</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>DefaultWide Skin</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Streamed MP Skin">
+ <DisplayName>Streamed MP Skin</DisplayName>
+ <DefaulChecked>false</DefaulChecked>
+ <Description>Streamed MP Skin</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items />
+ </Sections>
+ <Dependencies>
+ <Items>
+ <DependencyItem>
+ <Type>MediaPortal</Type>
+ <Id />
+ <MinVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MinVersion>
+ <MaxVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MaxVersion>
+ <WarnOnly>false</WarnOnly>
+ <Message>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ </Items>
+ </Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="FritzBox.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.1.0.0</MinRequiredVersion>
+ <DesignedForVersion>1.1.7.4535</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items>
+ <SubSystemItem Name="MP.Config" />
+ </Items>
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
+ <GeneralInfo>
+ <Name>FritzBox Manager</Name>
+ <Id>8cb6bbc2-5473-4a63-a8f9-e0bec7c8c81c</Id>
+ <Author>Horned_Reaper, Steve, Chefkoch</Author>
+ <HomePage>http://www.team-mediaportal.com/extensions/other/fritzbox-manager-phone-manager-callmonitor-for-avm-fritz-box</HomePage>
+ <ForumPage>http://forum.team-mediaportal.com/mediaportal-plugins-47/fritz-box-manager-english-forum-103177/#post817050</ForumPage>
+ <UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=52</UpdateUrl>
+ <Version>
+ <Major>1</Major>
+ <Minor>0</Minor>
+ <Build>0</Build>
+ <Revision>4535</Revision>
+ </Version>
+ <ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box information from MediaPortal.
+
+Features:
+- notification for incoming and outgoing calls via window, sound and contact picture
+- MediaPortal Player is automatically paused and resumed on calls
+- access call lists, voice box and phone book directly in MediaPortal
+- voice box message notification in any MediaPortal screen
+- connection establishment from call list, voice box or phone book entries
+- language localization</ExtensionDescription>
+ <VersionDescription />
+ <DevelopmentStatus>Stable</DevelopmentStatus>
+ <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
+ <ReleaseDate>2013-03-10T23:02:58.9670455+01:00</ReleaseDate>
+ <Tags>fritzbox, fritzbox manager, callmonitor</Tags>
+ <Location>..\MpeRelease\FritzBox.mpe1</Location>
+ <Params>
+ <Items>
+ <SectionParam Name="Online Icon">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Configuration file">
+ <Value />
+ <ValueType>Template</ValueType>
+ <Description>The file used to configure the extension.
+ If have .exe extension the will be executed
+ If have .dll extension used like MP plugin configuration</Description>
+ </SectionParam>
+ <SectionParam Name="Online Screenshots">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>Online stored screenshot urls separated by ; </Description>
+ </SectionParam>
+ <SectionParam Name="Force to uninstall on update">
+ <Value>yes</Value>
+ <ValueType>Bool</ValueType>
+ <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ </GeneralInfo>
+ <UniqueFileList>
+ <Items />
+ </UniqueFileList>
+ <ProjectSettings>
+ <FolderGroups />
+ </ProjectSettings>
+ <IsSkin>false</IsSkin>
+ </PackageClass>
+ </Items>
+</ExtensionCollection>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hor...@us...> - 2013-03-20 19:06:16
|
Revision: 4550
http://sourceforge.net/p/mp-plugins/code/4550
Author: horned-reaper
Date: 2013-03-20 19:06:09 +0000 (Wed, 20 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/Docs/Changes.txt
trunk/plugins/FritzBox/FritzBox/FritzBox.cs
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs
trunk/plugins/FritzBox/FritzBox/bin/Release/Dialogs.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.GenerateResource.Cache
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.GenerateResource.Cache
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/FritzBoxConfigTester.csproj
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Common.Utils.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Dialogs.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/DirectShowLib.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/MediaPortal.Support.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Utils.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/Dialogs.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/releases/update.xml
Added Paths:
-----------
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/FritzManager.xml
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/CallMonitor.Missing.png
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/CallMonitor.Unknown.png
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Home.png
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Mobile.png
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Work.png
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/callin.png
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/callout.png
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/rejected.png
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/hover_fritzbox.png
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Core.dll
trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4547.mpe1
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/Build/Build.log 2013-03-20 19:06:09 UTC (rev 4550)
@@ -1,6 +1,6 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4535
+SVN Version: 4547
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs
@@ -11,7 +11,7 @@
Copyright (C) Microsoft Corporation. Alle Rechte vorbehalten.
Die Projekte in dieser Projektmappe werden nacheinander erstellt. Um eine parallele Erstellung zu erm\x94glichen, m\x81ssen Sie den Schalter "/m" hinzuf\x81gen.
-Der Buildvorgang wurde am 10.03.2013 23:02:54 gestartet.
+Der Buildvorgang wurde am 18.03.2013 11:00:21 gestartet.
Projekt "D:\FritzBox\FritzBox.sln" auf Knoten "1", Rebuild Ziel(e).
ValidateSolutionConfiguration:
Die Projektmappenkonfiguration "Release|Any CPU" wird erstellt.
@@ -62,6 +62,7 @@
CoreCompile:
C:\Windows\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /platform:x86 /define:TRACE /highentropyva- /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /reference:D:\FritzBox\FritzBox\bin\Release\FritzBox.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /reference:"C:\Program Files (x86)\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 /debug:pdbonly /optimize+ /out:obj\Release\FritzBoxConfigTester.exe /target:winexe /utf8output Program.cs Properties\AssemblyInfo.cs
_CopyFilesMarkedCopyLocal:
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" in "bin\Release\Core.dll" kopiert.
Die Datei wird von "D:\FritzBox\FritzBox\bin\Release\FritzBox.dll" in "bin\Release\FritzBox.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Utils.dll" in "bin\Release\Utils.dll" kopiert.
Die Datei wird von "D:\FritzBox\FritzBox\bin\Release\Dialogs.dll" in "bin\Release\Dialogs.dll" kopiert.
@@ -118,7 +119,7 @@
0 Warnung(en)
0 Fehler
-Verstrichene Zeit 00:00:02.39
+Verstrichene Zeit 00:00:04.85
Reverting to build 0
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
@@ -129,6 +130,16 @@
1 Datei(en) kopiert
..\FritzBox\Resources\speexdec.exe
1 Datei(en) kopiert
+..\FritzBox\Skin\Avalon\FritzManager.xml
+..\FritzBox\Skin\Avalon\Media\hover_fritzbox.png
+..\FritzBox\Skin\Avalon\Media\FritzBox\callin.png
+..\FritzBox\Skin\Avalon\Media\FritzBox\CallMonitor.Missing.png
+..\FritzBox\Skin\Avalon\Media\FritzBox\CallMonitor.Unknown.png
+..\FritzBox\Skin\Avalon\Media\FritzBox\callout.png
+..\FritzBox\Skin\Avalon\Media\FritzBox\Phone_Icon_Home.png
+..\FritzBox\Skin\Avalon\Media\FritzBox\Phone_Icon_Mobile.png
+..\FritzBox\Skin\Avalon\Media\FritzBox\Phone_Icon_Work.png
+..\FritzBox\Skin\Avalon\Media\FritzBox\rejected.png
..\FritzBox\Skin\Black & White\FritzManager.xml
..\FritzBox\Skin\Black & White\Media\hover_FritzBox.png
..\FritzBox\Skin\Black & White\Media\FritzBox\callin.png
@@ -194,7 +205,7 @@
..\FritzBox\Skin\Titan\Media\FritzBox\Phone_Icon_Mobile.png
..\FritzBox\Skin\Titan\Media\FritzBox\Phone_Icon_Work.png
..\FritzBox\Skin\Titan\Media\FritzBox\rejected.png
-65 Datei(en) kopiert
+75 Datei(en) kopiert
..\FritzBox\Languages\strings_de.xml
..\FritzBox\Languages\strings_el.xml
..\FritzBox\Languages\strings_en-US.xml
@@ -232,8 +243,8 @@
..\FritzBox\Languages\Unsupported\strings_uk.xml
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
36 Datei(en) kopiert
-MpeMaker version: 1.2.200.0
-Build started at 23:02:58
+MpeMaker version: 1.3.0.0
+Build started at 11:00:29
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Modified: trunk/plugins/FritzBox/Docs/Changes.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Changes.txt 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/Docs/Changes.txt 2013-03-20 19:06:09 UTC (rev 4550)
@@ -1,10 +1,5 @@
-New release 1.0.0.4535:
+1.0.0.4547:
New feature:
-- Titan skin support (thanks to RicoHTPC)
-
-Optimizations:
-- FRITZ!OS 5.5 support
-- Default skin adjustions for MediaPortal 1.3.0
-
+- Avalon skin support
Fixed bug:
-- black bar is shown in call notification on some skins
\ No newline at end of file
+- call list is not shown with FRITZ!OS older than version 5.5
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2013-03-20 19:06:09 UTC (rev 4550)
@@ -1240,6 +1240,7 @@
// add contact picture
elem.ThumbnailImage = phoneBook.GetCallerImagePath(caller);
+ // add call type icon
string prefix = "FritzBox\\";
string icon = "defaultAudioBig.png";
@@ -1249,8 +1250,8 @@
elem.IconImageBig = icon;
elem.IconImage = icon;
- elem.IsFolder = false;
+ // add call item to list
facadeView.Add(elem);
}
}
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2013-03-20 19:06:09 UTC (rev 4550)
@@ -407,7 +407,7 @@
//
// numericUpDownMaxNotifies
//
- this.numericUpDownMaxNotifies.Location = new System.Drawing.Point(123, 89);
+ this.numericUpDownMaxNotifies.Location = new System.Drawing.Point(126, 89);
this.numericUpDownMaxNotifies.Maximum = new decimal(new int[] {
20,
0,
@@ -479,7 +479,7 @@
// numericUpDownTimeout
//
this.numericUpDownTimeout.Enabled = false;
- this.numericUpDownTimeout.Location = new System.Drawing.Point(190, 43);
+ this.numericUpDownTimeout.Location = new System.Drawing.Point(195, 43);
this.numericUpDownTimeout.Minimum = new decimal(new int[] {
1,
0,
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs 2013-03-20 19:06:09 UTC (rev 4550)
@@ -30,6 +30,7 @@
private string sid;
private string dialport;
private System.Object cacheSync = new System.Object();
+ private bool fritzOS55; // indicates of the FRITZ!Box OS version is 5.5 or higher
static Logger Log = LoggerFactory.getLogger("Fritz");
@@ -89,6 +90,7 @@
sid = matchList[0].Groups[1].Value;
}
}
+ else fritzOS55 = true;
}
}
catch { }
@@ -231,13 +233,14 @@
// download CSV file
try
{
- // new procedure since FRITZ!OS 5.5
- result = client.DownloadData("http://" + hostname + "/fon_num/foncalls_list.lua?sid=" + sid + "&csv=");
-
- if (result.Length == 147) // error message "...Luacgi not readable filename..."
+ switch (fritzOS55)
{
- // procedure before FRITZ!OS 5.5
- result = client.DownloadData(baseurl + "?sid=" + sid + "&getpage=../html/de/FRITZ%21Box_Anrufliste.csv");
+ case true:
+ result = client.DownloadData("http://" + hostname + "/fon_num/foncalls_list.lua?sid=" + sid + "&csv="); // new procedure since FRITZ!OS 5.5
+ break;
+ case false:
+ result = client.DownloadData(baseurl + "?sid=" + sid + "&getpage=../html/de/FRITZ%21Box_Anrufliste.csv"); // old procedure before FRITZ!OS 5.5
+ break;
}
}
catch {}
Added: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/FritzManager.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Avalon/FritzManager.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Avalon/FritzManager.xml 2013-03-20 19:06:09 UTC (rev 4550)
@@ -0,0 +1,288 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<window>
+ <id>464554871</id>
+ <defaultcontrol>50</defaultcontrol>
+ <allowoverlay>no</allowoverlay>
+ <define>#header.label:FritzBox Manager</define>
+ <define>#header.hover:hover_FritzBox.png</define>
+ <controls>
+ <import>common.overlay.xml</import>
+
+ <control>
+ <description>default background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1920</width>
+ <height>1080</height>
+ <texture>background.png</texture>
+ </control>
+
+ <control>
+ <description>background</description>
+ <id>0</id>
+ <type>image</type>
+ <posY>0</posY>
+ <posX>0</posX>
+ <width>1920</width>
+ <height>1080</height>
+ <keepaspectratio>no</keepaspectratio>
+ <texture>#header.hover</texture>
+ <visible>[facadeview.list | facadeview.smallicons | facadeview.largeicons]+Control.IsVisible(50)</visible>
+ <animation effect="fade" time="0">WindowClose</animation>
+ <animation effect="fade" start="0" end="100" time="300" delay="350">WindowOpen</animation>
+ </control>
+ <control>
+ <description>background listview</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1920</width>
+ <height>1080</height>
+ <texture>overlay_long.png</texture>
+ <visible>[facadeview.list | facadeview.album | facadeview.smallicons | facadeview.largeicons]</visible>
+ </control>
+
+ <control>
+ <description>background listview</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>1</posX>
+ <posY>92</posY>
+ <width>1893</width>
+ <height>795</height>
+ <texture>viewport_noposter_music.png</texture>
+ <visible>facadeview.list+Control.IsVisible(50)</visible>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
+ <animation effect="slide" time="250" start="-1890,0">WindowOpen</animation>
+ <animation effect="slide" time="250" end="-1890,0">WindowClose</animation>
+ </control>
+
+ <control>
+ <description>viewport thumbs</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>1</posX>
+ <posY>92</posY>
+ <width>1893</width>
+ <height>795</height>
+ <texture>viewport_thumbs.png</texture>
+ <visible>[facadeview.smallicons | facadeview.largeicons] + Control.IsVisible(50)</visible>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
+ <animation effect="slide" time="250" start="-1890,0">WindowOpen</animation>
+ <animation effect="slide" time="250" end="-1890,0">WindowClose</animation>
+ </control>
+
+ <control>
+ <description>viewport shadow poster disabled</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>467</posX>
+ <posY>120</posY>
+ <width>469</width>
+ <height>739</height>
+ <texture>viewport_shadow.png</texture>
+ <visible>facadeview.list + Control.IsVisible(50)</visible>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
+ <animation effect="slide" time="250" start="-1890,0">WindowOpen</animation>
+ <animation effect="slide" time="250" end="-1890,0">WindowClose</animation>
+ </control>
+
+ <import>common.time.xml</import>
+
+ <control Style="HeaderLabels">
+ <description>Current Feed</description>
+ <type>fadelabel</type>
+ <id>4711</id>
+ <posX>185</posX>
+ <posY>38</posY>
+ <width>800</width>
+ <label>-</label>
+ <font>font22</font>
+ <animation effect="fade" start="0" end="100" time="300" delay="350">WindowOpen</animation>
+ <animation effect="fade" start="100" end="0" time="0" delay="0">WindowClose</animation>
+ </control>
+
+ <control>
+ <description>Selected item Label</description>
+ <type>fadelabel</type>
+ <id>1</id>
+ <posX>1832</posX>
+ <posY>956</posY>
+ <width>1170</width>
+ <label>#selecteditem</label>
+ <font>fontB16</font>
+ <align>right</align>
+ <visible>[facadeview.list | facadeview.smallicons | facadeview.largeicons]+Control.IsVisible(50)+!string.equals(#selecteditem2)</visible>
+ <animation effect="fade" start="0" end="100" time="300" delay="350">WindowOpen</animation>
+ <animation effect="fade" start="100" end="0" time="0" delay="0">WindowClose</animation>
+ </control>
+ <control>
+ <description>Selected item Label</description>
+ <type>fadelabel</type>
+ <id>1</id>
+ <posX>1832</posX>
+ <posY>956</posY>
+ <width>1170</width>
+ <label>#selecteditem2 / #selecteditem</label>
+ <font>fontB16</font>
+ <align>right</align>
+ <visible>[facadeview.list | facadeview.smallicons | facadeview.largeicons]+Control.IsVisible(50)+string.equals(#selecteditem2)</visible>
+ <animation effect="fade" start="0" end="100" time="300" delay="350">WindowOpen</animation>
+ <animation effect="fade" start="100" end="0" time="0" delay="0">WindowClose</animation>
+ </control>
+
+ <control>
+ <id>1</id>
+ <type>image</type>
+ <posX>0</posX>
+ <posY>440</posY>
+ <width>64</width>
+ <height>199</height>
+ <texture>hiddenmenu_tab.png</texture>
+ <visible>[facadeview.list | facadeview.smallicons | facadeview.largeicons]+Control.HasFocus(50) + !string.contains(#Avalon.HiddenMenu, false)</visible>
+ <animation effect="slide" start="-60,0" time="250" delay="400">WindowOpen</animation>
+ <animation effect="slide" start="0,0" end="-60,0" time="250" delay="100">WindowClose</animation>
+ </control>
+
+ <control>
+ <type>actiongroup</type>
+ <description>action menu</description>
+ <defaultcontrol>2</defaultcontrol>
+ <onexit>50</onexit>
+ <dimColor>00ffffff</dimColor>
+ <buttonX>0</buttonX>
+ <buttonY>0</buttonY>
+ <buttonwidth>497</buttonwidth>
+ <buttonheight>1080</buttonheight>
+
+ <control>
+ <type>image</type>
+ <id>0</id>
+ <width>1920</width>
+ <height>1080</height>
+ <texture>semi_trans_back_hidden_menu.png</texture>
+ <visible>!Control.HasFocus(50)</visible>
+ <animation effect="fade" time="450">visible</animation>
+ <animation effect="fade" time="400">hidden</animation>
+ </control>
+
+ <control>
+ <type>image</type>
+ <id>0</id>
+ <posY>15</posY>
+ <posX>0</posX>
+ <width>631</width>
+ <height>1044</height>
+ <texture>menu_bg.png</texture>
+ <visible>!Control.HasFocus(50)</visible>
+ <animation effect="fade" time="0">WindowClose</animation>
+ <animation effect="slide" start="-150,0" time="100">visible</animation>
+ <animation effect="fade" time="250">visible</animation>
+ <animation effect="fade" time="0">hidden</animation>
+ </control>
+
+ <control Style="HiddenMenuMenu">
+ <description>Menu label</description>
+ <type>label</type>
+ <id>1</id>
+ <posX>128</posX>
+ <posY>90</posY>
+ <label>499</label>
+ <visible>!Control.HasFocus(50)</visible>
+ <animation effect="fade" time="0">WindowClose</animation>
+ <animation effect="slide" start="-150,0" time="100">visible</animation>
+ <animation effect="fade" time="250">visible</animation>
+ <animation effect="fade" time="0">hidden</animation>
+ </control>
+ <control>
+ <type>group</type>
+ <description>group element</description>
+ <visible>!Control.HasFocus(50)</visible>
+ <animation effect="fade" time="0">WindowClose</animation>
+ <animation effect="slide" start="-150,0" time="100">visible</animation>
+ <animation effect="fade" time="250">visible</animation>
+ <animation effect="fade" time="0">hidden</animation>
+ <posX>69</posX>
+ <posY>155</posY>
+ <layout>StackLayout(0, Vertical, true)</layout>
+
+ <control Style="HiddenMenuItems">
+ <id>2</id>
+ <description>View-As</description>
+ <type>button</type>
+ <textureFocus>hiddenmenu_item_selected.png</textureFocus>
+ <textureNoFocus>-</textureNoFocus>
+ <width>497</width>
+ <height>64</height>
+ <textXOff>58</textXOff>
+ <textYOff>14</textYOff>
+ <onright>50</onright>
+ <onup>9</onup>
+ <label>100</label>
+ </control>
+ <control Style="HiddenMenuItems">
+ <id>3</id>
+ <description>Sort</description>
+ <type>sortbutton</type>
+ <textureFocus>hiddenmenu_item_selected.png</textureFocus>
+ <textureNoFocus>-</textureNoFocus>
+ <width>497</width>
+ <height>64</height>
+ <textXOff>58</textXOff>
+ <textYOff>14</textYOff>
+ <onright>50</onright>
+ <ondown>4</ondown>
+ </control>
+ <control Style="HiddenMenuItems">
+ <id>4</id>
+ <description>Modus</description>
+ <type>button</type>
+ <textureFocus>hiddenmenu_item_selected.png</textureFocus>
+ <textureNoFocus>-</textureNoFocus>
+ <width>497</width>
+ <height>64</height>
+ <textXOff>58</textXOff>
+ <textYOff>14</textYOff>
+ <onright>50</onright>
+ <ondown>9</ondown>
+ <label>Anrufliste</label>
+ </control>
+ <control Style="HiddenMenuItems">
+ <id>9</id>
+ <description>Receive new list</description>
+ <type>button</type>
+ <textureFocus>hiddenmenu_item_selected.png</textureFocus>
+ <textureNoFocus>-</textureNoFocus>
+ <width>497</width>
+ <height>64</height>
+ <textXOff>58</textXOff>
+ <textYOff>14</textYOff>
+ <onright>50</onright>
+ <ondown>2</ondown>
+ <label>Update</label>
+ </control>
+ </control>
+ </control>
+ <!--
+ <control>
+ <id>1</id>
+ <type>image</type>
+ <posX>90</posX>
+ <posY>250</posY>
+ <width>348</width>
+ <height>348</height>
+ <keepaspectratio>yes</keepaspectratio>
+ <texture flipY="true" diffuse="Thumb_Mask.png">#selectedthumb</texture>
+ <visible>!facadeview.filmstrip</visible>
+ <animation effect="fade" start="100" end="0" time="250">WindowClose</animation>
+ </control>
+ -->
+ <import>FritzManager.facade.xml</import>
+ </controls>
+</window>
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/CallMonitor.Missing.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/CallMonitor.Missing.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/CallMonitor.Missing.png 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/CallMonitor.Missing.png 2013-03-20 19:06:09 UTC (rev 4550)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/CallMonitor.Missing.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/CallMonitor.Unknown.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/CallMonitor.Unknown.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/CallMonitor.Unknown.png 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/CallMonitor.Unknown.png 2013-03-20 19:06:09 UTC (rev 4550)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/CallMonitor.Unknown.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Home.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Home.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Home.png 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Home.png 2013-03-20 19:06:09 UTC (rev 4550)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Home.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Mobile.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Mobile.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Mobile.png 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Mobile.png 2013-03-20 19:06:09 UTC (rev 4550)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Mobile.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Work.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Work.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Work.png 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Work.png 2013-03-20 19:06:09 UTC (rev 4550)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Work.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/callin.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/callin.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/callin.png 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/callin.png 2013-03-20 19:06:09 UTC (rev 4550)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/callin.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/callout.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/callout.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/callout.png 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/callout.png 2013-03-20 19:06:09 UTC (rev 4550)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/callout.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/rejected.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/rejected.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/rejected.png 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/rejected.png 2013-03-20 19:06:09 UTC (rev 4550)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/rejected.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/hover_fritzbox.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/hover_fritzbox.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/hover_fritzbox.png 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/hover_fritzbox.png 2013-03-20 19:06:09 UTC (rev 4550)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/hover_fritzbox.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/Dialogs.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.FileListAbsolute.txt
===================================================================
--- trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.FileListAbsolute.txt 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.FileListAbsolute.txt 2013-03-20 19:06:09 UTC (rev 4550)
@@ -6,3 +6,4 @@
D:\FritzBox\FritzBox\obj\Debug\FritzBox.csproj.GenerateResource.Cache
D:\FritzBox\FritzBox\obj\Debug\FritzBox.dll
D:\FritzBox\FritzBox\obj\Debug\FritzBox.pdb
+D:\FritzBox\FritzBox\obj\Debug\FritzBox.csprojResolveAssemblyReference.cache
Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.GenerateResource.Cache
===================================================================
(Binary files differ)
Added: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csprojResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csprojResolveAssemblyReference.cache
===================================================================
--- trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csprojResolveAssemblyReference.cache 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csprojResolveAssemblyReference.cache 2013-03-20 19:06:09 UTC (rev 4550)
Property changes on: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csprojResolveAssemblyReference.cache
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
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/FritzBox/obj/Release/FritzBox.csproj.GenerateResource.Cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csprojResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2013-03-20 19:06:09 UTC (rev 4550)
@@ -622,6 +622,79 @@
</Items>
</Files>
</GroupItem>
+ <GroupItem Name="Avalon Skin">
+ <ParentGroup />
+ <DisplayName>Avalon Skin</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Avalon Skin</Description>
+ <Files>
+ <Items>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\FritzManager.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{404d8fdb-c896-44ca-9ac0-24fb1f983bea}-FritzManager.xml</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\FritzManager.xml</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\Media\hover_fritzbox.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{5608e907-1913-4aab-95f8-37f03a07f688}-hover_fritzbox.png</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\Media\hover_fritzbox.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\Media\FritzBox\CallMonitor.Missing.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{ce2aa5d9-8992-4d0b-aa6f-4b276626aa25}-CallMonitor.Missing.png</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\Media\FritzBox\CallMonitor.Missing.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\Media\FritzBox\CallMonitor.Unknown.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{d8a2f5dd-aad5-490e-a52a-303603d6cefb}-CallMonitor.Unknown.png</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\Media\FritzBox\CallMonitor.Unknown.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\Media\FritzBox\callout.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{53f6fb9c-b97b-4e65-82e0-e9d7e53cad40}-callout.png</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\Media\FritzBox\callout.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\Media\FritzBox\Phone_Icon_Home.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{0b9bd34e-c724-4904-a458-0e13d58e8542}-Phone_Icon_Home.png</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\Media\FritzBox\Phone_Icon_Home.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\Media\FritzBox\Phone_Icon_Mobile.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{881911ca-f20d-4ea7-a91a-02657a48905d}-Phone_Icon_Mobile.png</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\Media\FritzBox\Phone_Icon_Mobile.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\Media\FritzBox\Phone_Icon_Work.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{ef02bf45-aaf2-4b1c-b6f8-480a7d6764d5}-Phone_Icon_Work.png</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\Media\FritzBox\Phone_Icon_Work.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\Media\FritzBox\rejected.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{c6205570-8488-48cf-86dc-e2933c9dde23}-rejected.png</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\Media\FritzBox\rejected.png</DestinationFilename>
+ </FileItem>
+ </Items>
+ </Files>
+ </GroupItem>
</Items>
</Groups>
<Sections>
@@ -689,6 +762,7 @@
<Items />
</Actions>
<IncludedGroups>
+ <string>Avalon Skin</string>
<string>Black & White Skin</string>
<string>Blue3 Skin</string>
<string>Maya Skin</string>
@@ -798,7 +872,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4535</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4547</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -821,7 +895,7 @@
<Major>1</Major>
<Minor>0</Minor>
<Build>0</Build>
- <Revision>4535</Revision>
+ <Revision>4547</Revision>
</Version>
<ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box information from MediaPortal.
@@ -835,7 +909,7 @@
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
- <ReleaseDate>2013-03-10T23:02:58.9670455+01:00</ReleaseDate>
+ <ReleaseDate>2013-03-18T11:00:29.448938+01:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
@@ -1404,6 +1478,69 @@
<ZipFileName>Installer{CopyFile}\{ca228657-f8bf-468f-8437-ee3d484bd8e0}-Phone_Icon_Work.png</ZipFileName>
<DestinationFilename>%Skin%\StreamedMP\Media\FritzBox\Phone_Icon_Work.png</DestinationFilename>
</FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\FritzManager.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{404d8fdb-c896-44ca-9ac0-24fb1f983bea}-FritzManager.xml</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\FritzManager.xml</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\Media\hover_fritzbox.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{5608e907-1913-4aab-95f8-37f03a07f688}-hover_fritzbox.png</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\Media\hover_fritzbox.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\Media\FritzBox\CallMonitor.Missing.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{ce2aa5d9-8992-4d0b-aa6f-4b276626aa25}-CallMonitor.Missing.png</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\Media\FritzBox\CallMonitor.Missing.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\Media\FritzBox\CallMonitor.Unknown.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{d8a2f5dd-aad5-490e-a52a-303603d6cefb}-CallMonitor.Unknown.png</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\Media\FritzBox\CallMonitor.Unknown.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\Media\FritzBox\callout.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{53f6fb9c-b97b-4e65-82e0-e9d7e53cad40}-callout.png</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\Media\FritzBox\callout.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\Media\FritzBox\Phone_Icon_Home.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{0b9bd34e-c724-4904-a458-0e13d58e8542}-Phone_Icon_Home.png</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\Media\FritzBox\Phone_Icon_Home.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\Media\FritzBox\Phone_Icon_Mobile.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{881911ca-f20d-4ea7-a91a-02657a48905d}-Phone_Icon_Mobile.png</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\Media\FritzBox\Phone_Icon_Mobile.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\Media\FritzBox\Phone_Icon_Work.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{ef02bf45-aaf2-4b1c-b6f8-480a7d6764d5}-Phone_Icon_Work.png</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\Media\FritzBox\Phone_Icon_Work.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\Media\FritzBox\rejected.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{c6205570-8488-48cf-86dc-e2933c9dde23}-rejected.png</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\Media\FritzBox\rejected.png</DestinationFilename>
+ </FileItem>
</Items>
</UniqueFileList>
<ProjectSettings>
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/FritzBoxConfigTester.csproj
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/FritzBoxConfigTester.csproj 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/FritzBoxConfigTester.csproj 2013-03-20 19:06:09 UTC (rev 4550)
@@ -100,7 +100,7 @@
<ItemGroup>
<Reference Include="Core">
<HintPath>C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll</HintPath>
- <Private>False</Private>
+ <Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Common.Utils.dll
===================================================================
(Binary files differ)
Added: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Core.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Core.dll
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Core.dll 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Core.dll 2013-03-20 19:06:09 UTC (rev 4550)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Core.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Dialogs.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/DirectShowLib.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/MediaPortal.Support.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Utils.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
===================================================================
(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/Release/FritzBoxConfigTester.csproj.FileListAbsolute.txt
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csproj.FileListAbsolute.txt 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csproj.FileListAbsolute.txt 2013-03-20 19:06:09 UTC (rev 4550)
@@ -20,3 +20,4 @@
D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.csprojResolveAssemblyReference.cache
D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.exe
D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.pdb
+D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\Core.dll
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/Dialogs.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csprojResolveAssemblyReference.cache
===================================================================
(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)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Added: trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4547.mpe1
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4547.mpe1
===================================================================
--- trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4547.mpe1 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4547.mpe1 2013-03-20 19:06:09 UTC (rev 4550)
Property changes on: trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4547.mpe1
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/FritzBox/releases/update.xml
===================================================================
--- trunk/plugins/FritzBox/releases/update.xml 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/releases/update.xml 2013-03-20 19:06:09 UTC (rev 4550)
@@ -69,6 +69,14 @@
<Items />
</Files>
</GroupItem>
+ <GroupItem Name="Avalon Skin">
+ <DisplayName>Avalon Skin</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Avalon Skin</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
</Items>
</Groups>
<Sections>
@@ -104,7 +112,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4535</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4547</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -127,7 +135,7 @@
<Major>1</Major>
<Minor>0</Minor>
<Build>0</Build>
- <Revision>4535</Revision>
+ <Revision>4547</Revision>
</Version>
<ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box information from MediaPortal.
@@ -141,7 +149,7 @@
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
- <ReleaseDate>2013-03-10T23:02:58.9670455+01:00</ReleaseDate>
+ <ReleaseDate>2013-03-18T11:00:29.448938+01:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hor...@us...> - 2013-03-20 19:11:49
|
Revision: 4551
http://sourceforge.net/p/mp-plugins/code/4551
Author: horned-reaper
Date: 2013-03-20 19:11:46 +0000 (Wed, 20 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/FritzBox/Skin/Titan/FritzManager.xml
Added Paths:
-----------
trunk/plugins/FritzBox/FritzBox/docs/
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/TempPE/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/x86/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/x86/Debug/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/TempPE/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/x86/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/x86/Debug/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/x86/Debug/TempPE/
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Titan/FritzManager.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Titan/FritzManager.xml 2013-03-20 19:06:09 UTC (rev 4550)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Titan/FritzManager.xml 2013-03-20 19:11:46 UTC (rev 4551)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>f
<window>
<id>464554871</id>
<defaultcontrol>50</defaultcontrol>
@@ -6,30 +6,30 @@
<define>#header.label:FRITZ!Box Manager</define>
<define>#header.hover:hover_fritzbox.png</define>
<controls>
- <import>common.fritz.xml</import>
- <import>common.time.xml</import>
- <control>
- <description>Default background</description>
- <type>image</type>
- <id>0</id>
- <posX>0</posX>
- <posY>0</posY>
- <width>1920</width>
- <height>1080</height>
- <texture>hover_fritzbox.png</texture>
- <shouldCache>true</shouldCache>
+ <import>common.fritz.xml</import>
+ <import>common.time.xml</import>
+ <control>
+ <description>Default background</description>
+ <type>image</type>
+ <id>0</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1920</width>
+ <height>1080</height>
+ <texture>hover_fritzbox.png</texture>
+ <shouldCache>true</shouldCache>
</control>
<control>
- <description>Shaddow behind facadeview</description>
- <type>image</type>
- <id>0</id>
- <posX>770</posX>
- <posY>300</posY>
- <width>1130</width>
- <height>670</height>
- <texture>info_bg.png</texture>
- <animation effect="fade" time="250">WindowOpen</animation>
- <animation effect="fade" time="250">WindowClose</animation>
+ <description>Shaddow behind facadeview</description>
+ <type>image</type>
+ <id>0</id>
+ <posX>770</posX>
+ <posY>300</posY>
+ <width>1130</width>
+ <height>670</height>
+ <texture>info_bg.png</texture>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Action menu</description>
@@ -58,7 +58,7 @@
<colorDiffuse>fffffffff</colorDiffuse>
</control>
<control>
- <description>group element</description>
+ <description>Group element</description>
<type>group</type>
<visible>!Control.HasFocus(50)</visible>
<posX>40</posX>
@@ -137,4 +137,4 @@
<animation effect="fade" time="250">WindowClose</animation>
</control>
</controls>
-</window>
\ No newline at end of file
+</window>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hor...@us...> - 2013-03-23 13:22:26
|
Revision: 4557
http://sourceforge.net/p/mp-plugins/code/4557
Author: horned-reaper
Date: 2013-03-23 13:22:23 +0000 (Sat, 23 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/Docs/Changes.txt
trunk/plugins/FritzBox/FritzBox/FritzBox.cs
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/callin.png
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/callout.png
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/rejected.png
trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/callin.png
trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/callout.png
trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/rejected.png
trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/callin.png
trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/callout.png
trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/rejected.png
trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml
trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/callin.png
trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/callout.png
trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/rejected.png
trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml
trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/callin.png
trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/callout.png
trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/rejected.png
trunk/plugins/FritzBox/FritzBox/Skin/Maya/Media/FritzBox/callin.png
trunk/plugins/FritzBox/FritzBox/Skin/Maya/Media/FritzBox/callout.png
trunk/plugins/FritzBox/FritzBox/Skin/Maya/Media/FritzBox/rejected.png
trunk/plugins/FritzBox/FritzBox/Skin/Titan/FritzManager.xml
trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/callin.png
trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/callout.png
trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/rejected.png
trunk/plugins/FritzBox/FritzBox/Skin/Titan/common.facade.fritz.xml
trunk/plugins/FritzBox/FritzBox/Skin/Titan/common.fritz.xml
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/releases/update.xml
Added Paths:
-----------
trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4556.mpe1
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2013-03-21 09:57:58 UTC (rev 4556)
+++ trunk/plugins/FritzBox/Build/Build.log 2013-03-23 13:22:23 UTC (rev 4557)
@@ -1,6 +1,6 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4547
+SVN Version: 4556
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs
@@ -11,7 +11,7 @@
Copyright (C) Microsoft Corporation. Alle Rechte vorbehalten.
Die Projekte in dieser Projektmappe werden nacheinander erstellt. Um eine parallele Erstellung zu erm\x94glichen, m\x81ssen Sie den Schalter "/m" hinzuf\x81gen.
-Der Buildvorgang wurde am 18.03.2013 11:00:21 gestartet.
+Der Buildvorgang wurde am 23.03.2013 14:04:23 gestartet.
Projekt "D:\FritzBox\FritzBox.sln" auf Knoten "1", Rebuild Ziel(e).
ValidateSolutionConfiguration:
Die Projektmappenkonfiguration "Release|Any CPU" wird erstellt.
@@ -56,6 +56,7 @@
Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\log4net.dll" wird gel\x94scht.
Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\Ionic.Zip.dll" wird gel\x94scht.
Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\FritzBox.pdb" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\Core.dll" wird gel\x94scht.
Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.csprojResolveAssemblyReference.cache" wird gel\x94scht.
Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.exe" wird gel\x94scht.
Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.pdb" wird gel\x94scht.
@@ -119,7 +120,7 @@
0 Warnung(en)
0 Fehler
-Verstrichene Zeit 00:00:04.85
+Verstrichene Zeit 00:00:01.34
Reverting to build 0
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
@@ -244,7 +245,7 @@
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
36 Datei(en) kopiert
MpeMaker version: 1.3.0.0
-Build started at 11:00:29
+Build started at 14:04:26
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Modified: trunk/plugins/FritzBox/Docs/Changes.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Changes.txt 2013-03-21 09:57:58 UTC (rev 4556)
+++ trunk/plugins/FritzBox/Docs/Changes.txt 2013-03-23 13:22:23 UTC (rev 4557)
@@ -1,3 +1,7 @@
-1.0.0.45xx:
-Fixed bug:
-- call list item images are not shown with some FRITZ!OS versions older than 5.5
\ No newline at end of file
+1.0.0.4556:
+Optimiziation:
+- skin adjustments
+
+Fixed bugs:
+- call type "outgoing" filter does not work
+- Avalon skin is selected per default on Installer
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2013-03-21 09:57:58 UTC (rev 4556)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2013-03-23 13:22:23 UTC (rev 4557)
@@ -1219,9 +1219,10 @@
i++;
+ // apply call type filter
if (Settings.CurrentFilter == CallListFilter.Incoming) if (item.type != 1) continue;
if (Settings.CurrentFilter == CallListFilter.Rejected) if (item.type != 2) continue;
- if (Settings.CurrentFilter == CallListFilter.Outgoing) if (item.type != 3) continue;
+ if (Settings.CurrentFilter == CallListFilter.Outgoing) if (item.type != 4 && item.type != 3) continue; // since FRITZ!OS 5.5 this type number is 4
elem.Label = item.timestamp.ToString(format, ci) + " - " + item.duration.ToString("HH:mm", ci);
@@ -1533,8 +1534,6 @@
private void updateButtonStates()
{
- facadeView.IsVisible = false;
- facadeView.IsVisible = true;
GUIControl.FocusControl(GetID, facadeView.GetID);
string strLine = string.Empty;
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/callin.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/callout.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/rejected.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/callin.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/callout.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/rejected.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/callin.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/callout.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/rejected.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml 2013-03-21 09:57:58 UTC (rev 4556)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml 2013-03-23 13:22:23 UTC (rev 4557)
@@ -1,122 +1,123 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<window>
- <id>464554871</id>
- <defaultcontrol>50</defaultcontrol>
- <allowoverlay>yes</allowoverlay>
- <define>#header.label:666</define>
- <define>#header.hover:-</define>
- <controls>
+ <id>464554871</id>
+ <defaultcontrol>50</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <define>#header.label:666</define>
+ <define>#header.hover:-</define>
+ <controls>
+ <control>
+ <description>Background</description>
+ <type>image</type>
+ <id>1</id>
+ <texture>Background.png</texture>
+ <width>1280</width>
+ <height>720</height>
+ </control>
+ <import>common.window.xml</import>
+ <import>common.time.xml</import>
+ <control>
+ <description>Action menu</description>
+ <type>actiongroup</type>
+ <dimColor>00ffffff</dimColor>
+ <width>206</width>
+ <height>720</height>
+ <buttonX>0</buttonX>
+ <buttonY>-60</buttonY>
+ <buttonwidth>79</buttonwidth>
+ <buttonheight>720</buttonheight>
+ <onexit>50</onexit>
+ <defaultcontrol>2</defaultcontrol>
+ <textureFocus>Action_focus.png</textureFocus>
+ <textureNoFocus>Action_nofocus.png</textureNoFocus>
<control>
- <description>BG</description>
- <type>image</type>
- <id>1</id>
- <texture>Background.png</texture>
- <width>1280</width>
- <height>720</height>
+ <type>image</type>
+ <visible>!Control.HasFocus(50)</visible>
+ <posX>19</posX>
+ <posY>78</posY>
+ <width>280</width>
+ <height>591</height>
+ <texture>Backslide.png</texture>
+ <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
+ <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
+ <colorDiffuse>fffffffff</colorDiffuse>
</control>
- <import>common.window.xml</import>
- <import>common.time.xml</import>
- <control>
- <description>Action menu</description>
- <type>actiongroup</type>
- <dimColor>00ffffff</dimColor>
- <width>206</width>
- <height>720</height>
- <buttonX>0</buttonX>
- <buttonY>-60</buttonY>
- <buttonwidth>79</buttonwidth>
- <buttonheight>720</buttonheight>
- <onexit>0</onexit>
- <defaultcontrol>2</defaultcontrol>
- <textureFocus>Action_focus.png</textureFocus>
- <textureNoFocus>Action_nofocus.png</textureNoFocus>
- <control>
- <type>image</type>
- <visible>!Control.HasFocus(50)</visible>
- <posX>19</posX>
- <posY>78</posY>
- <width>280</width>
- <height>591</height>
- <texture>Backslide.png</texture>
- <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
- <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
- <colorDiffuse>fffffffff</colorDiffuse>
- </control>
- <control>
- <description>group element</description>
- <type>group</type>
- <visible>!Control.HasFocus(50)</visible>
- <posX>37</posX>
- <posY>121</posY>
- <layout>StackLayout</layout>
- <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
- <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
- <control>
- <id>2</id>
- <description>View as</description>
- <type>button</type>
- <onright>50</onright>
- <onup>9</onup>
- <label>100</label>
- </control>
- <control>
- <id>3</id>
- <description>Sort</description>
- <type>sortbutton</type>
- <onright>50</onright>
- <ondown>4</ondown>
- </control>
- <control>
- <id>4</id>
- <description>Mode</description>
- <type>button</type>
- <onright>50</onright>
- <ondown>9</ondown>
- <label>Mode</label>
- </control>
- <control>
- <id>9</id>
- <description>Update list</description>
- <type>button</type>
- <onright>50</onright>
- <ondown>2</ondown>
- <label>Update</label>
- </control>
- </control>
- </control>
- <import>common.facade.pictures.xml</import>
<control>
- <description>Contact picture</description>
- <id>500</id>
- <type>image</type>
- <posX>690</posX>
- <posY>170</posY>
- <width>167</width>
- <height>142</height>
- <keepaspectratio>yes</keepaspectratio>
- <centered>yes</centered>
- <texture flipY="true" diffuse="Thumb_Mask.png">#selectedthumb</texture>
- <visible>yes</visible>
- <animation effect="fade" time="450" reversible="false">visible</animation>
+ <description>Group element</description>
+ <type>group</type>
+ <visible>!Control.HasFocus(50)</visible>
+ <posX>37</posX>
+ <posY>121</posY>
+ <layout>StackLayout</layout>
+ <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
+ <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
+ <control>
+ <id>2</id>
+ <description>View as</description>
+ <type>button</type>
+ <onright>50</onright>
+ <onup>9</onup>
+ <label>100</label>
+ </control>
+ <control>
+ <id>3</id>
+ <description>Sort</description>
+ <type>sortbutton</type>
+ <onright>50</onright>
+ <ondown>4</ondown>
+ </control>
+ <control>
+ <id>4</id>
+ <description>Mode</description>
+ <type>button</type>
+ <onright>50</onright>
+ <ondown>9</ondown>
+ <label>Mode</label>
+ </control>
+ <control>
+ <id>9</id>
+ <description>Update list</description>
+ <type>button</type>
+ <onright>50</onright>
+ <ondown>2</ondown>
+ <label>Update</label>
+ </control>
</control>
- <control>
- <type>image</type>
- <id>1</id>
- <posX>40</posX>
- <posY>150</posY>
- <width>178</width>
- <height>144</height>
- <texture flipY="true" diffuse="Thumb_Mask.png">Picture_cover.png</texture>
- <visible>facadeview.list+Control.HasFocus(50)</visible>
- <animation effect="fade" time="450" reversible="false">visible</animation>
- </control>
- <control>
- <type>fadelabel</type>
- <posX>26</posX>
- <posY>18</posY>
- <width>350</width>
- <font>font18</font>
- <label>FRITZ!Box Manager</label>
- </control>
- </controls>
+ </control>
+ <import>common.facade.pictures.xml</import>
+ <control>
+ <description>Contact picture</description>
+ <id>500</id>
+ <type>image</type>
+ <posX>690</posX>
+ <posY>170</posY>
+ <width>170</width>
+ <height>142</height>
+ <keepaspectratio>yes</keepaspectratio>
+ <centered>yes</centered>
+ <texture flipY="true" diffuse="Thumb_Mask.png">#selectedthumb</texture>
+ <visible>yes</visible>
+ <animation effect="fade" time="450" reversible="false">visible</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <id>1</id>
+ <posX>40</posX>
+ <posY>150</posY>
+ <width>178</width>
+ <height>144</height>
+ <texture flipY="true" diffuse="Thumb_Mask.png">Picture_cover.png</texture>
+ <visible>facadeview.list+Control.HasFocus(50)</visible>
+ <animation effect="fade" time="450" reversible="false">visible</animation>
+ </control>
+ <control>
+ <description>Header</description>
+ <type>fadelabel</type>
+ <posX>26</posX>
+ <posY>18</posY>
+ <width>350</width>
+ <font>font18</font>
+ <label>FRITZ!Box Manager</label>
+ </control>
+ </controls>
</window>
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/callin.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/callout.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/rejected.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml 2013-03-21 09:57:58 UTC (rev 4556)
+++ trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml 2013-03-23 13:22:23 UTC (rev 4557)
@@ -1,122 +1,123 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<window>
- <id>464554871</id>
- <defaultcontrol>50</defaultcontrol>
- <allowoverlay>yes</allowoverlay>
- <define>#header.label:666</define>
- <define>#header.hover:-</define>
- <controls>
+ <id>464554871</id>
+ <defaultcontrol>50</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <define>#header.label:666</define>
+ <define>#header.hover:-</define>
+ <controls>
+ <control>
+ <description>Background</description>
+ <type>image</type>
+ <id>1</id>
+ <texture>Background.png</texture>
+ <width>1280</width>
+ <height>720</height>
+ </control>
+ <import>common.window.xml</import>
+ <import>common.time.xml</import>
+ <control>
+ <description>Action menu</description>
+ <type>actiongroup</type>
+ <dimColor>00ffffff</dimColor>
+ <width>263</width>
+ <height>473</height>
+ <buttonX>0</buttonX>
+ <buttonY>0</buttonY>
+ <buttonwidth>60</buttonwidth>
+ <buttonheight>576</buttonheight>
+ <onexit>50</onexit>
+ <defaultcontrol>2</defaultcontrol>
+ <textureFocus>Action_focus.png</textureFocus>
+ <textureNoFocus>Action_nofocus.png</textureNoFocus>
<control>
- <description>BG</description>
- <type>image</type>
- <id>1</id>
- <texture>Background.png</texture>
- <width>1280</width>
- <height>720</height>
+ <type>image</type>
+ <visible>!Control.HasFocus(50)</visible>
+ <posX>15</posX>
+ <posY>63</posY>
+ <width>329</width>
+ <height>473</height>
+ <texture>Backslide.png</texture>
+ <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
+ <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
+ <colorDiffuse>fffffffff</colorDiffuse>
</control>
- <import>common.window.xml</import>
- <import>common.time.xml</import>
- <control>
- <description>Action menu</description>
- <type>actiongroup</type>
- <dimColor>00ffffff</dimColor>
- <width>263</width>
- <height>473</height>
- <buttonX>0</buttonX>
- <buttonY>0</buttonY>
- <buttonwidth>60</buttonwidth>
- <buttonheight>576</buttonheight>
- <onexit>50</onexit>
- <defaultcontrol>2</defaultcontrol>
- <textureFocus>Action_focus.png</textureFocus>
- <textureNoFocus>Action_nofocus.png</textureNoFocus>
- <control>
- <type>image</type>
- <visible>!Control.HasFocus(50)</visible>
- <posX>15</posX>
- <posY>63</posY>
- <width>329</width>
- <height>473</height>
- <texture>Backslide.png</texture>
- <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
- <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
- <colorDiffuse>fffffffff</colorDiffuse>
- </control>
- <control>
- <description>group element</description>
- <type>group</type>
- <visible>!Control.HasFocus(50)</visible>
- <posX>40</posX>
- <posY>97</posY>
- <layout>StackLayout</layout>
- <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
- <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
- <control>
- <id>2</id>
- <description>View as</description>
- <type>button</type>
- <onright>50</onright>
- <onup>9</onup>
- <label>100</label>
- </control>
- <control>
- <id>3</id>
- <description>Sort</description>
- <type>sortbutton</type>
- <onright>50</onright>
- <ondown>4</ondown>
- </control>
- <control>
- <id>4</id>
- <description>Mode</description>
- <type>button</type>
- <onright>50</onright>
- <ondown>9</ondown>
- <label>Mode</label>
- </control>
- <control>
- <id>9</id>
- <description>Update list</description>
- <type>button</type>
- <onright>50</onright>
- <ondown>2</ondown>
- <label>Update</label>
- </control>
- </control>
- </control>
- <import>common.facade.pictures.xml</import>
<control>
- <description>Contact picture</description>
- <id>500</id>
- <type>image</type>
- <posX>950</posX>
- <posY>170</posY>
- <width>167</width>
- <height>142</height>
- <keepaspectratio>yes</keepaspectratio>
- <centered>yes</centered>
- <texture flipY="true" diffuse="Thumb_Mask.png">#selectedthumb</texture>
- <visible>yes</visible>
- <animation effect="fade" time="450" reversible="false">visible</animation>
+ <description>Group element</description>
+ <type>group</type>
+ <visible>!Control.HasFocus(50)</visible>
+ <posX>40</posX>
+ <posY>97</posY>
+ <layout>StackLayout</layout>
+ <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
+ <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
+ <control>
+ <id>2</id>
+ <description>View as</description>
+ <type>button</type>
+ <onright>50</onright>
+ <onup>9</onup>
+ <label>100</label>
+ </control>
+ <control>
+ <id>3</id>
+ <description>Sort</description>
+ <type>sortbutton</type>
+ <onright>50</onright>
+ <ondown>4</ondown>
+ </control>
+ <control>
+ <id>4</id>
+ <description>Mode</description>
+ <type>button</type>
+ <onright>50</onright>
+ <ondown>9</ondown>
+ <label>Mode</label>
+ </control>
+ <control>
+ <id>9</id>
+ <description>Update list</description>
+ <type>button</type>
+ <onright>50</onright>
+ <ondown>2</ondown>
+ <label>Update</label>
+ </control>
</control>
- <control>
- <type>image</type>
- <id>1</id>
- <posX>40</posX>
- <posY>150</posY>
- <width>178</width>
- <height>144</height>
- <texture flipY="true" diffuse="Thumb_Mask.png">Picture_cover.png</texture>
- <visible>facadeview.list+Control.HasFocus(50)</visible>
- <animation effect="fade" time="450" reversible="false">visible</animation>
- </control>
- <control>
- <type>fadelabel</type>
- <posX>26</posX>
- <posY>18</posY>
- <width>350</width>
- <font>font18</font>
- <label>FRITZ!Box Manager</label>
- </control>
- </controls>
+ </control>
+ <import>common.facade.pictures.xml</import>
+ <control>
+ <description>Contact picture</description>
+ <id>500</id>
+ <type>image</type>
+ <posX>950</posX>
+ <posY>170</posY>
+ <width>167</width>
+ <height>142</height>
+ <keepaspectratio>yes</keepaspectratio>
+ <centered>yes</centered>
+ <texture flipY="true" diffuse="Thumb_Mask.png">#selectedthumb</texture>
+ <visible>yes</visible>
+ <animation effect="fade" time="450" reversible="false">visible</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <id>1</id>
+ <posX>40</posX>
+ <posY>150</posY>
+ <width>178</width>
+ <height>144</height>
+ <texture flipY="true" diffuse="Thumb_Mask.png">Picture_cover.png</texture>
+ <visible>facadeview.list+Control.HasFocus(50)</visible>
+ <animation effect="fade" time="450" reversible="false">visible</animation>
+ </control>
+ <control>
+ <description>Header</description>
+ <type>fadelabel</type>
+ <posX>26</posX>
+ <posY>18</posY>
+ <width>350</width>
+ <font>font18</font>
+ <label>FRITZ!Box Manager</label>
+ </control>
+ </controls>
</window>
Modified: trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/callin.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/callout.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/rejected.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Maya/Media/FritzBox/callin.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Maya/Media/FritzBox/callout.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Maya/Media/FritzBox/rejected.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Titan/FritzManager.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Titan/FritzManager.xml 2013-03-21 09:57:58 UTC (rev 4556)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Titan/FritzManager.xml 2013-03-23 13:22:23 UTC (rev 4557)
@@ -1,140 +1,140 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>f
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<window>
- <id>464554871</id>
- <defaultcontrol>50</defaultcontrol>
- <allowoverlay>yes</allowoverlay>
- <define>#header.label:FRITZ!Box Manager</define>
- <define>#header.hover:hover_fritzbox.png</define>
- <controls>
- <import>common.fritz.xml</import>
- <import>common.time.xml</import>
+ <id>464554871</id>
+ <defaultcontrol>50</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <define>#header.label:FRITZ!Box Manager</define>
+ <define>#header.hover:hover_fritzbox.png</define>
+ <controls>
+ <import>common.fritz.xml</import>
+ <import>common.time.xml</import>
+ <control>
+ <description>Default background</description>
+ <type>image</type>
+ <id>0</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1920</width>
+ <height>1080</height>
+ <texture>hover_fritzbox.png</texture>
+ <shouldCache>true</shouldCache>
+ </control>
+ <control>
+ <description>Shaddow behind facadeview</description>
+ <type>image</type>
+ <id>0</id>
+ <posX>706</posX>
+ <posY>300</posY>
+ <width>1148</width>
+ <height>666</height>
+ <texture>info_bg.png</texture>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Action menu</description>
+ <type>actiongroup</type>
+ <dimColor>00ffffff</dimColor>
+ <width>263</width>
+ <height>473</height>
+ <buttonX>0</buttonX>
+ <buttonY>0</buttonY>
+ <buttonwidth>60</buttonwidth>
+ <buttonheight>576</buttonheight>
+ <onexit>50</onexit>
+ <defaultcontrol>2</defaultcontrol>
+ <textureFocus>action_menu.png</textureFocus>
+ <textureNoFocus>Action_nofocus.png</textureNoFocus>
<control>
- <description>Default background</description>
- <type>image</type>
- <id>0</id>
- <posX>0</posX>
- <posY>0</posY>
- <width>1920</width>
- <height>1080</height>
- <texture>hover_fritzbox.png</texture>
- <shouldCache>true</shouldCache>
+ <type>image</type>
+ <visible>!Control.HasFocus(50)</visible>
+ <posX>-15</posX>
+ <posY>283</posY>
+ <width>500</width>
+ <height>300</height>
+ <texture>menu_bg.png</texture>
+ <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
+ <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
+ <colorDiffuse>fffffffff</colorDiffuse>
+ </control>
+ <control>
+ <description>Group element</description>
+ <type>group</type>
+ <visible>!Control.HasFocus(50)</visible>
+ <posX>40</posX>
+ <posY>317</posY>
+ <layout>StackLayout</layout>
+ <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
+ <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
+ <control>
+ <id>2</id>
+ <description>View-As</description>
+ <type>button</type>
+ <onright>50</onright>
+ <onup>9</onup>
+ <label>100</label>
+ </control>
+ <control>
+ <id>3</id>
+ <description>Sort</description>
+ <type>sortbutton</type>
+ <onright>50</onright>
+ <ondown>4</ondown>
+ </control>
+ <control>
+ <id>4</id>
+ <description>Mode</description>
+ <type>button</type>
+ <onright>50</onright>
+ <ondown>9</ondown>
+ <label>Mode</label>
+ </control>
+ <control>
+ <id>9</id>
+ <description>Update list</description>
+ <type>button</type>
+ <onright>50</onright>
+ <ondown>2</ondown>
+ <label>Update</label>
+ </control>
</control>
- <control>
- <description>Shaddow behind facadeview</description>
- <type>image</type>
- <id>0</id>
- <posX>770</posX>
- <posY>300</posY>
- <width>1130</width>
- <height>670</height>
- <texture>info_bg.png</texture>
- <animation effect="fade" time="250">WindowOpen</animation>
- <animation effect="fade" time="250">WindowClose</animation>
- </control>
- <control>
- <description>Action menu</description>
- <type>actiongroup</type>
- <dimColor>00ffffff</dimColor>
- <width>263</width>
- <height>473</height>
- <buttonX>0</buttonX>
- <buttonY>0</buttonY>
- <buttonwidth>60</buttonwidth>
- <buttonheight>576</buttonheight>
- <onexit>50</onexit>
- <defaultcontrol>2</defaultcontrol>
- <textureFocus>action_menu.png</textureFocus>
- <textureNoFocus>Action_nofocus.png</textureNoFocus>
- <control>
- <type>image</type>
- <visible>!Control.HasFocus(50)</visible>
- <posX>-15</posX>
- <posY>283</posY>
- <width>500</width>
- <height>300</height>
- <texture>menu_bg.png</texture>
- <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
- <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
- <colorDiffuse>fffffffff</colorDiffuse>
- </control>
- <control>
- <description>Group element</description>
- <type>group</type>
- <visible>!Control.HasFocus(50)</visible>
- <posX>40</posX>
- <posY>317</posY>
- <layout>StackLayout</layout>
- <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
- <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
- <control>
- <id>2</id>
- <description>View-As</description>
- <type>button</type>
- <onright>50</onright>
- <onup>9</onup>
- <label>100</label>
- </control>
- <control>
- <id>3</id>
- <description>Sort</description>
- <type>sortbutton</type>
- <onright>50</onright>
- <ondown>4</ondown>
- </control>
- <control>
- <id>4</id>
- <description>Mode</description>
- <type>button</type>
- <onright>50</onright>
- <ondown>9</ondown>
- <label>Mode</label>
- </control>
- <control>
- <id>9</id>
- <description>Update list</description>
- <type>button</type>
- <onright>50</onright>
- <ondown>2</ondown>
- <label>Update</label>
- </control>
- </control>
- </control>
- <import>common.facade.fritz.xml</import>
- <control>
- <description>Contact picture</description>
- <id>500</id>
- <type>image</type>
- <posX>500</posX>
- <posY>320</posY>
- <width>167</width>
- <height>142</height>
- <keepaspectratio>yes</keepaspectratio>
- <centered>yes</centered>
- <texture>#selectedthumb</texture>
- <visible>yes</visible>
- <animation effect="fade" time="450" reversible="false">visible</animation>
- </control>
- <control>
- <type>image</type>
- <id>1</id>
- <posX>62</posX>
- <posY>317</posY>
- <width>178</width>
- <height>144</height>
- <texture>Picture_cover.png</texture>
- <visible>facadeview.list+Control.HasFocus(50)</visible>
- <animation effect="fade" time="450" reversible="false">visible</animation>
- </control>
- <control>
- <id>0</id>
- <type>image</type>
- <posX>60</posX>
- <posY>40</posY>
- <width>68</width>
- <height>60</height>
- <texture>icon_fritz.png</texture>
- <animation effect="fade" time="250">WindowOpen</animation>
- <animation effect="fade" time="250">WindowClose</animation>
- </control>
- </controls>
+ </control>
+ <import>common.facade.fritz.xml</import>
+ <control>
+ <description>Contact picture</description>
+ <id>500</id>
+ <type>image</type>
+ <posX>480</posX>
+ <posY>300</posY>
+ <width>167</width>
+ <height>142</height>
+ <keepaspectratio>yes</keepaspectratio>
+ <centered>yes</centered>
+ <texture>#selectedthumb</texture>
+ <visible>control.isvisible(50)</visible>
+ <animation effect="fade" time="450" reversible="false">visible</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <id>1</id>
+ <posX>62</posX>
+ <posY>317</posY>
+ <width>178</width>
+ <height>144</height>
+ <texture>Picture_cover.png</texture>
+ <visible>facadeview.list+Control.HasFocus(50)</visible>
+ <animation effect="fade" time="450" reversible="false">visible</animation>
+ </control>
+ <control>
+ <id>0</id>
+ <type>image</type>
+ <posX>60</posX>
+ <posY>40</posY>
+ <width>68</width>
+ <height>60</height>
+ <texture>icon_fritz.png</texture>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
+ </control>
+ </controls>
</window>
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/callin.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/callout.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/rejected.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Titan/common.facade.fritz.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Titan/common.facade.fritz.xml 2013-03-21 09:57:58 UTC (rev 4556)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Titan/common.facade.fritz.xml 2013-03-23 13:22:23 UTC (rev 4557)
@@ -1,225 +1,233 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<window>
-<controls>
- <!-- :: List Scrolling Popup :: -->
- <control>
- <description>listscroller bg</description>
- <type>image</type>
- <id>1</id>
- <posX>297</posX>
- <posY>540</posY>
- <width>211</width>
- <height>211</height>
- <texture>listscroller_bg.png</texture>
- <visible>facadeview.list+string.contains(#scrolling.up,yes)|string.contains(#scrolling.down,yes)</visible>
- <animation effect="fade" time="250">Visible</animation>
- <animation effect="fade" time="0">Hidden</animation>
- </control>
- <control>
- <type>label</type>
- <id>1</id>
- <posX>352</posX>
- <posY>600</posY>
- <width>96</width>
- <height>96</height>
- <font>TitanLight32</font>
- <textcolor>ff000000</textcolor>
- <label>#selecteditem.scrolllabel</label>
- <visible>facadeview.list+string.contains(#scrolling.up,yes)|string.contains(#scrolling.down,yes)</visible>
- <align>center</align>
- <valign>middle</valign>
- <animation effect="fade" time="250">Visible</animation>
- <animation effect="fade" time="0">Hidden</animation>
- </control>
- <!-- :: Count :: -->
- <!-- :: Listview Lines :: -->
- <control>
- <description>List Lines</description>
- <type>image</type>
- <id>1</id>
- <posX>800</posX>
- <posY>385</posY>
- <width>1060</width>
- <height>506</height>
- <texture>list_lines_wide.png</texture>
- <visible>facadeview.list + control.isvisible(50)</visible>
- <animation effect="fade" time="250">WindowOpen</animation>
- <animation effect="fade" time="250">WindowClose</animation>
- </control>
- <control>
- <description>group element</description>
- <type>group</type>
- <control>
- <animation effect="fade" start="0" end="100" time="300" delay="350">WindowOpen</animation>
- <animation effect="fade" start="100" end="0" time="0" delay="0">WindowClose</animation>
- <description>composite control consisting of a list control and a thumbnail panel</description>
- <type>facadeview</type>
- <id>50</id>
- <control>
- <description>listcontrol</description>
- <type>listcontrol</type>
- <id>50</id>
- <onleft>2</onleft>
- <onright>50</onright>
- <scrollOffset>1</scrollOffset>
- <posX>800</posX>
- <posY>331</posY>
- <width>1085</width>
- <height>700</height>
- <textXOff>0</textXOff>
- <dimColor>ffffffff</dimColor>
- <textureFocus>listcontrol_item_selected_wide.png</textureFocus>
- <textureNoFocus>-</textureNoFocus>
- <spinPosX>1828</spinPosX>
- <spinPosY>1000</spinPosY>
- </control>
- <control>
- <description>Thumbnail Panel</description>
- <type>thumbnailpanel</type>
- <dimColor>90ffffff</dimColor>
- <id>50</id>
- <posX>800</posX>
- <posY>331</posY>
- <width>1085</width>
- <height>700</height>
- <onleft>2</onleft>
- <onright>50</onright>
- <itemWidth>245</itemWidth>
- <itemHeight>141</itemHeight>
- <textureWidth>245</textureWidth>
- <textureHeight>141</textureHeight>
- <thumbWidth>245</thumbWidth>
- <thumbHeight>141</thumbHeight>
- <thumbPosX>0</thumbPosX>
- <thumbPosY>0</thumbPosY>
- <itemWidthBig>350</itemWidthBig>
- <itemHeightBig>202</itemHeightBig>
- <thumbWidthBig>350</thumbWidthBig>
- <thumbHeightBig>202</thumbHeightBig>
- <textureWidthBig>350</textureWidthBig>
- <textureHeightBig>202</textureHeightBig>
- <thumbPosXBig>0</thumbPosXBig>
- <thumbPosYBig>0</thumbPosYBig>
- <zoomXPixels>30</zoomXPixels>
- <zoomYPixels>20</zoomYPixels>
- <thumbZoom>no</thumbZoom>
- <hideUnfocusTexture>no</hideUnfocusTexture>
- <renderFocusText>no</renderFocusText>
- <renderUnfocusText>no</renderUnfocusText>
- <spinCanFocus>no</spinCanFocus>
- <shadowAngle>90</shadowAngle>
- <frameFocus>recordings_thumb_focus.png</frameFocus>
- <textureMask>recordings_thumb_mask.png</textureMask>
- <shadowDistance>50</shadowDistance>
- <keepaspectratio>yes</keepaspectratio>
- <spinPosX>1828</spinPosX>
- <spinPosY>1000</spinPosY>
- <unfocusedAlpha>255</unfocusedAlpha>
- </control>
- <control>
- <description>Filmstrip view</description>
- <type>filmstrip</type>
- <dimColor>90ffffff</dimColor>
- <id>50</id>
- <scrollOffset>3</scrollOffset>
- <folderPrefix></folderPrefix>
- <folderSuffix></folderSuffix>
- <posX>88</posX>
- <posY>665</posY>
- <width>1800</width>
- <height>340</height>
- <onup>2</onup>
- <ondown>2</ondown>
- <onleft>50</onleft>
- <onright>50</onright>
- <thumbWidth>338</thumbWidth>
- <thumbHeight>190</thumbHeight>
- <thumbPosX>0</thumbPosX>
- <thumbPosY>0</thumbPosY>
- <itemWidth>353</itemWidth>
- <itemHeight>190</itemHeight>
- <textureWidth>338</textureWidth>
- <textureHeight>190</textureHeight>
- <textYOff>-2000</textYOff>
- <imageFolderFocus>-</imageFolderFocus>
- <frame>-</frame>
- <frameFocus>-</frameFocus>
- <background>-</background>
- <thumbs flipY="true" diffuse="Thumb_Mask.png" mask="pictures_filmstrip_mask.png"></thumbs>
- <showFrame>yes</showFrame>
- <showFolder>no</showFolder>
- <showBackGround>no</showBackGround>
- <showInfoImage>no</showInfoImage>
- <keepaspectratio>yes</keepaspectratio>
- <scrollbarBackground>scrollbar_bg_hor.png</scrollbarBackground>
- <scrollbarLeft>scrollbar_left_hor.png</scrollbarLeft>
- <scrollbarRight>scrollbar_right_hor.png</scrollbarRight>
- <scrollbarWidth>717</scrollbarWidth>
- <scrollbarHeight>8</scrollbarHeight>
- <scrollbarYOff>293</scrollbarYOff>
- <spinPosX>1828</spinPosX>
- <spinPosY>1000</spinPosY>
- <thumbAnimation effect="zoom" acceleration="-2" start="100,100" reversible="false" end="135,135" center="0,800" time="200">focus</thumbAnimation>
- <thumbAnimation effect="zoom" start="135,135" reversible="false" end="100,100" center="0,800" time="100">unfocus</thumbAnimation>
- </control>
- <control>
- <description>Cover Flow view</description>
- <type>coverflow</type>
- <colordiffuse>90ffffff</colordiffuse>
- <dimColor>90ffffff</dimColor>
- <id>50</id>
- <onup>2</onup>
- <ondown>2</ondown>
- <onleft>50</onleft>
- <onright>50</onright>
- <posX>0</posX>
- <posY>665</posY>
- <width>1920</width>
- <height>768</height>
- <selectedCard>0</selectedCard>
- <cardWidth>338</cardWidth>
- <cardHeight>190</cardHeight>
- <angle>65</angle>
- <sideShift>410</sideShift>
- <sideGap>210</sideGap>
- <sideDepth>280</sideDepth>
- <offsetY>0</offsetY>
- <selectedOffsetY>0</selectedOffsetY>
- <speed>8</speed>
- <showFrame>yes</showFrame>
- <frame>-</frame>
- <frameFocus>-</frameFocus>
- <frameWidth>338</frameWidth>
- <frameHeight>190</frameHeight>
- <spinSpeed>8</spinSpeed>
- <unfocusedAlpha>FF</unfocusedAlpha>
- <folderPrefix></folderPrefix>
- <folderSuffix></folderSuffix>
- <font1>font13</font1>
- <font2>font11</font2>
- <label1>#selecteditem</label1>
- <label2>#selecteditem2</label2>
- <textColor>FFFFFFFF</textColor>
- <remoteColor>FFFF0000</remoteColor>
- <playedColor>FFA0D0FF</playedColor>
- <downloadColor>FF00FF00</downloadColor>
- <selectedColor>FFFFFFFF</selectedColor>
- <shadowAngle>45</shadowAngle>
- <shadowDistance>0</shadowDistance>
- <shadowColor>FF000000</shadowColor>
- <label1YOff>2405</label1YOff>
- <label2YOff>2430</label2YOff>
- <pageSize>5</pageSize>
- <keepaspectratio>yes</keepaspectratio>
- <scrollbarBackground>scrollbar_bg_hor.png</scrollbarBackground>
- <scrollbarLeft>scrollbar_left_hor.png</scrollbarLeft>
- <scrollbarRight>scrollbar_right_hor.png</scrollbarRight>
- <scrollbarWidth>717</scrollbarWidth>
- <scrollbarHeight>8</scrollbarHeight>
- <scrollbarYOff>293</scrollbarYOff>
- <cards flipY="true" diffuse="Thumb_Mask.png" mask="pictures_filmstrip_mask.png"></cards>
- </control>
- </control>
- </control>
-</controls>
+ <controls>
+ <!-- :: List Scrolling Popup :: -->
+ <control>
+ <description>Listscroller background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>297</posX>
+ <posY>540</posY>
+ <width>211</width>
+ <height>211</height>
+ <texture>listscroller_bg.png</texture>
+ <visible>facadeview.list+string.contains(#scrolling.up,yes)|string.contains(#scrolling.down,yes)</visible>
+ <animation effect="fade" time="250">Visible</animation>
+ <animation effect="fade" time="0">Hidden</animation>
+ </control>
+ <control>
+ <type>label</type>
+ <id>1</id>
+ <posX>352</posX>
+ <posY>600</posY>
+ <width>96</width>
+ <height>96</height>
+ <font>TitanLight32</font>
+ <textcolor>ff000000</textcolor>
+ <label>#selecteditem.scrolllabel</label>
+ <visible>facadeview.list+string.contains(#scrolling.up,yes)|string.contains(#scrolling.down,yes)</visible>
+ <align>center</align>
+ <valign>middle</valign>
+ <animation effect="fade" time="250">Visible</animation>
+ <animation effect="fade" time="0">Hidden</animation>
+ </control>
+ <!-- :: Count :: -->
+ <!-- :: Listview Lines :: -->
+ <control>
+ <description>List lines</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>749</posX>
+ <posY>384</posY>
+ <width>1060</width>
+ <height>495</height>
+ <texture>list_lines_wide.png</texture>
+ <visible>facadeview.list + control.isvisible(50)</visible>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Group element</description>
+ <type>group</type>
+ <control>
+ <animation effect="fade" start="0" end="100" time="300" delay="350">WindowOpen</animation>
+ <animation effect="fade" start="100" end="0" time="0" delay="0">WindowClose</animation>
+ <description>Composite control consisting of a list control and a thumbnail panel</description>
+ <type>facadeview</type>
+ <id>50</id>
+ <control>
+ <description>Listcontrol</description>
+ <type>listcontrol</type>
+ <id>50</id>
+ <onleft>2</onleft>
+ <onright>50</onright>
+ <scrollOffset>1</scrollOffset>
+ <posX>734</posX>
+ <posY>331</posY>
+ <width>1085</width>
+ <height>680</height>
+ <textXOff>42</textXOff>
+ <dimColor>ffffffff</dimColor>
+ <textureFocus>listcontrol_item_selected_wide.png</textureFocus>
+ <textureNoFocus>-</textureNoFocus>
+ <spinPosX>1828</spinPosX>
+ <spinPosY>1000</spinPosY>
+ <IconXOff>28</IconXOff>
+ <IconYOff>10</IconYOff>
+ <PinIconXOff>28</PinIconXOff>
+ <PinIconYOff>10</PinIconYOff>
+ <PinIconWidth>24</PinIconWidth>
+ <PinIconHeight>24</PinIconHeight>
+ <itemWidth>36</itemWidth>
+ <itemHeight>36</itemHeight>
+ </control>
+ <control>
+ <description>Thumbnail Panel</description>
+ <type>thumbnailpanel</type>
+ <dimColor>90ffffff</dimColor>
+ <id>50</id>
+ <posX>800</posX>
+ <posY>331</posY>
+ <width>1085</width>
+ <height>700</height>
+ <onleft>2</onleft>
+ <onright>50</onright>
+ <itemWidth>245</itemWidth>
+ <itemHeight>141</itemHeight>
+ <textureWidth>245</textureWidth>
+ <textureHeight>141</textureHeight>
+ <thumbWidth>245</thumbWidth>
+ <thumbHeight>141</thumbHeight>
+ <thumbPosX>0</thumbPosX>
+ <thumbPosY>0</thumbPosY>
+ <itemWidthBig>350</itemWidthBig>
+ <itemHeightBig>202</itemHeightBig>
+ <thumbWidthBig>350</thumbWidthBig>
+ <thumbHeightBig>202</thumbHeightBig>
+ <textureWidthBig>350</textureWidthBig>
+ <textureHeightBig>202</textureHeightBig>
+ <thumbPosXBig>0</thumbPosXBig>
+ <thumbPosYBig>0</thumbPosYBig>
+ <zoomXPixels>30</zoomXPixels>
+ <zoomYPixels>20</zoomYPixels>
+ <thumbZoom>no</thumbZoom>
+ <hideUnfocusTexture>no</hideUnfocusTexture>
+ <renderFocusText>no</renderFocusText>
+ <renderUnfocusText>no</renderUnfocusText>
+ <spinCanFocus>no</spinCanFocus>
+ <shadowAngle>90</shadowAngle>
+ <frameFocus>recordings_thumb_focus.png</frameFocus>
+ <textureMask>recordings_thumb_mask.png</textureMask>
+ <shadowDistance>50</shadowDistance>
+ <keepaspectratio>yes</keepaspectratio>
+ <spinPosX>1828</spinPosX>
+ <spinPosY>1000</spinPosY>
+ <unfocusedAlpha>255</unfocusedAlpha>
+ </control>
+ <control>
+ <description>Filmstrip view</description>
+ <type>filmstrip</type>
+ <dimColor>90ffffff</dimColor>
+ <id>50</id>
+ <scrollOffset>3</scrollOffset>
+ <folderPrefix></folderPrefix>
+ <folderSuffix></folderSuffix>
+ <posX>88</posX>
+ <posY>665</posY>
+ <width>1800</width>
+ <height>340</height>
+ <onup>2</onup>
+ <ondown>2</ondown>
+ <onleft>50</onleft>
+ <onright>50</onright>
+ <thumbWidth>338</thumbWidth>
+ <thumbHeight>190</thumbHeight>
+ <thumbPosX>0</thumbPosX>
+ <thumbPosY>0</thumbPosY>
+ <itemWidth>353</itemWidth>
+ <itemHeight>190</itemHeight>
+ <textureWidth>338</textureWidth>
+ <textureHeight>190</textureHeight>
+ <textYOff>-2000</textYOff>
+ <imageFolderFocus>-</imageFolderFocus>
+ <frame>-</frame>
+ <frameFocus>-</frameFocus>
+ <background>-</background>
+ <thumbs flipY="true" diffuse="Thumb_Mask.png" mask="pictures_filmstrip_mask.png"></thumbs>
+ <showFrame>yes</showFrame>
+ <showFolder>no</showFolder>
+ <showBackGround>no</showBackGround>
+ <showInfoImage>no</showInfoImage>
+ <keepaspectratio>yes</keepaspectratio>
+ <scrollbarBackground>scrollbar_bg_hor.png</scrollbarBackground>
+ <scrollbarLeft>scrollbar_left_hor.png</scrollbarLeft>
+ <scrollbarRight>scrollbar_right_hor.png</scrollbarRight>
+ <scrollbarWidth>717</scrollbarWidth>
+ <scrollbarHeight>8</scrollbarHeight>
+ <scrollbarYOff>293</scrollbarYOff>
+ <spinPosX>1828</spinPosX>
+ <spinPosY>1000</spinPosY>
+ <thumbAnimation effect="zoom" acceleration="-2" start="100,100" reversible="false" end="135,135" center="0,800" time="200">focus</thumbAnimation>
+ <thumbAnimation effect="zoom" start="135,135" reversible="false" end="100,100" center="0,800" time="100">unfocus</thumbAnimation>
+ </control>
+ <control>
+ <description>Cover Flow view</description>
+ <type>coverflow</type>
+ <colordiffuse>90ffffff</colordiffuse>
+ <dimColor>90ffffff</dimColor>
+ <id>50</id>
+ <onup>2</onup>
+ <ondown>2</ondown>
+ <onleft>50</onleft>
+ <onright>50</onright>
+ <posX>0</posX>
+ <posY>665</posY>
+ <width>1920</width>
+ <height>768</height>
+ <selectedCard>0</selectedCard>
+ <cardWidth>338</cardWidth>
+ <cardHeight>190</cardHeight>
+ <angle>65</angle>
+ <sideShift>410</sideShift>
+ <sideGap>210</sideGap>
+ <sideDepth>280</sideDepth>
+ <offsetY>0</offsetY>
+ <selectedOffsetY>0</selectedOffsetY>
+ <speed>8</speed>
+ <showFrame>yes</showFrame>
+ <frame>-</frame>
+ <frameFocus>-</frameFocus>
+ <frameWidth>338</frameWidth>
+ <frameHeight>190</frameHeight>
+ <spinSpeed>8</spinSpeed>
+ <unfocusedAlpha>FF</unfocusedAlpha>
+ <folderPrefix></folderPrefix>
+ <folderSuffix></folderSuffix>
+ <font1>font13</font1>
+ <font2>font11</font2>
+ <label1>#selecteditem</label1>
+ <label2>#selecteditem2</label2>
+ <textColor>FFFFFFFF</textColor>
+ <remoteColor>FFFF0000</remoteColor>
+ <playedColor>FFA0D0FF</playedColor>
+ <downloadColor>FF00FF00</downloadColor>
+ <selectedColor>FFFFFFFF</selectedColor>
+ <shadowAngle>45</shadowAngle>
+ <shadowDistance>0</shadowDistance>
+ <shadowColor>FF000000</shadowColor>
+ <label1YOff>2405</label1YOff>
+ <label2YOff>2430</label2YOff>
+ <pageSize>5</pageSize>
+ <keepaspectratio>yes</keepaspectratio>
+ <scrollbarBackground>scrollbar_bg_hor.png</scrollbarBackground>
+ <scrollbarLeft>scrollbar_left_hor.png</scrollbarLeft>
+ <scrollbarRight>scrollbar_right_hor.png</scrollbarRight>
+ <scrollbarWidth>717</scrollbarWidth>
+ <scrollbarHeight>8</scrollbarHeight>
+ <scrollbarYOff>293</scrollbarYOff>
+ <cards flipY="true" diffuse="Thumb_Mask.png" mask="pictures_filmstrip_mask.png"></cards>
+ </control>
+ </control>
+ </control>
+ </controls>
</window>
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Titan/common.fritz.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Titan/common.fritz.xml 2013-03-21 09:57:58 UTC (rev 4556)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Titan/common.fritz.xml 2013-03-23 13:22:23 UTC (rev 4557)
@@ -1,60 +1,53 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<window>
-<controls>
-
- <control>
- <description>BG</description>
- <type>image</type>
- <id>1</id>
- <width>1920</width>
- <height>1080</height>
- </control>
-
- <!-- :: Overlays :: -->
-
- <control>
- <description>background listview</description>
- <type>image</type>
- <id>1</id>
- <posX>0</posX>
- <posY>0</posY>
- <width>1920</width>
- <height>1080</height>
- <texture>overlay_long.png</texture>
- <visible>[facadeview.list | facadeview.album | facadeview.smallicons | facadeview.largeicons] + Control.IsVisible(50)</visible>
- </control>
-
- <control>
- <description>viewport list</description>
- <type>image</type>
- <id>2020</id>
- <posX>1</posX>
- <posY>92</posY>
- <width>1893</width>
- <height>795</height>
- <texture>viewport_long.png</texture>
- <visible>[facadeview.list | facadeview.album] + Control.IsVisible(50)</visible>
- <animation effect="fade" time="250">WindowOpen</animation>
- <animation effect="fade" time="250">WindowClose</animation>
- <animation effect="slide" time="250" start="-1890,0">WindowOpen</animation>
- <animation effect="slide" time="250" end="-1890,0">WindowClose</animation>
- </control>
-
- <control>
- ...
[truncated message content] |
|
From: <hor...@us...> - 2013-04-18 21:10:14
|
Revision: 4563
http://sourceforge.net/p/mp-plugins/code/4563
Author: horned-reaper
Date: 2013-04-18 21:09:57 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/Docs/Changes.txt
trunk/plugins/FritzBox/FritzBox/FritzBox.cs
trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs
trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_el.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_en-US.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_es.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_fr.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_it.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_nl.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_ru.xml
trunk/plugins/FritzBox/FritzBox/Settings.cs
trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml
trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml
trunk/plugins/FritzBox/FritzBox/Skin/Titan/FritzManager.xml
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/releases/update.xml
Added Paths:
-----------
trunk/plugins/FritzBox/FritzBox/Languages/strings_en-GB.xml
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_in.png
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_out.png
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_unanswered.png
trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_in.png
trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_out.png
trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_unanswered.png
trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_in.png
trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_out.png
trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_unanswered.png
trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_in.png
trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_out.png
trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_unanswered.png
trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/Call_in.png
trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/Call_out.png
trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/Call_unanswered.png
trunk/plugins/FritzBox/FritzBox/Skin/Maya/Media/FritzBox/Call_in.png
trunk/plugins/FritzBox/FritzBox/Skin/Maya/Media/FritzBox/Call_out.png
trunk/plugins/FritzBox/FritzBox/Skin/Maya/Media/FritzBox/Call_unanswered.png
trunk/plugins/FritzBox/FritzBox/Skin/Streamed MP/Media/FritzBox/Call_in.png
trunk/plugins/FritzBox/FritzBox/Skin/Streamed MP/Media/FritzBox/Call_out.png
trunk/plugins/FritzBox/FritzBox/Skin/Streamed MP/Media/FritzBox/Call_unanswered.png
trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/Call_in.png
trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/Call_out.png
trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/Call_unanswered.png
trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/DefaultInboxBig.png
trunk/plugins/FritzBox/FritzBox/bin/x86/
trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4562.mpe1
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/Build/Build.log 2013-04-18 21:09:57 UTC (rev 4563)
@@ -1,6 +1,6 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4556
+SVN Version: 4562
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs
@@ -11,7 +11,7 @@
Copyright (C) Microsoft Corporation. Alle Rechte vorbehalten.
Die Projekte in dieser Projektmappe werden nacheinander erstellt. Um eine parallele Erstellung zu erm\x94glichen, m\x81ssen Sie den Schalter "/m" hinzuf\x81gen.
-Der Buildvorgang wurde am 23.03.2013 14:04:23 gestartet.
+Der Buildvorgang wurde am 18.04.2013 23:01:40 gestartet.
Projekt "D:\FritzBox\FritzBox.sln" auf Knoten "1", Rebuild Ziel(e).
ValidateSolutionConfiguration:
Die Projektmappenkonfiguration "Release|Any CPU" wird erstellt.
@@ -120,7 +120,7 @@
0 Warnung(en)
0 Fehler
-Verstrichene Zeit 00:00:01.34
+Verstrichene Zeit 00:00:50.43
Reverting to build 0
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
@@ -137,6 +137,9 @@
..\FritzBox\Skin\Avalon\Media\FritzBox\CallMonitor.Missing.png
..\FritzBox\Skin\Avalon\Media\FritzBox\CallMonitor.Unknown.png
..\FritzBox\Skin\Avalon\Media\FritzBox\callout.png
+..\FritzBox\Skin\Avalon\Media\FritzBox\Call_in.png
+..\FritzBox\Skin\Avalon\Media\FritzBox\Call_out.png
+..\FritzBox\Skin\Avalon\Media\FritzBox\Call_unanswered.png
..\FritzBox\Skin\Avalon\Media\FritzBox\Phone_Icon_Home.png
..\FritzBox\Skin\Avalon\Media\FritzBox\Phone_Icon_Mobile.png
..\FritzBox\Skin\Avalon\Media\FritzBox\Phone_Icon_Work.png
@@ -147,6 +150,9 @@
..\FritzBox\Skin\Black & White\Media\FritzBox\CallMonitor.Missing.png
..\FritzBox\Skin\Black & White\Media\FritzBox\CallMonitor.Unknown.png
..\FritzBox\Skin\Black & White\Media\FritzBox\callout.png
+..\FritzBox\Skin\Black & White\Media\FritzBox\Call_in.png
+..\FritzBox\Skin\Black & White\Media\FritzBox\Call_out.png
+..\FritzBox\Skin\Black & White\Media\FritzBox\Call_unanswered.png
..\FritzBox\Skin\Black & White\Media\FritzBox\Phone_Icon_Home.png
..\FritzBox\Skin\Black & White\Media\FritzBox\Phone_Icon_Mobile.png
..\FritzBox\Skin\Black & White\Media\FritzBox\Phone_Icon_Work.png
@@ -157,6 +163,9 @@
..\FritzBox\Skin\Blue3\Media\FritzBox\CallMonitor.Missing.png
..\FritzBox\Skin\Blue3\Media\FritzBox\CallMonitor.Unknown.png
..\FritzBox\Skin\Blue3\Media\FritzBox\callout.png
+..\FritzBox\Skin\Blue3\Media\FritzBox\Call_in.png
+..\FritzBox\Skin\Blue3\Media\FritzBox\Call_out.png
+..\FritzBox\Skin\Blue3\Media\FritzBox\Call_unanswered.png
..\FritzBox\Skin\Blue3\Media\FritzBox\Phone_Icon_Home.png
..\FritzBox\Skin\Blue3\Media\FritzBox\Phone_Icon_Mobile.png
..\FritzBox\Skin\Blue3\Media\FritzBox\Phone_Icon_Work.png
@@ -167,6 +176,9 @@
..\FritzBox\Skin\Default\Media\FritzBox\CallMonitor.Missing.png
..\FritzBox\Skin\Default\Media\FritzBox\CallMonitor.Unknown.png
..\FritzBox\Skin\Default\Media\FritzBox\callout.png
+..\FritzBox\Skin\Default\Media\FritzBox\Call_in.png
+..\FritzBox\Skin\Default\Media\FritzBox\Call_out.png
+..\FritzBox\Skin\Default\Media\FritzBox\Call_unanswered.png
..\FritzBox\Skin\Default\Media\FritzBox\Phone_Icon_Home.png
..\FritzBox\Skin\Default\Media\FritzBox\Phone_Icon_Mobile.png
..\FritzBox\Skin\Default\Media\FritzBox\Phone_Icon_Work.png
@@ -177,6 +189,9 @@
..\FritzBox\Skin\DefaultWide\Media\FritzBox\CallMonitor.Missing.png
..\FritzBox\Skin\DefaultWide\Media\FritzBox\CallMonitor.Unknown.png
..\FritzBox\Skin\DefaultWide\Media\FritzBox\callout.png
+..\FritzBox\Skin\DefaultWide\Media\FritzBox\Call_in.png
+..\FritzBox\Skin\DefaultWide\Media\FritzBox\Call_out.png
+..\FritzBox\Skin\DefaultWide\Media\FritzBox\Call_unanswered.png
..\FritzBox\Skin\DefaultWide\Media\FritzBox\Phone_Icon_Home.png
..\FritzBox\Skin\DefaultWide\Media\FritzBox\Phone_Icon_Mobile.png
..\FritzBox\Skin\DefaultWide\Media\FritzBox\Phone_Icon_Work.png
@@ -187,10 +202,16 @@
..\FritzBox\Skin\Maya\Media\FritzBox\CallMonitor.Missing.png
..\FritzBox\Skin\Maya\Media\FritzBox\CallMonitor.Unknown.png
..\FritzBox\Skin\Maya\Media\FritzBox\callout.png
+..\FritzBox\Skin\Maya\Media\FritzBox\Call_in.png
+..\FritzBox\Skin\Maya\Media\FritzBox\Call_out.png
+..\FritzBox\Skin\Maya\Media\FritzBox\Call_unanswered.png
..\FritzBox\Skin\Maya\Media\FritzBox\Phone_Icon_Home.png
..\FritzBox\Skin\Maya\Media\FritzBox\Phone_Icon_Mobile.png
..\FritzBox\Skin\Maya\Media\FritzBox\Phone_Icon_Work.png
..\FritzBox\Skin\Maya\Media\FritzBox\rejected.png
+..\FritzBox\Skin\Streamed MP\Media\FritzBox\Call_in.png
+..\FritzBox\Skin\Streamed MP\Media\FritzBox\Call_out.png
+..\FritzBox\Skin\Streamed MP\Media\FritzBox\Call_unanswered.png
..\FritzBox\Skin\Streamed MP\Media\FritzBox\Phone_Icon_Home.png
..\FritzBox\Skin\Streamed MP\Media\FritzBox\Phone_Icon_Mobile.png
..\FritzBox\Skin\Streamed MP\Media\FritzBox\Phone_Icon_Work.png
@@ -202,13 +223,18 @@
..\FritzBox\Skin\Titan\Media\FritzBox\CallMonitor.Missing.png
..\FritzBox\Skin\Titan\Media\FritzBox\CallMonitor.Unknown.png
..\FritzBox\Skin\Titan\Media\FritzBox\callout.png
+..\FritzBox\Skin\Titan\Media\FritzBox\Call_in.png
+..\FritzBox\Skin\Titan\Media\FritzBox\Call_out.png
+..\FritzBox\Skin\Titan\Media\FritzBox\Call_unanswered.png
+..\FritzBox\Skin\Titan\Media\FritzBox\DefaultInboxBig.png
..\FritzBox\Skin\Titan\Media\FritzBox\Phone_Icon_Home.png
..\FritzBox\Skin\Titan\Media\FritzBox\Phone_Icon_Mobile.png
..\FritzBox\Skin\Titan\Media\FritzBox\Phone_Icon_Work.png
..\FritzBox\Skin\Titan\Media\FritzBox\rejected.png
-75 Datei(en) kopiert
+100 Datei(en) kopiert
..\FritzBox\Languages\strings_de.xml
..\FritzBox\Languages\strings_el.xml
+..\FritzBox\Languages\strings_en-GB.xml
..\FritzBox\Languages\strings_en-US.xml
..\FritzBox\Languages\strings_en.xml
..\FritzBox\Languages\strings_es.xml
@@ -243,9 +269,9 @@
..\FritzBox\Languages\Unsupported\strings_tr.xml
..\FritzBox\Languages\Unsupported\strings_uk.xml
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
-36 Datei(en) kopiert
+37 Datei(en) kopiert
MpeMaker version: 1.3.0.0
-Build started at 14:04:26
+Build started at 23:03:01
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Modified: trunk/plugins/FritzBox/Docs/Changes.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Changes.txt 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/Docs/Changes.txt 2013-04-18 21:09:57 UTC (rev 4563)
@@ -1,7 +1,3 @@
-1.0.0.4556:
-Optimiziation:
-- skin adjustments
-
-Fixed bugs:
-- call type "outgoing" filter does not work
-- Avalon skin is selected per default on Installer
\ No newline at end of file
+1.0.0.4562:
+Fixed bug:
+- incoming call notifications aren't shown when option "Show on outgoing call" is disabled and an outgoing call has been done
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2013-04-18 21:09:57 UTC (rev 4563)
@@ -49,7 +49,7 @@
All = 0,
Incoming = 1,
Outgoing = 2,
- Rejected = 3
+ Unanswered = 3
}
[PluginIcons("FritzBox.FritzBox.png", "FritzBox.FritzBoxDisabled.png")]
@@ -127,6 +127,11 @@
Log.Info("\"Auto-close after connection is closed\" setting is enabled");
closeNotificationWindow();
}
+
+ currentConnectionID = null;
+
+ // update call list
+ worker.EnqueueTask(new Task(Task.TaskAction.LoadCallListItems, null));
break;
default:
Log.Error("Incorrect call type");
@@ -284,9 +289,6 @@
// show call notification
showNotificationWindow(callAction.Type, strHeading, strImage, strText);
-
- // update call list
- worker.EnqueueTask(new Task(Task.TaskAction.LoadCallListItems, null));
}
}
}
@@ -477,8 +479,6 @@
notificationWindowCloseTimer.Elapsed += OnCloseNotificationWindowTimerEvent;
notificationWindowCloseTimer.Start();
}
-
- currentConnectionID = null;
}
else Log.Debug("Notification window wasn't opened");
}
@@ -963,7 +963,7 @@
/// <param name="data">holds CSV list</param>
protected void refreshCallListData(byte[] data)
{
- List<CallItem> newCallItemList = CallItem.load(new MemoryStream(data));
+ List<CallItem> newCallItemList = CallItem.Load(new MemoryStream(data));
int i = 0;
bool callItemListChanged = false;
@@ -1173,8 +1173,8 @@
}
else
{
- if (newVoiceBoxItemsCount > 1) GUIPropertyManager.SetProperty("#FritzManager.NewMessages", newVoiceBoxItemsCount + " " + LocalizeStrings.Get(7)); // 7 = Messages
- else GUIPropertyManager.SetProperty("#FritzManager.NewMessages", newVoiceBoxItemsCount + " " + LocalizeStrings.Get(27)); // 27 = Message
+ if (newVoiceBoxItemsCount > 1) GUIPropertyManager.SetProperty("#FritzManager.NewMessages", newVoiceBoxItemsCount + " " + LocalizeStrings.Get(19) + " " + LocalizeStrings.Get(7)); // 7 = Messages
+ else GUIPropertyManager.SetProperty("#FritzManager.NewMessages", newVoiceBoxItemsCount + " " + LocalizeStrings.Get(19) + " " + LocalizeStrings.Get(27)); // 27 = Message
GUIPropertyManager.SetProperty("#FritzManager.Caller", lastNewCallerName);
GUIPropertyManager.SetProperty("#FritzManager.NewMessageCount", newVoiceBoxItemsCount.ToString());
@@ -1215,16 +1215,16 @@
foreach (CallItem item in callItemList)
{
GUIListItem elem = new GUIListItem();
- Caller caller = phoneBook.FindContactEntries(item.number); ;
+ Caller caller = phoneBook.FindContactEntries(item.Number); ;
i++;
// apply call type filter
if (Settings.CurrentFilter == CallListFilter.Incoming) if (item.type != 1) continue;
- if (Settings.CurrentFilter == CallListFilter.Rejected) if (item.type != 2) continue;
- if (Settings.CurrentFilter == CallListFilter.Outgoing) if (item.type != 4 && item.type != 3) continue; // since FRITZ!OS 5.5 this type number is 4
+ if (Settings.CurrentFilter == CallListFilter.Unanswered) if (item.type != 2) continue;
+ if (Settings.CurrentFilter == CallListFilter.Outgoing) if (item.type != 4 && item.type != 3) continue; // since FRITZ!OS 5.50 this type number is 4
- elem.Label = item.timestamp.ToString(format, ci) + " - " + item.duration.ToString("HH:mm", ci);
+ elem.Label = item.TimeStamp.ToString(format, ci) + " - " + item.Duration.ToString("HH:mm", ci);
// add caller name/phone number
if (caller.MatchedPhoneBookItems != null) elem.Label2 = caller.MatchedPhoneBookEntryNamesAndPhoneTypes;
@@ -1234,7 +1234,7 @@
else elem.Label2 = LocalizeStrings.Get(3); // 3 = Unknown
}
- elem.DVDLabel = item.mynumber + item.extension;
+ elem.DVDLabel = item.MyNumber + item.Extension;
elem.Path = Convert.ToString(i);
@@ -1245,9 +1245,9 @@
string prefix = "FritzBox\\";
string icon = "defaultAudioBig.png";
- if (item.type == 1) icon = prefix + "callin.png";
- else if (item.type == 4 || item.type == 3) icon = prefix + "callout.png"; // since FRITZ!OS 5.5 this type number is 4
- else if (item.type == 2) icon = prefix + "rejected.png";
+ if (item.type == 1) icon = prefix + "Call_in.png";
+ else if (item.type == 4 || item.type == 3) icon = prefix + "Call_out.png"; // since FRITZ!OS 5.50 this type number is 4
+ else if (item.type == 2) icon = prefix + "Call_unanswered.png";
elem.IconImageBig = icon;
elem.IconImage = icon;
@@ -1427,9 +1427,9 @@
Settings.CurrentFilter = CallListFilter.Outgoing;
break;
case CallListFilter.Outgoing:
- Settings.CurrentFilter = CallListFilter.Rejected;
+ Settings.CurrentFilter = CallListFilter.Unanswered;
break;
- case CallListFilter.Rejected:
+ case CallListFilter.Unanswered:
Settings.CurrentFilter = CallListFilter.All;
break;
}
@@ -1468,7 +1468,7 @@
{
bool callActionEnabled = false;
- if (callItemList[Convert.ToInt16(facadeView.SelectedListItem.Path)].number != String.Empty) callActionEnabled = true;
+ if (callItemList[Convert.ToInt16(facadeView.SelectedListItem.Path)].Number != String.Empty) callActionEnabled = true;
GUIDialogMenu dlgMenu = (GUIDialogMenu)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU);
@@ -1565,8 +1565,8 @@
case CallListFilter.Outgoing:
strLine = LocalizeStrings.Get(16); // 16 = Outgoing
break;
- case CallListFilter.Rejected:
- strLine = LocalizeStrings.Get(17); // 17 = Rejected
+ case CallListFilter.Unanswered:
+ strLine = LocalizeStrings.Get(17); // 17 = Unanswered
break;
}
@@ -1580,15 +1580,15 @@
switch (Settings.CurrentMode)
{
case GUIMode.VoiceBox:
- if (headerLabel != null) headerLabel.Label = LocalizeStrings.Get(19); // 19 = FRITZ!Box messages
+ if (headerLabel != null) headerLabel.Label = LocalizeStrings.Get(7); // 7 = Messages
btnMode.Label = LocalizeStrings.Get(18); // 18 = Call list
break;
case GUIMode.CallList:
- if (headerLabel != null) headerLabel.Label = LocalizeStrings.Get(21); // 21 = FRITZ!Box call list
+ if (headerLabel != null) headerLabel.Label = LocalizeStrings.Get(18); // 18 = Call list
btnMode.Label = LocalizeStrings.Get(20); // 20 = Phone book
break;
case GUIMode.PhoneBook:
- if (headerLabel != null) headerLabel.Label = LocalizeStrings.Get(22); // 22 = FRITZ!Box phone book
+ if (headerLabel != null) headerLabel.Label = LocalizeStrings.Get(20); // // 20 = Phone book
btnMode.Label = LocalizeStrings.Get(7); // 7 = Messages
break;
}
Modified: trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs 2013-04-18 21:09:57 UTC (rev 4563)
@@ -88,7 +88,6 @@
private static ManualResetEvent connectDone = new ManualResetEvent(false); // ensures that the thread doesn't end before the socket is connected (avoids error message "A request to send or receive data was disallowed because the socket is not connected and (when sending on a datagram socket using a sendto call) no address was supplied")
private static System.Timers.Timer connectionCheckTimer = new System.Timers.Timer();
private static IPEndPoint remoteEP;
-
#region Properties
static FritzBoxClient()
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs 2013-04-18 21:09:57 UTC (rev 4563)
@@ -8,28 +8,28 @@
namespace FritzManager
{
/// <summary>
- /// Model of one call item record. read from fritz CSV exports
+ /// Model of one call item record. Read from FRITZ CSV exports
/// </summary>
public class CallItem : System.IEquatable<CallItem>
{
- public DateTime duration;
- public string extension; // in German "Nebenstelle"
- public string mynumber;
- public string name;
- public string number;
- public DateTime timestamp;
+ public DateTime Duration;
+ public string Extension; // in German "Nebenstelle"
+ public string MyNumber;
+ public string Name;
+ public string Number;
+ public DateTime TimeStamp;
public int type;
private static Logger Log = LoggerFactory.getLogger("CallItem");
public static List<CallItem> loadFromFile(string filename)
{
Stream s = new FileStream(filename, FileMode.Open);
- List<CallItem> r = load(s);
+ List<CallItem> r = Load(s);
s.Close();
return r;
}
- public static List<CallItem> load(Stream s)
+ public static List<CallItem> Load(Stream s)
{
List<CallItem> result = new List<CallItem>();
@@ -42,7 +42,11 @@
string cutOffPrefix = "49";
string line;
- for (int i = 0; i < 3; i++) reader.ReadLine(); // skip first three lines
+ if (FritzBox.Settings.FritzBoxFirmwareMainVersion > 5 || (FritzBox.Settings.FritzBoxFirmwareMainVersion == 5 && FritzBox.Settings.FritzBoxFirmwareSubVersion >= 50))
+ {
+ for (int i = 0; i < 2; i++) reader.ReadLine(); // skip first two lines on firmware version 5.50 or higher
+ }
+ else for (int i = 0; i < 3; i++) reader.ReadLine(); // skip first three lines
while (reader.Peek() >= 0)
{
@@ -51,15 +55,15 @@
CallItem item = new CallItem();
item.type = Convert.ToInt16(f[0]);
- item.timestamp = DateTime.ParseExact(f[1], formatTimeStamp, provider);
- item.name = f[2];
+ item.TimeStamp = DateTime.ParseExact(f[1], formatTimeStamp, provider);
+ item.Name = f[2];
- if (f[3].StartsWith(cutOffPrefix)) item.number = "0" + f[3].Substring(cutOffPrefix.Length);
- else item.number = f[3];
+ if (f[3].StartsWith(cutOffPrefix)) item.Number = "0" + f[3].Substring(cutOffPrefix.Length);
+ else item.Number = f[3];
- item.extension = f[4];
- item.mynumber = f[5];
- item.duration = DateTime.ParseExact(f[6], formatDuration, provider);
+ item.Extension = f[4];
+ item.MyNumber = f[5];
+ item.Duration = DateTime.ParseExact(f[6], formatDuration, provider);
result.Add(item);
}
@@ -77,7 +81,7 @@
public bool Equals(CallItem callItem)
{
- if (timestamp == callItem.timestamp) return true;
+ if (TimeStamp == callItem.TimeStamp) return true;
else return false;
}
}
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs 2013-04-18 21:09:57 UTC (rev 4563)
@@ -23,6 +23,7 @@
private string hostname;
private string baseurl;
+ private string baseurl2;
private bool loggedIn;
private string passwd;
private string cacheDir;
@@ -30,14 +31,13 @@
private string sid;
private string dialport;
private System.Object cacheSync = new System.Object();
- private bool fritzOS55; // indicates of the FRITZ!Box OS version is 5.5 or higher
+ private static Logger Log = LoggerFactory.getLogger("Fritz");
- static Logger Log = LoggerFactory.getLogger("Fritz");
-
public Fritz(string passwd, string cacheDir, string host, string dialport)
{
this.hostname = host;
this.baseurl = "http://" + host + "/cgi-bin/webcm";
+ this.baseurl2 = "http://" + host;
this.passwd = passwd;
this.cacheDir = cacheDir;
this.cacheFileName = cacheDir + "\\FritzBox-CallList.csv";
@@ -74,13 +74,15 @@
byte[] hash = md5.ComputeHash(Encoding.GetEncoding("UTF-16LE").GetBytes(md5in));
string response = challenge + "-" + BitConverter.ToString(hash).Replace("-", String.Empty).ToLower();
- // new login procedure since FRITZ!OS 5.5
- XDocument doc = XDocument.Load("http://fritz.box/login_sid.lua?username=&response=" + response);
- sid = GetXMLValue(doc, "SID");
-
- if (sid == "0000000000000000")
+ if (FritzBox.Settings.FritzBoxFirmwareMainVersion > 5 || (FritzBox.Settings.FritzBoxFirmwareMainVersion == 5 && FritzBox.Settings.FritzBoxFirmwareSubVersion >= 50))
{
- // login procedure before FRITZ!OS 5.5
+ // new login procedure since FRITZ!OS 5.50
+ XDocument doc = XDocument.Load(baseurl2 + "/login_sid.lua?username=&response=" + response);
+ sid = getXMLValue(doc, "SID");
+ }
+ else
+ {
+ // login procedure before FRITZ!OS 5.50
sid = PostRequest(baseurl, "login:command/response=" + response + "&getpage=../html/de/menus/menu2.html");
if (sid != String.Empty)
@@ -90,7 +92,6 @@
sid = matchList[0].Groups[1].Value;
}
}
- else fritzOS55 = true;
}
}
catch { }
@@ -233,15 +234,16 @@
// download CSV file
try
{
- switch (fritzOS55)
+ if (FritzBox.Settings.FritzBoxFirmwareMainVersion > 5 || (FritzBox.Settings.FritzBoxFirmwareMainVersion == 5 && FritzBox.Settings.FritzBoxFirmwareSubVersion >= 50))
{
- case true:
- result = client.DownloadData("http://" + hostname + "/fon_num/foncalls_list.lua?sid=" + sid + "&csv="); // new procedure since FRITZ!OS 5.5
- break;
- case false:
- result = client.DownloadData(baseurl + "?sid=" + sid + "&getpage=../html/de/FRITZ%21Box_Anrufliste.csv"); // old procedure before FRITZ!OS 5.5
- break;
+ // new procedure since FRITZ!OS 5.50
+ result = client.DownloadData(baseurl2 + "/fon_num/foncalls_list.lua?sid=" + sid + "&csv=");
}
+ else
+ {
+ // old procedure before FRITZ!OS 5.50
+ result = client.DownloadData(baseurl + "?sid=" + sid + "&getpage=../html/de/FRITZ%21Box_Anrufliste.csv");
+ }
}
catch {}
@@ -291,8 +293,8 @@
try
{
- XDocument doc = XDocument.Load("http://" + hostname + "/login_sid.lua");
- return GetXMLValue(doc, "Challenge");
+ XDocument doc = XDocument.Load(baseurl2 + "/login_sid.lua");
+ return getXMLValue(doc, "Challenge");
}
catch {}
@@ -337,14 +339,45 @@
}
}
- private string GetXMLValue(XDocument doc, string name)
+ private string getXMLValue(XDocument doc, string name)
{
XElement info = doc.FirstNode as XElement;
return info.Element(name).Value;
}
+ private string getXMLValue(XDocument doc, string name, XNamespace nameSpace)
+ {
+ XElement info = doc.FirstNode as XElement;
+ return info.Element(nameSpace + name).Value;
+ }
+
+ private void getFritzBoxInfo()
+ {
+ try
+ {
+ XDocument doc = XDocument.Load(baseurl2 + "/jason_boxinfo.xml");
+
+ // get FRITZ!Box firmware version
+ string fritzBoxFirmwareVersion = getXMLValue(doc, "Version", "http://jason.avm.de/updatecheck/");
+ string[] fritzBoxFirmwareVersionArray = fritzBoxFirmwareVersion.Split(new char[] { '.' });
+
+ FritzBox.Settings.FritzBoxFirmwareMainVersion = Convert.ToInt32(fritzBoxFirmwareVersionArray[1]);
+ FritzBox.Settings.FritzBoxFirmwareSubVersion = Convert.ToInt32(fritzBoxFirmwareVersionArray[2]);
+
+ // get FRITZ!Box name
+ FritzBox.Settings.FritzBoxName = getXMLValue(doc, "Name", "http://jason.avm.de/updatecheck/");
+
+ Log.Debug("FRITZ!Box firmware version is " + FritzBox.Settings.FritzBoxFirmwareMainVersion + "." + FritzBox.Settings.FritzBoxFirmwareSubVersion + " on " + FritzBox.Settings.FritzBoxName);
+ }
+ catch
+ {
+ Log.Debug("Could not query FRITZ!Box firmware version");
+ }
+ }
+
private void OnConnectedEvent()
{
+ getFritzBoxInfo();
Login();
}
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs 2013-04-18 21:09:57 UTC (rev 4563)
@@ -630,24 +630,17 @@
private string convertImageURL(string imageURL)
{
- string contactImagePathRemote = imageURL;
+ string contactImagePathRemote;
// convert to UNC format
- if (Directory.Exists(@"\\" + FritzBoxClient.Address + "\\" + Settings.NASShareName))
+ if (imageURL.Contains("file:///var/media/ftp/"))
{
- if (contactImagePathRemote.Contains("InternerSpeicher")) contactImagePathRemote = contactImagePathRemote.Replace("file:///var/InternerSpeicher", @"\\" + FritzBoxClient.Address + "\\" + Settings.NASShareName); // FRITZ!Boxe models with internal storage e. g. FRITZ!Box 7390
- else contactImagePathRemote = contactImagePathRemote.Replace("file:///var/media/ftp", @"\\" + FritzBoxClient.Address + "\\" + Settings.NASShareName);
+ contactImagePathRemote = imageURL.Replace("file:///var/media/ftp/", @"\\" + FritzBoxClient.Address + "\\" + Settings.NASShareName + "\\");
+ contactImagePathRemote = contactImagePathRemote.Replace("/", "\\");
+
+ return contactImagePathRemote;
}
- else
- {
- // some FRITZ!Box models e. g. 7390 don't have no common share under "Settings.NASShareName". They directly share their data under the FRITZ!Box host name
- if (contactImagePathRemote.Contains("InternerSpeicher")) contactImagePathRemote = contactImagePathRemote.Replace("file:///var/InternerSpeicher", @"\\" + FritzBoxClient.Address); // FRITZ!Boxe models with internal storage e. g. FRITZ!Box 7390
- else contactImagePathRemote = contactImagePathRemote.Replace("file:///var/media/ftp", @"\\" + FritzBoxClient.Address);
- }
-
- contactImagePathRemote = contactImagePathRemote.Replace("/", "\\");
-
- return contactImagePathRemote;
+ else return String.Empty;
}
#endregion private methods
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml 2013-04-18 21:09:57 UTC (rev 4563)
@@ -17,12 +17,10 @@
<String id="14">Alle</String>
<String id="15">Eingehend</String>
<String id="16">Ausgehend</String>
- <String id="17">Abgelehnt</String>
+ <String id="17">Unbeantwortet</String>
<String id="18">Anrufliste</String>
- <String id="19">FRITZ!Box Nachrichten</String>
+ <String id="19">neue</String>
<String id="20">Telefonbuch</String>
- <String id="21">FRITZ!Box Anrufliste</String>
- <String id="22">FRITZ!Box Telefonbuch</String>
<String id="23">Fehler</String>
<String id="24">Bitte FRITZ!Box-Passwort und Anrufbeantworter-Pfad unter Configuration eintragen!</String>
<String id="25">Aktualisieren</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_el.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_el.xml 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_el.xml 2013-04-18 21:09:57 UTC (rev 4563)
@@ -17,12 +17,10 @@
<String id="14">Όλες</String>
<String id="15">Εισερχόμενη</String>
<String id="16">Ξεκινώντας</String>
- <String id="17">Απορρίφθηκε</String>
+ <String id="17">Αναπάντητες</String>
<String id="18">Λίστα κλήσεων</String>
- <String id="19">FritzBox ειδήσεις</String>
+ <String id="19">νέα</String>
<String id="20">Τηλεφωνικός κατάλογος</String>
- <String id="21">FRITZ!Box λίστα κλήσεων</String>
- <String id="22">FRITZ!Box Telefonbuch</String>
<String id="23">Errore</String>
<String id="24">FRITZ!Box κωδικό και φωνή μονοπάτι κουτί λείπουν στις ρυθμίσεις!</String>
<String id="25">Ενημέρωση</String>
Added: trunk/plugins/FritzBox/FritzBox/Languages/strings_en-GB.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_en-GB.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_en-GB.xml 2013-04-18 21:09:57 UTC (rev 4563)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Language name="English (United Kingdom)" characters="255">
+ <Section name="unmapped">
+ <String id="1">Incoming call</String>
+ <String id="2">Outgoing call</String>
+ <String id="3">Unknown</String>
+ <String id="4">Caller</String>
+ <String id="5">Call</String>
+ <String id="6">Contact</String>
+ <String id="7">Messages</String>
+ <String id="8">Play message</String>
+ <String id="9">Mark message as heard</String>
+ <String id="10">Delete message</String>
+ <String id="11">View: List</String>
+ <String id="12">View: Small icons</String>
+ <String id="13">View: Large icons</String>
+ <String id="14">All</String>
+ <String id="15">Incoming</String>
+ <String id="16">Outgoing</String>
+ <String id="17">Unanswered</String>
+ <String id="18">Call list</String>
+ <String id="19">new</String>
+ <String id="20">Phone book</String>
+ <String id="23">Error</String>
+ <String id="24">FRITZ!Box password and voice box path are missing in settings!</String>
+ <String id="25">Update</String>
+ <String id="26">to</String>
+ <String id="27">Message</String>
+ <String id="28">Phone</String>
+ <String id="29">Private</String>
+ <String id="30">Mobile</String>
+ <String id="31">Business</String>
+ </Section>
+</Language>
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_en-US.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_en-US.xml 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_en-US.xml 2013-04-18 21:09:57 UTC (rev 4563)
@@ -17,12 +17,10 @@
<String id="14">All</String>
<String id="15">Incoming</String>
<String id="16">Outgoing</String>
- <String id="17">Rejected</String>
+ <String id="17">Unanswered</String>
<String id="18">Call list</String>
- <String id="19">FRITZ!Box messages</String>
+ <String id="19">new</String>
<String id="20">Phone book</String>
- <String id="21">FRITZ!Box call list</String>
- <String id="22">FRITZ!Box phone book</String>
<String id="23">Error</String>
<String id="24">FRITZ!Box password and voice box path are missing in settings!</String>
<String id="25">Update</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_es.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_es.xml 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_es.xml 2013-04-18 21:09:57 UTC (rev 4563)
@@ -17,12 +17,10 @@
<String id="14">Todos</String>
<String id="15">Detallado</String>
<String id="16">Basado</String>
- <String id="17">Rechazado</String>
+ <String id="17">Sin respuesta</String>
<String id="18">Lista de llamadas</String>
- <String id="19">FRITZ!Box noticias</String>
+ <String id="19">nuevo </String>
<String id="20">Guía telefónica</String>
- <String id="21">FRITZ!Box lista de llamadas</String>
- <String id="22">FRITZ!Box guía telefónica</String>
<String id="23">Error</String>
<String id="24">FRITZ!Box y la ruta de caja de la voz no se encuentran en la configuración!</String>
<String id="25">Actualización</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_fr.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_fr.xml 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_fr.xml 2013-04-18 21:09:57 UTC (rev 4563)
@@ -17,12 +17,10 @@
<String id="14">Tous les</String>
<String id="15">Détail</String>
<String id="16">Basé</String>
- <String id="17">Rejetée</String>
+ <String id="17">Sans réponse</String>
<String id="18">Liste des appels</String>
- <String id="19">FRITZ!Box nouvelles</String>
+ <String id="19">neufs</String>
<String id="20">Annuaire téléphonique</String>
- <String id="21">Liste des appels FRITZ!Box</String>
- <String id="22">Annuaire FRITZ!Box</String>
<String id="23">Erreur</String>
<String id="24">FRITZ!Box passe et le chemin boîte vocale sont manquantes dans les réglages!</String>
<String id="25">Mise à jour</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_it.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_it.xml 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_it.xml 2013-04-18 21:09:57 UTC (rev 4563)
@@ -17,12 +17,10 @@
<String id="14">Tutti</String>
<String id="15">Dettagliato</String>
<String id="16">Basato</String>
- <String id="17">Rifiutato</String>
+ <String id="17">Senza risposta</String>
<String id="18">Lista chiamate</String>
- <String id="19">FRITZ!Box notizie</String>
+ <String id="19">nuovi</String>
<String id="20">Elenco telefonico</String>
- <String id="21">FRITZ!Box chiamata lista</String>
- <String id="22">FRITZ!Box rubrica</String>
<String id="23">Errore</String>
<String id="24">FRITZ!Box password della casella e casella percorso vocale mancano nelle impostazioni!</String>
<String id="25">Aggiornamento</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_nl.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_nl.xml 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_nl.xml 2013-04-18 21:09:57 UTC (rev 4563)
@@ -17,12 +17,10 @@
<String id="14">Alle</String>
<String id="15">Gedetailleerd</String>
<String id="16">Op basis van</String>
- <String id="17">Verworpen</String>
+ <String id="17">Onbeantwoorde</String>
<String id="18">Bellijst</String>
- <String id="19">FRITZ!Box nieuws</String>
+ <String id="19">nieuwe</String>
<String id="20">Telefoonboek</String>
- <String id="21">FRITZ!Box oproeplijst</String>
- <String id="22">FRITZ!Box telefoonboek</String>
<String id="23">Fout</String>
<String id="24">FRITZ!Box wachtwoord en strottenhoofd het pad ontbreken in instellingen!</String>
<String id="25">Update</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_ru.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_ru.xml 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_ru.xml 2013-04-18 21:09:57 UTC (rev 4563)
@@ -17,12 +17,10 @@
<String id="14">все</String>
<String id="15">входящие</String>
<String id="16">исходящие</String>
- <String id="17">пропущенные</String>
+ <String id="17">без ответов</String>
<String id="18">Список вызовов</String>
- <String id="19">Сообщения FRITZ!Box</String>
+ <String id="19">новых</String>
<String id="20">Телефонная книга</String>
- <String id="21">Список вызовов FRITZ!Box</String>
- <String id="22">Телефонная книга FRITZ!Box</String>
<String id="23">Ошибка</String>
<String id="24">Пароль к FRITZ!Box и путь к голосовому ящику не указаны в настройках!</String>
<String id="25">Обновить</String>
Modified: trunk/plugins/FritzBox/FritzBox/Settings.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Settings.cs 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Settings.cs 2013-04-18 21:09:57 UTC (rev 4563)
@@ -154,6 +154,12 @@
public static string ContactImagesFolderPath { get; private set; }
+ public static int FritzBoxFirmwareMainVersion { get; set; }
+
+ public static int FritzBoxFirmwareSubVersion { get; set; }
+
+ public static string FritzBoxName { get; set; }
+
#endregion Properties
#region Contructor
@@ -242,6 +248,11 @@
ManualContactImagePathEntry = xmlreader.GetValueAsBool(PLUGIN_NAME, "Manual contact image path entry", false);
+ // FRITZ!Box information
+ FritzBoxName = xmlreader.GetValueAsString(PLUGIN_NAME, "FRITZ!Box name", String.Empty);
+ FritzBoxFirmwareMainVersion = xmlreader.GetValueAsInt(PLUGIN_NAME, "FRITZ!Box firmware main version", 0);
+ FritzBoxFirmwareSubVersion = xmlreader.GetValueAsInt(PLUGIN_NAME, "FRITZ!Box firmware sub version", 0);
+
// GUI settings
CurrentMode = (GUIMode)xmlreader.GetValueAsInt(PLUGIN_NAME, "Current mode", 0);
CurrentFilter = (CallListFilter)xmlreader.GetValueAsInt(PLUGIN_NAME, "Current filter", 0);
@@ -329,7 +340,12 @@
xmlwriter.SetValueAsBool(PLUGIN_NAME, "Synchronize phone book", SynchronizePhoneBook);
xmlwriter.SetValueAsBool(PLUGIN_NAME, "Manual contact image path entry", ManualContactImagePathEntry);
-
+
+ // FRITZ!Box information
+ xmlwriter.SetValue(PLUGIN_NAME, "FRITZ!Box name", FritzBoxName);
+ xmlwriter.SetValue(PLUGIN_NAME, "FRITZ!Box firmware main version", FritzBoxFirmwareMainVersion);
+ xmlwriter.SetValue(PLUGIN_NAME, "FRITZ!Box firmware sub version", FritzBoxFirmwareSubVersion);
+
// GUI settings
xmlwriter.SetValue(PLUGIN_NAME, "Current mode", (int)CurrentMode);
xmlwriter.SetValue(PLUGIN_NAME, "Current filter", (int)CurrentFilter);
@@ -351,7 +367,7 @@
}
catch
{
- Log.Info("Country and area code could not be queried from Windows. MSN detection only works limited");
+ Log.Info("Country and area code could not be queried from Windows. MSN detection works limited only");
}
}
Added: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_in.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_in.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_in.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_in.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_in.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_out.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_out.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_out.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_out.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_out.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_unanswered.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_unanswered.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_unanswered.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_unanswered.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_unanswered.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_in.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_in.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_in.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_in.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_in.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_out.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_out.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_out.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_out.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_out.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_unanswered.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_unanswered.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_unanswered.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_unanswered.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_unanswered.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_in.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_in.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_in.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_in.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_in.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_out.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_out.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_out.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_out.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_out.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_unanswered.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_unanswered.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_unanswered.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_unanswered.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_unanswered.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml 2013-04-18 21:09:57 UTC (rev 4563)
@@ -3,8 +3,8 @@
<id>464554871</id>
<defaultcontrol>50</defaultcontrol>
<allowoverlay>yes</allowoverlay>
- <define>#header.label:666</define>
- <define>#header.hover:-</define>
+ <define>#header.label:FRITZ!Box Manager</define>
+ <define>#header.hover:hover_fritzbox.png</define>
<controls>
<control>
<description>Background</description>
@@ -100,17 +100,6 @@
<animation effect="fade" time="450" reversible="false">visible</animation>
</control>
<control>
- <type>image</type>
- <id>1</id>
- <posX>40</posX>
- <posY>150</posY>
- <width>178</width>
- <height>144</height>
- <texture flipY="true" diffuse="Thumb_Mask.png">Picture_cover.png</texture>
- <visible>facadeview.list+Control.HasFocus(50)</visible>
- <animation effect="fade" time="450" reversible="false">visible</animation>
- </control>
- <control>
<description>Header</description>
<type>fadelabel</type>
<posX>26</posX>
Added: trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_in.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_in.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_in.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_in.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_in.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_out.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_out.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_out.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_out.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_out.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_unanswered.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_unanswered.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_unanswered.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_unanswered.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_unanswered.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml 2013-04-18 21:09:57 UTC (rev 4563)
@@ -3,8 +3,8 @@
<id>464554871</id>
<defaultcontrol>50</defaultcontrol>
<allowoverlay>yes</allowoverlay>
- <define>#header.label:666</define>
- <define>#header.hover:-</define>
+ <define>#header.label:FRITZ!Box Manager</define>
+ <define>#header.hover:hover_fritzbox.png</define>
<controls>
<control>
<description>Background</description>
@@ -100,17 +100,6 @@
<animation effect="fade" time="450" reversible="false">visible</animation>
</control>
<control>
- <type>image</type>
- <id>1</id>
- <posX>40</posX>
- <posY>150</posY>
- <width>178</width>
- <height>144</height>
- <texture flipY="true" diffuse="Thumb_Mask.png">Picture_cover.png</texture>
- <visible>facadeview.list+Control.HasFocus(50)</visible>
- <animation effect="fade" time="450" reversible="false">visible</animation>
- </control>
- <control>
<description>Header</description>
<type>fadelabel</type>
<posX>26</posX>
Added: trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/Call_in.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/Call_in.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/Call_in.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/Call_in.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/Call_in.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/Call_out.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/Call_out.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzB...
[truncated message content] |
|
From: <hor...@us...> - 2013-04-18 21:17:42
|
Revision: 4564
http://sourceforge.net/p/mp-plugins/code/4564
Author: horned-reaper
Date: 2013-04-18 21:17:39 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/Docs/Changes.txt
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/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_v1.0.0.4563.mpe1
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2013-04-18 21:09:57 UTC (rev 4563)
+++ trunk/plugins/FritzBox/Build/Build.log 2013-04-18 21:17:39 UTC (rev 4564)
@@ -1,6 +1,6 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4562
+SVN Version: 4563
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs
@@ -11,7 +11,7 @@
Copyright (C) Microsoft Corporation. Alle Rechte vorbehalten.
Die Projekte in dieser Projektmappe werden nacheinander erstellt. Um eine parallele Erstellung zu erm\x94glichen, m\x81ssen Sie den Schalter "/m" hinzuf\x81gen.
-Der Buildvorgang wurde am 18.04.2013 23:01:40 gestartet.
+Der Buildvorgang wurde am 18.04.2013 23:11:23 gestartet.
Projekt "D:\FritzBox\FritzBox.sln" auf Knoten "1", Rebuild Ziel(e).
ValidateSolutionConfiguration:
Die Projektmappenkonfiguration "Release|Any CPU" wird erstellt.
@@ -120,7 +120,7 @@
0 Warnung(en)
0 Fehler
-Verstrichene Zeit 00:00:50.43
+Verstrichene Zeit 00:00:02.14
Reverting to build 0
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
@@ -271,7 +271,7 @@
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
37 Datei(en) kopiert
MpeMaker version: 1.3.0.0
-Build started at 23:03:01
+Build started at 23:11:27
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Modified: trunk/plugins/FritzBox/Docs/Changes.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Changes.txt 2013-04-18 21:09:57 UTC (rev 4563)
+++ trunk/plugins/FritzBox/Docs/Changes.txt 2013-04-18 21:17:39 UTC (rev 4564)
@@ -1,3 +1,3 @@
-1.0.0.4562:
+1.0.0.4563:
Fixed bug:
-- incoming call notifications aren't shown when option "Show on outgoing call" is disabled and an outgoing call has been done
\ No newline at end of file
+- incoming call notifications aren't shown when option "Show on outgoing call" is disabled and an outgoing call has been done (thanks to Django.edwards!)
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2013-04-18 21:09:57 UTC (rev 4563)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2013-04-18 21:17:39 UTC (rev 4564)
@@ -879,7 +879,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4562</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4563</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -902,7 +902,7 @@
<Major>1</Major>
<Minor>0</Minor>
<Build>0</Build>
- <Revision>4562</Revision>
+ <Revision>4563</Revision>
</Version>
<ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box information from MediaPortal.
@@ -916,7 +916,7 @@
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
- <ReleaseDate>2013-04-18T23:03:01.6718295+02:00</ReleaseDate>
+ <ReleaseDate>2013-04-18T23:11:27.9286738+02:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Added: trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4563.mpe1
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4563.mpe1
===================================================================
--- trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4563.mpe1 2013-04-18 21:09:57 UTC (rev 4563)
+++ trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4563.mpe1 2013-04-18 21:17:39 UTC (rev 4564)
Property changes on: trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4563.mpe1
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/FritzBox/releases/update.xml
===================================================================
--- trunk/plugins/FritzBox/releases/update.xml 2013-04-18 21:09:57 UTC (rev 4563)
+++ trunk/plugins/FritzBox/releases/update.xml 2013-04-18 21:17:39 UTC (rev 4564)
@@ -112,7 +112,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4562</DesignedForVersion>
+ <DesignedForVersion>1.1.7.0</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -135,7 +135,7 @@
<Major>1</Major>
<Minor>0</Minor>
<Build>0</Build>
- <Revision>4562</Revision>
+ <Revision>0</Revision>
</Version>
<ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box information from MediaPortal.
@@ -149,7 +149,7 @@
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
- <ReleaseDate>2013-04-18T23:03:01.6718295+02:00</ReleaseDate>
+ <ReleaseDate>2013-04-18T23:10:46.1521221+02:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
@@ -187,5 +187,191 @@
</ProjectSettings>
<IsSkin>false</IsSkin>
</PackageClass>
+ <PackageClass>
+ <Version>2.0</Version>
+ <Groups>
+ <Items>
+ <GroupItem Name="Default">
+ <DisplayName>Default</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Default</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Titan Skin">
+ <DisplayName>Titan Skin</DisplayName>
+ <DefaulChecked>false</DefaulChecked>
+ <Description>Titan Skin</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Blue3 Skin">
+ <DisplayName>Blue3 Skin</DisplayName>
+ <DefaulChecked>false</DefaulChecked>
+ <Description>Blue3 Skin</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Maya Skin">
+ <DisplayName>Maya Skin</DisplayName>
+ <DefaulChecked>false</DefaulChecked>
+ <Description>Maya Skin</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Black & White Skin">
+ <DisplayName>Black & White Skin</DisplayName>
+ <DefaulChecked>false</DefaulChecked>
+ <Description>Black & White Skin</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Default Skin">
+ <DisplayName>Default Skin</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Default Skin</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="DefaultWide Skin">
+ <DisplayName>DefaultWide Skin</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>DefaultWide Skin</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Streamed MP Skin">
+ <DisplayName>Streamed MP Skin</DisplayName>
+ <DefaulChecked>false</DefaulChecked>
+ <Description>Streamed MP Skin</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Avalon Skin">
+ <DisplayName>Avalon Skin</DisplayName>
+ <DefaulChecked>false</DefaulChecked>
+ <Description>Avalon Skin</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items />
+ </Sections>
+ <Dependencies>
+ <Items>
+ <DependencyItem>
+ <Type>MediaPortal</Type>
+ <Id />
+ <MinVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MinVersion>
+ <MaxVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MaxVersion>
+ <WarnOnly>false</WarnOnly>
+ <Message>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ </Items>
+ </Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="FritzBox.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.1.0.0</MinRequiredVersion>
+ <DesignedForVersion>1.1.7.4563</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items>
+ <SubSystemItem Name="MP.Config" />
+ </Items>
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
+ <GeneralInfo>
+ <Name>FritzBox Manager</Name>
+ <Id>8cb6bbc2-5473-4a63-a8f9-e0bec7c8c81c</Id>
+ <Author>Horned_Reaper, Steve, Chefkoch</Author>
+ <HomePage>http://www.team-mediaportal.com/extensions/other/fritzbox-manager-phone-manager-callmonitor-for-avm-fritz-box</HomePage>
+ <ForumPage>http://forum.team-mediaportal.com/mediaportal-plugins-47/fritz-box-manager-english-forum-103177/#post817050</ForumPage>
+ <UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=52</UpdateUrl>
+ <Version>
+ <Major>1</Major>
+ <Minor>0</Minor>
+ <Build>0</Build>
+ <Revision>4563</Revision>
+ </Version>
+ <ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box information from MediaPortal.
+
+Features:
+- notification for incoming and outgoing calls via window, sound and contact picture
+- MediaPortal Player is automatically paused and resumed on calls
+- access call lists, voice box and phone book directly in MediaPortal
+- voice box message notification in any MediaPortal screen
+- connection establishment from call list, voice box or phone book entries
+- language localization</ExtensionDescription>
+ <VersionDescription />
+ <DevelopmentStatus>Stable</DevelopmentStatus>
+ <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
+ <ReleaseDate>2013-04-18T23:11:27.9286738+02:00</ReleaseDate>
+ <Tags>fritzbox, fritzbox manager, callmonitor</Tags>
+ <Location>..\MpeRelease\FritzBox.mpe1</Location>
+ <Params>
+ <Items>
+ <SectionParam Name="Online Icon">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Configuration file">
+ <Value />
+ <ValueType>Template</ValueType>
+ <Description>The file used to configure the extension.
+ If have .exe extension the will be executed
+ If have .dll extension used like MP plugin configuration</Description>
+ </SectionParam>
+ <SectionParam Name="Online Screenshots">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>Online stored screenshot urls separated by ; </Description>
+ </SectionParam>
+ <SectionParam Name="Force to uninstall on update">
+ <Value>yes</Value>
+ <ValueType>Bool</ValueType>
+ <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ </GeneralInfo>
+ <UniqueFileList>
+ <Items />
+ </UniqueFileList>
+ <ProjectSettings>
+ <FolderGroups />
+ </ProjectSettings>
+ <IsSkin>false</IsSkin>
+ </PackageClass>
</Items>
</ExtensionCollection>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hor...@us...> - 2014-04-21 19:49:02
|
Revision: 4787
http://sourceforge.net/p/mp-plugins/code/4787
Author: horned-reaper
Date: 2014-04-21 19:48:57 +0000 (Mon, 21 Apr 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/Docs/Changes.txt
trunk/plugins/FritzBox/Docs/Vorgehensweise beim Update.txt
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/FritzBoxConfig.resx
trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs
trunk/plugins/FritzBox/FritzBox/Settings.cs
trunk/plugins/FritzBox/FritzBox/bin/Release/Dialogs.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/DesignTimeResolveAssemblyReferences.cache
trunk/plugins/FritzBox/FritzBox/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.EditPhoneBook.resources
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.FritzBoxConfig.resources
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.Properties.Resources.resources
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.GenerateResource.Cache
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.EditPhoneBook.resources
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.FritzBoxConfig.resources
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.Properties.Resources.resources
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.GenerateResource.Cache
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/FritzBoxConfigTester.csproj
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/app.config
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Bass.Net.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/BassRegistration.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/BassVisAPI.Net.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Common.Utils.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Core.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Dialogs.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/DirectShowLib.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe.config
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/MediaPortal.Support.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Utils.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/log4net.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/taglib-sharp.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/FritzBoxDebugger.csproj
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/app.config
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/Dialogs.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe.config
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.DebugForm.resources
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.DebugForm.resources
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/UNCAccessWithCredentials.cs
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/CSScriptLibrary.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Microsoft.WindowsAPICodePack.Shell.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Microsoft.WindowsAPICodePack.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4564.mpe1
trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4786.mpe1
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/Build/Build.log 2014-04-21 19:48:57 UTC (rev 4787)
@@ -1,17 +1,17 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4563
+SVN Version: 4786
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\Tools\FritzBoxConfigTester\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\Tools\FritzBoxDebugger\Properties\AssemblyInfo.cs
Microsoft (R)-Buildmodul, Version 4.0.30319.17929
-[Microsoft .NET Framework, Version 4.0.30319.18033]
+[Microsoft .NET Framework, Version 4.0.30319.18449]
Copyright (C) Microsoft Corporation. Alle Rechte vorbehalten.
Die Projekte in dieser Projektmappe werden nacheinander erstellt. Um eine parallele Erstellung zu erm\x94glichen, m\x81ssen Sie den Schalter "/m" hinzuf\x81gen.
-Der Buildvorgang wurde am 18.04.2013 23:11:23 gestartet.
+Der Buildvorgang wurde am 21.04.2014 21:24:13 gestartet.
Projekt "D:\FritzBox\FritzBox.sln" auf Knoten "1", Rebuild Ziel(e).
ValidateSolutionConfiguration:
Die Projektmappenkonfiguration "Release|Any CPU" wird erstellt.
@@ -26,9 +26,14 @@
Die Datei "D:\FritzBox\FritzBox\obj\Release\FritzBox.dll" wird gel\x94scht.
Die Datei "D:\FritzBox\FritzBox\obj\Release\FritzBox.csprojResolveAssemblyReference.cache" wird gel\x94scht.
CoreResGen:
- C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\ResGen.exe /useSourcePath /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Common.Utils.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Core.dll" /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Data.dll /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Data.Linq.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 (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Xml.Linq.dll" /r:"C:\Program Files (x86)\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
+ "C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\bin\NETFX 4.0 Tools\resgen.exe" /useSourcePath /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Common.Utils.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\mscorlib.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Core.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Data.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Data.Linq.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Drawing.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Windows.Forms.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Xml.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Xml.Linq.dll" /r:"C:\Program Files (x86)\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
+ Die Ressourcendatei "EditPhoneBook.resx" wird zu "obj\Release\FritzBox.EditPhoneBook.resources" verarbeitet.
+ Die Ressourcendatei "Properties\Resources.resx" wird zu "obj\Release\FritzBox.Properties.Resources.resources" verarbeitet.
+ Die Ressourcendatei "FritzBoxConfig.resx" wird zu "obj\Release\FritzBox.FritzBoxConfig.resources" verarbeitet.
+GenerateTargetFrameworkMonikerAttribute:
+Das Ziel "GenerateTargetFrameworkMonikerAttribute" wird \x81bersprungen, da alle Ausgabedateien hinsichtlich der Eingabedateien aktuell sind.
CoreCompile:
- C:\Windows\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /platform:x86 /baseaddress:4194304 /highentropyva- /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Common.Utils.dll" /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Core.dll" /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Data.dll /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Data.Linq.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 (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Xml.Linq.dll" /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Utils.dll" /filealign:4096 /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- /utf8output 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
+ C:\Windows\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /platform:x86 /baseaddress:4194304 /highentropyva- /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Common.Utils.dll" /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\mscorlib.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Core.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Data.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Data.Linq.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Drawing.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Windows.Forms.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Xml.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Xml.Linq.dll" /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Utils.dll" /filealign:4096 /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- /utf8output EditPhoneBook.cs EditPhoneBook.Designer.cs FritzCallMonitor\FritzBoxClient.cs FritzManager\LocalizeStrings.cs FritzManager\StringEncryption.cs FritzManager\UNCAccessWithCredentials.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 "C:\Users\Test\AppData\Local\Temp\.NETFramework,Version=v4.0.AssemblyAttributes.cs"
_CopyFilesMarkedCopyLocal:
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" in "bin\Release\Dialogs.dll" kopiert.
CopyFilesToOutputDirectory:
@@ -60,8 +65,10 @@
Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.csprojResolveAssemblyReference.cache" wird gel\x94scht.
Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.exe" wird gel\x94scht.
Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.pdb" wird gel\x94scht.
+GenerateTargetFrameworkMonikerAttribute:
+Das Ziel "GenerateTargetFrameworkMonikerAttribute" wird \x81bersprungen, da alle Ausgabedateien hinsichtlich der Eingabedateien aktuell sind.
CoreCompile:
- C:\Windows\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /platform:x86 /define:TRACE /highentropyva- /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /reference:D:\FritzBox\FritzBox\bin\Release\FritzBox.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /reference:"C:\Program Files (x86)\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 /debug:pdbonly /optimize+ /out:obj\Release\FritzBoxConfigTester.exe /target:winexe /utf8output Program.cs Properties\AssemblyInfo.cs
+ C:\Windows\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /platform:x86 /define:TRACE /highentropyva- /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /reference:D:\FritzBox\FritzBox\bin\Release\FritzBox.dll /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\mscorlib.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Core.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Data.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Drawing.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Windows.Forms.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Xml.dll" /debug:pdbonly /optimize+ /out:obj\Release\FritzBoxConfigTester.exe /target:winexe /utf8output Program.cs Properties\AssemblyInfo.cs "C:\Users\Test\AppData\Local\Temp\.NETFramework,Version=v4.0.AssemblyAttributes.cs"
_CopyFilesMarkedCopyLocal:
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" in "bin\Release\Core.dll" kopiert.
Die Datei wird von "D:\FritzBox\FritzBox\bin\Release\FritzBox.dll" in "bin\Release\FritzBox.dll" kopiert.
@@ -72,13 +79,16 @@
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\DirectShowLib.dll" in "bin\Release\DirectShowLib.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\BassVisAPI.Net.dll" in "bin\Release\BassVisAPI.Net.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\taglib-sharp.dll" in "bin\Release\taglib-sharp.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\CSScriptLibrary.dll" in "bin\Release\CSScriptLibrary.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\AxInterop.WMPLib.dll" in "bin\Release\AxInterop.WMPLib.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\edtftpnet-1.2.2.dll" in "bin\Release\edtftpnet-1.2.2.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\BassRegistration.dll" in "bin\Release\BassRegistration.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\MediaPortal.Support.dll" in "bin\Release\MediaPortal.Support.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Interop.WMPLib.dll" in "bin\Release\Interop.WMPLib.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Microsoft.WindowsAPICodePack.Shell.dll" in "bin\Release\Microsoft.WindowsAPICodePack.Shell.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\log4net.dll" in "bin\Release\log4net.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Ionic.Zip.dll" in "bin\Release\Ionic.Zip.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Microsoft.WindowsAPICodePack.dll" in "bin\Release\Microsoft.WindowsAPICodePack.dll" kopiert.
Die Datei wird von "D:\FritzBox\FritzBox\bin\Release\FritzBox.pdb" in "bin\Release\FritzBox.pdb" kopiert.
_CopyAppConfigFile:
Die Datei wird von "app.config" in "bin\Release\FritzBoxConfigTester.exe.config" kopiert.
@@ -100,9 +110,12 @@
Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.exe" wird gel\x94scht.
Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.pdb" wird gel\x94scht.
CoreResGen:
- C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\ResGen.exe /useSourcePath /r:D:\FritzBox\FritzBox\bin\Release\FritzBox.dll /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /r:"C:\Program Files (x86)\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 /compile DebugForm.resx,obj\Release\FritzBoxDebugger.DebugForm.resources
+ "C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\bin\NETFX 4.0 Tools\resgen.exe" /useSourcePath /r:D:\FritzBox\FritzBox\bin\Release\FritzBox.dll /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\mscorlib.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Core.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Data.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Drawing.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Windows.Forms.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Xml.dll" /compile DebugForm.resx,obj\Release\FritzBoxDebugger.DebugForm.resources
+ Die Ressourcendatei "DebugForm.resx" wird zu "obj\Release\FritzBoxDebugger.DebugForm.resources" verarbeitet.
+GenerateTargetFrameworkMonikerAttribute:
+Das Ziel "GenerateTargetFrameworkMonikerAttribute" wird \x81bersprungen, da alle Ausgabedateien hinsichtlich der Eingabedateien aktuell sind.
CoreCompile:
- C:\Windows\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /platform:x86 /define:TRACE /highentropyva- /reference:D:\FritzBox\FritzBox\bin\Release\FritzBox.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /reference:"C:\Program Files (x86)\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 /debug:pdbonly /optimize+ /out:obj\Release\FritzBoxDebugger.exe /resource:obj\Release\FritzBoxDebugger.DebugForm.resources /target:winexe /utf8output DebugForm.cs DebugForm.Designer.cs Program.cs Properties\AssemblyInfo.cs
+ C:\Windows\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /platform:x86 /define:TRACE /highentropyva- /reference:D:\FritzBox\FritzBox\bin\Release\FritzBox.dll /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\mscorlib.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Core.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Data.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Drawing.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Windows.Forms.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Xml.dll" /debug:pdbonly /optimize+ /out:obj\Release\FritzBoxDebugger.exe /resource:obj\Release\FritzBoxDebugger.DebugForm.resources /target:winexe /utf8output DebugForm.cs DebugForm.Designer.cs Program.cs Properties\AssemblyInfo.cs "C:\Users\Test\AppData\Local\Temp\.NETFramework,Version=v4.0.AssemblyAttributes.cs"
_CopyFilesMarkedCopyLocal:
Die Datei wird von "D:\FritzBox\FritzBox\bin\Release\FritzBox.dll" in "bin\Release\FritzBox.dll" kopiert.
Die Datei wird von "D:\FritzBox\FritzBox\bin\Release\Dialogs.dll" in "bin\Release\Dialogs.dll" kopiert.
@@ -120,7 +133,7 @@
0 Warnung(en)
0 Fehler
-Verstrichene Zeit 00:00:02.14
+Verstrichene Zeit 00:00:04.54
Reverting to build 0
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
@@ -270,8 +283,8 @@
..\FritzBox\Languages\Unsupported\strings_uk.xml
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
37 Datei(en) kopiert
-MpeMaker version: 1.3.0.0
-Build started at 23:11:27
+MpeMaker version: 1.7.0.0
+Build started at 21:24:21
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Modified: trunk/plugins/FritzBox/Docs/Changes.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Changes.txt 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/Docs/Changes.txt 2014-04-21 19:48:57 UTC (rev 4787)
@@ -1,3 +1,5 @@
-1.0.0.4563:
-Fixed bug:
-- incoming call notifications aren't shown when option "Show on outgoing call" is disabled and an outgoing call has been done (thanks to Django.edwards!)
\ No newline at end of file
+1.0.0.4786:
+Optimizations:
+- FRITZ!OS 6 and MediaPortal 1.6/1.6 compatibility
+- FRITZ!OS version display format (e. g. 06.05) in log file
+- login test in Configuration menu
\ No newline at end of file
Modified: trunk/plugins/FritzBox/Docs/Vorgehensweise beim Update.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Vorgehensweise beim Update.txt 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/Docs/Vorgehensweise beim Update.txt 2014-04-21 19:48:57 UTC (rev 4787)
@@ -1,5 +1,5 @@
1. \xC4nderungen in Visual Studio vornehmen
-2. Build.bat ausf\xFChren
+2. "Build FritzBoxManager.bat" ausf\xFChren
3. Pr\xFCfen, ob Installer-Datei mit der korrekten Versionsnummer unter "D:\FritzBox\releases" angelegt wurde. Beispiel:
- OK: FritzBox_v0.3.5.4364.mpe1
- Falsch: FritzBox_v0.3.5.0.mpe1
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2014-04-21 19:48:57 UTC (rev 4787)
@@ -68,6 +68,7 @@
private int notificationCount = 0;
private CallAction.CallType lastCallActionType; // necessary to avoid that notification window isn't closed on quick sequent call actions
private string currentConnectionID;
+ private UNCAccessWithCredentials nASShareConnection;
#endregion Variables
@@ -161,13 +162,38 @@
}
private void OnConnectedAction()
- {
+ {
updateTimer.Start();
+
+ string nASSharePath = @"\\" + FritzBoxClient.Address + "\\" + Settings.NASShareName;
+ if (!Directory.Exists(nASSharePath) && Settings.NASShareIsEnabled)
+ {
+ Log.Debug("Connecting with FRITZ!Box NAS share");
+
+ nASShareConnection = new UNCAccessWithCredentials();
+
+ if (nASShareConnection.NetUseWithCredentials(nASSharePath, Settings.UserName, "", Settings.Password))
+ {
+ Log.Info("Connected with FRITZ!Box NAS share");
+ }
+ else
+ {
+ Log.Error("Failed to connect with FRITZ!Box NAS share");
+ }
+ }
}
private void OnDisconnectedAction()
{
updateTimer.Stop();
+ if (_tempNotification != null && isNotificationWindowOpened()) closeNotificationWindow();
+ currentConnectionID = null;
+
+ if (nASShareConnection != null)
+ {
+ Log.Debug("Disconnecting from FRITZ!Box NAS share");
+ nASShareConnection.NetUseDelete(); // disconnecting is done asynchronously and takes about 15 seconds
+ }
}
private void OnLoggedInAction()
@@ -803,9 +829,9 @@
BackGroundWorker worker = thePlugin.worker;
worker.EnqueueTask(new Task(Task.TaskAction.LoadCallListItems, null));
- if (!String.IsNullOrEmpty(Settings.VBPath)) worker.EnqueueTask(new Task(Task.TaskAction.LoadVoiceBoxItems, null));
+ if (Settings.NASShareIsEnabled && !String.IsNullOrEmpty(Settings.VBPath)) worker.EnqueueTask(new Task(Task.TaskAction.LoadVoiceBoxItems, null));
if (Settings.SynchronizePhoneBook) worker.EnqueueTask(new Task(Task.TaskAction.SynchronizePhoneBook, null));
- if (!Settings.ManualContactImagePathEntry && !String.IsNullOrEmpty(Settings.NASShareName)) worker.EnqueueTask(new Task(Task.TaskAction.SynchronizeContactImages, null));
+ if (Settings.NASShareIsEnabled && !Settings.ManualContactImagePathEntry && !String.IsNullOrEmpty(Settings.NASShareName)) worker.EnqueueTask(new Task(Task.TaskAction.SynchronizeContactImages, null));
worker.EnqueueTask(new Task(Task.TaskAction.UpdateGUIProperties, null));
// reset update timer to get the timer countdown reset
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.csproj
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.csproj 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.csproj 2014-04-21 19:48:57 UTC (rev 4787)
@@ -18,7 +18,7 @@
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
<SourceAnalysisOverrideSettingsFile>C:\Dokumente und Einstellungen\sr\Anwendungsdaten\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<NoStdLib>False</NoStdLib>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
@@ -105,6 +105,7 @@
<Compile Include="FritzManager\StringEncryption.cs">
<SubType>Code</SubType>
</Compile>
+ <Compile Include="FritzManager\UNCAccessWithCredentials.cs" />
<Compile Include="FritzManager\VBReader.cs" />
<Compile Include="FritzManager\BackGroundWorker.cs" />
<Compile Include="FritzManager\BlockingQueue.cs" />
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2014-04-21 19:48:57 UTC (rev 4787)
@@ -70,13 +70,17 @@
this.checkBoxPauseMediaOnIncomingCall = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.tabPageConnection = new System.Windows.Forms.TabPage();
this.numericUpDownDialPort = new System.Windows.Forms.NumericUpDown();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.checkBoxEnableNASShare = new System.Windows.Forms.CheckBox();
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();
+ this.textBoxVBPath = new System.Windows.Forms.TextBox();
+ this.textBoxUserName = new System.Windows.Forms.TextBox();
+ this.label7 = new System.Windows.Forms.Label();
+ this.textBoxPasswd = new System.Windows.Forms.TextBox();
+ this.label1 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
- this.label1 = new System.Windows.Forms.Label();
this.numericUpDownPort = new System.Windows.Forms.NumericUpDown();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.textBoxAddress = new MediaPortal.UserInterface.Controls.MPTextBox();
@@ -96,6 +100,7 @@
this.groupBoxMedia.SuspendLayout();
this.tabPageConnection.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownDialPort)).BeginInit();
+ this.groupBox1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownPort)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.tabControlConfiguration.SuspendLayout();
@@ -594,13 +599,12 @@
// tabPageConnection
//
this.tabPageConnection.Controls.Add(this.numericUpDownDialPort);
- this.tabPageConnection.Controls.Add(this.label6);
- this.tabPageConnection.Controls.Add(this.textBoxNASShareName);
- this.tabPageConnection.Controls.Add(this.label2);
- this.tabPageConnection.Controls.Add(this.vBPath);
- this.tabPageConnection.Controls.Add(this.passwd);
+ this.tabPageConnection.Controls.Add(this.groupBox1);
+ this.tabPageConnection.Controls.Add(this.textBoxUserName);
+ this.tabPageConnection.Controls.Add(this.label7);
+ this.tabPageConnection.Controls.Add(this.textBoxPasswd);
+ this.tabPageConnection.Controls.Add(this.label1);
this.tabPageConnection.Controls.Add(this.label3);
- this.tabPageConnection.Controls.Add(this.label1);
this.tabPageConnection.Controls.Add(this.numericUpDownPort);
this.tabPageConnection.Controls.Add(this.pictureBox1);
this.tabPageConnection.Controls.Add(this.textBoxAddress);
@@ -616,7 +620,7 @@
//
// numericUpDownDialPort
//
- this.numericUpDownDialPort.Location = new System.Drawing.Point(129, 152);
+ this.numericUpDownDialPort.Location = new System.Drawing.Point(449, 57);
this.numericUpDownDialPort.Maximum = new decimal(new int[] {
99,
0,
@@ -624,70 +628,111 @@
0});
this.numericUpDownDialPort.Name = "numericUpDownDialPort";
this.numericUpDownDialPort.Size = new System.Drawing.Size(44, 20);
- this.numericUpDownDialPort.TabIndex = 36;
+ this.numericUpDownDialPort.TabIndex = 42;
//
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.checkBoxEnableNASShare);
+ this.groupBox1.Controls.Add(this.label6);
+ this.groupBox1.Controls.Add(this.textBoxNASShareName);
+ this.groupBox1.Controls.Add(this.label2);
+ this.groupBox1.Controls.Add(this.textBoxVBPath);
+ this.groupBox1.Location = new System.Drawing.Point(15, 145);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(538, 153);
+ this.groupBox1.TabIndex = 39;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "FRITZ! NAS";
+ //
+ // checkBoxEnableNASShare
+ //
+ this.checkBoxEnableNASShare.AutoSize = true;
+ this.checkBoxEnableNASShare.Location = new System.Drawing.Point(23, 28);
+ this.checkBoxEnableNASShare.Name = "checkBoxEnableNASShare";
+ this.checkBoxEnableNASShare.Size = new System.Drawing.Size(335, 17);
+ this.checkBoxEnableNASShare.TabIndex = 42;
+ this.checkBoxEnableNASShare.Text = "Enable NAS share (used for voice box function and caller images)";
+ this.checkBoxEnableNASShare.UseVisualStyleBackColor = true;
+ this.checkBoxEnableNASShare.CheckedChanged += new System.EventHandler(this.checkBoxEnableNASShare_CheckedChanged);
+ //
// label6
//
this.label6.AutoSize = true;
- this.label6.Location = new System.Drawing.Point(15, 260);
+ this.label6.Location = new System.Drawing.Point(22, 117);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(87, 13);
- this.label6.TabIndex = 35;
+ this.label6.TabIndex = 41;
this.label6.Text = "NAS share name";
//
// textBoxNASShareName
//
- this.textBoxNASShareName.Location = new System.Drawing.Point(110, 257);
+ this.textBoxNASShareName.Location = new System.Drawing.Point(117, 114);
this.textBoxNASShareName.Name = "textBoxNASShareName";
this.textBoxNASShareName.Size = new System.Drawing.Size(119, 20);
- this.textBoxNASShareName.TabIndex = 34;
+ this.textBoxNASShareName.TabIndex = 40;
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(15, 196);
+ this.label2.Location = new System.Drawing.Point(22, 59);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(354, 13);
- this.label2.TabIndex = 32;
- this.label2.Text = "Voice box path (e. g. \\\\fritz.box\\FRITZ.NAS\\USBStore\\FRITZ\\voicebox)";
+ this.label2.Size = new System.Drawing.Size(302, 13);
+ this.label2.TabIndex = 39;
+ this.label2.Text = "Voice box path (e. g. \\\\fritz.box\\FRITZ.NAS\\FRITZ\\voicebox)";
//
- // vBPath
+ // textBoxVBPath
//
- this.vBPath.Location = new System.Drawing.Point(17, 216);
- this.vBPath.Name = "vBPath";
- this.vBPath.Size = new System.Drawing.Size(369, 20);
- this.vBPath.TabIndex = 29;
+ this.textBoxVBPath.Location = new System.Drawing.Point(24, 79);
+ this.textBoxVBPath.Name = "textBoxVBPath";
+ this.textBoxVBPath.Size = new System.Drawing.Size(369, 20);
+ this.textBoxVBPath.TabIndex = 37;
//
- // passwd
+ // textBoxUserName
//
- this.passwd.Location = new System.Drawing.Point(206, 97);
- this.passwd.Name = "passwd";
- this.passwd.PasswordChar = '*';
- this.passwd.Size = new System.Drawing.Size(100, 20);
- this.passwd.TabIndex = 27;
- this.passwd.Text = "passwd";
+ this.textBoxUserName.Location = new System.Drawing.Point(209, 97);
+ this.textBoxUserName.Name = "textBoxUserName";
+ this.textBoxUserName.Size = new System.Drawing.Size(100, 20);
+ this.textBoxUserName.TabIndex = 37;
//
- // label3
+ // label7
//
- this.label3.Location = new System.Drawing.Point(15, 145);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(108, 23);
- this.label3.TabIndex = 31;
- this.label3.Text = "Dial port (telephone)";
- this.label3.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
+ this.label7.Location = new System.Drawing.Point(142, 91);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(65, 23);
+ this.label7.TabIndex = 38;
+ this.label7.Text = "User name";
+ this.label7.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
//
+ // textBoxPasswd
+ //
+ this.textBoxPasswd.Location = new System.Drawing.Point(393, 97);
+ this.textBoxPasswd.Name = "textBoxPasswd";
+ this.textBoxPasswd.PasswordChar = '*';
+ this.textBoxPasswd.Size = new System.Drawing.Size(100, 20);
+ this.textBoxPasswd.TabIndex = 27;
+ this.textBoxPasswd.Text = "passwd";
+ //
// label1
//
- this.label1.Location = new System.Drawing.Point(142, 91);
+ this.label1.Location = new System.Drawing.Point(329, 91);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(58, 23);
this.label1.TabIndex = 28;
this.label1.Text = "Password";
this.label1.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
//
+ // label3
+ //
+ this.label3.Location = new System.Drawing.Point(331, 50);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(108, 23);
+ this.label3.TabIndex = 38;
+ this.label3.Text = "Dial port (telephone)";
+ this.label3.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
+ //
// numericUpDownPort
//
- this.numericUpDownPort.Location = new System.Drawing.Point(206, 58);
+ this.numericUpDownPort.Location = new System.Drawing.Point(209, 58);
this.numericUpDownPort.Maximum = new decimal(new int[] {
999999,
0,
@@ -718,7 +763,7 @@
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(206, 18);
+ this.textBoxAddress.Location = new System.Drawing.Point(209, 18);
this.textBoxAddress.Name = "textBoxAddress";
this.textBoxAddress.Size = new System.Drawing.Size(138, 20);
this.textBoxAddress.TabIndex = 10;
@@ -847,6 +892,8 @@
this.tabPageConnection.ResumeLayout(false);
this.tabPageConnection.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownDialPort)).EndInit();
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownPort)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.tabControlConfiguration.ResumeLayout(false);
@@ -890,10 +937,7 @@
private System.Windows.Forms.TabPage tabPageMiscellaneous;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label label5;
- private System.Windows.Forms.Label label2;
- private System.Windows.Forms.TextBox vBPath;
- private System.Windows.Forms.TextBox passwd;
- private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.TextBox textBoxPasswd;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.NumericUpDown numericUpDownPort;
private System.Windows.Forms.PictureBox pictureBox1;
@@ -904,9 +948,6 @@
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;
private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxShowPhoneTypeOnNotification;
private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxShowUnknownCaller;
private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxUsePhonebook;
@@ -917,5 +958,15 @@
private MediaPortal.UserInterface.Controls.MPComboBox comboBoxExtensions;
private System.Windows.Forms.CheckBox checkBoxManualContactImagePathEntry;
private System.Windows.Forms.CheckBox checkBoxSynchronizePhoneBook;
+ private System.Windows.Forms.TextBox textBoxUserName;
+ private System.Windows.Forms.Label label7;
+ private System.Windows.Forms.NumericUpDown numericUpDownDialPort;
+ private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.CheckBox checkBoxEnableNASShare;
+ private System.Windows.Forms.Label label6;
+ private System.Windows.Forms.TextBox textBoxNASShareName;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.TextBox textBoxVBPath;
+ private System.Windows.Forms.Label label3;
}
}
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2014-04-21 19:48:57 UTC (rev 4787)
@@ -38,10 +38,14 @@
{
InitializeComponent();
LoadSettings();
- FritzBoxClient.LogEvent += OnLogAction;
+ FritzBoxClient.LogEvent += new FritzBoxClient.LogEventHandler(OnLogAction);
+ FritzBoxClient.ConnectedEvent += new FritzBoxClient.ConnectedEventHandler(OnConnectedAction);
+
+ Fritz.LoggedInEvent += OnLoggedInAction;
}
private static Logger Log = LoggerFactory.getLogger("FritzBoxConfig");
+ private static Fritz fritz;
#region Settings
@@ -56,16 +60,20 @@
// connection settings
textBoxAddress.Text = FritzBoxClient.Address;
numericUpDownPort.Value = FritzBoxClient.Port;
- passwd.Text = Settings.Password;
+ textBoxUserName.Text = Settings.UserName;
+ textBoxPasswd.Text = Settings.Password;
+
numericUpDownDialPort.Text = Settings.DialPort;
ToolTip toolTipNumericUpDownDialPort = new ToolTip();
toolTipNumericUpDownDialPort.SetToolTip(numericUpDownDialPort, "Be sure to configure the correct dial port in the FRITZ!Box Manager settings to choose the appropriate telephone connected with the FRITZ!Box." + Environment.NewLine + "You may refer to the following list:" + Environment.NewLine + "1 & 2: analog phone outlets on the FRITZ!Box" + Environment.NewLine + "50: ISDN- & cordless phones (group)" + Environment.NewLine + "60: DECT phone");
- vBPath.Text = Settings.VBPath;
-
+ // NAS share settings
+ checkBoxEnableNASShare.Checked = Settings.NASShareIsEnabled;
textBoxNASShareName.Text = Settings.NASShareName;
+ textBoxVBPath.Text = Settings.VBPath;
+ checkBoxEnableNASShare_CheckedChanged(this, null);
// call notification settings
checkBoxShowNotificationOnIncomingCall.Checked = Settings.ShowNotificationOnIncomingCall;
@@ -129,13 +137,16 @@
// connection settings
FritzBoxClient.Address = textBoxAddress.Text;
FritzBoxClient.Port = (int)numericUpDownPort.Value;
- Settings.Password = passwd.Text;
+ Settings.UserName = textBoxUserName.Text;
+ Settings.Password = textBoxPasswd.Text;
+
Settings.DialPort = numericUpDownDialPort.Text;
- Settings.VBPath = vBPath.Text;
-
+ // NAS share settings
+ Settings.NASShareIsEnabled = checkBoxEnableNASShare.Checked;
Settings.NASShareName = textBoxNASShareName.Text;
+ Settings.VBPath = textBoxVBPath.Text;
// call notification settings
Settings.ShowNotificationOnIncomingCall = checkBoxShowNotificationOnIncomingCall.Checked;
@@ -318,6 +329,8 @@
FritzBoxClient.Port = (int)numericUpDownPort.Value;
// run tests
+ if (fritz == null) fritz = new Fritz(Settings.Password, Config.GetFolder(Config.Dir.Config), FritzBoxClient.Address, Settings.DialPort);
+
if (FritzBoxClient.TestConnection()) FritzBoxClient.StartClient();
}
@@ -352,7 +365,19 @@
}
else labelHelp.Text += logMessage + Environment.NewLine;
}
-
+
+ private void OnConnectedAction()
+ {
+ // log in to FRITZ!Box
+ OnLogAction(FritzBoxClient.LogLevel.Info, "Logging in to FRITZ!Box (see Configuration log for details!)");
+ }
+
+ private void OnLoggedInAction()
+ {
+ OnLogAction(FritzBoxClient.LogLevel.Info, "Successfully logged in. Logging off...");
+ fritz.LogOff();
+ }
+
private void buttonEditPhoneBook_Click(object sender, EventArgs e)
{
EditPhoneBook editPhoneBook = new EditPhoneBook();
@@ -372,6 +397,12 @@
Settings.SynchronizePhoneBook = checkBoxSynchronizePhoneBook.Checked;
}
+ private void checkBoxEnableNASShare_CheckedChanged(object sender, EventArgs e)
+ {
+ textBoxNASShareName.Enabled = checkBoxEnableNASShare.Checked;
+ textBoxVBPath.Enabled = checkBoxEnableNASShare.Checked;
+ }
+
#region Nested type: SetTextCallback
private delegate void SetTextCallback(FritzBoxClient.LogLevel logLevel, string logMessage);
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.resx
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.resx 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.resx 2014-04-21 19:48:57 UTC (rev 4787)
@@ -112,12 +112,12 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAwAEBAQAAAAAAAoAQAAxgAAABAQAAABAAgAaAUAAO4BAAAgIBAAAAAAAOgCAABWBwAAICAAAAEA
Modified: trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs 2014-04-21 19:48:57 UTC (rev 4787)
@@ -306,7 +306,7 @@
Connected = true;
// raise event
- if (ConnectedEvent != null) ConnectedEvent(); // the Configuration tool doesn't use this event
+ ConnectedEvent();
// start connection monitoring. Since the socket does not detect connection interruptions it's necessary to monitor it by another thread
connectionCheckTimer.Start();
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs 2014-04-21 19:48:57 UTC (rev 4787)
@@ -1,5 +1,4 @@
-
-using System;
+using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs 2014-04-21 19:48:57 UTC (rev 4787)
@@ -109,7 +109,7 @@
public void LogOff()
{
loggedIn = false;
- LoggedOffEvent(); // raise event
+ if (LoggedOffEvent != null) LoggedOffEvent(); // the Configuration tool doesn't use this event
}
public void KeepAlive()
@@ -185,7 +185,7 @@
"-----------------------------88612920297--\r\n" +
"\r\n";
- returnData = PostRequest("http://" + hostname + "/cgi-bin/firmwarecfg", postdata, "multipart/form-data; boundary=---------------------------88612920297", "ISO-8859-15");
+ returnData = PostRequest("http://" + hostname + "/cgi-bin/firmwarecfg", postdata, "multipart/form-data; boundary=---------------------------88612920297", "UTF-8");
if (!returnData.StartsWith("<!DOCTYPE html")) return returnData;
}
@@ -367,7 +367,7 @@
// get FRITZ!Box name
FritzBox.Settings.FritzBoxName = getXMLValue(doc, "Name", "http://jason.avm.de/updatecheck/");
- Log.Debug("FRITZ!Box firmware version is " + FritzBox.Settings.FritzBoxFirmwareMainVersion + "." + FritzBox.Settings.FritzBoxFirmwareSubVersion + " on " + FritzBox.Settings.FritzBoxName);
+ Log.Debug("FRITZ!Box firmware version is " + string.Format("{0:00}", FritzBox.Settings.FritzBoxFirmwareMainVersion) + "." + string.Format("{0:00}", FritzBox.Settings.FritzBoxFirmwareSubVersion) + " on " + FritzBox.Settings.FritzBoxName);
}
catch
{
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs 2014-04-21 19:48:57 UTC (rev 4787)
@@ -633,14 +633,11 @@
string contactImagePathRemote;
// convert to UNC format
- if (imageURL.Contains("file:///var/media/ftp/"))
- {
- contactImagePathRemote = imageURL.Replace("file:///var/media/ftp/", @"\\" + FritzBoxClient.Address + "\\" + Settings.NASShareName + "\\");
- contactImagePathRemote = contactImagePathRemote.Replace("/", "\\");
+ contactImagePathRemote = imageURL.Replace("file:///var/media/ftp", @"\\" + FritzBoxClient.Address + "\\" + Settings.NASShareName);
+ contactImagePathRemote = contactImagePathRemote.Replace("file:///var/InternerSpeicher", @"\\" + FritzBoxClient.Address + "\\" + Settings.NASShareName);
+ contactImagePathRemote = contactImagePathRemote.Replace("/", "\\");
- return contactImagePathRemote;
- }
- else return String.Empty;
+ return contactImagePathRemote;
}
#endregion private methods
Added: trunk/plugins/FritzBox/FritzBox/FritzManager/UNCAccessWithCredentials.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/UNCAccessWithCredentials.cs (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/UNCAccessWithCredentials.cs 2014-04-21 19:48:57 UTC (rev 4787)
@@ -0,0 +1,138 @@
+using System;
+using System.Runtime.InteropServices;
+using BOOL = System.Boolean;
+using DWORD = System.UInt32;
+using LPWSTR = System.String;
+using NET_API_STATUS = System.UInt32;
+
+namespace FritzBox
+{
+ public class UNCAccessWithCredentials : IDisposable
+ {
+ [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+ internal struct USE_INFO_2
+ {
+ internal LPWSTR ui2_local;
+ internal LPWSTR ui2_remote;
+ internal LPWSTR ui2_password;
+ internal DWORD ui2_status;
+ internal DWORD ui2_asg_type;
+ internal DWORD ui2_refcount;
+ internal DWORD ui2_usecount;
+ internal LPWSTR ui2_username;
+ internal LPWSTR ui2_domainname;
+ }
+
+ [DllImport("NetApi32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+ internal static extern NET_API_STATUS NetUseAdd(
+ LPWSTR UncServerName,
+ DWORD Level,
+ ref USE_INFO_2 Buf,
+ out DWORD ParmError);
+
+ [DllImport("NetApi32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+ internal static extern NET_API_STATUS NetUseDel(
+ LPWSTR UncServerName,
+ LPWSTR UseName,
+ DWORD ForceCond);
+
+ private bool disposed = false;
+
+ private string sUNCPath;
+ private string sUser;
+ private string sPassword;
+ private string sDomain;
+ private int iLastError;
+
+ /// <summary>
+ /// A disposeable class that allows access to a UNC resource with credentials.
+ /// </summary>
+ public UNCAccessWithCredentials()
+ {
+ }
+
+ /// <summary>
+ /// The last system error code returned from NetUseAdd or NetUseDel. Success = 0
+ /// </summary>
+ public int LastError
+ {
+ get { return iLastError; }
+ }
+
+ public void Dispose()
+ {
+ if (!this.disposed)
+ {
+ NetUseDelete();
+ }
+ disposed = true;
+ GC.SuppressFinalize(this);
+ }
+
+ /// <summary>
+ /// Connects to a UNC path using the credenti...
[truncated message content] |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X