Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4359] trunk/plugins/FritzBox
|
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.
|
