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...> - 2013-04-18 21:17:42
|
Revision: 4564
http://sourceforge.net/p/mp-plugins/code/4564
Author: horned-reaper
Date: 2013-04-18 21:17:39 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/Docs/Changes.txt
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/releases/update.xml
Added Paths:
-----------
trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4563.mpe1
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2013-04-18 21:09:57 UTC (rev 4563)
+++ trunk/plugins/FritzBox/Build/Build.log 2013-04-18 21:17:39 UTC (rev 4564)
@@ -1,6 +1,6 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4562
+SVN Version: 4563
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs
@@ -11,7 +11,7 @@
Copyright (C) Microsoft Corporation. Alle Rechte vorbehalten.
Die Projekte in dieser Projektmappe werden nacheinander erstellt. Um eine parallele Erstellung zu erm\x94glichen, m\x81ssen Sie den Schalter "/m" hinzuf\x81gen.
-Der Buildvorgang wurde am 18.04.2013 23:01:40 gestartet.
+Der Buildvorgang wurde am 18.04.2013 23:11:23 gestartet.
Projekt "D:\FritzBox\FritzBox.sln" auf Knoten "1", Rebuild Ziel(e).
ValidateSolutionConfiguration:
Die Projektmappenkonfiguration "Release|Any CPU" wird erstellt.
@@ -120,7 +120,7 @@
0 Warnung(en)
0 Fehler
-Verstrichene Zeit 00:00:50.43
+Verstrichene Zeit 00:00:02.14
Reverting to build 0
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
@@ -271,7 +271,7 @@
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
37 Datei(en) kopiert
MpeMaker version: 1.3.0.0
-Build started at 23:03:01
+Build started at 23:11:27
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Modified: trunk/plugins/FritzBox/Docs/Changes.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Changes.txt 2013-04-18 21:09:57 UTC (rev 4563)
+++ trunk/plugins/FritzBox/Docs/Changes.txt 2013-04-18 21:17:39 UTC (rev 4564)
@@ -1,3 +1,3 @@
-1.0.0.4562:
+1.0.0.4563:
Fixed bug:
-- incoming call notifications aren't shown when option "Show on outgoing call" is disabled and an outgoing call has been done
\ No newline at end of file
+- incoming call notifications aren't shown when option "Show on outgoing call" is disabled and an outgoing call has been done (thanks to Django.edwards!)
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2013-04-18 21:09:57 UTC (rev 4563)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2013-04-18 21:17:39 UTC (rev 4564)
@@ -879,7 +879,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4562</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4563</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -902,7 +902,7 @@
<Major>1</Major>
<Minor>0</Minor>
<Build>0</Build>
- <Revision>4562</Revision>
+ <Revision>4563</Revision>
</Version>
<ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box information from MediaPortal.
@@ -916,7 +916,7 @@
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
- <ReleaseDate>2013-04-18T23:03:01.6718295+02:00</ReleaseDate>
+ <ReleaseDate>2013-04-18T23:11:27.9286738+02:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Added: trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4563.mpe1
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4563.mpe1
===================================================================
--- trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4563.mpe1 2013-04-18 21:09:57 UTC (rev 4563)
+++ trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4563.mpe1 2013-04-18 21:17:39 UTC (rev 4564)
Property changes on: trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4563.mpe1
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/FritzBox/releases/update.xml
===================================================================
--- trunk/plugins/FritzBox/releases/update.xml 2013-04-18 21:09:57 UTC (rev 4563)
+++ trunk/plugins/FritzBox/releases/update.xml 2013-04-18 21:17:39 UTC (rev 4564)
@@ -112,7 +112,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4562</DesignedForVersion>
+ <DesignedForVersion>1.1.7.0</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -135,7 +135,7 @@
<Major>1</Major>
<Minor>0</Minor>
<Build>0</Build>
- <Revision>4562</Revision>
+ <Revision>0</Revision>
</Version>
<ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box information from MediaPortal.
@@ -149,7 +149,7 @@
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
- <ReleaseDate>2013-04-18T23:03:01.6718295+02:00</ReleaseDate>
+ <ReleaseDate>2013-04-18T23:10:46.1521221+02:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
@@ -187,5 +187,191 @@
</ProjectSettings>
<IsSkin>false</IsSkin>
</PackageClass>
+ <PackageClass>
+ <Version>2.0</Version>
+ <Groups>
+ <Items>
+ <GroupItem Name="Default">
+ <DisplayName>Default</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Default</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Titan Skin">
+ <DisplayName>Titan Skin</DisplayName>
+ <DefaulChecked>false</DefaulChecked>
+ <Description>Titan Skin</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Blue3 Skin">
+ <DisplayName>Blue3 Skin</DisplayName>
+ <DefaulChecked>false</DefaulChecked>
+ <Description>Blue3 Skin</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Maya Skin">
+ <DisplayName>Maya Skin</DisplayName>
+ <DefaulChecked>false</DefaulChecked>
+ <Description>Maya Skin</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Black & White Skin">
+ <DisplayName>Black & White Skin</DisplayName>
+ <DefaulChecked>false</DefaulChecked>
+ <Description>Black & White Skin</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Default Skin">
+ <DisplayName>Default Skin</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Default Skin</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="DefaultWide Skin">
+ <DisplayName>DefaultWide Skin</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>DefaultWide Skin</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Streamed MP Skin">
+ <DisplayName>Streamed MP Skin</DisplayName>
+ <DefaulChecked>false</DefaulChecked>
+ <Description>Streamed MP Skin</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Avalon Skin">
+ <DisplayName>Avalon Skin</DisplayName>
+ <DefaulChecked>false</DefaulChecked>
+ <Description>Avalon Skin</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items />
+ </Sections>
+ <Dependencies>
+ <Items>
+ <DependencyItem>
+ <Type>MediaPortal</Type>
+ <Id />
+ <MinVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MinVersion>
+ <MaxVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MaxVersion>
+ <WarnOnly>false</WarnOnly>
+ <Message>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ </Items>
+ </Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="FritzBox.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.1.0.0</MinRequiredVersion>
+ <DesignedForVersion>1.1.7.4563</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items>
+ <SubSystemItem Name="MP.Config" />
+ </Items>
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
+ <GeneralInfo>
+ <Name>FritzBox Manager</Name>
+ <Id>8cb6bbc2-5473-4a63-a8f9-e0bec7c8c81c</Id>
+ <Author>Horned_Reaper, Steve, Chefkoch</Author>
+ <HomePage>http://www.team-mediaportal.com/extensions/other/fritzbox-manager-phone-manager-callmonitor-for-avm-fritz-box</HomePage>
+ <ForumPage>http://forum.team-mediaportal.com/mediaportal-plugins-47/fritz-box-manager-english-forum-103177/#post817050</ForumPage>
+ <UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=52</UpdateUrl>
+ <Version>
+ <Major>1</Major>
+ <Minor>0</Minor>
+ <Build>0</Build>
+ <Revision>4563</Revision>
+ </Version>
+ <ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box information from MediaPortal.
+
+Features:
+- notification for incoming and outgoing calls via window, sound and contact picture
+- MediaPortal Player is automatically paused and resumed on calls
+- access call lists, voice box and phone book directly in MediaPortal
+- voice box message notification in any MediaPortal screen
+- connection establishment from call list, voice box or phone book entries
+- language localization</ExtensionDescription>
+ <VersionDescription />
+ <DevelopmentStatus>Stable</DevelopmentStatus>
+ <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
+ <ReleaseDate>2013-04-18T23:11:27.9286738+02:00</ReleaseDate>
+ <Tags>fritzbox, fritzbox manager, callmonitor</Tags>
+ <Location>..\MpeRelease\FritzBox.mpe1</Location>
+ <Params>
+ <Items>
+ <SectionParam Name="Online Icon">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Configuration file">
+ <Value />
+ <ValueType>Template</ValueType>
+ <Description>The file used to configure the extension.
+ If have .exe extension the will be executed
+ If have .dll extension used like MP plugin configuration</Description>
+ </SectionParam>
+ <SectionParam Name="Online Screenshots">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>Online stored screenshot urls separated by ; </Description>
+ </SectionParam>
+ <SectionParam Name="Force to uninstall on update">
+ <Value>yes</Value>
+ <ValueType>Bool</ValueType>
+ <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ </GeneralInfo>
+ <UniqueFileList>
+ <Items />
+ </UniqueFileList>
+ <ProjectSettings>
+ <FolderGroups />
+ </ProjectSettings>
+ <IsSkin>false</IsSkin>
+ </PackageClass>
</Items>
</ExtensionCollection>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hor...@us...> - 2013-04-18 21:10:14
|
Revision: 4563
http://sourceforge.net/p/mp-plugins/code/4563
Author: horned-reaper
Date: 2013-04-18 21:09:57 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/Docs/Changes.txt
trunk/plugins/FritzBox/FritzBox/FritzBox.cs
trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs
trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_el.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_en-US.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_es.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_fr.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_it.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_nl.xml
trunk/plugins/FritzBox/FritzBox/Languages/strings_ru.xml
trunk/plugins/FritzBox/FritzBox/Settings.cs
trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml
trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml
trunk/plugins/FritzBox/FritzBox/Skin/Titan/FritzManager.xml
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/releases/update.xml
Added Paths:
-----------
trunk/plugins/FritzBox/FritzBox/Languages/strings_en-GB.xml
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_in.png
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_out.png
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_unanswered.png
trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_in.png
trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_out.png
trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_unanswered.png
trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_in.png
trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_out.png
trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_unanswered.png
trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_in.png
trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_out.png
trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_unanswered.png
trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/Call_in.png
trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/Call_out.png
trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/Call_unanswered.png
trunk/plugins/FritzBox/FritzBox/Skin/Maya/Media/FritzBox/Call_in.png
trunk/plugins/FritzBox/FritzBox/Skin/Maya/Media/FritzBox/Call_out.png
trunk/plugins/FritzBox/FritzBox/Skin/Maya/Media/FritzBox/Call_unanswered.png
trunk/plugins/FritzBox/FritzBox/Skin/Streamed MP/Media/FritzBox/Call_in.png
trunk/plugins/FritzBox/FritzBox/Skin/Streamed MP/Media/FritzBox/Call_out.png
trunk/plugins/FritzBox/FritzBox/Skin/Streamed MP/Media/FritzBox/Call_unanswered.png
trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/Call_in.png
trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/Call_out.png
trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/Call_unanswered.png
trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/DefaultInboxBig.png
trunk/plugins/FritzBox/FritzBox/bin/x86/
trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4562.mpe1
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/Build/Build.log 2013-04-18 21:09:57 UTC (rev 4563)
@@ -1,6 +1,6 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4556
+SVN Version: 4562
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs
@@ -11,7 +11,7 @@
Copyright (C) Microsoft Corporation. Alle Rechte vorbehalten.
Die Projekte in dieser Projektmappe werden nacheinander erstellt. Um eine parallele Erstellung zu erm\x94glichen, m\x81ssen Sie den Schalter "/m" hinzuf\x81gen.
-Der Buildvorgang wurde am 23.03.2013 14:04:23 gestartet.
+Der Buildvorgang wurde am 18.04.2013 23:01:40 gestartet.
Projekt "D:\FritzBox\FritzBox.sln" auf Knoten "1", Rebuild Ziel(e).
ValidateSolutionConfiguration:
Die Projektmappenkonfiguration "Release|Any CPU" wird erstellt.
@@ -120,7 +120,7 @@
0 Warnung(en)
0 Fehler
-Verstrichene Zeit 00:00:01.34
+Verstrichene Zeit 00:00:50.43
Reverting to build 0
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
@@ -137,6 +137,9 @@
..\FritzBox\Skin\Avalon\Media\FritzBox\CallMonitor.Missing.png
..\FritzBox\Skin\Avalon\Media\FritzBox\CallMonitor.Unknown.png
..\FritzBox\Skin\Avalon\Media\FritzBox\callout.png
+..\FritzBox\Skin\Avalon\Media\FritzBox\Call_in.png
+..\FritzBox\Skin\Avalon\Media\FritzBox\Call_out.png
+..\FritzBox\Skin\Avalon\Media\FritzBox\Call_unanswered.png
..\FritzBox\Skin\Avalon\Media\FritzBox\Phone_Icon_Home.png
..\FritzBox\Skin\Avalon\Media\FritzBox\Phone_Icon_Mobile.png
..\FritzBox\Skin\Avalon\Media\FritzBox\Phone_Icon_Work.png
@@ -147,6 +150,9 @@
..\FritzBox\Skin\Black & White\Media\FritzBox\CallMonitor.Missing.png
..\FritzBox\Skin\Black & White\Media\FritzBox\CallMonitor.Unknown.png
..\FritzBox\Skin\Black & White\Media\FritzBox\callout.png
+..\FritzBox\Skin\Black & White\Media\FritzBox\Call_in.png
+..\FritzBox\Skin\Black & White\Media\FritzBox\Call_out.png
+..\FritzBox\Skin\Black & White\Media\FritzBox\Call_unanswered.png
..\FritzBox\Skin\Black & White\Media\FritzBox\Phone_Icon_Home.png
..\FritzBox\Skin\Black & White\Media\FritzBox\Phone_Icon_Mobile.png
..\FritzBox\Skin\Black & White\Media\FritzBox\Phone_Icon_Work.png
@@ -157,6 +163,9 @@
..\FritzBox\Skin\Blue3\Media\FritzBox\CallMonitor.Missing.png
..\FritzBox\Skin\Blue3\Media\FritzBox\CallMonitor.Unknown.png
..\FritzBox\Skin\Blue3\Media\FritzBox\callout.png
+..\FritzBox\Skin\Blue3\Media\FritzBox\Call_in.png
+..\FritzBox\Skin\Blue3\Media\FritzBox\Call_out.png
+..\FritzBox\Skin\Blue3\Media\FritzBox\Call_unanswered.png
..\FritzBox\Skin\Blue3\Media\FritzBox\Phone_Icon_Home.png
..\FritzBox\Skin\Blue3\Media\FritzBox\Phone_Icon_Mobile.png
..\FritzBox\Skin\Blue3\Media\FritzBox\Phone_Icon_Work.png
@@ -167,6 +176,9 @@
..\FritzBox\Skin\Default\Media\FritzBox\CallMonitor.Missing.png
..\FritzBox\Skin\Default\Media\FritzBox\CallMonitor.Unknown.png
..\FritzBox\Skin\Default\Media\FritzBox\callout.png
+..\FritzBox\Skin\Default\Media\FritzBox\Call_in.png
+..\FritzBox\Skin\Default\Media\FritzBox\Call_out.png
+..\FritzBox\Skin\Default\Media\FritzBox\Call_unanswered.png
..\FritzBox\Skin\Default\Media\FritzBox\Phone_Icon_Home.png
..\FritzBox\Skin\Default\Media\FritzBox\Phone_Icon_Mobile.png
..\FritzBox\Skin\Default\Media\FritzBox\Phone_Icon_Work.png
@@ -177,6 +189,9 @@
..\FritzBox\Skin\DefaultWide\Media\FritzBox\CallMonitor.Missing.png
..\FritzBox\Skin\DefaultWide\Media\FritzBox\CallMonitor.Unknown.png
..\FritzBox\Skin\DefaultWide\Media\FritzBox\callout.png
+..\FritzBox\Skin\DefaultWide\Media\FritzBox\Call_in.png
+..\FritzBox\Skin\DefaultWide\Media\FritzBox\Call_out.png
+..\FritzBox\Skin\DefaultWide\Media\FritzBox\Call_unanswered.png
..\FritzBox\Skin\DefaultWide\Media\FritzBox\Phone_Icon_Home.png
..\FritzBox\Skin\DefaultWide\Media\FritzBox\Phone_Icon_Mobile.png
..\FritzBox\Skin\DefaultWide\Media\FritzBox\Phone_Icon_Work.png
@@ -187,10 +202,16 @@
..\FritzBox\Skin\Maya\Media\FritzBox\CallMonitor.Missing.png
..\FritzBox\Skin\Maya\Media\FritzBox\CallMonitor.Unknown.png
..\FritzBox\Skin\Maya\Media\FritzBox\callout.png
+..\FritzBox\Skin\Maya\Media\FritzBox\Call_in.png
+..\FritzBox\Skin\Maya\Media\FritzBox\Call_out.png
+..\FritzBox\Skin\Maya\Media\FritzBox\Call_unanswered.png
..\FritzBox\Skin\Maya\Media\FritzBox\Phone_Icon_Home.png
..\FritzBox\Skin\Maya\Media\FritzBox\Phone_Icon_Mobile.png
..\FritzBox\Skin\Maya\Media\FritzBox\Phone_Icon_Work.png
..\FritzBox\Skin\Maya\Media\FritzBox\rejected.png
+..\FritzBox\Skin\Streamed MP\Media\FritzBox\Call_in.png
+..\FritzBox\Skin\Streamed MP\Media\FritzBox\Call_out.png
+..\FritzBox\Skin\Streamed MP\Media\FritzBox\Call_unanswered.png
..\FritzBox\Skin\Streamed MP\Media\FritzBox\Phone_Icon_Home.png
..\FritzBox\Skin\Streamed MP\Media\FritzBox\Phone_Icon_Mobile.png
..\FritzBox\Skin\Streamed MP\Media\FritzBox\Phone_Icon_Work.png
@@ -202,13 +223,18 @@
..\FritzBox\Skin\Titan\Media\FritzBox\CallMonitor.Missing.png
..\FritzBox\Skin\Titan\Media\FritzBox\CallMonitor.Unknown.png
..\FritzBox\Skin\Titan\Media\FritzBox\callout.png
+..\FritzBox\Skin\Titan\Media\FritzBox\Call_in.png
+..\FritzBox\Skin\Titan\Media\FritzBox\Call_out.png
+..\FritzBox\Skin\Titan\Media\FritzBox\Call_unanswered.png
+..\FritzBox\Skin\Titan\Media\FritzBox\DefaultInboxBig.png
..\FritzBox\Skin\Titan\Media\FritzBox\Phone_Icon_Home.png
..\FritzBox\Skin\Titan\Media\FritzBox\Phone_Icon_Mobile.png
..\FritzBox\Skin\Titan\Media\FritzBox\Phone_Icon_Work.png
..\FritzBox\Skin\Titan\Media\FritzBox\rejected.png
-75 Datei(en) kopiert
+100 Datei(en) kopiert
..\FritzBox\Languages\strings_de.xml
..\FritzBox\Languages\strings_el.xml
+..\FritzBox\Languages\strings_en-GB.xml
..\FritzBox\Languages\strings_en-US.xml
..\FritzBox\Languages\strings_en.xml
..\FritzBox\Languages\strings_es.xml
@@ -243,9 +269,9 @@
..\FritzBox\Languages\Unsupported\strings_tr.xml
..\FritzBox\Languages\Unsupported\strings_uk.xml
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
-36 Datei(en) kopiert
+37 Datei(en) kopiert
MpeMaker version: 1.3.0.0
-Build started at 14:04:26
+Build started at 23:03:01
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Modified: trunk/plugins/FritzBox/Docs/Changes.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Changes.txt 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/Docs/Changes.txt 2013-04-18 21:09:57 UTC (rev 4563)
@@ -1,7 +1,3 @@
-1.0.0.4556:
-Optimiziation:
-- skin adjustments
-
-Fixed bugs:
-- call type "outgoing" filter does not work
-- Avalon skin is selected per default on Installer
\ No newline at end of file
+1.0.0.4562:
+Fixed bug:
+- incoming call notifications aren't shown when option "Show on outgoing call" is disabled and an outgoing call has been done
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2013-04-18 21:09:57 UTC (rev 4563)
@@ -49,7 +49,7 @@
All = 0,
Incoming = 1,
Outgoing = 2,
- Rejected = 3
+ Unanswered = 3
}
[PluginIcons("FritzBox.FritzBox.png", "FritzBox.FritzBoxDisabled.png")]
@@ -127,6 +127,11 @@
Log.Info("\"Auto-close after connection is closed\" setting is enabled");
closeNotificationWindow();
}
+
+ currentConnectionID = null;
+
+ // update call list
+ worker.EnqueueTask(new Task(Task.TaskAction.LoadCallListItems, null));
break;
default:
Log.Error("Incorrect call type");
@@ -284,9 +289,6 @@
// show call notification
showNotificationWindow(callAction.Type, strHeading, strImage, strText);
-
- // update call list
- worker.EnqueueTask(new Task(Task.TaskAction.LoadCallListItems, null));
}
}
}
@@ -477,8 +479,6 @@
notificationWindowCloseTimer.Elapsed += OnCloseNotificationWindowTimerEvent;
notificationWindowCloseTimer.Start();
}
-
- currentConnectionID = null;
}
else Log.Debug("Notification window wasn't opened");
}
@@ -963,7 +963,7 @@
/// <param name="data">holds CSV list</param>
protected void refreshCallListData(byte[] data)
{
- List<CallItem> newCallItemList = CallItem.load(new MemoryStream(data));
+ List<CallItem> newCallItemList = CallItem.Load(new MemoryStream(data));
int i = 0;
bool callItemListChanged = false;
@@ -1173,8 +1173,8 @@
}
else
{
- if (newVoiceBoxItemsCount > 1) GUIPropertyManager.SetProperty("#FritzManager.NewMessages", newVoiceBoxItemsCount + " " + LocalizeStrings.Get(7)); // 7 = Messages
- else GUIPropertyManager.SetProperty("#FritzManager.NewMessages", newVoiceBoxItemsCount + " " + LocalizeStrings.Get(27)); // 27 = Message
+ if (newVoiceBoxItemsCount > 1) GUIPropertyManager.SetProperty("#FritzManager.NewMessages", newVoiceBoxItemsCount + " " + LocalizeStrings.Get(19) + " " + LocalizeStrings.Get(7)); // 7 = Messages
+ else GUIPropertyManager.SetProperty("#FritzManager.NewMessages", newVoiceBoxItemsCount + " " + LocalizeStrings.Get(19) + " " + LocalizeStrings.Get(27)); // 27 = Message
GUIPropertyManager.SetProperty("#FritzManager.Caller", lastNewCallerName);
GUIPropertyManager.SetProperty("#FritzManager.NewMessageCount", newVoiceBoxItemsCount.ToString());
@@ -1215,16 +1215,16 @@
foreach (CallItem item in callItemList)
{
GUIListItem elem = new GUIListItem();
- Caller caller = phoneBook.FindContactEntries(item.number); ;
+ Caller caller = phoneBook.FindContactEntries(item.Number); ;
i++;
// apply call type filter
if (Settings.CurrentFilter == CallListFilter.Incoming) if (item.type != 1) continue;
- if (Settings.CurrentFilter == CallListFilter.Rejected) if (item.type != 2) continue;
- if (Settings.CurrentFilter == CallListFilter.Outgoing) if (item.type != 4 && item.type != 3) continue; // since FRITZ!OS 5.5 this type number is 4
+ if (Settings.CurrentFilter == CallListFilter.Unanswered) if (item.type != 2) continue;
+ if (Settings.CurrentFilter == CallListFilter.Outgoing) if (item.type != 4 && item.type != 3) continue; // since FRITZ!OS 5.50 this type number is 4
- elem.Label = item.timestamp.ToString(format, ci) + " - " + item.duration.ToString("HH:mm", ci);
+ elem.Label = item.TimeStamp.ToString(format, ci) + " - " + item.Duration.ToString("HH:mm", ci);
// add caller name/phone number
if (caller.MatchedPhoneBookItems != null) elem.Label2 = caller.MatchedPhoneBookEntryNamesAndPhoneTypes;
@@ -1234,7 +1234,7 @@
else elem.Label2 = LocalizeStrings.Get(3); // 3 = Unknown
}
- elem.DVDLabel = item.mynumber + item.extension;
+ elem.DVDLabel = item.MyNumber + item.Extension;
elem.Path = Convert.ToString(i);
@@ -1245,9 +1245,9 @@
string prefix = "FritzBox\\";
string icon = "defaultAudioBig.png";
- if (item.type == 1) icon = prefix + "callin.png";
- else if (item.type == 4 || item.type == 3) icon = prefix + "callout.png"; // since FRITZ!OS 5.5 this type number is 4
- else if (item.type == 2) icon = prefix + "rejected.png";
+ if (item.type == 1) icon = prefix + "Call_in.png";
+ else if (item.type == 4 || item.type == 3) icon = prefix + "Call_out.png"; // since FRITZ!OS 5.50 this type number is 4
+ else if (item.type == 2) icon = prefix + "Call_unanswered.png";
elem.IconImageBig = icon;
elem.IconImage = icon;
@@ -1427,9 +1427,9 @@
Settings.CurrentFilter = CallListFilter.Outgoing;
break;
case CallListFilter.Outgoing:
- Settings.CurrentFilter = CallListFilter.Rejected;
+ Settings.CurrentFilter = CallListFilter.Unanswered;
break;
- case CallListFilter.Rejected:
+ case CallListFilter.Unanswered:
Settings.CurrentFilter = CallListFilter.All;
break;
}
@@ -1468,7 +1468,7 @@
{
bool callActionEnabled = false;
- if (callItemList[Convert.ToInt16(facadeView.SelectedListItem.Path)].number != String.Empty) callActionEnabled = true;
+ if (callItemList[Convert.ToInt16(facadeView.SelectedListItem.Path)].Number != String.Empty) callActionEnabled = true;
GUIDialogMenu dlgMenu = (GUIDialogMenu)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU);
@@ -1565,8 +1565,8 @@
case CallListFilter.Outgoing:
strLine = LocalizeStrings.Get(16); // 16 = Outgoing
break;
- case CallListFilter.Rejected:
- strLine = LocalizeStrings.Get(17); // 17 = Rejected
+ case CallListFilter.Unanswered:
+ strLine = LocalizeStrings.Get(17); // 17 = Unanswered
break;
}
@@ -1580,15 +1580,15 @@
switch (Settings.CurrentMode)
{
case GUIMode.VoiceBox:
- if (headerLabel != null) headerLabel.Label = LocalizeStrings.Get(19); // 19 = FRITZ!Box messages
+ if (headerLabel != null) headerLabel.Label = LocalizeStrings.Get(7); // 7 = Messages
btnMode.Label = LocalizeStrings.Get(18); // 18 = Call list
break;
case GUIMode.CallList:
- if (headerLabel != null) headerLabel.Label = LocalizeStrings.Get(21); // 21 = FRITZ!Box call list
+ if (headerLabel != null) headerLabel.Label = LocalizeStrings.Get(18); // 18 = Call list
btnMode.Label = LocalizeStrings.Get(20); // 20 = Phone book
break;
case GUIMode.PhoneBook:
- if (headerLabel != null) headerLabel.Label = LocalizeStrings.Get(22); // 22 = FRITZ!Box phone book
+ if (headerLabel != null) headerLabel.Label = LocalizeStrings.Get(20); // // 20 = Phone book
btnMode.Label = LocalizeStrings.Get(7); // 7 = Messages
break;
}
Modified: trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs 2013-04-18 21:09:57 UTC (rev 4563)
@@ -88,7 +88,6 @@
private static ManualResetEvent connectDone = new ManualResetEvent(false); // ensures that the thread doesn't end before the socket is connected (avoids error message "A request to send or receive data was disallowed because the socket is not connected and (when sending on a datagram socket using a sendto call) no address was supplied")
private static System.Timers.Timer connectionCheckTimer = new System.Timers.Timer();
private static IPEndPoint remoteEP;
-
#region Properties
static FritzBoxClient()
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs 2013-04-18 21:09:57 UTC (rev 4563)
@@ -8,28 +8,28 @@
namespace FritzManager
{
/// <summary>
- /// Model of one call item record. read from fritz CSV exports
+ /// Model of one call item record. Read from FRITZ CSV exports
/// </summary>
public class CallItem : System.IEquatable<CallItem>
{
- public DateTime duration;
- public string extension; // in German "Nebenstelle"
- public string mynumber;
- public string name;
- public string number;
- public DateTime timestamp;
+ public DateTime Duration;
+ public string Extension; // in German "Nebenstelle"
+ public string MyNumber;
+ public string Name;
+ public string Number;
+ public DateTime TimeStamp;
public int type;
private static Logger Log = LoggerFactory.getLogger("CallItem");
public static List<CallItem> loadFromFile(string filename)
{
Stream s = new FileStream(filename, FileMode.Open);
- List<CallItem> r = load(s);
+ List<CallItem> r = Load(s);
s.Close();
return r;
}
- public static List<CallItem> load(Stream s)
+ public static List<CallItem> Load(Stream s)
{
List<CallItem> result = new List<CallItem>();
@@ -42,7 +42,11 @@
string cutOffPrefix = "49";
string line;
- for (int i = 0; i < 3; i++) reader.ReadLine(); // skip first three lines
+ if (FritzBox.Settings.FritzBoxFirmwareMainVersion > 5 || (FritzBox.Settings.FritzBoxFirmwareMainVersion == 5 && FritzBox.Settings.FritzBoxFirmwareSubVersion >= 50))
+ {
+ for (int i = 0; i < 2; i++) reader.ReadLine(); // skip first two lines on firmware version 5.50 or higher
+ }
+ else for (int i = 0; i < 3; i++) reader.ReadLine(); // skip first three lines
while (reader.Peek() >= 0)
{
@@ -51,15 +55,15 @@
CallItem item = new CallItem();
item.type = Convert.ToInt16(f[0]);
- item.timestamp = DateTime.ParseExact(f[1], formatTimeStamp, provider);
- item.name = f[2];
+ item.TimeStamp = DateTime.ParseExact(f[1], formatTimeStamp, provider);
+ item.Name = f[2];
- if (f[3].StartsWith(cutOffPrefix)) item.number = "0" + f[3].Substring(cutOffPrefix.Length);
- else item.number = f[3];
+ if (f[3].StartsWith(cutOffPrefix)) item.Number = "0" + f[3].Substring(cutOffPrefix.Length);
+ else item.Number = f[3];
- item.extension = f[4];
- item.mynumber = f[5];
- item.duration = DateTime.ParseExact(f[6], formatDuration, provider);
+ item.Extension = f[4];
+ item.MyNumber = f[5];
+ item.Duration = DateTime.ParseExact(f[6], formatDuration, provider);
result.Add(item);
}
@@ -77,7 +81,7 @@
public bool Equals(CallItem callItem)
{
- if (timestamp == callItem.timestamp) return true;
+ if (TimeStamp == callItem.TimeStamp) return true;
else return false;
}
}
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs 2013-04-18 21:09:57 UTC (rev 4563)
@@ -23,6 +23,7 @@
private string hostname;
private string baseurl;
+ private string baseurl2;
private bool loggedIn;
private string passwd;
private string cacheDir;
@@ -30,14 +31,13 @@
private string sid;
private string dialport;
private System.Object cacheSync = new System.Object();
- private bool fritzOS55; // indicates of the FRITZ!Box OS version is 5.5 or higher
+ private static Logger Log = LoggerFactory.getLogger("Fritz");
- static Logger Log = LoggerFactory.getLogger("Fritz");
-
public Fritz(string passwd, string cacheDir, string host, string dialport)
{
this.hostname = host;
this.baseurl = "http://" + host + "/cgi-bin/webcm";
+ this.baseurl2 = "http://" + host;
this.passwd = passwd;
this.cacheDir = cacheDir;
this.cacheFileName = cacheDir + "\\FritzBox-CallList.csv";
@@ -74,13 +74,15 @@
byte[] hash = md5.ComputeHash(Encoding.GetEncoding("UTF-16LE").GetBytes(md5in));
string response = challenge + "-" + BitConverter.ToString(hash).Replace("-", String.Empty).ToLower();
- // new login procedure since FRITZ!OS 5.5
- XDocument doc = XDocument.Load("http://fritz.box/login_sid.lua?username=&response=" + response);
- sid = GetXMLValue(doc, "SID");
-
- if (sid == "0000000000000000")
+ if (FritzBox.Settings.FritzBoxFirmwareMainVersion > 5 || (FritzBox.Settings.FritzBoxFirmwareMainVersion == 5 && FritzBox.Settings.FritzBoxFirmwareSubVersion >= 50))
{
- // login procedure before FRITZ!OS 5.5
+ // new login procedure since FRITZ!OS 5.50
+ XDocument doc = XDocument.Load(baseurl2 + "/login_sid.lua?username=&response=" + response);
+ sid = getXMLValue(doc, "SID");
+ }
+ else
+ {
+ // login procedure before FRITZ!OS 5.50
sid = PostRequest(baseurl, "login:command/response=" + response + "&getpage=../html/de/menus/menu2.html");
if (sid != String.Empty)
@@ -90,7 +92,6 @@
sid = matchList[0].Groups[1].Value;
}
}
- else fritzOS55 = true;
}
}
catch { }
@@ -233,15 +234,16 @@
// download CSV file
try
{
- switch (fritzOS55)
+ if (FritzBox.Settings.FritzBoxFirmwareMainVersion > 5 || (FritzBox.Settings.FritzBoxFirmwareMainVersion == 5 && FritzBox.Settings.FritzBoxFirmwareSubVersion >= 50))
{
- case true:
- result = client.DownloadData("http://" + hostname + "/fon_num/foncalls_list.lua?sid=" + sid + "&csv="); // new procedure since FRITZ!OS 5.5
- break;
- case false:
- result = client.DownloadData(baseurl + "?sid=" + sid + "&getpage=../html/de/FRITZ%21Box_Anrufliste.csv"); // old procedure before FRITZ!OS 5.5
- break;
+ // new procedure since FRITZ!OS 5.50
+ result = client.DownloadData(baseurl2 + "/fon_num/foncalls_list.lua?sid=" + sid + "&csv=");
}
+ else
+ {
+ // old procedure before FRITZ!OS 5.50
+ result = client.DownloadData(baseurl + "?sid=" + sid + "&getpage=../html/de/FRITZ%21Box_Anrufliste.csv");
+ }
}
catch {}
@@ -291,8 +293,8 @@
try
{
- XDocument doc = XDocument.Load("http://" + hostname + "/login_sid.lua");
- return GetXMLValue(doc, "Challenge");
+ XDocument doc = XDocument.Load(baseurl2 + "/login_sid.lua");
+ return getXMLValue(doc, "Challenge");
}
catch {}
@@ -337,14 +339,45 @@
}
}
- private string GetXMLValue(XDocument doc, string name)
+ private string getXMLValue(XDocument doc, string name)
{
XElement info = doc.FirstNode as XElement;
return info.Element(name).Value;
}
+ private string getXMLValue(XDocument doc, string name, XNamespace nameSpace)
+ {
+ XElement info = doc.FirstNode as XElement;
+ return info.Element(nameSpace + name).Value;
+ }
+
+ private void getFritzBoxInfo()
+ {
+ try
+ {
+ XDocument doc = XDocument.Load(baseurl2 + "/jason_boxinfo.xml");
+
+ // get FRITZ!Box firmware version
+ string fritzBoxFirmwareVersion = getXMLValue(doc, "Version", "http://jason.avm.de/updatecheck/");
+ string[] fritzBoxFirmwareVersionArray = fritzBoxFirmwareVersion.Split(new char[] { '.' });
+
+ FritzBox.Settings.FritzBoxFirmwareMainVersion = Convert.ToInt32(fritzBoxFirmwareVersionArray[1]);
+ FritzBox.Settings.FritzBoxFirmwareSubVersion = Convert.ToInt32(fritzBoxFirmwareVersionArray[2]);
+
+ // get FRITZ!Box name
+ FritzBox.Settings.FritzBoxName = getXMLValue(doc, "Name", "http://jason.avm.de/updatecheck/");
+
+ Log.Debug("FRITZ!Box firmware version is " + FritzBox.Settings.FritzBoxFirmwareMainVersion + "." + FritzBox.Settings.FritzBoxFirmwareSubVersion + " on " + FritzBox.Settings.FritzBoxName);
+ }
+ catch
+ {
+ Log.Debug("Could not query FRITZ!Box firmware version");
+ }
+ }
+
private void OnConnectedEvent()
{
+ getFritzBoxInfo();
Login();
}
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs 2013-04-18 21:09:57 UTC (rev 4563)
@@ -630,24 +630,17 @@
private string convertImageURL(string imageURL)
{
- string contactImagePathRemote = imageURL;
+ string contactImagePathRemote;
// convert to UNC format
- if (Directory.Exists(@"\\" + FritzBoxClient.Address + "\\" + Settings.NASShareName))
+ if (imageURL.Contains("file:///var/media/ftp/"))
{
- if (contactImagePathRemote.Contains("InternerSpeicher")) contactImagePathRemote = contactImagePathRemote.Replace("file:///var/InternerSpeicher", @"\\" + FritzBoxClient.Address + "\\" + Settings.NASShareName); // FRITZ!Boxe models with internal storage e. g. FRITZ!Box 7390
- else contactImagePathRemote = contactImagePathRemote.Replace("file:///var/media/ftp", @"\\" + FritzBoxClient.Address + "\\" + Settings.NASShareName);
+ contactImagePathRemote = imageURL.Replace("file:///var/media/ftp/", @"\\" + FritzBoxClient.Address + "\\" + Settings.NASShareName + "\\");
+ contactImagePathRemote = contactImagePathRemote.Replace("/", "\\");
+
+ return contactImagePathRemote;
}
- else
- {
- // some FRITZ!Box models e. g. 7390 don't have no common share under "Settings.NASShareName". They directly share their data under the FRITZ!Box host name
- if (contactImagePathRemote.Contains("InternerSpeicher")) contactImagePathRemote = contactImagePathRemote.Replace("file:///var/InternerSpeicher", @"\\" + FritzBoxClient.Address); // FRITZ!Boxe models with internal storage e. g. FRITZ!Box 7390
- else contactImagePathRemote = contactImagePathRemote.Replace("file:///var/media/ftp", @"\\" + FritzBoxClient.Address);
- }
-
- contactImagePathRemote = contactImagePathRemote.Replace("/", "\\");
-
- return contactImagePathRemote;
+ else return String.Empty;
}
#endregion private methods
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_de.xml 2013-04-18 21:09:57 UTC (rev 4563)
@@ -17,12 +17,10 @@
<String id="14">Alle</String>
<String id="15">Eingehend</String>
<String id="16">Ausgehend</String>
- <String id="17">Abgelehnt</String>
+ <String id="17">Unbeantwortet</String>
<String id="18">Anrufliste</String>
- <String id="19">FRITZ!Box Nachrichten</String>
+ <String id="19">neue</String>
<String id="20">Telefonbuch</String>
- <String id="21">FRITZ!Box Anrufliste</String>
- <String id="22">FRITZ!Box Telefonbuch</String>
<String id="23">Fehler</String>
<String id="24">Bitte FRITZ!Box-Passwort und Anrufbeantworter-Pfad unter Configuration eintragen!</String>
<String id="25">Aktualisieren</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_el.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_el.xml 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_el.xml 2013-04-18 21:09:57 UTC (rev 4563)
@@ -17,12 +17,10 @@
<String id="14">Όλες</String>
<String id="15">Εισερχόμενη</String>
<String id="16">Ξεκινώντας</String>
- <String id="17">Απορρίφθηκε</String>
+ <String id="17">Αναπάντητες</String>
<String id="18">Λίστα κλήσεων</String>
- <String id="19">FritzBox ειδήσεις</String>
+ <String id="19">νέα</String>
<String id="20">Τηλεφωνικός κατάλογος</String>
- <String id="21">FRITZ!Box λίστα κλήσεων</String>
- <String id="22">FRITZ!Box Telefonbuch</String>
<String id="23">Errore</String>
<String id="24">FRITZ!Box κωδικό και φωνή μονοπάτι κουτί λείπουν στις ρυθμίσεις!</String>
<String id="25">Ενημέρωση</String>
Added: trunk/plugins/FritzBox/FritzBox/Languages/strings_en-GB.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_en-GB.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_en-GB.xml 2013-04-18 21:09:57 UTC (rev 4563)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Language name="English (United Kingdom)" characters="255">
+ <Section name="unmapped">
+ <String id="1">Incoming call</String>
+ <String id="2">Outgoing call</String>
+ <String id="3">Unknown</String>
+ <String id="4">Caller</String>
+ <String id="5">Call</String>
+ <String id="6">Contact</String>
+ <String id="7">Messages</String>
+ <String id="8">Play message</String>
+ <String id="9">Mark message as heard</String>
+ <String id="10">Delete message</String>
+ <String id="11">View: List</String>
+ <String id="12">View: Small icons</String>
+ <String id="13">View: Large icons</String>
+ <String id="14">All</String>
+ <String id="15">Incoming</String>
+ <String id="16">Outgoing</String>
+ <String id="17">Unanswered</String>
+ <String id="18">Call list</String>
+ <String id="19">new</String>
+ <String id="20">Phone book</String>
+ <String id="23">Error</String>
+ <String id="24">FRITZ!Box password and voice box path are missing in settings!</String>
+ <String id="25">Update</String>
+ <String id="26">to</String>
+ <String id="27">Message</String>
+ <String id="28">Phone</String>
+ <String id="29">Private</String>
+ <String id="30">Mobile</String>
+ <String id="31">Business</String>
+ </Section>
+</Language>
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_en-US.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_en-US.xml 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_en-US.xml 2013-04-18 21:09:57 UTC (rev 4563)
@@ -17,12 +17,10 @@
<String id="14">All</String>
<String id="15">Incoming</String>
<String id="16">Outgoing</String>
- <String id="17">Rejected</String>
+ <String id="17">Unanswered</String>
<String id="18">Call list</String>
- <String id="19">FRITZ!Box messages</String>
+ <String id="19">new</String>
<String id="20">Phone book</String>
- <String id="21">FRITZ!Box call list</String>
- <String id="22">FRITZ!Box phone book</String>
<String id="23">Error</String>
<String id="24">FRITZ!Box password and voice box path are missing in settings!</String>
<String id="25">Update</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_es.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_es.xml 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_es.xml 2013-04-18 21:09:57 UTC (rev 4563)
@@ -17,12 +17,10 @@
<String id="14">Todos</String>
<String id="15">Detallado</String>
<String id="16">Basado</String>
- <String id="17">Rechazado</String>
+ <String id="17">Sin respuesta</String>
<String id="18">Lista de llamadas</String>
- <String id="19">FRITZ!Box noticias</String>
+ <String id="19">nuevo </String>
<String id="20">Guía telefónica</String>
- <String id="21">FRITZ!Box lista de llamadas</String>
- <String id="22">FRITZ!Box guía telefónica</String>
<String id="23">Error</String>
<String id="24">FRITZ!Box y la ruta de caja de la voz no se encuentran en la configuración!</String>
<String id="25">Actualización</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_fr.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_fr.xml 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_fr.xml 2013-04-18 21:09:57 UTC (rev 4563)
@@ -17,12 +17,10 @@
<String id="14">Tous les</String>
<String id="15">Détail</String>
<String id="16">Basé</String>
- <String id="17">Rejetée</String>
+ <String id="17">Sans réponse</String>
<String id="18">Liste des appels</String>
- <String id="19">FRITZ!Box nouvelles</String>
+ <String id="19">neufs</String>
<String id="20">Annuaire téléphonique</String>
- <String id="21">Liste des appels FRITZ!Box</String>
- <String id="22">Annuaire FRITZ!Box</String>
<String id="23">Erreur</String>
<String id="24">FRITZ!Box passe et le chemin boîte vocale sont manquantes dans les réglages!</String>
<String id="25">Mise à jour</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_it.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_it.xml 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_it.xml 2013-04-18 21:09:57 UTC (rev 4563)
@@ -17,12 +17,10 @@
<String id="14">Tutti</String>
<String id="15">Dettagliato</String>
<String id="16">Basato</String>
- <String id="17">Rifiutato</String>
+ <String id="17">Senza risposta</String>
<String id="18">Lista chiamate</String>
- <String id="19">FRITZ!Box notizie</String>
+ <String id="19">nuovi</String>
<String id="20">Elenco telefonico</String>
- <String id="21">FRITZ!Box chiamata lista</String>
- <String id="22">FRITZ!Box rubrica</String>
<String id="23">Errore</String>
<String id="24">FRITZ!Box password della casella e casella percorso vocale mancano nelle impostazioni!</String>
<String id="25">Aggiornamento</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_nl.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_nl.xml 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_nl.xml 2013-04-18 21:09:57 UTC (rev 4563)
@@ -17,12 +17,10 @@
<String id="14">Alle</String>
<String id="15">Gedetailleerd</String>
<String id="16">Op basis van</String>
- <String id="17">Verworpen</String>
+ <String id="17">Onbeantwoorde</String>
<String id="18">Bellijst</String>
- <String id="19">FRITZ!Box nieuws</String>
+ <String id="19">nieuwe</String>
<String id="20">Telefoonboek</String>
- <String id="21">FRITZ!Box oproeplijst</String>
- <String id="22">FRITZ!Box telefoonboek</String>
<String id="23">Fout</String>
<String id="24">FRITZ!Box wachtwoord en strottenhoofd het pad ontbreken in instellingen!</String>
<String id="25">Update</String>
Modified: trunk/plugins/FritzBox/FritzBox/Languages/strings_ru.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Languages/strings_ru.xml 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Languages/strings_ru.xml 2013-04-18 21:09:57 UTC (rev 4563)
@@ -17,12 +17,10 @@
<String id="14">все</String>
<String id="15">входящие</String>
<String id="16">исходящие</String>
- <String id="17">пропущенные</String>
+ <String id="17">без ответов</String>
<String id="18">Список вызовов</String>
- <String id="19">Сообщения FRITZ!Box</String>
+ <String id="19">новых</String>
<String id="20">Телефонная книга</String>
- <String id="21">Список вызовов FRITZ!Box</String>
- <String id="22">Телефонная книга FRITZ!Box</String>
<String id="23">Ошибка</String>
<String id="24">Пароль к FRITZ!Box и путь к голосовому ящику не указаны в настройках!</String>
<String id="25">Обновить</String>
Modified: trunk/plugins/FritzBox/FritzBox/Settings.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Settings.cs 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Settings.cs 2013-04-18 21:09:57 UTC (rev 4563)
@@ -154,6 +154,12 @@
public static string ContactImagesFolderPath { get; private set; }
+ public static int FritzBoxFirmwareMainVersion { get; set; }
+
+ public static int FritzBoxFirmwareSubVersion { get; set; }
+
+ public static string FritzBoxName { get; set; }
+
#endregion Properties
#region Contructor
@@ -242,6 +248,11 @@
ManualContactImagePathEntry = xmlreader.GetValueAsBool(PLUGIN_NAME, "Manual contact image path entry", false);
+ // FRITZ!Box information
+ FritzBoxName = xmlreader.GetValueAsString(PLUGIN_NAME, "FRITZ!Box name", String.Empty);
+ FritzBoxFirmwareMainVersion = xmlreader.GetValueAsInt(PLUGIN_NAME, "FRITZ!Box firmware main version", 0);
+ FritzBoxFirmwareSubVersion = xmlreader.GetValueAsInt(PLUGIN_NAME, "FRITZ!Box firmware sub version", 0);
+
// GUI settings
CurrentMode = (GUIMode)xmlreader.GetValueAsInt(PLUGIN_NAME, "Current mode", 0);
CurrentFilter = (CallListFilter)xmlreader.GetValueAsInt(PLUGIN_NAME, "Current filter", 0);
@@ -329,7 +340,12 @@
xmlwriter.SetValueAsBool(PLUGIN_NAME, "Synchronize phone book", SynchronizePhoneBook);
xmlwriter.SetValueAsBool(PLUGIN_NAME, "Manual contact image path entry", ManualContactImagePathEntry);
-
+
+ // FRITZ!Box information
+ xmlwriter.SetValue(PLUGIN_NAME, "FRITZ!Box name", FritzBoxName);
+ xmlwriter.SetValue(PLUGIN_NAME, "FRITZ!Box firmware main version", FritzBoxFirmwareMainVersion);
+ xmlwriter.SetValue(PLUGIN_NAME, "FRITZ!Box firmware sub version", FritzBoxFirmwareSubVersion);
+
// GUI settings
xmlwriter.SetValue(PLUGIN_NAME, "Current mode", (int)CurrentMode);
xmlwriter.SetValue(PLUGIN_NAME, "Current filter", (int)CurrentFilter);
@@ -351,7 +367,7 @@
}
catch
{
- Log.Info("Country and area code could not be queried from Windows. MSN detection only works limited");
+ Log.Info("Country and area code could not be queried from Windows. MSN detection works limited only");
}
}
Added: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_in.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_in.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_in.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_in.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_in.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_out.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_out.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_out.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_out.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_out.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_unanswered.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_unanswered.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_unanswered.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_unanswered.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Call_unanswered.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_in.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_in.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_in.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_in.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_in.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_out.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_out.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_out.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_out.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_out.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_unanswered.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_unanswered.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_unanswered.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_unanswered.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/Call_unanswered.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_in.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_in.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_in.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_in.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_in.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_out.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_out.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_out.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_out.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_out.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_unanswered.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_unanswered.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_unanswered.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_unanswered.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/Call_unanswered.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml 2013-04-18 21:09:57 UTC (rev 4563)
@@ -3,8 +3,8 @@
<id>464554871</id>
<defaultcontrol>50</defaultcontrol>
<allowoverlay>yes</allowoverlay>
- <define>#header.label:666</define>
- <define>#header.hover:-</define>
+ <define>#header.label:FRITZ!Box Manager</define>
+ <define>#header.hover:hover_fritzbox.png</define>
<controls>
<control>
<description>Background</description>
@@ -100,17 +100,6 @@
<animation effect="fade" time="450" reversible="false">visible</animation>
</control>
<control>
- <type>image</type>
- <id>1</id>
- <posX>40</posX>
- <posY>150</posY>
- <width>178</width>
- <height>144</height>
- <texture flipY="true" diffuse="Thumb_Mask.png">Picture_cover.png</texture>
- <visible>facadeview.list+Control.HasFocus(50)</visible>
- <animation effect="fade" time="450" reversible="false">visible</animation>
- </control>
- <control>
<description>Header</description>
<type>fadelabel</type>
<posX>26</posX>
Added: trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_in.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_in.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_in.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_in.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_in.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_out.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_out.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_out.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_out.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_out.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_unanswered.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_unanswered.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_unanswered.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_unanswered.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/Call_unanswered.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml 2013-04-18 21:09:57 UTC (rev 4563)
@@ -3,8 +3,8 @@
<id>464554871</id>
<defaultcontrol>50</defaultcontrol>
<allowoverlay>yes</allowoverlay>
- <define>#header.label:666</define>
- <define>#header.hover:-</define>
+ <define>#header.label:FRITZ!Box Manager</define>
+ <define>#header.hover:hover_fritzbox.png</define>
<controls>
<control>
<description>Background</description>
@@ -100,17 +100,6 @@
<animation effect="fade" time="450" reversible="false">visible</animation>
</control>
<control>
- <type>image</type>
- <id>1</id>
- <posX>40</posX>
- <posY>150</posY>
- <width>178</width>
- <height>144</height>
- <texture flipY="true" diffuse="Thumb_Mask.png">Picture_cover.png</texture>
- <visible>facadeview.list+Control.HasFocus(50)</visible>
- <animation effect="fade" time="450" reversible="false">visible</animation>
- </control>
- <control>
<description>Header</description>
<type>fadelabel</type>
<posX>26</posX>
Added: trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/Call_in.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/Call_in.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/Call_in.png 2013-04-15 20:15:38 UTC (rev 4562)
+++ trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/Call_in.png 2013-04-18 21:09:57 UTC (rev 4563)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/Call_in.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/Call_out.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/Call_out.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzB...
[truncated message content] |
|
From: <dos...@us...> - 2013-04-15 20:15:43
|
Revision: 4562
http://sourceforge.net/p/mp-plugins/code/4562
Author: doskabouter
Date: 2013-04-15 20:15:38 +0000 (Mon, 15 Apr 2013)
Log Message:
-----------
fixed click issue when zoom isn't 100%
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2013-04-08 19:35:21 UTC (rev 4561)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2013-04-15 20:15:38 UTC (rev 4562)
@@ -1000,7 +1000,8 @@
{
Point p = DomHelper.GetCenterCoordinate(webBrowser.Document, ge);
MyLog.debug("perform click on " + p.ToString());
-
+ p.X = Convert.ToInt32(p.X * zoom);
+ p.Y = Convert.ToInt32(p.Y * zoom);
webBrowser.Enabled = true;
System.Threading.Thread.Sleep(200);
Cursor.Position = webBrowser.PointToScreen(p);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2013-04-08 19:35:24
|
Revision: 4561
http://sourceforge.net/p/mp-plugins/code/4561
Author: doskabouter
Date: 2013-04-08 19:35:21 +0000 (Mon, 08 Apr 2013)
Log Message:
-----------
release 1.1.0.0
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/Geckofx-Winforms-18.dll
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/geckofx-core-18.dll
Added Paths:
-----------
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.1.0.0.mpe1
Added: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.1.0.0.mpe1
===================================================================
(Binary files differ)
Index: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.1.0.0.mpe1
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.1.0.0.mpe1 2013-04-07 21:55:39 UTC (rev 4560)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.1.0.0.mpe1 2013-04-08 19:35:21 UTC (rev 4561)
Property changes on: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.1.0.0.mpe1
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2013-04-07 21:55:39 UTC (rev 4560)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2013-04-08 19:35:21 UTC (rev 4561)
@@ -116,8 +116,8 @@
<SectionParam Name="Configuration file">
<Value />
<ValueType>Template</ValueType>
- <Description>The file used to configure the extension.
-If have .exe extension the will be executed
+ <Description>The file used to configure the extension.
+If have .exe extension the will be executed
If have .dll extension used like MP plugin configuration</Description>
</SectionParam>
<SectionParam Name="Online Screenshots">
@@ -256,8 +256,8 @@
<SectionParam Name="Configuration file">
<Value />
<ValueType>Template</ValueType>
- <Description>The file used to configure the extension.
-If have .exe extension the will be executed
+ <Description>The file used to configure the extension.
+If have .exe extension the will be executed
If have .dll extension used like MP plugin configuration</Description>
</SectionParam>
<SectionParam Name="Online Screenshots">
@@ -281,5 +281,157 @@
</ProjectSettings>
<IsSkin>false</IsSkin>
</PackageClass>
+ <PackageClass>
+ <Version>2.0</Version>
+ <Groups>
+ <Items>
+ <GroupItem Name="Common">
+ <DisplayName>Common</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Common</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Default">
+ <DisplayName>Default</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Default</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="DefaultWide">
+ <DisplayName>DefaultWide</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>DefaultWide</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Titan">
+ <DisplayName>Titan</DisplayName>
+ <DefaulChecked>false</DefaulChecked>
+ <Description>Titan</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Skins">
+ <DisplayName>Skins</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Skins</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items />
+ </Sections>
+ <Dependencies>
+ <Items>
+ <DependencyItem>
+ <Type>MediaPortal</Type>
+ <Id />
+ <MinVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MinVersion>
+ <MaxVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MaxVersion>
+ <WarnOnly>false</WarnOnly>
+ <Message>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ </Items>
+ </Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="BrowseTheWeb.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.1.7.0</MinRequiredVersion>
+ <DesignedForVersion>1.2.100.0</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items>
+ <SubSystemItem Name="MP.Config" />
+ <SubSystemItem Name="MP.DB" />
+ <SubSystemItem Name="MP.SkinEngine" />
+ </Items>
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
+ <GeneralInfo>
+ <Name>Browse The Web</Name>
+ <Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
+ <Author>Doskabouter</Author>
+ <HomePage>http://www.team-mediaportal.com/extensions/news-info/browse-the-web-webbrowser</HomePage>
+ <ForumPage>http://forum.team-mediaportal.com/threads/browse-the-web-webbrowser.107285/</ForumPage>
+ <UpdateUrl>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml</UpdateUrl>
+ <Version>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>0</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / Webbrowser.</ExtensionDescription>
+ <VersionDescription>Added compatibility with 1.4.0
+More items to click on
+Added skin selection to installer
+Fixed installation issues
+Skin improvements</VersionDescription>
+ <DevelopmentStatus>Stable</DevelopmentStatus>
+ <OnlineLocation>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.1.0.0.mpe1</OnlineLocation>
+ <ReleaseDate>2013-04-08T21:18:37.2804854+02:00</ReleaseDate>
+ <Tags>webbrowser, internet, web</Tags>
+ <Location>..\..\BrowseTheWeb.mpe1</Location>
+ <Params>
+ <Items>
+ <SectionParam Name="Online Icon">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Configuration file">
+ <Value />
+ <ValueType>Template</ValueType>
+ <Description>The file used to configure the extension.
+If have .exe extension the will be executed
+If have .dll extension used like MP plugin configuration</Description>
+ </SectionParam>
+ <SectionParam Name="Online Screenshots">
+ <Value>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/browser1.jpg;http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/setup3.jpg</Value>
+ <ValueType>String</ValueType>
+ <Description>Online stored screenshot urls separated by ; </Description>
+ </SectionParam>
+ <SectionParam Name="Force to uninstall on update">
+ <Value>YES</Value>
+ <ValueType>Bool</ValueType>
+ <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ </GeneralInfo>
+ <UniqueFileList>
+ <Items />
+ </UniqueFileList>
+ <ProjectSettings>
+ <FolderGroups />
+ </ProjectSettings>
+ <IsSkin>false</IsSkin>
+ </PackageClass>
</Items>
</ExtensionCollection>
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2013-04-07 21:55:39 UTC (rev 4560)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2013-04-08 19:35:21 UTC (rev 4561)
@@ -707,9 +707,9 @@
</CompatibleVersion>
<SubSystemsUsed>
<Items>
- <SubSystemItem Name="MP.SkinEngine" />
<SubSystemItem Name="MP.Config" />
<SubSystemItem Name="MP.DB" />
+ <SubSystemItem Name="MP.SkinEngine" />
</Items>
</SubSystemsUsed>
</PluginDependencyItem>
@@ -718,21 +718,25 @@
<GeneralInfo>
<Name>Browse The Web</Name>
<Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
- <Author>Doskabouter/Mark Koenig (kroko)</Author>
+ <Author>Doskabouter</Author>
<HomePage>http://www.team-mediaportal.com/extensions/news-info/browse-the-web-webbrowser</HomePage>
<ForumPage>http://forum.team-mediaportal.com/threads/browse-the-web-webbrowser.107285/</ForumPage>
<UpdateUrl>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml</UpdateUrl>
<Version>
<Major>1</Major>
- <Minor>0</Minor>
+ <Minor>1</Minor>
<Build>0</Build>
<Revision>0</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / Webbrowser.</ExtensionDescription>
- <VersionDescription>Upgraded core to 18.0.2</VersionDescription>
- <DevelopmentStatus>Rc</DevelopmentStatus>
- <OnlineLocation>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.0.0.mpe1</OnlineLocation>
- <ReleaseDate>2013-03-12T23:29:26.965465+01:00</ReleaseDate>
+ <VersionDescription>Added compatibility with 1.4.0
+More items to click on
+Added skin selection to installer
+Fixed installation issues
+Skin improvements</VersionDescription>
+ <DevelopmentStatus>Stable</DevelopmentStatus>
+ <OnlineLocation>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.[Version].mpe1</OnlineLocation>
+ <ReleaseDate>2013-04-08T21:18:37.2804854+02:00</ReleaseDate>
<Tags>webbrowser, internet, web</Tags>
<Location>..\..\BrowseTheWeb.mpe1</Location>
<Params>
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/Geckofx-Winforms-18.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/geckofx-core-18.dll
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2013-04-07 21:55:41
|
Revision: 4560
http://sourceforge.net/p/mp-plugins/code/4560
Author: doskabouter
Date: 2013-04-07 21:55:39 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
fixed threading issue at startuo
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2013-04-07 19:47:28 UTC (rev 4559)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2013-04-07 21:55:39 UTC (rev 4560)
@@ -74,11 +74,11 @@
private float zoom = Settings.Instance.DefaultZoom;
private Settings settings = Settings.Instance;
- public static bool ParameterSupported = false;
public static string Parameter = string.Empty;
public static string loadFav = string.Empty;
private bool originalMouseSupport;
+ private bool formsAdded = false;
#endregion
@@ -165,21 +165,6 @@
{
MyLog.debug("Init Browse the web");
- AddFormsDelegate d = AddForms;
- GUIGraphicsContext.form.Invoke(d);
-
- #region parameters test
- ParameterSupported = false;
- if (typeof(GUIWindow).GetField("_loadParameter", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance) != null)
- {
- ParameterSupported = true;
- }
- #endregion
-
- TrySetProxy();
- if (!String.IsNullOrEmpty(settings.UserAgent))
- GeckoPreferences.User["general.useragent.override"] = settings.UserAgent;
-
BookmarkXml.AddFolder(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) +
"\\bookmarks.xml", "Saved by MP");
@@ -188,10 +173,11 @@
return Load(GUIGraphicsContext.Skin + @"\BrowseTheWeb.xml");
}
- private delegate void AddFormsDelegate();
-
private void AddForms()
{
+ if (formsAdded)
+ return;
+ MyLog.debug("Start AddForms");
try
{
Xpcom.Initialize(Settings.XulRunnerPath());
@@ -219,6 +205,12 @@
GeckoPreferences.Load(preferenceFile);
#endregion
+ TrySetProxy();
+ if (!String.IsNullOrEmpty(settings.UserAgent))
+ GeckoPreferences.User["general.useragent.override"] = settings.UserAgent;
+
+ formsAdded = true;
+ MyLog.debug("Finish AddForms");
}
private void SetBrowserWindow()
@@ -255,6 +247,7 @@
protected override void OnPageLoad()
{
+ AddForms();
GUIPropertyManager.SetProperty("#currentmodule", settings.PluginName);
if (settings.DisableAero && !aeroDisabled)
@@ -281,11 +274,7 @@
while (ShowCursor(true) < 0) ;
}
- Parameter = null;
- if (ParameterSupported)
- {
- Parameter = _loadParameter;
- }
+ Parameter = _loadParameter;
#region init browser
webBrowser.Visible = true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2013-04-07 19:47:32
|
Revision: 4559
http://sourceforge.net/p/mp-plugins/code/4559
Author: doskabouter
Date: 2013-04-07 19:47:28 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
- version increased to 1.1
- Major rework of DOM-interaction. Increases the number of items to click on, better handling of textboxes (value prefilled on clicking)
- Explicit loading of preferences
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
Added Paths:
-----------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/DomHelper.cs
Removed Paths:
-------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlInputType.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlLinkNumber.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2013-04-06 19:42:56 UTC (rev 4558)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2013-04-07 19:47:28 UTC (rev 4559)
@@ -83,6 +83,7 @@
<Compile Include="Bookmark.cs" />
<Compile Include="BookmarkElement.cs" />
<Compile Include="BookmarkXml.cs" />
+ <Compile Include="DomHelper.cs" />
<Compile Include="GetFolder.cs">
<SubType>Form</SubType>
</Compile>
@@ -103,8 +104,6 @@
</Compile>
<Compile Include="GUIBookmark.cs" />
<Compile Include="GUIPlugin.cs" />
- <Compile Include="HtmlInputType.cs" />
- <Compile Include="HtmlLinkNumber.cs" />
<Compile Include="ImportIE.cs">
<SubType>Form</SubType>
</Compile>
Added: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/DomHelper.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/DomHelper.cs (rev 0)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/DomHelper.cs 2013-04-07 19:47:28 UTC (rev 4559)
@@ -0,0 +1,285 @@
+using System;
+using System.Drawing;
+using System.Linq;
+using Gecko;
+using Gecko.DOM;
+
+namespace BrowseTheWeb
+{
+ public class DomHelper
+ {
+ private const string _spanstyle = "font-family: arial,sans-serif; font-size: 12px ! important; line-height: 130% ! important; border-width: 1px ! important; border-style: solid ! important; -moz-border-radius: 2px 2px 2px 2px ! important; padding: 0px 2px ! important; margin-right: 2px; max-width: 20px; max-height: 10px ! important; overflow: visible ! important; float: none ! important; display: inline;";
+ private const string btwebId = "btweb_id";
+
+ public static void AddLinksToPage(GeckoDocument document)
+ {
+ int maxId = GetMaxId(document);
+ AddLinksToPage(document, maxId + 1);
+ }
+
+ public static GeckoHtmlElement GetElement(string linkId, GeckoDocument document)
+ {
+ GeckoHtmlElement ge = document.GetElements(String.Format("//*[@{0}='{1}']", btwebId, linkId)).FirstOrDefault();
+ if (ge != null)
+ return ge;
+
+ GeckoElementCollection iframes = document.GetElementsByTagName("iframe");
+ foreach (GeckoIFrameElement element in iframes)
+ {
+ ge = GetElement(linkId, element.ContentDocument);
+ if (ge != null)
+ return ge;
+ }
+ return null;
+ }
+
+ public static Point GetCenterCoordinate(GeckoDocument root, GeckoHtmlElement element)
+ {
+ Point documentOffset = DocumentOffset(root, element.OwnerDocument);
+ RectangleF rect = element.BoundingClientRect;
+ Point p = new Point(Convert.ToInt32(rect.Left + rect.Width / 2), Convert.ToInt32(rect.Top + rect.Height / 2));
+ p.X += documentOffset.X;
+ p.Y += documentOffset.Y;
+ return p;
+ }
+
+ public static int NrOfChildElementsDone(GeckoHtmlElement element)
+ {
+ return element.GetElements(".//*[@" + btwebId + "]").Count();
+ }
+
+ private static Point DocumentOffset(GeckoDocument root, GeckoDocument current)
+ {
+ Point result = new Point(0, 0);
+ if (root.Equals(current))
+ return result;
+
+ GeckoElementCollection iframes = root.GetElementsByTagName("iframe");
+ foreach (GeckoIFrameElement element in iframes)
+ {
+ if (element.ContentDocument.Equals(current))
+ {
+ Point tmp = DocumentOffset(root, element.OwnerDocument);
+ result.X += element.BoundingClientRect.Left + tmp.X;
+ result.Y += element.BoundingClientRect.Top + tmp.Y;
+ return result;
+ }
+ }
+ return new Point(0, 0);
+ }
+
+ private static void AddLinksToPage(GeckoDocument document, int id)
+ {
+ GeckoElementCollection links = document.Links;
+ MyLog.debug("page links cnt : " + links.Count);
+ foreach (GeckoHtmlElement element in links) // no casting to GeckoAnchorElement, because document.links also returns GeckoAreaElemenets
+ if (!element.GetAttribute("href").StartsWith("javascript:"))
+ {
+ GeckoHtmlElement lastSpan = element;
+ bool ready = false;
+ while (!ready)
+ {
+ GeckoHtmlElement ls = lastSpan.LastChild as GeckoHtmlElement;
+ if (ls == null || ls.TagName != "SPAN")
+ ready = true;
+ else
+ lastSpan = ls;
+ };
+ if (!elementDone(element))
+ {
+ GeckoElement ls = element;
+ while (ls.LastChild != null && ls.LastChild is GeckoElement && !String.IsNullOrEmpty(ls.LastChild.TextContent))
+ ls = (GeckoElement)ls.LastChild;
+ insertSpanAfter(id, lastSpan.ClassName, ls);
+ SetLinkAttributes(element, id);
+ id++;
+ }
+ }
+
+ foreach (GeckoHtmlElement element in links) // no casting to GeckoAnchorElement, because document.links also returns GeckoAreaElemenets
+ if (!element.GetAttribute("href").StartsWith("javascript:") && element.ClientRects.Length == 0)
+ //invisible, so find visible previousSibling/parent and put a number on that
+ {
+ GeckoNode el = element;
+ while (el != null && !ElementVisible(el))
+ {
+ GeckoNode ps = el.PreviousSibling;
+ if (ps != null)
+ el = ps;
+ else
+ el = el.ParentNode;
+ }
+
+ if (el != null)// -> ElementVisible(el)=true, and thus el is a GeckoHtmlElement
+ {
+ GeckoHtmlElement geckoEl = (GeckoHtmlElement)el;
+
+ GeckoHtmlElement lastSpan = geckoEl;
+ bool ready = false;
+ while (!ready)
+ {
+ GeckoHtmlElement ls = lastSpan.LastChild as GeckoHtmlElement;
+ if (ls == null || ls.TagName != "SPAN")
+ ready = true;
+ else
+ lastSpan = ls;
+ };
+
+ if (!elementDone(geckoEl))
+ {
+
+ GeckoElement ls = geckoEl;
+ while (ls.LastChild != null && ls.LastChild is GeckoElement && !String.IsNullOrEmpty(ls.LastChild.TextContent))
+ ls = (GeckoElement)ls.LastChild;
+ insertSpanAfter(id, lastSpan.ClassName, ls);
+ SetLinkAttributes(geckoEl, id);
+ id++;
+ }
+ }
+ }
+
+ GeckoElementCollection objects = document.GetElementsByTagName("object");
+ MyLog.debug("page objects cnt : " + objects.Count);
+ foreach (GeckoObjectElement element in objects)
+ if (element.Type == "application/x-shockwave-flash")
+ {
+ if (!elementDone(element))
+ {
+ insertSpanAfter(id, null, element.Parent, "color:black;background-color:white");
+ SetLinkAttributes(element, id);
+ id++;
+ }
+ }
+
+ GeckoElementCollection forms = document.GetElementsByTagName("form");
+ MyLog.debug("page forms cnt : " + forms.Count);
+ foreach (GeckoHtmlElement element in forms)
+ {
+ GeckoElementCollection inps = element.GetElementsByTagName("input");
+ foreach (GeckoInputElement inp in inps)
+ if (!elementDone(inp))
+ {
+ string linkType = inp.Type;
+ if (!String.IsNullOrEmpty(linkType))
+ {
+ if (linkType != "hidden")
+ {
+ SetLinkAttributes(inp, id);
+
+ GeckoNode ps = inp.PreviousSibling;
+ while (ps != null && !(ps is GeckoHtmlElement))
+ ps = ps.PreviousSibling;
+
+ if (inp.PreviousSibling != null)
+ insertSpanBefore(id, null, inp);
+ else
+ insertSpanAfter(id, null, inp.Parent);
+ id++;
+ }
+ }
+ else
+ {
+ SetLinkAttributes(inp, id);
+ insertSpanAfter(id, null, inp.Parent);
+ id++;
+ }
+ }
+
+ GeckoElementCollection buttons = element.GetElementsByTagName("button");
+ foreach (GeckoHtmlElement button in buttons)
+ if (!elementDone(button) && button.ClientRects.Length != 0)
+ {
+ SetLinkAttributes(button, id);
+ insertSpanBefore(id, null, button);
+ id++;
+ }
+
+ GeckoElementCollection selects = element.GetElementsByTagName("select");
+ foreach (GeckoHtmlElement select in selects)
+ if (!elementDone(select) && select.ClientRects.Length != 0)
+ {
+ SetLinkAttributes(select, id);
+ insertSpanBefore(id, null, select);
+ id++;
+ }
+ }
+
+ GeckoElementCollection iframes = document.GetElementsByTagName("iframe");
+ MyLog.debug("page iframes cnt : " + iframes.Count);
+ foreach (GeckoIFrameElement element in iframes)
+ AddLinksToPage(element.ContentDocument, id);
+ }
+
+ private static int GetMaxId(GeckoDocument document)
+ {
+ int maxId = 0;
+ try
+ {
+ foreach (GeckoHtmlElement ge in document.GetElements("//*[@" + btwebId + "]"))
+ {
+ int j;
+ if (Int32.TryParse(ge.Attributes[btwebId].NodeValue, out j))
+ maxId = Math.Max(maxId, j);
+ }
+ }
+ catch
+ {
+ // sometimes this causes an exception...
+ };
+
+ GeckoElementCollection iframes = document.GetElementsByTagName("iframe");
+ foreach (GeckoIFrameElement element in iframes)
+ maxId = Math.Max(maxId, GetMaxId(element.ContentDocument));
+ return maxId;
+ }
+
+ private static GeckoHtmlElement CreateSpan(GeckoDocument owner, int geckoId, string className, string extra)
+ {
+ GeckoHtmlElement result = owner.CreateHtmlElement("span");
+ result.SetAttribute("style", _spanstyle + extra);
+ result.InnerHtml = geckoId.ToString();
+ if (!String.IsNullOrEmpty(className))
+ result.SetAttribute("class", className);
+ return result;
+ }
+
+ private static GeckoElement insertSpanAfter(int geckoId, string className, GeckoNode after, string extra = "")
+ {
+ if (after == null)
+ throw new ArgumentNullException("after");
+ GeckoHtmlElement newChild = CreateSpan(after.OwnerDocument, geckoId, className, extra);
+ if (after.FirstChild == null)
+ after.AppendChild(newChild);
+ else
+ after.InsertBefore(newChild, after.FirstChild);
+ return newChild;
+ }
+
+ private static GeckoElement insertSpanBefore(int geckoId, string className, GeckoNode before, string extra = "")
+ {
+ if (before == null)
+ throw new ArgumentNullException("after");
+ GeckoHtmlElement newElement = CreateSpan(before.OwnerDocument, geckoId, className, extra);
+ before.ParentNode.InsertBefore(newElement, before);
+ return newElement;
+ }
+
+ private static void SetLinkAttributes(GeckoElement link, int linkNumber)
+ {
+ link.SetAttribute(btwebId, linkNumber.ToString());
+ }
+
+ private static bool elementDone(GeckoElement element)
+ {
+ return !String.IsNullOrEmpty(element.GetAttribute(btwebId));
+ }
+
+ private static bool ElementVisible(GeckoNode el)
+ {
+ GeckoHtmlElement ge = el as GeckoHtmlElement;
+ return ge != null && ge.OffsetHeight > 0;
+ }
+
+
+ }
+}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2013-04-06 19:42:56 UTC (rev 4558)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2013-04-07 19:47:28 UTC (rev 4559)
@@ -23,9 +23,9 @@
#endregion
using System;
-using System.Collections.Generic;
using System.Drawing;
using System.IO;
+using System.Text;
using MediaPortal.GUI.Library;
using MediaPortal.Dialogs;
@@ -35,6 +35,7 @@
using System.Runtime.InteropServices;
using Gecko;
+using Gecko.DOM;
namespace BrowseTheWeb
{
@@ -57,12 +58,8 @@
private bool mouseVisible = false;
private bool clickFromPlugin = false;
private bool aeroDisabled = false;
- #region Links
- private Dictionary<int, HtmlLinkNumber> _htmlLinkNumbers = new Dictionary<int, HtmlLinkNumber>();
- #endregion
#region Constants
- private const string _spanstyle = "font-family: arial,sans-serif; font-size: 12px ! important; line-height: 130% ! important; border-width: 1px ! important; border-style: solid ! important; -moz-border-radius: 2px 2px 2px 2px ! important; padding: 0px 2px ! important; margin-right: 2px; max-width: 20px; max-height: 10px ! important; overflow: visible ! important; float: none ! important; display: inline;";
public const int PluginWindowId = 54537689;
#endregion
@@ -217,6 +214,9 @@
osd_linkID = new OSD_LinkId();
GUIGraphicsContext.form.Controls.Add(osd_linkID);
osd_linkID.Visible = false;
+ string preferenceFile = Path.Combine(Config.GetFolder(Config.Dir.Config), "btwebprefs.js");
+ if (File.Exists(preferenceFile))
+ GeckoPreferences.Load(preferenceFile);
#endregion
}
@@ -291,7 +291,7 @@
webBrowser.Visible = true;
webBrowser.Enabled = settings.UseMouse;
- //webBrowser.ClearCachedCOMPtrs();possibly not needed anymore
+ webBrowser.ClearCachedCOMPtrs();
webBrowser.Dock = DockStyle.None;
SetBrowserWindow();
@@ -410,8 +410,7 @@
// http://geckofx.org/viewtopic.php?id=832
GeckoPreferences.User["network.proxy.http"] = Server;
GeckoPreferences.User["network.proxy.http_port"] = Port;
- int ena = 0; if (useProxy) ena = 1;
- GeckoPreferences.User["network.proxy.type"] = ena;
+ GeckoPreferences.User["network.proxy.type"] = useProxy ? 1 : 0;
// maybe possible... not sure...
// network.proxy.login
@@ -903,56 +902,6 @@
}
}
- private void AddElements(List<GeckoHtmlElement> list, GeckoNode parent, string elName)
- {
- if (parent is GeckoHtmlElement && ((GeckoHtmlElement)parent).TagName.ToLowerInvariant() == elName)
- list.Add((GeckoHtmlElement)parent);
- foreach (GeckoNode child in parent.ChildNodes)
- AddElements(list, child, elName);
- }
-
- private List<GeckoHtmlElement> getElements(GeckoNode parent, string elName)
- {
- List<GeckoHtmlElement> res = new List<GeckoHtmlElement>();
- AddElements(res, parent, elName);
- return res;
- }
-
- private GeckoElement insertSpan(int geckoId, string geckoAction, string geckoType, string className, GeckoNode after)
- {
- if (after == null)
- throw new ArgumentNullException("after");
- GeckoHtmlElement newChild = after.OwnerDocument.CreateHtmlElement("span");
- newChild.SetAttribute("style", _spanstyle);
- newChild.SetAttribute("gecko_id", geckoId.ToString());
- newChild.SetAttribute("gecko_action", geckoAction);
- newChild.SetAttribute("gecko_type", geckoType);
- newChild.InnerHtml = geckoId.ToString();
- if (!String.IsNullOrEmpty(className))
- newChild.SetAttribute("class", className);
- if (after.FirstChild == null)
- after.AppendChild(newChild);
- else
- after.InsertBefore(newChild, after.FirstChild);
- return newChild;
- }
-
- private void SetLinkAttributes(GeckoElement link, int linkNumber, out string id, out string name)
- {
- string gb = link.GetAttribute("gb");
- id = link.GetAttribute("id");
- name = link.GetAttribute("name");
- if (string.IsNullOrEmpty(gb))
- {
- link.SetAttribute("gb", "gecko_link" + linkNumber);
- }
- if (string.IsNullOrEmpty(id))
- {
- link.SetAttribute("id", "gb" + linkNumber);
- id = "gb" + linkNumber;
- }
- }
-
private void webBrowser_DocumentCompleted(object sender, EventArgs e)
{
MyLog.debug("page completed : " + webBrowser.Url.ToString());
@@ -968,123 +917,8 @@
#endregion
if (!settings.UseMouse)
- {
- #region add links to page
- _htmlLinkNumbers.Clear();
+ DomHelper.AddLinksToPage(webBrowser.Document);
- GeckoElementCollection links = webBrowser.Document.Links;
- int i = 1;
-
- MyLog.debug("page links cnt : " + links.Count);
-
- foreach (GeckoHtmlElement element in links)
- {
- string link = element.GetAttribute("href");
-
- if (!link.StartsWith("javascript:"))
- {
- GeckoHtmlElement lastSpan = element;
- bool ready = false;
- while (!ready)
- {
- GeckoHtmlElement ls = lastSpan.LastChild as GeckoHtmlElement;
- if (ls == null || ls.TagName != "SPAN")
- ready = true;
- else
- lastSpan = ls;
- };
- if (!element.InnerHtml.Contains("gecko_id"))
- {
- GeckoElement ls = element;
- while (ls.LastChild != null && ls.LastChild is GeckoElement && !String.IsNullOrEmpty(ls.LastChild.TextContent))
- ls = (GeckoElement)ls.LastChild;
- insertSpan(i, String.Empty, "LINK", lastSpan.ClassName, ls);
- }
-
- string id, name;
- SetLinkAttributes(element, i, out id, out name);
- _htmlLinkNumbers.Add(i, new HtmlLinkNumber(i, id, name, link, HtmlInputType.Link));
- i++;
- }
- }
-
- GeckoElementCollection objects = webBrowser.Document.GetElementsByTagName("object");
- MyLog.debug("page objects cnt : " + objects.Count);
- foreach (GeckoHtmlElement element in objects)
- if (element.GetAttribute("type") == "application/x-shockwave-flash")
- {
- string id, name;
- GeckoHtmlElement element2 = element.Parent;
- SetLinkAttributes(element2, i, out id, out name);
-
- if (!element2.InnerHtml.Contains("gecko_id=\"" + i + "\""))
- {
- insertSpan(i, String.Empty, "LINK", null, element2);
- }
- RectangleF rect = element2.BoundingClientRect;
- Point p = new Point(Convert.ToInt32(rect.Left + rect.Width / 2), Convert.ToInt32(rect.Top + rect.Height / 2));
- _htmlLinkNumbers.Add(i, new HtmlLinkNumber(i, id, name, p, HtmlInputType.FlashObject));
- i++;
- }
-
- GeckoElementCollection forms = webBrowser.Document.GetElementsByTagName("form");
-
- MyLog.debug("page forms cnt : " + forms.Count);
-
- foreach (GeckoHtmlElement element in forms)
- {
- List<GeckoHtmlElement> inps = getElements(element, "input");
- string action = element.GetAttribute("action");
- foreach (GeckoHtmlElement link in inps)
- {
- string linkType = link.GetAttribute("type");
- if (!String.IsNullOrEmpty(linkType))
- {
- if (linkType != "hidden")
- {
- string id, name;
- SetLinkAttributes(link, i, out id, out name);
-
- if (!element.InnerHtml.Contains("gecko_id=\"" + i + "\""))
- {
- insertSpan(i, action, "INPUT", null, link.Parent);
- }
- if (linkType == "submit" ||
- linkType == "reset" ||
- linkType == "radio" ||
- linkType == "image" ||
- linkType == "checkbox")
- {
- _htmlLinkNumbers.Add(i, new HtmlLinkNumber(i, id, name, action, HtmlInputType.Action));
- }
- else
- {
- if (linkType == "password")
- _htmlLinkNumbers.Add(i, new HtmlLinkNumber(i, id, name, action, HtmlInputType.InputPassword));
- else
- _htmlLinkNumbers.Add(i, new HtmlLinkNumber(i, id, name, action, HtmlInputType.Input));
- }
- i++;
- }
- }
- else
- {
- string id, name;
- SetLinkAttributes(link, i, out id, out name);
-
- if (!element.InnerHtml.Contains("gecko_id=\"" + i + "\""))
- {
- insertSpan(i, action, "INPUT", null, link.Parent);
- }
-
- _htmlLinkNumbers.Add(i, new HtmlLinkNumber(i, id, name, action, HtmlInputType.Input));
- i++;
- }
- }
- }
- #endregion
- }
-
#region reset zoom
if (settings.ZoomPage)
{
@@ -1125,118 +959,120 @@
osd_linkID.Visible = false;
Application.DoEvents();
- HtmlLinkNumber hln = null;
- if (GetLinkById(Convert.ToInt32(LinkId), out hln))
+ GeckoHtmlElement ge = DomHelper.GetElement(LinkId, webBrowser.Document);
+
+ if (ge == null)
{
- switch (hln.Type)
- {
- case HtmlInputType.Link:
- string link = (string)hln.Obj;
- webBrowser.Navigate(link);
- MyLog.debug("navigate to linkid=" + LinkId + " URL=" + link);
- break;
- case HtmlInputType.Input:
- case HtmlInputType.InputPassword:
- ShowInputDialog(hln);
- break;
- case HtmlInputType.Action:
- webBrowser.Navigate("javascript:document.getElementById(\"" + hln.Id + "\").click()");
- MyLog.debug("action linkid=" + LinkId);
- break;
- case HtmlInputType.FlashObject:
- MyLog.debug("flash click on " + Cursor.Position.ToString());
- Point p = (Point)hln.Obj;
- webBrowser.Enabled = true;
+ MyLog.debug(String.Format("LinkId {0} not found in _htmlLinkNumbers", LinkId));
+ return;
+ }
- System.Threading.Thread.Sleep(200);
- Cursor.Position = webBrowser.PointToScreen(p);
- int X = Cursor.Position.X;
- int Y = Cursor.Position.Y;
- clickFromPlugin = true;
- mouse_event(MOUSEEVENTF_LEFTDOWN | MOUSEEVENTF_LEFTUP, 0, 0, 0, 0);
- break;
- }
+ if (ge is GeckoAnchorElement)
+ {
+ string link = ((GeckoAnchorElement)ge).Href;
+ webBrowser.Navigate(link);
+ MyLog.debug("navigate to linkid=" + LinkId + " URL=" + link);
}
- }
- private bool GetLinkById(int value, out HtmlLinkNumber hln)
- {
- if (_htmlLinkNumbers.ContainsKey(value))
- {
- HtmlLinkNumber id = _htmlLinkNumbers[value];
- switch (id.Type)
+ else
+ if (ge is GeckoButtonElement)
{
- case HtmlInputType.Link:
+ ge.Click();
+ }
+ else
+ if (ge is GeckoSelectElement)
+ {
+ ShowSelect(ge as GeckoSelectElement);
+ }
+ else
+ if (ge is GeckoInputElement)
{
- string link = (string)id.Obj;
- if (!Uri.IsWellFormedUriString(link, UriKind.Absolute))
+ string linkType = ((GeckoInputElement)ge).Type;
+ if (!String.IsNullOrEmpty(linkType))
{
- Uri baseUri = webBrowser.Url;
-
- GeckoElementCollection baseElements = webBrowser.Document.GetElementsByTagName("base");
- if (baseElements != null && baseElements.Count > 0)
+ switch (linkType)
{
- GeckoNode gn = baseElements[0].Attributes["href"];
- if (gn != null && !String.IsNullOrEmpty(gn.NodeValue))
- baseUri = new Uri(gn.NodeValue);
+ case "password": ShowInputDialog(true, ge as GeckoInputElement); break;
+ case "submit":
+ case "reset":
+ case "radio":
+ case "image":
+ case "checkbox":
+ ge.Click();
+ MyLog.debug("action linkid=" + LinkId);
+ break;
+ case "hidden": break;
+ default: ShowInputDialog(false, ge as GeckoInputElement); break;
}
- id.Obj = new Uri(baseUri, link).AbsoluteUri;
}
- hln = id;
- return true;
}
- case HtmlInputType.FlashObject:
- case HtmlInputType.Input:
- case HtmlInputType.InputPassword:
- case HtmlInputType.Action:
- hln = id;
- return true;
- //return "javascript:document.getElementById(\"" + id.Name + "\").click()";
- }
- }
- else
- MyLog.debug(String.Format("LinkId {0} not found in _htmlLinkNumbers", value));
- hln = null;
- return false;
+ else
+ //if (ge is GeckoObjectElement)
+ // some items just need a mousehover, and a ge.Click won't do that
+ {
+ Point p = DomHelper.GetCenterCoordinate(webBrowser.Document, ge);
+ MyLog.debug("perform click on " + p.ToString());
+
+ webBrowser.Enabled = true;
+ System.Threading.Thread.Sleep(200);
+ Cursor.Position = webBrowser.PointToScreen(p);
+ clickFromPlugin = true;
+ mouse_event(MOUSEEVENTF_LEFTDOWN | MOUSEEVENTF_LEFTUP, 0, 0, 0, 0);
+ }
+ //else
+ // ge.Click();
}
- public void ShowInputDialog(HtmlLinkNumber id)
+ public void ShowInputDialog(bool isPassword, GeckoInputElement element)
{
webBrowser.Visible = false;
- string result = string.Empty;
- if (ShowKeyboard(ref result, id.Type == HtmlInputType.InputPassword) == DialogResult.OK)
+ string result = element.Value;
+ if (ShowKeyboard(ref result, isPassword) == DialogResult.OK)
{
- SetInputElementValue(webBrowser.Document, id.Number, result);
- }
- webBrowser.Visible = true;
- }
+ if (element != null)
+ element.SetAttribute("value", result);
+ GeckoFormElement form = element.Form;
+ if (form != null)
+ {
+ //List<GeckoHtmlElement> inps = DomHelper.GetElements(form, "input");
+ GeckoElementCollection inps = form.GetElementsByTagName("input");
+ if (DomHelper.NrOfChildElementsDone(form) == 1)
+ {
+ StringBuilder sb = new StringBuilder();
+ foreach (GeckoInputElement inp in inps)
+ {
+ if (sb.Length != 0)
+ sb.Append('&');
+ sb.Append(inp.Name);
+ sb.Append('=');
+ sb.Append(inp.Value);
+ }
- private bool SetInputElementValue(GeckoNode parent, int geckoId, string text)
- {
- GeckoElement el = parent as GeckoElement;
- if (el != null && el.TagName.ToLowerInvariant() == "input" && el.GetAttribute("gb") == "gecko_link" + geckoId)
- {
- el.SetAttribute("value", text);
- return true;
- }
- else
- {
- foreach (GeckoNode child in parent.ChildNodes)
- {
- if (SetInputElementValue(child, geckoId, text))
- return true;
+ if (form.Method == "get")
+ webBrowser.Navigate(form.Action + '?' + sb.ToString());
+ else
+ {
+ using (GeckoMIMEInputStream stream = new GeckoMIMEInputStream())
+ {
+ stream.AddHeader("Content-Type", "application/x-www-form-urlencoded");
+ stream.AddContentLength = true;
+ stream.SetData(sb.ToString());
+ webBrowser.Navigate(form.Action, 0, null, stream);
+ }
+ }
+ }
}
- return false;
}
+ webBrowser.Visible = true;
}
public static DialogResult ShowKeyboard(ref string DefaultText, bool PasswordInput)
{
VirtualKeyboard vk = (VirtualKeyboard)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_VIRTUAL_KEYBOARD);
-
vk.Reset();
vk.Password = PasswordInput;
vk.Text = DefaultText;
+ vk.SetLabelAsInitialText(false); // set to false, otherwise our intial text is cleared
vk.DoModal(GUIWindowManager.ActiveWindow);
if (vk.IsConfirmed)
@@ -1256,7 +1092,30 @@
dlg.SetLine(3, line3);
dlg.DoModal(GUIWindowManager.ActiveWindow);
}
+ public void ShowSelect(GeckoSelectElement select)
+ {
+ webBrowser.Visible = false;
+ GUIDialogSelect2 dlgMenu = (GUIDialogSelect2)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_SELECT2);
+ dlgMenu.Reset();
+ dlgMenu.SetHeading(select.Name);
+ dlgMenu.SelectedLabel = select.SelectedIndex;
+ GeckoOptionsCollection options = select.Options;
+ for (uint i = 0; i < options.Length; i++)
+ {
+ GeckoOptionElement option = options.item(i);
+ dlgMenu.Add(option.Label);
+ }
+ dlgMenu.DoModal(GUIWindowManager.ActiveWindow);
+ webBrowser.Visible = true;
+
+ if (dlgMenu.SelectedLabel == -1)
+ return;
+ select.SelectedIndex = dlgMenu.SelectedLabel;
+ return;
+
+ }
+
private void OnRenderSound(string strFilePath)
{
MediaPortal.Util.Utils.PlaySound(strFilePath, false, true);
Deleted: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlInputType.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlInputType.cs 2013-04-06 19:42:56 UTC (rev 4558)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlInputType.cs 2013-04-07 19:47:28 UTC (rev 4559)
@@ -1,36 +0,0 @@
-#region Copyright (C) 2005-2010 Team MediaPortal
-
-/*
- * Copyright (C) 2005-2010 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
-
-
-namespace BrowseTheWeb
-{
- public enum HtmlInputType
- {
- Input,
- InputPassword,
- Link,
- Action,
- FlashObject
- }
-}
Deleted: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlLinkNumber.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlLinkNumber.cs 2013-04-06 19:42:56 UTC (rev 4558)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlLinkNumber.cs 2013-04-07 19:47:28 UTC (rev 4559)
@@ -1,46 +0,0 @@
-#region Copyright (C) 2005-2010 Team MediaPortal
-
-/*
- * Copyright (C) 2005-2010 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
-
-
-namespace BrowseTheWeb
-{
- public class HtmlLinkNumber
- {
- public HtmlLinkNumber(int number, string id, string name, object obj, HtmlInputType type)
- {
- Type = type;
- Number = number;
- Name = name;
- Id = id;
- Obj =obj;
-
- }
-
- public int Number { get; set; }
- public string Id { get; set; }
- public string Name { get; set; }
- public HtmlInputType Type { get; set; }
- public object Obj { get; set; }
- }
-}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2013-04-06 19:42:56 UTC (rev 4558)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2013-04-07 19:47:28 UTC (rev 4559)
@@ -16,7 +16,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("MP")]
[assembly: AssemblyProduct("BrowseTheWeb")]
-[assembly: AssemblyCopyright("Copyright © 2010")]
+[assembly: AssemblyCopyright("Copyright © 2013")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -38,5 +38,5 @@
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2013-04-06 19:42:59
|
Revision: 4558
http://sourceforge.net/p/mp-plugins/code/4558
Author: doskabouter
Date: 2013-04-06 19:42:56 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
Added missing file
Added Paths:
-----------
trunk/plugins/BrowseTheWeb/Source/geckofx-18.0/Geckofx-Core/geckofx-core-18.dll.config
Added: trunk/plugins/BrowseTheWeb/Source/geckofx-18.0/Geckofx-Core/geckofx-core-18.dll.config
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/geckofx-18.0/Geckofx-Core/geckofx-core-18.dll.config (rev 0)
+++ trunk/plugins/BrowseTheWeb/Source/geckofx-18.0/Geckofx-Core/geckofx-core-18.dll.config 2013-04-06 19:42:56 UTC (rev 4558)
@@ -0,0 +1,3 @@
+<configuration>
+ <dllmap dll="mozjs" target="libxpcom.so" os="!windows"/>
+</configuration>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hor...@us...> - 2013-03-23 13:22:26
|
Revision: 4557
http://sourceforge.net/p/mp-plugins/code/4557
Author: horned-reaper
Date: 2013-03-23 13:22:23 +0000 (Sat, 23 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/Docs/Changes.txt
trunk/plugins/FritzBox/FritzBox/FritzBox.cs
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/callin.png
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/callout.png
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/rejected.png
trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/callin.png
trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/callout.png
trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/rejected.png
trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/callin.png
trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/callout.png
trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/rejected.png
trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml
trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/callin.png
trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/callout.png
trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/rejected.png
trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml
trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/callin.png
trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/callout.png
trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/rejected.png
trunk/plugins/FritzBox/FritzBox/Skin/Maya/Media/FritzBox/callin.png
trunk/plugins/FritzBox/FritzBox/Skin/Maya/Media/FritzBox/callout.png
trunk/plugins/FritzBox/FritzBox/Skin/Maya/Media/FritzBox/rejected.png
trunk/plugins/FritzBox/FritzBox/Skin/Titan/FritzManager.xml
trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/callin.png
trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/callout.png
trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/rejected.png
trunk/plugins/FritzBox/FritzBox/Skin/Titan/common.facade.fritz.xml
trunk/plugins/FritzBox/FritzBox/Skin/Titan/common.fritz.xml
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/releases/update.xml
Added Paths:
-----------
trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4556.mpe1
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2013-03-21 09:57:58 UTC (rev 4556)
+++ trunk/plugins/FritzBox/Build/Build.log 2013-03-23 13:22:23 UTC (rev 4557)
@@ -1,6 +1,6 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4547
+SVN Version: 4556
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs
@@ -11,7 +11,7 @@
Copyright (C) Microsoft Corporation. Alle Rechte vorbehalten.
Die Projekte in dieser Projektmappe werden nacheinander erstellt. Um eine parallele Erstellung zu erm\x94glichen, m\x81ssen Sie den Schalter "/m" hinzuf\x81gen.
-Der Buildvorgang wurde am 18.03.2013 11:00:21 gestartet.
+Der Buildvorgang wurde am 23.03.2013 14:04:23 gestartet.
Projekt "D:\FritzBox\FritzBox.sln" auf Knoten "1", Rebuild Ziel(e).
ValidateSolutionConfiguration:
Die Projektmappenkonfiguration "Release|Any CPU" wird erstellt.
@@ -56,6 +56,7 @@
Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\log4net.dll" wird gel\x94scht.
Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\Ionic.Zip.dll" wird gel\x94scht.
Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\FritzBox.pdb" wird gel\x94scht.
+ Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\Core.dll" wird gel\x94scht.
Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.csprojResolveAssemblyReference.cache" wird gel\x94scht.
Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.exe" wird gel\x94scht.
Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.pdb" wird gel\x94scht.
@@ -119,7 +120,7 @@
0 Warnung(en)
0 Fehler
-Verstrichene Zeit 00:00:04.85
+Verstrichene Zeit 00:00:01.34
Reverting to build 0
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
@@ -244,7 +245,7 @@
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
36 Datei(en) kopiert
MpeMaker version: 1.3.0.0
-Build started at 11:00:29
+Build started at 14:04:26
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Modified: trunk/plugins/FritzBox/Docs/Changes.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Changes.txt 2013-03-21 09:57:58 UTC (rev 4556)
+++ trunk/plugins/FritzBox/Docs/Changes.txt 2013-03-23 13:22:23 UTC (rev 4557)
@@ -1,3 +1,7 @@
-1.0.0.45xx:
-Fixed bug:
-- call list item images are not shown with some FRITZ!OS versions older than 5.5
\ No newline at end of file
+1.0.0.4556:
+Optimiziation:
+- skin adjustments
+
+Fixed bugs:
+- call type "outgoing" filter does not work
+- Avalon skin is selected per default on Installer
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2013-03-21 09:57:58 UTC (rev 4556)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2013-03-23 13:22:23 UTC (rev 4557)
@@ -1219,9 +1219,10 @@
i++;
+ // apply call type filter
if (Settings.CurrentFilter == CallListFilter.Incoming) if (item.type != 1) continue;
if (Settings.CurrentFilter == CallListFilter.Rejected) if (item.type != 2) continue;
- if (Settings.CurrentFilter == CallListFilter.Outgoing) if (item.type != 3) continue;
+ if (Settings.CurrentFilter == CallListFilter.Outgoing) if (item.type != 4 && item.type != 3) continue; // since FRITZ!OS 5.5 this type number is 4
elem.Label = item.timestamp.ToString(format, ci) + " - " + item.duration.ToString("HH:mm", ci);
@@ -1533,8 +1534,6 @@
private void updateButtonStates()
{
- facadeView.IsVisible = false;
- facadeView.IsVisible = true;
GUIControl.FocusControl(GetID, facadeView.GetID);
string strLine = string.Empty;
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/callin.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/callout.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/rejected.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/callin.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/callout.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Black & White/Media/FritzBox/rejected.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/callin.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/callout.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Blue3/Media/FritzBox/rejected.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml 2013-03-21 09:57:58 UTC (rev 4556)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml 2013-03-23 13:22:23 UTC (rev 4557)
@@ -1,122 +1,123 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<window>
- <id>464554871</id>
- <defaultcontrol>50</defaultcontrol>
- <allowoverlay>yes</allowoverlay>
- <define>#header.label:666</define>
- <define>#header.hover:-</define>
- <controls>
+ <id>464554871</id>
+ <defaultcontrol>50</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <define>#header.label:666</define>
+ <define>#header.hover:-</define>
+ <controls>
+ <control>
+ <description>Background</description>
+ <type>image</type>
+ <id>1</id>
+ <texture>Background.png</texture>
+ <width>1280</width>
+ <height>720</height>
+ </control>
+ <import>common.window.xml</import>
+ <import>common.time.xml</import>
+ <control>
+ <description>Action menu</description>
+ <type>actiongroup</type>
+ <dimColor>00ffffff</dimColor>
+ <width>206</width>
+ <height>720</height>
+ <buttonX>0</buttonX>
+ <buttonY>-60</buttonY>
+ <buttonwidth>79</buttonwidth>
+ <buttonheight>720</buttonheight>
+ <onexit>50</onexit>
+ <defaultcontrol>2</defaultcontrol>
+ <textureFocus>Action_focus.png</textureFocus>
+ <textureNoFocus>Action_nofocus.png</textureNoFocus>
<control>
- <description>BG</description>
- <type>image</type>
- <id>1</id>
- <texture>Background.png</texture>
- <width>1280</width>
- <height>720</height>
+ <type>image</type>
+ <visible>!Control.HasFocus(50)</visible>
+ <posX>19</posX>
+ <posY>78</posY>
+ <width>280</width>
+ <height>591</height>
+ <texture>Backslide.png</texture>
+ <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
+ <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
+ <colorDiffuse>fffffffff</colorDiffuse>
</control>
- <import>common.window.xml</import>
- <import>common.time.xml</import>
- <control>
- <description>Action menu</description>
- <type>actiongroup</type>
- <dimColor>00ffffff</dimColor>
- <width>206</width>
- <height>720</height>
- <buttonX>0</buttonX>
- <buttonY>-60</buttonY>
- <buttonwidth>79</buttonwidth>
- <buttonheight>720</buttonheight>
- <onexit>0</onexit>
- <defaultcontrol>2</defaultcontrol>
- <textureFocus>Action_focus.png</textureFocus>
- <textureNoFocus>Action_nofocus.png</textureNoFocus>
- <control>
- <type>image</type>
- <visible>!Control.HasFocus(50)</visible>
- <posX>19</posX>
- <posY>78</posY>
- <width>280</width>
- <height>591</height>
- <texture>Backslide.png</texture>
- <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
- <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
- <colorDiffuse>fffffffff</colorDiffuse>
- </control>
- <control>
- <description>group element</description>
- <type>group</type>
- <visible>!Control.HasFocus(50)</visible>
- <posX>37</posX>
- <posY>121</posY>
- <layout>StackLayout</layout>
- <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
- <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
- <control>
- <id>2</id>
- <description>View as</description>
- <type>button</type>
- <onright>50</onright>
- <onup>9</onup>
- <label>100</label>
- </control>
- <control>
- <id>3</id>
- <description>Sort</description>
- <type>sortbutton</type>
- <onright>50</onright>
- <ondown>4</ondown>
- </control>
- <control>
- <id>4</id>
- <description>Mode</description>
- <type>button</type>
- <onright>50</onright>
- <ondown>9</ondown>
- <label>Mode</label>
- </control>
- <control>
- <id>9</id>
- <description>Update list</description>
- <type>button</type>
- <onright>50</onright>
- <ondown>2</ondown>
- <label>Update</label>
- </control>
- </control>
- </control>
- <import>common.facade.pictures.xml</import>
<control>
- <description>Contact picture</description>
- <id>500</id>
- <type>image</type>
- <posX>690</posX>
- <posY>170</posY>
- <width>167</width>
- <height>142</height>
- <keepaspectratio>yes</keepaspectratio>
- <centered>yes</centered>
- <texture flipY="true" diffuse="Thumb_Mask.png">#selectedthumb</texture>
- <visible>yes</visible>
- <animation effect="fade" time="450" reversible="false">visible</animation>
+ <description>Group element</description>
+ <type>group</type>
+ <visible>!Control.HasFocus(50)</visible>
+ <posX>37</posX>
+ <posY>121</posY>
+ <layout>StackLayout</layout>
+ <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
+ <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
+ <control>
+ <id>2</id>
+ <description>View as</description>
+ <type>button</type>
+ <onright>50</onright>
+ <onup>9</onup>
+ <label>100</label>
+ </control>
+ <control>
+ <id>3</id>
+ <description>Sort</description>
+ <type>sortbutton</type>
+ <onright>50</onright>
+ <ondown>4</ondown>
+ </control>
+ <control>
+ <id>4</id>
+ <description>Mode</description>
+ <type>button</type>
+ <onright>50</onright>
+ <ondown>9</ondown>
+ <label>Mode</label>
+ </control>
+ <control>
+ <id>9</id>
+ <description>Update list</description>
+ <type>button</type>
+ <onright>50</onright>
+ <ondown>2</ondown>
+ <label>Update</label>
+ </control>
</control>
- <control>
- <type>image</type>
- <id>1</id>
- <posX>40</posX>
- <posY>150</posY>
- <width>178</width>
- <height>144</height>
- <texture flipY="true" diffuse="Thumb_Mask.png">Picture_cover.png</texture>
- <visible>facadeview.list+Control.HasFocus(50)</visible>
- <animation effect="fade" time="450" reversible="false">visible</animation>
- </control>
- <control>
- <type>fadelabel</type>
- <posX>26</posX>
- <posY>18</posY>
- <width>350</width>
- <font>font18</font>
- <label>FRITZ!Box Manager</label>
- </control>
- </controls>
+ </control>
+ <import>common.facade.pictures.xml</import>
+ <control>
+ <description>Contact picture</description>
+ <id>500</id>
+ <type>image</type>
+ <posX>690</posX>
+ <posY>170</posY>
+ <width>170</width>
+ <height>142</height>
+ <keepaspectratio>yes</keepaspectratio>
+ <centered>yes</centered>
+ <texture flipY="true" diffuse="Thumb_Mask.png">#selectedthumb</texture>
+ <visible>yes</visible>
+ <animation effect="fade" time="450" reversible="false">visible</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <id>1</id>
+ <posX>40</posX>
+ <posY>150</posY>
+ <width>178</width>
+ <height>144</height>
+ <texture flipY="true" diffuse="Thumb_Mask.png">Picture_cover.png</texture>
+ <visible>facadeview.list+Control.HasFocus(50)</visible>
+ <animation effect="fade" time="450" reversible="false">visible</animation>
+ </control>
+ <control>
+ <description>Header</description>
+ <type>fadelabel</type>
+ <posX>26</posX>
+ <posY>18</posY>
+ <width>350</width>
+ <font>font18</font>
+ <label>FRITZ!Box Manager</label>
+ </control>
+ </controls>
</window>
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/callin.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/callout.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Default/Media/FritzBox/rejected.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml 2013-03-21 09:57:58 UTC (rev 4556)
+++ trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml 2013-03-23 13:22:23 UTC (rev 4557)
@@ -1,122 +1,123 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<window>
- <id>464554871</id>
- <defaultcontrol>50</defaultcontrol>
- <allowoverlay>yes</allowoverlay>
- <define>#header.label:666</define>
- <define>#header.hover:-</define>
- <controls>
+ <id>464554871</id>
+ <defaultcontrol>50</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <define>#header.label:666</define>
+ <define>#header.hover:-</define>
+ <controls>
+ <control>
+ <description>Background</description>
+ <type>image</type>
+ <id>1</id>
+ <texture>Background.png</texture>
+ <width>1280</width>
+ <height>720</height>
+ </control>
+ <import>common.window.xml</import>
+ <import>common.time.xml</import>
+ <control>
+ <description>Action menu</description>
+ <type>actiongroup</type>
+ <dimColor>00ffffff</dimColor>
+ <width>263</width>
+ <height>473</height>
+ <buttonX>0</buttonX>
+ <buttonY>0</buttonY>
+ <buttonwidth>60</buttonwidth>
+ <buttonheight>576</buttonheight>
+ <onexit>50</onexit>
+ <defaultcontrol>2</defaultcontrol>
+ <textureFocus>Action_focus.png</textureFocus>
+ <textureNoFocus>Action_nofocus.png</textureNoFocus>
<control>
- <description>BG</description>
- <type>image</type>
- <id>1</id>
- <texture>Background.png</texture>
- <width>1280</width>
- <height>720</height>
+ <type>image</type>
+ <visible>!Control.HasFocus(50)</visible>
+ <posX>15</posX>
+ <posY>63</posY>
+ <width>329</width>
+ <height>473</height>
+ <texture>Backslide.png</texture>
+ <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
+ <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
+ <colorDiffuse>fffffffff</colorDiffuse>
</control>
- <import>common.window.xml</import>
- <import>common.time.xml</import>
- <control>
- <description>Action menu</description>
- <type>actiongroup</type>
- <dimColor>00ffffff</dimColor>
- <width>263</width>
- <height>473</height>
- <buttonX>0</buttonX>
- <buttonY>0</buttonY>
- <buttonwidth>60</buttonwidth>
- <buttonheight>576</buttonheight>
- <onexit>50</onexit>
- <defaultcontrol>2</defaultcontrol>
- <textureFocus>Action_focus.png</textureFocus>
- <textureNoFocus>Action_nofocus.png</textureNoFocus>
- <control>
- <type>image</type>
- <visible>!Control.HasFocus(50)</visible>
- <posX>15</posX>
- <posY>63</posY>
- <width>329</width>
- <height>473</height>
- <texture>Backslide.png</texture>
- <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
- <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
- <colorDiffuse>fffffffff</colorDiffuse>
- </control>
- <control>
- <description>group element</description>
- <type>group</type>
- <visible>!Control.HasFocus(50)</visible>
- <posX>40</posX>
- <posY>97</posY>
- <layout>StackLayout</layout>
- <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
- <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
- <control>
- <id>2</id>
- <description>View as</description>
- <type>button</type>
- <onright>50</onright>
- <onup>9</onup>
- <label>100</label>
- </control>
- <control>
- <id>3</id>
- <description>Sort</description>
- <type>sortbutton</type>
- <onright>50</onright>
- <ondown>4</ondown>
- </control>
- <control>
- <id>4</id>
- <description>Mode</description>
- <type>button</type>
- <onright>50</onright>
- <ondown>9</ondown>
- <label>Mode</label>
- </control>
- <control>
- <id>9</id>
- <description>Update list</description>
- <type>button</type>
- <onright>50</onright>
- <ondown>2</ondown>
- <label>Update</label>
- </control>
- </control>
- </control>
- <import>common.facade.pictures.xml</import>
<control>
- <description>Contact picture</description>
- <id>500</id>
- <type>image</type>
- <posX>950</posX>
- <posY>170</posY>
- <width>167</width>
- <height>142</height>
- <keepaspectratio>yes</keepaspectratio>
- <centered>yes</centered>
- <texture flipY="true" diffuse="Thumb_Mask.png">#selectedthumb</texture>
- <visible>yes</visible>
- <animation effect="fade" time="450" reversible="false">visible</animation>
+ <description>Group element</description>
+ <type>group</type>
+ <visible>!Control.HasFocus(50)</visible>
+ <posX>40</posX>
+ <posY>97</posY>
+ <layout>StackLayout</layout>
+ <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
+ <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
+ <control>
+ <id>2</id>
+ <description>View as</description>
+ <type>button</type>
+ <onright>50</onright>
+ <onup>9</onup>
+ <label>100</label>
+ </control>
+ <control>
+ <id>3</id>
+ <description>Sort</description>
+ <type>sortbutton</type>
+ <onright>50</onright>
+ <ondown>4</ondown>
+ </control>
+ <control>
+ <id>4</id>
+ <description>Mode</description>
+ <type>button</type>
+ <onright>50</onright>
+ <ondown>9</ondown>
+ <label>Mode</label>
+ </control>
+ <control>
+ <id>9</id>
+ <description>Update list</description>
+ <type>button</type>
+ <onright>50</onright>
+ <ondown>2</ondown>
+ <label>Update</label>
+ </control>
</control>
- <control>
- <type>image</type>
- <id>1</id>
- <posX>40</posX>
- <posY>150</posY>
- <width>178</width>
- <height>144</height>
- <texture flipY="true" diffuse="Thumb_Mask.png">Picture_cover.png</texture>
- <visible>facadeview.list+Control.HasFocus(50)</visible>
- <animation effect="fade" time="450" reversible="false">visible</animation>
- </control>
- <control>
- <type>fadelabel</type>
- <posX>26</posX>
- <posY>18</posY>
- <width>350</width>
- <font>font18</font>
- <label>FRITZ!Box Manager</label>
- </control>
- </controls>
+ </control>
+ <import>common.facade.pictures.xml</import>
+ <control>
+ <description>Contact picture</description>
+ <id>500</id>
+ <type>image</type>
+ <posX>950</posX>
+ <posY>170</posY>
+ <width>167</width>
+ <height>142</height>
+ <keepaspectratio>yes</keepaspectratio>
+ <centered>yes</centered>
+ <texture flipY="true" diffuse="Thumb_Mask.png">#selectedthumb</texture>
+ <visible>yes</visible>
+ <animation effect="fade" time="450" reversible="false">visible</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <id>1</id>
+ <posX>40</posX>
+ <posY>150</posY>
+ <width>178</width>
+ <height>144</height>
+ <texture flipY="true" diffuse="Thumb_Mask.png">Picture_cover.png</texture>
+ <visible>facadeview.list+Control.HasFocus(50)</visible>
+ <animation effect="fade" time="450" reversible="false">visible</animation>
+ </control>
+ <control>
+ <description>Header</description>
+ <type>fadelabel</type>
+ <posX>26</posX>
+ <posY>18</posY>
+ <width>350</width>
+ <font>font18</font>
+ <label>FRITZ!Box Manager</label>
+ </control>
+ </controls>
</window>
Modified: trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/callin.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/callout.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/Media/FritzBox/rejected.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Maya/Media/FritzBox/callin.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Maya/Media/FritzBox/callout.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Maya/Media/FritzBox/rejected.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Titan/FritzManager.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Titan/FritzManager.xml 2013-03-21 09:57:58 UTC (rev 4556)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Titan/FritzManager.xml 2013-03-23 13:22:23 UTC (rev 4557)
@@ -1,140 +1,140 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>f
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<window>
- <id>464554871</id>
- <defaultcontrol>50</defaultcontrol>
- <allowoverlay>yes</allowoverlay>
- <define>#header.label:FRITZ!Box Manager</define>
- <define>#header.hover:hover_fritzbox.png</define>
- <controls>
- <import>common.fritz.xml</import>
- <import>common.time.xml</import>
+ <id>464554871</id>
+ <defaultcontrol>50</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <define>#header.label:FRITZ!Box Manager</define>
+ <define>#header.hover:hover_fritzbox.png</define>
+ <controls>
+ <import>common.fritz.xml</import>
+ <import>common.time.xml</import>
+ <control>
+ <description>Default background</description>
+ <type>image</type>
+ <id>0</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1920</width>
+ <height>1080</height>
+ <texture>hover_fritzbox.png</texture>
+ <shouldCache>true</shouldCache>
+ </control>
+ <control>
+ <description>Shaddow behind facadeview</description>
+ <type>image</type>
+ <id>0</id>
+ <posX>706</posX>
+ <posY>300</posY>
+ <width>1148</width>
+ <height>666</height>
+ <texture>info_bg.png</texture>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Action menu</description>
+ <type>actiongroup</type>
+ <dimColor>00ffffff</dimColor>
+ <width>263</width>
+ <height>473</height>
+ <buttonX>0</buttonX>
+ <buttonY>0</buttonY>
+ <buttonwidth>60</buttonwidth>
+ <buttonheight>576</buttonheight>
+ <onexit>50</onexit>
+ <defaultcontrol>2</defaultcontrol>
+ <textureFocus>action_menu.png</textureFocus>
+ <textureNoFocus>Action_nofocus.png</textureNoFocus>
<control>
- <description>Default background</description>
- <type>image</type>
- <id>0</id>
- <posX>0</posX>
- <posY>0</posY>
- <width>1920</width>
- <height>1080</height>
- <texture>hover_fritzbox.png</texture>
- <shouldCache>true</shouldCache>
+ <type>image</type>
+ <visible>!Control.HasFocus(50)</visible>
+ <posX>-15</posX>
+ <posY>283</posY>
+ <width>500</width>
+ <height>300</height>
+ <texture>menu_bg.png</texture>
+ <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
+ <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
+ <colorDiffuse>fffffffff</colorDiffuse>
+ </control>
+ <control>
+ <description>Group element</description>
+ <type>group</type>
+ <visible>!Control.HasFocus(50)</visible>
+ <posX>40</posX>
+ <posY>317</posY>
+ <layout>StackLayout</layout>
+ <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
+ <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
+ <control>
+ <id>2</id>
+ <description>View-As</description>
+ <type>button</type>
+ <onright>50</onright>
+ <onup>9</onup>
+ <label>100</label>
+ </control>
+ <control>
+ <id>3</id>
+ <description>Sort</description>
+ <type>sortbutton</type>
+ <onright>50</onright>
+ <ondown>4</ondown>
+ </control>
+ <control>
+ <id>4</id>
+ <description>Mode</description>
+ <type>button</type>
+ <onright>50</onright>
+ <ondown>9</ondown>
+ <label>Mode</label>
+ </control>
+ <control>
+ <id>9</id>
+ <description>Update list</description>
+ <type>button</type>
+ <onright>50</onright>
+ <ondown>2</ondown>
+ <label>Update</label>
+ </control>
</control>
- <control>
- <description>Shaddow behind facadeview</description>
- <type>image</type>
- <id>0</id>
- <posX>770</posX>
- <posY>300</posY>
- <width>1130</width>
- <height>670</height>
- <texture>info_bg.png</texture>
- <animation effect="fade" time="250">WindowOpen</animation>
- <animation effect="fade" time="250">WindowClose</animation>
- </control>
- <control>
- <description>Action menu</description>
- <type>actiongroup</type>
- <dimColor>00ffffff</dimColor>
- <width>263</width>
- <height>473</height>
- <buttonX>0</buttonX>
- <buttonY>0</buttonY>
- <buttonwidth>60</buttonwidth>
- <buttonheight>576</buttonheight>
- <onexit>50</onexit>
- <defaultcontrol>2</defaultcontrol>
- <textureFocus>action_menu.png</textureFocus>
- <textureNoFocus>Action_nofocus.png</textureNoFocus>
- <control>
- <type>image</type>
- <visible>!Control.HasFocus(50)</visible>
- <posX>-15</posX>
- <posY>283</posY>
- <width>500</width>
- <height>300</height>
- <texture>menu_bg.png</texture>
- <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
- <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
- <colorDiffuse>fffffffff</colorDiffuse>
- </control>
- <control>
- <description>Group element</description>
- <type>group</type>
- <visible>!Control.HasFocus(50)</visible>
- <posX>40</posX>
- <posY>317</posY>
- <layout>StackLayout</layout>
- <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation>
- <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation>
- <control>
- <id>2</id>
- <description>View-As</description>
- <type>button</type>
- <onright>50</onright>
- <onup>9</onup>
- <label>100</label>
- </control>
- <control>
- <id>3</id>
- <description>Sort</description>
- <type>sortbutton</type>
- <onright>50</onright>
- <ondown>4</ondown>
- </control>
- <control>
- <id>4</id>
- <description>Mode</description>
- <type>button</type>
- <onright>50</onright>
- <ondown>9</ondown>
- <label>Mode</label>
- </control>
- <control>
- <id>9</id>
- <description>Update list</description>
- <type>button</type>
- <onright>50</onright>
- <ondown>2</ondown>
- <label>Update</label>
- </control>
- </control>
- </control>
- <import>common.facade.fritz.xml</import>
- <control>
- <description>Contact picture</description>
- <id>500</id>
- <type>image</type>
- <posX>500</posX>
- <posY>320</posY>
- <width>167</width>
- <height>142</height>
- <keepaspectratio>yes</keepaspectratio>
- <centered>yes</centered>
- <texture>#selectedthumb</texture>
- <visible>yes</visible>
- <animation effect="fade" time="450" reversible="false">visible</animation>
- </control>
- <control>
- <type>image</type>
- <id>1</id>
- <posX>62</posX>
- <posY>317</posY>
- <width>178</width>
- <height>144</height>
- <texture>Picture_cover.png</texture>
- <visible>facadeview.list+Control.HasFocus(50)</visible>
- <animation effect="fade" time="450" reversible="false">visible</animation>
- </control>
- <control>
- <id>0</id>
- <type>image</type>
- <posX>60</posX>
- <posY>40</posY>
- <width>68</width>
- <height>60</height>
- <texture>icon_fritz.png</texture>
- <animation effect="fade" time="250">WindowOpen</animation>
- <animation effect="fade" time="250">WindowClose</animation>
- </control>
- </controls>
+ </control>
+ <import>common.facade.fritz.xml</import>
+ <control>
+ <description>Contact picture</description>
+ <id>500</id>
+ <type>image</type>
+ <posX>480</posX>
+ <posY>300</posY>
+ <width>167</width>
+ <height>142</height>
+ <keepaspectratio>yes</keepaspectratio>
+ <centered>yes</centered>
+ <texture>#selectedthumb</texture>
+ <visible>control.isvisible(50)</visible>
+ <animation effect="fade" time="450" reversible="false">visible</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <id>1</id>
+ <posX>62</posX>
+ <posY>317</posY>
+ <width>178</width>
+ <height>144</height>
+ <texture>Picture_cover.png</texture>
+ <visible>facadeview.list+Control.HasFocus(50)</visible>
+ <animation effect="fade" time="450" reversible="false">visible</animation>
+ </control>
+ <control>
+ <id>0</id>
+ <type>image</type>
+ <posX>60</posX>
+ <posY>40</posY>
+ <width>68</width>
+ <height>60</height>
+ <texture>icon_fritz.png</texture>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
+ </control>
+ </controls>
</window>
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/callin.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/callout.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/rejected.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Titan/common.facade.fritz.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Titan/common.facade.fritz.xml 2013-03-21 09:57:58 UTC (rev 4556)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Titan/common.facade.fritz.xml 2013-03-23 13:22:23 UTC (rev 4557)
@@ -1,225 +1,233 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<window>
-<controls>
- <!-- :: List Scrolling Popup :: -->
- <control>
- <description>listscroller bg</description>
- <type>image</type>
- <id>1</id>
- <posX>297</posX>
- <posY>540</posY>
- <width>211</width>
- <height>211</height>
- <texture>listscroller_bg.png</texture>
- <visible>facadeview.list+string.contains(#scrolling.up,yes)|string.contains(#scrolling.down,yes)</visible>
- <animation effect="fade" time="250">Visible</animation>
- <animation effect="fade" time="0">Hidden</animation>
- </control>
- <control>
- <type>label</type>
- <id>1</id>
- <posX>352</posX>
- <posY>600</posY>
- <width>96</width>
- <height>96</height>
- <font>TitanLight32</font>
- <textcolor>ff000000</textcolor>
- <label>#selecteditem.scrolllabel</label>
- <visible>facadeview.list+string.contains(#scrolling.up,yes)|string.contains(#scrolling.down,yes)</visible>
- <align>center</align>
- <valign>middle</valign>
- <animation effect="fade" time="250">Visible</animation>
- <animation effect="fade" time="0">Hidden</animation>
- </control>
- <!-- :: Count :: -->
- <!-- :: Listview Lines :: -->
- <control>
- <description>List Lines</description>
- <type>image</type>
- <id>1</id>
- <posX>800</posX>
- <posY>385</posY>
- <width>1060</width>
- <height>506</height>
- <texture>list_lines_wide.png</texture>
- <visible>facadeview.list + control.isvisible(50)</visible>
- <animation effect="fade" time="250">WindowOpen</animation>
- <animation effect="fade" time="250">WindowClose</animation>
- </control>
- <control>
- <description>group element</description>
- <type>group</type>
- <control>
- <animation effect="fade" start="0" end="100" time="300" delay="350">WindowOpen</animation>
- <animation effect="fade" start="100" end="0" time="0" delay="0">WindowClose</animation>
- <description>composite control consisting of a list control and a thumbnail panel</description>
- <type>facadeview</type>
- <id>50</id>
- <control>
- <description>listcontrol</description>
- <type>listcontrol</type>
- <id>50</id>
- <onleft>2</onleft>
- <onright>50</onright>
- <scrollOffset>1</scrollOffset>
- <posX>800</posX>
- <posY>331</posY>
- <width>1085</width>
- <height>700</height>
- <textXOff>0</textXOff>
- <dimColor>ffffffff</dimColor>
- <textureFocus>listcontrol_item_selected_wide.png</textureFocus>
- <textureNoFocus>-</textureNoFocus>
- <spinPosX>1828</spinPosX>
- <spinPosY>1000</spinPosY>
- </control>
- <control>
- <description>Thumbnail Panel</description>
- <type>thumbnailpanel</type>
- <dimColor>90ffffff</dimColor>
- <id>50</id>
- <posX>800</posX>
- <posY>331</posY>
- <width>1085</width>
- <height>700</height>
- <onleft>2</onleft>
- <onright>50</onright>
- <itemWidth>245</itemWidth>
- <itemHeight>141</itemHeight>
- <textureWidth>245</textureWidth>
- <textureHeight>141</textureHeight>
- <thumbWidth>245</thumbWidth>
- <thumbHeight>141</thumbHeight>
- <thumbPosX>0</thumbPosX>
- <thumbPosY>0</thumbPosY>
- <itemWidthBig>350</itemWidthBig>
- <itemHeightBig>202</itemHeightBig>
- <thumbWidthBig>350</thumbWidthBig>
- <thumbHeightBig>202</thumbHeightBig>
- <textureWidthBig>350</textureWidthBig>
- <textureHeightBig>202</textureHeightBig>
- <thumbPosXBig>0</thumbPosXBig>
- <thumbPosYBig>0</thumbPosYBig>
- <zoomXPixels>30</zoomXPixels>
- <zoomYPixels>20</zoomYPixels>
- <thumbZoom>no</thumbZoom>
- <hideUnfocusTexture>no</hideUnfocusTexture>
- <renderFocusText>no</renderFocusText>
- <renderUnfocusText>no</renderUnfocusText>
- <spinCanFocus>no</spinCanFocus>
- <shadowAngle>90</shadowAngle>
- <frameFocus>recordings_thumb_focus.png</frameFocus>
- <textureMask>recordings_thumb_mask.png</textureMask>
- <shadowDistance>50</shadowDistance>
- <keepaspectratio>yes</keepaspectratio>
- <spinPosX>1828</spinPosX>
- <spinPosY>1000</spinPosY>
- <unfocusedAlpha>255</unfocusedAlpha>
- </control>
- <control>
- <description>Filmstrip view</description>
- <type>filmstrip</type>
- <dimColor>90ffffff</dimColor>
- <id>50</id>
- <scrollOffset>3</scrollOffset>
- <folderPrefix></folderPrefix>
- <folderSuffix></folderSuffix>
- <posX>88</posX>
- <posY>665</posY>
- <width>1800</width>
- <height>340</height>
- <onup>2</onup>
- <ondown>2</ondown>
- <onleft>50</onleft>
- <onright>50</onright>
- <thumbWidth>338</thumbWidth>
- <thumbHeight>190</thumbHeight>
- <thumbPosX>0</thumbPosX>
- <thumbPosY>0</thumbPosY>
- <itemWidth>353</itemWidth>
- <itemHeight>190</itemHeight>
- <textureWidth>338</textureWidth>
- <textureHeight>190</textureHeight>
- <textYOff>-2000</textYOff>
- <imageFolderFocus>-</imageFolderFocus>
- <frame>-</frame>
- <frameFocus>-</frameFocus>
- <background>-</background>
- <thumbs flipY="true" diffuse="Thumb_Mask.png" mask="pictures_filmstrip_mask.png"></thumbs>
- <showFrame>yes</showFrame>
- <showFolder>no</showFolder>
- <showBackGround>no</showBackGround>
- <showInfoImage>no</showInfoImage>
- <keepaspectratio>yes</keepaspectratio>
- <scrollbarBackground>scrollbar_bg_hor.png</scrollbarBackground>
- <scrollbarLeft>scrollbar_left_hor.png</scrollbarLeft>
- <scrollbarRight>scrollbar_right_hor.png</scrollbarRight>
- <scrollbarWidth>717</scrollbarWidth>
- <scrollbarHeight>8</scrollbarHeight>
- <scrollbarYOff>293</scrollbarYOff>
- <spinPosX>1828</spinPosX>
- <spinPosY>1000</spinPosY>
- <thumbAnimation effect="zoom" acceleration="-2" start="100,100" reversible="false" end="135,135" center="0,800" time="200">focus</thumbAnimation>
- <thumbAnimation effect="zoom" start="135,135" reversible="false" end="100,100" center="0,800" time="100">unfocus</thumbAnimation>
- </control>
- <control>
- <description>Cover Flow view</description>
- <type>coverflow</type>
- <colordiffuse>90ffffff</colordiffuse>
- <dimColor>90ffffff</dimColor>
- <id>50</id>
- <onup>2</onup>
- <ondown>2</ondown>
- <onleft>50</onleft>
- <onright>50</onright>
- <posX>0</posX>
- <posY>665</posY>
- <width>1920</width>
- <height>768</height>
- <selectedCard>0</selectedCard>
- <cardWidth>338</cardWidth>
- <cardHeight>190</cardHeight>
- <angle>65</angle>
- <sideShift>410</sideShift>
- <sideGap>210</sideGap>
- <sideDepth>280</sideDepth>
- <offsetY>0</offsetY>
- <selectedOffsetY>0</selectedOffsetY>
- <speed>8</speed>
- <showFrame>yes</showFrame>
- <frame>-</frame>
- <frameFocus>-</frameFocus>
- <frameWidth>338</frameWidth>
- <frameHeight>190</frameHeight>
- <spinSpeed>8</spinSpeed>
- <unfocusedAlpha>FF</unfocusedAlpha>
- <folderPrefix></folderPrefix>
- <folderSuffix></folderSuffix>
- <font1>font13</font1>
- <font2>font11</font2>
- <label1>#selecteditem</label1>
- <label2>#selecteditem2</label2>
- <textColor>FFFFFFFF</textColor>
- <remoteColor>FFFF0000</remoteColor>
- <playedColor>FFA0D0FF</playedColor>
- <downloadColor>FF00FF00</downloadColor>
- <selectedColor>FFFFFFFF</selectedColor>
- <shadowAngle>45</shadowAngle>
- <shadowDistance>0</shadowDistance>
- <shadowColor>FF000000</shadowColor>
- <label1YOff>2405</label1YOff>
- <label2YOff>2430</label2YOff>
- <pageSize>5</pageSize>
- <keepaspectratio>yes</keepaspectratio>
- <scrollbarBackground>scrollbar_bg_hor.png</scrollbarBackground>
- <scrollbarLeft>scrollbar_left_hor.png</scrollbarLeft>
- <scrollbarRight>scrollbar_right_hor.png</scrollbarRight>
- <scrollbarWidth>717</scrollbarWidth>
- <scrollbarHeight>8</scrollbarHeight>
- <scrollbarYOff>293</scrollbarYOff>
- <cards flipY="true" diffuse="Thumb_Mask.png" mask="pictures_filmstrip_mask.png"></cards>
- </control>
- </control>
- </control>
-</controls>
+ <controls>
+ <!-- :: List Scrolling Popup :: -->
+ <control>
+ <description>Listscroller background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>297</posX>
+ <posY>540</posY>
+ <width>211</width>
+ <height>211</height>
+ <texture>listscroller_bg.png</texture>
+ <visible>facadeview.list+string.contains(#scrolling.up,yes)|string.contains(#scrolling.down,yes)</visible>
+ <animation effect="fade" time="250">Visible</animation>
+ <animation effect="fade" time="0">Hidden</animation>
+ </control>
+ <control>
+ <type>label</type>
+ <id>1</id>
+ <posX>352</posX>
+ <posY>600</posY>
+ <width>96</width>
+ <height>96</height>
+ <font>TitanLight32</font>
+ <textcolor>ff000000</textcolor>
+ <label>#selecteditem.scrolllabel</label>
+ <visible>facadeview.list+string.contains(#scrolling.up,yes)|string.contains(#scrolling.down,yes)</visible>
+ <align>center</align>
+ <valign>middle</valign>
+ <animation effect="fade" time="250">Visible</animation>
+ <animation effect="fade" time="0">Hidden</animation>
+ </control>
+ <!-- :: Count :: -->
+ <!-- :: Listview Lines :: -->
+ <control>
+ <description>List lines</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>749</posX>
+ <posY>384</posY>
+ <width>1060</width>
+ <height>495</height>
+ <texture>list_lines_wide.png</texture>
+ <visible>facadeview.list + control.isvisible(50)</visible>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Group element</description>
+ <type>group</type>
+ <control>
+ <animation effect="fade" start="0" end="100" time="300" delay="350">WindowOpen</animation>
+ <animation effect="fade" start="100" end="0" time="0" delay="0">WindowClose</animation>
+ <description>Composite control consisting of a list control and a thumbnail panel</description>
+ <type>facadeview</type>
+ <id>50</id>
+ <control>
+ <description>Listcontrol</description>
+ <type>listcontrol</type>
+ <id>50</id>
+ <onleft>2</onleft>
+ <onright>50</onright>
+ <scrollOffset>1</scrollOffset>
+ <posX>734</posX>
+ <posY>331</posY>
+ <width>1085</width>
+ <height>680</height>
+ <textXOff>42</textXOff>
+ <dimColor>ffffffff</dimColor>
+ <textureFocus>listcontrol_item_selected_wide.png</textureFocus>
+ <textureNoFocus>-</textureNoFocus>
+ <spinPosX>1828</spinPosX>
+ <spinPosY>1000</spinPosY>
+ <IconXOff>28</IconXOff>
+ <IconYOff>10</IconYOff>
+ <PinIconXOff>28</PinIconXOff>
+ <PinIconYOff>10</PinIconYOff>
+ <PinIconWidth>24</PinIconWidth>
+ <PinIconHeight>24</PinIconHeight>
+ <itemWidth>36</itemWidth>
+ <itemHeight>36</itemHeight>
+ </control>
+ <control>
+ <description>Thumbnail Panel</description>
+ <type>thumbnailpanel</type>
+ <dimColor>90ffffff</dimColor>
+ <id>50</id>
+ <posX>800</posX>
+ <posY>331</posY>
+ <width>1085</width>
+ <height>700</height>
+ <onleft>2</onleft>
+ <onright>50</onright>
+ <itemWidth>245</itemWidth>
+ <itemHeight>141</itemHeight>
+ <textureWidth>245</textureWidth>
+ <textureHeight>141</textureHeight>
+ <thumbWidth>245</thumbWidth>
+ <thumbHeight>141</thumbHeight>
+ <thumbPosX>0</thumbPosX>
+ <thumbPosY>0</thumbPosY>
+ <itemWidthBig>350</itemWidthBig>
+ <itemHeightBig>202</itemHeightBig>
+ <thumbWidthBig>350</thumbWidthBig>
+ <thumbHeightBig>202</thumbHeightBig>
+ <textureWidthBig>350</textureWidthBig>
+ <textureHeightBig>202</textureHeightBig>
+ <thumbPosXBig>0</thumbPosXBig>
+ <thumbPosYBig>0</thumbPosYBig>
+ <zoomXPixels>30</zoomXPixels>
+ <zoomYPixels>20</zoomYPixels>
+ <thumbZoom>no</thumbZoom>
+ <hideUnfocusTexture>no</hideUnfocusTexture>
+ <renderFocusText>no</renderFocusText>
+ <renderUnfocusText>no</renderUnfocusText>
+ <spinCanFocus>no</spinCanFocus>
+ <shadowAngle>90</shadowAngle>
+ <frameFocus>recordings_thumb_focus.png</frameFocus>
+ <textureMask>recordings_thumb_mask.png</textureMask>
+ <shadowDistance>50</shadowDistance>
+ <keepaspectratio>yes</keepaspectratio>
+ <spinPosX>1828</spinPosX>
+ <spinPosY>1000</spinPosY>
+ <unfocusedAlpha>255</unfocusedAlpha>
+ </control>
+ <control>
+ <description>Filmstrip view</description>
+ <type>filmstrip</type>
+ <dimColor>90ffffff</dimColor>
+ <id>50</id>
+ <scrollOffset>3</scrollOffset>
+ <folderPrefix></folderPrefix>
+ <folderSuffix></folderSuffix>
+ <posX>88</posX>
+ <posY>665</posY>
+ <width>1800</width>
+ <height>340</height>
+ <onup>2</onup>
+ <ondown>2</ondown>
+ <onleft>50</onleft>
+ <onright>50</onright>
+ <thumbWidth>338</thumbWidth>
+ <thumbHeight>190</thumbHeight>
+ <thumbPosX>0</thumbPosX>
+ <thumbPosY>0</thumbPosY>
+ <itemWidth>353</itemWidth>
+ <itemHeight>190</itemHeight>
+ <textureWidth>338</textureWidth>
+ <textureHeight>190</textureHeight>
+ <textYOff>-2000</textYOff>
+ <imageFolderFocus>-</imageFolderFocus>
+ <frame>-</frame>
+ <frameFocus>-</frameFocus>
+ <background>-</background>
+ <thumbs flipY="true" diffuse="Thumb_Mask.png" mask="pictures_filmstrip_mask.png"></thumbs>
+ <showFrame>yes</showFrame>
+ <showFolder>no</showFolder>
+ <showBackGround>no</showBackGround>
+ <showInfoImage>no</showInfoImage>
+ <keepaspectratio>yes</keepaspectratio>
+ <scrollbarBackground>scrollbar_bg_hor.png</scrollbarBackground>
+ <scrollbarLeft>scrollbar_left_hor.png</scrollbarLeft>
+ <scrollbarRight>scrollbar_right_hor.png</scrollbarRight>
+ <scrollbarWidth>717</scrollbarWidth>
+ <scrollbarHeight>8</scrollbarHeight>
+ <scrollbarYOff>293</scrollbarYOff>
+ <spinPosX>1828</spinPosX>
+ <spinPosY>1000</spinPosY>
+ <thumbAnimation effect="zoom" acceleration="-2" start="100,100" reversible="false" end="135,135" center="0,800" time="200">focus</thumbAnimation>
+ <thumbAnimation effect="zoom" start="135,135" reversible="false" end="100,100" center="0,800" time="100">unfocus</thumbAnimation>
+ </control>
+ <control>
+ <description>Cover Flow view</description>
+ <type>coverflow</type>
+ <colordiffuse>90ffffff</colordiffuse>
+ <dimColor>90ffffff</dimColor>
+ <id>50</id>
+ <onup>2</onup>
+ <ondown>2</ondown>
+ <onleft>50</onleft>
+ <onright>50</onright>
+ <posX>0</posX>
+ <posY>665</posY>
+ <width>1920</width>
+ <height>768</height>
+ <selectedCard>0</selectedCard>
+ <cardWidth>338</cardWidth>
+ <cardHeight>190</cardHeight>
+ <angle>65</angle>
+ <sideShift>410</sideShift>
+ <sideGap>210</sideGap>
+ <sideDepth>280</sideDepth>
+ <offsetY>0</offsetY>
+ <selectedOffsetY>0</selectedOffsetY>
+ <speed>8</speed>
+ <showFrame>yes</showFrame>
+ <frame>-</frame>
+ <frameFocus>-</frameFocus>
+ <frameWidth>338</frameWidth>
+ <frameHeight>190</frameHeight>
+ <spinSpeed>8</spinSpeed>
+ <unfocusedAlpha>FF</unfocusedAlpha>
+ <folderPrefix></folderPrefix>
+ <folderSuffix></folderSuffix>
+ <font1>font13</font1>
+ <font2>font11</font2>
+ <label1>#selecteditem</label1>
+ <label2>#selecteditem2</label2>
+ <textColor>FFFFFFFF</textColor>
+ <remoteColor>FFFF0000</remoteColor>
+ <playedColor>FFA0D0FF</playedColor>
+ <downloadColor>FF00FF00</downloadColor>
+ <selectedColor>FFFFFFFF</selectedColor>
+ <shadowAngle>45</shadowAngle>
+ <shadowDistance>0</shadowDistance>
+ <shadowColor>FF000000</shadowColor>
+ <label1YOff>2405</label1YOff>
+ <label2YOff>2430</label2YOff>
+ <pageSize>5</pageSize>
+ <keepaspectratio>yes</keepaspectratio>
+ <scrollbarBackground>scrollbar_bg_hor.png</scrollbarBackground>
+ <scrollbarLeft>scrollbar_left_hor.png</scrollbarLeft>
+ <scrollbarRight>scrollbar_right_hor.png</scrollbarRight>
+ <scrollbarWidth>717</scrollbarWidth>
+ <scrollbarHeight>8</scrollbarHeight>
+ <scrollbarYOff>293</scrollbarYOff>
+ <cards flipY="true" diffuse="Thumb_Mask.png" mask="pictures_filmstrip_mask.png"></cards>
+ </control>
+ </control>
+ </control>
+ </controls>
</window>
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Titan/common.fritz.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Titan/common.fritz.xml 2013-03-21 09:57:58 UTC (rev 4556)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Titan/common.fritz.xml 2013-03-23 13:22:23 UTC (rev 4557)
@@ -1,60 +1,53 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<window>
-<controls>
-
- <control>
- <description>BG</description>
- <type>image</type>
- <id>1</id>
- <width>1920</width>
- <height>1080</height>
- </control>
-
- <!-- :: Overlays :: -->
-
- <control>
- <description>background listview</description>
- <type>image</type>
- <id>1</id>
- <posX>0</posX>
- <posY>0</posY>
- <width>1920</width>
- <height>1080</height>
- <texture>overlay_long.png</texture>
- <visible>[facadeview.list | facadeview.album | facadeview.smallicons | facadeview.largeicons] + Control.IsVisible(50)</visible>
- </control>
-
- <control>
- <description>viewport list</description>
- <type>image</type>
- <id>2020</id>
- <posX>1</posX>
- <posY>92</posY>
- <width>1893</width>
- <height>795</height>
- <texture>viewport_long.png</texture>
- <visible>[facadeview.list | facadeview.album] + Control.IsVisible(50)</visible>
- <animation effect="fade" time="250">WindowOpen</animation>
- <animation effect="fade" time="250">WindowClose</animation>
- <animation effect="slide" time="250" start="-1890,0">WindowOpen</animation>
- <animation effect="slide" time="250" end="-1890,0">WindowClose</animation>
- </control>
-
- <control>
- ...
[truncated message content] |
|
From: <jmb...@us...> - 2013-03-21 09:58:04
|
Revision: 4556
http://sourceforge.net/p/mp-plugins/code/4556
Author: jmbillings
Date: 2013-03-21 09:57:58 +0000 (Thu, 21 Mar 2013)
Log Message:
-----------
Bugfix for left/right switching + updated MP installer
Modified Paths:
--------------
trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs
trunk/plugins/APODPlugin/APODPlugin/Properties/AssemblyInfo.cs
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.pdb
trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.dll
trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.pdb
trunk/plugins/APODPlugin/APODPlugin.v11.suo
trunk/plugins/APODPlugin/MPE/APODPlugin.mpe1
trunk/plugins/APODPlugin/MPE/APODPlugin.xmp2
trunk/plugins/APODPlugin/MPE/update.xml
Modified: trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs 2013-03-20 19:55:34 UTC (rev 4555)
+++ trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs 2013-03-21 09:57:58 UTC (rev 4556)
@@ -127,7 +127,7 @@
base.OnAction(action);
if (downloading) return;
- if (action.m_key.KeyCode == 37)
+ if (action.wID == MediaPortal.GUI.Library.Action.ActionType.ACTION_MOVE_LEFT)
{
//User pressed Left
GUIWaitCursor.Show();
@@ -135,7 +135,7 @@
imageStep = imageStep + 1;
downloader.GetImage(imageStep);
}
- else if (action.m_key.KeyCode == 39)
+ else if (action.wID == MediaPortal.GUI.Library.Action.ActionType.ACTION_MOVE_RIGHT)
{
//User pressed right
if (imageStep == 0)
@@ -154,7 +154,7 @@
imageStep = imageStep - 1;
downloader.GetImage(imageStep);
}
- else if (action.m_key.KeyCode == 120)
+ else if (action.wID == MediaPortal.GUI.Library.Action.ActionType.ACTION_SHOW_INFO)
{
//User pressed i
Modified: trunk/plugins/APODPlugin/APODPlugin/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/Properties/AssemblyInfo.cs 2013-03-20 19:55:34 UTC (rev 4555)
+++ trunk/plugins/APODPlugin/APODPlugin/Properties/AssemblyInfo.cs 2013-03-21 09:57:58 UTC (rev 4556)
@@ -36,5 +36,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.0")]
-[assembly: AssemblyFileVersion("1.0.1.0")]
+[assembly: AssemblyVersion("1.0.2.0")]
+[assembly: AssemblyFileVersion("1.0.2.0")]
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin.v11.suo
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/MPE/APODPlugin.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/MPE/APODPlugin.xmp2
===================================================================
--- trunk/plugins/APODPlugin/MPE/APODPlugin.xmp2 2013-03-20 19:55:34 UTC (rev 4555)
+++ trunk/plugins/APODPlugin/MPE/APODPlugin.xmp2 2013-03-21 09:57:58 UTC (rev 4556)
@@ -195,13 +195,13 @@
<Id>7d9c01e5-0408-4f1b-ba3a-e8afd66c22ab</Id>
<Author>jmbillings</Author>
<HomePage>http://www.team-mediaportal.com/extensions/other/apod-plugin</HomePage>
- <ForumPage />
+ <ForumPage>http://forum.team-mediaportal.com/threads/apod-astronomy-picture-of-the-day-plugin.117456/</ForumPage>
<UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=270&cf_id=52</UpdateUrl>
<Version>
<Major>1</Major>
<Minor>0</Minor>
- <Build>0</Build>
- <Revision>1</Revision>
+ <Build>2</Build>
+ <Revision>0</Revision>
</Version>
<ExtensionDescription>Display APOD (Astronomy Picture of the Day) pictures in Mediaportal</ExtensionDescription>
<VersionDescription />
@@ -262,7 +262,7 @@
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>M42-130202.jpg</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{99c5a998-73b1-4821-9009-58eb172a777e}-M42-130202.jpg</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{fafbb8f2-5d96-4996-8359-c52dbcfd4d20}-M42-130202.jpg</ZipFileName>
<DestinationFilename />
</FileItem>
</Items>
Modified: trunk/plugins/APODPlugin/MPE/update.xml
===================================================================
--- trunk/plugins/APODPlugin/MPE/update.xml 2013-03-20 19:55:34 UTC (rev 4555)
+++ trunk/plugins/APODPlugin/MPE/update.xml 2013-03-21 09:57:58 UTC (rev 4556)
@@ -231,5 +231,120 @@
</ProjectSettings>
<IsSkin>false</IsSkin>
</PackageClass>
+ <PackageClass>
+ <Version>2.0</Version>
+ <Groups>
+ <Items>
+ <GroupItem Name="Default">
+ <DisplayName>Default</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Default</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items />
+ </Sections>
+ <Dependencies>
+ <Items>
+ <DependencyItem>
+ <Type>MediaPortal</Type>
+ <Id />
+ <MinVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MinVersion>
+ <MaxVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MaxVersion>
+ <WarnOnly>false</WarnOnly>
+ <Message>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ </Items>
+ </Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="APODPlugin.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.2.300.0</MinRequiredVersion>
+ <DesignedForVersion>1.2.300.0</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items>
+ <SubSystemItem Name="MP.Config" />
+ <SubSystemItem Name="MP.SkinEngine" />
+ </Items>
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
+ <GeneralInfo>
+ <Name>APODPlugin</Name>
+ <Id>7d9c01e5-0408-4f1b-ba3a-e8afd66c22ab</Id>
+ <Author>jmbillings</Author>
+ <HomePage>http://www.team-mediaportal.com/extensions/other/apod-plugin</HomePage>
+ <ForumPage>http://forum.team-mediaportal.com/threads/apod-astronomy-picture-of-the-day-plugin.117456/</ForumPage>
+ <UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=270&cf_id=52</UpdateUrl>
+ <Version>
+ <Major>1</Major>
+ <Minor>0</Minor>
+ <Build>2</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>Display APOD (Astronomy Picture of the Day) pictures in Mediaportal</ExtensionDescription>
+ <VersionDescription />
+ <DevelopmentStatus>Rc</DevelopmentStatus>
+ <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=270&cf_id=24</OnlineLocation>
+ <ReleaseDate>2013-03-17T12:36:33.840161+00:00</ReleaseDate>
+ <Tags />
+ <Location>C:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\MPE\APODPlugin.mpe1</Location>
+ <Params>
+ <Items>
+ <SectionParam Name="Online Icon">
+ <Value>http://www.team-mediaportal.com/components/com_mtree/img/listings/s/1882.jpg</Value>
+ <ValueType>String</ValueType>
+ <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Configuration file">
+ <Value />
+ <ValueType>Template</ValueType>
+ <Description>The file used to configure the extension.
+ If it has .exe extension the will be executed.
+ If it has .dll extension it's started like MP plugin configuration.</Description>
+ </SectionParam>
+ <SectionParam Name="Online Screenshots">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>Online stored screenshot urls separated by ; </Description>
+ </SectionParam>
+ <SectionParam Name="Force to uninstall on update">
+ <Value>yes</Value>
+ <ValueType>Bool</ValueType>
+ <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ </GeneralInfo>
+ <UniqueFileList>
+ <Items />
+ </UniqueFileList>
+ <ProjectSettings>
+ <FolderGroups />
+ </ProjectSettings>
+ <IsSkin>false</IsSkin>
+ </PackageClass>
</Items>
</ExtensionCollection>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hor...@us...> - 2013-03-20 19:55:39
|
Revision: 4555
http://sourceforge.net/p/mp-plugins/code/4555
Author: horned-reaper
Date: 2013-03-20 19:55:34 +0000 (Wed, 20 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Docs/Changes.txt
Modified: trunk/plugins/FritzBox/Docs/Changes.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Changes.txt 2013-03-20 19:47:53 UTC (rev 4554)
+++ trunk/plugins/FritzBox/Docs/Changes.txt 2013-03-20 19:55:34 UTC (rev 4555)
@@ -1,3 +1,3 @@
1.0.0.45xx:
Fixed bug:
-- call list item images are not shown with some FRITZ!OS versions older than version 5.5
\ No newline at end of file
+- call list item images are not shown with some FRITZ!OS versions older than 5.5
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hor...@us...> - 2013-03-20 19:47:56
|
Revision: 4554
http://sourceforge.net/p/mp-plugins/code/4554
Author: horned-reaper
Date: 2013-03-20 19:47:53 +0000 (Wed, 20 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Docs/Changes.txt
Modified: trunk/plugins/FritzBox/Docs/Changes.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Changes.txt 2013-03-20 19:32:26 UTC (rev 4553)
+++ trunk/plugins/FritzBox/Docs/Changes.txt 2013-03-20 19:47:53 UTC (rev 4554)
@@ -1,4 +1,3 @@
1.0.0.45xx:
Fixed bug:
-- call list item images are not shown with some FRITZ!OS versions older than version 5.5
-- test1
\ No newline at end of file
+- call list item images are not shown with some FRITZ!OS versions older than version 5.5
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hor...@us...> - 2013-03-20 19:32:29
|
Revision: 4553
http://sourceforge.net/p/mp-plugins/code/4553
Author: horned-reaper
Date: 2013-03-20 19:32:26 +0000 (Wed, 20 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Docs/Changes.txt
Modified: trunk/plugins/FritzBox/Docs/Changes.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Changes.txt 2013-03-20 19:29:08 UTC (rev 4552)
+++ trunk/plugins/FritzBox/Docs/Changes.txt 2013-03-20 19:32:26 UTC (rev 4553)
@@ -1,3 +1,4 @@
1.0.0.45xx:
Fixed bug:
-- call list item images are not shown with some FRITZ!OS versions older than version 5.5
\ No newline at end of file
+- call list item images are not shown with some FRITZ!OS versions older than version 5.5
+- test1
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hor...@us...> - 2013-03-20 19:29:11
|
Revision: 4552
http://sourceforge.net/p/mp-plugins/code/4552
Author: horned-reaper
Date: 2013-03-20 19:29:08 +0000 (Wed, 20 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Docs/Changes.txt
Modified: trunk/plugins/FritzBox/Docs/Changes.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Changes.txt 2013-03-20 19:11:46 UTC (rev 4551)
+++ trunk/plugins/FritzBox/Docs/Changes.txt 2013-03-20 19:29:08 UTC (rev 4552)
@@ -1,5 +1,3 @@
-1.0.0.4547:
-New feature:
-- Avalon skin support
+1.0.0.45xx:
Fixed bug:
-- call list is not shown with FRITZ!OS older than version 5.5
\ No newline at end of file
+- call list item images are not shown with some FRITZ!OS versions older than version 5.5
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hor...@us...> - 2013-03-20 19:11:49
|
Revision: 4551
http://sourceforge.net/p/mp-plugins/code/4551
Author: horned-reaper
Date: 2013-03-20 19:11:46 +0000 (Wed, 20 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/FritzBox/Skin/Titan/FritzManager.xml
Added Paths:
-----------
trunk/plugins/FritzBox/FritzBox/docs/
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/TempPE/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/x86/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/x86/Debug/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/TempPE/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/x86/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/x86/Debug/
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/x86/Debug/TempPE/
Modified: trunk/plugins/FritzBox/FritzBox/Skin/Titan/FritzManager.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Titan/FritzManager.xml 2013-03-20 19:06:09 UTC (rev 4550)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Titan/FritzManager.xml 2013-03-20 19:11:46 UTC (rev 4551)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>f
<window>
<id>464554871</id>
<defaultcontrol>50</defaultcontrol>
@@ -6,30 +6,30 @@
<define>#header.label:FRITZ!Box Manager</define>
<define>#header.hover:hover_fritzbox.png</define>
<controls>
- <import>common.fritz.xml</import>
- <import>common.time.xml</import>
- <control>
- <description>Default background</description>
- <type>image</type>
- <id>0</id>
- <posX>0</posX>
- <posY>0</posY>
- <width>1920</width>
- <height>1080</height>
- <texture>hover_fritzbox.png</texture>
- <shouldCache>true</shouldCache>
+ <import>common.fritz.xml</import>
+ <import>common.time.xml</import>
+ <control>
+ <description>Default background</description>
+ <type>image</type>
+ <id>0</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1920</width>
+ <height>1080</height>
+ <texture>hover_fritzbox.png</texture>
+ <shouldCache>true</shouldCache>
</control>
<control>
- <description>Shaddow behind facadeview</description>
- <type>image</type>
- <id>0</id>
- <posX>770</posX>
- <posY>300</posY>
- <width>1130</width>
- <height>670</height>
- <texture>info_bg.png</texture>
- <animation effect="fade" time="250">WindowOpen</animation>
- <animation effect="fade" time="250">WindowClose</animation>
+ <description>Shaddow behind facadeview</description>
+ <type>image</type>
+ <id>0</id>
+ <posX>770</posX>
+ <posY>300</posY>
+ <width>1130</width>
+ <height>670</height>
+ <texture>info_bg.png</texture>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Action menu</description>
@@ -58,7 +58,7 @@
<colorDiffuse>fffffffff</colorDiffuse>
</control>
<control>
- <description>group element</description>
+ <description>Group element</description>
<type>group</type>
<visible>!Control.HasFocus(50)</visible>
<posX>40</posX>
@@ -137,4 +137,4 @@
<animation effect="fade" time="250">WindowClose</animation>
</control>
</controls>
-</window>
\ No newline at end of file
+</window>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hor...@us...> - 2013-03-20 19:06:16
|
Revision: 4550
http://sourceforge.net/p/mp-plugins/code/4550
Author: horned-reaper
Date: 2013-03-20 19:06:09 +0000 (Wed, 20 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/Docs/Changes.txt
trunk/plugins/FritzBox/FritzBox/FritzBox.cs
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs
trunk/plugins/FritzBox/FritzBox/bin/Release/Dialogs.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.GenerateResource.Cache
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.GenerateResource.Cache
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/FritzBoxConfigTester.csproj
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Common.Utils.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Dialogs.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/DirectShowLib.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/MediaPortal.Support.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Utils.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/Dialogs.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/releases/update.xml
Added Paths:
-----------
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/FritzManager.xml
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/CallMonitor.Missing.png
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/CallMonitor.Unknown.png
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Home.png
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Mobile.png
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Work.png
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/callin.png
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/callout.png
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/rejected.png
trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/hover_fritzbox.png
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Core.dll
trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4547.mpe1
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/Build/Build.log 2013-03-20 19:06:09 UTC (rev 4550)
@@ -1,6 +1,6 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4535
+SVN Version: 4547
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs
@@ -11,7 +11,7 @@
Copyright (C) Microsoft Corporation. Alle Rechte vorbehalten.
Die Projekte in dieser Projektmappe werden nacheinander erstellt. Um eine parallele Erstellung zu erm\x94glichen, m\x81ssen Sie den Schalter "/m" hinzuf\x81gen.
-Der Buildvorgang wurde am 10.03.2013 23:02:54 gestartet.
+Der Buildvorgang wurde am 18.03.2013 11:00:21 gestartet.
Projekt "D:\FritzBox\FritzBox.sln" auf Knoten "1", Rebuild Ziel(e).
ValidateSolutionConfiguration:
Die Projektmappenkonfiguration "Release|Any CPU" wird erstellt.
@@ -62,6 +62,7 @@
CoreCompile:
C:\Windows\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /platform:x86 /define:TRACE /highentropyva- /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /reference:D:\FritzBox\FritzBox\bin\Release\FritzBox.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Core.dll" /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Data.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Drawing.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Windows.Forms.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Xml.dll /debug:pdbonly /optimize+ /out:obj\Release\FritzBoxConfigTester.exe /target:winexe /utf8output Program.cs Properties\AssemblyInfo.cs
_CopyFilesMarkedCopyLocal:
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" in "bin\Release\Core.dll" kopiert.
Die Datei wird von "D:\FritzBox\FritzBox\bin\Release\FritzBox.dll" in "bin\Release\FritzBox.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Utils.dll" in "bin\Release\Utils.dll" kopiert.
Die Datei wird von "D:\FritzBox\FritzBox\bin\Release\Dialogs.dll" in "bin\Release\Dialogs.dll" kopiert.
@@ -118,7 +119,7 @@
0 Warnung(en)
0 Fehler
-Verstrichene Zeit 00:00:02.39
+Verstrichene Zeit 00:00:04.85
Reverting to build 0
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
@@ -129,6 +130,16 @@
1 Datei(en) kopiert
..\FritzBox\Resources\speexdec.exe
1 Datei(en) kopiert
+..\FritzBox\Skin\Avalon\FritzManager.xml
+..\FritzBox\Skin\Avalon\Media\hover_fritzbox.png
+..\FritzBox\Skin\Avalon\Media\FritzBox\callin.png
+..\FritzBox\Skin\Avalon\Media\FritzBox\CallMonitor.Missing.png
+..\FritzBox\Skin\Avalon\Media\FritzBox\CallMonitor.Unknown.png
+..\FritzBox\Skin\Avalon\Media\FritzBox\callout.png
+..\FritzBox\Skin\Avalon\Media\FritzBox\Phone_Icon_Home.png
+..\FritzBox\Skin\Avalon\Media\FritzBox\Phone_Icon_Mobile.png
+..\FritzBox\Skin\Avalon\Media\FritzBox\Phone_Icon_Work.png
+..\FritzBox\Skin\Avalon\Media\FritzBox\rejected.png
..\FritzBox\Skin\Black & White\FritzManager.xml
..\FritzBox\Skin\Black & White\Media\hover_FritzBox.png
..\FritzBox\Skin\Black & White\Media\FritzBox\callin.png
@@ -194,7 +205,7 @@
..\FritzBox\Skin\Titan\Media\FritzBox\Phone_Icon_Mobile.png
..\FritzBox\Skin\Titan\Media\FritzBox\Phone_Icon_Work.png
..\FritzBox\Skin\Titan\Media\FritzBox\rejected.png
-65 Datei(en) kopiert
+75 Datei(en) kopiert
..\FritzBox\Languages\strings_de.xml
..\FritzBox\Languages\strings_el.xml
..\FritzBox\Languages\strings_en-US.xml
@@ -232,8 +243,8 @@
..\FritzBox\Languages\Unsupported\strings_uk.xml
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
36 Datei(en) kopiert
-MpeMaker version: 1.2.200.0
-Build started at 23:02:58
+MpeMaker version: 1.3.0.0
+Build started at 11:00:29
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Modified: trunk/plugins/FritzBox/Docs/Changes.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Changes.txt 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/Docs/Changes.txt 2013-03-20 19:06:09 UTC (rev 4550)
@@ -1,10 +1,5 @@
-New release 1.0.0.4535:
+1.0.0.4547:
New feature:
-- Titan skin support (thanks to RicoHTPC)
-
-Optimizations:
-- FRITZ!OS 5.5 support
-- Default skin adjustions for MediaPortal 1.3.0
-
+- Avalon skin support
Fixed bug:
-- black bar is shown in call notification on some skins
\ No newline at end of file
+- call list is not shown with FRITZ!OS older than version 5.5
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2013-03-20 19:06:09 UTC (rev 4550)
@@ -1240,6 +1240,7 @@
// add contact picture
elem.ThumbnailImage = phoneBook.GetCallerImagePath(caller);
+ // add call type icon
string prefix = "FritzBox\\";
string icon = "defaultAudioBig.png";
@@ -1249,8 +1250,8 @@
elem.IconImageBig = icon;
elem.IconImage = icon;
- elem.IsFolder = false;
+ // add call item to list
facadeView.Add(elem);
}
}
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2013-03-20 19:06:09 UTC (rev 4550)
@@ -407,7 +407,7 @@
//
// numericUpDownMaxNotifies
//
- this.numericUpDownMaxNotifies.Location = new System.Drawing.Point(123, 89);
+ this.numericUpDownMaxNotifies.Location = new System.Drawing.Point(126, 89);
this.numericUpDownMaxNotifies.Maximum = new decimal(new int[] {
20,
0,
@@ -479,7 +479,7 @@
// numericUpDownTimeout
//
this.numericUpDownTimeout.Enabled = false;
- this.numericUpDownTimeout.Location = new System.Drawing.Point(190, 43);
+ this.numericUpDownTimeout.Location = new System.Drawing.Point(195, 43);
this.numericUpDownTimeout.Minimum = new decimal(new int[] {
1,
0,
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs 2013-03-20 19:06:09 UTC (rev 4550)
@@ -30,6 +30,7 @@
private string sid;
private string dialport;
private System.Object cacheSync = new System.Object();
+ private bool fritzOS55; // indicates of the FRITZ!Box OS version is 5.5 or higher
static Logger Log = LoggerFactory.getLogger("Fritz");
@@ -89,6 +90,7 @@
sid = matchList[0].Groups[1].Value;
}
}
+ else fritzOS55 = true;
}
}
catch { }
@@ -231,13 +233,14 @@
// download CSV file
try
{
- // new procedure since FRITZ!OS 5.5
- result = client.DownloadData("http://" + hostname + "/fon_num/foncalls_list.lua?sid=" + sid + "&csv=");
-
- if (result.Length == 147) // error message "...Luacgi not readable filename..."
+ switch (fritzOS55)
{
- // procedure before FRITZ!OS 5.5
- result = client.DownloadData(baseurl + "?sid=" + sid + "&getpage=../html/de/FRITZ%21Box_Anrufliste.csv");
+ case true:
+ result = client.DownloadData("http://" + hostname + "/fon_num/foncalls_list.lua?sid=" + sid + "&csv="); // new procedure since FRITZ!OS 5.5
+ break;
+ case false:
+ result = client.DownloadData(baseurl + "?sid=" + sid + "&getpage=../html/de/FRITZ%21Box_Anrufliste.csv"); // old procedure before FRITZ!OS 5.5
+ break;
}
}
catch {}
Added: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/FritzManager.xml
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Avalon/FritzManager.xml (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Avalon/FritzManager.xml 2013-03-20 19:06:09 UTC (rev 4550)
@@ -0,0 +1,288 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<window>
+ <id>464554871</id>
+ <defaultcontrol>50</defaultcontrol>
+ <allowoverlay>no</allowoverlay>
+ <define>#header.label:FritzBox Manager</define>
+ <define>#header.hover:hover_FritzBox.png</define>
+ <controls>
+ <import>common.overlay.xml</import>
+
+ <control>
+ <description>default background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1920</width>
+ <height>1080</height>
+ <texture>background.png</texture>
+ </control>
+
+ <control>
+ <description>background</description>
+ <id>0</id>
+ <type>image</type>
+ <posY>0</posY>
+ <posX>0</posX>
+ <width>1920</width>
+ <height>1080</height>
+ <keepaspectratio>no</keepaspectratio>
+ <texture>#header.hover</texture>
+ <visible>[facadeview.list | facadeview.smallicons | facadeview.largeicons]+Control.IsVisible(50)</visible>
+ <animation effect="fade" time="0">WindowClose</animation>
+ <animation effect="fade" start="0" end="100" time="300" delay="350">WindowOpen</animation>
+ </control>
+ <control>
+ <description>background listview</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1920</width>
+ <height>1080</height>
+ <texture>overlay_long.png</texture>
+ <visible>[facadeview.list | facadeview.album | facadeview.smallicons | facadeview.largeicons]</visible>
+ </control>
+
+ <control>
+ <description>background listview</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>1</posX>
+ <posY>92</posY>
+ <width>1893</width>
+ <height>795</height>
+ <texture>viewport_noposter_music.png</texture>
+ <visible>facadeview.list+Control.IsVisible(50)</visible>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
+ <animation effect="slide" time="250" start="-1890,0">WindowOpen</animation>
+ <animation effect="slide" time="250" end="-1890,0">WindowClose</animation>
+ </control>
+
+ <control>
+ <description>viewport thumbs</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>1</posX>
+ <posY>92</posY>
+ <width>1893</width>
+ <height>795</height>
+ <texture>viewport_thumbs.png</texture>
+ <visible>[facadeview.smallicons | facadeview.largeicons] + Control.IsVisible(50)</visible>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
+ <animation effect="slide" time="250" start="-1890,0">WindowOpen</animation>
+ <animation effect="slide" time="250" end="-1890,0">WindowClose</animation>
+ </control>
+
+ <control>
+ <description>viewport shadow poster disabled</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>467</posX>
+ <posY>120</posY>
+ <width>469</width>
+ <height>739</height>
+ <texture>viewport_shadow.png</texture>
+ <visible>facadeview.list + Control.IsVisible(50)</visible>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
+ <animation effect="slide" time="250" start="-1890,0">WindowOpen</animation>
+ <animation effect="slide" time="250" end="-1890,0">WindowClose</animation>
+ </control>
+
+ <import>common.time.xml</import>
+
+ <control Style="HeaderLabels">
+ <description>Current Feed</description>
+ <type>fadelabel</type>
+ <id>4711</id>
+ <posX>185</posX>
+ <posY>38</posY>
+ <width>800</width>
+ <label>-</label>
+ <font>font22</font>
+ <animation effect="fade" start="0" end="100" time="300" delay="350">WindowOpen</animation>
+ <animation effect="fade" start="100" end="0" time="0" delay="0">WindowClose</animation>
+ </control>
+
+ <control>
+ <description>Selected item Label</description>
+ <type>fadelabel</type>
+ <id>1</id>
+ <posX>1832</posX>
+ <posY>956</posY>
+ <width>1170</width>
+ <label>#selecteditem</label>
+ <font>fontB16</font>
+ <align>right</align>
+ <visible>[facadeview.list | facadeview.smallicons | facadeview.largeicons]+Control.IsVisible(50)+!string.equals(#selecteditem2)</visible>
+ <animation effect="fade" start="0" end="100" time="300" delay="350">WindowOpen</animation>
+ <animation effect="fade" start="100" end="0" time="0" delay="0">WindowClose</animation>
+ </control>
+ <control>
+ <description>Selected item Label</description>
+ <type>fadelabel</type>
+ <id>1</id>
+ <posX>1832</posX>
+ <posY>956</posY>
+ <width>1170</width>
+ <label>#selecteditem2 / #selecteditem</label>
+ <font>fontB16</font>
+ <align>right</align>
+ <visible>[facadeview.list | facadeview.smallicons | facadeview.largeicons]+Control.IsVisible(50)+string.equals(#selecteditem2)</visible>
+ <animation effect="fade" start="0" end="100" time="300" delay="350">WindowOpen</animation>
+ <animation effect="fade" start="100" end="0" time="0" delay="0">WindowClose</animation>
+ </control>
+
+ <control>
+ <id>1</id>
+ <type>image</type>
+ <posX>0</posX>
+ <posY>440</posY>
+ <width>64</width>
+ <height>199</height>
+ <texture>hiddenmenu_tab.png</texture>
+ <visible>[facadeview.list | facadeview.smallicons | facadeview.largeicons]+Control.HasFocus(50) + !string.contains(#Avalon.HiddenMenu, false)</visible>
+ <animation effect="slide" start="-60,0" time="250" delay="400">WindowOpen</animation>
+ <animation effect="slide" start="0,0" end="-60,0" time="250" delay="100">WindowClose</animation>
+ </control>
+
+ <control>
+ <type>actiongroup</type>
+ <description>action menu</description>
+ <defaultcontrol>2</defaultcontrol>
+ <onexit>50</onexit>
+ <dimColor>00ffffff</dimColor>
+ <buttonX>0</buttonX>
+ <buttonY>0</buttonY>
+ <buttonwidth>497</buttonwidth>
+ <buttonheight>1080</buttonheight>
+
+ <control>
+ <type>image</type>
+ <id>0</id>
+ <width>1920</width>
+ <height>1080</height>
+ <texture>semi_trans_back_hidden_menu.png</texture>
+ <visible>!Control.HasFocus(50)</visible>
+ <animation effect="fade" time="450">visible</animation>
+ <animation effect="fade" time="400">hidden</animation>
+ </control>
+
+ <control>
+ <type>image</type>
+ <id>0</id>
+ <posY>15</posY>
+ <posX>0</posX>
+ <width>631</width>
+ <height>1044</height>
+ <texture>menu_bg.png</texture>
+ <visible>!Control.HasFocus(50)</visible>
+ <animation effect="fade" time="0">WindowClose</animation>
+ <animation effect="slide" start="-150,0" time="100">visible</animation>
+ <animation effect="fade" time="250">visible</animation>
+ <animation effect="fade" time="0">hidden</animation>
+ </control>
+
+ <control Style="HiddenMenuMenu">
+ <description>Menu label</description>
+ <type>label</type>
+ <id>1</id>
+ <posX>128</posX>
+ <posY>90</posY>
+ <label>499</label>
+ <visible>!Control.HasFocus(50)</visible>
+ <animation effect="fade" time="0">WindowClose</animation>
+ <animation effect="slide" start="-150,0" time="100">visible</animation>
+ <animation effect="fade" time="250">visible</animation>
+ <animation effect="fade" time="0">hidden</animation>
+ </control>
+ <control>
+ <type>group</type>
+ <description>group element</description>
+ <visible>!Control.HasFocus(50)</visible>
+ <animation effect="fade" time="0">WindowClose</animation>
+ <animation effect="slide" start="-150,0" time="100">visible</animation>
+ <animation effect="fade" time="250">visible</animation>
+ <animation effect="fade" time="0">hidden</animation>
+ <posX>69</posX>
+ <posY>155</posY>
+ <layout>StackLayout(0, Vertical, true)</layout>
+
+ <control Style="HiddenMenuItems">
+ <id>2</id>
+ <description>View-As</description>
+ <type>button</type>
+ <textureFocus>hiddenmenu_item_selected.png</textureFocus>
+ <textureNoFocus>-</textureNoFocus>
+ <width>497</width>
+ <height>64</height>
+ <textXOff>58</textXOff>
+ <textYOff>14</textYOff>
+ <onright>50</onright>
+ <onup>9</onup>
+ <label>100</label>
+ </control>
+ <control Style="HiddenMenuItems">
+ <id>3</id>
+ <description>Sort</description>
+ <type>sortbutton</type>
+ <textureFocus>hiddenmenu_item_selected.png</textureFocus>
+ <textureNoFocus>-</textureNoFocus>
+ <width>497</width>
+ <height>64</height>
+ <textXOff>58</textXOff>
+ <textYOff>14</textYOff>
+ <onright>50</onright>
+ <ondown>4</ondown>
+ </control>
+ <control Style="HiddenMenuItems">
+ <id>4</id>
+ <description>Modus</description>
+ <type>button</type>
+ <textureFocus>hiddenmenu_item_selected.png</textureFocus>
+ <textureNoFocus>-</textureNoFocus>
+ <width>497</width>
+ <height>64</height>
+ <textXOff>58</textXOff>
+ <textYOff>14</textYOff>
+ <onright>50</onright>
+ <ondown>9</ondown>
+ <label>Anrufliste</label>
+ </control>
+ <control Style="HiddenMenuItems">
+ <id>9</id>
+ <description>Receive new list</description>
+ <type>button</type>
+ <textureFocus>hiddenmenu_item_selected.png</textureFocus>
+ <textureNoFocus>-</textureNoFocus>
+ <width>497</width>
+ <height>64</height>
+ <textXOff>58</textXOff>
+ <textYOff>14</textYOff>
+ <onright>50</onright>
+ <ondown>2</ondown>
+ <label>Update</label>
+ </control>
+ </control>
+ </control>
+ <!--
+ <control>
+ <id>1</id>
+ <type>image</type>
+ <posX>90</posX>
+ <posY>250</posY>
+ <width>348</width>
+ <height>348</height>
+ <keepaspectratio>yes</keepaspectratio>
+ <texture flipY="true" diffuse="Thumb_Mask.png">#selectedthumb</texture>
+ <visible>!facadeview.filmstrip</visible>
+ <animation effect="fade" start="100" end="0" time="250">WindowClose</animation>
+ </control>
+ -->
+ <import>FritzManager.facade.xml</import>
+ </controls>
+</window>
\ No newline at end of file
Added: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/CallMonitor.Missing.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/CallMonitor.Missing.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/CallMonitor.Missing.png 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/CallMonitor.Missing.png 2013-03-20 19:06:09 UTC (rev 4550)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/CallMonitor.Missing.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/CallMonitor.Unknown.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/CallMonitor.Unknown.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/CallMonitor.Unknown.png 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/CallMonitor.Unknown.png 2013-03-20 19:06:09 UTC (rev 4550)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/CallMonitor.Unknown.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Home.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Home.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Home.png 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Home.png 2013-03-20 19:06:09 UTC (rev 4550)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Home.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Mobile.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Mobile.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Mobile.png 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Mobile.png 2013-03-20 19:06:09 UTC (rev 4550)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Mobile.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Work.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Work.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Work.png 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Work.png 2013-03-20 19:06:09 UTC (rev 4550)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/Phone_Icon_Work.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/callin.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/callin.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/callin.png 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/callin.png 2013-03-20 19:06:09 UTC (rev 4550)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/callin.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/callout.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/callout.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/callout.png 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/callout.png 2013-03-20 19:06:09 UTC (rev 4550)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/callout.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/rejected.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/rejected.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/rejected.png 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/rejected.png 2013-03-20 19:06:09 UTC (rev 4550)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/FritzBox/rejected.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/hover_fritzbox.png
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/hover_fritzbox.png
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/hover_fritzbox.png 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/hover_fritzbox.png 2013-03-20 19:06:09 UTC (rev 4550)
Property changes on: trunk/plugins/FritzBox/FritzBox/Skin/Avalon/Media/hover_fritzbox.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/Dialogs.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.FileListAbsolute.txt
===================================================================
--- trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.FileListAbsolute.txt 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.FileListAbsolute.txt 2013-03-20 19:06:09 UTC (rev 4550)
@@ -6,3 +6,4 @@
D:\FritzBox\FritzBox\obj\Debug\FritzBox.csproj.GenerateResource.Cache
D:\FritzBox\FritzBox\obj\Debug\FritzBox.dll
D:\FritzBox\FritzBox\obj\Debug\FritzBox.pdb
+D:\FritzBox\FritzBox\obj\Debug\FritzBox.csprojResolveAssemblyReference.cache
Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.GenerateResource.Cache
===================================================================
(Binary files differ)
Added: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csprojResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csprojResolveAssemblyReference.cache
===================================================================
--- trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csprojResolveAssemblyReference.cache 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csprojResolveAssemblyReference.cache 2013-03-20 19:06:09 UTC (rev 4550)
Property changes on: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csprojResolveAssemblyReference.cache
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.GenerateResource.Cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csprojResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
===================================================================
--- trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2013-03-20 19:06:09 UTC (rev 4550)
@@ -622,6 +622,79 @@
</Items>
</Files>
</GroupItem>
+ <GroupItem Name="Avalon Skin">
+ <ParentGroup />
+ <DisplayName>Avalon Skin</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Avalon Skin</Description>
+ <Files>
+ <Items>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\FritzManager.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{404d8fdb-c896-44ca-9ac0-24fb1f983bea}-FritzManager.xml</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\FritzManager.xml</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\Media\hover_fritzbox.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{5608e907-1913-4aab-95f8-37f03a07f688}-hover_fritzbox.png</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\Media\hover_fritzbox.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\Media\FritzBox\CallMonitor.Missing.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{ce2aa5d9-8992-4d0b-aa6f-4b276626aa25}-CallMonitor.Missing.png</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\Media\FritzBox\CallMonitor.Missing.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\Media\FritzBox\CallMonitor.Unknown.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{d8a2f5dd-aad5-490e-a52a-303603d6cefb}-CallMonitor.Unknown.png</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\Media\FritzBox\CallMonitor.Unknown.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\Media\FritzBox\callout.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{53f6fb9c-b97b-4e65-82e0-e9d7e53cad40}-callout.png</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\Media\FritzBox\callout.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\Media\FritzBox\Phone_Icon_Home.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{0b9bd34e-c724-4904-a458-0e13d58e8542}-Phone_Icon_Home.png</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\Media\FritzBox\Phone_Icon_Home.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\Media\FritzBox\Phone_Icon_Mobile.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{881911ca-f20d-4ea7-a91a-02657a48905d}-Phone_Icon_Mobile.png</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\Media\FritzBox\Phone_Icon_Mobile.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\Media\FritzBox\Phone_Icon_Work.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{ef02bf45-aaf2-4b1c-b6f8-480a7d6764d5}-Phone_Icon_Work.png</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\Media\FritzBox\Phone_Icon_Work.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\Media\FritzBox\rejected.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{c6205570-8488-48cf-86dc-e2933c9dde23}-rejected.png</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\Media\FritzBox\rejected.png</DestinationFilename>
+ </FileItem>
+ </Items>
+ </Files>
+ </GroupItem>
</Items>
</Groups>
<Sections>
@@ -689,6 +762,7 @@
<Items />
</Actions>
<IncludedGroups>
+ <string>Avalon Skin</string>
<string>Black & White Skin</string>
<string>Blue3 Skin</string>
<string>Maya Skin</string>
@@ -798,7 +872,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4535</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4547</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -821,7 +895,7 @@
<Major>1</Major>
<Minor>0</Minor>
<Build>0</Build>
- <Revision>4535</Revision>
+ <Revision>4547</Revision>
</Version>
<ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box information from MediaPortal.
@@ -835,7 +909,7 @@
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
- <ReleaseDate>2013-03-10T23:02:58.9670455+01:00</ReleaseDate>
+ <ReleaseDate>2013-03-18T11:00:29.448938+01:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
@@ -1404,6 +1478,69 @@
<ZipFileName>Installer{CopyFile}\{ca228657-f8bf-468f-8437-ee3d484bd8e0}-Phone_Icon_Work.png</ZipFileName>
<DestinationFilename>%Skin%\StreamedMP\Media\FritzBox\Phone_Icon_Work.png</DestinationFilename>
</FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\FritzManager.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{404d8fdb-c896-44ca-9ac0-24fb1f983bea}-FritzManager.xml</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\FritzManager.xml</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\Media\hover_fritzbox.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{5608e907-1913-4aab-95f8-37f03a07f688}-hover_fritzbox.png</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\Media\hover_fritzbox.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\Media\FritzBox\CallMonitor.Missing.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{ce2aa5d9-8992-4d0b-aa6f-4b276626aa25}-CallMonitor.Missing.png</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\Media\FritzBox\CallMonitor.Missing.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\Media\FritzBox\CallMonitor.Unknown.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{d8a2f5dd-aad5-490e-a52a-303603d6cefb}-CallMonitor.Unknown.png</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\Media\FritzBox\CallMonitor.Unknown.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\Media\FritzBox\callout.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{53f6fb9c-b97b-4e65-82e0-e9d7e53cad40}-callout.png</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\Media\FritzBox\callout.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\Media\FritzBox\Phone_Icon_Home.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{0b9bd34e-c724-4904-a458-0e13d58e8542}-Phone_Icon_Home.png</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\Media\FritzBox\Phone_Icon_Home.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\Media\FritzBox\Phone_Icon_Mobile.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{881911ca-f20d-4ea7-a91a-02657a48905d}-Phone_Icon_Mobile.png</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\Media\FritzBox\Phone_Icon_Mobile.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\Media\FritzBox\Phone_Icon_Work.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{ef02bf45-aaf2-4b1c-b6f8-480a7d6764d5}-Phone_Icon_Work.png</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\Media\FritzBox\Phone_Icon_Work.png</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\_release\skin\Avalon\Media\FritzBox\rejected.png</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{c6205570-8488-48cf-86dc-e2933c9dde23}-rejected.png</ZipFileName>
+ <DestinationFilename>%Skin%\Avalon\Media\FritzBox\rejected.png</DestinationFilename>
+ </FileItem>
</Items>
</UniqueFileList>
<ProjectSettings>
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/FritzBoxConfigTester.csproj
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/FritzBoxConfigTester.csproj 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/FritzBoxConfigTester.csproj 2013-03-20 19:06:09 UTC (rev 4550)
@@ -100,7 +100,7 @@
<ItemGroup>
<Reference Include="Core">
<HintPath>C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll</HintPath>
- <Private>False</Private>
+ <Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Common.Utils.dll
===================================================================
(Binary files differ)
Added: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Core.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Core.dll
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Core.dll 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Core.dll 2013-03-20 19:06:09 UTC (rev 4550)
Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Core.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Dialogs.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/DirectShowLib.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/MediaPortal.Support.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Utils.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csproj.FileListAbsolute.txt
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csproj.FileListAbsolute.txt 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csproj.FileListAbsolute.txt 2013-03-20 19:06:09 UTC (rev 4550)
@@ -20,3 +20,4 @@
D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.csprojResolveAssemblyReference.cache
D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.exe
D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.pdb
+D:\FritzBox\Tools\FritzBoxConfigTester\bin\Release\Core.dll
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/Dialogs.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csprojResolveAssemblyReference.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
===================================================================
(Binary files differ)
Added: trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4547.mpe1
===================================================================
(Binary files differ)
Index: trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4547.mpe1
===================================================================
--- trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4547.mpe1 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4547.mpe1 2013-03-20 19:06:09 UTC (rev 4550)
Property changes on: trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4547.mpe1
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/FritzBox/releases/update.xml
===================================================================
--- trunk/plugins/FritzBox/releases/update.xml 2013-03-20 11:01:17 UTC (rev 4549)
+++ trunk/plugins/FritzBox/releases/update.xml 2013-03-20 19:06:09 UTC (rev 4550)
@@ -69,6 +69,14 @@
<Items />
</Files>
</GroupItem>
+ <GroupItem Name="Avalon Skin">
+ <DisplayName>Avalon Skin</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Avalon Skin</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
</Items>
</Groups>
<Sections>
@@ -104,7 +112,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.0.0</MinRequiredVersion>
- <DesignedForVersion>1.1.7.4535</DesignedForVersion>
+ <DesignedForVersion>1.1.7.4547</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -127,7 +135,7 @@
<Major>1</Major>
<Minor>0</Minor>
<Build>0</Build>
- <Revision>4535</Revision>
+ <Revision>4547</Revision>
</Version>
<ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box information from MediaPortal.
@@ -141,7 +149,7 @@
<VersionDescription />
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation>
- <ReleaseDate>2013-03-10T23:02:58.9670455+01:00</ReleaseDate>
+ <ReleaseDate>2013-03-18T11:00:29.448938+01:00</ReleaseDate>
<Tags>fritzbox, fritzbox manager, callmonitor</Tags>
<Location>..\MpeRelease\FritzBox.mpe1</Location>
<Params>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jmb...@us...> - 2013-03-20 11:01:19
|
Revision: 4549
http://sourceforge.net/p/mp-plugins/code/4549
Author: jmbillings
Date: 2013-03-20 11:01:17 +0000 (Wed, 20 Mar 2013)
Log Message:
-----------
Changes to allow viewing previous pictures.
Modified Paths:
--------------
trunk/plugins/APODPlugin/APODPlugin/APODDownloader.cs
trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.pdb
trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.dll
trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.pdb
trunk/plugins/APODPlugin/APODPlugin.v11.suo
trunk/plugins/APODPlugin/MPE/APODPlugin.mpe1
trunk/plugins/APODPlugin/MPE/APODPlugin.xmp2
trunk/plugins/APODPlugin/MPE/update.xml
Modified: trunk/plugins/APODPlugin/APODPlugin/APODDownloader.cs
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/APODDownloader.cs 2013-03-19 11:07:49 UTC (rev 4548)
+++ trunk/plugins/APODPlugin/APODPlugin/APODDownloader.cs 2013-03-20 11:01:17 UTC (rev 4549)
@@ -18,17 +18,21 @@
public delegate void downloadCompleteEvent(object sender, downloadCompleteEventArgs e);
WebClient client;
WebClient imageClient;
+ List<String> apodURLs;
+ int currentStep = 0;
internal APODDownloader()
{
client = new WebClient();
- GetImage();
+ apodURLs = new List<string>();
+ apodURLs.Add(APODURL);
}
- internal void GetImage()
+ internal void GetImage(int step)
{
+ currentStep = step;
client.OpenReadCompleted += new OpenReadCompletedEventHandler(readComplete);
- client.OpenReadAsync(new Uri(APODURL));
+ client.OpenReadAsync(new Uri(apodURLs[step]));
}
private void readComplete(object sender, OpenReadCompletedEventArgs args)
@@ -41,6 +45,7 @@
{
try
{
+ String imageURL = "";
Stream resultStream = args.Result;
if (!resultStream.CanRead)
return;
@@ -57,13 +62,19 @@
Match sourceMatcher = Regex.Match(pagesource, "(?<=<IMG SRC=\")(.+?)(?=\")", RegexOptions.Singleline);
if (sourceMatcher.Success)
{
- String imageURL = "http://apod.nasa.gov/apod/" + sourceMatcher.Value;
+ imageURL = "http://apod.nasa.gov/apod/" + sourceMatcher.Value;
downloadImage(imageURL);
}
else
{
onDownloadError(this, new downloadErrorEventArgs(new Exception("Couldn't find image source :(")));
}
+
+ //Find the previous page URL as well... i.e. <a href="ap130319.html"><</a>
+ Match prevMatcher = Regex.Match(pagesource, "(?<=<a href=\")(.+?)(?=\"><</a>)");
+ String prevURL = "http://apod.nasa.gov/apod/" + prevMatcher.Value;
+ if (!apodURLs.Contains(prevURL))
+ apodURLs.Add(prevURL);
}
catch (Exception ex)
{
Modified: trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs 2013-03-19 11:07:49 UTC (rev 4548)
+++ trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs 2013-03-20 11:01:17 UTC (rev 4549)
@@ -14,7 +14,10 @@
{
[SkinControlAttribute(4)]
protected GUIImage image = null;
-
+ int imageStep = 0;
+ APODDownloader downloader;
+ bool downloading = true;
+
public APODPlugin()
{
}
@@ -113,24 +116,43 @@
protected override void OnPageLoad()
{
GUIWaitCursor.Show();
- APODDownloader downloader = new APODDownloader();
+ downloader = new APODDownloader();
downloader.onDownloadError += downloader_onDownloadError;
downloader.onDownloadComplete += downloader_onDownloadComplete;
- downloader.GetImage();
+ downloader.GetImage(imageStep);
}
public override void OnAction(MediaPortal.GUI.Library.Action action)
{
base.OnAction(action);
+ if (downloading) return;
+
if (action.m_key.KeyCode == 37)
{
//User pressed Left
-
+ GUIWaitCursor.Show();
+ downloading = true;
+ imageStep = imageStep + 1;
+ downloader.GetImage(imageStep);
}
else if (action.m_key.KeyCode == 39)
{
//User pressed right
-
+ if (imageStep == 0)
+ {
+ GUIDialogOK dlgOK = (GUIDialogOK)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_OK);
+ if (dlgOK != null)
+ {
+ dlgOK.SetHeading("Info");
+ dlgOK.SetLine(1, "This is the most recent image!");
+ dlgOK.DoModal(this.GetWindowId());
+ }
+ return;
+ }
+ GUIWaitCursor.Show();
+ downloading = true;
+ imageStep = imageStep - 1;
+ downloader.GetImage(imageStep);
}
else if (action.m_key.KeyCode == 120)
{
@@ -158,10 +180,10 @@
graph.FillRectangle(brush, new RectangleF(0, 0, screenRect.Width, screenRect.Height));
graph.DrawImage(originalBitmap, new Rectangle(((int)screenRect.Width - scaleWidth) / 2, ((int)screenRect.Height - scaleHeight) / 2, scaleWidth, scaleHeight));
- resizedBitmap.Save(System.IO.Path.GetTempPath() + "\\apod.jpg");
- image.SetFileName(System.IO.Path.GetTempPath() + "\\apod.jpg");
+ resizedBitmap.Save(System.IO.Path.GetTempPath() + "\\apod" + imageStep.ToString() + ".jpg");
+ image.SetFileName(System.IO.Path.GetTempPath() + "\\apod" + imageStep.ToString() + ".jpg");
image.Refresh();
-
+ downloading = false;
GUIWaitCursor.Hide();
}
@@ -178,4 +200,4 @@
}
}
}
-}
+}
\ No newline at end of file
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin.v11.suo
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/MPE/APODPlugin.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/MPE/APODPlugin.xmp2
===================================================================
--- trunk/plugins/APODPlugin/MPE/APODPlugin.xmp2 2013-03-19 11:07:49 UTC (rev 4548)
+++ trunk/plugins/APODPlugin/MPE/APODPlugin.xmp2 2013-03-20 11:01:17 UTC (rev 4549)
@@ -201,9 +201,9 @@
<Major>1</Major>
<Minor>0</Minor>
<Build>0</Build>
- <Revision>0</Revision>
+ <Revision>1</Revision>
</Version>
- <ExtensionDescription>Display the current APOD (Astronomy Picture of the Day) in Mediaportal</ExtensionDescription>
+ <ExtensionDescription>Display APOD (Astronomy Picture of the Day) pictures in Mediaportal</ExtensionDescription>
<VersionDescription />
<DevelopmentStatus>Rc</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=270&cf_id=24</OnlineLocation>
@@ -262,7 +262,7 @@
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>M42-130202.jpg</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{46d26bb9-9853-400e-bb4d-ca3ad5017c7e}-M42-130202.jpg</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{99c5a998-73b1-4821-9009-58eb172a777e}-M42-130202.jpg</ZipFileName>
<DestinationFilename />
</FileItem>
</Items>
Modified: trunk/plugins/APODPlugin/MPE/update.xml
===================================================================
--- trunk/plugins/APODPlugin/MPE/update.xml 2013-03-19 11:07:49 UTC (rev 4548)
+++ trunk/plugins/APODPlugin/MPE/update.xml 2013-03-20 11:01:17 UTC (rev 4549)
@@ -74,7 +74,7 @@
<Build>0</Build>
<Revision>0</Revision>
</Version>
- <ExtensionDescription>Display the current APOD (Astronomy Picture of the Day) in Mediaportal</ExtensionDescription>
+ <ExtensionDescription>Display APOD (Astronomy Picture of the Day) pictures in Mediaportal</ExtensionDescription>
<VersionDescription />
<DevelopmentStatus>Rc</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=270&cf_id=24</OnlineLocation>
@@ -116,5 +116,120 @@
</ProjectSettings>
<IsSkin>false</IsSkin>
</PackageClass>
+ <PackageClass>
+ <Version>2.0</Version>
+ <Groups>
+ <Items>
+ <GroupItem Name="Default">
+ <DisplayName>Default</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Default</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items />
+ </Sections>
+ <Dependencies>
+ <Items>
+ <DependencyItem>
+ <Type>MediaPortal</Type>
+ <Id />
+ <MinVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MinVersion>
+ <MaxVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MaxVersion>
+ <WarnOnly>false</WarnOnly>
+ <Message>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ </Items>
+ </Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="APODPlugin.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.2.300.0</MinRequiredVersion>
+ <DesignedForVersion>1.2.300.0</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items>
+ <SubSystemItem Name="MP.Config" />
+ <SubSystemItem Name="MP.SkinEngine" />
+ </Items>
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
+ <GeneralInfo>
+ <Name>APODPlugin</Name>
+ <Id>7d9c01e5-0408-4f1b-ba3a-e8afd66c22ab</Id>
+ <Author>jmbillings</Author>
+ <HomePage>http://www.team-mediaportal.com/extensions/other/apod-plugin</HomePage>
+ <ForumPage />
+ <UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=270&cf_id=52</UpdateUrl>
+ <Version>
+ <Major>1</Major>
+ <Minor>0</Minor>
+ <Build>0</Build>
+ <Revision>1</Revision>
+ </Version>
+ <ExtensionDescription>Display APOD (Astronomy Picture of the Day) pictures in Mediaportal</ExtensionDescription>
+ <VersionDescription />
+ <DevelopmentStatus>Rc</DevelopmentStatus>
+ <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=270&cf_id=24</OnlineLocation>
+ <ReleaseDate>2013-03-17T12:36:33.840161+00:00</ReleaseDate>
+ <Tags />
+ <Location>C:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\MPE\APODPlugin.mpe1</Location>
+ <Params>
+ <Items>
+ <SectionParam Name="Online Icon">
+ <Value>http://www.team-mediaportal.com/components/com_mtree/img/listings/s/1882.jpg</Value>
+ <ValueType>String</ValueType>
+ <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Configuration file">
+ <Value />
+ <ValueType>Template</ValueType>
+ <Description>The file used to configure the extension.
+ If it has .exe extension the will be executed.
+ If it has .dll extension it's started like MP plugin configuration.</Description>
+ </SectionParam>
+ <SectionParam Name="Online Screenshots">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>Online stored screenshot urls separated by ; </Description>
+ </SectionParam>
+ <SectionParam Name="Force to uninstall on update">
+ <Value>yes</Value>
+ <ValueType>Bool</ValueType>
+ <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ </GeneralInfo>
+ <UniqueFileList>
+ <Items />
+ </UniqueFileList>
+ <ProjectSettings>
+ <FolderGroups />
+ </ProjectSettings>
+ <IsSkin>false</IsSkin>
+ </PackageClass>
</Items>
</ExtensionCollection>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jmb...@us...> - 2013-03-19 11:07:53
|
Revision: 4548
http://sourceforge.net/p/mp-plugins/code/4548
Author: jmbillings
Date: 2013-03-19 11:07:49 +0000 (Tue, 19 Mar 2013)
Log Message:
-----------
Fix resizing. Add keycode detect
Modified Paths:
--------------
trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs
trunk/plugins/APODPlugin/APODPlugin/Properties/AssemblyInfo.cs
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.pdb
trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.dll
trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.pdb
trunk/plugins/APODPlugin/APODPlugin.v11.suo
Modified: trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs 2013-03-18 08:42:18 UTC (rev 4547)
+++ trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs 2013-03-19 11:07:49 UTC (rev 4548)
@@ -42,7 +42,7 @@
// show the setup dialog
public void ShowPlugin()
{
- MessageBox.Show("Nothing to configure, this is just an example");
+ MessageBox.Show("Nothing to see here.");
}
// Indicates whether plugin can be enabled/disabled
@@ -83,7 +83,7 @@
/// <returns>true : plugin needs it's own button on home
/// false : plugin does not need it's own button on home</returns>
public bool GetHome(out string strButtonText, out string strButtonImage,
- out string strButtonImageFocus, out string strPictureImage)
+ out string strButtonImageFocus, out string strPictureImage)
{
strButtonText = PluginName();
strButtonImage = String.Empty;
@@ -119,6 +119,26 @@
downloader.GetImage();
}
+ public override void OnAction(MediaPortal.GUI.Library.Action action)
+ {
+ base.OnAction(action);
+ if (action.m_key.KeyCode == 37)
+ {
+ //User pressed Left
+
+ }
+ else if (action.m_key.KeyCode == 39)
+ {
+ //User pressed right
+
+ }
+ else if (action.m_key.KeyCode == 120)
+ {
+ //User pressed i
+
+ }
+ }
+
void downloader_onDownloadComplete(object sender, downloadCompleteEventArgs e)
{
Rectangle screenRect = Screen.PrimaryScreen.Bounds;
@@ -126,7 +146,7 @@
Bitmap originalBitmap = (Bitmap)e.bitmap;
Brush brush = new SolidBrush(Color.Black);
- float scale = Math.Min(screenRect.Width / originalBitmap.Width, screenRect.Height / originalBitmap.Height);
+ float scale = Math.Min((float)screenRect.Width / (float)originalBitmap.Width, (float)screenRect.Height / (float)originalBitmap.Height);
Graphics graph = Graphics.FromImage(resizedBitmap);
graph.InterpolationMode = InterpolationMode.High;
Modified: trunk/plugins/APODPlugin/APODPlugin/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/Properties/AssemblyInfo.cs 2013-03-18 08:42:18 UTC (rev 4547)
+++ trunk/plugins/APODPlugin/APODPlugin/Properties/AssemblyInfo.cs 2013-03-19 11:07:49 UTC (rev 4548)
@@ -36,5 +36,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin.v11.suo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jmb...@us...> - 2013-03-18 08:42:21
|
Revision: 4547
http://sourceforge.net/p/mp-plugins/code/4547
Author: jmbillings
Date: 2013-03-18 08:42:18 +0000 (Mon, 18 Mar 2013)
Log Message:
-----------
Commit installer
Added Paths:
-----------
trunk/plugins/APODPlugin/MPE/
trunk/plugins/APODPlugin/MPE/APODPlugin.mpe1
trunk/plugins/APODPlugin/MPE/APODPlugin.xmp2
trunk/plugins/APODPlugin/MPE/M42-130202.jpg
trunk/plugins/APODPlugin/MPE/update.xml
Added: trunk/plugins/APODPlugin/MPE/APODPlugin.mpe1
===================================================================
(Binary files differ)
Index: trunk/plugins/APODPlugin/MPE/APODPlugin.mpe1
===================================================================
--- trunk/plugins/APODPlugin/MPE/APODPlugin.mpe1 2013-03-18 08:41:40 UTC (rev 4546)
+++ trunk/plugins/APODPlugin/MPE/APODPlugin.mpe1 2013-03-18 08:42:18 UTC (rev 4547)
Property changes on: trunk/plugins/APODPlugin/MPE/APODPlugin.mpe1
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/APODPlugin/MPE/APODPlugin.xmp2
===================================================================
--- trunk/plugins/APODPlugin/MPE/APODPlugin.xmp2 (rev 0)
+++ trunk/plugins/APODPlugin/MPE/APODPlugin.xmp2 2013-03-18 08:42:18 UTC (rev 4547)
@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PackageClass xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <Version>2.0</Version>
+ <Groups>
+ <Items>
+ <GroupItem Name="Default">
+ <ParentGroup />
+ <DisplayName>Default</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Default</Description>
+ <Files>
+ <Items>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\APODPlugin\bin\Debug\APODPlugin.dll</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{746296f1-824c-4cd3-8c66-7d1f0befd7cf}-APODPlugin.dll</ZipFileName>
+ <DestinationFilename>%Plugins%\Windows\APODPlugin.dll</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\APODPlugin\bin\Debug\APODPlugin.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{9bd9a2d2-9a0e-4f58-a88e-8342721fc6bb}-APODPlugin.xml</ZipFileName>
+ <DestinationFilename>%Skin%\Titan\APODPlugin.xml</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\APODPlugin\bin\Debug\APODPlugin.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{2e8ca333-8c7c-4698-8306-c471adc7df71}-APODPlugin.xml</ZipFileName>
+ <DestinationFilename>%Skin%\Default\APODPlugin.xml</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\APODPlugin\bin\Debug\APODPlugin.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{5fcfa3ae-4095-4fef-9110-c3a1d1a1865e}-APODPlugin.xml</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\APODPlugin.xml</DestinationFilename>
+ </FileItem>
+ </Items>
+ </Files>
+ </GroupItem>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items>
+ <SectionItem Guid="a06a7afd-bf99-429f-96eb-1dd6bb1da855" Name="Welcome Screen" ConditionGroup="">
+ <Params>
+ <Items>
+ <SectionParam Name="Header text">
+ <Value>Welcome to the Extension Installer for [Name]</Value>
+ <ValueType>String</ValueType>
+ <Description />
+ </SectionParam>
+ <SectionParam Name="Description">
+ <Value>This will install [Name] version [Version] on your computer.
+It is recommended that you close all other applications before continuing.
+Click Next to continue or Cancel to exit Setup.</Value>
+ <ValueType>String</ValueType>
+ <Description />
+ </SectionParam>
+ <SectionParam Name="Left part image">
+ <Value />
+ <ValueType>File</ValueType>
+ <Description />
+ </SectionParam>
+ <SectionParam Name="Header image">
+ <Value />
+ <ValueType>File</ValueType>
+ <Description>Image in upper right part</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ <Actions>
+ <Items />
+ </Actions>
+ <IncludedGroups />
+ <PanelName>Welcome Screen</PanelName>
+ <WizardButtonsEnum>NextCancel</WizardButtonsEnum>
+ </SectionItem>
+ <SectionItem Guid="3928d4ec-d28c-4537-88a6-e82ce7ed6dec" Name="Install Section" ConditionGroup="">
+ <Params>
+ <Items>
+ <SectionParam Name="Header Title">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>Header title</Description>
+ </SectionParam>
+ <SectionParam Name="Header description">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>Description of section, shown in under section title</Description>
+ </SectionParam>
+ <SectionParam Name="Header image">
+ <Value />
+ <ValueType>File</ValueType>
+ <Description>Image in upper right part</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ <Actions>
+ <Items>
+ <ActionItem Name="InstallFiles" ActionType="InstallFiles" ConditionGroup="">
+ <Params>
+ <Items />
+ </Params>
+ <ExecuteLocation>AfterPanelShow</ExecuteLocation>
+ </ActionItem>
+ </Items>
+ </Actions>
+ <IncludedGroups />
+ <PanelName>Install Section</PanelName>
+ <WizardButtonsEnum>Next</WizardButtonsEnum>
+ </SectionItem>
+ <SectionItem Guid="2d517551-a818-45f3-8a57-4ab2882466ae" Name="Setup Complete" ConditionGroup="">
+ <Params>
+ <Items>
+ <SectionParam Name="Header text">
+ <Value>The Extension Installer Wizard has successfully installed [Name].</Value>
+ <ValueType>String</ValueType>
+ <Description />
+ </SectionParam>
+ <SectionParam Name="Left part image">
+ <Value />
+ <ValueType>File</ValueType>
+ <Description />
+ </SectionParam>
+ <SectionParam Name="Show radio buttons">
+ <Value />
+ <ValueType>Bool</ValueType>
+ <Description>Use radiobutton in place of combobox</Description>
+ </SectionParam>
+ <SectionParam Name="Header image">
+ <Value />
+ <ValueType>File</ValueType>
+ <Description>Image in upper right part</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ <Actions>
+ <Items />
+ </Actions>
+ <IncludedGroups />
+ <PanelName>Setup Complete</PanelName>
+ <WizardButtonsEnum>Finish</WizardButtonsEnum>
+ </SectionItem>
+ </Items>
+ </Sections>
+ <Dependencies>
+ <Items>
+ <DependencyItem>
+ <Type>MediaPortal</Type>
+ <Id />
+ <MinVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MinVersion>
+ <MaxVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MaxVersion>
+ <WarnOnly>false</WarnOnly>
+ <Message>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ </Items>
+ </Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="APODPlugin.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.2.300.0</MinRequiredVersion>
+ <DesignedForVersion>1.2.300.0</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items>
+ <SubSystemItem Name="MP.Config" />
+ <SubSystemItem Name="MP.SkinEngine" />
+ </Items>
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
+ <GeneralInfo>
+ <Name>APODPlugin</Name>
+ <Id>7d9c01e5-0408-4f1b-ba3a-e8afd66c22ab</Id>
+ <Author>jmbillings</Author>
+ <HomePage>http://www.team-mediaportal.com/extensions/other/apod-plugin</HomePage>
+ <ForumPage />
+ <UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=270&cf_id=52</UpdateUrl>
+ <Version>
+ <Major>1</Major>
+ <Minor>0</Minor>
+ <Build>0</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>Display the current APOD (Astronomy Picture of the Day) in Mediaportal</ExtensionDescription>
+ <VersionDescription />
+ <DevelopmentStatus>Rc</DevelopmentStatus>
+ <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=270&cf_id=24</OnlineLocation>
+ <ReleaseDate>2013-03-17T12:36:33.840161+00:00</ReleaseDate>
+ <Tags />
+ <Location>C:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\MPE\APODPlugin.mpe1</Location>
+ <Params>
+ <Items>
+ <SectionParam Name="Icon">
+ <Value>M42-130202.jpg</Value>
+ <ValueType>File</ValueType>
+ <Description>The icon file of the package (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Online Icon">
+ <Value>http://www.team-mediaportal.com/components/com_mtree/img/listings/s/1882.jpg</Value>
+ <ValueType>String</ValueType>
+ <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Configuration file">
+ <Value />
+ <ValueType>Template</ValueType>
+ <Description>The file used to configure the extension.
+ If it has .exe extension the will be executed.
+ If it has .dll extension it's started like MP plugin configuration.</Description>
+ </SectionParam>
+ <SectionParam Name="Online Screenshots">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>Online stored screenshot urls separated by ; </Description>
+ </SectionParam>
+ <SectionParam Name="Force to uninstall on update">
+ <Value>yes</Value>
+ <ValueType>Bool</ValueType>
+ <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ </GeneralInfo>
+ <UniqueFileList>
+ <Items>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\APODPlugin\bin\Debug\APODPlugin.dll</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{746296f1-824c-4cd3-8c66-7d1f0befd7cf}-APODPlugin.dll</ZipFileName>
+ <DestinationFilename>%Plugins%\Windows\APODPlugin.dll</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\APODPlugin\bin\Debug\APODPlugin.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{9bd9a2d2-9a0e-4f58-a88e-8342721fc6bb}-APODPlugin.xml</ZipFileName>
+ <DestinationFilename>%Skin%\Titan\APODPlugin.xml</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="true" Modified="true">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>M42-130202.jpg</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{46d26bb9-9853-400e-bb4d-ca3ad5017c7e}-M42-130202.jpg</ZipFileName>
+ <DestinationFilename />
+ </FileItem>
+ </Items>
+ </UniqueFileList>
+ <ProjectSettings>
+ <FolderGroups />
+ <ProjectFilename>APODPlugin.xmp2</ProjectFilename>
+ <UpdatePath1>C:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\MPE\update.xml</UpdatePath1>
+ <UpdatePath2 />
+ <UpdatePath3 />
+ </ProjectSettings>
+ <IsSkin>false</IsSkin>
+</PackageClass>
\ No newline at end of file
Added: trunk/plugins/APODPlugin/MPE/M42-130202.jpg
===================================================================
(Binary files differ)
Index: trunk/plugins/APODPlugin/MPE/M42-130202.jpg
===================================================================
--- trunk/plugins/APODPlugin/MPE/M42-130202.jpg 2013-03-18 08:41:40 UTC (rev 4546)
+++ trunk/plugins/APODPlugin/MPE/M42-130202.jpg 2013-03-18 08:42:18 UTC (rev 4547)
Property changes on: trunk/plugins/APODPlugin/MPE/M42-130202.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/APODPlugin/MPE/update.xml
===================================================================
--- trunk/plugins/APODPlugin/MPE/update.xml (rev 0)
+++ trunk/plugins/APODPlugin/MPE/update.xml 2013-03-18 08:42:18 UTC (rev 4547)
@@ -0,0 +1,120 @@
+<?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>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items />
+ </Sections>
+ <Dependencies>
+ <Items>
+ <DependencyItem>
+ <Type>MediaPortal</Type>
+ <Id />
+ <MinVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MinVersion>
+ <MaxVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MaxVersion>
+ <WarnOnly>false</WarnOnly>
+ <Message>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ </Items>
+ </Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="APODPlugin.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.2.300.0</MinRequiredVersion>
+ <DesignedForVersion>1.2.300.0</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items>
+ <SubSystemItem Name="MP.Config" />
+ <SubSystemItem Name="MP.SkinEngine" />
+ </Items>
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
+ <GeneralInfo>
+ <Name>APODPlugin</Name>
+ <Id>7d9c01e5-0408-4f1b-ba3a-e8afd66c22ab</Id>
+ <Author>jmbillings</Author>
+ <HomePage>http://www.team-mediaportal.com/extensions/other/apod-plugin</HomePage>
+ <ForumPage />
+ <UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=270&cf_id=52</UpdateUrl>
+ <Version>
+ <Major>1</Major>
+ <Minor>0</Minor>
+ <Build>0</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>Display the current APOD (Astronomy Picture of the Day) in Mediaportal</ExtensionDescription>
+ <VersionDescription />
+ <DevelopmentStatus>Rc</DevelopmentStatus>
+ <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=270&cf_id=24</OnlineLocation>
+ <ReleaseDate>2013-03-17T12:36:33.840161+00:00</ReleaseDate>
+ <Tags />
+ <Location>C:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\MPE\APODPlugin.mpe1</Location>
+ <Params>
+ <Items>
+ <SectionParam Name="Online Icon">
+ <Value>http://www.team-mediaportal.com/components/com_mtree/img/listings/s/1882.jpg</Value>
+ <ValueType>String</ValueType>
+ <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Configuration file">
+ <Value />
+ <ValueType>Template</ValueType>
+ <Description>The file used to configure the extension.
+ If it has .exe extension the will be executed.
+ If it has .dll extension it's started like MP plugin configuration.</Description>
+ </SectionParam>
+ <SectionParam Name="Online Screenshots">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>Online stored screenshot urls separated by ; </Description>
+ </SectionParam>
+ <SectionParam Name="Force to uninstall on update">
+ <Value>yes</Value>
+ <ValueType>Bool</ValueType>
+ <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ </GeneralInfo>
+ <UniqueFileList>
+ <Items />
+ </UniqueFileList>
+ <ProjectSettings>
+ <FolderGroups />
+ </ProjectSettings>
+ <IsSkin>false</IsSkin>
+ </PackageClass>
+ </Items>
+</ExtensionCollection>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jmb...@us...> - 2013-03-18 08:41:45
|
Revision: 4546
http://sourceforge.net/p/mp-plugins/code/4546
Author: jmbillings
Date: 2013-03-18 08:41:40 +0000 (Mon, 18 Mar 2013)
Log Message:
-----------
Add MP Installer + update code
Modified Paths:
--------------
trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.pdb
trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.dll
trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.pdb
trunk/plugins/APODPlugin/APODPlugin/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/APODPlugin/APODPlugin.v11.suo
Modified: trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs 2013-03-14 22:20:22 UTC (rev 4545)
+++ trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs 2013-03-18 08:41:40 UTC (rev 4546)
@@ -5,8 +5,9 @@
using System.Windows.Forms;
using MediaPortal.GUI.Library;
using MediaPortal.Dialogs;
+using System.Drawing;
+using System.Drawing.Drawing2D;
-
namespace APODPlugin
{
public class APODPlugin : GUIWindow, ISetupForm
@@ -120,17 +121,25 @@
void downloader_onDownloadComplete(object sender, downloadCompleteEventArgs e)
{
- //Scale bitmap
-
- e.bitmap.Save(System.IO.Path.GetTempPath() + "\\apod.jpg");
+ Rectangle screenRect = Screen.PrimaryScreen.Bounds;
+ Bitmap resizedBitmap = new Bitmap(screenRect.Width, screenRect.Height);
+ Bitmap originalBitmap = (Bitmap)e.bitmap;
+ Brush brush = new SolidBrush(Color.Black);
+ float scale = Math.Min(screenRect.Width / originalBitmap.Width, screenRect.Height / originalBitmap.Height);
+ Graphics graph = Graphics.FromImage(resizedBitmap);
+ graph.InterpolationMode = InterpolationMode.High;
+ graph.CompositingQuality = CompositingQuality.HighQuality;
+ graph.SmoothingMode = SmoothingMode.AntiAlias;
+
+ int scaleWidth = (int)(originalBitmap.Width * scale);
+ int scaleHeight = (int)(originalBitmap.Height * scale);
+
+ graph.FillRectangle(brush, new RectangleF(0, 0, screenRect.Width, screenRect.Height));
+ graph.DrawImage(originalBitmap, new Rectangle(((int)screenRect.Width - scaleWidth) / 2, ((int)screenRect.Height - scaleHeight) / 2, scaleWidth, scaleHeight));
+ resizedBitmap.Save(System.IO.Path.GetTempPath() + "\\apod.jpg");
image.SetFileName(System.IO.Path.GetTempPath() + "\\apod.jpg");
- image.KeepAspectRatio = true;
- image.HorizontalContentAlignment = MediaPortal.Drawing.HorizontalAlignment.Center;
- image.HorizontalAlignment = MediaPortal.Drawing.HorizontalAlignment.Center;
- image.VerticalAlignment = MediaPortal.Drawing.VerticalAlignment.Center;
- image.BringIntoView();
image.Refresh();
GUIWaitCursor.Hide();
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin.v11.suo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2013-03-14 22:20:25
|
Revision: 4545
http://sourceforge.net/p/mp-plugins/code/4545
Author: doskabouter
Date: 2013-03-14 22:20:22 +0000 (Thu, 14 Mar 2013)
Log Message:
-----------
- ClearCachedCOMPtrs not needed anymore
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2013-03-14 22:18:57 UTC (rev 4544)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2013-03-14 22:20:22 UTC (rev 4545)
@@ -291,7 +291,7 @@
webBrowser.Visible = true;
webBrowser.Enabled = settings.UseMouse;
- webBrowser.ClearCachedCOMPtrs();
+ //webBrowser.ClearCachedCOMPtrs();possibly not needed anymore
webBrowser.Dock = DockStyle.None;
SetBrowserWindow();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2013-03-14 22:19:01
|
Revision: 4544
http://sourceforge.net/p/mp-plugins/code/4544
Author: doskabouter
Date: 2013-03-14 22:18:57 +0000 (Thu, 14 Mar 2013)
Log Message:
-----------
- skin updates
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Release/Skin/Default/browsetheweb.xml
trunk/plugins/BrowseTheWeb/Release/Skin/DefaultWide/browsetheweb.xml
trunk/plugins/BrowseTheWeb/Release/Skin/Titan/Media/hover_BrowseTheWeb.png
Modified: trunk/plugins/BrowseTheWeb/Release/Skin/Default/browsetheweb.xml
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/Skin/Default/browsetheweb.xml 2013-03-14 14:02:24 UTC (rev 4543)
+++ trunk/plugins/BrowseTheWeb/Release/Skin/Default/browsetheweb.xml 2013-03-14 22:18:57 UTC (rev 4544)
@@ -9,16 +9,16 @@
<description>background image</description>
<type>image</type>
<id>1</id>
- <width>720</width>
- <height>576</height>
+ <width>960</width>
+ <height>720</height>
</control>
<control>
<description>Placeholder for browser component. If statusvisible=true, then bottom coordinate is decreased by the height of control with id of 545376891</description>
<type>image</type>
<id>545376890</id>
- <width>720</width>
- <height>576</height>
+ <width>960</width>
+ <height>720</height>
</control>
<control>
@@ -26,7 +26,7 @@
<type>label</type>
<id>545376891</id>
<posX>7</posX>
- <posY>540</posY>
+ <posY>690</posY>
<label>#btWeb.status</label>
<font>font12</font>
<align>left</align>
@@ -38,11 +38,11 @@
<description>Link id label</description>
<type>label</type>
<id>9</id>
- <posX>900</posX>
- <posY>540</posY>
+ <posX>950</posX>
+ <posY>690</posY>
<label>#btWeb.linkid</label>
<font>font10</font>
- <align>left</align>
+ <align>right</align>
<textcolor>ffffffff</textcolor>
<height>36</height>
<visible>string.equals(#btWeb.statusvisible, true)</visible>
Modified: trunk/plugins/BrowseTheWeb/Release/Skin/DefaultWide/browsetheweb.xml
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/Skin/DefaultWide/browsetheweb.xml 2013-03-14 14:02:24 UTC (rev 4543)
+++ trunk/plugins/BrowseTheWeb/Release/Skin/DefaultWide/browsetheweb.xml 2013-03-14 22:18:57 UTC (rev 4544)
@@ -38,11 +38,11 @@
<description>Link id label</description>
<type>label</type>
<id>9</id>
- <posX>900</posX>
+ <posX>1270</posX>
<posY>690</posY>
<label>#btWeb.linkid</label>
<font>font10</font>
- <align>left</align>
+ <align>right</align>
<textcolor>ffffffff</textcolor>
<height>36</height>
<visible>string.equals(#btWeb.statusvisible, true)</visible>
Modified: trunk/plugins/BrowseTheWeb/Release/Skin/Titan/Media/hover_BrowseTheWeb.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hwa...@us...> - 2013-03-14 14:02:27
|
Revision: 4543
http://sourceforge.net/p/mp-plugins/code/4543
Author: hwahrmann
Date: 2013-03-14 14:02:24 +0000 (Thu, 14 Mar 2013)
Log Message:
-----------
Updated setup files to point to new svn repository
Modified Paths:
--------------
trunk/plugins/OneButtonMusic/setup/OneButtonMusic.mpe1
trunk/plugins/OneButtonMusic/setup/OneButtonMusic.xmp2
trunk/plugins/OneButtonMusic/setup/update.xml
Modified: trunk/plugins/OneButtonMusic/setup/OneButtonMusic.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/OneButtonMusic/setup/OneButtonMusic.xmp2
===================================================================
--- trunk/plugins/OneButtonMusic/setup/OneButtonMusic.xmp2 2013-03-14 10:00:38 UTC (rev 4542)
+++ trunk/plugins/OneButtonMusic/setup/OneButtonMusic.xmp2 2013-03-14 14:02:24 UTC (rev 4543)
@@ -143,8 +143,8 @@
<Build>6</Build>
<Revision>27644</Revision>
</MaxVersion>
- <WarnOnly>false</WarnOnly>
- <Message>requires MediaPortal version 1.2.0</Message>
+ <WarnOnly>true</WarnOnly>
+ <Message>This version of OneButtonMusic requires MediaPortal 1.2.0 Beta or higher!</Message>
<Name>MediaPortal</Name>
</DependencyItem>
</Items>
@@ -172,23 +172,23 @@
<Author>Helmut Wahrmann</Author>
<HomePage>http://www.team-mediaportal.com</HomePage>
<ForumPage>http://forum.team-mediaportal.com/listen-music-99/one-button-random-music-48751/</ForumPage>
- <UpdateUrl>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/OneButtonMusic/setup/update.xml</UpdateUrl>
+ <UpdateUrl>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/OneButtonMusic/setup/update.xml</UpdateUrl>
<Version>
<Major>2</Major>
<Minor>0</Minor>
<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>
+ <VersionDescription>Mediaportal 1.3.0 compatible</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
- <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/OneButtonMusic/setup/OneButtonMusic.mpe1</OnlineLocation>
- <ReleaseDate>2011-09-21T21:58:10.869256+02:00</ReleaseDate>
+ <OnlineLocation>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/OneButtonMusic/setup/OneButtonMusic.mpe1</OnlineLocation>
+ <ReleaseDate>2013-03-14T21:58:10</ReleaseDate>
<Tags />
- <Location>D:\Documents\Source\Mp1\mp-plugins\OneButtonMusic\setup\OneButtonMusic.mpe1</Location>
+ <Location>D:\Documents\Source\mp-plugins\OneButtonMusic\setup\OneButtonMusic.mpe1</Location>
<Params>
<Items>
<SectionParam Name="Icon">
@@ -235,7 +235,7 @@
<ProjectSettings>
<FolderGroups />
<ProjectFilename>OneButtonMusic.xmp2</ProjectFilename>
- <UpdatePath1>D:\Documents\Source\Mp1\mp-plugins\OneButtonMusic\setup\update.xml</UpdatePath1>
+ <UpdatePath1>D:\Documents\Source\mp-plugins\OneButtonMusic\setup\update.xml</UpdatePath1>
<UpdatePath2 />
<UpdatePath3 />
</ProjectSettings>
Modified: trunk/plugins/OneButtonMusic/setup/update.xml
===================================================================
--- trunk/plugins/OneButtonMusic/setup/update.xml 2013-03-14 10:00:38 UTC (rev 4542)
+++ trunk/plugins/OneButtonMusic/setup/update.xml 2013-03-14 14:02:24 UTC (rev 4543)
@@ -116,5 +116,120 @@
</ProjectSettings>
<IsSkin>false</IsSkin>
</PackageClass>
+ <PackageClass>
+ <Version>2.0</Version>
+ <Groups>
+ <Items>
+ <GroupItem Name="Default">
+ <DisplayName>Default</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Default</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items />
+ </Sections>
+ <Dependencies>
+ <Items>
+ <DependencyItem>
+ <Type>MediaPortal</Type>
+ <Id />
+ <MinVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MinVersion>
+ <MaxVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MaxVersion>
+ <WarnOnly>true</WarnOnly>
+ <Message>This version of OneButtonMusic requires MediaPortal 1.2.0 Beta or higher!</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ </Items>
+ </Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="OneButtonMusic.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.1.7.0</MinRequiredVersion>
+ <DesignedForVersion>1.1.7.0</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items />
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
+ <GeneralInfo>
+ <Name>OneButtonMusic</Name>
+ <Id>4843636c-a386-49b1-b50d-85276aa6286a</Id>
+ <Author>Helmut Wahrmann</Author>
+ <HomePage>http://www.team-mediaportal.com</HomePage>
+ <ForumPage>http://forum.team-mediaportal.com/listen-music-99/one-button-random-music-48751/</ForumPage>
+ <UpdateUrl>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/OneButtonMusic/setup/update.xml</UpdateUrl>
+ <Version>
+ <Major>2</Major>
+ <Minor>0</Minor>
+ <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>
+ <VersionDescription>Mediaportal 1.3.0 compatible</VersionDescription>
+ <DevelopmentStatus>Stable</DevelopmentStatus>
+ <OnlineLocation>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/OneButtonMusic/setup/OneButtonMusic.mpe1</OnlineLocation>
+ <ReleaseDate>2013-03-14T21:58:10</ReleaseDate>
+ <Tags />
+ <Location>D:\Documents\Source\mp-plugins\OneButtonMusic\setup\OneButtonMusic.mpe1</Location>
+ <Params>
+ <Items>
+ <SectionParam Name="Online Icon">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Configuration file">
+ <Value />
+ <ValueType>Template</ValueType>
+ <Description>The file used to configure the extension.
+ If have .exe extension the will be executed
+ If have .dll extension used like MP plugin configuration</Description>
+ </SectionParam>
+ <SectionParam Name="Online Screenshots">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>Online stored screenshot urls separated by ; </Description>
+ </SectionParam>
+ <SectionParam Name="Force to uninstall on update">
+ <Value>yes</Value>
+ <ValueType>Bool</ValueType>
+ <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ </GeneralInfo>
+ <UniqueFileList>
+ <Items />
+ </UniqueFileList>
+ <ProjectSettings>
+ <FolderGroups />
+ </ProjectSettings>
+ <IsSkin>false</IsSkin>
+ </PackageClass>
</Items>
</ExtensionCollection>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jmb...@us...> - 2013-03-14 10:00:42
|
Revision: 4542
http://sourceforge.net/p/mp-plugins/code/4542
Author: jmbillings
Date: 2013-03-14 10:00:38 +0000 (Thu, 14 Mar 2013)
Log Message:
-----------
minor change
Modified Paths:
--------------
trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs
trunk/plugins/APODPlugin/APODPlugin/APODPlugin.csproj
trunk/plugins/APODPlugin/APODPlugin.v11.suo
Modified: trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs 2013-03-14 09:14:14 UTC (rev 4541)
+++ trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs 2013-03-14 10:00:38 UTC (rev 4542)
@@ -13,7 +13,7 @@
{
[SkinControlAttribute(4)]
protected GUIImage image = null;
-
+
public APODPlugin()
{
}
Modified: trunk/plugins/APODPlugin/APODPlugin/APODPlugin.csproj
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/APODPlugin.csproj 2013-03-14 09:14:14 UTC (rev 4541)
+++ trunk/plugins/APODPlugin/APODPlugin/APODPlugin.csproj 2013-03-14 10:00:38 UTC (rev 4542)
@@ -62,6 +62,7 @@
<ItemGroup>
<Content Include="APODPlugin.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ <SubType>Designer</SubType>
</Content>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Modified: trunk/plugins/APODPlugin/APODPlugin.v11.suo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jmb...@us...> - 2013-03-14 09:14:18
|
Revision: 4541
http://sourceforge.net/p/mp-plugins/code/4541
Author: jmbillings
Date: 2013-03-14 09:14:14 +0000 (Thu, 14 Mar 2013)
Log Message:
-----------
commit
Added Paths:
-----------
trunk/plugins/APODPlugin/APODPlugin/
trunk/plugins/APODPlugin/APODPlugin/APODDownloader.cs
trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs
trunk/plugins/APODPlugin/APODPlugin/APODPlugin.csproj
trunk/plugins/APODPlugin/APODPlugin/APODPlugin.xml
trunk/plugins/APODPlugin/APODPlugin/Properties/
trunk/plugins/APODPlugin/APODPlugin/Properties/AssemblyInfo.cs
trunk/plugins/APODPlugin/APODPlugin/bin/
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.pdb
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.xml
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/AxInterop.WMPLib.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Bass.Net.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/BassRegistration.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/BassVisAPI.Net.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Common.Utils.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Core.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Dialogs.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/DirectShowLib.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Interop.WMPLib.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Ionic.Zip.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/MediaPortal.Support.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Utils.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/edtftpnet-1.2.2.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/log4net.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/taglib-sharp.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Release/
trunk/plugins/APODPlugin/APODPlugin/obj/
trunk/plugins/APODPlugin/APODPlugin/obj/Debug/
trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.csproj.FileListAbsolute.txt
trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.dll
trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.pdb
trunk/plugins/APODPlugin/APODPlugin/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/APODPlugin/APODPlugin/obj/Debug/TempPE/
trunk/plugins/APODPlugin/APODPlugin.sln
trunk/plugins/APODPlugin/APODPlugin.v11.suo
Added: trunk/plugins/APODPlugin/APODPlugin/APODDownloader.cs
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/APODDownloader.cs (rev 0)
+++ trunk/plugins/APODPlugin/APODPlugin/APODDownloader.cs 2013-03-14 09:14:14 UTC (rev 4541)
@@ -0,0 +1,118 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Net;
+using System.IO;
+using System.Drawing;
+
+namespace APODPlugin
+{
+ class APODDownloader
+ {
+ String APODURL = "http://apod.nasa.gov/apod/astropix.html";
+ internal event downloadErrorEvent onDownloadError;
+ internal event downloadCompleteEvent onDownloadComplete;
+ public delegate void downloadErrorEvent(object sender, downloadErrorEventArgs e);
+ public delegate void downloadCompleteEvent(object sender, downloadCompleteEventArgs e);
+ WebClient client;
+ WebClient imageClient;
+
+ internal APODDownloader()
+ {
+ client = new WebClient();
+ GetImage();
+ }
+
+ internal void GetImage()
+ {
+ client.OpenReadCompleted += new OpenReadCompletedEventHandler(readComplete);
+ client.OpenReadAsync(new Uri(APODURL));
+ }
+
+ private void readComplete(object sender, OpenReadCompletedEventArgs args)
+ {
+ if (args.Error != null)
+ {
+ onDownloadError(this, new downloadErrorEventArgs(args.Error));
+ }
+ else
+ {
+ try
+ {
+ Stream resultStream = args.Result;
+ if (!resultStream.CanRead)
+ return;
+
+ StreamReader sr = new StreamReader(resultStream);
+ String pagesource = sr.ReadToEnd();
+ sr.Close();
+ resultStream.Close();
+ sr.Dispose();
+ resultStream.Dispose();
+ client.OpenReadCompleted -= readComplete;
+ client.Dispose();
+
+ Match sourceMatcher = Regex.Match(pagesource, "(?<=<IMG SRC=\")(.+?)(?=\")", RegexOptions.Singleline);
+ if (sourceMatcher.Success)
+ {
+ String imageURL = "http://apod.nasa.gov/apod/" + sourceMatcher.Value;
+ downloadImage(imageURL);
+ }
+ else
+ {
+ onDownloadError(this, new downloadErrorEventArgs(new Exception("Couldn't find image source :(")));
+ }
+ }
+ catch (Exception ex)
+ {
+ onDownloadError(this, new downloadErrorEventArgs(ex));
+ }
+ }
+ }
+
+ private void downloadImage(String imageURL)
+ {
+ imageClient = new WebClient();
+ imageClient.OpenReadCompleted += new OpenReadCompletedEventHandler(imageReadComplete);
+ imageClient.OpenReadAsync(new Uri(imageURL));
+ }
+
+ private void imageReadComplete(object sender, OpenReadCompletedEventArgs args)
+ {
+ if (args.Error != null)
+ {
+ onDownloadError(this, new downloadErrorEventArgs(args.Error));
+ }
+ else
+ {
+ Stream resultStream = args.Result;
+ Image bitmap = Bitmap.FromStream(resultStream);
+ resultStream.Close();
+ resultStream.Dispose();
+ imageClient.Dispose();
+
+ onDownloadComplete(this, new downloadCompleteEventArgs(bitmap));
+ }
+ }
+ }
+
+ internal class downloadErrorEventArgs : EventArgs
+ {
+ internal Exception downloadException;
+ internal downloadErrorEventArgs(Exception ex)
+ {
+ downloadException = ex;
+ }
+ }
+
+ internal class downloadCompleteEventArgs : EventArgs
+ {
+ internal Image bitmap;
+ internal downloadCompleteEventArgs(Image b)
+ {
+ bitmap = b;
+ }
+ }
+}
Added: trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs (rev 0)
+++ trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs 2013-03-14 09:14:14 UTC (rev 4541)
@@ -0,0 +1,152 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using MediaPortal.GUI.Library;
+using MediaPortal.Dialogs;
+
+
+namespace APODPlugin
+{
+ public class APODPlugin : GUIWindow, ISetupForm
+ {
+ [SkinControlAttribute(4)]
+ protected GUIImage image = null;
+
+ public APODPlugin()
+ {
+ }
+
+ #region ISetupForm Members
+
+ // Returns the name of the plugin which is shown in the plugin menu
+ public string PluginName()
+ {
+ return "APOD";
+ }
+
+ // Returns the description of the plugin is shown in the plugin menu
+ public string Description()
+ {
+ return "Astronomy Picture of the day";
+ }
+
+ // Returns the author of the plugin which is shown in the plugin menu
+ public string Author()
+ {
+ return "jmbillings";
+ }
+
+ // show the setup dialog
+ public void ShowPlugin()
+ {
+ MessageBox.Show("Nothing to configure, this is just an example");
+ }
+
+ // Indicates whether plugin can be enabled/disabled
+ public bool CanEnable()
+ {
+ return true;
+ }
+
+ // Get Windows-ID
+ public int GetWindowId()
+ {
+ // WindowID of windowplugin belonging to this setup
+ // enter your own unique code
+ return 3355;
+ }
+
+ // Indicates if plugin is enabled by default;
+ public bool DefaultEnabled()
+ {
+ return true;
+ }
+
+ // indicates if a plugin has it's own setup screen
+ public bool HasSetup()
+ {
+ return true;
+ }
+
+ /// <summary>
+ /// If the plugin should have it's own button on the main menu of MediaPortal then it
+ /// should return true to this method, otherwise if it should not be on home
+ /// it should return false
+ /// </summary>
+ /// <param name="strButtonText">text the button should have</param>
+ /// <param name="strButtonImage">image for the button, or empty for default</param>
+ /// <param name="strButtonImageFocus">image for the button, or empty for default</param>
+ /// <param name="strPictureImage">subpicture for the button or empty for none</param>
+ /// <returns>true : plugin needs it's own button on home
+ /// false : plugin does not need it's own button on home</returns>
+ public bool GetHome(out string strButtonText, out string strButtonImage,
+ out string strButtonImageFocus, out string strPictureImage)
+ {
+ strButtonText = PluginName();
+ strButtonImage = String.Empty;
+ strButtonImageFocus = String.Empty;
+ strPictureImage = String.Empty;
+ return true;
+ }
+
+ // With GetID it will be an window-plugin / otherwise a process-plugin
+ // Enter the id number here again
+ public override int GetID
+ {
+ get
+ {
+ return 3355;
+ }
+ set { }
+ }
+
+ #endregion
+
+ public override bool Init()
+ {
+ return Load(GUIGraphicsContext.Skin + @"\APODPlugin.xml");
+ }
+
+ protected override void OnPageLoad()
+ {
+ GUIWaitCursor.Show();
+ APODDownloader downloader = new APODDownloader();
+ downloader.onDownloadError += downloader_onDownloadError;
+ downloader.onDownloadComplete += downloader_onDownloadComplete;
+ downloader.GetImage();
+ }
+
+ void downloader_onDownloadComplete(object sender, downloadCompleteEventArgs e)
+ {
+ //Scale bitmap
+
+ e.bitmap.Save(System.IO.Path.GetTempPath() + "\\apod.jpg");
+
+
+ image.SetFileName(System.IO.Path.GetTempPath() + "\\apod.jpg");
+ image.KeepAspectRatio = true;
+ image.HorizontalContentAlignment = MediaPortal.Drawing.HorizontalAlignment.Center;
+ image.HorizontalAlignment = MediaPortal.Drawing.HorizontalAlignment.Center;
+ image.VerticalAlignment = MediaPortal.Drawing.VerticalAlignment.Center;
+ image.BringIntoView();
+ image.Refresh();
+
+ GUIWaitCursor.Hide();
+ }
+
+ void downloader_onDownloadError(object sender, downloadErrorEventArgs e)
+ {
+ GUIWaitCursor.Hide();
+ GUIDialogOK dlgOK = (GUIDialogOK)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_OK);
+ if (dlgOK != null)
+ {
+ dlgOK.SetHeading("Error" /* or Message */);
+ dlgOK.SetLine(1, "An exception occurred during download:");
+ dlgOK.SetLine(2, e.downloadException.Message);
+ dlgOK.DoModal(this.GetWindowId());
+ }
+ }
+ }
+}
Added: trunk/plugins/APODPlugin/APODPlugin/APODPlugin.csproj
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/APODPlugin.csproj (rev 0)
+++ trunk/plugins/APODPlugin/APODPlugin/APODPlugin.csproj 2013-03-14 09:14:14 UTC (rev 4541)
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProjectGuid>{A9F253DB-5825-4319-928C-650B6D76DC5F}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>APODPlugin</RootNamespace>
+ <AssemblyName>APODPlugin</AssemblyName>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ <TargetFrameworkProfile />
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</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>
+ <ItemGroup>
+ <Reference Include="Common.Utils, Version=1.2.300.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Team MediaPortal\MediaPortal\Common.Utils.dll</HintPath>
+ </Reference>
+ <Reference Include="Core">
+ <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll</HintPath>
+ </Reference>
+ <Reference Include="Dialogs">
+ <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll</HintPath>
+ </Reference>
+ <Reference Include="MediaPortal.Support, Version=1.2.300.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Team MediaPortal\MediaPortal\MediaPortal.Support.dll</HintPath>
+ </Reference>
+ <Reference Include="System" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.Drawing" />
+ <Reference Include="System.Windows.Forms" />
+ <Reference Include="System.Xml.Linq" />
+ <Reference Include="System.Data.DataSetExtensions" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="APODDownloader.cs" />
+ <Compile Include="APODPlugin.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <Content Include="APODPlugin.xml">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ </ItemGroup>
+ <Import Project="$(MSBuildToolsPath)\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>
+ -->
+</Project>
\ No newline at end of file
Added: trunk/plugins/APODPlugin/APODPlugin/APODPlugin.xml
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/APODPlugin.xml (rev 0)
+++ trunk/plugins/APODPlugin/APODPlugin/APODPlugin.xml 2013-03-14 09:14:14 UTC (rev 4541)
@@ -0,0 +1,16 @@
+<window>
+ <id>3355</id>
+ <defaultcontrol>4</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <controls>
+
+ <control>
+ <description>image</description>
+ <type>image</type>
+ <id>4</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ </control>
+
+ </controls>
+</window>
\ No newline at end of file
Added: trunk/plugins/APODPlugin/APODPlugin/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/Properties/AssemblyInfo.cs (rev 0)
+++ trunk/plugins/APODPlugin/APODPlugin/Properties/AssemblyInfo.cs 2013-03-14 09:14:14 UTC (rev 4541)
@@ -0,0 +1,40 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using MediaPortal.Common.Utils;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("APODPlugin")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("APODPlugin")]
+[assembly: AssemblyCopyright("Copyright © 2013")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: CompatibleVersion("1.2.300.0")]
+[assembly: UsesSubsystem("MP.SkinEngine")]
+[assembly: UsesSubsystem("MP.Config")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("82301eb7-cfb8-4fd9-b4d8-a53172ee8792")]
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
Added: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.dll
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.dll 2013-03-14 09:12:00 UTC (rev 4540)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.dll 2013-03-14 09:14:14 UTC (rev 4541)
Property changes on: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.pdb
===================================================================
(Binary files differ)
Index: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.pdb
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.pdb 2013-03-14 09:12:00 UTC (rev 4540)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.pdb 2013-03-14 09:14:14 UTC (rev 4541)
Property changes on: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.pdb
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.xml
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.xml (rev 0)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.xml 2013-03-14 09:14:14 UTC (rev 4541)
@@ -0,0 +1,16 @@
+<window>
+ <id>3355</id>
+ <defaultcontrol>4</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <controls>
+
+ <control>
+ <description>image</description>
+ <type>image</type>
+ <id>4</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ </control>
+
+ </controls>
+</window>
\ No newline at end of file
Added: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/AxInterop.WMPLib.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/AxInterop.WMPLib.dll
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/AxInterop.WMPLib.dll 2013-03-14 09:12:00 UTC (rev 4540)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/AxInterop.WMPLib.dll 2013-03-14 09:14:14 UTC (rev 4541)
Property changes on: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/AxInterop.WMPLib.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Bass.Net.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Bass.Net.dll
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Bass.Net.dll 2013-03-14 09:12:00 UTC (rev 4540)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Bass.Net.dll 2013-03-14 09:14:14 UTC (rev 4541)
Property changes on: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Bass.Net.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/BassRegistration.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/BassRegistration.dll
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/BassRegistration.dll 2013-03-14 09:12:00 UTC (rev 4540)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/BassRegistration.dll 2013-03-14 09:14:14 UTC (rev 4541)
Property changes on: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/BassRegistration.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/BassVisAPI.Net.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/BassVisAPI.Net.dll
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/BassVisAPI.Net.dll 2013-03-14 09:12:00 UTC (rev 4540)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/BassVisAPI.Net.dll 2013-03-14 09:14:14 UTC (rev 4541)
Property changes on: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/BassVisAPI.Net.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Common.Utils.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Common.Utils.dll
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Common.Utils.dll 2013-03-14 09:12:00 UTC (rev 4540)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Common.Utils.dll 2013-03-14 09:14:14 UTC (rev 4541)
Property changes on: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Common.Utils.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Core.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Core.dll
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Core.dll 2013-03-14 09:12:00 UTC (rev 4540)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Core.dll 2013-03-14 09:14:14 UTC (rev 4541)
Property changes on: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Core.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Dialogs.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Dialogs.dll
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Dialogs.dll 2013-03-14 09:12:00 UTC (rev 4540)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Dialogs.dll 2013-03-14 09:14:14 UTC (rev 4541)
Property changes on: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Dialogs.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/DirectShowLib.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/DirectShowLib.dll
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/DirectShowLib.dll 2013-03-14 09:12:00 UTC (rev 4540)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/DirectShowLib.dll 2013-03-14 09:14:14 UTC (rev 4541)
Property changes on: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/DirectShowLib.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Interop.WMPLib.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Interop.WMPLib.dll
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Interop.WMPLib.dll 2013-03-14 09:12:00 UTC (rev 4540)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Interop.WMPLib.dll 2013-03-14 09:14:14 UTC (rev 4541)
Property changes on: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Interop.WMPLib.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Ionic.Zip.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Ionic.Zip.dll
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Ionic.Zip.dll 2013-03-14 09:12:00 UTC (rev 4540)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Ionic.Zip.dll 2013-03-14 09:14:14 UTC (rev 4541)
Property changes on: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Ionic.Zip.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/MediaPortal.Support.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/MediaPortal.Support.dll
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/MediaPortal.Support.dll 2013-03-14 09:12:00 UTC (rev 4540)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/MediaPortal.Support.dll 2013-03-14 09:14:14 UTC (rev 4541)
Property changes on: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/MediaPortal.Support.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Utils.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Utils.dll
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Utils.dll 2013-03-14 09:12:00 UTC (rev 4540)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Utils.dll 2013-03-14 09:14:14 UTC (rev 4541)
Property changes on: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Utils.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/edtftpnet-1.2.2.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/edtftpnet-1.2.2.dll
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/edtftpnet-1.2.2.dll 2013-03-14 09:12:00 UTC (rev 4540)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/edtftpnet-1.2.2.dll 2013-03-14 09:14:14 UTC (rev 4541)
Property changes on: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/edtftpnet-1.2.2.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/log4net.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/log4net.dll
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/log4net.dll 2013-03-14 09:12:00 UTC (rev 4540)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/log4net.dll 2013-03-14 09:14:14 UTC (rev 4541)
Property changes on: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/log4net.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/taglib-sharp.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/taglib-sharp.dll
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/taglib-sharp.dll 2013-03-14 09:12:00 UTC (rev 4540)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/taglib-sharp.dll 2013-03-14 09:14:14 UTC (rev 4541)
Property changes on: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/taglib-sharp.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.csproj.FileListAbsolute.txt
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.csproj.FileListAbsolute.txt (rev 0)
+++ trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.csproj.FileListAbsolute.txt 2013-03-14 09:14:14 UTC (rev 4541)
@@ -0,0 +1,20 @@
+c:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\APODPlugin.dll
+c:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\APODPlugin.pdb
+c:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\Core.dll
+c:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\Dialogs.dll
+c:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\Bass.Net.dll
+c:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\DirectShowLib.dll
+c:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\Utils.dll
+c:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\BassVisAPI.Net.dll
+c:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\taglib-sharp.dll
+c:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\AxInterop.WMPLib.dll
+c:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\edtftpnet-1.2.2.dll
+c:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\Common.Utils.dll
+c:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\BassRegistration.dll
+c:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\MediaPortal.Support.dll
+c:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\Interop.WMPLib.dll
+c:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\log4net.dll
+c:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\Ionic.Zip.dll
+c:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\obj\Debug\APODPlugin.dll
+c:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\obj\Debug\APODPlugin.pdb
+c:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\APODPlugin.xml
Added: trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.dll
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.dll 2013-03-14 09:12:00 UTC (rev 4540)
+++ trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.dll 2013-03-14 09:14:14 UTC (rev 4541)
Property changes on: trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.pdb
===================================================================
(Binary files differ)
Index: trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.pdb
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.pdb 2013-03-14 09:12:00 UTC (rev 4540)
+++ trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.pdb 2013-03-14 09:14:14 UTC (rev 4541)
Property changes on: trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.pdb
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/APODPlugin/APODPlugin/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
===================================================================
(Binary files differ)
Index: trunk/plugins/APODPlugin/APODPlugin/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache 2013-03-14 09:12:00 UTC (rev 4540)
+++ trunk/plugins/APODPlugin/APODPlugin/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache 2013-03-14 09:14:14 UTC (rev 4541)
Property changes on: trunk/plugins/APODPlugin/APODPlugin/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/APODPlugin/APODPlugin.sln
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin.sln (rev 0)
+++ trunk/plugins/APODPlugin/APODPlugin.sln 2013-03-14 09:14:14 UTC (rev 4541)
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "APODPlugin", "APODPlugin\APODPlugin.csproj", "{A9F253DB-5825-4319-928C-650B6D76DC5F}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {A9F253DB-5825-4319-928C-650B6D76DC5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A9F253DB-5825-4319-928C-650B6D76DC5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A9F253DB-5825-4319-928C-650B6D76DC5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A9F253DB-5825-4319-928C-650B6D76DC5F}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Added: trunk/plugins/APODPlugin/APODPlugin.v11.suo
===================================================================
(Binary files differ)
Index: trunk/plugins/APODPlugin/APODPlugin.v11.suo
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin.v11.suo 2013-03-14 09:12:00 UTC (rev 4540)
+++ trunk/plugins/APODPlugin/APODPlugin.v11.suo 2013-03-14 09:14:14 UTC (rev 4541)
Property changes on: trunk/plugins/APODPlugin/APODPlugin.v11.suo
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jmb...@us...> - 2013-03-14 09:12:03
|
Revision: 4540
http://sourceforge.net/p/mp-plugins/code/4540
Author: jmbillings
Date: 2013-03-14 09:12:00 +0000 (Thu, 14 Mar 2013)
Log Message:
-----------
create folder
Added Paths:
-----------
trunk/plugins/APODPlugin/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
2 messages has been excluded from this view by a project administrator.
