Menu
▾
▴
mp-plugins-svn — SVN Update mailing list
You can subscribe to this list here.
| 2007 |
Jan
(36) |
Feb
(79) |
Mar
(123) |
Apr
(95) |
May
(119) |
Jun
(172) |
Jul
(124) |
Aug
(100) |
Sep
(83) |
Oct
(52) |
Nov
(97) |
Dec
(87) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(131) |
Feb
(80) |
Mar
(163) |
Apr
(178) |
May
(73) |
Jun
(54) |
Jul
(106) |
Aug
(118) |
Sep
(50) |
Oct
(125) |
Nov
(100) |
Dec
(99) |
| 2009 |
Jan
(104) |
Feb
(99) |
Mar
(68) |
Apr
(81) |
May
(52) |
Jun
(87) |
Jul
(67) |
Aug
(33) |
Sep
(27) |
Oct
(37) |
Nov
(60) |
Dec
(116) |
| 2010 |
Jan
(82) |
Feb
(79) |
Mar
(38) |
Apr
(50) |
May
(45) |
Jun
(53) |
Jul
(23) |
Aug
(86) |
Sep
(22) |
Oct
(96) |
Nov
(97) |
Dec
(73) |
| 2011 |
Jan
(24) |
Feb
(45) |
Mar
(28) |
Apr
(31) |
May
(42) |
Jun
(25) |
Jul
|
Aug
(12) |
Sep
(28) |
Oct
(13) |
Nov
(43) |
Dec
(13) |
| 2012 |
Jan
(62) |
Feb
(28) |
Mar
(6) |
Apr
(16) |
May
(7) |
Jun
|
Jul
(16) |
Aug
(2) |
Sep
(1) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
| 2013 |
Jan
(5) |
Feb
|
Mar
(34) |
Apr
(9) |
May
(6) |
Jun
(10) |
Jul
(32) |
Aug
(8) |
Sep
(11) |
Oct
(35) |
Nov
(24) |
Dec
(22) |
| 2014 |
Jan
(44) |
Feb
(9) |
Mar
(9) |
Apr
(15) |
May
(25) |
Jun
(34) |
Jul
(16) |
Aug
(11) |
Sep
(7) |
Oct
(6) |
Nov
(1) |
Dec
(12) |
| 2015 |
Jan
(33) |
Feb
(19) |
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2023 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(5) |
|
From: <hor...@us...> - 2011-12-04 10:46:13
|
Revision: 4364
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4364&view=rev
Author: horned-reaper
Date: 2011-12-04 10:46:06 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/FritzBox/FritzManager/StringEncryption.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/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/obj/Debug/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/ResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBox.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/StringEncryption.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/StringEncryption.cs 2011-12-03 16:12:08 UTC (rev 4363)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/StringEncryption.cs 2011-12-04 10:46:06 UTC (rev 4364)
@@ -1,11 +1,14 @@
using System;
using System.Text;
using System.Security.Cryptography;
+using FritzManager;
namespace FritzBox
{
class StringEncryption
{
+ static Logger Log = LoggerFactory.getLogger("FritzBox");
+
public static string EncryptString(string Message, string Passphrase)
{
byte[] Results;
@@ -37,6 +40,11 @@
ICryptoTransform Encryptor = TDESAlgorithm.CreateEncryptor();
Results = Encryptor.TransformFinalBlock(DataToEncrypt, 0, DataToEncrypt.Length);
}
+ catch (Exception e)
+ {
+ Log.Debug("Error on encrypting string: " + e.Message);
+ return null;
+ }
finally
{
// Clear the TripleDes and Hashprovider services of any sensitive information
@@ -79,8 +87,9 @@
{
DataToDecrypt = Convert.FromBase64String(Message);
}
- catch
+ catch (Exception e)
{
+ Log.Debug("Error on decrypting string: " + e.Message);
return null;
}
@@ -90,6 +99,11 @@
ICryptoTransform Decryptor = TDESAlgorithm.CreateDecryptor();
Results = Decryptor.TransformFinalBlock(DataToDecrypt, 0, DataToDecrypt.Length);
}
+ catch (Exception e)
+ {
+ Log.Debug("Error on decrypting string: " + e.Message);
+ return null;
+ }
finally
{
// Clear the TripleDes and Hashprovider services of any sensitive information
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/MpeRelease/FritzBox.xmp2
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2011-12-03 16:12:08 UTC (rev 4363)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2011-12-04 10:46:06 UTC (rev 4364)
@@ -584,7 +584,7 @@
<Build>5</Build>
<Revision>4362</Revision>
</Version>
- <ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box informations in MediaPortal.
+ <ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box informations from MediaPortal.
Features:
- notification for incoming and outgoing calls via window, sound and contact picture
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/ResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hor...@us...> - 2011-12-03 16:12:17
|
Revision: 4363
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4363&view=rev
Author: horned-reaper
Date: 2011-12-03 16:12:08 +0000 (Sat, 03 Dec 2011)
Log Message:
-----------
Official build
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
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/CallItem.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.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.read.1.tlog
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.GenerateResource.Cache
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb
trunk/plugins/FritzBox/MpeRelease/FritzBox.mpe1
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/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.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/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/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
Added Paths:
-----------
trunk/plugins/FritzBox/FritzBox/FritzManager/StringEncryption.cs
trunk/plugins/FritzBox/MpeRelease/update.xml
trunk/plugins/FritzBox/releases/FritzBox_v0.3.5.4362.mpe1
Removed Paths:
-------------
trunk/plugins/FritzBox/releases/FritzBox_v0.3.5.4349.mpe1
trunk/plugins/FritzBox/releases/FritzBox_v0.3.5.4356.mpe1
trunk/plugins/FritzBox/releases/FritzBox_v0.3.5.4358.mpe1
trunk/plugins/FritzBox/releases/FritzBox_v0.3.5.4359.mpe1
Property Changed:
----------------
trunk/plugins/FritzBox/FritzBox/Skin/
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2011-12-01 20:35:25 UTC (rev 4362)
+++ trunk/plugins/FritzBox/Build/Build.log 2011-12-03 16:12:08 UTC (rev 4363)
@@ -1,6 +1,6 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4359
+SVN Version: 4362
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 2.0.50727.3625]
Copyright (C) Microsoft Corporation 2007. All rights reserved.
-Build started 01.12.2011 10:04:59.
+Build started 03.12.2011 16:47:07.
Project "D:\FritzBox\FritzBox.sln" on node 0 (Rebuild target(s)).
Building solution configuration "Release|Mixed Platforms".
Project "D:\FritzBox\FritzBox.sln" (1) is building "D:\FritzBox\FritzBox\FritzBox.csproj" (2) on node 0 (Rebuild target(s)).
@@ -105,7 +105,7 @@
2 Warning(s)
0 Error(s)
-Time Elapsed 00:00:01.93
+Time Elapsed 00:00:01.95
Reverting to build 0
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
@@ -190,6 +190,6 @@
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
36 File(s) copied
MpeMaker version: 1.2.1.0
-Build started at 10:05:03
+Build started at 16:47:11
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2011-12-01 20:35:25 UTC (rev 4362)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2011-12-03 16:12:08 UTC (rev 4363)
@@ -653,8 +653,7 @@
{
phoneBookPath = Config.GetFolder(Config.Dir.Config) + "\\fritzmanagerPhonebook.xml";
mediaPortalLanguage = xmlreader.GetValue("gui", "language");
-
- passwd = xmlreader.GetValue("FritzManager", "passwd");
+ passwd = Settings.FmPassword;
vBPath = xmlreader.GetValue("FritzManager", "vBPath");
dialport = xmlreader.GetValue("FritzManager", "dialport");
useInversSearch = xmlreader.GetValueAsBool("FritzManager", "useInversSearch", true);
@@ -698,7 +697,7 @@
ShowThumbPanel();
- if (String.IsNullOrEmpty(passwd) && String.IsNullOrEmpty(vBPath)) ShowError(GUILocalizeStrings.Get(24)); // 24 = "Could not load phone book"
+ if (String.IsNullOrEmpty(passwd) && String.IsNullOrEmpty(vBPath)) ShowError(GUILocalizeStrings.Get(24)); // 24 = FRITZ!Box password and voice box path are missing in settings!
}
private static void OnTimedEvent(object source, System.Timers.ElapsedEventArgs e)
@@ -880,26 +879,13 @@
protected void loadCallListFromFritzbox(bool forceReload)
{
- if (!String.IsNullOrEmpty(passwd))
- {
- GUIWaitCursor.Show();
+ GUIWaitCursor.Show();
- try
- {
- Log.Debug("load call list from FritzBox");
+ byte[] data = fritz.loadCallListData(forceReload);
- byte[] data = fritz.loadCallListData(forceReload);
+ refreshCallData(data);
- refreshCallData(data);
- }
- catch (Exception e)
- {
- Log.Debug("Exception {0}", e.Message);
- }
-
- GUIWaitCursor.Hide();
- }
- else Log.Debug("FritzBox password is not set. Call list cannot be loaded");
+ GUIWaitCursor.Hide();
}
protected string decode(VoiceBoxItem item)
@@ -924,38 +910,35 @@
{
facadeView.Clear();
- if (fritzPhonebooks.Items == null || fritzPhonebooks.Items.GetLength(0) == 0)
+ if (fritzPhonebooks.Items != null && fritzPhonebooks.Items.GetLength(0) != 0)
{
- Log.Debug("no FritzBox phone book items found");
+ Phonebook p = fritzPhonebooks.Items[0]; // always choose first phone book
+ int i = 0;
+ string thumbDir = Config.GetFolder(Config.Dir.Thumbs) + "\\yac\\";
- return;
- }
-
- Phonebook p = fritzPhonebooks.Items[0]; // always choose first phone book
- int i = 0;
- string thumbDir = Config.GetFolder(Config.Dir.Thumbs) + "\\yac\\";
-
- foreach (Contact c in p.contact)
- {
- string name = c.person[0].realName;
-
- foreach (TelephonyNumber number in c.telephony)
+ foreach (Contact c in p.contact)
{
- GUIListItem elem = new GUIListItem();
- elem.Label = name;
- elem.Label2 = number.Value;
+ string name = c.person[0].realName;
- if (elem.Label2.Length > 0)
+ foreach (TelephonyNumber number in c.telephony)
{
- if (File.Exists(thumbDir + c.person[0].realName + ".jpg")) elem.ThumbnailImage = thumbDir + c.person[0].realName + ".jpg";
- else elem.ThumbnailImage = thumbDir + "_noImage.png";
+ GUIListItem elem = new GUIListItem();
+ elem.Label = name;
+ elem.Label2 = number.Value;
- elem.Path = Convert.ToString(i++);
+ if (elem.Label2.Length > 0)
+ {
+ if (File.Exists(thumbDir + c.person[0].realName + ".jpg")) elem.ThumbnailImage = thumbDir + c.person[0].realName + ".jpg";
+ else elem.ThumbnailImage = thumbDir + "_noImage.png";
- facadeView.Add(elem);
+ elem.Path = Convert.ToString(i++);
+
+ facadeView.Add(elem);
+ }
}
}
}
+ else Log.Debug("no FRITZ!Box phone book items found");
}
/// <summary>
@@ -1054,7 +1037,7 @@
}
/// <summary>
- /// fill in call items in facadeView
+ /// fill in call list items in facadeView
/// </summary>
protected void populateCallItems()
{
@@ -1175,7 +1158,6 @@
if (actionType == MediaPortal.GUI.Library.Action.ActionType.ACTION_SHOW_INFO)
{
OnShowContextMenu();
-
return;
}
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.csproj
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.csproj 2011-12-01 20:35:25 UTC (rev 4362)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.csproj 2011-12-03 16:12:08 UTC (rev 4363)
@@ -89,6 +89,9 @@
</ItemGroup>
<ItemGroup>
<Compile Include="FritzCallMonitor\FritzBoxClient.cs" />
+ <Compile Include="FritzManager\StringEncryption.cs">
+ <SubType>Code</SubType>
+ </Compile>
<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 2011-12-01 20:35:25 UTC (rev 4362)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2011-12-03 16:12:08 UTC (rev 4363)
@@ -849,9 +849,9 @@
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(24, 92);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(371, 13);
+ this.label2.Size = new System.Drawing.Size(354, 13);
this.label2.TabIndex = 17;
- this.label2.Text = "Voice box path (e. g. \\\\Fritz!nas\\FRITZ.NAS\\MemoryStick\\FRITZ\\voicebox)";
+ this.label2.Text = "Voice box path (e. g. \\\\fritz.box\\FRITZ.NAS\\USBStore\\FRITZ\\voicebox)";
//
// updateInterval
//
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2011-12-01 20:35:25 UTC (rev 4362)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2011-12-03 16:12:08 UTC (rev 4363)
@@ -35,7 +35,7 @@
{
public FritzBoxConfig()
{
- // Configure logging into Configuration.log
+ // Configure logging into Configuration.log file
Log.SetConfigurationMode();
Log.BackupLogFile(LogType.Config);
@@ -81,7 +81,7 @@
checkBoxStopMediaOnIncomingCall.Checked = Settings.StopMedia;
checkBoxResumeMedia.Checked = Settings.ResumeMedia;
- // phoneBook settings
+ // phone book settings
checkBoxUsePhonebook.Checked = PhoneBook.Enabled;
checkBoxShowUnknownCaller.Checked = PhoneBook.ShowUnknownCaller;
@@ -96,7 +96,7 @@
RefreshDataGridView();
- // fritzmanager settings
+ // FritzBox Manager settings
passwd.Text = Settings.FmPassword;
vBPath.Text = Settings.FmVBPath;
dialPort.Text = Settings.FmDialPort;
@@ -160,15 +160,11 @@
private void okButton_Click(object sender, EventArgs e)
{
SaveSettings();
- FritzBoxClient.StopClient();
- FritzBoxClient.LogEvent -= OnLogAction;
Close();
}
private void cancelButton_Click(object sender, EventArgs e)
{
- FritzBoxClient.StopClient();
- FritzBoxClient.LogEvent -= OnLogAction;
Close();
}
@@ -314,10 +310,6 @@
FritzBoxClient.LogEvent += OnLogAction;
Log.Debug("FRITZ!Box: Connection test: Start");
-
- // stopping client
- Log.Debug("FRITZ!Box: Connection test: Stop client");
- FritzBoxClient.StopClient();
// set current settings
FritzBoxClient.Address = textBoxAddress.Text;
@@ -330,11 +322,16 @@
// if port test was successful start client
Log.Debug("FRITZ!Box: Connection test: Start client");
FritzBoxClient.StartClient();
+
+ FritzBoxClient.LogEvent -= OnLogAction;
+
+ // stopping client
+ Log.Debug("FRITZ!Box: Connection test: Stop client");
+ FritzBoxClient.StopClient();
}
+ else FritzBoxClient.LogEvent -= OnLogAction;
Log.Debug("FRITZ!Box: Connection test: End");
-
- FritzBoxClient.LogEvent -= OnLogAction;
}
#endregion
@@ -434,4 +431,4 @@
#endregion
}
-}
+}
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs 2011-12-01 20:35:25 UTC (rev 4362)
+++ trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs 2011-12-03 16:12:08 UTC (rev 4363)
@@ -121,7 +121,8 @@
{
try
{
- if( _client != null ) {
+ if (_client != null)
+ {
// Release the socket.
_client.Shutdown(SocketShutdown.Both);
_client.Close();
@@ -129,44 +130,45 @@
}
catch (Exception ex)
{
- Log(ex);
+ Log(LogLevel.Error, "Error on stopping client: " + ex.Message);
}
}
public static bool TestConnection()
{
- try
- {
- Log(LogLevel.Info, "Testing address ({0}) and port ({1})", Address, Port);
-
- TcpClient tcpClient;
-
try
{
- tcpClient = new TcpClient(Address, Port);
- }
- catch (Exception)
- {
- Log(LogLevel.Error,
- "Address & port test failed! :(" + Environment.NewLine +
- " Did you entered correct connection information?" + Environment.NewLine +
- " Are you using the latest FRITZ!Box firmware?" + Environment.NewLine +
- " Did you opened the port on your FRITZ!Box? If not, call #96*5* from your phone.");
+ Log(LogLevel.Info, "Testing address ({0}) and port ({1})", Address, Port);
- return false;
- }
+ TcpClient tcpClient;
- tcpClient.Close();
- Log(LogLevel.Info, "Testing address & port succeeded.");
+ try
+ {
+ tcpClient = new TcpClient(Address, Port);
+ }
+ catch (Exception)
+ {
+ Log(LogLevel.Error,
+ "Address & port test failed! :(" + Environment.NewLine +
+ " Did you enter correct connection information?" + Environment.NewLine +
+ " Are you using the latest FRITZ!Box firmware?" + Environment.NewLine +
+ " Did you open the port on your FRITZ!Box? If not call #96*5* from your phone.");
- return true;
- }
- catch (Exception ex)
- {
- Log(ex);
+ return false;
+ }
- return false;
- }
+ tcpClient.Close();
+
+ Log(LogLevel.Info, "Testing address & port succeeded.");
+
+ return true;
+ }
+ catch (Exception ex)
+ {
+ Log(ex);
+
+ return false;
+ }
}
#endregion
@@ -297,99 +299,96 @@
private static void ReceiveCallback(IAsyncResult ar)
{
- try
- {
- // Retrieve the state object and the client socket
- // from the asynchronous state object.
- StateObject state = (StateObject) ar.AsyncState;
- Socket client = state.workSocket;
+ try
+ {
+ // Retrieve the state object and the client socket
+ // from the asynchronous state object.
+ StateObject state = (StateObject)ar.AsyncState;
+ Socket client = state.workSocket;
- // Read data from the remote device.
- int bytesRead = client.EndReceive(ar);
+ // Read data from the remote device.
+ int bytesRead = client.EndReceive(ar);
- if (bytesRead > 0)
- {
- // There might be more data, so store the data received so far.
- string data = Encoding.ASCII.GetString(state.buffer, 0, bytesRead);
- Log(LogLevel.HeavyDebug, "ReceiveCallback : received data: {0}", data);
- //Log.Debug();"ReceiveCallback : received data: {0}", data
+ if (bytesRead > 0)
+ {
+ // There might be more data, so store the data received so far.
+ string data = Encoding.ASCII.GetString(state.buffer, 0, bytesRead);
+ Log(LogLevel.HeavyDebug, "ReceiveCallback : received data: {0}", data);
+ //Log.Debug();"ReceiveCallback : received data: {0}", data
- // data-stream can be in following format:
- // incoming calls: DateTime;RING;ConnectionID;CallerID;MSN;??POTS??;
- // outgoing calls: DateTime;CALL;ConnectionID;??Nebenstelle??;MSN;CallerID;??POTS??;
- // connection started: DateTime;CONNECT;ConnectionID;??Nebenstelle??;CallerID;
- // connection closed: DateTime;DISCONNECT;ConnectionID;ConnectedTime;
+ // data-stream can be in following format:
+ // incoming calls: DateTime;RING;ConnectionID;CallerID;MSN;??POTS??;
+ // outgoing calls: DateTime;CALL;ConnectionID;??Nebenstelle??;MSN;CallerID;??POTS??;
+ // connection started: DateTime;CONNECT;ConnectionID;??Nebenstelle??;CallerID;
+ // connection closed: DateTime;DISCONNECT;ConnectionID;ConnectedTime;
- // DateTime format:
- // 12.12.06 12:12:12
- // dd.MM.yy hh:mm:ss
+ // DateTime format:
+ // 12.12.06 12:12:12
+ // dd.MM.yy hh:mm:ss
- string[] strList = data.Trim().Split(';');
- CallAction callAction = new CallAction();
+ string[] strList = data.Trim().Split(';');
+ CallAction callAction = new CallAction();
- // time when action happens
- callAction.Time = DateTime.Parse(strList[0], new CultureInfo("de-DE", false));
+ // time when action happens
+ callAction.Time = DateTime.Parse(strList[0], new CultureInfo("de-DE", false));
- // set the type of the callAction
- switch (strList[1])
- {
- case "RING":
- callAction.Type = CallAction.CallType.Incoming;
- // sets the callerID
- callAction.Caller.ID = strList[3];
- callAction.MSN = strList[4];
- break;
- case "CALL":
- callAction.Type = CallAction.CallType.Outgoing;
- // sets the callerID
- callAction.Caller.ID = strList[5];
- callAction.MSN = strList[4];
- break;
- case "CONNECT":
- callAction.Type = CallAction.CallType.ConnectionStarted;
- // sets the callerID
- callAction.Caller.ID = strList[4];
- break;
- case "DISCONNECT":
- callAction.Type = CallAction.CallType.ConnectionClosed;
- break;
- default:
- callAction = null;
- break;
- }
+ // set the type of the callAction
+ switch (strList[1])
+ {
+ case "RING":
+ callAction.Type = CallAction.CallType.Incoming;
+ // sets the callerID
+ callAction.Caller.ID = strList[3];
+ callAction.MSN = strList[4];
+ break;
+ case "CALL":
+ callAction.Type = CallAction.CallType.Outgoing;
+ // sets the callerID
+ callAction.Caller.ID = strList[5];
+ callAction.MSN = strList[4];
+ break;
+ case "CONNECT":
+ callAction.Type = CallAction.CallType.ConnectionStarted;
+ // sets the callerID
+ callAction.Caller.ID = strList[4];
+ break;
+ case "DISCONNECT":
+ callAction.Type = CallAction.CallType.ConnectionClosed;
+ break;
+ default:
+ callAction = null;
+ break;
+ }
- // continue to listen to the fb
- client.BeginReceive(state.buffer, 0, StateObject.BufferSize, 0,
- new AsyncCallback(ReceiveCallback), state);
+ // continue to listen to the fb
+ client.BeginReceive(state.buffer, 0, StateObject.BufferSize, 0, new AsyncCallback(ReceiveCallback), state);
- if (CallEvent != null)
- CallEvent(callAction);
+ if (CallEvent != null) CallEvent(callAction);
+ }
+ else
+ {
+ Log(LogLevel.Debug, "ReceiveCallback: no bytes to read");
+ Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect.");
+ ReConnect();
+ }
}
- else
+ catch (ObjectDisposedException)
{
- Log(LogLevel.Debug, "ReceiveCallback: no bytes to read");
- Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect.");
- ReConnect();
+ Log(LogLevel.Debug, "ReceiveCallback: ObjectDisposedException");
+ Log(LogLevel.Info, "FRITZ!BOX connection shut down.");
}
- }
- catch (ObjectDisposedException)
- {
- Log(LogLevel.Debug, "ReceiveCallback: ObjectDisposedException");
- Log(LogLevel.Info, "FRITZ!BOX connection shut down.");
- }
- catch (SocketException)
- {
- Log(LogLevel.Debug, "ReceiveCallback: SocketException");
- Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect.");
- ReConnect();
- }
- catch (Exception ex)
- {
- Log(ex);
- }
+ catch (SocketException)
+ {
+ Log(LogLevel.Debug, "ReceiveCallback: SocketException");
+ Log(LogLevel.Info, "FRITZ!BOX connection lost, trying to reconnect.");
+ ReConnect();
+ }
+ catch (Exception ex)
+ {
+ Log(ex);
+ }
}
-
private static void Log(LogLevel logLevel, string format, params object[] arg)
{
if (LogEvent != null)
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs 2011-12-01 20:35:25 UTC (rev 4362)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs 2011-12-03 16:12:08 UTC (rev 4363)
@@ -74,7 +74,7 @@
}
catch (Exception e)
{
- Log.Debug("Error loading call items: {0}", e.Message);
+ Log.Debug("Error loading call list items: {0}", e.Message);
}
return result;
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs 2011-12-01 20:35:25 UTC (rev 4362)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs 2011-12-03 16:12:08 UTC (rev 4363)
@@ -41,26 +41,8 @@
this.dialport = dialport;
}
- private string getChallenge()
+ public bool alreadyLoggedIn()
{
- string response = null;
- try
- {
- WebClient client = new WebClient();
- response = client.DownloadString(baseurl + "?getpage=../html/login_sid.xml");
- }
- catch (WebException)
- {
- //useSidAuthentication = false;
- return "";
- }
- Regex exp = new Regex(@"<Challenge>(.*)</Challenge>", RegexOptions.Multiline);
- MatchCollection matchList = exp.Matches(response);
- return matchList[0].Groups[1].Value;
- }
-
- private bool alreadyLoggedIn()
- {
return loggedIn;
}
@@ -122,85 +104,53 @@
{
byte[] result = { 0 } ;
- if (!String.IsNullOrEmpty(passwd))
- {
- if (forceReload || DateTime.Now.Subtract(lastCallListUpdate).Minutes > 2) result = loadCallListDataInternal();
- else
- {
- // try local cache
- Log.Debug("try to load call list from cache");
+ if (!loggedIn) login();
- lock (cacheSync)
- {
- // read data from cache
- try
- {
- if (File.Exists(cacheFileName)) result = File.ReadAllBytes(cacheFileName);
- }
- catch
- {
- Log.Debug("cached call list could not be loaded");
- }
- }
-
- if (result == null) result = loadCallListDataInternal();
- }
- }
- else Log.Debug("FritzBox password is not set. Call list cannot be loaded");
-
- return result;
- }
-
- private System.Object cacheSync = new System.Object();
-
- /// <summary>
- /// load internally (really remote) and put result to cache
- /// </summary>
- /// <returns></returns>
- protected byte[] loadCallListDataInternal()
- {
- byte[] result = { 0 };
-
- Log.Debug("load call list from FritzBox");
-
- if (!String.IsNullOrEmpty(passwd))
+ if (alreadyLoggedIn() && (forceReload || DateTime.Now.Subtract(lastCallListUpdate).Minutes > 2))
{
+ // direct download from FRITZ!Box
+ Log.Debug("trying to load call list directly from FRITZ!Box...");
+
try
{
- if (!loggedIn) login();
-
- refresh();
-
- lastCallListUpdate = DateTime.Now; // update time stamp
- WebClient client = new WebClient();
-
- client.Headers.Add("Cache-Control", "max-age=0");
- result = client.DownloadData(baseurl + "?sid=" + sid + "&getpage=../html/de/FRITZ%21Box_Anrufliste.csv");
-
- lock (cacheSync)
- {
- // put data to cache
- File.WriteAllBytes(cacheFileName, result);
- }
+ result = loadCallListDataInternal();
}
catch
{
- Log.Debug("call list could not be loaded");
+ Log.Debug("could not load call list from FRITZ!Box");
}
}
- else Log.Debug("FritzBox password is not set. Call list cannot be loaded");
+ else
+ {
+ // download from local cache
+ Log.Debug("trying to load call list from local cache...");
+ lock (cacheSync)
+ {
+ try
+ {
+ if (File.Exists(cacheFileName)) result = File.ReadAllBytes(cacheFileName);
+ }
+ catch
+ {
+ Log.Debug("locally cached call list could not be loaded");
+ }
+ }
+
+ //if (result == null) result = loadCallListDataInternal();
+ }
+
return result;
}
public string loadPhoneBook()
{
- if (!String.IsNullOrEmpty(passwd))
+ if (!loggedIn) login();
+
+ if (alreadyLoggedIn())
{
try
{
- if (!loggedIn) login();
-
string postdata =
"-----------------------------88612920297\r\n" +
"Content-Disposition: form-data; name=\"sid\"\r\n" +
@@ -225,17 +175,80 @@
}
catch
{
- Log.Debug("Error on loading phone book");
+ Log.Debug("error on loading phone book");
return "";
}
}
else
{
- Log.Debug("FritzBox password is not set. Phone book cannot be loaded");
+ Log.Debug("no connection to FRITZ!Box. Phone book cannot be loaded");
return "";
}
}
+ /// <summary>
+ /// 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)
+ {
+ if (!loggedIn) login();
+
+ string postdata = String.Format(
+ "getpage=../html/de/menus/menu2.html&var:lang=de&sid={0}" +
+ "&telcfg:settings/UseClickToDial=1&telcfg:command/Dial={1}" +
+ "&telcfg:settings/DialPort={2}",
+ this.sid, number, dialport);
+
+ PostRequest(baseurl, postdata);
+ }
+
+ private string getChallenge()
+ {
+ string response = null;
+ try
+ {
+ WebClient client = new WebClient();
+ response = client.DownloadString(baseurl + "?getpage=../html/login_sid.xml");
+ }
+ catch (WebException)
+ {
+ //useSidAuthentication = false;
+ return "";
+ }
+ Regex exp = new Regex(@"<Challenge>(.*)</Challenge>", RegexOptions.Multiline);
+ MatchCollection matchList = exp.Matches(response);
+ return matchList[0].Groups[1].Value;
+ }
+
+ private System.Object cacheSync = new System.Object();
+
+ /// <summary>
+ /// load internally (really remote) and put result to cache
+ /// </summary>
+ /// <returns></returns>
+ protected byte[] loadCallListDataInternal()
+ {
+ byte[] result = { 0 };
+
+ refresh();
+
+ lastCallListUpdate = DateTime.Now; // update time stamp
+ WebClient client = new WebClient();
+
+ client.Headers.Add("Cache-Control", "max-age=0");
+ result = client.DownloadData(baseurl + "?sid=" + sid + "&getpage=../html/de/FRITZ%21Box_Anrufliste.csv");
+
+ lock (cacheSync)
+ {
+ // put data to cache
+ File.WriteAllBytes(cacheFileName, result);
+ }
+
+ return result;
+ }
+
protected string PostRequest(string url, string postdata)
{
return PostRequest(url, postdata, "application/x-www-form-urlencoded", "UTF-8");
@@ -271,22 +284,5 @@
return "";
}
}
-
- /// <summary>
- /// 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)
- {
- if (!loggedIn) login();
- string postdata = String.Format(
- "getpage=../html/de/menus/menu2.html&var:lang=de&sid={0}" +
- "&telcfg:settings/UseClickToDial=1&telcfg:command/Dial={1}" +
- "&telcfg:settings/DialPort={2}",
- this.sid, number, dialport);
-
- PostRequest(baseurl, postdata);
- }
}
}
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/PhonebookItem.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/PhonebookItem.cs 2011-12-01 20:35:25 UTC (rev 4362)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/PhonebookItem.cs 2011-12-03 16:12:08 UTC (rev 4363)
@@ -6,57 +6,57 @@
namespace FritzManager
{
- public class InternalPhoneBook
- {
- static Logger Log = LoggerFactory.getLogger("InternalPhoneBook");
-
- public List<PhonebookItem> items = new List<PhonebookItem>();
-
- public static void savePhonebook(GCollections.ICollection<PhonebookItem> items, string fileName)
+ public class InternalPhoneBook
{
- InternalPhoneBook book = new InternalPhoneBook();
- Log.Debug("Saving internal phoneBook to {0}", fileName);
+ static Logger Log = LoggerFactory.getLogger("InternalPhoneBook");
- foreach (PhonebookItem i in items)
- {
- book.items.Add(i);
- }
+ public List<PhonebookItem> items = new List<PhonebookItem>();
- XmlSerializer s = new XmlSerializer(typeof (InternalPhoneBook));
- TextWriter w = new StreamWriter(fileName);
+ public static void savePhonebook(GCollections.ICollection<PhonebookItem> items, string fileName)
+ {
+ InternalPhoneBook book = new InternalPhoneBook();
+ Log.Debug("Saving internal phoneBook to {0}", fileName);
- s.Serialize(w, book);
+ foreach (PhonebookItem i in items)
+ {
+ book.items.Add(i);
+ }
- w.Close();
- }
+ XmlSerializer s = new XmlSerializer(typeof(InternalPhoneBook));
+ TextWriter w = new StreamWriter(fileName);
- public static HashMap<string, PhonebookItem> loadPhoneBook(string fileName)
- {
- HashMap<string, PhonebookItem> result = new HashMap<string, PhonebookItem>();
+ s.Serialize(w, book);
- if (File.Exists(fileName))
- {
- Log.Debug("Loading internal phone book from {0}", fileName);
-
- XmlSerializer s = new XmlSerializer(typeof (InternalPhoneBook));
- TextReader r = new StreamReader(fileName);
- InternalPhoneBook l = (InternalPhoneBook) s.Deserialize(r);
-
- r.Close();
+ w.Close();
+ }
- foreach (PhonebookItem i in l.items)
+ public static HashMap<string, PhonebookItem> loadPhoneBook(string fileName)
{
- result[i.number] = i;
+ HashMap<string, PhonebookItem> result = new HashMap<string, PhonebookItem>();
+
+ if (File.Exists(fileName))
+ {
+ Log.Debug("Loading FritzManager phone book from {0}", fileName);
+
+ XmlSerializer s = new XmlSerializer(typeof(InternalPhoneBook));
+ TextReader r = new StreamReader(fileName);
+ InternalPhoneBook l = (InternalPhoneBook)s.Deserialize(r);
+
+ r.Close();
+
+ foreach (PhonebookItem i in l.items)
+ {
+ result[i.number] = i;
+ }
+ }
+ else
+ {
+ Log.Debug("Could not load FritzManager phone book, file {0} not found", fileName);
+ }
+
+ return result;
}
- }
- else
- {
- Log.Debug("Could not load internal phone book, file {0} not found", fileName);
- }
-
- return result;
}
- }
/// <summary>
/// Description of PhonebookItem.
Added: trunk/plugins/FritzBox/FritzBox/FritzManager/StringEncryption.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/StringEncryption.cs (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/StringEncryption.cs 2011-12-03 16:12:08 UTC (rev 4363)
@@ -0,0 +1,106 @@
+using System;
+using System.Text;
+using System.Security.Cryptography;
+
+namespace FritzBox
+{
+ class StringEncryption
+ {
+ public static string EncryptString(string Message, string Passphrase)
+ {
+ byte[] Results;
+ System.Text.UTF8Encoding UTF8 = new System.Text.UTF8Encoding();
+
+ if (!String.IsNullOrEmpty(Message) && !String.IsNullOrEmpty(Passphrase))
+ {
+ // Step 1. We hash the passphrase using MD5
+ // We use the MD5 hash generator as the result is a 128 bit byte array
+ // which is a valid length for the TripleDES encoder we use below
+
+ MD5CryptoServiceProvider HashProvider = new MD5CryptoServiceProvider();
+ byte[] TDESKey = HashProvider.ComputeHash(UTF8.GetBytes(Passphrase));
+
+ // Step 2. Create a new TripleDESCryptoServiceProvider object
+ TripleDESCryptoServiceProvider TDESAlgorithm = new TripleDESCryptoServiceProvider();
+
+ // Step 3. Setup the encoder
+ TDESAlgorithm.Key = TDESKey;
+ TDESAlgorithm.Mode = CipherMode.ECB;
+ TDESAlgorithm.Padding = PaddingMode.PKCS7;
+
+ // Step 4. Convert the input string to a byte[]
+ byte[] DataToEncrypt = UTF8.GetBytes(Message);
+
+ // Step 5. Attempt to encrypt the string
+ try
+ {
+ ICryptoTransform Encryptor = TDESAlgorithm.CreateEncryptor();
+ Results = Encryptor.TransformFinalBlock(DataToEncrypt, 0, DataToEncrypt.Length);
+ }
+ finally
+ {
+ // Clear the TripleDes and Hashprovider services of any sensitive information
+ TDESAlgorithm.Clear();
+ HashProvider.Clear();
+ }
+
+ // Step 6. Return the encrypted string as a base64 encoded string
+ return Convert.ToBase64String(Results);
+ }
+ else return null;
+ }
+
+ public static string DecryptString(string Message, string Passphrase)
+ {
+ byte[] Results;
+ System.Text.UTF8Encoding UTF8 = new System.Text.UTF8Encoding();
+
+ if (!String.IsNullOrEmpty(Message) && !String.IsNullOrEmpty(Passphrase))
+ {
+ // Step 1. We hash the passphrase using MD5
+ // We use the MD5 hash generator as the result is a 128 bit byte array
+ // which is a valid length for the TripleDES encoder we use below
+
+ MD5CryptoServiceProvider HashProvider = new MD5CryptoServiceProvider();
+ byte[] TDESKey = HashProvider.ComputeHash(UTF8.GetBytes(Passphrase));
+
+ // Step 2. Create a new TripleDESCryptoServiceProvider object
+ TripleDESCryptoServiceProvider TDESAlgorithm = new TripleDESCryptoServiceProvider();
+
+ // Step 3. Setup the decoder
+ TDESAlgorithm.Key = TDESKey;
+ TDESAlgorithm.Mode = CipherMode.ECB;
+ TDESAlgorithm.Padding = PaddingMode.PKCS7;
+
+ // Step 4. Convert the input string to a byte[]
+ byte[] DataToDecrypt;
+
+ try
+ {
+ DataToDecrypt = Convert.FromBase64String(Message);
+ }
+ catch
+ {
+ return null;
+ }
+
+ // Step 5. Attempt to decrypt the string
+ try
+ {
+ ICryptoTransform Decryptor = TDESAlgorithm.CreateDecryptor();
+ Results = Decryptor.TransformFinalBlock(DataToDecrypt, 0, DataToDecrypt.Length);
+ }
+ finally
+ {
+ // Clear the TripleDes and Hashprovider services of any sensitive information
+ TDESAlgorithm.Clear();
+ HashProvider.Clear();
+ }
+
+ // Step 6. Return the decrypted string in UTF8 format
+ return UTF8.GetString(Results);
+ }
+ else return null;
+ }
+ }
+}
Modified: trunk/plugins/FritzBox/FritzBox/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Properties/AssemblyInfo.cs 2011-12-01 20:35:25 UTC (rev 4362)
+++ trunk/plugins/FritzBox/FritzBox/Properties/AssemblyInfo.cs 2011-12-03 16:12:08 UTC (rev 4363)
@@ -31,9 +31,9 @@
[assembly: AssemblyTitle("FRITZ!Box Manager")]
[assembly: AssemblyDescription("Displays FRITZ!Box calling information / phoneBook / voicebox.")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Rinke Solutions / Horned Reaper / chefkoch @ Team MediaPortal")]
+[assembly: AssemblyCompany("Horned Reaper, Steve, Chefkoch @ Team MediaPortal")]
[assembly: AssemblyProduct("FRITZ!Box Manager")]
-[assembly: AssemblyCopyright("Copyright © S.Rinke / Horned Reaper / chefkoch @ Team MediaPortal 2009")]
+[assembly: AssemblyCopyright("Horned Reaper, Steve, Chefkoch @ Team MediaPortal 2009")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
Modified: trunk/plugins/FritzBox/FritzBox/Settings.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Settings.cs 2011-12-01 20:35:25 UTC (rev 4362)
+++ trunk/plugins/FritzBox/FritzBox/Settings.cs 2011-12-03 16:12:08 UTC (rev 4363)
@@ -38,6 +38,8 @@
private static List<String> _msnList;
+ private const string encryptionPassphrase = "j/§=sFf)39=Jd&wVZj37";
+
#endregion Variables and constants
#region Properties
@@ -109,62 +111,68 @@
public static void Load()
{
- Log.Info("FRITZ!Box: Settings.Load()");
+ Log.Info("FRITZ!Box: Settings.Load()");
- PhoneBook.LoadSettings();
+ PhoneBook.LoadSettings();
- using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml")))
- {
- ExtensiveLogging = xmlreader.GetValueAsBool("fritzbox", "extensiveLogging", false);
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml")))
+ {
+ ExtensiveLogging = xmlreader.GetValueAsBool("fritzbox", "extensiveLogging", false);
- FritzBoxClient.Address = xmlreader.GetValueAsString("fritzbox", "address", "fritz.box");
- FritzBoxClient.Port = xmlreader.GetValueAsInt("fritzbox", "port", 1012);
+ FritzBoxClient.Address = xmlreader.GetValueAsString("fritzbox", "address", "fritz.box");
+ FritzBoxClient.Port = xmlreader.GetValueAsInt("fritzbox", "port", 1012);
- // notify settings
- MaxNotifies = xmlreader.GetValueAsInt("fritzbox", "maxNotifies", 20);
- CloseOnTimeout = xmlreader.GetValueAsBool("fritzbox", "closeOnTimeout", false);
- NotifyTimeout = xmlreader.GetValueAsInt("fritzbox", "timeout", 10);
- CloseOnConnectionClosed = xmlreader.GetValueAsBool("fritzbox", "closeOnConnectionClosed", true);
+ // notify settings
+ MaxNotifies = xmlreader.GetValueAsInt("fritzbox", "maxNotifies", 20);
+ CloseOnTimeout = xmlreader.GetValueAsBool("fritzbox", "closeOnTimeout", false);
+ NotifyTimeout = xmlreader.GetValueAsInt("fritzbox", "timeout", 10);
+ CloseOnConnectionClosed = xmlreader.GetValueAsBool("fritzbox", "closeOnConnectionClosed", true);
- //if ((!CloseOnTimeout) || (NotifyTimeout == 0))
- //NotifyTimeout = -1;
+ //if ((!CloseOnTimeout) || (NotifyTimeout == 0))
+ //NotifyTimeout = -1;
- FilterMSN = xmlreader.GetValueAsBool("fritzbox", "filterMSNs", false);
- string strMSN = xmlreader.GetValueAsString("fritzbox", "MSN", "");
- char[] charSeparators = new[] {';'};
- MSNList.AddRange(strMSN.Split(charSeparators, StringSplitOptions.RemoveEmptyEntries));
+ FilterMSN = xmlreader.GetValueAsBool("fritzbox", "filterMSNs", false);
+ string strMSN = xmlreader.GetValueAsString("fritzbox", "MSN", "");
+ char[] charSeparators = new[] { ';' };
+ MSNList.AddRange(strMSN.Split(charSeparators, StringSplitOptions.RemoveEmptyEntries));
- ShowMSNOnNotify = xmlreader.GetValueAsBool("fritzbox", "showMSNOnNotify", true);
+ ShowMSNOnNotify = xmlreader.GetValueAsBool("fritzbox", "showMSNOnNotify", true);
- // media settings
- StopMedia = xmlreader.GetValueAsBool("fritzbox", "stopMedia", true);
- ResumeMedia = xmlreader.GetValueAsBool("fritzbox", "resumeMedia", true);
- IncomingSound = xmlreader.GetValueAsString("fritzbox", "incomingSound", "");
+ // media settings
+ StopMedia = xmlreader.GetValueAsBool("fritzbox", "stopMedia", true);
+ ResumeMedia = xmlreader.GetValueAsBool("fritzbox", "resumeMedia", true);
+ IncomingSound = xmlreader.GetValueAsString("fritzbox", "incomingSound", "");
- // new FritzManager settings
- FmPassword = xmlreader.GetValue("FritzManager", "passwd");
- FmVBPath = xmlreader.GetValue("FritzManager", "vBPath");
- FmDialPort = xmlreader.GetValue("FritzManager", "dialport");
- //todo: check if the other way to load the currentmode also works
- //string modestr = xmlreader.GetValue("FritzManager", "currentMode");
- //if (modestr != null && modestr != "")
- //{
- // FmCurrentMode = (FritzBoxGuiMode)Enum.Parse(typeof(FritzBoxGuiMode), modestr);
- //}
- FmCurrentMode = (FritzBoxGuiMode) xmlreader.GetValueAsInt("FritzManager", "currentMode", 0);
- FmUseInversSearch = xmlreader.GetValueAsBool("FritzManager", "useInversSearch", false);
- FmDefaultAreacode = xmlreader.GetValue("FritzManager", "defaultAreacode");
- FmUpdateInterval = xmlreader.GetValueAsInt("FritzManager", "updateInterval", 0);
-
- // delete obsolete setting entries
- xmlreader.RemoveEntry("fritzbox", "showMsnOnHeading");
- xmlreader.RemoveEntry("FritzManager", "abpath");
+ // FritzManager settings
+ string decryptedPassword = StringEncryption.DecryptString(xmlreader.GetValue("FritzManager", "passwd"), encryptionPassphrase);
+ if (decryptedPassword != null) FmPassword = decryptedPassword;
+ else FmPassword = xmlreader.GetValue("FritzManager", "passwd"); // if the password was not encrypted read it in clear text (for older FritzBox Manager versions)
+ FmVBPath = xmlreader.GetValue("FritzManager", "vBPath");
+ FmDialPort = xmlreader.GetValue("FritzManager", "dialport");
+ //todo: check if the other way to load the currentmode also works
+ //string modestr = xmlreader.GetValue("FritzManager", "currentMode");
+ //if (modestr != null && modestr != "")
+ //{
+ // FmCurrentMode = (FritzBoxGuiMode)Enum.Parse(typeof(FritzBoxGuiMode), modestr);
+ //}
+ FmCurrentMode = (FritzBoxGuiMode)xmlreader.GetValueAsInt("FritzManager", "currentMode", 0);
+ FmUseInversSearch = xmlreader.GetValueAsBool("FritzManager", "useInversSearch", false);
+ FmDefaultAreacode = xmlreader.GetValue("FritzManager", "defaultAreacode");
+ FmUpdateInterval = xmlreader.GetValueAsInt("FritzManager", "updateInterval", 0);
- // loading current skin setting
- MediaPortalSkin = xmlreader.GetValueAsString("skin", "name", "DefaultWide");
- }
+ // delete (convert) obsolete setting entries
+ xmlreader.RemoveEntry("fritzbox", "showMsnOnHeading");
+ if (!String.IsNullOrEmpty(xmlreader.GetValue("FritzManager", "abpath")))
+ {
+ FmVBPath = xmlreader.GetValue("FritzManager", "abpath");
+ xmlreader.RemoveEntry("FritzManager", "abpath");
+ }
- WriteToLog();
+ // loading current skin setting
+ MediaPortalSkin = xmlreader.GetValueAsString("skin", "name", "DefaultWide");
+ }
+
+ WriteToLog();
}
public static void Save()
@@ -200,7 +208,7 @@
xmlwriter.SetValue("fritzbox", "incomingSound", IncomingSound );
// new FritzManager settings
- xmlwriter.SetValue("FritzManager", "passwd", FmPassword);
+ xmlwriter.SetValue("FritzManager", "passwd", StringEncryption.EncryptString(FmPassword, encryptionPassphrase));
xmlwriter.SetValue("FritzManager", "vBPath", FmVBPath);
xmlwriter.SetValue("FritzManager", "dialport", FmDialPort);
xmlwriter.SetValueAsBool("FritzManager", "useInversSearch", FmUseInversSearch);
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin
___________________________________________________________________
Added: svn:ignore
+ GenericSkin
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.csproj.FileListAbsolute.txt
===================================================================
--- trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.FileListAbsolute.txt 2011-12-01 20:35:25 UTC (rev 4362)
+++ trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.FileListAbsolute.txt 2011-12-03 16:12:08 UTC (rev 4363)
@@ -1,12 +1,5 @@
-D:\FritzBox\FritzBox\obj\Debug\ResolveAssemblyReference.cache
-D:\FritzBox\FritzBox\obj\Debug\FritzBox.Properties.Resources.resources
-D:\FritzBox\FritzBox\obj\Debug\FritzBox.FritzBoxConfig.resources
-D:\FritzBox\FritzBox\obj\Debug\GenerateResource.read.1.tlog
-D:\FritzBox\FritzBox\obj\Debug\GenerateResource.write.1.tlog
D:\Programme\Team MediaPortal\MediaPortal\plugins\Windows\FritzBox.dll
D:\Programme\Team MediaPortal\MediaPortal\plugins\Windows\FritzBox.pdb
-D:\FritzBox\FritzBox\obj\Debug\FritzBox.dll
-D:\FritzBox\FritzBox\obj\Debug\FritzBox.pdb
D:\FritzBox\FritzBox\FritzBox\bin\Release\FritzBox.dll
D:\FritzBox\FritzBox\FritzBox\bin\Release\FritzBox.pdb
D:\FritzBox\FritzBox\FritzBox\bin\Release\Common.Utils.dll
@@ -39,6 +32,13 @@
D:\FritzBox\FritzBox\bin\Release\BassRegistration.dll
D:\FritzBox\FritzBox\bin\Release\MediaPortal.Support.dll
D:\FritzBox\FritzBox\bin\Release\Interop.WMPLib.dll
+D:\FritzBox\FritzBox\bin\Release\Interop.SHDocVw.dll
D:\FritzBox\FritzBox\bin\Release\log4net.dll
D:\FritzBox\FritzBox\bin\Release\Ionic.Zip.dll
-D:\FritzBox\FritzBox\bin\Release\Interop.SHDocVw.dll
+D:\FritzBox\FritzBox\obj\Debug\ResolveAssemblyReference.cache
+D:\FritzBox\FritzBox\obj\Debug\FritzBox.Properties.Resources.resources
+D:\FritzBox\FritzBox\obj\Debug\FritzBox.FritzBoxConfig.resources
+D:\FritzBox\FritzBox\obj\Debug\GenerateResource.read.1.tlog
+D:\FritzBox\FritzBox\obj\Debug\GenerateResource.write.1.tlog
+D:\FritzBox\FritzBox\obj\Debug\FritzBox.dll
+D:\FritzBox\FritzBox\obj\Debug\FritzBox.pdb
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/Debug/GenerateResource.read.1.tlog
===================================================================
(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/FritzBox/obj/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2011-12-01 20:35:25 UTC (rev 4362)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2011-12-03 16:12:08 UTC (rev 4363)
@@ -559,7 +559,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4359</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4362</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -574,22 +574,30 @@
<GeneralInfo>
<Name>FritzBox Manager</Name>
<Id>8cb6bbc2-5473-4a63-a8f9-e0bec7c8c81c</Id>
- <Author>Steve, Horned Reaper, Chefkoch</Author>
+ <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/new-plugin-fritzbox-manager-update-merged-plugin-0-3-4-9-a-74531/</ForumPage>
- <UpdateUrl />
+ <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>0</Major>
<Minor>3</Minor>
<Build>5</Build>
- <Revision>4359</Revision>
+ <Revision>4362</Revision>
</Version>
- <ExtensionDescription>This plugin is a combination of the former fritz call monitor and the new fritz manager.</ExtensionDescription>
+ <ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box informations in 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 />
- <ReleaseDate>2011-12-01T10:05:03.1294614+01:00</ReleaseDate>
- <Tags />
+ <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
+ <ReleaseDate>2011-12-03T16:47:11.414255+01:00</ReleaseDate>
+ <Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
<Items>
@@ -1003,7 +1011,7 @@
</FolderGroup>
</FolderGroups>
<ProjectFilename>FritzBox.xmp2</ProjectFilename>
- <UpdatePath1>C:\Documents and Settings\All Users\Application Data\Team MediaPortal\MediaPortal\language\strings_de.xml</UpdatePath1>
+ <UpdatePath1>update.xml</UpdatePath1>
<UpdatePath2 />
<UpdatePath3 />
</ProjectSettings>
Added: trunk/plugins/FritzBox/MpeRelease/update.xml
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/update.xml (rev 0)
+++ trunk/plugins/FritzBox/MpeRelease/update.xml 2011-12-03 16:12:08 UTC (rev 4363)
@@ -0,0 +1,167 @@
+<?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="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>
+...
[truncated message content] |
|
From: <hor...@us...> - 2011-12-01 20:35:31
|
Revision: 4362
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4362&view=rev
Author: horned-reaper
Date: 2011-12-01 20:35:25 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
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
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_el.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_el.xml 2011-12-01 20:27:04 UTC (rev 4361)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_el.xml 2011-12-01 20:35:25 UTC (rev 4362)
@@ -24,7 +24,7 @@
<String id="21">FritzBox λίστα κλήσεων</String>
<String id="22">FritzBox Telefonbuch</String>
<String id="23">Fehler</String>
- <String id="24">τηλεφωνικό κατάλογο δεν θα μπορούσε να φορτωθεί!</String>
+ <String id="24">FRITZ!Box κωδικό και φωνή μονοπάτι κουτί λείπουν στις ρυθμίσεις!</String>
<String id="25">Ενημέρωση</String>
<String id="26">στο</String>
<String id="27">μήνυμα</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_en-US.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_en-US.xml 2011-12-01 20:27:04 UTC (rev 4361)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_en-US.xml 2011-12-01 20:35:25 UTC (rev 4362)
@@ -24,7 +24,7 @@
<String id="21">FritzBox call list</String>
<String id="22">FritzBox phone book</String>
<String id="23">Error</String>
- <String id="24">Could not load phone book!</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>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_es.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_es.xml 2011-12-01 20:27:04 UTC (rev 4361)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_es.xml 2011-12-01 20:35:25 UTC (rev 4362)
@@ -24,7 +24,7 @@
<String id="21">FritzBox lista de llamadas</String>
<String id="22">FritzBox guía telefónica</String>
<String id="23">Error</String>
- <String id="24">La agenda no se pudo cargar!</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>
<String id="26">en</String>
<String id="27">Mensaje</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_fr.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_fr.xml 2011-12-01 20:27:04 UTC (rev 4361)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_fr.xml 2011-12-01 20:35:25 UTC (rev 4362)
@@ -24,7 +24,7 @@
<String id="21">Liste des appels FritzBox</String>
<String id="22">Annuaire FritzBox</String>
<String id="23">Erreur</String>
- <String id="24">Répertoire n'a pas pu être chargé!</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>
<String id="26">au</String>
<String id="27">Message</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_it.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_it.xml 2011-12-01 20:27:04 UTC (rev 4361)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_it.xml 2011-12-01 20:35:25 UTC (rev 4362)
@@ -24,7 +24,7 @@
<String id="21">FritzBox chiamata lista</String>
<String id="22">FritzBox rubrica</String>
<String id="23">Errore</String>
- <String id="24">Rubrica non può essere caricato!</String>
+ <String id="24">FRITZ!Box password della casella e casella percorso vocale mancano nelle impostazioni!</String>
<String id="25">Aggiornamento</String>
<String id="26">a</String>
<String id="27">Messaggio</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_nl.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_nl.xml 2011-12-01 20:27:04 UTC (rev 4361)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_nl.xml 2011-12-01 20:35:25 UTC (rev 4362)
@@ -24,7 +24,7 @@
<String id="21">FritzBox oproeplijst</String>
<String id="22">FritzBox telefoonboek</String>
<String id="23">Fout</String>
- <String id="24">Het telefoonboek kon niet worden geladen!</String>
+ <String id="24">FRITZ!Box wachtwoord en strottenhoofd het pad ontbreken in instellingen!</String>
<String id="25">Update</String>
<String id="26">bij</String>
<String id="27">bericht</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_ru.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_ru.xml 2011-12-01 20:27:04 UTC (rev 4361)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_ru.xml 2011-12-01 20:35:25 UTC (rev 4362)
@@ -24,7 +24,7 @@
<String id="21">FritzBox списка вызовов</String>
<String id="22">FritzBox телефонной книге</String>
<String id="23">ошибка</String>
- <String id="24">телефонная книга не может быть загружен!</String>
+ <String id="24">FRITZ!Box пароль и путь к нему голосовой ящик не хватает в настройках!</String>
<String id="25">Обновление</String>
<String id="26">на</String>
<String id="27">Cообщение</String>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hor...@us...> - 2011-12-01 20:27:11
|
Revision: 4361
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4361&view=rev
Author: horned-reaper
Date: 2011-12-01 20:27:04 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/FritzBox/FritzBox.cs
trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_en.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.mpe1
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/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/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
Added Paths:
-----------
trunk/plugins/FritzBox/releases/FritzBox_v0.3.5.4358.mpe1
trunk/plugins/FritzBox/releases/FritzBox_v0.3.5.4359.mpe1
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2011-12-01 10:24:20 UTC (rev 4360)
+++ trunk/plugins/FritzBox/Build/Build.log 2011-12-01 20:27:04 UTC (rev 4361)
@@ -1,6 +1,6 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4358
+SVN Version: 4359
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 2.0.50727.3625]
Copyright (C) Microsoft Corporation 2007. All rights reserved.
-Build started 29.11.2011 21:41:47.
+Build started 01.12.2011 10:04:59.
Project "D:\FritzBox\FritzBox.sln" on node 0 (Rebuild target(s)).
Building solution configuration "Release|Mixed Platforms".
Project "D:\FritzBox\FritzBox.sln" (1) is building "D:\FritzBox\FritzBox\FritzBox.csproj" (2) on node 0 (Rebuild target(s)).
@@ -105,7 +105,7 @@
2 Warning(s)
0 Error(s)
-Time Elapsed 00:00:02.01
+Time Elapsed 00:00:01.93
Reverting to build 0
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
@@ -190,6 +190,6 @@
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
36 File(s) copied
MpeMaker version: 1.2.1.0
-Build started at 21:41:51
+Build started at 10:05:03
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2011-12-01 10:24:20 UTC (rev 4360)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2011-12-01 20:27:04 UTC (rev 4361)
@@ -1411,8 +1411,8 @@
{
GUIDialogOK dlg = (GUIDialogOK)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_OK);
dlg.SetHeading(GUILocalizeStrings.Get(23)); // 23 = Error
- dlg.SetLine(1, String.Empty);
- dlg.SetLine(2, msg);
+ 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);
dlg.DoModal(GUIWindowManager.ActiveWindow);
}
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml 2011-12-01 10:24:20 UTC (rev 4360)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml 2011-12-01 20:27:04 UTC (rev 4361)
@@ -24,7 +24,7 @@
<String id="21">FritzBox Anrufliste</String>
<String id="22">FritzBox Telefonbuch</String>
<String id="23">Fehler</String>
- <String id="24">Einstellungen für FRITZBox-Passw. + AB-Pfad fehlen!</String>
+ <String id="24">Bitte FRITZ!Box-Passwort und Anrufbeantworter-Pfad unter Configuration eintragen!</String>
<String id="25">Update</String>
<String id="26">an</String>
<String id="27">Nachricht</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_en.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_en.xml 2011-12-01 10:24:20 UTC (rev 4360)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_en.xml 2011-12-01 20:27:04 UTC (rev 4361)
@@ -24,7 +24,7 @@
<String id="21">FritzBox call list</String>
<String id="22">FritzBox phone book</String>
<String id="23">Error</String>
- <String id="24">Could not load phone book!</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>
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.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2011-12-01 10:24:20 UTC (rev 4360)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2011-12-01 20:27:04 UTC (rev 4361)
@@ -559,7 +559,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4358</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4359</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -582,13 +582,13 @@
<Major>0</Major>
<Minor>3</Minor>
<Build>5</Build>
- <Revision>4358</Revision>
+ <Revision>4359</Revision>
</Version>
<ExtensionDescription>This plugin is a combination of the former fritz call monitor and the new fritz manager.</ExtensionDescription>
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation />
- <ReleaseDate>2011-11-29T21:41:51.2753027+01:00</ReleaseDate>
+ <ReleaseDate>2011-12-01T10:05:03.1294614+01:00</ReleaseDate>
<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/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/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.3.5.4358.mpe1
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/releases/FritzBox_v0.3.5.4358.mpe1
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/releases/FritzBox_v0.3.5.4359.mpe1
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/releases/FritzBox_v0.3.5.4359.mpe1
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2011-12-01 10:24:30
|
Revision: 4360
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4360&view=rev
Author: framug
Date: 2011-12-01 10:24:20 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
- Fix ZguideTV url change.
- Visual Studio 2010 + dotnet 3.5 SP1 instead of Visual Studio 2008 + dotnet 2.0.
Modified Paths:
--------------
trunk/plugins/WebEPGfr/InfosSuivantSites.cs
trunk/plugins/WebEPGfr/Properties/Resources.Designer.cs
trunk/plugins/WebEPGfr/Properties/Settings.Designer.cs
trunk/plugins/WebEPGfr/WebEPGfr.csproj
trunk/plugins/WebEPGfr/WebEPGfr.sln
trunk/plugins/WebEPGfr/WebEPGfrSetup.cs
trunk/plugins/WebEPGfr/WebEPGfr_planification/WebEPGfr_planification.csproj
Modified: trunk/plugins/WebEPGfr/InfosSuivantSites.cs
===================================================================
--- trunk/plugins/WebEPGfr/InfosSuivantSites.cs 2011-11-30 08:19:55 UTC (rev 4359)
+++ trunk/plugins/WebEPGfr/InfosSuivantSites.cs 2011-12-01 10:24:20 UTC (rev 4360)
@@ -82,7 +82,7 @@
{
//logique de recuperation
_oParametre.Add(InfosSuivantSites.Grabber.Kazer.ToString(), XmlConfig.ReadXmlConfig("WebEPGfr", "Kazer", "Uri", ""));
- _oParametre.Add(InfosSuivantSites.Grabber.ZGuideTV.ToString(), XmlConfig.ReadXmlConfig("WebEPGfr", "ZguideTV", "Uri", @"http://xmltv.myftp.org/download/tnt.zip").ToString());
+ _oParametre.Add(InfosSuivantSites.Grabber.ZGuideTV.ToString(), XmlConfig.ReadXmlConfig("WebEPGfr", "ZguideTV", "Uri", @"http://xmltv.dyndns.org/download/tnt.zip").ToString());
}
catch { }
}
@@ -122,7 +122,7 @@
sURL_de_verification = @"http://www.kazer.org";
break;
case Grabber.ZGuideTV:
- sURL_de_verification = @"http://xmltv.myftp.org/download/";
+ sURL_de_verification = @"http://xmltv.dyndns.org/download/";
break;
}
return sURL_de_verification;
Modified: trunk/plugins/WebEPGfr/Properties/Resources.Designer.cs
===================================================================
--- trunk/plugins/WebEPGfr/Properties/Resources.Designer.cs 2011-11-30 08:19:55 UTC (rev 4359)
+++ trunk/plugins/WebEPGfr/Properties/Resources.Designer.cs 2011-12-01 10:24:20 UTC (rev 4360)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// Ce code a été généré par un outil.
-// Version du runtime :2.0.50727.1433
+// Version du runtime :4.0.30319.1
//
// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
// le code est régénéré.
@@ -19,7 +19,7 @@
// à l'aide d'un outil, tel que ResGen ou Visual Studio.
// Pour ajouter ou supprimer un membre, modifiez votre fichier .ResX, puis réexécutez ResGen
// avec l'option /str ou régénérez votre projet VS.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
Modified: trunk/plugins/WebEPGfr/Properties/Settings.Designer.cs
===================================================================
--- trunk/plugins/WebEPGfr/Properties/Settings.Designer.cs 2011-11-30 08:19:55 UTC (rev 4359)
+++ trunk/plugins/WebEPGfr/Properties/Settings.Designer.cs 2011-12-01 10:24:20 UTC (rev 4360)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// Ce code a été généré par un outil.
-// Version du runtime :2.0.50727.1433
+// Version du runtime :4.0.30319.1
//
// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
// le code est régénéré.
@@ -12,7 +12,7 @@
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
Modified: trunk/plugins/WebEPGfr/WebEPGfr.csproj
===================================================================
--- trunk/plugins/WebEPGfr/WebEPGfr.csproj 2011-11-30 08:19:55 UTC (rev 4359)
+++ trunk/plugins/WebEPGfr/WebEPGfr.csproj 2011-12-01 10:24:20 UTC (rev 4360)
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -15,7 +16,24 @@
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
- <OldToolsVersion>2.0</OldToolsVersion>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -25,6 +43,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -33,6 +52,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Core, Version=1.1.6.13175, Culture=neutral, processorArchitecture=x86">
@@ -189,6 +209,23 @@
<ItemGroup>
<Folder Include="Resources\" />
</ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
@@ -198,6 +235,6 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>rem copy $(ProjectName).dll "C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows"</PostBuildEvent>
+ <PostBuildEvent>copy $(ProjectName).dll "C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows"</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/WebEPGfr/WebEPGfr.sln
===================================================================
--- trunk/plugins/WebEPGfr/WebEPGfr.sln 2011-11-30 08:19:55 UTC (rev 4359)
+++ trunk/plugins/WebEPGfr/WebEPGfr.sln 2011-12-01 10:24:20 UTC (rev 4360)
@@ -1,6 +1,6 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebEPGfr", "WebEPGfr.csproj", "{1F927022-1A44-432D-B98B-82ECBF9765A7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebEPGfr_planification", "WebEPGfr_planification\WebEPGfr_planification.csproj", "{91C8D605-35D6-4CFF-B36D-95C6E7AD6E99}"
Modified: trunk/plugins/WebEPGfr/WebEPGfrSetup.cs
===================================================================
--- trunk/plugins/WebEPGfr/WebEPGfrSetup.cs 2011-11-30 08:19:55 UTC (rev 4359)
+++ trunk/plugins/WebEPGfr/WebEPGfrSetup.cs 2011-12-01 10:24:20 UTC (rev 4360)
@@ -196,11 +196,11 @@
XmlConfig.WriteXmlConfig("WebEPGfr", "Kazer", "Uri", kazer_UserName.Text.ToString());
if (Bouton_ZguideTV_TNT.Checked)
{
- XmlConfig.WriteXmlConfig("WebEPGfr", "ZguideTV", "Uri", @"http://xmltv.myftp.org/download/tnt.zip");
+ XmlConfig.WriteXmlConfig("WebEPGfr", "ZguideTV", "Uri", @"http://xmltv.dyndns.org/download/tnt.zip");
}
else
{
- XmlConfig.WriteXmlConfig("WebEPGfr", "ZguideTV", "Uri", @"http://xmltv.myftp.org/download/complet.zip");
+ XmlConfig.WriteXmlConfig("WebEPGfr", "ZguideTV", "Uri", @"http://xmltv.dyndns.org/download/complet.zip");
}
}
@@ -350,8 +350,8 @@
}
else
{
- if (Bouton_ZguideTV_TNT.Checked) { oGrabber.Configuration.DownloadUri = new Uri(@"http://xmltv.myftp.org/download/tnt.zip"); }
- else { oGrabber.Configuration.DownloadUri = new Uri(@"http://xmltv.myftp.org/download/complet.zip"); }
+ if (Bouton_ZguideTV_TNT.Checked) { oGrabber.Configuration.DownloadUri = new Uri(@"http://xmltv.dyndns.org/download/tnt.zip"); }
+ else { oGrabber.Configuration.DownloadUri = new Uri(@"http://xmltv.dyndns.org/download/complet.zip"); }
}
oGrabber.Configuration.MappingFile = InfosSuivantSites.GetMappingFileName(oUsedGrabber);
lXmlTvFileIsAvalaible = oGrabber.DownloadXmlTvFile(oGrabber.Configuration.DownloadUri);
@@ -407,8 +407,8 @@
}
else
{
- if (Bouton_ZguideTV_TNT.Checked) { oGrabber.Configuration.DownloadUri = new Uri(@"http://xmltv.myftp.org/download/tnt.zip"); }
- else { oGrabber.Configuration.DownloadUri = new Uri(@"http://xmltv.myftp.org/download/complet.zip"); }
+ if (Bouton_ZguideTV_TNT.Checked) { oGrabber.Configuration.DownloadUri = new Uri(@"http://xmltv.dyndns.org/download/tnt.zip"); }
+ else { oGrabber.Configuration.DownloadUri = new Uri(@"http://xmltv.dyndns.org/download/complet.zip"); }
}
oGrabber.Configuration.MappingFile = InfosSuivantSites.GetMappingFileName(oUsedGrabber);
lXmlTvFileIsAvalaible = oGrabber.DownloadXmlTvFile(oGrabber.Configuration.DownloadUri);
@@ -594,7 +594,7 @@
libinfo.Text = "Acc\xE8s \xE0 la page de t\xE9l\xE9chargement de ZguideTV";
libinfo.ForeColor = Color.Blue;
// On cha\xEEne sur le forum de ZguideTV
- Process.Start("http://xmltv.myftp.org/download/");
+ Process.Start("http://xmltv.dyndns.org/download/");
}
// On a cliqu\xE9 sur le nom d'utilisateur
@@ -750,8 +750,8 @@
string sDownloadUri;
//Choix du guide
if (Bouton_ZguideTV_TNT.Checked)
- { sDownloadUri = @"http://xmltv.myftp.org/download/tnt.zip"; }
- else { sDownloadUri = @"http://xmltv.myftp.org/download/complet.zip"; }
+ { sDownloadUri = @"http://xmltv.dyndns.org/download/tnt.zip"; }
+ else { sDownloadUri = @"http://xmltv.dyndns.org/download/complet.zip"; }
if (TestGrabber(sDownloadUri) == true)
{
@@ -846,7 +846,7 @@
libinfo.ForeColor = Color.Blue;
if (oGrabber != null)
{
- oGrabber.Configuration.DownloadUri = new Uri(@"http://xmltv.myftp.org/download/tnt.zip");
+ oGrabber.Configuration.DownloadUri = new Uri(@"http://xmltv.dyndns.org/download/tnt.zip");
}
}
@@ -860,7 +860,7 @@
libinfo.ForeColor = Color.Blue;
if (oGrabber != null)
{
- oGrabber.Configuration.DownloadUri = new Uri(@"http://xmltv.myftp.org/download/complet.zip");
+ oGrabber.Configuration.DownloadUri = new Uri(@"http://xmltv.dyndns.org/download/complet.zip");
}
}
#endregion
Modified: trunk/plugins/WebEPGfr/WebEPGfr_planification/WebEPGfr_planification.csproj
===================================================================
--- trunk/plugins/WebEPGfr/WebEPGfr_planification/WebEPGfr_planification.csproj 2011-11-30 08:19:55 UTC (rev 4359)
+++ trunk/plugins/WebEPGfr/WebEPGfr_planification/WebEPGfr_planification.csproj 2011-12-01 10:24:20 UTC (rev 4360)
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -13,7 +14,24 @@
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
- <OldToolsVersion>2.0</OldToolsVersion>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -23,6 +41,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -31,6 +50,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Core, Version=1.1.6.13175, Culture=neutral, processorArchitecture=x86">
@@ -64,6 +84,23 @@
<EmbeddedResource Include="WebEPGfr_planification.png" />
<EmbeddedResource Include="WebEPGfr_planificationDisabled.png" />
</ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
@@ -73,6 +110,6 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>rem copy $(ProjectName).dll "C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\process"</PostBuildEvent>
+ <PostBuildEvent>copy $(ProjectName).dll "C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\process"</PostBuildEvent>
</PropertyGroup>
</Project>
\ 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...> - 2011-11-30 08:20:03
|
Revision: 4359
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4359&view=rev
Author: horned-reaper
Date: 2011-11-30 08:19:55 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/FritzBox/FritzBox.cs
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.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.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.mpe1
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/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/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
Removed Paths:
-------------
trunk/plugins/FritzBox/releases/FritzBox_v0.3.5.0.mpe1
Modified: trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat
===================================================================
--- trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat 2011-11-29 20:09:03 UTC (rev 4358)
+++ trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat 2011-11-30 08:19:55 UTC (rev 4359)
@@ -17,10 +17,6 @@
echo Writing SVN revision assemblies...
DeployVersionSVN.exe /svn=".." >> %LOG%
-echo %errorlevel%
-if not errorlevel 0 exit
-pause
-
echo.
echo Building FRITZ!Box Manager...
"%WINDIR%\Microsoft.NET\Framework\v3.5\MSBUILD.exe" /target:Rebuild /property:Configuration=Release;AllowUnsafeBlocks=true "..\FritzBox.sln" >> %LOG%
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2011-11-29 20:09:03 UTC (rev 4358)
+++ trunk/plugins/FritzBox/Build/Build.log 2011-11-30 08:19:55 UTC (rev 4359)
@@ -1,20 +1,32 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-Unable to determine SVN version. Try with a SVN cleanup!
-Local SVN not up to date
+SVN Version: 4358
+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 3.5.30729.1
[Microsoft .NET Framework, Version 2.0.50727.3625]
Copyright (C) Microsoft Corporation 2007. All rights reserved.
-Build started 29.11.2011 21:02:16.
+Build started 29.11.2011 21:41:47.
Project "D:\FritzBox\FritzBox.sln" on node 0 (Rebuild target(s)).
Building solution configuration "Release|Mixed Platforms".
Project "D:\FritzBox\FritzBox.sln" (1) is building "D:\FritzBox\FritzBox\FritzBox.csproj" (2) on node 0 (Rebuild target(s)).
Project file contains ToolsVersion="4.0", which is not supported by this version of MSBuild. Treating the project as if it had ToolsVersion="3.5".
+CoreClean:
+ Deleting file "D:\FritzBox\FritzBox\bin\Release\FritzBox.dll".
+ Deleting file "D:\FritzBox\FritzBox\bin\Release\FritzBox.pdb".
+ 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.csproj.GenerateResource.Cache".
+ Deleting file "D:\FritzBox\FritzBox\obj\Release\FritzBox.dll".
+ Deleting file "D:\FritzBox\FritzBox\obj\Release\FritzBox.pdb".
CoreResGen:
- No resources are out of date with respect to their source files. Skipping resource generation.
-CoreCompile:
-Skipping target "CoreCompile" because all output files are up-to-date with respect to the input files.
+ Processing resource file "Properties\Resources.resx" into "obj\Release\FritzBox.Properties.Resources.resources".
+ Processing resource file "FritzBoxConfig.resx" into "obj\Release\FritzBox.FritzBoxConfig.resources".
CopyFilesToOutputDirectory:
Copying file from "obj\Release\FritzBox.dll" to "bin\Release\FritzBox.dll".
FritzBox -> D:\FritzBox\FritzBox\bin\Release\FritzBox.dll
@@ -93,8 +105,13 @@
2 Warning(s)
0 Error(s)
-Time Elapsed 00:00:01.73
+Time Elapsed 00:00:02.01
Reverting to build 0
+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
..\FritzBox\bin\Release\FritzBox.dll
1 File(s) copied
..\FritzBox\Resources\speexdec.exe
@@ -144,3 +161,35 @@
..\FritzBox\Languages\strings_it.xml
..\FritzBox\Languages\strings_nl.xml
..\FritzBox\Languages\strings_ru.xml
+..\FritzBox\Languages\Unsupported\strings_bg.xml
+..\FritzBox\Languages\Unsupported\strings_ca.xml
+..\FritzBox\Languages\Unsupported\strings_cs.xml
+..\FritzBox\Languages\Unsupported\strings_cy-GB.xml
+..\FritzBox\Languages\Unsupported\strings_da.xml
+..\FritzBox\Languages\Unsupported\strings_et.xml
+..\FritzBox\Languages\Unsupported\strings_eu.xml
+..\FritzBox\Languages\Unsupported\strings_fi.xml
+..\FritzBox\Languages\Unsupported\strings_fo.xml
+..\FritzBox\Languages\Unsupported\strings_he.xml
+..\FritzBox\Languages\Unsupported\strings_hr.xml
+..\FritzBox\Languages\Unsupported\strings_hu.xml
+..\FritzBox\Languages\Unsupported\strings_id.xml
+..\FritzBox\Languages\Unsupported\strings_is.xml
+..\FritzBox\Languages\Unsupported\strings_ko.xml
+..\FritzBox\Languages\Unsupported\strings_mk.xml
+..\FritzBox\Languages\Unsupported\strings_no.xml
+..\FritzBox\Languages\Unsupported\strings_pl.xml
+..\FritzBox\Languages\Unsupported\strings_pt-BR.xml
+..\FritzBox\Languages\Unsupported\strings_pt.xml
+..\FritzBox\Languages\Unsupported\strings_ro.xml
+..\FritzBox\Languages\Unsupported\strings_sk.xml
+..\FritzBox\Languages\Unsupported\strings_sl.xml
+..\FritzBox\Languages\Unsupported\strings_sv.xml
+..\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 21:41:51
+Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
+Output: "..\MpeRelease\FritzBox.mpe1"
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2011-11-29 20:09:03 UTC (rev 4358)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2011-11-30 08:19:55 UTC (rev 4359)
@@ -1411,8 +1411,8 @@
{
GUIDialogOK dlg = (GUIDialogOK)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_OK);
dlg.SetHeading(GUILocalizeStrings.Get(23)); // 23 = Error
- dlg.SetLine(1, msg);
- dlg.SetLine(2, String.Empty);
+ dlg.SetLine(1, String.Empty);
+ dlg.SetLine(2, msg);
dlg.SetLine(3, String.Empty);
dlg.DoModal(GUIWindowManager.ActiveWindow);
}
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2011-11-29 20:09:03 UTC (rev 4358)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2011-11-30 08:19:55 UTC (rev 4359)
@@ -308,32 +308,33 @@
private void mpButton1_Click(object sender, EventArgs e)
{
+ // clear text box
+ labelHelp.Text = string.Empty;
+
+ FritzBoxClient.LogEvent += OnLogAction;
+
Log.Debug("FRITZ!Box: Connection test: Start");
- FritzBoxClient.LogEvent += OnLogAction;
-
// stopping client
Log.Debug("FRITZ!Box: Connection test: Stop client");
FritzBoxClient.StopClient();
- // clear text box
- labelHelp.Text = string.Empty;
-
- // set current used text
+ // set current settings
FritzBoxClient.Address = textBoxAddress.Text;
FritzBoxClient.Port = (int)numericUpDownPort.Value;
// port test
Log.Debug("FRITZ!Box: Connection test: Start port test");
- if (!FritzBoxClient.TestConnection()) return;
+ if (FritzBoxClient.TestConnection())
+ {
+ // if port test was successful start client
+ Log.Debug("FRITZ!Box: Connection test: Start client");
+ FritzBoxClient.StartClient();
+ }
- // start client
- Log.Debug("FRITZ!Box: Connection test: Start client");
- FritzBoxClient.StartClient();
+ Log.Debug("FRITZ!Box: Connection test: End");
FritzBoxClient.LogEvent -= OnLogAction;
-
- Log.Debug("FRITZ!Box: Connection test: End");
}
#endregion
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml 2011-11-29 20:09:03 UTC (rev 4358)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml 2011-11-30 08:19:55 UTC (rev 4359)
@@ -24,7 +24,7 @@
<String id="21">FritzBox Anrufliste</String>
<String id="22">FritzBox Telefonbuch</String>
<String id="23">Fehler</String>
- <String id="24">FritzBox Passwort & Anrufbeantworter-Pfad wurden noch nicht definiert!</String>
+ <String id="24">Einstellungen für FRITZBox-Passw. + AB-Pfad fehlen!</String>
<String id="25">Update</String>
<String id="26">an</String>
<String id="27">Nachricht</String>
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.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2011-11-29 20:09:03 UTC (rev 4358)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2011-11-30 08:19:55 UTC (rev 4359)
@@ -559,7 +559,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.0</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4358</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -582,13 +582,13 @@
<Major>0</Major>
<Minor>3</Minor>
<Build>5</Build>
- <Revision>0</Revision>
+ <Revision>4358</Revision>
</Version>
<ExtensionDescription>This plugin is a combination of the former fritz call monitor and the new fritz manager.</ExtensionDescription>
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation />
- <ReleaseDate>2011-11-29T20:53:44.6886313+01:00</ReleaseDate>
+ <ReleaseDate>2011-11-29T21:41:51.2753027+01:00</ReleaseDate>
<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/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/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)
Deleted: trunk/plugins/FritzBox/releases/FritzBox_v0.3.5.0.mpe1
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hor...@us...> - 2011-11-29 20:09:09
|
Revision: 4358
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4358&view=rev
Author: horned-reaper
Date: 2011-11-29 20:09:03 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat
trunk/plugins/FritzBox/Build/Build.log
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/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb
trunk/plugins/FritzBox/MpeRelease/FritzBox.mpe1
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
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.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/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/FritzBox_v0.3.5.0.mpe1
Modified: trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat
===================================================================
--- trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat 2011-11-29 19:50:29 UTC (rev 4357)
+++ trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat 2011-11-29 20:09:03 UTC (rev 4358)
@@ -17,6 +17,10 @@
echo Writing SVN revision assemblies...
DeployVersionSVN.exe /svn=".." >> %LOG%
+echo %errorlevel%
+if not errorlevel 0 exit
+pause
+
echo.
echo Building FRITZ!Box Manager...
"%WINDIR%\Microsoft.NET\Framework\v3.5\MSBUILD.exe" /target:Rebuild /property:Configuration=Release;AllowUnsafeBlocks=true "..\FritzBox.sln" >> %LOG%
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2011-11-29 19:50:29 UTC (rev 4357)
+++ trunk/plugins/FritzBox/Build/Build.log 2011-11-29 20:09:03 UTC (rev 4358)
@@ -1,32 +1,20 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4356
-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
+Unable to determine SVN version. Try with a SVN cleanup!
+Local SVN not up to date
Microsoft (R) Build Engine Version 3.5.30729.1
[Microsoft .NET Framework, Version 2.0.50727.3625]
Copyright (C) Microsoft Corporation 2007. All rights reserved.
-Build started 29.11.2011 20:48:19.
+Build started 29.11.2011 21:02:16.
Project "D:\FritzBox\FritzBox.sln" on node 0 (Rebuild target(s)).
Building solution configuration "Release|Mixed Platforms".
Project "D:\FritzBox\FritzBox.sln" (1) is building "D:\FritzBox\FritzBox\FritzBox.csproj" (2) on node 0 (Rebuild target(s)).
Project file contains ToolsVersion="4.0", which is not supported by this version of MSBuild. Treating the project as if it had ToolsVersion="3.5".
-CoreClean:
- Deleting file "D:\FritzBox\FritzBox\bin\Release\FritzBox.dll".
- Deleting file "D:\FritzBox\FritzBox\bin\Release\FritzBox.pdb".
- 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.csproj.GenerateResource.Cache".
- Deleting file "D:\FritzBox\FritzBox\obj\Release\FritzBox.dll".
- Deleting file "D:\FritzBox\FritzBox\obj\Release\FritzBox.pdb".
CoreResGen:
- Processing resource file "Properties\Resources.resx" into "obj\Release\FritzBox.Properties.Resources.resources".
- Processing resource file "FritzBoxConfig.resx" into "obj\Release\FritzBox.FritzBoxConfig.resources".
+ No resources are out of date with respect to their source files. Skipping resource generation.
+CoreCompile:
+Skipping target "CoreCompile" because all output files are up-to-date with respect to the input files.
CopyFilesToOutputDirectory:
Copying file from "obj\Release\FritzBox.dll" to "bin\Release\FritzBox.dll".
FritzBox -> D:\FritzBox\FritzBox\bin\Release\FritzBox.dll
@@ -105,13 +93,8 @@
2 Warning(s)
0 Error(s)
-Time Elapsed 00:00:02.06
+Time Elapsed 00:00:01.73
Reverting to build 0
-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
..\FritzBox\bin\Release\FritzBox.dll
1 File(s) copied
..\FritzBox\Resources\speexdec.exe
@@ -161,35 +144,3 @@
..\FritzBox\Languages\strings_it.xml
..\FritzBox\Languages\strings_nl.xml
..\FritzBox\Languages\strings_ru.xml
-..\FritzBox\Languages\Unsupported\strings_bg.xml
-..\FritzBox\Languages\Unsupported\strings_ca.xml
-..\FritzBox\Languages\Unsupported\strings_cs.xml
-..\FritzBox\Languages\Unsupported\strings_cy-GB.xml
-..\FritzBox\Languages\Unsupported\strings_da.xml
-..\FritzBox\Languages\Unsupported\strings_et.xml
-..\FritzBox\Languages\Unsupported\strings_eu.xml
-..\FritzBox\Languages\Unsupported\strings_fi.xml
-..\FritzBox\Languages\Unsupported\strings_fo.xml
-..\FritzBox\Languages\Unsupported\strings_he.xml
-..\FritzBox\Languages\Unsupported\strings_hr.xml
-..\FritzBox\Languages\Unsupported\strings_hu.xml
-..\FritzBox\Languages\Unsupported\strings_id.xml
-..\FritzBox\Languages\Unsupported\strings_is.xml
-..\FritzBox\Languages\Unsupported\strings_ko.xml
-..\FritzBox\Languages\Unsupported\strings_mk.xml
-..\FritzBox\Languages\Unsupported\strings_no.xml
-..\FritzBox\Languages\Unsupported\strings_pl.xml
-..\FritzBox\Languages\Unsupported\strings_pt-BR.xml
-..\FritzBox\Languages\Unsupported\strings_pt.xml
-..\FritzBox\Languages\Unsupported\strings_ro.xml
-..\FritzBox\Languages\Unsupported\strings_sk.xml
-..\FritzBox\Languages\Unsupported\strings_sl.xml
-..\FritzBox\Languages\Unsupported\strings_sv.xml
-..\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 20:48:23
-Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
-Output: "..\MpeRelease\FritzBox.mpe1"
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml 2011-11-29 19:50:29 UTC (rev 4357)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml 2011-11-29 20:09:03 UTC (rev 4358)
@@ -24,7 +24,7 @@
<String id="21">FritzBox Anrufliste</String>
<String id="22">FritzBox Telefonbuch</String>
<String id="23">Fehler</String>
- <String id="24">Telefonbuch konnte nicht geladen werden!</String>
+ <String id="24">FritzBox Passwort & Anrufbeantworter-Pfad wurden noch nicht definiert!</String>
<String id="25">Update</String>
<String id="26">an</String>
<String id="27">Nachricht</String>
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/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2011-11-29 19:50:29 UTC (rev 4357)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2011-11-29 20:09:03 UTC (rev 4358)
@@ -559,7 +559,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4356</DesignedForVersion>
+ <DesignedForVersion>1.1.7.0</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -582,13 +582,13 @@
<Major>0</Major>
<Minor>3</Minor>
<Build>5</Build>
- <Revision>4356</Revision>
+ <Revision>0</Revision>
</Version>
<ExtensionDescription>This plugin is a combination of the former fritz call monitor and the new fritz manager.</ExtensionDescription>
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation />
- <ReleaseDate>2011-11-29T20:48:23.2293344+01:00</ReleaseDate>
+ <ReleaseDate>2011-11-29T20:53:44.6886313+01:00</ReleaseDate>
<Tags />
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
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.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/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)
Modified: trunk/plugins/FritzBox/releases/FritzBox_v0.3.5.0.mpe1
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hor...@us...> - 2011-11-29 19:50:36
|
Revision: 4357
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4357&view=rev
Author: horned-reaper
Date: 2011-11-29 19:50:29 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb
trunk/plugins/FritzBox/MpeRelease/FritzBox.mpe1
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
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.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/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
Added Paths:
-----------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/releases/FritzBox_v0.3.5.0.mpe1
trunk/plugins/FritzBox/releases/FritzBox_v0.3.5.4356.mpe1
Removed Paths:
-------------
trunk/plugins/FritzBox/Build/build_.log
trunk/plugins/FritzBox/FritzBox/Skin/GenericSkin/
Modified: trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat
===================================================================
--- trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat 2011-11-29 19:40:00 UTC (rev 4356)
+++ trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat 2011-11-29 19:50:29 UTC (rev 4357)
@@ -1,6 +1,3 @@
-D:
-cd \FritzBox\Build
-
@echo off
REM Select program path based on current machine environment
Added: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log (rev 0)
+++ trunk/plugins/FritzBox/Build/Build.log 2011-11-29 19:50:29 UTC (rev 4357)
@@ -0,0 +1,195 @@
+
+Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
+SVN Version: 4356
+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 3.5.30729.1
+[Microsoft .NET Framework, Version 2.0.50727.3625]
+Copyright (C) Microsoft Corporation 2007. All rights reserved.
+
+Build started 29.11.2011 20:48:19.
+Project "D:\FritzBox\FritzBox.sln" on node 0 (Rebuild target(s)).
+ Building solution configuration "Release|Mixed Platforms".
+Project "D:\FritzBox\FritzBox.sln" (1) is building "D:\FritzBox\FritzBox\FritzBox.csproj" (2) on node 0 (Rebuild target(s)).
+Project file contains ToolsVersion="4.0", which is not supported by this version of MSBuild. Treating the project as if it had ToolsVersion="3.5".
+CoreClean:
+ Deleting file "D:\FritzBox\FritzBox\bin\Release\FritzBox.dll".
+ Deleting file "D:\FritzBox\FritzBox\bin\Release\FritzBox.pdb".
+ 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.csproj.GenerateResource.Cache".
+ Deleting file "D:\FritzBox\FritzBox\obj\Release\FritzBox.dll".
+ Deleting file "D:\FritzBox\FritzBox\obj\Release\FritzBox.pdb".
+CoreResGen:
+ Processing resource file "Properties\Resources.resx" into "obj\Release\FritzBox.Properties.Resources.resources".
+ Processing resource file "FritzBoxConfig.resx" into "obj\Release\FritzBox.FritzBoxConfig.resources".
+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 0 (Rebuild target(s)).
+Project file contains ToolsVersion="4.0", which is not supported by this version of MSBuild. Treating the project as if it had ToolsVersion="3.5".
+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\obj\Release\ResolveAssemblyReference.cache".
+ Deleting file "D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.exe".
+ Deleting file "D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.pdb".
+Project "D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj" (3) is building "D:\FritzBox\FritzBox\FritzBox.csproj" (2:2) on node 0 (GetTargetPath target(s)).
+Project file contains ToolsVersion="4.0", which is not supported by this version of MSBuild. Treating the project as if it had ToolsVersion="3.5".
+Done Building Project "D:\FritzBox\FritzBox\FritzBox.csproj" (GetTargetPath target(s)).
+Project "D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj" (3) is building "D:\FritzBox\FritzBox\FritzBox.csproj" (2:3) on node 0 (GetNativeManifest target(s)).
+Project file contains ToolsVersion="4.0", which is not supported by this version of MSBuild. Treating the project as if it had ToolsVersion="3.5".
+Done Building Project "D:\FritzBox\FritzBox\FritzBox.csproj" (GetNativeManifest target(s)).
+ResolveAssemblyReferences:
+ Consider app.config remapping of assembly "System, Culture=neutral, PublicKeyToken=b77a5c561934e089" from Version "1.0.5000.0" [] to Version "2.0.0.0" [C:\WINDOWS\assembly\GAC_MSIL\System\2.0.0.0__b77a5c561934e089\System.dll] to solve conflict and get rid of warning.
+ Consider app.config remapping of assembly "System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089" from Version "1.0.5000.0" [] to Version "2.0.0.0" [C:\WINDOWS\assembly\GAC_MSIL\System.Windows.Forms\2.0.0.0__b77a5c561934e089\System.Windows.Forms.dll] to solve conflict and get rid of warning.
+ Consider app.config remapping of assembly "Microsoft.VisualC, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" from Version "7.0.5000.0" [] to Version "8.0.0.0" [C:\WINDOWS\assembly\GAC_MSIL\Microsoft.VisualC\8.0.0.0__b03f5f7f11d50a3a\Microsoft.VisualC.dll] to solve conflict and get rid of warning.
+ Consider app.config remapping of assembly "System.Drawing, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" from Version "1.0.5000.0" [] to Version "2.0.0.0" [C:\WINDOWS\assembly\GAC_MSIL\System.Drawing\2.0.0.0__b03f5f7f11d50a3a\System.Drawing.dll] to solve conflict and get rid of warning.
+C:\WINDOWS\Microsoft.NET\Framework\v3.5\Microsoft.Common.targets : warning MSB3247: Found conflicts between different versions of the same dependent assembly.
+Project "D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj" (3) is building "D:\FritzBox\FritzBox\FritzBox.csproj" (2:4) on node 0 (GetCopyToOutputDirectoryItems target(s)).
+Project file contains ToolsVersion="4.0", which is not supported by this version of MSBuild. Treating the project as if it had ToolsVersion="3.5".
+Done Building Project "D:\FritzBox\FritzBox\FritzBox.csproj" (GetCopyToOutputDirectoryItems target(s)).
+_CopyAppConfigFile:
+ Copying file from "app.config" to ".\bin\Release\FritzBoxConfigTester.exe.config".
+CopyFilesToOutputDirectory:
+ Copying file from "obj\Release\FritzBoxConfigTester.exe" to ".\bin\Release\FritzBoxConfigTester.exe".
+ 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 0 (Rebuild target(s)).
+Project file contains ToolsVersion="4.0", which is not supported by this version of MSBuild. Treating the project as if it had ToolsVersion="3.5".
+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\obj\Release\FritzBoxDebugger.DebugForm.resources".
+ Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.csproj.GenerateResource.Cache".
+ Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.exe".
+ Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.pdb".
+ResolveAssemblyReferences:
+ Consider app.config remapping of assembly "System, Culture=neutral, PublicKeyToken=b77a5c561934e089" from Version "1.0.5000.0" [] to Version "2.0.0.0" [C:\WINDOWS\assembly\GAC_MSIL\System\2.0.0.0__b77a5c561934e089\System.dll] to solve conflict and get rid of warning.
+ Consider app.config remapping of assembly "System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089" from Version "1.0.5000.0" [] to Version "2.0.0.0" [C:\WINDOWS\assembly\GAC_MSIL\System.Windows.Forms\2.0.0.0__b77a5c561934e089\System.Windows.Forms.dll] to solve conflict and get rid of warning.
+ Consider app.config remapping of assembly "Microsoft.VisualC, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" from Version "7.0.5000.0" [] to Version "8.0.0.0" [C:\WINDOWS\assembly\GAC_MSIL\Microsoft.VisualC\8.0.0.0__b03f5f7f11d50a3a\Microsoft.VisualC.dll] to solve conflict and get rid of warning.
+ Consider app.config remapping of assembly "System.Drawing, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" from Version "1.0.5000.0" [] to Version "2.0.0.0" [C:\WINDOWS\assembly\GAC_MSIL\System.Drawing\2.0.0.0__b03f5f7f11d50a3a\System.Drawing.dll] to solve conflict and get rid of warning.
+C:\WINDOWS\Microsoft.NET\Framework\v3.5\Microsoft.Common.targets : warning MSB3247: Found conflicts between different versions of the same dependent assembly.
+CoreResGen:
+ Processing resource file "DebugForm.resx" into "obj\Release\FritzBoxDebugger.DebugForm.resources".
+_CopyAppConfigFile:
+ Copying file from "app.config" to ".\bin\Release\FritzBoxDebugger.exe.config".
+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)).
+
+Build succeeded.
+
+"D:\FritzBox\FritzBox.sln" (Rebuild target) (1) ->
+"D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj" (Rebuild target) (3) ->
+(ResolveAssemblyReferences target) ->
+ C:\WINDOWS\Microsoft.NET\Framework\v3.5\Microsoft.Common.targets : warning MSB3247: Found conflicts between different versions of the same dependent assembly.
+
+
+"D:\FritzBox\FritzBox.sln" (Rebuild target) (1) ->
+"D:\FritzBox\Tools\FritzBoxDebugger\FritzBoxDebugger.csproj" (Rebuild target) (4) ->
+ C:\WINDOWS\Microsoft.NET\Framework\v3.5\Microsoft.Common.targets : warning MSB3247: Found conflicts between different versions of the same dependent assembly.
+
+ 2 Warning(s)
+ 0 Error(s)
+
+Time Elapsed 00:00:02.06
+Reverting to build 0
+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
+..\FritzBox\bin\Release\FritzBox.dll
+1 File(s) copied
+..\FritzBox\Resources\speexdec.exe
+1 File(s) copied
+..\FritzBox\Skin\Black & White\FritzManager.xml
+..\FritzBox\Skin\Black & White\Media\hover_FritzBox.png
+..\FritzBox\Skin\Black & White\Media\FritzBox\callin.png
+..\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\rejected.png
+..\FritzBox\Skin\Blue3\FritzManager.xml
+..\FritzBox\Skin\Blue3\Media\hover_FritzBox.png
+..\FritzBox\Skin\Blue3\Media\FritzBox\callin.png
+..\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\rejected.png
+..\FritzBox\Skin\Default\FritzManager.xml
+..\FritzBox\Skin\Default\Media\hover_FritzBox.png
+..\FritzBox\Skin\Default\Media\FritzBox\callin.png
+..\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\rejected.png
+..\FritzBox\Skin\DefaultWide\FritzManager.xml
+..\FritzBox\Skin\DefaultWide\Media\hover_FritzBox.png
+..\FritzBox\Skin\DefaultWide\Media\FritzBox\callin.png
+..\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\rejected.png
+..\FritzBox\Skin\Maya\FritzManager.xml
+..\FritzBox\Skin\Maya\Media\hover_FritzBox.png
+..\FritzBox\Skin\Maya\Media\FritzBox\callin.png
+..\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\rejected.png
+35 File(s) copied
+..\FritzBox\Languages\strings_de.xml
+..\FritzBox\Languages\strings_el.xml
+..\FritzBox\Languages\strings_en-US.xml
+..\FritzBox\Languages\strings_en.xml
+..\FritzBox\Languages\strings_es.xml
+..\FritzBox\Languages\strings_fr.xml
+..\FritzBox\Languages\strings_it.xml
+..\FritzBox\Languages\strings_nl.xml
+..\FritzBox\Languages\strings_ru.xml
+..\FritzBox\Languages\Unsupported\strings_bg.xml
+..\FritzBox\Languages\Unsupported\strings_ca.xml
+..\FritzBox\Languages\Unsupported\strings_cs.xml
+..\FritzBox\Languages\Unsupported\strings_cy-GB.xml
+..\FritzBox\Languages\Unsupported\strings_da.xml
+..\FritzBox\Languages\Unsupported\strings_et.xml
+..\FritzBox\Languages\Unsupported\strings_eu.xml
+..\FritzBox\Languages\Unsupported\strings_fi.xml
+..\FritzBox\Languages\Unsupported\strings_fo.xml
+..\FritzBox\Languages\Unsupported\strings_he.xml
+..\FritzBox\Languages\Unsupported\strings_hr.xml
+..\FritzBox\Languages\Unsupported\strings_hu.xml
+..\FritzBox\Languages\Unsupported\strings_id.xml
+..\FritzBox\Languages\Unsupported\strings_is.xml
+..\FritzBox\Languages\Unsupported\strings_ko.xml
+..\FritzBox\Languages\Unsupported\strings_mk.xml
+..\FritzBox\Languages\Unsupported\strings_no.xml
+..\FritzBox\Languages\Unsupported\strings_pl.xml
+..\FritzBox\Languages\Unsupported\strings_pt-BR.xml
+..\FritzBox\Languages\Unsupported\strings_pt.xml
+..\FritzBox\Languages\Unsupported\strings_ro.xml
+..\FritzBox\Languages\Unsupported\strings_sk.xml
+..\FritzBox\Languages\Unsupported\strings_sl.xml
+..\FritzBox\Languages\Unsupported\strings_sv.xml
+..\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 20:48:23
+Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
+Output: "..\MpeRelease\FritzBox.mpe1"
Deleted: trunk/plugins/FritzBox/Build/build_.log
===================================================================
--- trunk/plugins/FritzBox/Build/build_.log 2011-11-29 19:40:00 UTC (rev 4356)
+++ trunk/plugins/FritzBox/Build/build_.log 2011-11-29 19:50:29 UTC (rev 4357)
@@ -1,195 +0,0 @@
-
-Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4349
-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 3.5.30729.1
-[Microsoft .NET Framework, Version 2.0.50727.3625]
-Copyright (C) Microsoft Corporation 2007. All rights reserved.
-
-Build started 28.11.2011 23:50:43.
-Project "D:\FritzBox\FritzBox.sln" on node 0 (Rebuild target(s)).
- Building solution configuration "Release|Mixed Platforms".
-Project "D:\FritzBox\FritzBox.sln" (1) is building "D:\FritzBox\FritzBox\FritzBox.csproj" (2) on node 0 (Rebuild target(s)).
-Project file contains ToolsVersion="4.0", which is not supported by this version of MSBuild. Treating the project as if it had ToolsVersion="3.5".
-CoreClean:
- Deleting file "D:\FritzBox\FritzBox\bin\Release\FritzBox.dll".
- Deleting file "D:\FritzBox\FritzBox\bin\Release\FritzBox.pdb".
- 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.csproj.GenerateResource.Cache".
- Deleting file "D:\FritzBox\FritzBox\obj\Release\FritzBox.dll".
- Deleting file "D:\FritzBox\FritzBox\obj\Release\FritzBox.pdb".
-CoreResGen:
- Processing resource file "Properties\Resources.resx" into "obj\Release\FritzBox.Properties.Resources.resources".
- Processing resource file "FritzBoxConfig.resx" into "obj\Release\FritzBox.FritzBoxConfig.resources".
-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 0 (Rebuild target(s)).
-Project file contains ToolsVersion="4.0", which is not supported by this version of MSBuild. Treating the project as if it had ToolsVersion="3.5".
-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\obj\Release\ResolveAssemblyReference.cache".
- Deleting file "D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.exe".
- Deleting file "D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.pdb".
-Project "D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj" (3) is building "D:\FritzBox\FritzBox\FritzBox.csproj" (2:2) on node 0 (GetTargetPath target(s)).
-Project file contains ToolsVersion="4.0", which is not supported by this version of MSBuild. Treating the project as if it had ToolsVersion="3.5".
-Done Building Project "D:\FritzBox\FritzBox\FritzBox.csproj" (GetTargetPath target(s)).
-Project "D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj" (3) is building "D:\FritzBox\FritzBox\FritzBox.csproj" (2:3) on node 0 (GetNativeManifest target(s)).
-Project file contains ToolsVersion="4.0", which is not supported by this version of MSBuild. Treating the project as if it had ToolsVersion="3.5".
-Done Building Project "D:\FritzBox\FritzBox\FritzBox.csproj" (GetNativeManifest target(s)).
-ResolveAssemblyReferences:
- Consider app.config remapping of assembly "System, Culture=neutral, PublicKeyToken=b77a5c561934e089" from Version "1.0.5000.0" [] to Version "2.0.0.0" [C:\WINDOWS\assembly\GAC_MSIL\System\2.0.0.0__b77a5c561934e089\System.dll] to solve conflict and get rid of warning.
- Consider app.config remapping of assembly "System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089" from Version "1.0.5000.0" [] to Version "2.0.0.0" [C:\WINDOWS\assembly\GAC_MSIL\System.Windows.Forms\2.0.0.0__b77a5c561934e089\System.Windows.Forms.dll] to solve conflict and get rid of warning.
- Consider app.config remapping of assembly "Microsoft.VisualC, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" from Version "7.0.5000.0" [] to Version "8.0.0.0" [C:\WINDOWS\assembly\GAC_MSIL\Microsoft.VisualC\8.0.0.0__b03f5f7f11d50a3a\Microsoft.VisualC.dll] to solve conflict and get rid of warning.
- Consider app.config remapping of assembly "System.Drawing, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" from Version "1.0.5000.0" [] to Version "2.0.0.0" [C:\WINDOWS\assembly\GAC_MSIL\System.Drawing\2.0.0.0__b03f5f7f11d50a3a\System.Drawing.dll] to solve conflict and get rid of warning.
-C:\WINDOWS\Microsoft.NET\Framework\v3.5\Microsoft.Common.targets : warning MSB3247: Found conflicts between different versions of the same dependent assembly.
-Project "D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj" (3) is building "D:\FritzBox\FritzBox\FritzBox.csproj" (2:4) on node 0 (GetCopyToOutputDirectoryItems target(s)).
-Project file contains ToolsVersion="4.0", which is not supported by this version of MSBuild. Treating the project as if it had ToolsVersion="3.5".
-Done Building Project "D:\FritzBox\FritzBox\FritzBox.csproj" (GetCopyToOutputDirectoryItems target(s)).
-_CopyAppConfigFile:
- Copying file from "app.config" to ".\bin\Release\FritzBoxConfigTester.exe.config".
-CopyFilesToOutputDirectory:
- Copying file from "obj\Release\FritzBoxConfigTester.exe" to ".\bin\Release\FritzBoxConfigTester.exe".
- 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 0 (Rebuild target(s)).
-Project file contains ToolsVersion="4.0", which is not supported by this version of MSBuild. Treating the project as if it had ToolsVersion="3.5".
-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\obj\Release\FritzBoxDebugger.DebugForm.resources".
- Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.csproj.GenerateResource.Cache".
- Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.exe".
- Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.pdb".
-ResolveAssemblyReferences:
- Consider app.config remapping of assembly "System, Culture=neutral, PublicKeyToken=b77a5c561934e089" from Version "1.0.5000.0" [] to Version "2.0.0.0" [C:\WINDOWS\assembly\GAC_MSIL\System\2.0.0.0__b77a5c561934e089\System.dll] to solve conflict and get rid of warning.
- Consider app.config remapping of assembly "System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089" from Version "1.0.5000.0" [] to Version "2.0.0.0" [C:\WINDOWS\assembly\GAC_MSIL\System.Windows.Forms\2.0.0.0__b77a5c561934e089\System.Windows.Forms.dll] to solve conflict and get rid of warning.
- Consider app.config remapping of assembly "Microsoft.VisualC, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" from Version "7.0.5000.0" [] to Version "8.0.0.0" [C:\WINDOWS\assembly\GAC_MSIL\Microsoft.VisualC\8.0.0.0__b03f5f7f11d50a3a\Microsoft.VisualC.dll] to solve conflict and get rid of warning.
- Consider app.config remapping of assembly "System.Drawing, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" from Version "1.0.5000.0" [] to Version "2.0.0.0" [C:\WINDOWS\assembly\GAC_MSIL\System.Drawing\2.0.0.0__b03f5f7f11d50a3a\System.Drawing.dll] to solve conflict and get rid of warning.
-C:\WINDOWS\Microsoft.NET\Framework\v3.5\Microsoft.Common.targets : warning MSB3247: Found conflicts between different versions of the same dependent assembly.
-CoreResGen:
- Processing resource file "DebugForm.resx" into "obj\Release\FritzBoxDebugger.DebugForm.resources".
-_CopyAppConfigFile:
- Copying file from "app.config" to ".\bin\Release\FritzBoxDebugger.exe.config".
-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)).
-
-Build succeeded.
-
-"D:\FritzBox\FritzBox.sln" (Rebuild target) (1) ->
-"D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj" (Rebuild target) (3) ->
-(ResolveAssemblyReferences target) ->
- C:\WINDOWS\Microsoft.NET\Framework\v3.5\Microsoft.Common.targets : warning MSB3247: Found conflicts between different versions of the same dependent assembly.
-
-
-"D:\FritzBox\FritzBox.sln" (Rebuild target) (1) ->
-"D:\FritzBox\Tools\FritzBoxDebugger\FritzBoxDebugger.csproj" (Rebuild target) (4) ->
- C:\WINDOWS\Microsoft.NET\Framework\v3.5\Microsoft.Common.targets : warning MSB3247: Found conflicts between different versions of the same dependent assembly.
-
- 2 Warning(s)
- 0 Error(s)
-
-Time Elapsed 00:00:02.39
-Reverting to build 0
-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
-..\FritzBox\bin\Release\FritzBox.dll
-1 File(s) copied
-..\FritzBox\Resources\speexdec.exe
-1 File(s) copied
-..\FritzBox\Skin\Black & White\FritzManager.xml
-..\FritzBox\Skin\Black & White\Media\hover_FritzBox.png
-..\FritzBox\Skin\Black & White\Media\FritzBox\callin.png
-..\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\rejected.png
-..\FritzBox\Skin\Blue3\FritzManager.xml
-..\FritzBox\Skin\Blue3\Media\hover_FritzBox.png
-..\FritzBox\Skin\Blue3\Media\FritzBox\callin.png
-..\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\rejected.png
-..\FritzBox\Skin\Default\FritzManager.xml
-..\FritzBox\Skin\Default\Media\hover_FritzBox.png
-..\FritzBox\Skin\Default\Media\FritzBox\callin.png
-..\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\rejected.png
-..\FritzBox\Skin\DefaultWide\FritzManager.xml
-..\FritzBox\Skin\DefaultWide\Media\hover_FritzBox.png
-..\FritzBox\Skin\DefaultWide\Media\FritzBox\callin.png
-..\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\rejected.png
-..\FritzBox\Skin\Maya\FritzManager.xml
-..\FritzBox\Skin\Maya\Media\hover_FritzBox.png
-..\FritzBox\Skin\Maya\Media\FritzBox\callin.png
-..\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\rejected.png
-35 File(s) copied
-..\FritzBox\Languages\strings_de.xml
-..\FritzBox\Languages\strings_el.xml
-..\FritzBox\Languages\strings_en-US.xml
-..\FritzBox\Languages\strings_en.xml
-..\FritzBox\Languages\strings_es.xml
-..\FritzBox\Languages\strings_fr.xml
-..\FritzBox\Languages\strings_it.xml
-..\FritzBox\Languages\strings_nl.xml
-..\FritzBox\Languages\strings_ru.xml
-..\FritzBox\Languages\Unsupported\strings_bg.xml
-..\FritzBox\Languages\Unsupported\strings_ca.xml
-..\FritzBox\Languages\Unsupported\strings_cs.xml
-..\FritzBox\Languages\Unsupported\strings_cy-GB.xml
-..\FritzBox\Languages\Unsupported\strings_da.xml
-..\FritzBox\Languages\Unsupported\strings_et.xml
-..\FritzBox\Languages\Unsupported\strings_eu.xml
-..\FritzBox\Languages\Unsupported\strings_fi.xml
-..\FritzBox\Languages\Unsupported\strings_fo.xml
-..\FritzBox\Languages\Unsupported\strings_he.xml
-..\FritzBox\Languages\Unsupported\strings_hr.xml
-..\FritzBox\Languages\Unsupported\strings_hu.xml
-..\FritzBox\Languages\Unsupported\strings_id.xml
-..\FritzBox\Languages\Unsupported\strings_is.xml
-..\FritzBox\Languages\Unsupported\strings_ko.xml
-..\FritzBox\Languages\Unsupported\strings_mk.xml
-..\FritzBox\Languages\Unsupported\strings_no.xml
-..\FritzBox\Languages\Unsupported\strings_pl.xml
-..\FritzBox\Languages\Unsupported\strings_pt-BR.xml
-..\FritzBox\Languages\Unsupported\strings_pt.xml
-..\FritzBox\Languages\Unsupported\strings_ro.xml
-..\FritzBox\Languages\Unsupported\strings_sk.xml
-..\FritzBox\Languages\Unsupported\strings_sl.xml
-..\FritzBox\Languages\Unsupported\strings_sv.xml
-..\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 23:50:48
-Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
-Output: "..\MpeRelease\FritzBox.mpe1"
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/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2011-11-29 19:40:00 UTC (rev 4356)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2011-11-29 19:50:29 UTC (rev 4357)
@@ -559,7 +559,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.0</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4356</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -582,13 +582,13 @@
<Major>0</Major>
<Minor>3</Minor>
<Build>5</Build>
- <Revision>0</Revision>
+ <Revision>4356</Revision>
</Version>
<ExtensionDescription>This plugin is a combination of the former fritz call monitor and the new fritz manager.</ExtensionDescription>
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation />
- <ReleaseDate>2011-11-29T20:35:10.4484883+01:00</ReleaseDate>
+ <ReleaseDate>2011-11-29T20:48:23.2293344+01:00</ReleaseDate>
<Tags />
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
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.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/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_v0.3.5.0.mpe1
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/releases/FritzBox_v0.3.5.0.mpe1
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/releases/FritzBox_v0.3.5.4356.mpe1
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/releases/FritzBox_v0.3.5.4356.mpe1
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hor...@us...> - 2011-11-29 19:40:11
|
Revision: 4356
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4356&view=rev
Author: horned-reaper
Date: 2011-11-29 19:40:00 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat
trunk/plugins/FritzBox/FritzBox/FritzBox.cs
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs
trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/PhoneBook.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/PhonebookItem.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/VBReader.cs
trunk/plugins/FritzBox/FritzBox/Languages/strings_en-US.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_en.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.csproj.GenerateResource.Cache
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.pdb
trunk/plugins/FritzBox/MpeRelease/FritzBox.mpe1
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/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/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
Modified: trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat
===================================================================
--- trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat 2011-11-29 11:06:08 UTC (rev 4355)
+++ trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat 2011-11-29 19:40:00 UTC (rev 4356)
@@ -1,3 +1,6 @@
+D:
+cd \FritzBox\Build
+
@echo off
REM Select program path based on current machine environment
@@ -5,7 +8,7 @@
if not "%ProgramFiles(x86)%".=="". set ProgramDir=%ProgramFiles(x86)%
REM set logfile where the infos are written to, and clear that file
-set LOG=build_%BUILD_TYPE%.log
+set LOG=Build.log
echo. > %LOG%
echo.
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2011-11-29 11:06:08 UTC (rev 4355)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2011-11-29 19:40:00 UTC (rev 4356)
@@ -39,1385 +39,1398 @@
namespace FritzBox
{
- internal enum FritzBoxGuiMode
- {
- CallList = 0,
- VoiceBox = 1,
- PhoneBook = 2
- }
+ internal enum FritzBoxGuiMode
+ {
+ CallList = 0,
+ VoiceBox = 1,
+ PhoneBook = 2
+ }
- [PluginIcons("FritzBox.FritzBox.png", "FritzBox.FritzBoxDisabled.png")]
- public class FritzBox : GUIWindow, ISetupForm, IPlugin
- {
- static Logger Log = LoggerFactory.getLogger("FritzBox");
-
- #region CallMonitor
+ [PluginIcons("FritzBox.FritzBox.png", "FritzBox.FritzBoxDisabled.png")]
+ public class FritzBox : GUIWindow, ISetupForm, IPlugin
+ {
+ static Logger Log = LoggerFactory.getLogger("FritzBox");
- #region Variables
+ #region CallMonitor
- private readonly List<CallAction> _actionList = new List<CallAction>();
- private readonly List<CallAction> _notifyQueue = new List<CallAction>();
- private bool _showNotify = true;
- private object _tempNotify;
+ #region Variables
- private int notifyCount = 0;
+ private readonly List<CallAction> _actionList = new List<CallAction>();
+ private readonly List<CallAction> _notifyQueue = new List<CallAction>();
+ private bool _showNotify = true;
+ private object _tempNotify;
- #endregion Variables
+ private int notifyCount = 0;
- #region Properties
+ #endregion Variables
- public string ContactPicturesFolder
- {
- get { return Config.GetSubFolder(Config.Dir.Thumbs, "FritzBox.Contacts"); }
- }
-
- public string YacFolder
- {
- get { return Config.GetSubFolder(Config.Dir.Thumbs, "yac"); }
- }
+ #region Properties
- public string SkinMediaFolder
- {
- get { return Path.Combine(Config.GetSubFolder(Config.Dir.Skin, Settings.MediaPortalSkin), "Media"); }
- }
+ public string ContactPicturesFolder
+ {
+ get { return Config.GetSubFolder(Config.Dir.Thumbs, "FritzBox.Contacts"); }
+ }
- public string UnknownCallerImage
- {
- get
- {
- string filePath;
+ public string YacFolder
+ {
+ get { return Config.GetSubFolder(Config.Dir.Thumbs, "yac"); }
+ }
- // check if skin supports it's own images
- filePath = Utils.GetCoverArt(SkinMediaFolder, @"FritzBox\CallMonitor.Unknown");
- if (!String.IsNullOrEmpty(filePath)) return filePath;
+ public string SkinMediaFolder
+ {
+ get { return Path.Combine(Config.GetSubFolder(Config.Dir.Skin, Settings.MediaPortalSkin), "Media"); }
+ }
- // use new default image
- filePath = Utils.GetCoverArt(ContactPicturesFolder, @"FritzBox\CallMonitor.Unknown");
- if (!String.IsNullOrEmpty(filePath)) return filePath;
+ public string UnknownCallerImage
+ {
+ get
+ {
+ string filePath;
- // use old default image
- filePath = Utils.GetCoverArt(YacFolder, "_unknown");
- if (!String.IsNullOrEmpty(filePath)) return filePath;
+ // check if skin supports it's own images
+ filePath = Utils.GetCoverArt(SkinMediaFolder, @"FritzBox\CallMonitor.Unknown");
+ if (!String.IsNullOrEmpty(filePath)) return filePath;
- return String.Empty;
- }
- }
+ // use new default image
+ filePath = Utils.GetCoverArt(ContactPicturesFolder, @"FritzBox\CallMonitor.Unknown");
+ if (!String.IsNullOrEmpty(filePath)) return filePath;
- public string MissingCallerImage
- {
- get
- {
- string filePath;
+ // use old default image
+ filePath = Utils.GetCoverArt(YacFolder, "_unknown");
+ if (!String.IsNullOrEmpty(filePath)) return filePath;
- // check if skin supports it's own images
- filePath = Utils.GetCoverArt(SkinMediaFolder, @"FritzBox\CallMonitor.Missing");
- if (!String.IsNullOrEmpty(filePath)) return filePath;
+ return String.Empty;
+ }
+ }
- // use new default image
- filePath = Utils.GetCoverArt(ContactPicturesFolder, @"FritzBox\CallMonitor.Missing");
- if (!String.IsNullOrEmpty(filePath)) return filePath;
+ public string MissingCallerImage
+ {
+ get
+ {
+ string filePath;
- // use old default image
- filePath = Utils.GetCoverArt(YacFolder, "_noImage");
- if (!String.IsNullOrEmpty(filePath)) return filePath;
+ // check if skin supports it's own images
+ filePath = Utils.GetCoverArt(SkinMediaFolder, @"FritzBox\CallMonitor.Missing");
+ if (!String.IsNullOrEmpty(filePath)) return filePath;
- return String.Empty;
- }
- }
+ // use new default image
+ filePath = Utils.GetCoverArt(ContactPicturesFolder, @"FritzBox\CallMonitor.Missing");
+ if (!String.IsNullOrEmpty(filePath)) return filePath;
- #endregion
+ // use old default image
+ filePath = Utils.GetCoverArt(YacFolder, "_noImage");
+ if (!String.IsNullOrEmpty(filePath)) return filePath;
- #region Private Functions/Methods
+ return String.Empty;
+ }
+ }
- private void OnStartExternal(Process proc, bool waitForExit)
- {
- if (waitForExit) _showNotify = false;
- else _showNotify = true;
- }
+ #endregion
- private void OnStopExternal(Process proc, bool waitForExit)
- {
- _showNotify = true;
+ #region Private Functions/Methods
- //for (int i = 0; i < _notifyQueue.Count; i++)
- // OnFritzBoxEvent(_notifyQueue[i]);
+ private void OnStartExternal(Process proc, bool waitForExit)
+ {
+ if (waitForExit) _showNotify = false;
+ else _showNotify = true;
+ }
- _notifyQueue.Clear();
- }
+ private void OnStopExternal(Process proc, bool waitForExit)
+ {
+ _showNotify = true;
- private void OnCallAction(CallAction callAction)
- {
- Log.Info("FRITZ!Box: OnCallAction()");
- callAction.WriteToLog();
+ //for (int i = 0; i < _notifyQueue.Count; i++)
+ // OnFritzBoxEvent(_notifyQueue[i]);
- if (!_showNotify)
- {
- Log.Info("External process is running. Notify is queued and will be shown later.");
- _notifyQueue.Add(callAction);
- return;
- }
+ _notifyQueue.Clear();
+ }
- switch (callAction.Type)
- {
- case CallAction.CallType.Incoming:
- if (PhoneBook.Enabled) callAction.Caller = PhoneBook.GetCaller(phoneBook, callAction.Caller);
- OnCall(callAction);
- break;
- case CallAction.CallType.Outgoing:
- if (PhoneBook.Enabled) callAction.Caller = PhoneBook.GetCaller(phoneBook, callAction.Caller);
- OnCall(callAction);
- break;
- case CallAction.CallType.ConnectionStarted:
- break;
- case CallAction.CallType.ConnectionClosed:
- if (Settings.CloseOnConnectionClosed)
- {
- Log.Info("_closeOnConnectionClosed is enabled. Try to close active notify.");
+ private void OnCallAction(CallAction callAction)
+ {
+ Log.Info("FRITZ!Box: OnCallAction()");
+ callAction.WriteToLog();
+
+ if (!_showNotify)
+ {
+ Log.Info("external process is running. Notify is queued and will be shown later.");
+ _notifyQueue.Add(callAction);
+ return;
+ }
+
+ switch (callAction.Type)
+ {
+ case CallAction.CallType.Incoming:
+ if (PhoneBook.Enabled) callAction.Caller = PhoneBook.GetCaller(phoneBook, callAction.Caller);
+ OnCall(callAction);
+ break;
+ case CallAction.CallType.Outgoing:
+ if (PhoneBook.Enabled) callAction.Caller = PhoneBook.GetCaller(phoneBook, callAction.Caller);
+ OnCall(callAction);
+ break;
+ case CallAction.CallType.ConnectionStarted:
+ break;
+ case CallAction.CallType.ConnectionClosed:
+ if (Settings.CloseOnConnectionClosed)
+ {
+ Log.Info("_closeOnConnectionClosed is enabled. Try to close active notify.");
+ if (_tempNotify != 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);
+ }
+ }
+ break;
+ default:
+ Log.Error("incorrect callAction.Type");
+ break;
+ }
+ }
+
+ private void OnLogAction(FritzBoxClient.LogLevel logLevel, string logMessage)
+ {
+ switch (logLevel)
+ {
+ case FritzBoxClient.LogLevel.Debug:
+ Log.Debug(logMessage);
+ break;
+ case FritzBoxClient.LogLevel.Error:
+ Log.Error(logMessage);
+ break;
+ case FritzBoxClient.LogLevel.Warning:
+ Log.Warn(logMessage);
+ break;
+ case FritzBoxClient.LogLevel.Info:
+ Log.Info(logMessage);
+ break;
+ default:
+ break;
+ }
+ }
+
+ private void OnCall(CallAction callAction)
+ {
+ Log.Info("FRITZ!Box: OnCall()");
+
if (_tempNotify != 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("yet another dialog is active. action is sent to queue.");
+
+ if (_actionList.Count < Settings.MaxNotifies - 1) _actionList.Add(callAction);
+
+ return;
}
- }
- break;
- default:
- Log.Error("incorrect callAction.Type");
- break;
- }
- }
- private void OnLogAction(FritzBoxClient.LogLevel logLevel, string logMessage)
- {
- switch (logLevel)
- {
- case FritzBoxClient.LogLevel.Debug:
- Log.Debug(logMessage);
- break;
- case FritzBoxClient.LogLevel.Error:
- Log.Error(logMessage);
- break;
- case FritzBoxClient.LogLevel.Warning:
- Log.Warn(logMessage);
- break;
- case FritzBoxClient.LogLevel.Info:
- Log.Info(logMessage);
- break;
- default:
- break;
- }
- }
+ // config settings for dialog
+ string strHeading = string.Empty;
+ string strImage = string.Empty;
+ string strText = string.Empty;
- private void OnCall(CallAction callAction)
- {
- Log.Info("FRITZ!Box: OnCall()");
+ // set heading for NotifyDialog
+ switch (callAction.Type)
+ {
+ case CallAction.CallType.Incoming:
+ strHeading = GUILocalizeStrings.Get(1); // 1 = Incoming call
+ break;
+ case CallAction.CallType.Outgoing:
+ strHeading = GUILocalizeStrings.Get(2); // 2 = Outgoing call
+ break;
+ }
- if (_tempNotify != null)
- {
- Log.Info("yet another dialog is active. action is sent to queue.");
- if (_actionList.Count < Settings.MaxNotifies - 1) _actionList.Add(callAction);
- return;
- }
+ // set Image for NotifyDialog
+ strImage = GetCallerImage(callAction.Caller);
- // config settings for dialog
- string strHeading = string.Empty;
- string strImage = string.Empty;
- string strText = string.Empty;
-
- // set heading for NotifyDialog
- switch (callAction.Type)
- {
- case CallAction.CallType.Incoming:
- strHeading = GUILocalizeStrings.Get(1); // 1 = Incoming call
- break;
- case CallAction.CallType.Outgoing:
- strHeading = GUILocalizeStrings.Get(2); // 2 = Outgoing call
- break;
- }
+ // set message text for NotifyDialog
+ strText = Environment.NewLine;
- // set Image for NotifyDialog
- strImage = GetCallerImage(callAction.Caller);
+ if (callAction.Caller.ID == "") strText += GUILocalizeStrings.Get(3); // 3 = Unknown
+ else if (callAction.Caller.Name == "") strText += callAction.Caller.ID;
+ else
+ {
+ strText += callAction.Caller.Name;
- // set message text for NotifyDialog
- strText = Environment.NewLine;
- if (callAction.Caller.ID == "") strText += GUILocalizeStrings.Get(3); // 3 = Unknown
- else if (callAction.Caller.Name == "") strText += callAction.Caller.ID;
- else
- {
- strText += callAction.Caller.Name;
- if (Settings.ShowMSNOnNotify) strText += Environment.NewLine + callAction.Caller.ID;
- }
+ if (Settings.ShowMSNOnNotify) strText += Environment.NewLine + callAction.Caller.ID;
+ }
- // config settings for dialog FINISHED
+ // config settings for dialog FINISHED
- // if MSN is disabled, stop here
- if (!IsMsnEnabled(callAction.MSN)) return;
+ // if MSN is disabled, stop here
+ if (!IsMSNEnabled(callAction.MSN)) return;
- // if notifies are disabled for this call, stop here
- if (!IsCallerEnabled(callAction.Caller)) return;
-
- if (callAction.Type == CallAction.CallType.Incoming && Settings.IncomingSound != null && Settings.IncomingSound.Length > 0 ) Utils.PlaySound(Settings.IncomingSound, false, true);
+ // if notifies are disabled for this call, stop here
+ if (!IsCallerEnabled(callAction.Caller)) return;
- ShowNotify(strHeading, strImage, strText);
- }
+ if (callAction.Type == CallAction.CallType.Incoming && Settings.IncomingSound != null && Settings.IncomingSound.Length > 0) Utils.PlaySound(Settings.IncomingSound, false, true);
- #endregion
+ ShowNotify(strHeading, strImage, strText);
+ }
- #region Helper Methods
+ #endregion
- private string GetCallerImage(string callerId)
- {
- // search image for caller
- if (Settings.ExtensiveLogging)
- Log.Info("searching image for callerId: " + callerId);
+ #region Helper Methods
- string filePath;
+ private string GetCallerImage(string callerId)
+ {
+ // search image for caller
+ if (Settings.ExtensiveLogging)
+ Log.Info("searching image for callerId: " + callerId);
- // use new image path
- filePath = Utils.GetCoverArt(ContactPicturesFolder, callerId);
- if (!String.IsNullOrEmpty(filePath)) return filePath;
- Log.Info("found image not in: " + ContactPicturesFolder);
+ string filePath;
- // use old image path
- filePath = Utils.GetCoverArt(YacFolder, callerId);
- if (!String.IsNullOrEmpty(filePath)) return filePath;
- Log.Info("found image not in: " + YacFolder);
+ // use new image path
+ filePath = Utils.GetCoverArt(ContactPicturesFolder, callerId);
+ if (!String.IsNullOrEmpty(filePath)) return filePath;
+ Log.Info("found image not in: " + ContactPicturesFolder);
- return String.Empty;
- }
+ // use old image path
+ filePath = Utils.GetCoverArt(YacFolder, callerId);
+ if (!String.IsNullOrEmpty(filePath)) return filePath;
+ Log.Info("found image not in: " + YacFolder);
- private string GetCallerImage(Caller caller)
- {
- if (caller.ID == "")
- return UnknownCallerImage;
- else
- {
- string strImage = GetCallerImage(caller.Name);
+ return String.Empty;
+ }
- if (File.Exists(strImage))
+ private string GetCallerImage(Caller caller)
{
- if (Settings.ExtensiveLogging) Log.Info("found image for caller: " + strImage);
- else Log.Info("found image for caller");
+ if (caller.ID == "")
+ return UnknownCallerImage;
+ else
+ {
+ string strImage = GetCallerImage(caller.Name);
- return strImage;
+ if (File.Exists(strImage))
+ {
+ if (Settings.ExtensiveLogging) Log.Info("found image for caller: " + strImage);
+ else Log.Info("found image for caller");
+
+ return strImage;
+ }
+ else
+ {
+ Log.Info("found NO image for caller");
+ return MissingCallerImage;
+ }
+ }
}
- else
+
+ private bool IsMSNEnabled(string mSN)
{
- Log.Info("found NO image for caller");
- return MissingCallerImage;
+ if (!Settings.FilterMSN)
+ {
+ Log.Info("MSN filter is disabled.");
+ return true;
+ }
+
+ if (Settings.MSNList.Contains(mSN))
+ {
+ Log.Info("MSN is on list.");
+ return true;
+ }
+ else
+ {
+ Log.Info("MSN is not on list. Notify won't be shown.");
+ return false;
+ }
}
- }
- }
- private bool IsMsnEnabled(string msn)
- {
- if (!Settings.FilterMSN)
- {
- Log.Info("MSN filter is disabled.");
- return true;
- }
+ private bool IsCallerEnabled(Caller caller)
+ {
+ if (!PhoneBook.Enabled)
+ {
+ Log.Info("Phone book is disabled. Notify will be shown.");
+ return true;
+ }
+ else if (caller.Show) return true;
+ else return false;
+ }
- if (Settings.MSNList.Contains(msn))
- {
- Log.Info("MSN is on list.");
- return true;
- }
- else
- {
- Log.Info("MSN is not on list. Notify won't be shown.");
- return false;
- }
- }
+ private void ShowNotify(string strHeading, string strImage, string strText)
+ {
+ bool resumePlayer = false;
- private bool IsCallerEnabled(Caller caller)
- {
- if (!PhoneBook.Enabled)
- {
- Log.Info("Phone book is disabled. Notify will be shown.");
- return true;
- }
- else if (caller.Show) return true;
- else return false;
- }
+ if (notifyCount >= Settings.MaxNotifies) return;
- private void ShowNotify(string strHeading, string strImage, string strText)
- {
- bool resumePlayer = false;
+ // pause player
+ if (g_Player.Playing && !g_Player.Paused && Settings.StopMedia)
+ {
+ g_Player.Pause();
+ resumePlayer = true;
+ }
- if (notifyCount >= Settings.MaxNotifies) return;
+ // show dialog
+ GUIDialogNotify dlgNotify = (GUIDialogNotify)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_NOTIFY);
+ if (dlgNotify == null) return;
- // pause player
- if (g_Player.Playing && !g_Player.Paused && Settings.StopMedia)
- {
- g_Player.Pause();
- resumePlayer = true;
+ dlgNotify.Reset();
+ dlgNotify.ClearAll();
+ dlgNotify.SetHeading(strHeading);
+ dlgNotify.SetImage(strImage);
+ dlgNotify.SetText(strText);
+ if (Settings.CloseOnTimeout) dlgNotify.TimeOut = Settings.NotifyTimeout;
+ else dlgNotify.TimeOut = -1;
+
+ _tempNotify = dlgNotify;
+ dlgNotify.DoModal(GUIWindowManager.ActiveWindow);
+
+ // resume player
+ if (resumePlayer && g_Player.Playing && g_Player.Paused && Settings.StopMedia && Settings.ResumeMedia) g_Player.Pause();
+
+ _tempNotify = null;
+ if (_actionList.Count > 0)
+ {
+ CallAction tmpAction = _actionList[0];
+ _actionList.RemoveAt(0);
+ OnCallAction(tmpAction);
+ }
}
- // show dialog
- GUIDialogNotify dlgNotify = (GUIDialogNotify)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_NOTIFY);
- if (dlgNotify == null) return;
+ #endregion
- dlgNotify.Reset();
- dlgNotify.ClearAll();
- dlgNotify.SetHeading(strHeading);
- dlgNotify.SetImage(strImage);
- dlgNotify.SetText(strText);
- if (Settings.CloseOnTimeout) dlgNotify.TimeOut = Settings.NotifyTimeout;
- else dlgNotify.TimeOut = -1;
+ #endregion CallMonitor
- _tempNotify = dlgNotify;
- dlgNotify.DoModal(GUIWindowManager.ActiveWindow);
+ #region <Interface> Implementations
- // resume player
- if (resumePlayer && g_Player.Playing && g_Player.Paused && Settings.StopMedia && Settings.ResumeMedia) g_Player.Pause();
+ #region IPlugin Interface
- _tempNotify = null;
- if (_actionList.Count > 0)
+ /// <summary>
+ /// This method will be called by mediaportal to start your process plugin
+ /// </summary>
+ public void Start()
{
- CallAction tmpAction = _actionList[0];
- _actionList.RemoveAt(0);
- OnCallAction(tmpAction);
+ Log.Info("FRITZ!Box Plugin {0} starting.", Assembly.GetExecutingAssembly().GetName().Version);
+ Settings.Load();
+
+ Utils.OnStartExternal += OnStartExternal;
+ Utils.OnStopExternal += OnStopExternal;
+
+ FritzBoxClient.LogEvent += OnLogAction;
+ FritzBoxClient.CallEvent += OnCallAction;
+ FritzBoxClient.StartClient();
+
+ // start monitoring Windows power mode changes (Standby & Hibernate)
+ SystemEvents.PowerModeChanged += new PowerModeChangedEventHandler(SystemEvents_PowerModeChanged);
}
- }
- #endregion
+ /// <summary>
+ /// this method will be called by mediaportal to stop your process plugin
+ /// </summary>
+ public void Stop()
+ {
+ Log.Info("FRITZ!Box Plugin {0} stopping.", Assembly.GetExecutingAssembly().GetName().Version);
- #endregion CallMonitor
+ FritzBoxClient.StopClient();
+ FritzBoxClient.CallEvent -= OnCallAction;
+ FritzBoxClient.LogEvent -= OnLogAction;
- #region <Interface> Implementations
+ Utils.OnStartExternal -= OnStartExternal;
+ Utils.OnStopExternal -= OnStopExternal;
- #region IPlugin Interface
+ // stop monitoring power changes
+ SystemEvents.PowerModeChanged -= new PowerModeChangedEventHandler(SystemEvents_PowerModeChanged);
- /// <summary>
- /// This method will be called by mediaportal to start your process plugin
- /// </summary>
- public void Start()
- {
- Log.Info("FRITZ!Box Plugin {0} starting.", Assembly.GetExecutingAssembly().GetName().Version);
- Settings.Load();
+ PhoneBook.SaveSettings();
+ }
- Utils.OnStartExternal += OnStartExternal;
- Utils.OnStopExternal += OnStopExternal;
+ #endregion
- FritzBoxClient.LogEvent += OnLogAction;
- FritzBoxClient.CallEvent += OnCallAction;
- FritzBoxClient.StartClient();
+ #region ISetupForm Member
- // start monitoring Windows power mode changes (Standby & Hibernate)
- SystemEvents.PowerModeChanged += new PowerModeChangedEventHandler(SystemEvents_PowerModeChanged);
- }
+ /// <summary>
+ /// With GetID it will be an window-plugin / otherwise a process-plugin
+ /// Enter the id number here again
+ /// </summary>
+ public override int GetID
+ {
+ get { return GetWindowId(); }
+ set { }
+ }
- /// <summary>
- /// this method will be called by mediaportal to stop your process plugin
- /// </summary>
- public void Stop()
- {
- Log.Info("FRITZ!Box Plugin {0} stopping.", Assembly.GetExecutingAssembly().GetName().Version);
+ public string PluginName()
+ {
+ return "FRITZ!Box Manager";
+ }
- FritzBoxClient.StopClient();
- FritzBoxClient.CallEvent -= OnCallAction;
- FritzBoxClient.LogEvent -= OnLogAction;
+ public string Author()
+ {
+ return "chefkoch, S.Rinke";
+ }
- Utils.OnStartExternal -= OnStartExternal;
- Utils.OnStopExternal -= OnStopExternal;
+ public string Description()
+ {
+ return "Displays FRITZ!Box caller lists and voice box infos and notifies on incoming calls.";
+ }
- // stop monitoring power changes
- SystemEvents.PowerModeChanged -= new PowerModeChangedEventHandler(SystemEvents_PowerModeChanged);
+ public void ShowPlugin()
+ {
+ try
+ {
+ FritzBoxConfig config = new FritzBoxConfig();
+ config.ShowDialog();
+ }
+ catch (Exception ex)
+ {
+ Log.Error(ex.ToString());
+ }
+ }
- PhoneBook.SaveSettings();
- }
+ public bool CanEnable()
+ {
+ return true;
+ }
- #endregion
+ public int GetWindowId()
+ {
+ return 464554871;
+ }
- #region ISetupForm Member
+ public bool DefaultEnabled()
+ {
+ return true;
+ }
- /// <summary>
- /// With GetID it will be an window-plugin / otherwise a process-plugin
- /// Enter the id number here again
- /// </summary>
- public override int GetID
- {
- get { return GetWindowId(); }
- set { }
- }
+ public bool HasSetup()
+ {
+ return true;
+ }
- public string PluginName()
- {
- return "FRITZ!Box Manager";
- }
+ public bool GetHome(out string strButtonText, out string strButtonImage, out string strButtonImageFocus, out string strPictureImage)
+ {
+ strButtonText = GUILocalizeStrings.Get(28); // 28 = Telefon
+ strButtonImage = String.Empty;
+ strButtonImageFocus = String.Empty;
+ strPictureImage = "hover_FritzBox.png";
- public string Author()
- {
- return "chefkoch, S.Rinke";
- }
+ return true;
+ }
- public string Description()
- {
- return "Displays FRITZ!Box caller lists and voice box infos and notifies on incoming calls.";
- }
+ #endregion
- public void ShowPlugin()
- {
- try
- {
- FritzBoxConfig config = new FritzBoxConfig();
- config.ShowDialog();
- }
- catch (Exception ex)
- {
- Log.Error(ex.ToString());
- }
- }
+ #endregion
- public bool CanEnable()
- {
- return true;
- }
+ #region FritzManager
- public int GetWindowId()
- {
- return 464554871;
- }
+ #region enums
- public bool DefaultEnabled()
- {
- return true;
- }
+ #region Nested type: Filter
- public bool HasSetup()
- {
- return true;
- }
+ private enum Filter
+ {
+ All = 0,
+ Incoming = 1,
+ Outgoing = 2,
+ Rejected = 3
+ }
- public bool GetHome(out string strButtonText, out string strButtonImage, out string strButtonImageFocus, out string strPictureImage)
- {
- strButtonText = GUILocalizeStrings.Get(28); // 28 = Telefon
- strButtonImage = String.Empty;
- strButtonImageFocus = String.Empty;
- strPictureImage = "hover_FritzBox.png";
+ #endregion
- return true;
- }
+ #region Nested type: View
- #endregion
+ private enum View
+ {
+ List = 0,
+ Icons = 1,
+ LargeIcons = 2,
+ }
- #endregion
+ #endregion
- #region FritzManager
+ #endregion
- #region enums
+ #region skin
- #region Nested type: Filter
+ [SkinControl(3)]
+ protected GUISortButtonControl btnFilter;
+ [SkinControl(4)]
+ protected GUIButtonControl btnModus;
+ [SkinControl(9)]
+ protected GUIButtonControl btnUpdate;
+ [SkinControl(2)]
+ protected GUIButtonControl btnViewAs;
+ [SkinControl(50)]
+ protected GUIFacadeControl facadeView;
+ [SkinControl(4711)]
+ protected GUIFadeLabel headerLabel;
- private enum Filter
- {
- All = 0,
- Incoming = 1,
- Outgoing = 2,
- Rejected = 3
- }
+ #endregion
- #endregion
+ #region fields
- #region Nested type: View
+ // update timer for background thread
+ private static System.Timers.Timer updateTimer = new System.Timers.Timer();
+ // path to voice box files
+ private string vBPath;
+ // FRITZBox password
+ private string passwd;
+ // list of call items (callers)
+ private List<CallItem> callItemList;
+ // filter on callitems used in list view
+ private Filter currentFilter = Filter.All;
+ // what kind of items is shown (callers, phoneBook, voicebox)
+ private FritzBoxGuiMode currentMode = FritzBoxGuiMode.CallList;
+ // state of facede view
+ private View currentView = View.List;
+ // list of tmp files to delete when deinit
+ // TODO should called in timer callback also
+ private List<string> filesToDelete = new List<string>();
+ // FritzBox WebGUI Client
+ private Fritz fritz;
+ // stores mapped msns
+ private HashMap<string, string> msns = new HashMap<string, string>();
+ // phone book
+ public HashMap<string, PhonebookItem> phoneBook = new HashMap<string, PhonebookItem>();
+ // dirty marker, if set the timer task will save phoneBook
+ private volatile bool phoneBookDirty;
+ // stores pathname for internal pb save file
+ private string phoneBookPath;
+ private string mediaPortalLanguage;
+ // if set true, use revers lookup
+ private bool useInversSearch;
+ // list of voivebox messages
+ private List<VoiceBoxItem> voiceboxItemList;
+ // worker for task
+ private BackGroundWorker worker;
+ // and the thread
+ private Thread workerThread;
- private enum View
- {
- List = 0,
- Icons = 1,
- LargeIcons = 2,
- }
+ #endregion
- #endregion
+ // the instance
+ private static FritzBox thePlugin;
+ // fritz phoneBook
+ protected FritzPhonebooks fritzPhonebooks = new FritzPhonebooks();
+ // sync the access to phoneBook / calllist
+ private System.Object sync = new System.Object();
- #endregion
+ public override bool Init()
+ {
+ Start();
+ updateGUIProperties(0, 0, "");
+ loadConfig();
+ GUILocalizeStrings.ChangeLanguage(mediaPortalLanguage);
- #region skin
+ return Load(GUIGraphicsContext.Skin + @"\FritzManager.xml");
+ }
- [SkinControl(3)] protected GUISortButtonControl btnFilter;
- [SkinControl(4)] protected GUIButtonControl btnModus;
- [SkinControl(9)] protected GUIButtonControl btnUpdate;
- [SkinControl(2)] protected GUIButtonControl btnViewAs;
- [SkinControl(50)] protected GUIFacadeControl facadeView;
- [SkinControl(4711)] protected GUIFadeLabel headerLabel;
+ private void startBackGroundWorker(InversSearch search)
+ {
+ if (worker == null)
+ {
+ worker = new BackGroundWorker(fritz, this, search);
+ workerThread = new Thread(worker.Run);
+ workerThread.Start();
+ }
+ }
- #endregion
+ public override void DeInit()
+ {
+ cleanup();
- #region fields
+ if (worker != null)
+ {
+ worker.stop();
+ workerThread.Abort();
+ }
- // update timer for background thread
- private static System.Timers.Timer updateTimer = new System.Timers.Timer();
- // path to voice box files
- private string vBPath;
- // FRITZBox password
- private string passwd;
- // list of call items (callers)
- private List<CallItem> callItemList;
- // filter on callitems used in list view
- private Filter currentFilter = Filter.All;
- // what kind of items is shown (callers, phoneBook, voicebox)
- private FritzBoxGuiMode currentMode = FritzBoxGuiMode.CallList;
- // state of facede view
- private View currentView = View.List;
- // list of tmp files to delete when deinit
- // TODO should called in timer callback also
- private List<string> filesToDelete = new List<string>();
- // FritzBox WebGUI Client
- private Fritz fritz;
- // stores mapped msns
- private HashMap<string, string> msns = new HashMap<string, string>();
- // phone book
- public HashMap<string, PhonebookItem> phoneBook = new HashMap<string, PhonebookItem>();
- // dirty marker, if set the timer task will save phoneBook
- private volatile bool phoneBookDirty;
- // stores pathname for internal pb save file
- private string phoneBookPath;
- private string mediaPortalLanguage;
- // if set true, use revers lookup
- private bool useInversSearch;
- // list of voivebox messages
- private List<VoiceBoxItem> voiceboxItemList;
- // worker for task
- private BackGroundWorker worker;
- // and the thread
- private Thread workerThread;
+ Stop();
- #endregion
+ // persist some props for next time
+ Log.Debug("DeInit called: persisting current props");
+ using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml")))
+ {
+ xmlwriter.SetValue("FritzManager", "currentMode", (int)currentFilter);
+ xmlwriter.SetValue("FritzManager", "currentFilter", (int)currentMode);
+ }
- // the instance
- private static FritzBox thePlugin;
- // fritz phoneBook
- protected FritzPhonebooks fritzPhonebooks = new FritzPhonebooks();
- // sync the access to phoneBook / calllist
- private System.Object sync = new System.Object();
+ base.DeInit();
+ }
- public override bool Init()
- {
- Start();
- updateGUIProperties(0,0,"");
- loadConfig();
- GUILocalizeStrings.ChangeLanguage(mediaPortalLanguage);
+ protected void loadConfig()
+ {
+ string dialport = "0";
+ string areacode = "";
- return Load(GUIGraphicsContext.Skin + @"\FritzManager.xml");
- }
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MediaPortal.xml"))
+ {
+ phoneBookPath = Config.GetFolder(Config.Dir.Config) + "\\fritzmanagerPhonebook.xml";
+ mediaPortalLanguage = xmlreader.GetValue("gui", "language");
- private void startBackGroundWorker(InversSearch search)
- {
- if (worker == null)
- {
- worker = new BackGroundWorker(fritz, this, search);
- workerThread = new Thread(worker.Run);
- workerThread.Start();
- }
- }
+ passwd = xmlreader.GetValue("FritzManager", "passwd");
+ vBPath = xmlreader.GetValue("FritzManager", "vBPath");
+ dialport = xmlreader.GetValue("FritzManager", "dialport");
+ useInversSearch = xmlreader.GetValueAsBool("FritzManager", "useInversSearch", true);
+ areacode = xmlreader.GetValue("FritzManager", "defaultAreacode");
- public override void DeInit()
- {
- cleanup();
+ string str = xmlreader.GetValue("FritzManager", "currentMode");
- if (worker != null)
- {
- worker.stop();
- workerThread.Abort();
- }
+ if (str != null && str != "") currentMode = (FritzBoxGuiMode)System.Enum.Parse(typeof(FritzBoxGuiMode), str);
- Stop();
+ str = xmlreader.GetValue("FritzManager", "currentFilter");
- // persist some props for next time
- Log.Debug("DeInit called: persisting current props" );
- using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml")))
- {
- xmlwriter.SetValue("FritzManager", "currentMode", (int)currentFilter);
- xmlwriter.SetValue("FritzManager", "currentFilter", (int)currentMode);
- }
-
- base.DeInit();
- }
-
- protected void loadConfig()
- {
- string dialport = "0";
- string areacode = "";
+ if (str != null && str != "") currentFilter = (Filter)System.Enum.Parse(typeof(Filter), str);
- using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MediaPortal.xml"))
- {
- phoneBookPath = Config.GetFolder(Config.Dir.Config) + "\\fritzmanagerPhonebook.xml";
- mediaPortalLanguage = xmlreader.GetValue("gui", "language");
+ int interval = xmlreader.GetValueAsInt("FritzManager", "updateInterval", 0);
- passwd = xmlreader.GetValue("FritzManager", "passwd");
- vBPath = xmlreader.GetValue("FritzManager", "vBPath");
- dialport = xmlreader.GetValue("FritzManager", "dialport");
- useInversSearch = xmlreader.GetValueAsBool("FritzManager", "useInversSearch", true);
- areacode = xmlreader.GetValue("FritzManager", "defaultAreacode");
+ if (interval != 0)
+ {
+ thePlugin = this;
+ updateTimer.Interval = interval * 1000; // interval is in sec
+ updateTimer.Elapsed += OnTimedEvent;
+ updateTimer.Enabled = true;
+ }
+ }
- string str = xmlreader.GetValue("FritzManager", "currentMode");
+ fritz = new Fritz(passwd, Config.GetFolder(Config.Dir.Config), FritzBoxClient.Address, dialport);
- if (str != null && str != "") currentMode = (FritzBoxGuiMode)System.Enum.Parse(typeof(FritzBoxGuiMode), str);
-
- str = xmlreader.GetValue("FritzManager", "currentFilter");
+ initMSN();
- if (str != null && str != "") currentFilter = (Filter)System.Enum.Parse(typeof(Filter), str);
+ InversSearch search = new InversSearchOert(areacode);
- int interval = xmlreader.GetValueAsInt("FritzManager", "updateInterval", 0);
+ startBackGroundWorker(search);
+ }
- if (interval != 0)
+ protected override void OnPageLoad()
{
- thePlugin = this;
- updateTimer.Interval = interval * 1000; // interval is in sec
- updateTimer.Elapsed += OnTimedEvent;
- updateTimer.Enabled = true;
- }
- }
-
- fritz = new Fritz(passwd, Config.GetFolder(Config.Dir.Config), FritzBoxClient.Address, dialport);
+ phoneBook = InternalPhoneBook.loadPhoneBook(phoneBookPath);
- initMSN();
+ update(false);
- InversSearch search = new InversSearchOert(areacode);
+ if (currentMode == FritzBoxGuiMode.VoiceBox) worker.queue.Enqueue(new Task(Task.TaskAction.LoadCallItems, null));
- startBackGroundWorker(search);
- }
+ ShowThumbPanel();
- protected override void OnPageLoad()
- {
- phoneBook = InternalPhoneBook.loadPhoneBook(phoneBookPath);
-
- update(false);
-
- if (currentMode == FritzBoxGuiMode.VoiceBox) worker.queue.Enqueue(new Task(Task.TaskAction.LoadCallItems, null));
-
- ShowThumbPanel();
- }
+ if (String.IsNullOrEmpty(passwd) && String.IsNullOrEmpty(vBPath)) ShowError(GUILocalizeStrings.Get(24)); // 24 = "Could not load phone book"
+ }
- private static void OnTimedEvent(object source, System.Timers.ElapsedEventArgs e)
- {
- Log.Debug("FritzBox Manager processing timer event");
+ private static void OnTimedEvent(object source, System.Timers.ElapsedEventArgs e)
+ {
+ Log.Debug("FritzBox Manager processing timer event");
- if (thePlugin.phoneBookDirty)
- {
- thePlugin.phoneBookDirty = false;
- InternalPhoneBook.savePhonebook(thePlugin.phoneBook.Values, thePlugin.phoneBookPath);
- }
+ if (thePlugin.phoneBookDirty)
+ {
+ thePlugin.phoneBookDirty = false;
+ InternalPhoneBook.savePhonebook(thePlugin.phoneBook.Values, thePlugin.phoneBookPath);
+ }
- thePlugin.fritz.keepAlive();
+ thePlugin.fritz.keepAlive();
- List<VoiceBoxItem> items = VBReader.loadVoiceBoxDir(thePlugin.vBPath);
+ List<VoiceBoxItem> items = VBReader.loadVoiceBoxDir(thePlugin.vBPath);
- int newItems = 0;
- string caller = null;
+ int newItems = 0;
+ string caller = null;
- foreach(VoiceBoxItem item in items)
- {
- if (item.isNew != 0 && item.type == 3)
+ foreach (VoiceBoxItem item in items)
+ {
+ if (item.isNew != 0 && item.type == 3)
+ {
+ if (caller == null) caller = thePlugin.lookupCaller(item.callerId);
+ newItems++;
+ }
+ }
+
+ thePlugin.updateGUIProperties(newItems, items.Count, caller);
+ }
+
+ protected void initMSN()
{
- if (caller == null ) caller = thePlugin.lookupCaller(item.callerId);
- newItems++;
+ // populate MSNs
+ if (File.Exists(Config.GetFolder(Config.Dir.Config) + "\\fritzmanager_msns.txt"))
+ {
+ using (StreamReader sr = new StreamReader(Config.GetFolder(Config.Dir.Config) + "\\fritzmanager_msns.txt"))
+ {
+ while (!sr.EndOfStream)
+ {
+ string line = sr.ReadLine();
+ string[] items = line.Split('=');
+ if (items.GetLength(0) > 1) msns.Add(items[0], items[1]);
+ }
+ }
+ }
}
- }
- thePlugin.updateGUIProperties(newItems, items.Count, caller);
- }
+ protected override void OnPageDestroy(int new_windowId)
+ {
+ cleanup();
+ base.OnPageDestroy(new_windowId);
+ }
- protected void initMSN()
- {
- // populate MSNs
- if (File.Exists(Config.GetFolder(Config.Dir.Config) + "\\fritzmanager_msns.txt"))
- {
- using (StreamReader sr = new StreamReader(Config.GetFolder(Config.Dir.Config) + "\\fritzmanager_msns.txt"))
+ /// <summary>
+ /// deletes temp files (decoded voicebox messages)
+ /// </summary>
+ private void cleanup()
{
- while (!sr.EndOfStream)
- {
- string line = sr.ReadLine();
- string[] items = line.Split('=');
- if (items.GetLength(0) > 1) msns.Add(items[0], items[1]);
- }
+ // cleanup temp
+ foreach (string file in filesToDelete)
+ {
+ File.Delete(file);
+ }
+
+ filesToDelete.Clear();
}
- }
- }
- protected override void OnPageDestroy(int new_windowId)
- {
- cleanup();
- base.OnPageDestroy(new_windowId);
- }
+ /// <summary>
+ /// update data for the views.
+ /// </summary>
+ /// <param name="forceReload">if set the update is forced, and data will be fetched in
+ /// any case.</param>
+ protected void update(bool forceReload)
+ {
+ if (currentMode == FritzBoxGuiMode.CallList) loadCallListFromFritzbox(forceReload);
+ else if (currentMode == FritzBoxGuiMode.VoiceBox) voiceboxItemList = VBReader.loadVoiceBoxDir(vBPath);
+ else if (currentMode == FritzBoxGuiMode.PhoneBook)
+ {
+ string str = fritz.loadPhoneBook();
- /// <summary>
- /// deletes temp files (decoded voicebox messages)
- /// </summary>
- private void cleanup()
- {
- // cleanup temp
- foreach (string file in filesToDelete)
- {
- File.Delete(file);
- }
+ if (str != "")
+ {
+ XmlSerializer s = new XmlSerializer(typeof(FritzPhonebooks));
+ fritzPhonebooks = (FritzPhonebooks)s.Deserialize(new StringReader(str));
+ }
+ }
- filesToDelete.Clear();
- }
+ refreshView();
- /// <summary>
- /// update data for the views.
- /// </summary>
- /// <param name="forceReload">if set the update is forced, and data will be fetched in
- /// any case.</param>
- protected void update(bool forceReload)
- {
- if (currentMode == FritzBoxGuiMode.CallList) loadCallListFromFritzbox(forceReload);
- else if (currentMode == FritzBoxGuiMode.VoiceBox)
- {
- if (!String.IsNullOrEmpty(vBPath)) voiceboxItemList = VBReader.loadVoiceBoxDir(vBPath);
- else
- {
- Log.Debug("voice box path is not set");
- return;
- }
- }
- else if (currentMode == FritzBoxGuiMode.PhoneBook)
- {
- string str = fritz.loadPhoneBook();
+ UpdateButtonStates();
+ }
- if (str == "") ShowError(GUILocalizeStrings.Get(24)); // 24 = "Could not load phone book"
- else
+ /// <summary>
+ /// refreshes the view. call when backing lists / maps have changed
+ /// </summary>
+ protected void refreshView()
{
- XmlSerializer s = new XmlSerializer(typeof (FritzPhonebooks));
- fritzPhonebooks = (FritzPhonebooks) s.Deserialize(new StringReader(str));
+ if (currentMode == FritzBoxGuiMode.CallList) populateCallItems();
+ else if (currentMode == FritzBoxGuiMode.VoiceBox) populateVoiceBoxItems();
+ else if (currentMode == FritzBoxGuiMode.PhoneBook) populatePhonebookItems();
}
- }
- refreshView();
+ /// <summary>
+ /// load internal callers list from csv contained in data
+ /// </summary>
+ /// <param name="data">holds csv list</param>
+ public void refreshCallData(byte[] data)
+ {
+ lock (sync)
+ {
+ callItemList = CallItem.load(new MemoryStream(data));
- UpdateButtonStates();
- }
+ // populate phone book
+ bool updatePhonebook = false;
+ int idx = 0;
- /// <summary>
- /// refreshes the view. call when backing lists / maps have changed
- /// </summary>
- protected void refreshView()
- {
- if (currentMode == FritzBoxGuiMode.CallList) populateCallItems();
- else if (currentMode == FritzBoxGuiMode.VoiceBox) populateVoiceBoxItems();
- else if (currentMode == FritzBoxGuiMode.PhoneBook) populatePhonebookItems();
- }
+ foreach (CallItem i in callItemList)
+ {
+ PhonebookItem pi = phoneBook[i.number];
- /// <summary>
- /// load internal callers list from csv contained in data
- /// </summary>
- /// <param name="data">holds csv list</param>
- public void refreshCallData(byte[] data)
- {
- lock (sync)
- {
- callItemList = CallItem.load(new MemoryStream(data));
+ if (pi == null)
+ {
+ pi = new PhonebookItem();
+ pi.number = i.number;
+ phoneBook[i.number] = pi;
+ }
- // populate phoneBook
- bool updatePhonebook = false;
- int idx = 0;
+ if (i.name != "" && pi.name != i.name)
+ {
+ pi.name = i.name;
+ pi.fritzEntry = true;
+ pi.inverseLookupDone = false;
+ updatePhonebook = true;
+ }
+ else if (useInversSearch && !pi.inverseLookupDone && !pi.fritzEntry && i.number != "") worker.queue.Enqueue(new Task(Task.TaskAction.InversLookup, new object[] { i.number, idx }));
- foreach (CallItem i in callItemList)
- {
- PhonebookItem pi = phoneBook[i.number];
+ idx++;
+ }
- if (pi == null)
- {
- pi = new PhonebookItem();
- pi.number = i.number;
- phoneBook[i.number] = pi;
- }
+ if (updatePhonebook) InternalPhoneBook.savePhonebook(phoneBook.Values, phoneBookPath);
+ }
- if (i.name != "" && pi.name != i.name)
- {
- pi.name = i.name;
- pi.fritzEntry = true;
- pi.inverseLookupDone = false;
- updatePhonebook = true;
- }
- else if (useInversSearch && !pi.inverseLookupDone && !pi.fritzEntry && i.number != "") worker.queue.Enqueue(new Task(Task.TaskAction.InversLookup, new object[] { i.number, idx }));
-
- idx++;
+ refreshView();
}
- if (updatePhonebook) InternalPhoneBook.savePhonebook(phoneBook.Values, phoneBookPath);
- }
-
- refreshView();
- }
-
- public void updatePhonebook(string number, string name, int index)
- {
- if (name != null && name != "" && phoneBook.Contains(number))
- {
- lock (sync)
+ public void updatePhonebook(string number, string name, int index)
{
- phoneBook[number].inverseLookupDone = true;
- phoneBookDirty = true;
+ if (name != null && name != "" && phoneBook.Contains(number))
+ {
+ lock (sync)
+ {
+ phoneBook[number].inverseLookupDone = true;
+ phoneBookDirty = true;
- if (name != number)
- {
- // search without result
- phoneBook[number].name = name;
+ if (name != number)
+ {
+ // search without result
+ phoneBook[number].name = name;
- if (currentMode == FritzBoxGuiMode.CallList)
- {
- GUIListItem item = facadeView[index];
+ if (currentMode == FritzBoxGuiMode.CallList)
+ {
+ GUIListItem item = facadeView[index];
- if (item != null)
- {
- Log.Debug("replacing label {0} with {1}", item.Label2, name);
- string l = name;
+ if (item != null)
+ {
+ Log.Debug("replacing label {0} with {1}", item.Label2, name);
+ string l = name;
- if (l.Length > 30) l = name.Substring(0, 30);
+ if (l.Length > 30) l = name.Substring(0, 30);
- item.Label2 = l;
- }
+ item.Label2 = l;
+ }
+ }
+ }
+ }
}
- }
}
- }
- }
- protected void loadCallListFromFritzbox(bool forceReload)
- {
- GUIWaitCursor.Show();
- try
- {
- Log.Debug("load callitem from fritzbox");
- byte[] data = fritz.loadCallListData(forceReload);
- refreshCallData(data);
- }
- catch (Exception e)
- {
- Log.Debug("Exception {0}", e.Message);
- }
- GUIWaitCursor.Hide();
- }
+ protected void loadCallListFromFritzbox(bool forceReload)
+ {
+ if (!String.IsNullOrEmpty(passwd))
+ {
+ GUIWaitCursor.Show();
- protected string decode(VoiceBoxItem item)
- {
- System.Diagnostics.Process proc = new System.Diagnostics.Process();
- proc.EnableRaisingEvents = false;
- proc.StartInfo.FileName = "speexdec";
- string target = Path.GetTempPath() + item.seq + ".wav";
- proc.StartInfo.Arguments = "\"" + vBPath + "\\rec\\" + item.filename + "\" \"" + target + "\"";
- proc.StartInfo.WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden;
+ try
+ {
+ Log.Debug("load call list from FritzBox");
- proc.Start();
- proc.WaitForExit();
- proc.Close();
+ byte[] data = fritz.loadCallListData(forceReload);
- filesToDelete.Add(target);
+ refreshCallData(data);
+ }
+ catch (Exception e)
+ {
+ Log.Debug("Exception {0}", e.Message);
+ }
- return target;
- }
+ GUIWaitCursor.Hide();
+ }
+ else Log.Debug("FritzBox password is not set. Call list cannot be loaded");
+ }
- protected void populatePhonebookItems()
- {
- facadeView.Clear();
-
- if (fritzPhonebooks.Items == null || fritzPhonebooks.Items.GetLength(0) == 0)
- {
- Log.Debug("no fritz phone book items found");
+ protected string decode(VoiceBoxItem item)
+ {
+ System.Diagnostics.Process proc = new System.Diagnostics.Process();
+ proc.EnableRaisingEvents = false;
+ proc.StartInfo.FileName = "speexdec";
+ string target = Path.GetTempPath() + item.seq + ".wav";
+ proc.StartInfo.Arguments = "\"" + vBPath + "\\rec\\" + item.filename + "\" \"" + target + "\"";
+ proc.StartInfo.WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden;
- return;
- }
-
- Phonebook p = fritzPhonebooks.Items[0]; // always choose first phone book
- int i = 0;
- string thumbDir = Config.GetFolder(Config.Dir.Thumbs) + "\\yac\\";
+ proc.Start();
+ proc.WaitForExit();
+ proc.Close();
- foreach (Contact c in p.contact)
- {
- string name = c.person[0].realName;
+ filesToDelete.Add(target);
- foreach (TelephonyNumber number in c.telephony)
- {
- GUIListItem elem = new GUIListItem();
- elem.Label = name;
- elem.Label2 = number.Value;
-
- if (elem.Label2.Length > 0)
- {
- if (File.Exists(thumbDir + c.person[0].realName + ".jpg")) elem.ThumbnailImage = thumbDir + c.person[0].realName + ".jpg";
- else elem.ThumbnailImage = thumbDir + "_noImage.png";
-
- elem.Path = Convert.ToString(i++);
-
- facadeView.Add(elem);
- }
+ return target;
}
- }
- }
- /// <summary>
- /// fill in voice box i...
[truncated message content] |
|
From: <hor...@us...> - 2011-11-29 11:06:24
|
Revision: 4355
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4355&view=rev
Author: horned-reaper
Date: 2011-11-29 11:06:08 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------
Added Paths:
-----------
trunk/plugins/FritzBox/Build/
trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat
trunk/plugins/FritzBox/Build/DeployVersionSVN.exe
trunk/plugins/FritzBox/Build/build_.log
trunk/plugins/FritzBox/Build/filever.exe
trunk/plugins/FritzBox/FritzBox/FritzBox.csproj.user
trunk/plugins/FritzBox/FritzBox/FritzManager/VBReader.cs
trunk/plugins/FritzBox/FritzBox/Languages/
trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/
trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_bg.xml
trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_ca.xml
trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_cs.xml
trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_cy-GB.xml
trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_da.xml
trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_et.xml
trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_eu.xml
trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_fi.xml
trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_fo.xml
trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_he.xml
trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_hr.xml
trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_hu.xml
trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_id.xml
trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_is.xml
trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_ko.xml
trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_mk.xml
trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_no.xml
trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_pl.xml
trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_pt-BR.xml
trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_pt.xml
trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_ro.xml
trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_sk.xml
trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_sl.xml
trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_sv.xml
trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_tr.xml
trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_uk.xml
trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_zh-CN.xml
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/Resources/ContactImages/
trunk/plugins/FritzBox/FritzBox/Resources/MpeRelease/
trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/
trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/CallMonitor.Missing.png
trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/CallMonitor.Unknown.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/
trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/CallMonitor.Missing.png
trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/CallMonitor.Unknown.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/
trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml
trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/
trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/
trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/CallMonitor.Missing.png
trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/CallMonitor.Unknown.png
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/Default/Media/hover_FritzBox.png
trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/
trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml
trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/
trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/
trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/CallMonitor.Missing.png
trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/CallMonitor.Unknown.png
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/DefaultWide/Media/hover_FritzBox.png
trunk/plugins/FritzBox/FritzBox/Skin/GenericSkin/
trunk/plugins/FritzBox/FritzBox/Skin/GenericSkin/Media/
trunk/plugins/FritzBox/FritzBox/Skin/Maya/
trunk/plugins/FritzBox/FritzBox/Skin/Maya/FritzManager.xml
trunk/plugins/FritzBox/FritzBox/Skin/Maya/Media/
trunk/plugins/FritzBox/FritzBox/Skin/Maya/Media/FritzBox/
trunk/plugins/FritzBox/FritzBox/Skin/Maya/Media/FritzBox/CallMonitor.Missing.png
trunk/plugins/FritzBox/FritzBox/Skin/Maya/Media/FritzBox/CallMonitor.Unknown.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/Maya/Media/hover_FritzBox.png
trunk/plugins/FritzBox/FritzBox/bin/
trunk/plugins/FritzBox/FritzBox/bin/Release/
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/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.pdb
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/FritzBox/docs/Install-de.txt
trunk/plugins/FritzBox/FritzBox/obj/
trunk/plugins/FritzBox/FritzBox/obj/Debug/
trunk/plugins/FritzBox/FritzBox/obj/Debug/DesignTimeResolveAssemblyReferences.cache
trunk/plugins/FritzBox/FritzBox/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
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.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Debug/GenerateResource.read.1.tlog
trunk/plugins/FritzBox/FritzBox/obj/Debug/GenerateResource.write.1.tlog
trunk/plugins/FritzBox/FritzBox/obj/Debug/ResolveAssemblyReference.cache
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/
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/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Release/ResolveAssemblyReference.cache
trunk/plugins/FritzBox/FritzBox.5.1.resharper
trunk/plugins/FritzBox/MP2version/
trunk/plugins/FritzBox/MP2version/CallMonitor.cs
trunk/plugins/FritzBox/MP2version/CallMonitor.csproj
trunk/plugins/FritzBox/MP2version/CallMonitor.plugin
trunk/plugins/FritzBox/MP2version/HelperClasses/
trunk/plugins/FritzBox/MP2version/HelperClasses/CallAction.cs
trunk/plugins/FritzBox/MP2version/HelperClasses/Caller.cs
trunk/plugins/FritzBox/MP2version/HelperClasses/ICallMonitor.cs
trunk/plugins/FritzBox/MP2version/HelperClasses/IListener.cs
trunk/plugins/FritzBox/MP2version/ListenerBuilder.cs
trunk/plugins/FritzBox/MP2version/Listeners/
trunk/plugins/FritzBox/MP2version/Listeners/BlueTooth_USB/
trunk/plugins/FritzBox/MP2version/Listeners/BlueTooth_USB/BlueTooth_USB.cs
trunk/plugins/FritzBox/MP2version/Listeners/BlueTooth_USB/BlueTooth_USB.csproj
trunk/plugins/FritzBox/MP2version/Listeners/BlueTooth_USB/BlueTooth_USB.plugin
trunk/plugins/FritzBox/MP2version/Listeners/BlueTooth_USB/Helper/
trunk/plugins/FritzBox/MP2version/Listeners/BlueTooth_USB/Helper/ATcommand.cs
trunk/plugins/FritzBox/MP2version/Listeners/FritzBox/
trunk/plugins/FritzBox/MP2version/Listeners/FritzBox/FritzBox.cs
trunk/plugins/FritzBox/MP2version/Listeners/FritzBox/FritzBox.csproj
trunk/plugins/FritzBox/MP2version/Listeners/FritzBox/FritzBox.plugin
trunk/plugins/FritzBox/MP2version/Listeners/FritzBox/Properties/
trunk/plugins/FritzBox/MP2version/Listeners/FritzBox/Properties/AssemblyInfo.cs
trunk/plugins/FritzBox/MP2version/Properties/
trunk/plugins/FritzBox/MP2version/Properties/AssemblyInfo.cs
trunk/plugins/FritzBox/MpeRelease/
trunk/plugins/FritzBox/MpeRelease/FritzBox.mpe1
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/FritzBoxConfigTester.csproj.user
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/AxInterop.WMPLib.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/Bass.Net.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/BassRegistration.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/BassVisAPI.Net.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/Common.Utils.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/Core.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/Dialogs.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/DirectShowLib.dll
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.exe.config
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/Interop.SHDocVw.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/Interop.WMPLib.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/Ionic.Zip.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/MediaPortal.Support.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/Utils.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/edtftpnet-1.2.2.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/log4net.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Debug/taglib-sharp.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/
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/obj/
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/
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/FritzBoxConfigTester/obj/Debug/ResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/TempPE/
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/
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.user
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/AxInterop.WMPLib.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/Bass.Net.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/BassRegistration.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/BassVisAPI.Net.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/Common.Utils.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/Core.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/Dialogs.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/DirectShowLib.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/Interop.SHDocVw.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/Interop.WMPLib.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/Ionic.Zip.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/MediaPortal.Support.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/Utils.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/edtftpnet-1.2.2.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/log4net.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Debug/taglib-sharp.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/
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/
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.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/Debug/TempPE/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/
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.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/UpgradeLog.XML
trunk/plugins/FritzBox/releases/
trunk/plugins/FritzBox/releases/FritzBox_v0.3.0.0.mpi
trunk/plugins/FritzBox/releases/FritzBox_v0.3.0.1.mpi
trunk/plugins/FritzBox/releases/FritzBox_v0.3.1.0.mpi
trunk/plugins/FritzBox/releases/FritzBox_v0.3.1.1.mpi
trunk/plugins/FritzBox/releases/FritzBox_v0.3.1.5.mpi
trunk/plugins/FritzBox/releases/FritzBox_v0.3.1.6.mpi
trunk/plugins/FritzBox/releases/FritzBox_v0.3.2.0.mpi
trunk/plugins/FritzBox/releases/FritzBox_v0.3.2.1.mpi
trunk/plugins/FritzBox/releases/FritzBox_v0.3.2.5.mpi
trunk/plugins/FritzBox/releases/FritzBox_v0.3.3.1.mpe1
trunk/plugins/FritzBox/releases/FritzBox_v0.3.3.2.mpe1
trunk/plugins/FritzBox/releases/FritzBox_v0.3.4.9.mpe1
trunk/plugins/FritzBox/releases/FritzBox_v0.3.5.4349.mpe1
Added: trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat
===================================================================
--- trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat (rev 0)
+++ trunk/plugins/FritzBox/Build/Build FritzBoxManager.bat 2011-11-29 11:06:08 UTC (rev 4355)
@@ -0,0 +1,51 @@
+@echo off
+
+REM Select program path based on current machine environment
+set ProgramDir=%ProgramFiles%
+if not "%ProgramFiles(x86)%".=="". set ProgramDir=%ProgramFiles(x86)%
+
+REM set logfile where the infos are written to, and clear that file
+set LOG=build_%BUILD_TYPE%.log
+echo. > %LOG%
+
+echo.
+echo -= FRITZ!Box Manager =-
+echo -=====================-
+echo.
+
+echo.
+echo Writing SVN revision assemblies...
+DeployVersionSVN.exe /svn=".." >> %LOG%
+
+echo.
+echo Building FRITZ!Box Manager...
+"%WINDIR%\Microsoft.NET\Framework\v3.5\MSBUILD.exe" /target:Rebuild /property:Configuration=Release;AllowUnsafeBlocks=true "..\FritzBox.sln" >> %LOG%
+
+echo.
+echo Reverting assemblies...
+DeployVersionSVN.exe /svn=".." /revert >> %LOG%
+
+rmdir /S /Q ..\_release
+xcopy ..\FritzBox\bin\Release\FritzBox.dll ..\_release\plugins\windows\ >> %LOG%
+xcopy ..\FritzBox\Resources\speexdec.exe ..\_release\base\ >> %LOG%
+xcopy ..\FritzBox\Skin ..\_release\skin /S /I >> %LOG%
+xcopy ..\FritzBox\Languages ..\_release\language /S /I >> %LOG%
+
+echo.
+echo Reading the version number...
+set plugindll=..\FritzBox\bin\Release\FritzBox.dll
+if not exist "%plugindll%" goto version_error
+for /f "Tokens=5" %%a in ('filever "%plugindll%"') do set version=%%a
+goto :version_done
+:version_error
+echo "fritzbox.dll not found. version could not be read" >> %LOG%
+goto :EOF
+:version_done
+
+echo.
+echo Building MpeExtension package...
+"%ProgramDir%\Team MediaPortal\MediaPortal\MpeMaker.exe" "..\MpeRelease\FritzBox.xmp2" /V=%version% /B >> %LOG%
+
+echo.
+echo Copying installer file to releases folder
+copy ..\MpeRelease\FritzBox.mpe1 ..\releases\FritzBox_v%Version%.mpe1 /Y
Added: trunk/plugins/FritzBox/Build/DeployVersionSVN.exe
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/Build/DeployVersionSVN.exe
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/Build/build_.log
===================================================================
--- trunk/plugins/FritzBox/Build/build_.log (rev 0)
+++ trunk/plugins/FritzBox/Build/build_.log 2011-11-29 11:06:08 UTC (rev 4355)
@@ -0,0 +1,195 @@
+
+Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
+SVN Version: 4349
+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 3.5.30729.1
+[Microsoft .NET Framework, Version 2.0.50727.3625]
+Copyright (C) Microsoft Corporation 2007. All rights reserved.
+
+Build started 28.11.2011 23:50:43.
+Project "D:\FritzBox\FritzBox.sln" on node 0 (Rebuild target(s)).
+ Building solution configuration "Release|Mixed Platforms".
+Project "D:\FritzBox\FritzBox.sln" (1) is building "D:\FritzBox\FritzBox\FritzBox.csproj" (2) on node 0 (Rebuild target(s)).
+Project file contains ToolsVersion="4.0", which is not supported by this version of MSBuild. Treating the project as if it had ToolsVersion="3.5".
+CoreClean:
+ Deleting file "D:\FritzBox\FritzBox\bin\Release\FritzBox.dll".
+ Deleting file "D:\FritzBox\FritzBox\bin\Release\FritzBox.pdb".
+ 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.csproj.GenerateResource.Cache".
+ Deleting file "D:\FritzBox\FritzBox\obj\Release\FritzBox.dll".
+ Deleting file "D:\FritzBox\FritzBox\obj\Release\FritzBox.pdb".
+CoreResGen:
+ Processing resource file "Properties\Resources.resx" into "obj\Release\FritzBox.Properties.Resources.resources".
+ Processing resource file "FritzBoxConfig.resx" into "obj\Release\FritzBox.FritzBoxConfig.resources".
+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 0 (Rebuild target(s)).
+Project file contains ToolsVersion="4.0", which is not supported by this version of MSBuild. Treating the project as if it had ToolsVersion="3.5".
+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\obj\Release\ResolveAssemblyReference.cache".
+ Deleting file "D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.exe".
+ Deleting file "D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.pdb".
+Project "D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj" (3) is building "D:\FritzBox\FritzBox\FritzBox.csproj" (2:2) on node 0 (GetTargetPath target(s)).
+Project file contains ToolsVersion="4.0", which is not supported by this version of MSBuild. Treating the project as if it had ToolsVersion="3.5".
+Done Building Project "D:\FritzBox\FritzBox\FritzBox.csproj" (GetTargetPath target(s)).
+Project "D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj" (3) is building "D:\FritzBox\FritzBox\FritzBox.csproj" (2:3) on node 0 (GetNativeManifest target(s)).
+Project file contains ToolsVersion="4.0", which is not supported by this version of MSBuild. Treating the project as if it had ToolsVersion="3.5".
+Done Building Project "D:\FritzBox\FritzBox\FritzBox.csproj" (GetNativeManifest target(s)).
+ResolveAssemblyReferences:
+ Consider app.config remapping of assembly "System, Culture=neutral, PublicKeyToken=b77a5c561934e089" from Version "1.0.5000.0" [] to Version "2.0.0.0" [C:\WINDOWS\assembly\GAC_MSIL\System\2.0.0.0__b77a5c561934e089\System.dll] to solve conflict and get rid of warning.
+ Consider app.config remapping of assembly "System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089" from Version "1.0.5000.0" [] to Version "2.0.0.0" [C:\WINDOWS\assembly\GAC_MSIL\System.Windows.Forms\2.0.0.0__b77a5c561934e089\System.Windows.Forms.dll] to solve conflict and get rid of warning.
+ Consider app.config remapping of assembly "Microsoft.VisualC, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" from Version "7.0.5000.0" [] to Version "8.0.0.0" [C:\WINDOWS\assembly\GAC_MSIL\Microsoft.VisualC\8.0.0.0__b03f5f7f11d50a3a\Microsoft.VisualC.dll] to solve conflict and get rid of warning.
+ Consider app.config remapping of assembly "System.Drawing, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" from Version "1.0.5000.0" [] to Version "2.0.0.0" [C:\WINDOWS\assembly\GAC_MSIL\System.Drawing\2.0.0.0__b03f5f7f11d50a3a\System.Drawing.dll] to solve conflict and get rid of warning.
+C:\WINDOWS\Microsoft.NET\Framework\v3.5\Microsoft.Common.targets : warning MSB3247: Found conflicts between different versions of the same dependent assembly.
+Project "D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj" (3) is building "D:\FritzBox\FritzBox\FritzBox.csproj" (2:4) on node 0 (GetCopyToOutputDirectoryItems target(s)).
+Project file contains ToolsVersion="4.0", which is not supported by this version of MSBuild. Treating the project as if it had ToolsVersion="3.5".
+Done Building Project "D:\FritzBox\FritzBox\FritzBox.csproj" (GetCopyToOutputDirectoryItems target(s)).
+_CopyAppConfigFile:
+ Copying file from "app.config" to ".\bin\Release\FritzBoxConfigTester.exe.config".
+CopyFilesToOutputDirectory:
+ Copying file from "obj\Release\FritzBoxConfigTester.exe" to ".\bin\Release\FritzBoxConfigTester.exe".
+ 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 0 (Rebuild target(s)).
+Project file contains ToolsVersion="4.0", which is not supported by this version of MSBuild. Treating the project as if it had ToolsVersion="3.5".
+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\obj\Release\FritzBoxDebugger.DebugForm.resources".
+ Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.csproj.GenerateResource.Cache".
+ Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.exe".
+ Deleting file "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.pdb".
+ResolveAssemblyReferences:
+ Consider app.config remapping of assembly "System, Culture=neutral, PublicKeyToken=b77a5c561934e089" from Version "1.0.5000.0" [] to Version "2.0.0.0" [C:\WINDOWS\assembly\GAC_MSIL\System\2.0.0.0__b77a5c561934e089\System.dll] to solve conflict and get rid of warning.
+ Consider app.config remapping of assembly "System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089" from Version "1.0.5000.0" [] to Version "2.0.0.0" [C:\WINDOWS\assembly\GAC_MSIL\System.Windows.Forms\2.0.0.0__b77a5c561934e089\System.Windows.Forms.dll] to solve conflict and get rid of warning.
+ Consider app.config remapping of assembly "Microsoft.VisualC, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" from Version "7.0.5000.0" [] to Version "8.0.0.0" [C:\WINDOWS\assembly\GAC_MSIL\Microsoft.VisualC\8.0.0.0__b03f5f7f11d50a3a\Microsoft.VisualC.dll] to solve conflict and get rid of warning.
+ Consider app.config remapping of assembly "System.Drawing, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" from Version "1.0.5000.0" [] to Version "2.0.0.0" [C:\WINDOWS\assembly\GAC_MSIL\System.Drawing\2.0.0.0__b03f5f7f11d50a3a\System.Drawing.dll] to solve conflict and get rid of warning.
+C:\WINDOWS\Microsoft.NET\Framework\v3.5\Microsoft.Common.targets : warning MSB3247: Found conflicts between different versions of the same dependent assembly.
+CoreResGen:
+ Processing resource file "DebugForm.resx" into "obj\Release\FritzBoxDebugger.DebugForm.resources".
+_CopyAppConfigFile:
+ Copying file from "app.config" to ".\bin\Release\FritzBoxDebugger.exe.config".
+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)).
+
+Build succeeded.
+
+"D:\FritzBox\FritzBox.sln" (Rebuild target) (1) ->
+"D:\FritzBox\Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj" (Rebuild target) (3) ->
+(ResolveAssemblyReferences target) ->
+ C:\WINDOWS\Microsoft.NET\Framework\v3.5\Microsoft.Common.targets : warning MSB3247: Found conflicts between different versions of the same dependent assembly.
+
+
+"D:\FritzBox\FritzBox.sln" (Rebuild target) (1) ->
+"D:\FritzBox\Tools\FritzBoxDebugger\FritzBoxDebugger.csproj" (Rebuild target) (4) ->
+ C:\WINDOWS\Microsoft.NET\Framework\v3.5\Microsoft.Common.targets : warning MSB3247: Found conflicts between different versions of the same dependent assembly.
+
+ 2 Warning(s)
+ 0 Error(s)
+
+Time Elapsed 00:00:02.39
+Reverting to build 0
+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
+..\FritzBox\bin\Release\FritzBox.dll
+1 File(s) copied
+..\FritzBox\Resources\speexdec.exe
+1 File(s) copied
+..\FritzBox\Skin\Black & White\FritzManager.xml
+..\FritzBox\Skin\Black & White\Media\hover_FritzBox.png
+..\FritzBox\Skin\Black & White\Media\FritzBox\callin.png
+..\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\rejected.png
+..\FritzBox\Skin\Blue3\FritzManager.xml
+..\FritzBox\Skin\Blue3\Media\hover_FritzBox.png
+..\FritzBox\Skin\Blue3\Media\FritzBox\callin.png
+..\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\rejected.png
+..\FritzBox\Skin\Default\FritzManager.xml
+..\FritzBox\Skin\Default\Media\hover_FritzBox.png
+..\FritzBox\Skin\Default\Media\FritzBox\callin.png
+..\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\rejected.png
+..\FritzBox\Skin\DefaultWide\FritzManager.xml
+..\FritzBox\Skin\DefaultWide\Media\hover_FritzBox.png
+..\FritzBox\Skin\DefaultWide\Media\FritzBox\callin.png
+..\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\rejected.png
+..\FritzBox\Skin\Maya\FritzManager.xml
+..\FritzBox\Skin\Maya\Media\hover_FritzBox.png
+..\FritzBox\Skin\Maya\Media\FritzBox\callin.png
+..\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\rejected.png
+35 File(s) copied
+..\FritzBox\Languages\strings_de.xml
+..\FritzBox\Languages\strings_el.xml
+..\FritzBox\Languages\strings_en-US.xml
+..\FritzBox\Languages\strings_en.xml
+..\FritzBox\Languages\strings_es.xml
+..\FritzBox\Languages\strings_fr.xml
+..\FritzBox\Languages\strings_it.xml
+..\FritzBox\Languages\strings_nl.xml
+..\FritzBox\Languages\strings_ru.xml
+..\FritzBox\Languages\Unsupported\strings_bg.xml
+..\FritzBox\Languages\Unsupported\strings_ca.xml
+..\FritzBox\Languages\Unsupported\strings_cs.xml
+..\FritzBox\Languages\Unsupported\strings_cy-GB.xml
+..\FritzBox\Languages\Unsupported\strings_da.xml
+..\FritzBox\Languages\Unsupported\strings_et.xml
+..\FritzBox\Languages\Unsupported\strings_eu.xml
+..\FritzBox\Languages\Unsupported\strings_fi.xml
+..\FritzBox\Languages\Unsupported\strings_fo.xml
+..\FritzBox\Languages\Unsupported\strings_he.xml
+..\FritzBox\Languages\Unsupported\strings_hr.xml
+..\FritzBox\Languages\Unsupported\strings_hu.xml
+..\FritzBox\Languages\Unsupported\strings_id.xml
+..\FritzBox\Languages\Unsupported\strings_is.xml
+..\FritzBox\Languages\Unsupported\strings_ko.xml
+..\FritzBox\Languages\Unsupported\strings_mk.xml
+..\FritzBox\Languages\Unsupported\strings_no.xml
+..\FritzBox\Languages\Unsupported\strings_pl.xml
+..\FritzBox\Languages\Unsupported\strings_pt-BR.xml
+..\FritzBox\Languages\Unsupported\strings_pt.xml
+..\FritzBox\Languages\Unsupported\strings_ro.xml
+..\FritzBox\Languages\Unsupported\strings_sk.xml
+..\FritzBox\Languages\Unsupported\strings_sl.xml
+..\FritzBox\Languages\Unsupported\strings_sv.xml
+..\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 23:50:48
+Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
+Output: "..\MpeRelease\FritzBox.mpe1"
Added: trunk/plugins/FritzBox/Build/filever.exe
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/Build/filever.exe
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/FritzBox/FritzBox.csproj.user
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.csproj.user (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.csproj.user 2011-11-29 11:06:08 UTC (rev 4355)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <PublishUrlHistory />
+ <InstallUrlHistory />
+ <SupportUrlHistory />
+ <UpdateUrlHistory />
+ <BootstrapperUrlHistory />
+ <ErrorReportUrlHistory />
+ <FallbackCulture>en-US</FallbackCulture>
+ <VerifyUploadedFiles>false</VerifyUploadedFiles>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+ <StartProgram>C:\Program Files\Team MediaPortal\MediaPortal\MediaPortal.exe</StartProgram>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/FritzManager/VBReader.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/VBReader.cs (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/VBReader.cs 2011-11-29 11:06:08 UTC (rev 4355)
@@ -0,0 +1,90 @@
+/*
+ * Erstellt mit SharpDevelop.
+ * Benutzer: sr
+ * Datum: 27.11.2009
+ * Zeit: 11:28
+ *
+ */
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+namespace FritzManager
+{
+ internal class VBReader
+ {
+ static Logger Log = LoggerFactory.getLogger("VBReader");
+
+ public static List<VoiceBoxItem> loadVoiceBoxDir(string basePath)
+ {
+ //string basePath = @"C:\Dokumente und Einstellungen\sr\Eigene Dateien\sharpproj\FritzABBrowser\voicebox\";
+ List<VoiceBoxItem> result = new List<VoiceBoxItem>();
+ try
+ {
+ for (int i = 0; i < 5; i++)
+ {
+ string meta = String.Format("{0}\\meta{1}", basePath, i);
+ Log.Debug("Reading voice box items from {0}", meta);
+ FileStream stream = File.OpenRead(meta);
+ MyBinaryReader r = new MyBinaryReader(stream);
+ int p = 0;
+ while (stream.Position < stream.Length)
+ {
+ stream.Position = p * 348;
+ int len = r.ReadInt32();
+ if (len == 348)
+ {
+ VoiceBoxItem item = new VoiceBoxItem();
+ item.voicebox = i; // what voice box
+ item.seq = r.ReadInt32();
+ item.type = r.ReadInt32();
+ r.ReadInt32();
+ item.filelen = r.ReadInt32();
+ item.lenInSec = r.ReadInt32();
+ item.isNew = r.ReadInt32();
+ // 24 Bytes
+ stream.Position += 24;
+ long pos = stream.Position + 18 * 4;
+ item.callerId = r.ReadCString();
+ stream.Position = pos;
+ pos += 32;
+ item.filename = r.ReadCString();
+ stream.Position = pos;
+ pos += 32 * 4;
+ item.pathname = r.ReadCString();
+ stream.Position = pos;
+ pos += 9 * 4;
+ // read date
+ int Day = r.ReadByte();
+ int Month = r.ReadByte();
+ int Year = r.ReadByte() + 2000;
+ int Hour = r.ReadByte();
+ int Minute = r.ReadByte();
+ int Second = r.ReadByte();
+ item.time = new DateTime(Year, Month, Day, Hour, Minute, Second);
+
+ stream.Position = pos;
+ pos += 32;
+ item.mynumber = r.ReadCString();
+ stream.Position = pos;
+ result.Add(item);
+ Log.Debug("found voice box item {0}", item);
+ }
+ else
+ {
+ Log.Debug("Bad length inidcator: {0}", len);
+ }
+ p++;
+ } // while
+ stream.Close();
+ //Console.ReadLine();
+ } // for
+ }
+ catch (Exception e)
+ {
+ Log.Debug("Exception {0}", e.Message);
+ }
+ return result;
+ }
+ }
+}
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_bg.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_bg.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_bg.xml 2011-11-29 11:06:08 UTC (rev 4355)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Language name="Bulgarian" characters="255">
+ <Section name="unmapped">
+ </Section>
+</Language>
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_ca.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_ca.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_ca.xml 2011-11-29 11:06:08 UTC (rev 4355)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Language name="Catalan" characters="255">
+ <Section name="unmapped">
+ </Section>
+</Language>
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_cs.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_cs.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_cs.xml 2011-11-29 11:06:08 UTC (rev 4355)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Language name="Czech" characters="255">
+ <Section name="unmapped">
+ </Section>
+</Language>
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_cy-GB.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_cy-GB.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_cy-GB.xml 2011-11-29 11:06:08 UTC (rev 4355)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Language name="Welsh" characters="255">
+ <Section name="unmapped">
+ </Section>
+</Language>
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_da.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_da.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_da.xml 2011-11-29 11:06:08 UTC (rev 4355)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Language name="Danish" characters="255">
+ <Section name="unmapped">
+ </Section>
+</Language>
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_et.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_et.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_et.xml 2011-11-29 11:06:08 UTC (rev 4355)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Language name="Estonian" characters="255">
+ <Section name="unmapped">
+ </Section>
+</Language>
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_eu.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_eu.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_eu.xml 2011-11-29 11:06:08 UTC (rev 4355)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Language name="Basque" characters="255">
+ <Section name="unmapped">
+ </Section>
+</Language>
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_fi.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_fi.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_fi.xml 2011-11-29 11:06:08 UTC (rev 4355)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Language name="Finnish" characters="255">
+ <Section name="unmapped">
+ </Section>
+</Language>
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_fo.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_fo.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_fo.xml 2011-11-29 11:06:08 UTC (rev 4355)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Language name="Faroese" characters="255">
+ <Section name="unmapped">
+ </Section>
+</Language>
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_he.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_he.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_he.xml 2011-11-29 11:06:08 UTC (rev 4355)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Language name="Hebrew" characters="255">
+ <Section name="unmapped">
+ </Section>
+</Language>
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_hr.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_hr.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_hr.xml 2011-11-29 11:06:08 UTC (rev 4355)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Language name="Croatian" characters="255">
+ <Section name="unmapped">
+ </Section>
+</Language>
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_hu.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_hu.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_hu.xml 2011-11-29 11:06:08 UTC (rev 4355)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Language name="Hungarian" characters="255">
+ <Section name="unmapped">
+ </Section>
+</Language>
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_id.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_id.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_id.xml 2011-11-29 11:06:08 UTC (rev 4355)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Language name="Indonesian" characters="255">
+ <Section name="unmapped">
+ </Section>
+</Language>
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_is.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_is.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_is.xml 2011-11-29 11:06:08 UTC (rev 4355)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Language name="German" characters="255">
+ <Section name="unmapped">
+ </Section>
+</Language>
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_ko.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_ko.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_ko.xml 2011-11-29 11:06:08 UTC (rev 4355)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Language name="Korean" characters="255">
+ <Section name="unmapped">
+ </Section>
+</Language>
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_mk.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_mk.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_mk.xml 2011-11-29 11:06:08 UTC (rev 4355)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Language name="Macedonian" characters="255">
+ <Section name="unmapped">
+ </Section>
+</Language>
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_no.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_no.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_no.xml 2011-11-29 11:06:08 UTC (rev 4355)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Language name="Norwegian" characters="255">
+ <Section name="unmapped">
+ </Section>
+</Language>
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_pl.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_pl.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_pl.xml 2011-11-29 11:06:08 UTC (rev 4355)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Language name="Polish" characters="255">
+ <Section name="unmapped">
+ </Section>
+</Language>
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_pt-BR.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_pt-BR.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_pt-BR.xml 2011-11-29 11:06:08 UTC (rev 4355)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Language name="Portuguese (Brazil)" characters="255">
+ <Section name="unmapped">
+ </Section>
+</Language>
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_pt.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_pt.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_pt.xml 2011-11-29 11:06:08 UTC (rev 4355)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Language name="Portuguese" characters="255">
+ <Section name="unmapped">
+ </Section>
+</Language>
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_ro.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_ro.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_ro.xml 2011-11-29 11:06:08 UTC (rev 4355)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Language name="Romanian" characters="255">
+ <Section name="unmapped">
+ </Section>
+</Language>
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_sk.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_sk.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_sk.xml 2011-11-29 11:06:08 UTC (rev 4355)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Language name="Slovak" characters="255">
+ <Section name="unmapped">
+ </Section>
+</Language>
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_sl.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_sl.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_sl.xml 2011-11-29 11:06:08 UTC (rev 4355)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Language name="Slovenian" characters="255">
+ <Section name="unmapped">
+ </Section>
+</Language>
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_sv.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_sv.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_sv.xml 2011-11-29 11:06:08 UTC (rev 4355)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Language name="Swedish" characters="255">
+ <Section name="unmapped">
+ </Section>
+</Language>
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_tr.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_tr.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_tr.xml 2011-11-29 11:06:08 UTC (rev 4355)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Language name="Turkish" characters="255">
+ <Section name="unmapped">
+ </Section>
+</Language>
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_uk.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_uk.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_uk.xml 2011-11-29 11:06:08 UTC (rev 4355)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Language name="Ukrainian" characters="255">
+ <Section name="unmapped">
+ </Section>
+</Language>
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_zh-CN.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_zh-CN.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Languages/Unsupported/strings_zh-CN.xml 2011-11-29 11:06:08 UTC (rev 4355)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Language name="Chinese" characters="255">
+ <Section name="unmapped">
+ </Section>
+</Language>
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml 2011-11-29 11:06:08 UTC (rev 4355)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Language name="German" characters="255">
+ <Section name="unmapped">
+ <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="6">Erneute Inverssuche</String>
+ <String id="7">Nachrichten</String>
+ <String id="8">Nachricht abspielen</String>
+ <String id="9">Nachricht als gehört markieren</String>
+ <String id="10">Nachricht löschen</String>
+ <String id="11">Ansicht: Liste</String>
+ <String id="12">Ansicht: Kleine Symbole</String>
+ <String id="13">Ansicht: Große Symbole</String>
+ <String id="14">Alle</String>
+ <String id="15">Eingehend</String>
+ <String id="16">Ausgehend</String>
+ <String id="17">Abgelehnt</String>
+ <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="23">Fehler</String>
+ <String id="24">Telefonbuch konnte nicht geladen werden!</String>
+ <String id="25">Update</String>
+ <String id="26">an</String>
+ <String id="27">Nachricht</String>
+ <String id="28">Telefon</String>
+ </Section>
+</Language>
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/Languages/strings_el.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_el.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_el.xml 2011-11-29 11:06:08 UTC (rev 4355)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Language name="Greek" characters="255">
+ <Section name="unmapped">
+ <String id="1">Λήψη κλήσης</String>
+ <String id="2">Εξερχόμενη κλήση</String>
+ <String id="3">Άγνωστη</String>
+ <String id="4">Προσκλήσεις</String>
+ <String id="5">Επιστροφή κλήσης</String>
+ <String id="6">Re-αντίστροφη αναζήτηση</String>
+ <String id="7">Ειδήσεις</String>
+ <String id="8">Παίξτε το μήνυμα</String>
+ <String id="9">Σήμανση μηνύματος ως μέρος της</String>
+ <String id="10">Διαγραφή του μηνύματος</String>
+ <String id="11">Προβολή: Λίστα</String>
+ <String id="12">Προβολή: Μικρά εικονίδια</String>
+ <String id="13">Προβολή: Μεγάλα εικονίδια</String>
+ <String id="14">Όλες</String>
+ <String id="15">Εισερχόμενη</String>
+ <String id="16">Ξεκινώντας</String>
+ <String id="17">Απορρίφθηκε</String>
+ <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="24">τηλεφωνικό κατάλογο δεν θα μπορούσε να φορτωθεί!</String>
+ <String id="25">Ενημέρωση</String>
+ <String id="26">στο</String>
+ <String id="27">μήνυμα</String>
+ <String id="28">Τηλέφωνο</String>
+ </Section>
+</Language>
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/Languages/strings_en-US.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_en-US.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_en-US.xml 2011-11-29 11:06:08 UTC (rev 4355)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Language name="English" 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">Calls</String>
+ <String id="5">Call back</String>
+ <String id="6">New reverse search</String>
+ <String id="7">Messages</String>
+ <String id="8">Play message</String>
+ <String id="9">Mark message as heared</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">Ougoing</String>
+ <String id="17">Rejected</String>
+ <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="23">Error</String>
+ <String id="24">Could not load phone book!</String>
+ <String id="25">Update</String>
+ <String id="26">to</String>
+ <String id="27">Message</String>
+ <String id="28">Phone</String>
+ </Section>
+</Language>
\ No ne...
[truncated message content] |
|
From: <hor...@us...> - 2011-11-29 10:23:19
|
Revision: 4354
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4354&view=rev
Author: horned-reaper
Date: 2011-11-29 10:23:07 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------
Build 0.3.5
Added Paths:
-----------
trunk/plugins/FritzBox/FritzBox/
trunk/plugins/FritzBox/FritzBox/FritzBox.cs
trunk/plugins/FritzBox/FritzBox/FritzBox.csproj
trunk/plugins/FritzBox/FritzBox/FritzBox.png
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.resx
trunk/plugins/FritzBox/FritzBox/FritzBoxDisabled.png
trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/
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/FritzCallMonitor/PhoneBook.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/
trunk/plugins/FritzBox/FritzBox/FritzManager/BackGroundWorker.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/BlockingQueue.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/FritzboxPhonebook.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/GCollections.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/InversSearch.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/InversSearchOert.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/Logger.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/LoggerFactory.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/MyBinaryReader.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/PhonebookItem.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/Task.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/VoiceboxItem.cs
trunk/plugins/FritzBox/FritzBox/LocalizeStrings.cs
trunk/plugins/FritzBox/FritzBox/Properties/
trunk/plugins/FritzBox/FritzBox/Properties/AssemblyInfo.cs
trunk/plugins/FritzBox/FritzBox/Properties/Resources.Designer.cs
trunk/plugins/FritzBox/FritzBox/Properties/Resources.resx
trunk/plugins/FritzBox/FritzBox/Resources/
trunk/plugins/FritzBox/FritzBox/Resources/fritzdial.sh
trunk/plugins/FritzBox/FritzBox/Resources/gfx/
trunk/plugins/FritzBox/FritzBox/Resources/gfx/FritzBox.ico
trunk/plugins/FritzBox/FritzBox/Resources/gfx/FritzBoxIconMadeByHarley.png
trunk/plugins/FritzBox/FritzBox/Resources/speexdec.exe
trunk/plugins/FritzBox/FritzBox/Settings.cs
trunk/plugins/FritzBox/FritzBox/Skin/
trunk/plugins/FritzBox/FritzBox/Skin/Black & White/
trunk/plugins/FritzBox/FritzBox/Skin/Black & White/FritzManager.xml
trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/
trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/hover_FritzBox.png
trunk/plugins/FritzBox/FritzBox/Skin/Blue3/
trunk/plugins/FritzBox/FritzBox/Skin/Blue3/FritzManager.xml
trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/
trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/hover_FritzBox.png
trunk/plugins/FritzBox/FritzBox/docs/
trunk/plugins/FritzBox/FritzBox/docs/Changes.txt
trunk/plugins/FritzBox/FritzBox/docs/Install.txt
trunk/plugins/FritzBox/FritzBox/docs/todo.txt
trunk/plugins/FritzBox/FritzBox.sln
trunk/plugins/FritzBox/Tools/
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/FritzBoxConfigTester.csproj
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/Program.cs
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/Properties/
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/Properties/AssemblyInfo.cs
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/app.config
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/
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/Program.cs
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/Properties/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/Properties/AssemblyInfo.cs
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/app.config
Removed Paths:
-------------
trunk/plugins/FritzBox/Build/
trunk/plugins/FritzBox/FritzBox/
trunk/plugins/FritzBox/FritzBox.5.1.resharper
trunk/plugins/FritzBox/FritzBox.sln
trunk/plugins/FritzBox/MP2version/
trunk/plugins/FritzBox/MpeRelease/
trunk/plugins/FritzBox/Tools/
trunk/plugins/FritzBox/releases/
Added: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2011-11-29 10:23:07 UTC (rev 4354)
@@ -0,0 +1,1423 @@
+#region Copyright (C) 2005-2009 Team MediaPortal
+
+// Copyright (C) 2005-2009 Team MediaPortal
+// http://www.team-mediaportal.com
+//
+// This Program 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, or (at your option)
+// any later version.
+//
+// This Program 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 GNU Make; see the file COPYING. If not, write to
+// the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+// http://www.gnu.org/copyleft/gpl.html
+
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Reflection;
+using System.Threading;
+using System.Xml.Serialization;
+using FritzManager;
+using GCollections;
+using MediaPortal.Configuration;
+using MediaPortal.Dialogs;
+using MediaPortal.GUI.Library;
+using MediaPortal.Player;
+using MediaPortal.Util;
+using Microsoft.Win32;
+
+namespace FritzBox
+{
+ internal enum FritzBoxGuiMode
+ {
+ CallList = 0,
+ VoiceBox = 1,
+ PhoneBook = 2
+ }
+
+ [PluginIcons("FritzBox.FritzBox.png", "FritzBox.FritzBoxDisabled.png")]
+ public class FritzBox : GUIWindow, ISetupForm, IPlugin
+ {
+ static Logger Log = LoggerFactory.getLogger("FritzBox");
+
+ #region CallMonitor
+
+ #region Variables
+
+ private readonly List<CallAction> _actionList = new List<CallAction>();
+ private readonly List<CallAction> _notifyQueue = new List<CallAction>();
+ private bool _showNotify = true;
+ private object _tempNotify;
+
+ private int notifyCount = 0;
+
+ #endregion Variables
+
+ #region Properties
+
+ public string ContactPicturesFolder
+ {
+ get { return Config.GetSubFolder(Config.Dir.Thumbs, "FritzBox.Contacts"); }
+ }
+
+ public string YacFolder
+ {
+ get { return Config.GetSubFolder(Config.Dir.Thumbs, "yac"); }
+ }
+
+ public string SkinMediaFolder
+ {
+ get { return Path.Combine(Config.GetSubFolder(Config.Dir.Skin, Settings.MediaPortalSkin), "Media"); }
+ }
+
+ public string UnknownCallerImage
+ {
+ get
+ {
+ string filePath;
+
+ // check if skin supports it's own images
+ filePath = Utils.GetCoverArt(SkinMediaFolder, @"FritzBox\CallMonitor.Unknown");
+ if (!String.IsNullOrEmpty(filePath)) return filePath;
+
+ // use new default image
+ filePath = Utils.GetCoverArt(ContactPicturesFolder, @"FritzBox\CallMonitor.Unknown");
+ if (!String.IsNullOrEmpty(filePath)) return filePath;
+
+ // use old default image
+ filePath = Utils.GetCoverArt(YacFolder, "_unknown");
+ if (!String.IsNullOrEmpty(filePath)) return filePath;
+
+ return String.Empty;
+ }
+ }
+
+ public string MissingCallerImage
+ {
+ get
+ {
+ string filePath;
+
+ // check if skin supports it's own images
+ filePath = Utils.GetCoverArt(SkinMediaFolder, @"FritzBox\CallMonitor.Missing");
+ if (!String.IsNullOrEmpty(filePath)) return filePath;
+
+ // use new default image
+ filePath = Utils.GetCoverArt(ContactPicturesFolder, @"FritzBox\CallMonitor.Missing");
+ if (!String.IsNullOrEmpty(filePath)) return filePath;
+
+ // use old default image
+ filePath = Utils.GetCoverArt(YacFolder, "_noImage");
+ if (!String.IsNullOrEmpty(filePath)) return filePath;
+
+ return String.Empty;
+ }
+ }
+
+ #endregion
+
+ #region Private Functions/Methods
+
+ private void OnStartExternal(Process proc, bool waitForExit)
+ {
+ if (waitForExit) _showNotify = false;
+ else _showNotify = true;
+ }
+
+ private void OnStopExternal(Process proc, bool waitForExit)
+ {
+ _showNotify = true;
+
+ //for (int i = 0; i < _notifyQueue.Count; i++)
+ // OnFritzBoxEvent(_notifyQueue[i]);
+
+ _notifyQueue.Clear();
+ }
+
+ private void OnCallAction(CallAction callAction)
+ {
+ Log.Info("FRITZ!Box: OnCallAction()");
+ callAction.WriteToLog();
+
+ if (!_showNotify)
+ {
+ Log.Info("External process is running. Notify is queued and will be shown later.");
+ _notifyQueue.Add(callAction);
+ return;
+ }
+
+ switch (callAction.Type)
+ {
+ case CallAction.CallType.Incoming:
+ if (PhoneBook.Enabled) callAction.Caller = PhoneBook.GetCaller(phoneBook, callAction.Caller);
+ OnCall(callAction);
+ break;
+ case CallAction.CallType.Outgoing:
+ if (PhoneBook.Enabled) callAction.Caller = PhoneBook.GetCaller(phoneBook, callAction.Caller);
+ OnCall(callAction);
+ break;
+ case CallAction.CallType.ConnectionStarted:
+ break;
+ case CallAction.CallType.ConnectionClosed:
+ if (Settings.CloseOnConnectionClosed)
+ {
+ Log.Info("_closeOnConnectionClosed is enabled. Try to close active notify.");
+ if (_tempNotify != 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);
+ }
+ }
+ break;
+ default:
+ Log.Error("incorrect callAction.Type");
+ break;
+ }
+ }
+
+ private void OnLogAction(FritzBoxClient.LogLevel logLevel, string logMessage)
+ {
+ switch (logLevel)
+ {
+ case FritzBoxClient.LogLevel.Debug:
+ Log.Debug(logMessage);
+ break;
+ case FritzBoxClient.LogLevel.Error:
+ Log.Error(logMessage);
+ break;
+ case FritzBoxClient.LogLevel.Warning:
+ Log.Warn(logMessage);
+ break;
+ case FritzBoxClient.LogLevel.Info:
+ Log.Info(logMessage);
+ break;
+ default:
+ break;
+ }
+ }
+
+ private void OnCall(CallAction callAction)
+ {
+ Log.Info("FRITZ!Box: OnCall()");
+
+ if (_tempNotify != null)
+ {
+ Log.Info("yet another dialog is active. action is sent to queue.");
+ if (_actionList.Count < Settings.MaxNotifies - 1) _actionList.Add(callAction);
+ return;
+ }
+
+ // config settings for dialog
+ string strHeading = string.Empty;
+ string strImage = string.Empty;
+ string strText = string.Empty;
+
+ // set heading for NotifyDialog
+ switch (callAction.Type)
+ {
+ case CallAction.CallType.Incoming:
+ strHeading = GUILocalizeStrings.Get(1); // 1 = Incoming call
+ break;
+ case CallAction.CallType.Outgoing:
+ strHeading = GUILocalizeStrings.Get(2); // 2 = Outgoing call
+ break;
+ }
+
+ // set Image for NotifyDialog
+ strImage = GetCallerImage(callAction.Caller);
+
+ // set message text for NotifyDialog
+ strText = Environment.NewLine;
+ if (callAction.Caller.ID == "") strText += GUILocalizeStrings.Get(3); // 3 = Unknown
+ else if (callAction.Caller.Name == "") strText += callAction.Caller.ID;
+ else
+ {
+ strText += callAction.Caller.Name;
+ if (Settings.ShowMSNOnNotify) strText += Environment.NewLine + callAction.Caller.ID;
+ }
+
+ // config settings for dialog FINISHED
+
+ // if MSN is disabled, stop here
+ if (!IsMsnEnabled(callAction.MSN)) return;
+
+ // if notifies are disabled for this call, stop here
+ if (!IsCallerEnabled(callAction.Caller)) return;
+
+ if (callAction.Type == CallAction.CallType.Incoming && Settings.IncomingSound != null && Settings.IncomingSound.Length > 0 ) Utils.PlaySound(Settings.IncomingSound, false, true);
+
+ ShowNotify(strHeading, strImage, strText);
+ }
+
+ #endregion
+
+ #region Helper Methods
+
+ private string GetCallerImage(string callerId)
+ {
+ // search image for caller
+ if (Settings.ExtensiveLogging)
+ Log.Info("searching image for callerId: " + callerId);
+
+ string filePath;
+
+ // use new image path
+ filePath = Utils.GetCoverArt(ContactPicturesFolder, callerId);
+ if (!String.IsNullOrEmpty(filePath)) return filePath;
+ Log.Info("found image not in: " + ContactPicturesFolder);
+
+ // use old image path
+ filePath = Utils.GetCoverArt(YacFolder, callerId);
+ if (!String.IsNullOrEmpty(filePath)) return filePath;
+ Log.Info("found image not in: " + YacFolder);
+
+ return String.Empty;
+ }
+
+ private string GetCallerImage(Caller caller)
+ {
+ if (caller.ID == "")
+ return UnknownCallerImage;
+ else
+ {
+ string strImage = GetCallerImage(caller.Name);
+
+ if (File.Exists(strImage))
+ {
+ if (Settings.ExtensiveLogging) Log.Info("found image for caller: " + strImage);
+ else Log.Info("found image for caller");
+
+ return strImage;
+ }
+ else
+ {
+ Log.Info("found NO image for caller");
+ return MissingCallerImage;
+ }
+ }
+ }
+
+ private bool IsMsnEnabled(string msn)
+ {
+ if (!Settings.FilterMSN)
+ {
+ Log.Info("MSN filter is disabled.");
+ return true;
+ }
+
+ if (Settings.MSNList.Contains(msn))
+ {
+ Log.Info("MSN is on list.");
+ return true;
+ }
+ else
+ {
+ Log.Info("MSN is not on list. Notify won't be shown.");
+ return false;
+ }
+ }
+
+ private bool IsCallerEnabled(Caller caller)
+ {
+ if (!PhoneBook.Enabled)
+ {
+ Log.Info("Phone book is disabled. Notify will be shown.");
+ return true;
+ }
+ else if (caller.Show) return true;
+ else return false;
+ }
+
+ private void ShowNotify(string strHeading, string strImage, string strText)
+ {
+ bool resumePlayer = false;
+
+ if (notifyCount >= Settings.MaxNotifies) return;
+
+ // pause player
+ if (g_Player.Playing && !g_Player.Paused && Settings.StopMedia)
+ {
+ g_Player.Pause();
+ resumePlayer = true;
+ }
+
+ // show dialog
+ GUIDialogNotify dlgNotify = (GUIDialogNotify)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_NOTIFY);
+ if (dlgNotify == null) return;
+
+ dlgNotify.Reset();
+ dlgNotify.ClearAll();
+ dlgNotify.SetHeading(strHeading);
+ dlgNotify.SetImage(strImage);
+ dlgNotify.SetText(strText);
+ if (Settings.CloseOnTimeout) dlgNotify.TimeOut = Settings.NotifyTimeout;
+ else dlgNotify.TimeOut = -1;
+
+ _tempNotify = dlgNotify;
+ dlgNotify.DoModal(GUIWindowManager.ActiveWindow);
+
+ // resume player
+ if (resumePlayer && g_Player.Playing && g_Player.Paused && Settings.StopMedia && Settings.ResumeMedia) g_Player.Pause();
+
+ _tempNotify = null;
+ if (_actionList.Count > 0)
+ {
+ CallAction tmpAction = _actionList[0];
+ _actionList.RemoveAt(0);
+ OnCallAction(tmpAction);
+ }
+ }
+
+ #endregion
+
+ #endregion CallMonitor
+
+ #region <Interface> Implementations
+
+ #region IPlugin Interface
+
+ /// <summary>
+ /// This method will be called by mediaportal to start your process plugin
+ /// </summary>
+ public void Start()
+ {
+ Log.Info("FRITZ!Box Plugin {0} starting.", Assembly.GetExecutingAssembly().GetName().Version);
+ Settings.Load();
+
+ Utils.OnStartExternal += OnStartExternal;
+ Utils.OnStopExternal += OnStopExternal;
+
+ FritzBoxClient.LogEvent += OnLogAction;
+ FritzBoxClient.CallEvent += OnCallAction;
+ FritzBoxClient.StartClient();
+
+ // start monitoring Windows power mode changes (Standby & Hibernate)
+ SystemEvents.PowerModeChanged += new PowerModeChangedEventHandler(SystemEvents_PowerModeChanged);
+ }
+
+ /// <summary>
+ /// this method will be called by mediaportal to stop your process plugin
+ /// </summary>
+ public void Stop()
+ {
+ Log.Info("FRITZ!Box Plugin {0} stopping.", Assembly.GetExecutingAssembly().GetName().Version);
+
+ FritzBoxClient.StopClient();
+ FritzBoxClient.CallEvent -= OnCallAction;
+ FritzBoxClient.LogEvent -= OnLogAction;
+
+ Utils.OnStartExternal -= OnStartExternal;
+ Utils.OnStopExternal -= OnStopExternal;
+
+ // stop monitoring power changes
+ SystemEvents.PowerModeChanged -= new PowerModeChangedEventHandler(SystemEvents_PowerModeChanged);
+
+ PhoneBook.SaveSettings();
+ }
+
+ #endregion
+
+ #region ISetupForm Member
+
+ /// <summary>
+ /// With GetID it will be an window-plugin / otherwise a process-plugin
+ /// Enter the id number here again
+ /// </summary>
+ public override int GetID
+ {
+ get { return GetWindowId(); }
+ set { }
+ }
+
+ public string PluginName()
+ {
+ return "FRITZ!Box Manager";
+ }
+
+ public string Author()
+ {
+ return "chefkoch, S.Rinke";
+ }
+
+ public string Description()
+ {
+ return "Displays FRITZ!Box caller lists and voice box infos and notifies on incoming calls.";
+ }
+
+ public void ShowPlugin()
+ {
+ try
+ {
+ FritzBoxConfig config = new FritzBoxConfig();
+ config.ShowDialog();
+ }
+ catch (Exception ex)
+ {
+ Log.Error(ex.ToString());
+ }
+ }
+
+ public bool CanEnable()
+ {
+ return true;
+ }
+
+ public int GetWindowId()
+ {
+ return 464554871;
+ }
+
+ public bool DefaultEnabled()
+ {
+ return true;
+ }
+
+ public bool HasSetup()
+ {
+ return true;
+ }
+
+ public bool GetHome(out string strButtonText, out string strButtonImage, out string strButtonImageFocus, out string strPictureImage)
+ {
+ strButtonText = GUILocalizeStrings.Get(28); // 28 = Telefon
+ strButtonImage = String.Empty;
+ strButtonImageFocus = String.Empty;
+ strPictureImage = "hover_FritzBox.png";
+
+ return true;
+ }
+
+ #endregion
+
+ #endregion
+
+ #region FritzManager
+
+ #region enums
+
+ #region Nested type: Filter
+
+ private enum Filter
+ {
+ All = 0,
+ Incoming = 1,
+ Outgoing = 2,
+ Rejected = 3
+ }
+
+ #endregion
+
+ #region Nested type: View
+
+ private enum View
+ {
+ List = 0,
+ Icons = 1,
+ LargeIcons = 2,
+ }
+
+ #endregion
+
+ #endregion
+
+ #region skin
+
+ [SkinControl(3)] protected GUISortButtonControl btnFilter;
+ [SkinControl(4)] protected GUIButtonControl btnModus;
+ [SkinControl(9)] protected GUIButtonControl btnUpdate;
+ [SkinControl(2)] protected GUIButtonControl btnViewAs;
+ [SkinControl(50)] protected GUIFacadeControl facadeView;
+ [SkinControl(4711)] protected GUIFadeLabel headerLabel;
+
+ #endregion
+
+ #region fields
+
+ // update timer for background thread
+ private static System.Timers.Timer updateTimer = new System.Timers.Timer();
+ // path to voice box files
+ private string vBPath;
+ // FRITZBox password
+ private string passwd;
+ // list of call items (callers)
+ private List<CallItem> callItemList;
+ // filter on callitems used in list view
+ private Filter currentFilter = Filter.All;
+ // what kind of items is shown (callers, phoneBook, voicebox)
+ private FritzBoxGuiMode currentMode = FritzBoxGuiMode.CallList;
+ // state of facede view
+ private View currentView = View.List;
+ // list of tmp files to delete when deinit
+ // TODO should called in timer callback also
+ private List<string> filesToDelete = new List<string>();
+ // FritzBox WebGUI Client
+ private Fritz fritz;
+ // stores mapped msns
+ private HashMap<string, string> msns = new HashMap<string, string>();
+ // phone book
+ public HashMap<string, PhonebookItem> phoneBook = new HashMap<string, PhonebookItem>();
+ // dirty marker, if set the timer task will save phoneBook
+ private volatile bool phoneBookDirty;
+ // stores pathname for internal pb save file
+ private string phoneBookPath;
+ private string mediaPortalLanguage;
+ // if set true, use revers lookup
+ private bool useInversSearch;
+ // list of voivebox messages
+ private List<VoiceBoxItem> voiceboxItemList;
+ // worker for task
+ private BackGroundWorker worker;
+ // and the thread
+ private Thread workerThread;
+
+ #endregion
+
+ // the instance
+ private static FritzBox thePlugin;
+ // fritz phoneBook
+ protected FritzPhonebooks fritzPhonebooks = new FritzPhonebooks();
+ // sync the access to phoneBook / calllist
+ private System.Object sync = new System.Object();
+
+ public override bool Init()
+ {
+ Start();
+ updateGUIProperties(0,0,"");
+ loadConfig();
+ GUILocalizeStrings.ChangeLanguage(mediaPortalLanguage);
+
+ return Load(GUIGraphicsContext.Skin + @"\FritzManager.xml");
+ }
+
+ private void startBackGroundWorker(InversSearch search)
+ {
+ if (worker == null)
+ {
+ worker = new BackGroundWorker(fritz, this, search);
+ workerThread = new Thread(worker.Run);
+ workerThread.Start();
+ }
+ }
+
+ public override void DeInit()
+ {
+ cleanup();
+
+ if (worker != null)
+ {
+ worker.stop();
+ workerThread.Abort();
+ }
+
+ Stop();
+
+ // persist some props for next time
+ Log.Debug("DeInit called: persisting current props" );
+ using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml")))
+ {
+ xmlwriter.SetValue("FritzManager", "currentMode", (int)currentFilter);
+ xmlwriter.SetValue("FritzManager", "currentFilter", (int)currentMode);
+ }
+
+ base.DeInit();
+ }
+
+ protected void loadConfig()
+ {
+ string dialport = "0";
+ string areacode = "";
+
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MediaPortal.xml"))
+ {
+ phoneBookPath = Config.GetFolder(Config.Dir.Config) + "\\fritzmanagerPhonebook.xml";
+ mediaPortalLanguage = xmlreader.GetValue("gui", "language");
+
+ passwd = xmlreader.GetValue("FritzManager", "passwd");
+ vBPath = xmlreader.GetValue("FritzManager", "vBPath");
+ dialport = xmlreader.GetValue("FritzManager", "dialport");
+ useInversSearch = xmlreader.GetValueAsBool("FritzManager", "useInversSearch", true);
+ areacode = xmlreader.GetValue("FritzManager", "defaultAreacode");
+
+ string str = xmlreader.GetValue("FritzManager", "currentMode");
+
+ if (str != null && str != "") currentMode = (FritzBoxGuiMode)System.Enum.Parse(typeof(FritzBoxGuiMode), str);
+
+ str = xmlreader.GetValue("FritzManager", "currentFilter");
+
+ if (str != null && str != "") currentFilter = (Filter)System.Enum.Parse(typeof(Filter), str);
+
+ int interval = xmlreader.GetValueAsInt("FritzManager", "updateInterval", 0);
+
+ if (interval != 0)
+ {
+ thePlugin = this;
+ updateTimer.Interval = interval * 1000; // interval is in sec
+ updateTimer.Elapsed += OnTimedEvent;
+ updateTimer.Enabled = true;
+ }
+ }
+
+ fritz = new Fritz(passwd, Config.GetFolder(Config.Dir.Config), FritzBoxClient.Address, dialport);
+
+ initMSN();
+
+ InversSearch search = new InversSearchOert(areacode);
+
+ startBackGroundWorker(search);
+ }
+
+ protected override void OnPageLoad()
+ {
+ phoneBook = InternalPhoneBook.loadPhoneBook(phoneBookPath);
+
+ update(false);
+
+ if (currentMode == FritzBoxGuiMode.VoiceBox) worker.queue.Enqueue(new Task(Task.TaskAction.LoadCallItems, null));
+
+ ShowThumbPanel();
+ }
+
+ private static void OnTimedEvent(object source, System.Timers.ElapsedEventArgs e)
+ {
+ Log.Debug("FritzBox Manager processing timer event");
+
+ if (thePlugin.phoneBookDirty)
+ {
+ thePlugin.phoneBookDirty = false;
+ InternalPhoneBook.savePhonebook(thePlugin.phoneBook.Values, thePlugin.phoneBookPath);
+ }
+
+ thePlugin.fritz.keepAlive();
+
+ List<VoiceBoxItem> items = VBReader.loadVoiceBoxDir(thePlugin.vBPath);
+
+ int newItems = 0;
+ string caller = null;
+
+ foreach(VoiceBoxItem item in items)
+ {
+ if (item.isNew != 0 && item.type == 3)
+ {
+ if (caller == null ) caller = thePlugin.lookupCaller(item.callerId);
+ newItems++;
+ }
+ }
+
+ thePlugin.updateGUIProperties(newItems, items.Count, caller);
+ }
+
+ protected void initMSN()
+ {
+ // populate MSNs
+ if (File.Exists(Config.GetFolder(Config.Dir.Config) + "\\fritzmanager_msns.txt"))
+ {
+ using (StreamReader sr = new StreamReader(Config.GetFolder(Config.Dir.Config) + "\\fritzmanager_msns.txt"))
+ {
+ while (!sr.EndOfStream)
+ {
+ string line = sr.ReadLine();
+ string[] items = line.Split('=');
+ if (items.GetLength(0) > 1) msns.Add(items[0], items[1]);
+ }
+ }
+ }
+ }
+
+ protected override void OnPageDestroy(int new_windowId)
+ {
+ cleanup();
+ base.OnPageDestroy(new_windowId);
+ }
+
+ /// <summary>
+ /// deletes temp files (decoded voicebox messages)
+ /// </summary>
+ private void cleanup()
+ {
+ // cleanup temp
+ foreach (string file in filesToDelete)
+ {
+ File.Delete(file);
+ }
+
+ filesToDelete.Clear();
+ }
+
+ /// <summary>
+ /// update data for the views.
+ /// </summary>
+ /// <param name="forceReload">if set the update is forced, and data will be fetched in
+ /// any case.</param>
+ protected void update(bool forceReload)
+ {
+ if (currentMode == FritzBoxGuiMode.CallList) loadCallListFromFritzbox(forceReload);
+ else if (currentMode == FritzBoxGuiMode.VoiceBox)
+ {
+ if (!String.IsNullOrEmpty(vBPath)) voiceboxItemList = VBReader.loadVoiceBoxDir(vBPath);
+ else
+ {
+ Log.Debug("voice box path is not set");
+ return;
+ }
+ }
+ else if (currentMode == FritzBoxGuiMode.PhoneBook)
+ {
+ string str = fritz.loadPhoneBook();
+
+ if (str == "") ShowError(GUILocalizeStrings.Get(24)); // 24 = "Could not load phone book"
+ else
+ {
+ XmlSerializer s = new XmlSerializer(typeof (FritzPhonebooks));
+ fritzPhonebooks = (FritzPhonebooks) s.Deserialize(new StringReader(str));
+ }
+ }
+
+ refreshView();
+
+ UpdateButtonStates();
+ }
+
+ /// <summary>
+ /// refreshes the view. call when backing lists / maps have changed
+ /// </summary>
+ protected void refreshView()
+ {
+ if (currentMode == FritzBoxGuiMode.CallList) populateCallItems();
+ else if (currentMode == FritzBoxGuiMode.VoiceBox) populateVoiceBoxItems();
+ else if (currentMode == FritzBoxGuiMode.PhoneBook) populatePhonebookItems();
+ }
+
+ /// <summary>
+ /// load internal callers list from csv contained in data
+ /// </summary>
+ /// <param name="data">holds csv list</param>
+ public void refreshCallData(byte[] data)
+ {
+ lock (sync)
+ {
+ callItemList = CallItem.load(new MemoryStream(data));
+
+ // populate phoneBook
+ bool updatePhonebook = false;
+ int idx = 0;
+
+ foreach (CallItem i in callItemList)
+ {
+ PhonebookItem pi = phoneBook[i.number];
+
+ if (pi == null)
+ {
+ pi = new PhonebookItem();
+ pi.number = i.number;
+ phoneBook[i.number] = pi;
+ }
+
+ if (i.name != "" && pi.name != i.name)
+ {
+ pi.name = i.name;
+ pi.fritzEntry = true;
+ pi.inverseLookupDone = false;
+ updatePhonebook = true;
+ }
+ else if (useInversSearch && !pi.inverseLookupDone && !pi.fritzEntry && i.number != "") worker.queue.Enqueue(new Task(Task.TaskAction.InversLookup, new object[] { i.number, idx }));
+
+ idx++;
+ }
+
+ if (updatePhonebook) InternalPhoneBook.savePhonebook(phoneBook.Values, phoneBookPath);
+ }
+
+ refreshView();
+ }
+
+ public void updatePhonebook(string number, string name, int index)
+ {
+ if (name != null && name != "" && phoneBook.Contains(number))
+ {
+ lock (sync)
+ {
+ phoneBook[number].inverseLookupDone = true;
+ phoneBookDirty = true;
+
+ if (name != number)
+ {
+ // search without result
+ phoneBook[number].name = name;
+
+ if (currentMode == FritzBoxGuiMode.CallList)
+ {
+ GUIListItem item = facadeView[index];
+
+ if (item != null)
+ {
+ Log.Debug("replacing label {0} with {1}", item.Label2, name);
+ string l = name;
+
+ if (l.Length > 30) l = name.Substring(0, 30);
+
+ item.Label2 = l;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ protected void loadCallListFromFritzbox(bool forceReload)
+ {
+ GUIWaitCursor.Show();
+ try
+ {
+ Log.Debug("load callitem from fritzbox");
+ byte[] data = fritz.loadCallListData(forceReload);
+ refreshCallData(data);
+ }
+ catch (Exception e)
+ {
+ Log.Debug("Exception {0}", e.Message);
+ }
+ GUIWaitCursor.Hide();
+ }
+
+ protected string decode(VoiceBoxItem item)
+ {
+ System.Diagnostics.Process proc = new System.Diagnostics.Process();
+ proc.EnableRaisingEvents = false;
+ proc.StartInfo.FileName = "speexdec";
+ string target = Path.GetTempPath() + item.seq + ".wav";
+ proc.StartInfo.Arguments = "\"" + vBPath + "\\rec\\" + item.filename + "\" \"" + target + "\"";
+ proc.StartInfo.WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden;
+
+ proc.Start();
+ proc.WaitForExit();
+ proc.Close();
+
+ filesToDelete.Add(target);
+
+ return target;
+ }
+
+ protected void populatePhonebookItems()
+ {
+ facadeView.Clear();
+
+ if (fritzPhonebooks.Items == null || fritzPhonebooks.Items.GetLength(0) == 0)
+ {
+ Log.Debug("no fritz phone book items found");
+
+ return;
+ }
+
+ Phonebook p = fritzPhonebooks.Items[0]; // always choose first phone book
+ int i = 0;
+ string thumbDir = Config.GetFolder(Config.Dir.Thumbs) + "\\yac\\";
+
+ foreach (Contact c in p.contact)
+ {
+ string name = c.person[0].realName;
+
+ foreach (TelephonyNumber number in c.telephony)
+ {
+ GUIListItem elem = new GUIListItem();
+ elem.Label = name;
+ elem.Label2 = number.Value;
+
+ if (elem.Label2.Length > 0)
+ {
+ if (File.Exists(thumbDir + c.person[0].realName + ".jpg")) elem.ThumbnailImage = thumbDir + c.person[0].realName + ".jpg";
+ else elem.ThumbnailImage = thumbDir + "_noImage.png";
+
+ elem.Path = Convert.ToString(i++);
+
+ facadeView.Add(elem);
+ }
+ }
+ }
+ }
+
+ /// <summary>
+ /// fill in voice box items in facadeView
+ /// </summary>
+ protected void populateVoiceBoxItems()
+ {
+ CultureInfo ci = CultureInfo.InvariantCulture;
+ string format = "dd.MM.yy HH:mm";
+ facadeView.Clear();
+ voiceboxItemList.Sort(VoiceBoxItem.CompareByDate);
+ int i = 0;
+ int newItems = 0;
+ string callerNotify = null;
+
+ foreach (VoiceBoxItem item in voiceboxItemList)
+ {
+ if (item.type == 3)
+ {
+ GUIListItem elem = new GUIListItem();
+ string caller = lookupCaller(item.callerId);
+
+ if (item.isNew != 0 )
+ {
+ if (callerNotify == null) callerNotify = caller;
+
+ newItems++;
+ }
+ string msnName = item.mynumber;
+
+ if (msns.Contains(item.mynumber)) msnName = msns[item.mynumber];
+
+ elem.Label = (item.isNew == 1 ? "* " : " ") + item.time.ToString(format, ci);
+ elem.Label2 = caller + " " + GUILocalizeStrings.Get(26) + " " + msnName; // 26 = to
+ elem.Path = Convert.ToString(i);
+ elem.IconImageBig = "defaultAudioBig.png";
+ elem.IconImage = "defaultAudio.png";
+
+ string thumbDir = Config.GetFolder(Config.Dir.Thumbs) + "\\yac\\";
+
+ if (File.Exists(thumbDir + caller + ".jpg")) elem.ThumbnailImage = thumbDir + caller + ".jpg";
+ else elem.ThumbnailImage = thumbDir + "_noImage.png";
+
+ facadeView.Add(elem);
+ }
+
+ i++;
+ }
+
+ updateGUIProperties(newItems, voiceboxItemList.Count, callerNotify);
+ }
+
+ private string lookupCaller(string caller)
+ {
+ if (phoneBook.Contains(caller)) caller = phoneBook[caller].name;
+ if (caller == "" || caller == null) caller = GUILocalizeStrings.Get(3); // 3 = Unknown
+
+ return caller;
+ }
+
+ public void updateGUIProperties(int newItems, int total, string name)
+ {
+ if (newItems == 0)
+ {
+ GUIPropertyManager.SetProperty("#FritzManager.NewMessages", " ");
+ GUIPropertyManager.SetProperty("#FritzManager.Caller", " ");
+ GUIPropertyManager.SetProperty("#FritzManager.NewMessageCount", string.Empty);
+ GUIPropertyManager.SetProperty("#FritzManager.NewMessagesAvail", "false");
+ }
+ else
+ {
+ if (newItems > 1) GUIPropertyManager.SetProperty("#FritzManager.NewMessages", newItems + " " + GUILocalizeStrings.Get(7)); // 7 = Messages
+ else GUIPropertyManager.SetProperty("#FritzManager.NewMessages", newItems + " " + GUILocalizeStrings.Get(27)); // 27 = Message
+
+ GUIPropertyManager.SetProperty("#FritzManager.Caller", name);
+ GUIPropertyManager.SetProperty("#FritzManager.NewMessageCount", newItems.ToString());
+ GUIPropertyManager.SetProperty("#FritzManager.NewMessagesAvail", "true");
+ }
+
+ if (total == 0)
+ {
+ GUIPropertyManager.SetProperty("#FritzManager.TotalMessages", " ");
+ GUIPropertyManager.SetProperty("#FritzManager.TotalMessageCount", string.Empty);
+ }
+ else
+ {
+ if (newItems > 1) GUIPropertyManager.SetProperty("#FritzManager.TotalMessages", total + " " + GUILocalizeStrings.Get(7)); // 7 = Messages
+ else GUIPropertyManager.SetProperty("#FritzManager.TotalMessages", total + " " + GUILocalizeStrings.Get(27)); // 27 = Message
+
+ GUIPropertyManager.SetProperty("#FritzManager.TotalMessageCount", total.ToString());
+ }
+
+ // set properties for skin file labels
+ GUIPropertyManager.SetProperty("#FritzManager.LabelCallList", GUILocalizeStrings.Get(18)); // 18 = Call list
+ GUIPropertyManager.SetProperty("#FritzManager.LabelUpdate", GUILocalizeStrings.Get(25)); // 25 = Update
+ }
+
+ /// <summary>
+ /// fill in call items in facadeView
+ /// </summary>
+ protected void populateCallItems()
+ {
+ CultureInfo ci = CultureInfo.InvariantCulture;
+ string format = "dd.MM.yy HH:mm";
+ facadeView.Clear();
+ int i = -1;
+
+ if (callItemList == null)
+ {
+ Log.Debug("callItemList is not initialized");
+
+ return;
+ }
+
+ foreach (CallItem item in callItemList)
+ {
+ GUIListItem elem = new GUIListItem();
+
+ i++;
+
+ if (currentFilter == Filter.Rejected) if (item.type != 2) continue;
+ if (currentFilter == Filter.Incoming) if (item.type != 1) continue;
+ if (currentFilter == Filter.Outgoing) if (item.type != 3) continue;
+
+ elem.Label = item.timestamp.ToString(format, ci) + " - " + item.duration.ToString("HH:mm", ci);
+ PhonebookItem pi = phoneBook[item.number];
+
+ if (pi.name != null)
+ {
+ elem.Label2 = pi.inverseLookupDone
+ ?
+ (pi.name + " (" + pi.number + ")")
+ :
+ pi.name;
+ }
+ else elem.Label2 = pi.number;
+
+ elem.DVDLabel = item.mynumber + item.extension;
+ elem.Path = Convert.ToString(i);
+
+ string thumbDir = Config.GetFolder(Config.Dir.Thumbs) + "\\yac\\";
+
+ if (File.Exists(thumbDir + pi.name + ".jpg")) elem.ThumbnailImage = thumbDir + pi.name + ".jpg";
+ else
+ {
+ if (pi.name == null || pi.name == "") elem.ThumbnailImage = thumbDir + "_unknown.png";
+ else elem.ThumbnailImage = thumbDir + "_noImage.png";
+ }
+
+ string prefix = "FritzBox\\";
+ string icon = "defaultAudioBig.png";
+
+ if (item.type == 1) icon = prefix + "callin.png";
+ else if (item.type == 3) icon = prefix + "callout.png";
+ else if (item.type == 2) icon = prefix + "rejected.png";
+
+ elem.IconImageBig = icon;
+ elem.IconImage = icon;
+ elem.IsFolder = false;
+
+ facadeView.Add(elem);
+ }
+ }
+
+ private void ShowThumbPanel()
+ {
+ int itemIndex = facadeView.SelectedListItemIndex;
+
+ if (currentView == View.LargeIcons) facadeView.CurrentLayout = GUIFacadeControl.Layout.LargeIcons;
+ else if (currentView == View.Icons) facadeView.CurrentLayout = GUIFacadeControl.Layout.SmallIcons;
+ else if (currentView == View.List) facadeView.CurrentLayout = GUIFacadeControl.Layout.List;
+
+ if (itemIndex > -1) GUIControl.SelectItemControl(GetID, facadeView.GetID, itemIndex);
+
+ UpdateButtonStates();
+ }
+
+ protected override void OnShowContextMenu()
+ {
+ base.OnShowContextMenu();
+
+ if (currentMode == FritzBoxGuiMode.VoiceBox)
+ {
+ int r = ShowVoiceboxContextMenu();
+
+ switch (r)
+ {
+ case 0: // play
+ g_Player.Play(decode(voiceboxItemList[Convert.ToInt16(facadeView.SelectedListItem.Path)]));
+ break;
+ case 1:
+ break;
+ }
+ }
+ else if (currentMode == FritzBoxGuiMode.CallList)
+ {
+ int r = ShowCallListContextMenu();
+ int idx = Convert.ToInt16(facadeView.SelectedListItem.Path);
+ CallItem item = callItemList[idx];
+
+ switch (r)
+ {
+ case 0: // call back
+ fritz.dial(item.number);
+ break;
+ case 1: // reverse search
+ worker.queue.Enqueue(new Task(Task.TaskAction.InversLookup, new object[] {item.number, idx}));
+ break;
+ }
+ }
+ }
+
+ protected override void OnClicked(int controlId, GUIControl control, MediaPortal.GUI.Library.Action.ActionType actionType)
+ {
+ base.OnClicked(controlId, control, actionType);
+
+ if (actionType == MediaPortal.GUI.Library.Action.ActionType.ACTION_SHOW_INFO)
+ {
+ OnShowContextMenu();
+
+ return;
+ }
+
+ if (control == facadeView)
+ {
+ GUIMessage msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_ITEM_SELECTED, GetID, 0, controlId, 0, 0, null);
+ OnMessage(msg);
+ int itemIndex = msg.Param1;
+
+ if (actionType == MediaPortal.GUI.Library.Action.ActionType.ACTION_SELECT_ITEM)
+ {
+ GUIListItem actual = facadeView.SelectedListItem;
+
+ if (currentMode == FritzBoxGuiMode.VoiceBox)
+ {
+ string tmp = decode(voiceboxItemList[Convert.ToInt16(actual.Path)]);
+ g_Player.Play(tmp);
+ }
+ }
+ }
+
+ if (control == btnViewAs)
+ {
+ bool shouldContinue = false;
+
+ do
+ {
+ shouldContinue = false;
+
+ switch (currentView)
+ {
+ case View.List:
+ currentView = View.Icons;
+
+ if (facadeView.ThumbnailLayout == null)
+ shouldContinue = true;
+ else
+ facadeView.CurrentLayout = GUIFacadeControl.Layout.SmallIcons;
+
+ break;
+
+ case View.Icons:
+ currentView = View.LargeIcons;
+
+ if (facadeView.ThumbnailLayout == null)
+ shouldContinue = true;
+ else
+ facadeView.CurrentLayout = GUIFacadeControl.Layout.LargeIcons;
+
+ break;
+
+ case View.LargeIcons:
+ currentView = View.List;
+
+ if (facadeView.ListLayout == null) shouldContinue = true;
+
+ else facadeView.CurrentLayout = GUIFacadeControl.Layout.List;
+
+ break;
+ }
+ }
+ while (shouldContinue);
+
+ UpdateButtonStates();
+
+ GUIControl.FocusControl(GetID, controlId);
+
+ return;
+ }
+
+ if (control == btnFilter)
+ {
+ switch (currentFilter)
+ {
+ case Filter.All:
+ currentFilter = Filter.Incoming;
+ break;
+ case Filter.Incoming:
+ currentFilter = Filter.Outgoing;
+ break;
+ case Filter.Outgoing:
+ currentFilter = Filter.Rejected;
+ break;
+ case Filter.Rejected:
+ currentFilter = Filter.All;
+ break;
+ }
+
+ populateCallItems();
+
+ UpdateButtonStates();
+
+ GUIControl.FocusControl(GetID, controlId);
+ }
+
+ if (control == btnUpdate) update(true);
+
+ // Messages -> Call list -> Phone book
+ if (control == btnModus)
+ {
+ switch (currentMode)
+ {
+ case FritzBoxGuiMode.VoiceBox:
+ currentMode = FritzBoxGuiMode.CallList;
+ break;
+ case FritzBoxGuiMode.CallList:
+ currentMode = FritzBoxGuiMode.PhoneBook;
+ break;
+ case FritzBoxGuiMode.PhoneBook:
+ currentMode = FritzBoxGuiMode.VoiceBox;
+ break;
+ }
+
+ if (currentMode == FritzBoxGuiMode.CallList)
+ {
+ // when switching into caller item list, then schedule a task
+ worker.queue.Enqueue(new Task(Task.TaskAction.LoadCallItems, null));
+ }
+
+ // TODO write currentMode
+ update(false);
+ }
+ }
+
+ private int ShowCallListContextMenu()
+ {
+ 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.Add(GUILocalizeStrings.Get(6)); // 6 = New reverse search
+ dlgMenu.DoModal(GetID);
+
+ if (dlgMenu.SelectedLabel == -1) return -1; // nothing was selected
+
+ return dlgMenu.SelectedLabel;
+ }
+
+ return -1;
+ }
+
+ private int ShowVoiceboxContextMenu()
+ {
+ GUIDialogMenu dlgMenu = (GUIDialogMenu) GUIWindowManager.GetWindow((int) GUIWindow.Window.WINDOW_DIALOG_MENU);
+
+ if (dlgMenu != null)
+ {
+ dlgMenu.Reset();
+ dlgMenu.SetHeading(GUILocalizeStrings.Get(7)); // 7 = Messages
+ dlgMenu.Add(GUILocalizeStrings.Get(8)); // 8 = Play message
+ dlgMenu.Add(GUILocalizeStrings.Get(9)); // 9 = Mark message as heared
+ dlgMenu.Add(GUILocalizeStrings.Get(10)); // 10 = Delete message
+ dlgMenu.DoModal(GetID);
+
+ if (dlgMenu.SelectedLabel == -1) return -1; // Nothing was selected
+
+ return dlgMenu.SelectedLabel;
+ }
+
+ return -1;
+ }
+
+ private void UpdateButtonStates()
+ {
+ facadeView.IsVisible = false;
+ facadeView.IsVisible = true;
+ GUIControl.FocusControl(GetID, facadeView.GetID);
+
+ string strLine = string.Empty;
+ View view = currentView;
+
+ switch (view)
+ {
+ case View.List:
+ strLine = GUILocalizeStrings.Get(11); // 11 = View: List
+ break;
+ case View.Icons:
+ strLine = GUILocalizeStrings.Get(12); // 12 = View: Small icons
+ break;
+ case View.LargeIcons:
+ strLine = GUILocalizeStrings.Get(13); // 13 = View: Large icons
+ break;
+ }
+
+ if (btnViewAs != null) btnViewAs.Label = strLine;
+
+ switch (currentFilter)
+ {
+ case Filter.All:
+ strLine = GUILocalizeStrings.Get(14); // 14 = All
+ break;
+ case Filter.Incoming:
+ strLine = GUILocalizeStrings.Get(15); // 15 = Incoming
+ break;
+ case Filter.Outgoing:
+ strLine = GUILocalizeStrings.Get(16); // 16 = Outgoing
+ break;
+ case Filter.Rejected:
+ strLine = GUILocalizeStrings.Get(17); // 17 = Rejected
+ break;
+ }
+
+ if (btnFilter != null)
+ {
+ btnFilter.Label = strLine;
+ btnFilter.IsAscending = true;
+ }
+
+ // Messages -> Call list -> Phone book
+ switch (currentMode)
+ {
+ case FritzBoxGuiMode.VoiceBox:
+ if (headerLabel != null) headerLabel.Label = GUILocalizeStrings.Get(19); // 19 = FritzBox messages
+ btnModus.Label = GUILocalizeStrings.Get(18); // 18 = Call list
+ break;
+ case FritzBoxGuiMode.CallList:
+ if (headerLabel != null) headerLabel.Label = GUILocalizeStrings.Get(21); // 21 = FritzBox call list
+ btnModus.Label = GUILocalizeStrings.Get(20); // 20 = Phone book
+ break;
+ case FritzBoxGuiMode.PhoneBook:
+ if (headerLabel != null) headerLabel.Label = GUILocalizeStrings.Get(22); // 22 = FritzBox phone book
+ btnModus.Label = GUILocalizeStrings.Get(7); // 7 = Messages
+ break;
+ }
+ }
+
+ private void ShowError(string msg)
+ {
+ GUIDialogOK dlg = (GUIDialogOK) GUIWindowManager.GetWindow((int) GUIWindow.Window.WINDOW_DIALOG_OK);
+ dlg.SetHeading(GUILocalizeStrings.Get(23)); // 23 = Error
+ dlg.SetLine(1, msg);
+ dlg.SetLine(2, String.Empty);
+ dlg.SetLine(3, String.Empty);
+ dlg.DoModal(GUIWindowManager.ActiveWindow);
+ }
+
+ private void SystemEvents_PowerModeChanged(object sender, Microsoft.Win32.PowerModeChangedEventArgs e)
+ {
+ switch (e.Mode)
+ {
+ case PowerModes.Suspend:
+ FritzBoxClient.StopClient();
+ break;
+
+ case PowerModes.Resume:
+ FritzBoxClient.StartClient();
+ break;
+ }
+ }
+
+ #endregion FritzManager
+ }
+}
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/FritzBox.csproj
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.csproj (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.csproj 2011-11-29 10:23:07 UTC (rev 4354)
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{7A458560-A537-429E-A016-1A4513CB586F}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>FritzBox</RootNamespace>
+ <AssemblyName>FritzBox</AssemblyName>
+ <ApplicationIcon>
+ </ApplicationIcon>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <SourceAnalysisOverrideSettingsFile>C:\Dokumente und Einstellungen\sr\Anwendungsdaten\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+ <NoStdLib>False</NoStdLib>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <TargetFrameworkProfile />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>Full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+ <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+ <StartAction>Program</StartAction>
+ <StartProgram>..\..\..\..\..\..\Programme\Team MediaPortal\MediaPortal\MediaPortal.exe</StartProgram>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
+ <RegisterForComInterop>False</RegisterForComInterop>
+ <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
+ <BaseAddress>4194304</BaseAddress>
+ <PlatformTarget>AnyCPU</PlatformTarget>
+ <FileAlignment>4096</FileAlignment>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="Common.Utils">
+ <HintPath>C:\Program Files\Team MediaPortal\MediaPortal\Common.Utils.dll</HintPath>
+ </Reference>
+ <Reference Include="Core">
+ <HintPath>C:\Program Files\Team MediaPortal\MediaPortal\Core.dll</HintPath>
+ </Reference>
+ <Reference Include="Dialogs">
+ <HintPath>C:\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll</HintPath>
+ </Reference>
+ <Reference Include="System" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Drawing" />
+ <Reference Include="System.Windows.Forms" />
+ <Reference Include="System.Xml" />
+ <Reference Include="Utils">
+ <HintPath>C:\Program Files\Team MediaPortal\MediaPortal\Utils.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="FritzCallMonitor\FritzBoxClient.cs" />
+ <Compile Include="FritzManager\VBReader.cs" />
+ <Compile Include="FritzManager\BackGroundWorker.cs" />
+ <Compile Include="FritzManager\BlockingQueue.cs" />
+ <Compile Include="FritzManager\CallItem.cs" />
+ <Compile Include="FritzManager\Fritz.cs" />
+ <Compile Include="FritzManager\FritzboxPhonebook.cs" />
+ <Compile Include="FritzManager\GCollections.cs" />
+ <Compile Include="FritzManager\InversSearch.cs" />
+ <Compile Include="FritzManager\InversSearchOert.cs" />
+ <Compile Include="FritzManager\Logger.cs" />
+ <Compile Include="FritzManager\LoggerFactory.cs" />
+ <Compile Include="FritzManager\MyBinaryReader.cs" />
+ <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" />
+ <Compile Include="FritzBoxConfig.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="FritzBoxConfig.Designer.cs">
+ <DependentUpon>FritzBoxConfig.cs</DependentUpon>
+ </Compile>
+ <Compile Include="FritzBox.cs" />
+ <Compile Include="FritzCallMonitor\PhoneBook.cs" />
+ <Compile Include="Properties\Resources.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <DependentUpon>Resources.resx</DependentUpon>
+ </Compile>
+ <Compile Include="Settings.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Properties\Resources.resx">
+ <Generator>ResXFileCodeGenerator</Generator>
+ <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="FritzBoxConfig.resx">
+ <SubType>Designer</SubType>
+ <DependentUpon>FritzBoxConfig.cs</DependentUpon>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="FritzBox.png" />
+ <EmbeddedResource Include="FritzBoxDisabled.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="docs\Changes.txt">
+ </None>
+ <None Include="docs\todo.txt">
+ </None>
+ <Content Include="docs\Install.txt">
+ </Content>
+ <Content Include="Skin\Black & White\FritzManager.xml">
+ </Content>
+ <Content Include="Skin\Black & White\Media\callin.png">
+ </Content>
+ <Content Include="Skin\Black & White\Media\callout.png">
+ </Content>
+ <Content Include="Skin\Black & White\Media\hover_FritzBox.png" />
+ <Content Include="Skin\Black & White\Media\rejected.png">
+ </Content>
+ <Content Include="Skin\Blue3\FritzManager.xml">
+ </Content>
+ <Content Include="Skin\Blue3\Media\callin.png">
+ </Content>
+ <Content Include="Skin\Blue3\Media\callout.png">
+ </Content>
+ <Content Include="Skin\Blue3\Media\FritzBox.CallMonitor.Missing.png">
+ </Content>
+ <Content Include="Skin\Blue3\Media\FritzBox.CallMonitor.Unknown.png">
+ </Content>
+ <Content Include="Skin\Blue3\Media\hover_FritzBox.png" />
+ <Content Include="Skin\Blue3\Media\rejected.png">
+ </Content>
+ <Content Include="Skin\GenericSkin\FritzManager.xml">
+ </Content>
+ <Content Include="Skin\GenericSkin\Media\callin.png">
+ </Content>
+ <Content Include="Skin\GenericSkin\Media\callout.png">
+ </Content>
+ <Content Include="Skin\GenericSkin\Media\hover_FritzBox.png" />
+ <Content Include="Skin\GenericSkin\Media\rejected.png">
+ </Content>
+ <Content Include="Resources\gfx\FritzBox.ico" />
+ <Content Include="Resources\gfx\FritzBoxIconMadeByHarley.png" />
+ <Content Include="Skin\GenericSkin\Media\FritzBox.CallMonitor.Missing.png">
+ </Content>
+ <Content Include="Skin\GenericSkin\Media\FritzBox.CallMonitor.Unknown.png">
+ </Content>
+ <Content Include="Resources\speexdec.exe">
+ </Content>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="Resources\fritzdial.sh" />
+ <None Include="Resources\MpeRelease\FritzBox.xmp2" />
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+ <PropertyGroup>
+ <PostBuildEvent>rem xcopy /y "$(TargetPath)" "$(SolutionDir)\xbmc\bin\$(ConfigurationName)\plugins\windows"
+rem xcopy /y "$(TargetPath)" "$(SolutionDir)\Configuration\bin\$(ConfigurationName)\plugins\windows"</PostBuildEvent>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/FritzBox.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/FritzBox/FritzBox/FritzBox.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2011-11-29 10:23:07 UTC (rev 4354)
@@ -0,0 +1,1102 @@
+namespace FritzBox
+{
+ partial class FritzBoxConfig
+ {
+ /// <summary>
+ /// Erforderliche Designervariable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Verwendete Ressourcen bereinigen.
+ /// </summary>
+ /// <param name="disposing">True, wenn verwaltete Ressourcen gelöscht werden sollen; andernfalls False.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Vom Windows Form-Designer generierter Code
+
+ /// <summary>
+ /// Erforderliche Methode für die Designerunterstützung.
+ /// Der Inhalt der Methode darf nicht mit dem Code-Editor geändert werden.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = 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.ComponentModel.ComponentResourceManager resources = new System.Co...
[truncated message content] |
|
From: <hwa...@us...> - 2011-11-28 21:32:57
|
Revision: 4353
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4353&view=rev
Author: hwahrmann
Date: 2011-11-28 21:32:51 +0000 (Mon, 28 Nov 2011)
Log Message:
-----------
Changed update.xml
Modified Paths:
--------------
trunk/plugins/OneButtonMusic/setup/update.xml
Modified: trunk/plugins/OneButtonMusic/setup/update.xml
===================================================================
--- trunk/plugins/OneButtonMusic/setup/update.xml 2011-11-28 21:23:09 UTC (rev 4352)
+++ trunk/plugins/OneButtonMusic/setup/update.xml 2011-11-28 21:32:51 UTC (rev 4353)
@@ -2,7 +2,7 @@
<ExtensionCollection xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Items>
<PackageClass>
- <Version>2.0</Version>
+ <Version>2.0.2</Version>
<Groups>
<Items>
<GroupItem Name="Default">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hwa...@us...> - 2011-11-28 21:23:15
|
Revision: 4352
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4352&view=rev
Author: hwahrmann
Date: 2011-11-28 21:23:09 +0000 (Mon, 28 Nov 2011)
Log Message:
-----------
Updating new MPE Installer package
Modified Paths:
--------------
trunk/plugins/OneButtonMusic/setup/OneButtonMusic.mpe1
trunk/plugins/OneButtonMusic/setup/OneButtonMusic.xmp2
Modified: trunk/plugins/OneButtonMusic/setup/OneButtonMusic.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/OneButtonMusic/setup/OneButtonMusic.xmp2
===================================================================
--- trunk/plugins/OneButtonMusic/setup/OneButtonMusic.xmp2 2011-11-28 21:12:56 UTC (rev 4351)
+++ trunk/plugins/OneButtonMusic/setup/OneButtonMusic.xmp2 2011-11-28 21:23:09 UTC (rev 4352)
@@ -176,12 +176,12 @@
<Version>
<Major>2</Major>
<Minor>0</Minor>
- <Build>1</Build>
+ <Build>2</Build>
<Revision>0</Revision>
</Version>
- <ExtensionDescription>One Button Music is a Process Plugin, which reacts on the Play command, either keyboard key p or Play button on the remote, and on actions assigned to Remote Buttons 0 - 9.
-
-Once one of the above action is detected the Playback of music starts. This enables instant playback, without the need to turn on TV or Projector.
+ <ExtensionDescription>One Button Music is a Process Plugin, which reacts on the Play command, either keyboard key p or Play button on the remote, and on actions assigned to Remote Buttons 0 - 9.
+
+Once one of the above action is detected the Playback of music starts. This enables instant playback, without the need to turn on TV or Projector.
</ExtensionDescription>
<VersionDescription>Mediaportal 1.2.0 compatible</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hwa...@us...> - 2011-11-28 21:13:03
|
Revision: 4351
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4351&view=rev
Author: hwahrmann
Date: 2011-11-28 21:12:56 +0000 (Mon, 28 Nov 2011)
Log Message:
-----------
Added an Operator to select songs based on Ratings.
Modified Paths:
--------------
trunk/plugins/OneButtonMusic/OneButtonMusic/OneButtonMusic.cs
trunk/plugins/OneButtonMusic/OneButtonMusic/OneButtonMusic.csproj
trunk/plugins/OneButtonMusic/OneButtonMusic/OneButtonMusicConfig.Designer.cs
trunk/plugins/OneButtonMusic/OneButtonMusic/OneButtonMusicConfig.cs
trunk/plugins/OneButtonMusic/OneButtonMusic/Properties/AssemblyInfo.cs
Modified: trunk/plugins/OneButtonMusic/OneButtonMusic/OneButtonMusic.cs
===================================================================
--- trunk/plugins/OneButtonMusic/OneButtonMusic/OneButtonMusic.cs 2011-11-28 17:44:34 UTC (rev 4350)
+++ trunk/plugins/OneButtonMusic/OneButtonMusic/OneButtonMusic.cs 2011-11-28 21:12:56 UTC (rev 4351)
@@ -37,6 +37,7 @@
private int _jumpOnPlay = 0;
private bool _useRating = false;
private int _rating = 0;
+ private string _ratingComparator = ">";
private bool _useFolder = false;
private string _songFolder = "";
private bool _includeSubFolder = false;
@@ -84,6 +85,7 @@
_randomPlaylist = xmlreader.GetValueAsBool("onebuttonmusic", "randomplaylist", false);
_lucky = xmlreader.GetValueAsBool("onebuttonmusic", "feelinglucky", true);
_useRating = xmlreader.GetValueAsBool("onebuttonmusic", "useRating", false);
+ _ratingComparator = xmlreader.GetValueAsString("onebuttonmusic", "ratingcomparator", ">");
_luckyalbums = xmlreader.GetValueAsBool("onebuttonmusic", "luckyalbums", false);
_playCurrentPlayList = xmlreader.GetValueAsBool("onebuttonmusic", "playcurrentplaylist", false);
_useFolder = xmlreader.GetValueAsBool("onebuttonmusic", "usefolder", false);
@@ -185,7 +187,7 @@
if (_useRating)
{
- AddRandomFavoriteSongToPlayList(_numberOfSongs);
+ AddRandomFavoriteSongToPlayList(_numberOfSongs, _ratingComparator, _rating);
}
else
{
@@ -295,7 +297,29 @@
else if (parm.ToLower() == "random")
{
int NumberOfSongs;
+ string sRatingComparator = "";
+ int iRating = 0;
+ // Check, if we have a Rating Comparator
+ int iComparatorPos = value.IndexOfAny(new char[] {'<', '>', '!', '='});
+ if (iComparatorPos > -1)
+ {
+ sRatingComparator = value.Substring(iComparatorPos).Trim();
+ int iRatingPos = sRatingComparator.IndexOfAny(new char[] {'0', '1', '2', '3', '4', '5'});
+ if (iRatingPos < 0)
+ {
+ Log.Warn("OneButtonMusic: Missing Rating after Comparator. Defaulting to > -1");
+ sRatingComparator = ">";
+ iRating = -1;
+ }
+ else
+ {
+ iRating = Convert.ToInt16(sRatingComparator.Substring(iRatingPos, 1));
+ sRatingComparator = sRatingComparator.Substring(0, iRatingPos);
+ }
+ value = value.Substring(0, iComparatorPos).Trim();
+ }
+
try
{
NumberOfSongs = Convert.ToInt32(value);
@@ -305,9 +329,17 @@
Log.Warn("OneButtonMusic: Invalid Parameter for number of songs. using 100 as default");
NumberOfSongs = 100;
}
- Log.Info("OneButtonMusic: Adding {0} Random songs from the database", value);
- AddRandomSongToPlaylist(NumberOfSongs);
+ if (sRatingComparator != "")
+ {
+ Log.Info("OneButtonMusic: Adding {0} Random songs with Rating {1} {2} from the database", NumberOfSongs, sRatingComparator, iRating);
+ AddRandomFavoriteSongToPlayList(NumberOfSongs, sRatingComparator, iRating);
+ }
+ else
+ {
+ Log.Info("OneButtonMusic: Adding {0} Random songs from the database", value);
+ AddRandomSongToPlaylist(NumberOfSongs);
+ }
}
else if (parm.ToLower() == "load folder")
{
@@ -318,7 +350,7 @@
}
else
{
- Log.Warn("OneButtonMusic: Spcified Song folder {0} does not exist. No action done.", _songFolder);
+ Log.Warn("OneButtonMusic: Specified Song folder {0} does not exist. No action done.", _songFolder);
}
}
else if (parm.ToLower() == "same artist")
@@ -507,7 +539,7 @@
/// Note: We need to have our own logic here, otherwise execution time would be very long.
/// </summary>
/// <param name="numberOfSongs"></param>
- void AddRandomFavoriteSongToPlayList(int numberOfSongs)
+ void AddRandomFavoriteSongToPlayList(int numberOfSongs, string sComparator, int rating)
{
PseudoRandomNumberGenerator rand = new PseudoRandomNumberGenerator();
int maxIDSong, rndIDSong;
@@ -518,7 +550,7 @@
playlistPlayer.GetPlaylist(PlayListType.PLAYLIST_MUSIC).Clear();
List<Song> songs = new List<Song>();
- string strSQL = string.Format("select * from tracks where iRating > {0}", _rating);
+ string strSQL = string.Format("select * from tracks where iRating {0} {1}", sComparator, rating);
m_db.GetSongsByFilter(strSQL, out songs, "tracks");
if (songs.Count > 0)
{
Modified: trunk/plugins/OneButtonMusic/OneButtonMusic/OneButtonMusic.csproj
===================================================================
--- trunk/plugins/OneButtonMusic/OneButtonMusic/OneButtonMusic.csproj 2011-11-28 17:44:34 UTC (rev 4350)
+++ trunk/plugins/OneButtonMusic/OneButtonMusic/OneButtonMusic.csproj 2011-11-28 21:12:56 UTC (rev 4351)
@@ -80,6 +80,7 @@
<Reference Include="Databases">
<HintPath>..\..\..\MediaPortal-1\mediaportal\Databases\bin\Debug\Databases.dll</HintPath>
</Reference>
+ <Reference Include="Elegant.Ui.Common, Version=4.2.0.0, Culture=neutral, PublicKeyToken=3a2b400713aae6e0, processorArchitecture=MSIL" />
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
Modified: trunk/plugins/OneButtonMusic/OneButtonMusic/OneButtonMusicConfig.Designer.cs
===================================================================
--- trunk/plugins/OneButtonMusic/OneButtonMusic/OneButtonMusicConfig.Designer.cs 2011-11-28 17:44:34 UTC (rev 4350)
+++ trunk/plugins/OneButtonMusic/OneButtonMusic/OneButtonMusicConfig.Designer.cs 2011-11-28 21:12:56 UTC (rev 4351)
@@ -50,8 +50,6 @@
this.btCancel = new System.Windows.Forms.Button();
this.tabControlSettings = new System.Windows.Forms.TabControl();
this.tabPagePlayList = new System.Windows.Forms.TabPage();
- this.ckAutoPlayOnResume = new System.Windows.Forms.CheckBox();
- this.ckAutoPlayOnStartup = new System.Windows.Forms.CheckBox();
this.tabPageButtons = new System.Windows.Forms.TabPage();
this.ckShuffle0 = new System.Windows.Forms.CheckBox();
this.ckShuffle9 = new System.Windows.Forms.CheckBox();
@@ -104,24 +102,27 @@
this.tbValue1 = new System.Windows.Forms.TextBox();
this.comboBoxRemote1 = new System.Windows.Forms.ComboBox();
this.label2 = new System.Windows.Forms.Label();
- this.label23 = new System.Windows.Forms.Label();
- this.cbJumpOnPlay = new System.Windows.Forms.ComboBox();
this.tabPageAutoPlay = new System.Windows.Forms.TabPage();
this.groupBox2 = new System.Windows.Forms.GroupBox();
- this.ckAutoPlayOnHome = new System.Windows.Forms.CheckBox();
- this.ckAutoPlayOnInactivity = new System.Windows.Forms.CheckBox();
- this.tbSecsInactive = new System.Windows.Forms.TextBox();
- this.label24 = new System.Windows.Forms.Label();
+ this.label25 = new System.Windows.Forms.Label();
+ this.ckShuffleOnInactivity = new System.Windows.Forms.CheckBox();
+ this.ckShuffleOnHome = new System.Windows.Forms.CheckBox();
this.ckShuffleOnStartup = new System.Windows.Forms.CheckBox();
+ this.tbAutoPlayOnInactivity = new System.Windows.Forms.TextBox();
+ this.tbAutoPlayOnHome = new System.Windows.Forms.TextBox();
this.tbAutoPlayOnStartup = new System.Windows.Forms.TextBox();
+ this.cbAutoPlayOnInactivity = new System.Windows.Forms.ComboBox();
+ this.cbAutoPlayOnHome = new System.Windows.Forms.ComboBox();
this.cbAutoPlayOnStartup = new System.Windows.Forms.ComboBox();
- this.label25 = new System.Windows.Forms.Label();
- this.cbAutoPlayOnHome = new System.Windows.Forms.ComboBox();
- this.tbAutoPlayOnHome = new System.Windows.Forms.TextBox();
- this.ckShuffleOnHome = new System.Windows.Forms.CheckBox();
- this.cbAutoPlayOnInactivity = new System.Windows.Forms.ComboBox();
- this.tbAutoPlayOnInactivity = new System.Windows.Forms.TextBox();
- this.ckShuffleOnInactivity = new System.Windows.Forms.CheckBox();
+ this.label24 = new System.Windows.Forms.Label();
+ this.tbSecsInactive = new System.Windows.Forms.TextBox();
+ this.ckAutoPlayOnInactivity = new System.Windows.Forms.CheckBox();
+ this.ckAutoPlayOnHome = new System.Windows.Forms.CheckBox();
+ this.ckAutoPlayOnResume = new System.Windows.Forms.CheckBox();
+ this.ckAutoPlayOnStartup = new System.Windows.Forms.CheckBox();
+ this.label23 = new System.Windows.Forms.Label();
+ this.cbJumpOnPlay = new System.Windows.Forms.ComboBox();
+ this.cbRatingComparator = new System.Windows.Forms.ComboBox();
this.groupBox1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.rating)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numNumberOfAlbums)).BeginInit();
@@ -135,6 +136,7 @@
//
// groupBox1
//
+ this.groupBox1.Controls.Add(this.cbRatingComparator);
this.groupBox1.Controls.Add(this.ckIncludeSubfolders);
this.groupBox1.Controls.Add(this.btFolderSelect);
this.groupBox1.Controls.Add(this.tbSongFolder);
@@ -197,7 +199,7 @@
//
// rating
//
- this.rating.Location = new System.Drawing.Point(204, 159);
+ this.rating.Location = new System.Drawing.Point(252, 156);
this.rating.Maximum = new decimal(new int[] {
4,
0,
@@ -222,9 +224,9 @@
this.ckRating.AutoSize = true;
this.ckRating.Location = new System.Drawing.Point(39, 159);
this.ckRating.Name = "ckRating";
- this.ckRating.Size = new System.Drawing.Size(159, 17);
+ this.ckRating.Size = new System.Drawing.Size(153, 17);
this.ckRating.TabIndex = 13;
- this.ckRating.Text = "Only add songs with rating >";
+ this.ckRating.Text = "Only add songs with rating ";
this.ckRating.UseVisualStyleBackColor = true;
//
// numNumberOfAlbums
@@ -389,31 +391,11 @@
this.tabPagePlayList.Location = new System.Drawing.Point(4, 22);
this.tabPagePlayList.Name = "tabPagePlayList";
this.tabPagePlayList.Padding = new System.Windows.Forms.Padding(3);
- this.tabPagePlayList.Size = new System.Drawing.Size(511, 367);
+ this.tabPagePlayList.Size = new System.Drawing.Size(619, 367);
this.tabPagePlayList.TabIndex = 0;
this.tabPagePlayList.Text = "Play Button Behaviour";
this.tabPagePlayList.UseVisualStyleBackColor = true;
//
- // ckAutoPlayOnResume
- //
- this.ckAutoPlayOnResume.AutoSize = true;
- this.ckAutoPlayOnResume.Location = new System.Drawing.Point(6, 40);
- this.ckAutoPlayOnResume.Name = "ckAutoPlayOnResume";
- this.ckAutoPlayOnResume.Size = new System.Drawing.Size(227, 17);
- this.ckAutoPlayOnResume.TabIndex = 8;
- this.ckAutoPlayOnResume.Text = "AutoPlay on System Resume from Standby";
- this.ckAutoPlayOnResume.UseVisualStyleBackColor = true;
- //
- // ckAutoPlayOnStartup
- //
- this.ckAutoPlayOnStartup.AutoSize = true;
- this.ckAutoPlayOnStartup.Location = new System.Drawing.Point(7, 82);
- this.ckAutoPlayOnStartup.Name = "ckAutoPlayOnStartup";
- this.ckAutoPlayOnStartup.Size = new System.Drawing.Size(177, 17);
- this.ckAutoPlayOnStartup.TabIndex = 7;
- this.ckAutoPlayOnStartup.Text = "AutoPlay on MediaPortal startup";
- this.ckAutoPlayOnStartup.UseVisualStyleBackColor = true;
- //
// tabPageButtons
//
this.tabPageButtons.Controls.Add(this.ckShuffle0);
@@ -470,7 +452,7 @@
this.tabPageButtons.Location = new System.Drawing.Point(4, 22);
this.tabPageButtons.Name = "tabPageButtons";
this.tabPageButtons.Padding = new System.Windows.Forms.Padding(3);
- this.tabPageButtons.Size = new System.Drawing.Size(652, 367);
+ this.tabPageButtons.Size = new System.Drawing.Size(619, 367);
this.tabPageButtons.TabIndex = 1;
this.tabPageButtons.Text = "Numeric Buttons Behaviour";
this.tabPageButtons.UseVisualStyleBackColor = true;
@@ -1014,28 +996,6 @@
this.label2.TabIndex = 0;
this.label2.Text = "Remote Button 1:";
//
- // label23
- //
- this.label23.AutoSize = true;
- this.label23.Location = new System.Drawing.Point(15, 473);
- this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(73, 13);
- this.label23.TabIndex = 5;
- this.label23.Text = "Jump on Play:";
- //
- // cbJumpOnPlay
- //
- this.cbJumpOnPlay.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.cbJumpOnPlay.FormattingEnabled = true;
- this.cbJumpOnPlay.Items.AddRange(new object[] {
- "None",
- "Playlist",
- "Now Playing"});
- this.cbJumpOnPlay.Location = new System.Drawing.Point(153, 470);
- this.cbJumpOnPlay.Name = "cbJumpOnPlay";
- this.cbJumpOnPlay.Size = new System.Drawing.Size(212, 21);
- this.cbJumpOnPlay.TabIndex = 6;
- //
// tabPageAutoPlay
//
this.tabPageAutoPlay.Controls.Add(this.groupBox2);
@@ -1071,42 +1031,33 @@
this.groupBox2.TabStop = false;
this.groupBox2.Text = "AutoPlay Options";
//
- // ckAutoPlayOnHome
+ // label25
//
- this.ckAutoPlayOnHome.AutoSize = true;
- this.ckAutoPlayOnHome.Location = new System.Drawing.Point(7, 115);
- this.ckAutoPlayOnHome.Name = "ckAutoPlayOnHome";
- this.ckAutoPlayOnHome.Size = new System.Drawing.Size(221, 17);
- this.ckAutoPlayOnHome.TabIndex = 9;
- this.ckAutoPlayOnHome.Text = "AutoPlay when returning to Home Screen";
- this.ckAutoPlayOnHome.UseVisualStyleBackColor = true;
+ this.label25.AutoSize = true;
+ this.label25.Location = new System.Drawing.Point(542, 21);
+ this.label25.Name = "label25";
+ this.label25.Size = new System.Drawing.Size(40, 13);
+ this.label25.TabIndex = 45;
+ this.label25.Text = "Shuffle";
//
- // ckAutoPlayOnInactivity
+ // ckShuffleOnInactivity
//
- this.ckAutoPlayOnInactivity.AutoSize = true;
- this.ckAutoPlayOnInactivity.Location = new System.Drawing.Point(7, 148);
- this.ckAutoPlayOnInactivity.Name = "ckAutoPlayOnInactivity";
- this.ckAutoPlayOnInactivity.Size = new System.Drawing.Size(91, 17);
- this.ckAutoPlayOnInactivity.TabIndex = 10;
- this.ckAutoPlayOnInactivity.Text = "Autoplay after";
- this.ckAutoPlayOnInactivity.UseVisualStyleBackColor = true;
+ this.ckShuffleOnInactivity.AutoSize = true;
+ this.ckShuffleOnInactivity.Location = new System.Drawing.Point(558, 146);
+ this.ckShuffleOnInactivity.Name = "ckShuffleOnInactivity";
+ this.ckShuffleOnInactivity.Size = new System.Drawing.Size(15, 14);
+ this.ckShuffleOnInactivity.TabIndex = 44;
+ this.ckShuffleOnInactivity.UseVisualStyleBackColor = true;
//
- // tbSecsInactive
+ // ckShuffleOnHome
//
- this.tbSecsInactive.Location = new System.Drawing.Point(98, 145);
- this.tbSecsInactive.Name = "tbSecsInactive";
- this.tbSecsInactive.Size = new System.Drawing.Size(46, 20);
- this.tbSecsInactive.TabIndex = 11;
+ this.ckShuffleOnHome.AutoSize = true;
+ this.ckShuffleOnHome.Location = new System.Drawing.Point(558, 114);
+ this.ckShuffleOnHome.Name = "ckShuffleOnHome";
+ this.ckShuffleOnHome.Size = new System.Drawing.Size(15, 14);
+ this.ckShuffleOnHome.TabIndex = 44;
+ this.ckShuffleOnHome.UseVisualStyleBackColor = true;
//
- // label24
- //
- this.label24.AutoSize = true;
- this.label24.Location = new System.Drawing.Point(149, 149);
- this.label24.Name = "label24";
- this.label24.Size = new System.Drawing.Size(103, 13);
- this.label24.TabIndex = 12;
- this.label24.Text = "seconds of inactivity";
- //
// ckShuffleOnStartup
//
this.ckShuffleOnStartup.AutoSize = true;
@@ -1116,6 +1067,20 @@
this.ckShuffleOnStartup.TabIndex = 44;
this.ckShuffleOnStartup.UseVisualStyleBackColor = true;
//
+ // tbAutoPlayOnInactivity
+ //
+ this.tbAutoPlayOnInactivity.Location = new System.Drawing.Point(384, 146);
+ this.tbAutoPlayOnInactivity.Name = "tbAutoPlayOnInactivity";
+ this.tbAutoPlayOnInactivity.Size = new System.Drawing.Size(148, 20);
+ this.tbAutoPlayOnInactivity.TabIndex = 43;
+ //
+ // tbAutoPlayOnHome
+ //
+ this.tbAutoPlayOnHome.Location = new System.Drawing.Point(384, 114);
+ this.tbAutoPlayOnHome.Name = "tbAutoPlayOnHome";
+ this.tbAutoPlayOnHome.Size = new System.Drawing.Size(148, 20);
+ this.tbAutoPlayOnHome.TabIndex = 43;
+ //
// tbAutoPlayOnStartup
//
this.tbAutoPlayOnStartup.Location = new System.Drawing.Point(384, 79);
@@ -1123,11 +1088,11 @@
this.tbAutoPlayOnStartup.Size = new System.Drawing.Size(148, 20);
this.tbAutoPlayOnStartup.TabIndex = 43;
//
- // cbAutoPlayOnStartup
+ // cbAutoPlayOnInactivity
//
- this.cbAutoPlayOnStartup.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.cbAutoPlayOnStartup.FormattingEnabled = true;
- this.cbAutoPlayOnStartup.Items.AddRange(new object[] {
+ this.cbAutoPlayOnInactivity.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cbAutoPlayOnInactivity.FormattingEnabled = true;
+ this.cbAutoPlayOnInactivity.Items.AddRange(new object[] {
"None",
"Genre",
"AlbumArtist",
@@ -1135,20 +1100,11 @@
"Playlist",
"Random",
"Load Folder"});
- this.cbAutoPlayOnStartup.Location = new System.Drawing.Point(272, 78);
- this.cbAutoPlayOnStartup.Name = "cbAutoPlayOnStartup";
- this.cbAutoPlayOnStartup.Size = new System.Drawing.Size(90, 21);
- this.cbAutoPlayOnStartup.TabIndex = 42;
+ this.cbAutoPlayOnInactivity.Location = new System.Drawing.Point(272, 144);
+ this.cbAutoPlayOnInactivity.Name = "cbAutoPlayOnInactivity";
+ this.cbAutoPlayOnInactivity.Size = new System.Drawing.Size(90, 21);
+ this.cbAutoPlayOnInactivity.TabIndex = 42;
//
- // label25
- //
- this.label25.AutoSize = true;
- this.label25.Location = new System.Drawing.Point(542, 21);
- this.label25.Name = "label25";
- this.label25.Size = new System.Drawing.Size(40, 13);
- this.label25.TabIndex = 45;
- this.label25.Text = "Shuffle";
- //
// cbAutoPlayOnHome
//
this.cbAutoPlayOnHome.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@@ -1166,27 +1122,11 @@
this.cbAutoPlayOnHome.Size = new System.Drawing.Size(90, 21);
this.cbAutoPlayOnHome.TabIndex = 42;
//
- // tbAutoPlayOnHome
+ // cbAutoPlayOnStartup
//
- this.tbAutoPlayOnHome.Location = new System.Drawing.Point(384, 114);
- this.tbAutoPlayOnHome.Name = "tbAutoPlayOnHome";
- this.tbAutoPlayOnHome.Size = new System.Drawing.Size(148, 20);
- this.tbAutoPlayOnHome.TabIndex = 43;
- //
- // ckShuffleOnHome
- //
- this.ckShuffleOnHome.AutoSize = true;
- this.ckShuffleOnHome.Location = new System.Drawing.Point(558, 114);
- this.ckShuffleOnHome.Name = "ckShuffleOnHome";
- this.ckShuffleOnHome.Size = new System.Drawing.Size(15, 14);
- this.ckShuffleOnHome.TabIndex = 44;
- this.ckShuffleOnHome.UseVisualStyleBackColor = true;
- //
- // cbAutoPlayOnInactivity
- //
- this.cbAutoPlayOnInactivity.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.cbAutoPlayOnInactivity.FormattingEnabled = true;
- this.cbAutoPlayOnInactivity.Items.AddRange(new object[] {
+ this.cbAutoPlayOnStartup.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cbAutoPlayOnStartup.FormattingEnabled = true;
+ this.cbAutoPlayOnStartup.Items.AddRange(new object[] {
"None",
"Genre",
"AlbumArtist",
@@ -1194,27 +1134,105 @@
"Playlist",
"Random",
"Load Folder"});
- this.cbAutoPlayOnInactivity.Location = new System.Drawing.Point(272, 144);
- this.cbAutoPlayOnInactivity.Name = "cbAutoPlayOnInactivity";
- this.cbAutoPlayOnInactivity.Size = new System.Drawing.Size(90, 21);
- this.cbAutoPlayOnInactivity.TabIndex = 42;
+ this.cbAutoPlayOnStartup.Location = new System.Drawing.Point(272, 78);
+ this.cbAutoPlayOnStartup.Name = "cbAutoPlayOnStartup";
+ this.cbAutoPlayOnStartup.Size = new System.Drawing.Size(90, 21);
+ this.cbAutoPlayOnStartup.TabIndex = 42;
//
- // tbAutoPlayOnInactivity
+ // label24
//
- this.tbAutoPlayOnInactivity.Location = new System.Drawing.Point(384, 146);
- this.tbAutoPlayOnInactivity.Name = "tbAutoPlayOnInactivity";
- this.tbAutoPlayOnInactivity.Size = new System.Drawing.Size(148, 20);
- this.tbAutoPlayOnInactivity.TabIndex = 43;
+ this.label24.AutoSize = true;
+ this.label24.Location = new System.Drawing.Point(149, 149);
+ this.label24.Name = "label24";
+ this.label24.Size = new System.Drawing.Size(103, 13);
+ this.label24.TabIndex = 12;
+ this.label24.Text = "seconds of inactivity";
//
- // ckShuffleOnInactivity
+ // tbSecsInactive
//
- this.ckShuffleOnInactivity.AutoSize = true;
- this.ckShuffleOnInactivity.Location = new System.Drawing.Point(558, 146);
- this.ckShuffleOnInactivity.Name = "ckShuffleOnInactivity";
- this.ckShuffleOnInactivity.Size = new System.Drawing.Size(15, 14);
- this.ckShuffleOnInactivity.TabIndex = 44;
- this.ckShuffleOnInactivity.UseVisualStyleBackColor = true;
+ this.tbSecsInactive.Location = new System.Drawing.Point(98, 145);
+ this.tbSecsInactive.Name = "tbSecsInactive";
+ this.tbSecsInactive.Size = new System.Drawing.Size(46, 20);
+ this.tbSecsInactive.TabIndex = 11;
//
+ // ckAutoPlayOnInactivity
+ //
+ this.ckAutoPlayOnInactivity.AutoSize = true;
+ this.ckAutoPlayOnInactivity.Location = new System.Drawing.Point(7, 148);
+ this.ckAutoPlayOnInactivity.Name = "ckAutoPlayOnInactivity";
+ this.ckAutoPlayOnInactivity.Size = new System.Drawing.Size(91, 17);
+ this.ckAutoPlayOnInactivity.TabIndex = 10;
+ this.ckAutoPlayOnInactivity.Text = "Autoplay after";
+ this.ckAutoPlayOnInactivity.UseVisualStyleBackColor = true;
+ //
+ // ckAutoPlayOnHome
+ //
+ this.ckAutoPlayOnHome.AutoSize = true;
+ this.ckAutoPlayOnHome.Location = new System.Drawing.Point(7, 115);
+ this.ckAutoPlayOnHome.Name = "ckAutoPlayOnHome";
+ this.ckAutoPlayOnHome.Size = new System.Drawing.Size(221, 17);
+ this.ckAutoPlayOnHome.TabIndex = 9;
+ this.ckAutoPlayOnHome.Text = "AutoPlay when returning to Home Screen";
+ this.ckAutoPlayOnHome.UseVisualStyleBackColor = true;
+ //
+ // ckAutoPlayOnResume
+ //
+ this.ckAutoPlayOnResume.AutoSize = true;
+ this.ckAutoPlayOnResume.Location = new System.Drawing.Point(6, 40);
+ this.ckAutoPlayOnResume.Name = "ckAutoPlayOnResume";
+ this.ckAutoPlayOnResume.Size = new System.Drawing.Size(227, 17);
+ this.ckAutoPlayOnResume.TabIndex = 8;
+ this.ckAutoPlayOnResume.Text = "AutoPlay on System Resume from Standby";
+ this.ckAutoPlayOnResume.UseVisualStyleBackColor = true;
+ //
+ // ckAutoPlayOnStartup
+ //
+ this.ckAutoPlayOnStartup.AutoSize = true;
+ this.ckAutoPlayOnStartup.Location = new System.Drawing.Point(7, 82);
+ this.ckAutoPlayOnStartup.Name = "ckAutoPlayOnStartup";
+ this.ckAutoPlayOnStartup.Size = new System.Drawing.Size(177, 17);
+ this.ckAutoPlayOnStartup.TabIndex = 7;
+ this.ckAutoPlayOnStartup.Text = "AutoPlay on MediaPortal startup";
+ this.ckAutoPlayOnStartup.UseVisualStyleBackColor = true;
+ //
+ // label23
+ //
+ this.label23.AutoSize = true;
+ this.label23.Location = new System.Drawing.Point(15, 473);
+ this.label23.Name = "label23";
+ this.label23.Size = new System.Drawing.Size(73, 13);
+ this.label23.TabIndex = 5;
+ this.label23.Text = "Jump on Play:";
+ //
+ // cbJumpOnPlay
+ //
+ this.cbJumpOnPlay.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cbJumpOnPlay.FormattingEnabled = true;
+ this.cbJumpOnPlay.Items.AddRange(new object[] {
+ "None",
+ "Playlist",
+ "Now Playing"});
+ this.cbJumpOnPlay.Location = new System.Drawing.Point(153, 470);
+ this.cbJumpOnPlay.Name = "cbJumpOnPlay";
+ this.cbJumpOnPlay.Size = new System.Drawing.Size(212, 21);
+ this.cbJumpOnPlay.TabIndex = 6;
+ //
+ // cbRatingComparator
+ //
+ this.cbRatingComparator.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cbRatingComparator.FormattingEnabled = true;
+ this.cbRatingComparator.Items.AddRange(new object[] {
+ ">",
+ "<",
+ "=",
+ "!=",
+ ">=",
+ "<="});
+ this.cbRatingComparator.Location = new System.Drawing.Point(203, 155);
+ this.cbRatingComparator.Name = "cbRatingComparator";
+ this.cbRatingComparator.Size = new System.Drawing.Size(37, 21);
+ this.cbRatingComparator.TabIndex = 19;
+ //
// OneButtonMusicConfig
//
this.AcceptButton = this.btOk;
@@ -1345,5 +1363,6 @@
private System.Windows.Forms.TextBox tbAutoPlayOnHome;
private System.Windows.Forms.ComboBox cbAutoPlayOnInactivity;
private System.Windows.Forms.ComboBox cbAutoPlayOnHome;
+ private System.Windows.Forms.ComboBox cbRatingComparator;
}
}
\ No newline at end of file
Modified: trunk/plugins/OneButtonMusic/OneButtonMusic/OneButtonMusicConfig.cs
===================================================================
--- trunk/plugins/OneButtonMusic/OneButtonMusic/OneButtonMusicConfig.cs 2011-11-28 17:44:34 UTC (rev 4350)
+++ trunk/plugins/OneButtonMusic/OneButtonMusic/OneButtonMusicConfig.cs 2011-11-28 21:12:56 UTC (rev 4351)
@@ -33,10 +33,10 @@
toolTip.SetToolTip(tbPlayList, "The Playlist to be loaded");
toolTip.SetToolTip(rbRandomPlaylist, "Load a random selected playlist from the playlist folder");
toolTip.SetToolTip(rbLucky, "Load the specified number of songs randomly from the database.");
- toolTip.SetToolTip(ckRating, "Specify the minimum rating a song must have to be selected");
+ toolTip.SetToolTip(ckRating, "Specify the rating a song must have to be selected");
toolTip.SetToolTip(rbLuckyAlbum, "Load the specified number of albums randomly from the database.");
toolTip.SetToolTip(rbPlayCurrentPlaylist, "Plays the currently active playlist.");
- toolTip.SetToolTip(rbUseFolder, "LOad songs from spefied folder and it's subfolder, if indicated");
+ toolTip.SetToolTip(rbUseFolder, "Load songs from spefied folder and it's subfolder, if indicated");
toolTip.SetToolTip(ckAutoShuffle, "Indicate, if the playlist should be shuffled, i.e. randomised, after loaded");
toolTip.SetToolTip(cbJumpOnPlay, "Which screen should be invoked after playback has started");
toolTip.SetToolTip(ckAutoPlayOnStartup, "Starts playback on MediaPortal startup using the supplied values");
@@ -44,13 +44,13 @@
toolTip.SetToolTip(ckAutoPlayOnHome, "Starts playback when returning to the Home screen and no player is playing.");
toolTip.SetToolTip(ckAutoPlayOnInactivity, "Starts playback after the given time of inactivity and no player is playing.");
- const string comboRemoteToolTip = "Action to take place when numeric button is pressed.\n" +
+ const string comboRemoteToolTip = "Action to take place when numeric button is pressed.\n\n" +
"None - No Action\n" +
"Genre - Select on Genre\n" +
"AlbumArtist - Select on Album Artist\n" +
"Artist - Select on Artist\n" +
"Playlist - Load specified playist or use current playlist when empty\n" +
- "Random - Select the specified number of songs randomly from database\n" +
+ "Random - Select the specified number of songs randomly from database.\n" +
"Load Folder - Loads all songs from the specified folder and it's sub folders\n" +
"Same Artist - Select all songs of the currently played artist\n" +
"Same Album - Select all songs from the currently played album\n";
@@ -65,6 +65,21 @@
toolTip.SetToolTip(comboBoxRemote8, comboRemoteToolTip);
toolTip.SetToolTip(comboBoxRemote9, comboRemoteToolTip);
+ const string toolTipValue = "For Random Specify the Number of Songs. Optionally add:\n" +
+ "One of the following Comparators: >, <, =, !=, >=, <=\n" +
+ "And the Rating to search for: 0 - 5\n" +
+ "e.g. 100 > 1 will add 100 songs with a ratiung greater than 1.";
+ toolTip.SetToolTip(tbValue0, toolTipValue);
+ toolTip.SetToolTip(tbValue1, toolTipValue);
+ toolTip.SetToolTip(tbValue2, toolTipValue);
+ toolTip.SetToolTip(tbValue3, toolTipValue);
+ toolTip.SetToolTip(tbValue4, toolTipValue);
+ toolTip.SetToolTip(tbValue5, toolTipValue);
+ toolTip.SetToolTip(tbValue6, toolTipValue);
+ toolTip.SetToolTip(tbValue7, toolTipValue);
+ toolTip.SetToolTip(tbValue8, toolTipValue);
+ toolTip.SetToolTip(tbValue9, toolTipValue);
+
const string tooltipShuffle = "Indicate, if the playlist should be shuffled, i.e. randomised, after loaded";
toolTip.SetToolTip(ckShuffle0, tooltipShuffle);
toolTip.SetToolTip(ckShuffle1, tooltipShuffle);
@@ -102,6 +117,7 @@
rbLucky.Checked = xmlreader.GetValueAsBool("onebuttonmusic", "feelinglucky", true);
numNumberOfSongs.Value = xmlreader.GetValueAsInt("onebuttonmusic", "numberSongs", 100);
ckRating.Checked = xmlreader.GetValueAsBool("onebuttonmusic", "useRating", false);
+ cbRatingComparator.Text = xmlreader.GetValueAsString("onebuttonmusic", "ratingcomparator", ">");
rating.Value = xmlreader.GetValueAsInt("onebuttonmusic", "rating", 0);
rbLuckyAlbum.Checked = xmlreader.GetValueAsBool("onebuttonmusic", "luckyalbums", false);
numNumberOfAlbums.Value = xmlreader.GetValueAsInt("onebuttonmusic", "numberAlbums", 10);
@@ -169,6 +185,7 @@
xmlwriter.SetValueAsBool("onebuttonmusic", "feelinglucky", rbLucky.Checked);
xmlwriter.SetValueAsBool("onebuttonmusic", "playcurrentplaylist", rbPlayCurrentPlaylist.Checked);
xmlwriter.SetValue("onebuttonmusic", "numberSongs", numNumberOfSongs.Value);
+ xmlwriter.SetValue("onebuttonmusic", "ratingcomparator", cbRatingComparator.Text);
xmlwriter.SetValueAsBool("onebuttonmusic", "useRating", ckRating.Checked);
xmlwriter.SetValue("onebuttonmusic", "rating", rating.Value);
xmlwriter.SetValueAsBool("onebuttonmusic", "luckyalbums", rbLuckyAlbum.Checked);
Modified: trunk/plugins/OneButtonMusic/OneButtonMusic/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/OneButtonMusic/OneButtonMusic/Properties/AssemblyInfo.cs 2011-11-28 17:44:34 UTC (rev 4350)
+++ trunk/plugins/OneButtonMusic/OneButtonMusic/Properties/AssemblyInfo.cs 2011-11-28 21:12:56 UTC (rev 4351)
@@ -31,8 +31,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.0.1.0")]
-[assembly: AssemblyFileVersion("2.0.1.0")]
+[assembly: AssemblyVersion("2.0.2.0")]
+[assembly: AssemblyFileVersion("2.0.2.0")]
// mediaportal compatible version
[assembly: CompatibleVersion("1.1.7.0")]
\ 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: <hwa...@us...> - 2011-11-28 17:44:40
|
Revision: 4350
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4350&view=rev
Author: hwahrmann
Date: 2011-11-28 17:44:34 +0000 (Mon, 28 Nov 2011)
Log Message:
-----------
Numeric Keys were interpreted twice. Causing Playback to stop after first title
Modified Paths:
--------------
trunk/plugins/OneButtonMusic/OneButtonMusic/OneButtonMusic.cs
trunk/plugins/OneButtonMusic/OneButtonMusic/OneButtonMusic.csproj
Modified: trunk/plugins/OneButtonMusic/OneButtonMusic/OneButtonMusic.cs
===================================================================
--- trunk/plugins/OneButtonMusic/OneButtonMusic/OneButtonMusic.cs 2011-11-23 13:52:01 UTC (rev 4349)
+++ trunk/plugins/OneButtonMusic/OneButtonMusic/OneButtonMusic.cs 2011-11-28 17:44:34 UTC (rev 4350)
@@ -19,6 +19,7 @@
{
#region Variables
+ private bool _keyHandled = false;
private Timer _timer = null;
private bool _startedPlayingViaOneButton = false;
private int _currentSongIndex = 0;
@@ -159,14 +160,15 @@
/// <param name="action"></param>
void OnAction(Action action)
{
- if (GUIWindowManager.ActiveWindow == (int)GUIWindow.Window.WINDOW_HOME ||
+ if (GUIWindowManager.ActiveWindow == (int)GUIWindow.Window.WINDOW_HOME ||
GUIWindowManager.ActiveWindow == (int)GUIWindow.Window.WINDOW_SECOND_HOME)
- {
+ {
switch (action.wID)
{
case Action.ActionType.ACTION_PLAY:
case Action.ActionType.ACTION_MUSIC_PLAY:
{
+ _keyHandled = true;
if (!_returnFromStandby)
{
@@ -246,6 +248,7 @@
case Action.ActionType.REMOTE_9:
case Action.ActionType.REMOTE_0:
{
+ _keyHandled = true;
string code = Enum.GetName(typeof(Action.ActionType), action.wID);
int index = Convert.ToInt32(code.Substring(code.Length - 1));
HandleCondition(_queryParms[index].ToLower(), _queryValues[index].Trim(), _queryShuffle[index]);
@@ -255,7 +258,7 @@
// Not all Remotes send "REMOTE_X" action, when a mumeric key is pressed
// Some send the KEY_PRESSED Action
- if (action.wID == Action.ActionType.ACTION_KEY_PRESSED)
+ if (action.wID == Action.ActionType.ACTION_KEY_PRESSED && !_keyHandled)
{
// Hanlde keys from 0 - 9
if (action.m_key.KeyChar >= 48 && action.m_key.KeyChar <= 57)
@@ -263,8 +266,8 @@
int index = action.m_key.KeyChar - 48;
HandleCondition(_queryParms[index].ToLower(), _queryValues[index].Trim(), _queryShuffle[index]);
}
+ _keyHandled = false;
}
-
}
}
Modified: trunk/plugins/OneButtonMusic/OneButtonMusic/OneButtonMusic.csproj
===================================================================
--- trunk/plugins/OneButtonMusic/OneButtonMusic/OneButtonMusic.csproj 2011-11-23 13:52:01 UTC (rev 4349)
+++ trunk/plugins/OneButtonMusic/OneButtonMusic/OneButtonMusic.csproj 2011-11-28 17:44:34 UTC (rev 4350)
@@ -71,26 +71,22 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Common.Utils, Version=1.1.7.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\Common-MP-TVE3\Common.Utils\bin\Release\Common.Utils.dll</HintPath>
+ <Reference Include="Common.Utils">
+ <HintPath>..\..\..\MediaPortal-1\Common-MP-TVE3\Common.Utils\bin\Debug\Common.Utils.dll</HintPath>
</Reference>
- <Reference Include="Core, Version=0.9.4.25894, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\mediaportal\Core\bin\Debug\Core.dll</HintPath>
+ <Reference Include="Core">
+ <HintPath>..\..\..\MediaPortal-1\mediaportal\Core\bin\Debug\Core.dll</HintPath>
</Reference>
- <Reference Include="Databases, Version=0.9.4.25896, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\mediaportal\Databases\bin\Debug\Databases.dll</HintPath>
+ <Reference Include="Databases">
+ <HintPath>..\..\..\MediaPortal-1\mediaportal\Databases\bin\Debug\Databases.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
- <Reference Include="Utils, Version=2.2.6.30715, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\mediaportal\Utils\bin\Debug\Utils.dll</HintPath>
+ <Reference Include="Utils">
+ <HintPath>..\..\..\MediaPortal-1\mediaportal\Utils\bin\Debug\Utils.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ste...@us...> - 2011-11-23 13:52:12
|
Revision: 4349
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4349&view=rev
Author: steve44src
Date: 2011-11-23 13:52:01 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
Added Paths:
-----------
trunk/plugins/FritzBox/releases/0.3.4.9/MpeRelease/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ste...@us...> - 2011-11-23 13:49:38
|
Revision: 4348
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4348&view=rev
Author: steve44src
Date: 2011-11-23 13:49:28 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
Added Paths:
-----------
trunk/plugins/FritzBox/releases/0.3.4.9/Tools/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ste...@us...> - 2011-11-23 13:48:50
|
Revision: 4347
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4347&view=rev
Author: steve44src
Date: 2011-11-23 13:48:42 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
Added Paths:
-----------
trunk/plugins/FritzBox/releases/0.3.4.9/MP2Version/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ste...@us...> - 2011-11-23 13:47:09
|
Revision: 4346
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4346&view=rev
Author: steve44src
Date: 2011-11-23 13:47:00 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
Added Paths:
-----------
trunk/plugins/FritzBox/releases/0.3.4.9/Build/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ste...@us...> - 2011-11-23 13:44:27
|
Revision: 4345
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4345&view=rev
Author: steve44src
Date: 2011-11-23 13:44:18 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
Added Paths:
-----------
trunk/plugins/FritzBox/releases/0.3.4.9/FritzBox/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ste...@us...> - 2011-11-23 13:41:47
|
Revision: 4344
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4344&view=rev
Author: steve44src
Date: 2011-11-23 13:41:41 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
Added Paths:
-----------
trunk/plugins/FritzBox/releases/0.3.4.9/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ste...@us...> - 2011-11-23 13:40:25
|
Revision: 4343
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4343&view=rev
Author: steve44src
Date: 2011-11-23 13:40:18 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
Removed Paths:
-------------
trunk/plugins/FritzBox/tags/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ste...@us...> - 2011-11-23 13:34:05
|
Revision: 4342
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4342&view=rev
Author: steve44src
Date: 2011-11-23 13:33:59 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
Added Paths:
-----------
trunk/plugins/FritzBox/tags/before-reaper-commit/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ste...@us...> - 2011-11-23 13:33:08
|
Revision: 4341
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4341&view=rev
Author: steve44src
Date: 2011-11-23 13:33:02 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
- tag subdir
Added Paths:
-----------
trunk/plugins/FritzBox/tags/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rs...@us...> - 2011-11-23 11:47:52
|
Revision: 4340
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4340&view=rev
Author: rsenden
Date: 2011-11-23 11:47:43 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
Updated encoding for readme, history documents
Modified Paths:
--------------
trunk/plugins/KeyboardInputPlugin/HISTORY.HTML
trunk/plugins/KeyboardInputPlugin/README.HTML
trunk/plugins/KeyboardInputPlugin/README_files/filelist.xml
Removed Paths:
-------------
trunk/plugins/KeyboardInputPlugin/README_files/image003.jpg
Modified: trunk/plugins/KeyboardInputPlugin/HISTORY.HTML
===================================================================
--- trunk/plugins/KeyboardInputPlugin/HISTORY.HTML 2011-11-23 11:33:17 UTC (rev 4339)
+++ trunk/plugins/KeyboardInputPlugin/HISTORY.HTML 2011-11-23 11:47:43 UTC (rev 4340)
@@ -5,7 +5,7 @@
xmlns="http://www.w3.org/TR/REC-html40">
<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
+<meta http-equiv=Content-Type content="text/html; charset=utf-8">
<meta name=ProgId content=Word.Document>
<meta name=Generator content="Microsoft Word 12">
<meta name=Originator content="Microsoft Word 12">
@@ -17,8 +17,8 @@
<o:LastAuthor>Ruud Senden</o:LastAuthor>
<o:Revision>2</o:Revision>
<o:TotalTime>40</o:TotalTime>
- <o:Created>2011-11-23T10:40:00Z</o:Created>
- <o:LastSaved>2011-11-23T11:20:00Z</o:LastSaved>
+ <o:Created>2011-11-23T11:46:00Z</o:Created>
+ <o:LastSaved>2011-11-23T11:46:00Z</o:LastSaved>
<o:Pages>2</o:Pages>
<o:Words>916</o:Words>
<o:Characters>5044</o:Characters>
@@ -332,13 +332,6 @@
<!--
/* Font Definitions */
@font-face
- {font-family:Wingdings;
- panose-1:5 0 0 0 0 0 0 0 0 0;
- mso-font-charset:2;
- mso-generic-font-family:auto;
- mso-font-pitch:variable;
- mso-font-signature:0 268435456 0 0 -2147483648 0;}
-@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;
mso-font-charset:1;
@@ -356,7 +349,7 @@
mso-pagination:widow-orphan;
font-size:12.0pt;
font-family:"Times New Roman","serif";
- mso-fareast-font-family:SimSun;
+ mso-fareast-font-family:"Times New Roman";
mso-fareast-theme-font:minor-fareast;}
h1
{mso-style-priority:9;
@@ -371,7 +364,7 @@
mso-outline-level:1;
font-size:24.0pt;
font-family:"Times New Roman","serif";
- mso-fareast-font-family:SimSun;
+ mso-fareast-font-family:"Times New Roman";
mso-fareast-theme-font:minor-fareast;}
h2
{mso-style-priority:9;
@@ -386,7 +379,7 @@
mso-outline-level:2;
font-size:18.0pt;
font-family:"Times New Roman","serif";
- mso-fareast-font-family:SimSun;
+ mso-fareast-font-family:"Times New Roman";
mso-fareast-theme-font:minor-fareast;}
span.Heading1Char
{mso-style-name:"Heading 1 Char";
@@ -399,7 +392,7 @@
font-family:"Cambria","serif";
mso-ascii-font-family:Cambria;
mso-ascii-theme-font:major-latin;
- mso-fareast-font-family:SimSun;
+ mso-fareast-font-family:"Times New Roman";
mso-fareast-theme-font:major-fareast;
mso-hansi-font-family:Cambria;
mso-hansi-theme-font:major-latin;
@@ -421,7 +414,7 @@
font-family:"Cambria","serif";
mso-ascii-font-family:Cambria;
mso-ascii-theme-font:major-latin;
- mso-fareast-font-family:SimSun;
+ mso-fareast-font-family:"Times New Roman";
mso-fareast-theme-font:major-fareast;
mso-hansi-font-family:Cambria;
mso-hansi-theme-font:major-latin;
@@ -450,18 +443,50 @@
mso-list-template-ids:1468717466;}
@list l0:level1
{mso-level-number-format:bullet;
- mso-level-text:\F0B7;
+ mso-level-text:;
mso-level-tab-stop:36.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Symbol;}
+@list l0:level2
+ {mso-level-tab-stop:72.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l0:level3
+ {mso-level-tab-stop:108.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l0:level4
+ {mso-level-tab-stop:144.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l0:level5
+ {mso-level-tab-stop:180.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l0:level6
+ {mso-level-tab-stop:216.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l0:level7
+ {mso-level-tab-stop:252.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l0:level8
+ {mso-level-tab-stop:288.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l0:level9
+ {mso-level-tab-stop:324.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
@list l1
{mso-list-id:173230818;
mso-list-template-ids:-252027432;}
@list l1:level1
{mso-level-number-format:bullet;
- mso-level-text:\F0B7;
+ mso-level-text:;
mso-level-tab-stop:36.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
@@ -476,12 +501,40 @@
mso-ansi-font-size:10.0pt;
font-family:"Courier New";
mso-bidi-font-family:"Times New Roman";}
+@list l1:level3
+ {mso-level-tab-stop:108.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l1:level4
+ {mso-level-tab-stop:144.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l1:level5
+ {mso-level-tab-stop:180.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l1:level6
+ {mso-level-tab-stop:216.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l1:level7
+ {mso-level-tab-stop:252.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l1:level8
+ {mso-level-tab-stop:288.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l1:level9
+ {mso-level-tab-stop:324.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
@list l2
{mso-list-id:201864976;
mso-list-template-ids:1384538122;}
@list l2:level1
{mso-level-number-format:bullet;
- mso-level-text:\F0B7;
+ mso-level-text:;
mso-level-tab-stop:36.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
@@ -496,34 +549,126 @@
mso-ansi-font-size:10.0pt;
font-family:"Courier New";
mso-bidi-font-family:"Times New Roman";}
+@list l2:level3
+ {mso-level-tab-stop:108.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l2:level4
+ {mso-level-tab-stop:144.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l2:level5
+ {mso-level-tab-stop:180.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l2:level6
+ {mso-level-tab-stop:216.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l2:level7
+ {mso-level-tab-stop:252.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l2:level8
+ {mso-level-tab-stop:288.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l2:level9
+ {mso-level-tab-stop:324.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
@list l3
{mso-list-id:271743139;
mso-list-template-ids:-828498394;}
@list l3:level1
{mso-level-number-format:bullet;
- mso-level-text:\F0B7;
+ mso-level-text:;
mso-level-tab-stop:36.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Symbol;}
+@list l3:level2
+ {mso-level-tab-stop:72.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l3:level3
+ {mso-level-tab-stop:108.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l3:level4
+ {mso-level-tab-stop:144.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l3:level5
+ {mso-level-tab-stop:180.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l3:level6
+ {mso-level-tab-stop:216.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l3:level7
+ {mso-level-tab-stop:252.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l3:level8
+ {mso-level-tab-stop:288.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l3:level9
+ {mso-level-tab-stop:324.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
@list l4
{mso-list-id:907809527;
mso-list-template-ids:-43499458;}
@list l4:level1
{mso-level-number-format:bullet;
- mso-level-text:\F0B7;
+ mso-level-text:;
mso-level-tab-stop:36.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Symbol;}
+@list l4:level2
+ {mso-level-tab-stop:72.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l4:level3
+ {mso-level-tab-stop:108.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l4:level4
+ {mso-level-tab-stop:144.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l4:level5
+ {mso-level-tab-stop:180.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l4:level6
+ {mso-level-tab-stop:216.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l4:level7
+ {mso-level-tab-stop:252.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l4:level8
+ {mso-level-tab-stop:288.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l4:level9
+ {mso-level-tab-stop:324.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
@list l5
{mso-list-id:1149439426;
mso-list-template-ids:-203231614;}
@list l5:level1
{mso-level-number-format:bullet;
- mso-level-text:\F0B7;
+ mso-level-text:;
mso-level-tab-stop:36.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
@@ -538,34 +683,126 @@
mso-ansi-font-size:10.0pt;
font-family:"Courier New";
mso-bidi-font-family:"Times New Roman";}
+@list l5:level3
+ {mso-level-tab-stop:108.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l5:level4
+ {mso-level-tab-stop:144.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l5:level5
+ {mso-level-tab-stop:180.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l5:level6
+ {mso-level-tab-stop:216.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l5:level7
+ {mso-level-tab-stop:252.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l5:level8
+ {mso-level-tab-stop:288.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l5:level9
+ {mso-level-tab-stop:324.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
@list l6
{mso-list-id:1179277009;
mso-list-template-ids:-819716864;}
@list l6:level1
{mso-level-number-format:bullet;
- mso-level-text:\F0B7;
+ mso-level-text:;
mso-level-tab-stop:36.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Symbol;}
+@list l6:level2
+ {mso-level-tab-stop:72.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l6:level3
+ {mso-level-tab-stop:108.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l6:level4
+ {mso-level-tab-stop:144.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l6:level5
+ {mso-level-tab-stop:180.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l6:level6
+ {mso-level-tab-stop:216.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l6:level7
+ {mso-level-tab-stop:252.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l6:level8
+ {mso-level-tab-stop:288.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l6:level9
+ {mso-level-tab-stop:324.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
@list l7
{mso-list-id:1280644938;
mso-list-template-ids:1731652506;}
@list l7:level1
{mso-level-number-format:bullet;
- mso-level-text:\F0B7;
+ mso-level-text:;
mso-level-tab-stop:36.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Symbol;}
+@list l7:level2
+ {mso-level-tab-stop:72.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l7:level3
+ {mso-level-tab-stop:108.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l7:level4
+ {mso-level-tab-stop:144.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l7:level5
+ {mso-level-tab-stop:180.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l7:level6
+ {mso-level-tab-stop:216.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l7:level7
+ {mso-level-tab-stop:252.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l7:level8
+ {mso-level-tab-stop:288.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l7:level9
+ {mso-level-tab-stop:324.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
@list l8
{mso-list-id:1336373281;
mso-list-template-ids:150882396;}
@list l8:level1
{mso-level-number-format:bullet;
- mso-level-text:\F0B7;
+ mso-level-text:;
mso-level-tab-stop:36.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
@@ -580,12 +817,40 @@
mso-ansi-font-size:10.0pt;
font-family:"Courier New";
mso-bidi-font-family:"Times New Roman";}
+@list l8:level3
+ {mso-level-tab-stop:108.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l8:level4
+ {mso-level-tab-stop:144.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l8:level5
+ {mso-level-tab-stop:180.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l8:level6
+ {mso-level-tab-stop:216.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l8:level7
+ {mso-level-tab-stop:252.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l8:level8
+ {mso-level-tab-stop:288.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l8:level9
+ {mso-level-tab-stop:324.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
@list l9
{mso-list-id:1675835159;
mso-list-template-ids:1758646566;}
@list l9:level1
{mso-level-number-format:bullet;
- mso-level-text:\F0B7;
+ mso-level-text:;
mso-level-tab-stop:36.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
@@ -600,17 +865,77 @@
mso-ansi-font-size:10.0pt;
font-family:"Courier New";
mso-bidi-font-family:"Times New Roman";}
+@list l9:level3
+ {mso-level-tab-stop:108.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l9:level4
+ {mso-level-tab-stop:144.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l9:level5
+ {mso-level-tab-stop:180.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l9:level6
+ {mso-level-tab-stop:216.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l9:level7
+ {mso-level-tab-stop:252.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l9:level8
+ {mso-level-tab-stop:288.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l9:level9
+ {mso-level-tab-stop:324.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
@list l10
{mso-list-id:2053796985;
mso-list-template-ids:932107218;}
@list l10:level1
{mso-level-number-format:bullet;
- mso-level-text:\F0B7;
+ mso-level-text:;
mso-level-tab-stop:36.0pt;
mso-level-number-position:left;
text-indent:-18.0pt;
mso-ansi-font-size:10.0pt;
font-family:Symbol;}
+@list l10:level2
+ {mso-level-tab-stop:72.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l10:level3
+ {mso-level-tab-stop:108.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l10:level4
+ {mso-level-tab-stop:144.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l10:level5
+ {mso-level-tab-stop:180.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l10:level6
+ {mso-level-tab-stop:216.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l10:level7
+ {mso-level-tab-stop:252.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l10:level8
+ {mso-level-tab-stop:288.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
+@list l10:level9
+ {mso-level-tab-stop:324.0pt;
+ mso-level-number-position:left;
+ text-indent:-18.0pt;}
ol
{margin-bottom:0cm;}
ul
@@ -636,7 +961,7 @@
font-family:"Times New Roman","serif";}
</style>
<![endif]--><!--[if gte mso 9]><xml>
- <o:shapedefaults v:ext="edit" spidmax="2050"/>
+ <o:shapedefaults v:ext="edit" spidmax="3074"/>
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1"/>
@@ -675,14 +1000,14 @@
to the new keyboard hook mechanism, mappings are handled slightly
different. Previous versions would pass on any keys to MediaPortal if they
were not mapped under the current conditions. For example, if you mapped
- the Enter key only under the condition \x91Media is playing\x92, if no media was
- playing the plug-in would pass on the Enter key to MediaPortal, in effect causing
- the \x91Select Item\x92 action. The new mechanism will <b style='mso-bidi-font-weight:
- normal'><i style='mso-bidi-font-style:normal'>never</i></b> pass on the
- Enter key to MediaPortal once it has been defined in the plug-in
- configuration. In this example, you would want to add an additional No
- Conditions -> Action \x91Select Item\x92 mapping to the Enter key in the
- plug-in configuration.<o:p></o:p></span></li>
+ the Enter key only under the condition ‘Media is playing’, if no media was
+ playing the plug-in would pass on the Enter key to MediaPortal, in effect
+ causing the ‘Select Item’ action. The new mechanism will <b
+ style='mso-bidi-font-weight:normal'><i style='mso-bidi-font-style:normal'>never</i></b>
+ pass on the Enter key to MediaPortal once it has been defined in the
+ plug-in configuration. In this example, you would want to add an
+ additional No Conditions -> Action ‘Select Item’ mapping to the Enter
+ key in the plug-in configuration.<o:p></o:p></span></li>
<li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
mso-list:l4 level1 lfo1;tab-stops:list 36.0pt'><span lang=EN-US
style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>TODO:
@@ -703,8 +1028,8 @@
some of the paths. Specifically, in order for your custom mappings to be
picked up, you may need to move [MP install
dir]\defaults\InputDeviceMappings\Keyboard.xml or [MP install
- dir]\InputDeviceMappings\defaults\Keyboard.xml to %ProgramData%\Team Mediaportal\Mediaportal\InputDeviceMappings
- <o:p></o:p></span></li>
+ dir]\InputDeviceMappings\defaults\Keyboard.xml to %ProgramData%\Team
+ Mediaportal\Mediaportal\InputDeviceMappings <o:p></o:p></span></li>
<li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
mso-list:l4 level1 lfo1;tab-stops:list 36.0pt'><span lang=EN-US
style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>TODO:
@@ -763,9 +1088,9 @@
<li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:
auto;mso-list:l2 level2 lfo2;tab-stops:list 72.0pt'><span lang=EN-US
style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Instead,
- all available predefined mappings are copied to the MediaPortal
- directory; the user can later import one or more of these using the
- configuration 'Import' button<o:p></o:p></span></li>
+ all available predefined mappings are copied to the MediaPortal directory;
+ the user can later import one or more of these using the configuration
+ 'Import' button<o:p></o:p></span></li>
</ul>
<li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:auto;
mso-list:l2 level1 lfo2;tab-stops:list 36.0pt'><span style='mso-fareast-font-family:
@@ -992,7 +1317,7 @@
style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>Keystrokes
that are mapped by this plug-in will be 'eaten'; they will not be passed
on to MediaPortal, so no more 'double' key presses or the need to remove
- MediaPortal\x92s keymap.xml.<o:p></o:p></span></li>
+ MediaPortal’s keymap.xml.<o:p></o:p></span></li>
<li class=MsoNormal style='mso-margin-top-alt:auto;mso-margin-bottom-alt:
auto;mso-list:l5 level2 lfo9;tab-stops:list 72.0pt'><span lang=EN-US
style='mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US'>(Limited)
Modified: trunk/plugins/KeyboardInputPlugin/README.HTML
===================================================================
--- trunk/plugins/KeyboardInputPlugin/README.HTML 2011-11-23 11:33:17 UTC (rev 4339)
+++ trunk/plugins/KeyboardInputPlugin/README.HTML 2011-11-23 11:47:43 UTC (rev 4340)
@@ -1,5681 +1,2839 @@
-\xFF\xFE< |
2 messages has been excluded from this view by a project administrator.
