From: <hor...@us...> - 2013-03-10 15:11:57
|
Revision: 4534 http://sourceforge.net/p/mp-plugins/code/4534 Author: horned-reaper Date: 2013-03-10 15:11:53 +0000 (Sun, 10 Mar 2013) Log Message: ----------- Modified Paths: -------------- trunk/plugins/FritzBox/Build/Build.log trunk/plugins/FritzBox/Docs/Changes.txt trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs trunk/plugins/FritzBox/FritzBox/Settings.cs trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml trunk/plugins/FritzBox/FritzBox/Skin/Titan/FritzManager.xml trunk/plugins/FritzBox/FritzBox/Skin/Titan/common.facade.fritz.xml trunk/plugins/FritzBox/FritzBox/Skin/Titan/common.fritz.xml trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.GenerateResource.Cache trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.csprojResolveAssemblyReference.cache trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csprojResolveAssemblyReference.cache trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csprojResolveAssemblyReference.cache trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb Added Paths: ----------- trunk/plugins/FritzBox/FritzBox/obj/Debug/DesignTimeResolveAssemblyReferences.cache trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache Removed Paths: ------------- trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/icon_fritz.png Property Changed: ---------------- trunk/plugins/FritzBox/FritzBox/Skin/ Modified: trunk/plugins/FritzBox/Build/Build.log =================================================================== --- trunk/plugins/FritzBox/Build/Build.log 2013-03-09 10:47:18 UTC (rev 4533) +++ trunk/plugins/FritzBox/Build/Build.log 2013-03-10 15:11:53 UTC (rev 4534) @@ -1,6 +1,6 @@ Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe -SVN Version: 4532 +SVN Version: 4533 Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs @@ -11,7 +11,7 @@ Copyright (C) Microsoft Corporation. Alle Rechte vorbehalten. Die Projekte in dieser Projektmappe werden nacheinander erstellt. Um eine parallele Erstellung zu erm\x94glichen, m\x81ssen Sie den Schalter "/m" hinzuf\x81gen. -Der Buildvorgang wurde am 09.03.2013 11:35:57 gestartet. +Der Buildvorgang wurde am 09.03.2013 11:51:43 gestartet. Projekt "D:\FritzBox\FritzBox.sln" auf Knoten "1", Rebuild Ziel(e). ValidateSolutionConfiguration: Die Projektmappenkonfiguration "Release|Any CPU" wird erstellt. @@ -97,7 +97,6 @@ Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.csproj.GenerateResource.Cache" wird gel\x94scht. Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.exe" wird gel\x94scht. Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.pdb" wird gel\x94scht. - Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.csprojResolveAssemblyReference.cache" wird gel\x94scht. CoreResGen: C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\ResGen.exe /useSourcePath /r:D:\FritzBox\FritzBox\bin\Release\FritzBox.dll /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Core.dll" /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Data.dll /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.dll /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Drawing.dll /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Windows.Forms.dll /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Xml.dll /compile DebugForm.resx,obj\Release\FritzBoxDebugger.DebugForm.resources CoreCompile: @@ -119,7 +118,7 @@ 0 Warnung(en) 0 Fehler -Verstrichene Zeit 00:00:02.40 +Verstrichene Zeit 00:00:01.85 Reverting to build 0 Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs @@ -235,7 +234,7 @@ ..\FritzBox\Languages\Unsupported\strings_zh-CN.xml 36 Datei(en) kopiert MpeMaker version: 1.2.200.0 -Build started at 11:36:01 +Build started at 11:51:47 Building "D:\FritzBox\MpeRelease\FritzBox.xmp2" Output: "..\MpeRelease\FritzBox.mpe1" Writing UpdateXML to "update.xml" Modified: trunk/plugins/FritzBox/Docs/Changes.txt =================================================================== --- trunk/plugins/FritzBox/Docs/Changes.txt 2013-03-09 10:47:18 UTC (rev 4533) +++ trunk/plugins/FritzBox/Docs/Changes.txt 2013-03-10 15:11:53 UTC (rev 4534) @@ -1,9 +1,10 @@ New release 1.0.0.4xxx: New feature: -- Titan skin support +- Titan skin support (thanks to RicoHTPC) Optimizations: - FRITZ!OS 5.5 support +- Default skin adjustions for MediaPortal 1.3.0 Fixed bugs: - black bar is shown in call notification on some skins \ No newline at end of file Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs =================================================================== --- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2013-03-09 10:47:18 UTC (rev 4533) +++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2013-03-10 15:11:53 UTC (rev 4534) @@ -285,7 +285,7 @@ // this.checkBoxFilterExtensions.AutoSize = true; this.checkBoxFilterExtensions.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.checkBoxFilterExtensions.Location = new System.Drawing.Point(253, 161); + this.checkBoxFilterExtensions.Location = new System.Drawing.Point(235, 161); this.checkBoxFilterExtensions.Name = "checkBoxFilterExtensions"; this.checkBoxFilterExtensions.Size = new System.Drawing.Size(305, 17); this.checkBoxFilterExtensions.TabIndex = 19; @@ -310,7 +310,7 @@ | System.Windows.Forms.AnchorStyles.Right))); this.comboBoxExtensions.BorderColor = System.Drawing.Color.Empty; this.comboBoxExtensions.FormattingEnabled = true; - this.comboBoxExtensions.Location = new System.Drawing.Point(253, 180); + this.comboBoxExtensions.Location = new System.Drawing.Point(235, 180); this.comboBoxExtensions.MaxLength = 2; this.comboBoxExtensions.Name = "comboBoxExtensions"; this.comboBoxExtensions.Size = new System.Drawing.Size(51, 21); @@ -321,7 +321,7 @@ // this.checkBoxShowPhoneTypeOnNotification.AutoSize = true; this.checkBoxShowPhoneTypeOnNotification.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.checkBoxShowPhoneTypeOnNotification.Location = new System.Drawing.Point(215, 136); + this.checkBoxShowPhoneTypeOnNotification.Location = new System.Drawing.Point(295, 19); this.checkBoxShowPhoneTypeOnNotification.Name = "checkBoxShowPhoneTypeOnNotification"; this.checkBoxShowPhoneTypeOnNotification.Size = new System.Drawing.Size(107, 17); this.checkBoxShowPhoneTypeOnNotification.TabIndex = 18; @@ -355,7 +355,7 @@ // this.checkBoxShowPhoneNumberOnNotification.AutoSize = true; this.checkBoxShowPhoneNumberOnNotification.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.checkBoxShowPhoneNumberOnNotification.Location = new System.Drawing.Point(368, 136); + this.checkBoxShowPhoneNumberOnNotification.Location = new System.Drawing.Point(410, 20); this.checkBoxShowPhoneNumberOnNotification.Name = "checkBoxShowPhoneNumberOnNotification"; this.checkBoxShowPhoneNumberOnNotification.Size = new System.Drawing.Size(122, 17); this.checkBoxShowPhoneNumberOnNotification.TabIndex = 17; @@ -366,7 +366,7 @@ // this.checkBoxShowNotificationOnOutgoingCall.AutoSize = true; this.checkBoxShowNotificationOnOutgoingCall.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.checkBoxShowNotificationOnOutgoingCall.Location = new System.Drawing.Point(215, 20); + this.checkBoxShowNotificationOnOutgoingCall.Location = new System.Drawing.Point(157, 19); this.checkBoxShowNotificationOnOutgoingCall.Name = "checkBoxShowNotificationOnOutgoingCall"; this.checkBoxShowNotificationOnOutgoingCall.Size = new System.Drawing.Size(129, 17); this.checkBoxShowNotificationOnOutgoingCall.TabIndex = 13; @@ -407,7 +407,7 @@ // // numericUpDownMaxNotifies // - this.numericUpDownMaxNotifies.Location = new System.Drawing.Point(215, 89); + this.numericUpDownMaxNotifies.Location = new System.Drawing.Point(123, 89); this.numericUpDownMaxNotifies.Maximum = new decimal(new int[] { 20, 0, @@ -479,7 +479,7 @@ // numericUpDownTimeout // this.numericUpDownTimeout.Enabled = false; - this.numericUpDownTimeout.Location = new System.Drawing.Point(215, 43); + this.numericUpDownTimeout.Location = new System.Drawing.Point(190, 43); this.numericUpDownTimeout.Minimum = new decimal(new int[] { 1, 0, @@ -501,9 +501,9 @@ this.checkBoxCloseOnTimout.FlatStyle = System.Windows.Forms.FlatStyle.Popup; this.checkBoxCloseOnTimout.Location = new System.Drawing.Point(15, 45); this.checkBoxCloseOnTimout.Name = "checkBoxCloseOnTimout"; - this.checkBoxCloseOnTimout.Size = new System.Drawing.Size(172, 17); + this.checkBoxCloseOnTimout.Size = new System.Drawing.Size(175, 17); this.checkBoxCloseOnTimout.TabIndex = 0; - this.checkBoxCloseOnTimout.Text = "Auto-close after timeout expired"; + this.checkBoxCloseOnTimout.Text = "Auto-close after timeout expired:"; this.checkBoxCloseOnTimout.UseVisualStyleBackColor = true; this.checkBoxCloseOnTimout.CheckedChanged += new System.EventHandler(this.checkBoxCloseOnTimout_CheckedChanged); // Modified: trunk/plugins/FritzBox/FritzBox/Settings.cs =================================================================== --- trunk/plugins/FritzBox/FritzBox/Settings.cs 2013-03-09 10:47:18 UTC (rev 4533) +++ trunk/plugins/FritzBox/FritzBox/Settings.cs 2013-03-10 15:11:53 UTC (rev 4534) @@ -492,7 +492,7 @@ if (xmlwriter.GetValueAsString(sectionName, entryName, null) != null) { - PauseMediaOnIncomingCall = xmlwriter.GetValueAsBool(sectionName, entryName, false); + PauseMediaOnIncomingCall = xmlwriter.GetValueAsBool(sectionName, entryName, true); xmlwriter.RemoveEntry(sectionName, entryName); } @@ -500,7 +500,7 @@ if (xmlwriter.GetValueAsString(sectionName, entryName, null) != null) { - ResumeMediaOnIncomingCall = xmlwriter.GetValueAsBool(sectionName, entryName, false); + ResumeMediaOnIncomingCall = xmlwriter.GetValueAsBool(sectionName, entryName, true); xmlwriter.RemoveEntry(sectionName, entryName); } Index: trunk/plugins/FritzBox/FritzBox/Skin =================================================================== --- trunk/plugins/FritzBox/FritzBox/Skin 2013-03-09 10:47:18 UTC (rev 4533) +++ trunk/plugins/FritzBox/FritzBox/Skin 2013-03-10 15:11:53 UTC (rev 4534) Property changes on: trunk/plugins/FritzBox/FritzBox/Skin ___________________________________________________________________ Deleted: svn:ignore ## -1 +0,0 ## -GenericSkin \ No newline at end of property Modified: trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml =================================================================== --- trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml 2013-03-09 10:47:18 UTC (rev 4533) +++ trunk/plugins/FritzBox/FritzBox/Skin/Default/FritzManager.xml 2013-03-10 15:11:53 UTC (rev 4534) @@ -1,121 +1,122 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <window> - <id>464554871</id> - <defaultcontrol>50</defaultcontrol> - <allowoverlay>yes</allowoverlay> - <define>#header.label:666</define> - <define>#header.hover:-</define> - <controls> - <control> - <description>BG</description> - <type>image</type> - <id>1</id> - <texture>Background.png</texture> - <width>1280</width> - <height>720</height> - </control> - <import>common.window.xml</import> - <import>common.time.xml</import> - <control> - <description>action menu</description> + <id>464554871</id> + <defaultcontrol>50</defaultcontrol> + <allowoverlay>yes</allowoverlay> + <define>#header.label:666</define> + <define>#header.hover:-</define> + <controls> + <control> + <description>BG</description> + <type>image</type> + <id>1</id> + <texture>Background.png</texture> + <width>1280</width> + <height>720</height> + </control> + <import>common.window.xml</import> + <import>common.time.xml</import> + <control> + <description>Action menu</description> <type>actiongroup</type> <dimColor>00ffffff</dimColor> - <width>263</width> - <height>473</height> + <width>206</width> + <height>720</height> <buttonX>0</buttonX> - <buttonY>0</buttonY> - <buttonwidth>60</buttonwidth> - <buttonheight>576</buttonheight> - <onexit>50</onexit> + <buttonY>-60</buttonY> + <buttonwidth>79</buttonwidth> + <buttonheight>720</buttonheight> + <onexit>0</onexit> <defaultcontrol>2</defaultcontrol> <textureFocus>Action_focus.png</textureFocus> <textureNoFocus>Action_nofocus.png</textureNoFocus> <control> - <type>image</type> - <visible>!Control.HasFocus(50)</visible> - <posX>15</posX> - <posY>63</posY> - <width>208</width> - <height>473</height> - <texture>Backslide.png</texture> - <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation> - <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation> - <colorDiffuse>fffffffff</colorDiffuse> + <type>image</type> + <visible>!Control.HasFocus(50)</visible> + <posX>19</posX> + <posY>78</posY> + <width>280</width> + <height>591</height> + <texture>Backslide.png</texture> + <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation> + <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation> + <colorDiffuse>fffffffff</colorDiffuse> </control> - <control> - <description>group element</description> - <type>group</type> - <visible>!Control.HasFocus(50)</visible> - <posX>40</posX> - <posY>97</posY> - <layout>StackLayout</layout> - <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation> - <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation> - <control> - <id>2</id> - <description>View-As</description> - <type>button</type> - <onright>50</onright> - <onup>9</onup> - <label>100</label> - </control> - <control> - <id>3</id> - <description>Sort</description> - <type>sortbutton</type> - <onright>50</onright> - <ondown>4</ondown> - </control> - <control> - <id>4</id> - <description>Mode</description> - <type>button</type> - <onright>50</onright> - <ondown>9</ondown> - <label>Mode</label> - </control> - <control> - <id>9</id> - <description>Update list</description> - <type>button</type> - <onright>50</onright> - <ondown>2</ondown> - <label>Update</label> - </control> + <control> + <description>group element</description> + <type>group</type> + <visible>!Control.HasFocus(50)</visible> + <posX>37</posX> + <posY>121</posY> + <layout>StackLayout</layout> + <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation> + <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation> + <control> + <id>2</id> + <description>View as</description> + <type>button</type> + <onright>50</onright> + <onup>9</onup> + <label>100</label> + </control> + <control> + <id>3</id> + <description>Sort</description> + <type>sortbutton</type> + <onright>50</onright> + <ondown>4</ondown> + </control> + <control> + <id>4</id> + <description>Mode</description> + <type>button</type> + <onright>50</onright> + <ondown>9</ondown> + <label>Mode</label> + </control> + <control> + <id>9</id> + <description>Update list</description> + <type>button</type> + <onright>50</onright> + <ondown>2</ondown> + <label>Update</label> + </control> </control> - </control> - <import>common.facade.pictures.xml</import> - <control> - <id>500</id> - <type>image</type> - <posX>44</posX> - <posY>153</posY> - <width>167</width> - <height>142</height> - <keepaspectratio>yes</keepaspectratio> - <centered>yes</centered> - <texture flipY="true" diffuse="Thumb_Mask.png">#selectedthumb</texture> - <visible>facadeview.list+Control.HasFocus(50)</visible> - <animation effect="fade" time="450" reversible="false">visible</animation> - </control> - <control> - <type>image</type> - <id>1</id> - <posX>40</posX> - <posY>150</posY> - <width>178</width> - <height>144</height> - <texture flipY="true" diffuse="Thumb_Mask.png">Picture_cover.png</texture> - <visible>facadeview.list+Control.HasFocus(50)</visible> - <animation effect="fade" time="450" reversible="false">visible</animation> - </control> - <control> - <type>fadelabel</type> - <posX>26</posX> - <posY>18</posY> - <width>305</width> - <font>font18</font> - <label>FritzBox Manager</label> - </control> + </control> + <import>common.facade.pictures.xml</import> + <control> + <description>Contact picture</description> + <id>500</id> + <type>image</type> + <posX>690</posX> + <posY>170</posY> + <width>167</width> + <height>142</height> + <keepaspectratio>yes</keepaspectratio> + <centered>yes</centered> + <texture flipY="true" diffuse="Thumb_Mask.png">#selectedthumb</texture> + <visible>yes</visible> + <animation effect="fade" time="450" reversible="false">visible</animation> + </control> + <control> + <type>image</type> + <id>1</id> + <posX>40</posX> + <posY>150</posY> + <width>178</width> + <height>144</height> + <texture flipY="true" diffuse="Thumb_Mask.png">Picture_cover.png</texture> + <visible>facadeview.list+Control.HasFocus(50)</visible> + <animation effect="fade" time="450" reversible="false">visible</animation> + </control> + <control> + <type>fadelabel</type> + <posX>26</posX> + <posY>18</posY> + <width>350</width> + <font>font18</font> + <label>FRITZ!Box Manager</label> + </control> </controls> </window> Modified: trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml =================================================================== --- trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml 2013-03-09 10:47:18 UTC (rev 4533) +++ trunk/plugins/FritzBox/FritzBox/Skin/DefaultWide/FritzManager.xml 2013-03-10 15:11:53 UTC (rev 4534) @@ -1,23 +1,23 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <window> - <id>464554871</id> - <defaultcontrol>50</defaultcontrol> - <allowoverlay>yes</allowoverlay> - <define>#header.label:666</define> - <define>#header.hover:-</define> - <controls> - <control> - <description>BG</description> - <type>image</type> - <id>1</id> - <texture>Background.png</texture> - <width>1280</width> - <height>720</height> - </control> - <import>common.window.xml</import> - <import>common.time.xml</import> - <control> - <description>action menu</description> + <id>464554871</id> + <defaultcontrol>50</defaultcontrol> + <allowoverlay>yes</allowoverlay> + <define>#header.label:666</define> + <define>#header.hover:-</define> + <controls> + <control> + <description>BG</description> + <type>image</type> + <id>1</id> + <texture>Background.png</texture> + <width>1280</width> + <height>720</height> + </control> + <import>common.window.xml</import> + <import>common.time.xml</import> + <control> + <description>Action menu</description> <type>actiongroup</type> <dimColor>00ffffff</dimColor> <width>263</width> @@ -31,91 +31,92 @@ <textureFocus>Action_focus.png</textureFocus> <textureNoFocus>Action_nofocus.png</textureNoFocus> <control> - <type>image</type> - <visible>!Control.HasFocus(50)</visible> - <posX>15</posX> - <posY>63</posY> - <width>329</width> - <height>473</height> - <texture>Backslide.png</texture> - <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation> - <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation> - <colorDiffuse>fffffffff</colorDiffuse> + <type>image</type> + <visible>!Control.HasFocus(50)</visible> + <posX>15</posX> + <posY>63</posY> + <width>329</width> + <height>473</height> + <texture>Backslide.png</texture> + <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation> + <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation> + <colorDiffuse>fffffffff</colorDiffuse> </control> - <control> - <description>group element</description> - <type>group</type> - <visible>!Control.HasFocus(50)</visible> - <posX>40</posX> - <posY>97</posY> - <layout>StackLayout</layout> - <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation> - <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation> - <control> - <id>2</id> - <description>View-As</description> - <type>button</type> - <onright>50</onright> - <onup>9</onup> - <label>100</label> - </control> - <control> - <id>3</id> - <description>Sort</description> - <type>sortbutton</type> - <onright>50</onright> - <ondown>4</ondown> - </control> - <control> - <id>4</id> - <description>Mode</description> - <type>button</type> - <onright>50</onright> - <ondown>9</ondown> - <label>Mode</label> - </control> - <control> - <id>9</id> - <description>Update list</description> - <type>button</type> - <onright>50</onright> - <ondown>2</ondown> - <label>Update</label> - </control> + <control> + <description>group element</description> + <type>group</type> + <visible>!Control.HasFocus(50)</visible> + <posX>40</posX> + <posY>97</posY> + <layout>StackLayout</layout> + <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation> + <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation> + <control> + <id>2</id> + <description>View as</description> + <type>button</type> + <onright>50</onright> + <onup>9</onup> + <label>100</label> + </control> + <control> + <id>3</id> + <description>Sort</description> + <type>sortbutton</type> + <onright>50</onright> + <ondown>4</ondown> + </control> + <control> + <id>4</id> + <description>Mode</description> + <type>button</type> + <onright>50</onright> + <ondown>9</ondown> + <label>Mode</label> + </control> + <control> + <id>9</id> + <description>Update list</description> + <type>button</type> + <onright>50</onright> + <ondown>2</ondown> + <label>Update</label> + </control> </control> - </control> - <import>common.facade.pictures.xml</import> - <control> - <id>500</id> - <type>image</type> - <posX>44</posX> - <posY>153</posY> - <width>167</width> - <height>142</height> - <keepaspectratio>yes</keepaspectratio> - <centered>yes</centered> - <texture flipY="true" diffuse="Thumb_Mask.png">#selectedthumb</texture> - <visible>facadeview.list+Control.HasFocus(50)</visible> - <animation effect="fade" time="450" reversible="false">visible</animation> - </control> - <control> - <type>image</type> - <id>1</id> - <posX>40</posX> - <posY>150</posY> - <width>178</width> - <height>144</height> - <texture flipY="true" diffuse="Thumb_Mask.png">Picture_cover.png</texture> - <visible>facadeview.list+Control.HasFocus(50)</visible> - <animation effect="fade" time="450" reversible="false">visible</animation> - </control> - <control> - <type>fadelabel</type> - <posX>26</posX> - <posY>18</posY> - <width>350</width> - <font>font18</font> - <label>FritzBox Manager</label> - </control> + </control> + <import>common.facade.pictures.xml</import> + <control> + <description>Contact picture</description> + <id>500</id> + <type>image</type> + <posX>950</posX> + <posY>170</posY> + <width>167</width> + <height>142</height> + <keepaspectratio>yes</keepaspectratio> + <centered>yes</centered> + <texture flipY="true" diffuse="Thumb_Mask.png">#selectedthumb</texture> + <visible>yes</visible> + <animation effect="fade" time="450" reversible="false">visible</animation> + </control> + <control> + <type>image</type> + <id>1</id> + <posX>40</posX> + <posY>150</posY> + <width>178</width> + <height>144</height> + <texture flipY="true" diffuse="Thumb_Mask.png">Picture_cover.png</texture> + <visible>facadeview.list+Control.HasFocus(50)</visible> + <animation effect="fade" time="450" reversible="false">visible</animation> + </control> + <control> + <type>fadelabel</type> + <posX>26</posX> + <posY>18</posY> + <width>350</width> + <font>font18</font> + <label>FRITZ!Box Manager</label> + </control> </controls> </window> Modified: trunk/plugins/FritzBox/FritzBox/Skin/Titan/FritzManager.xml =================================================================== --- trunk/plugins/FritzBox/FritzBox/Skin/Titan/FritzManager.xml 2013-03-09 10:47:18 UTC (rev 4533) +++ trunk/plugins/FritzBox/FritzBox/Skin/Titan/FritzManager.xml 2013-03-10 15:11:53 UTC (rev 4534) @@ -1,167 +1,140 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <window> - <id>464554871</id> - <defaultcontrol>50</defaultcontrol> - <allowoverlay>yes</allowoverlay> - <define>#header.label:Fritz!Box Manager</define> - <define>#header.hover:hover_fritzbox.png</define> - <controls> - <import>common.fritz.xml</import> - <import>common.time.xml</import> - - <control> - <description>DEFAULT BACKGROUND</description> - <type>image</type> - <id>0</id> - <posX>0</posX> - <posY>0</posY> - <width>1920</width> - <height>1080</height> - <texture>hover_fritzbox.png</texture> - <shouldCache>true</shouldCache> - </control> - - <control> - <description>Shaddow</description> - <type>image</type> - <id>0</id> - <posX>770</posX> - <posY>300</posY> - <width>1130</width> - <height>670</height> - <texture>info_bg.png</texture> - <animation effect="fade" time="250">WindowOpen</animation> - <animation effect="fade" time="250">WindowClose</animation> - </control> - - <control> - <description>Shaddow1</description> - <type>image</type> - <id>0</id> - <posX>60</posX> - <posY>300</posY> - <width>180</width> - <height>180</height> - <texture>info_bg.png</texture> - <visible>facadeview.list+Control.HasFocus(50)</visible> - <animation effect="fade" time="250">WindowOpen</animation> - <animation effect="fade" time="250">WindowClose</animation> - </control> - - <control> - <description>action menu</description> - <type>actiongroup</type> - <dimColor>00ffffff</dimColor> - <width>263</width> - <height>473</height> - <buttonX>0</buttonX> - <buttonY>0</buttonY> - <buttonwidth>60</buttonwidth> - <buttonheight>576</buttonheight> - <onexit>50</onexit> - <defaultcontrol>2</defaultcontrol> - <textureFocus>action_menu.png</textureFocus> - <textureNoFocus>Action_nofocus.png</textureNoFocus> - + <id>464554871</id> + <defaultcontrol>50</defaultcontrol> + <allowoverlay>yes</allowoverlay> + <define>#header.label:FRITZ!Box Manager</define> + <define>#header.hover:hover_fritzbox.png</define> + <controls> + <import>common.fritz.xml</import> + <import>common.time.xml</import> + <control> + <description>Default background</description> + <type>image</type> + <id>0</id> + <posX>0</posX> + <posY>0</posY> + <width>1920</width> + <height>1080</height> + <texture>hover_fritzbox.png</texture> + <shouldCache>true</shouldCache> + </control> + <control> + <description>Shaddow behind facadeview</description> + <type>image</type> + <id>0</id> + <posX>770</posX> + <posY>300</posY> + <width>1130</width> + <height>670</height> + <texture>info_bg.png</texture> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="250">WindowClose</animation> + </control> + <control> + <description>Action menu</description> + <type>actiongroup</type> + <dimColor>00ffffff</dimColor> + <width>263</width> + <height>473</height> + <buttonX>0</buttonX> + <buttonY>0</buttonY> + <buttonwidth>60</buttonwidth> + <buttonheight>576</buttonheight> + <onexit>50</onexit> + <defaultcontrol>2</defaultcontrol> + <textureFocus>action_menu.png</textureFocus> + <textureNoFocus>Action_nofocus.png</textureNoFocus> + <control> + <type>image</type> + <visible>!Control.HasFocus(50)</visible> + <posX>-15</posX> + <posY>283</posY> + <width>500</width> + <height>300</height> + <texture>menu_bg.png</texture> + <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation> + <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation> + <colorDiffuse>fffffffff</colorDiffuse> + </control> + <control> + <description>group element</description> + <type>group</type> + <visible>!Control.HasFocus(50)</visible> + <posX>40</posX> + <posY>317</posY> + <layout>StackLayout</layout> + <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation> + <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation> <control> - <type>image</type> - <visible>!Control.HasFocus(50)</visible> - <posX>-15</posX> - <posY>283</posY> - <width>500</width> - <height>300</height> - <texture>menu_bg.png</texture> - <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation> - <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation> - <colorDiffuse>fffffffff</colorDiffuse> + <id>2</id> + <description>View-As</description> + <type>button</type> + <onright>50</onright> + <onup>9</onup> + <label>100</label> </control> - <control> - <description>group element</description> - <type>group</type> - <visible>!Control.HasFocus(50)</visible> - <posX>40</posX> - <posY>317</posY> - <layout>StackLayout</layout> - <animation effect="Slide" reversible="FALSE" start="-300,0" time="450">Visible</animation> - <animation effect="Slide" end="-300,0" reversible="FALSE" time="450">Hidden</animation> - - <control> - <id>2</id> - <description>View-As</description> - <type>button</type> - <onright>50</onright> - <onup>9</onup> - <label>100</label> - </control> - - <control> - <id>3</id> - <description>Sort</description> - <type>sortbutton</type> - <onright>50</onright> - <ondown>4</ondown> - </control> - - <control> - <id>4</id> - <description>Mode</description> - <type>button</type> - <onright>50</onright> - <ondown>9</ondown> - <label>Mode</label> - </control> - - <control> - <id>9</id> - <description>Update list</description> - <type>button</type> - <onright>50</onright> - <ondown>2</ondown> - <label>Update</label> - </control> - + <id>3</id> + <description>Sort</description> + <type>sortbutton</type> + <onright>50</onright> + <ondown>4</ondown> </control> - </control> - <import>common.facade.fritz.xml</import> - -<control> - <id>500</id> - <type>image</type> - <posX>66</posX> - <posY>320</posY> - <width>167</width> - <height>142</height> - <keepaspectratio>yes</keepaspectratio> - <centered>yes</centered> - <texture>#selectedthumb</texture> - <visible>facadeview.list+Control.HasFocus(50)</visible> - <animation effect="fade" time="450" reversible="false">visible</animation> - </control> - -<control> - <type>image</type> - <id>1</id> - <posX>62</posX> - <posY>317</posY> - <width>178</width> - <height>144</height> - <texture>Picture_cover.png</texture> - <visible>facadeview.list+Control.HasFocus(50)</visible> - <animation effect="fade" time="450" reversible="false">visible</animation> - </control> - -<control> - <id>0</id> - <type>image</type> - <posX>60</posX> - <posY>40</posY> - <width>68</width> - <height>60</height> - <texture>icon_fritz.png</texture> - <animation effect="fade" time="250">WindowOpen</animation> - <animation effect="fade" time="250">WindowClose</animation> - </control> - + <control> + <id>4</id> + <description>Mode</description> + <type>button</type> + <onright>50</onright> + <ondown>9</ondown> + <label>Mode</label> + </control> + <control> + <id>9</id> + <description>Update list</description> + <type>button</type> + <onright>50</onright> + <ondown>2</ondown> + <label>Update</label> + </control> + </control> + </control> + <import>common.facade.fritz.xml</import> + <control> + <description>Contact picture</description> + <id>500</id> + <type>image</type> + <posX>500</posX> + <posY>320</posY> + <width>167</width> + <height>142</height> + <keepaspectratio>yes</keepaspectratio> + <centered>yes</centered> + <texture>#selectedthumb</texture> + <visible>yes</visible> + <animation effect="fade" time="450" reversible="false">visible</animation> + </control> + <control> + <type>image</type> + <id>1</id> + <posX>62</posX> + <posY>317</posY> + <width>178</width> + <height>144</height> + <texture>Picture_cover.png</texture> + <visible>facadeview.list+Control.HasFocus(50)</visible> + <animation effect="fade" time="450" reversible="false">visible</animation> + </control> + <control> + <id>0</id> + <type>image</type> + <posX>60</posX> + <posY>40</posY> + <width>68</width> + <height>60</height> + <texture>icon_fritz.png</texture> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="250">WindowClose</animation> + </control> </controls> -</window> +</window> \ No newline at end of file Deleted: trunk/plugins/FritzBox/FritzBox/Skin/Titan/Media/FritzBox/icon_fritz.png =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/FritzBox/Skin/Titan/common.facade.fritz.xml =================================================================== --- trunk/plugins/FritzBox/FritzBox/Skin/Titan/common.facade.fritz.xml 2013-03-09 10:47:18 UTC (rev 4533) +++ trunk/plugins/FritzBox/FritzBox/Skin/Titan/common.facade.fritz.xml 2013-03-10 15:11:53 UTC (rev 4534) @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <window> <controls> - - <!-- :: List Scrolling Popup :: --> - + <!-- :: List Scrolling Popup :: --> <control> <description>listscroller bg</description> <type>image</type> @@ -16,8 +14,7 @@ <visible>facadeview.list+string.contains(#scrolling.up,yes)|string.contains(#scrolling.down,yes)</visible> <animation effect="fade" time="250">Visible</animation> <animation effect="fade" time="0">Hidden</animation> - </control> - + </control> <control> <type>label</type> <id>1</id> @@ -34,12 +31,8 @@ <animation effect="fade" time="250">Visible</animation> <animation effect="fade" time="0">Hidden</animation> </control> - - <!-- :: Count :: --> - - + <!-- :: Count :: --> <!-- :: Listview Lines :: --> - <control> <description>List Lines</description> <type>image</type> @@ -52,8 +45,7 @@ <visible>facadeview.list + control.isvisible(50)</visible> <animation effect="fade" time="250">WindowOpen</animation> <animation effect="fade" time="250">WindowClose</animation> - </control> - + </control> <control> <description>group element</description> <type>group</type> @@ -81,7 +73,6 @@ <spinPosX>1828</spinPosX> <spinPosY>1000</spinPosY> </control> - <control> <description>Thumbnail Panel</description> <type>thumbnailpanel</type> @@ -124,8 +115,7 @@ <spinPosX>1828</spinPosX> <spinPosY>1000</spinPosY> <unfocusedAlpha>255</unfocusedAlpha> - </control> - + </control> <control> <description>Filmstrip view</description> <type>filmstrip</type> @@ -171,8 +161,7 @@ <spinPosY>1000</spinPosY> <thumbAnimation effect="zoom" acceleration="-2" start="100,100" reversible="false" end="135,135" center="0,800" time="200">focus</thumbAnimation> <thumbAnimation effect="zoom" start="135,135" reversible="false" end="100,100" center="0,800" time="100">unfocus</thumbAnimation> - </control> - + </control> <control> <description>Cover Flow view</description> <type>coverflow</type> @@ -231,8 +220,6 @@ <cards flipY="true" diffuse="Thumb_Mask.png" mask="pictures_filmstrip_mask.png"></cards> </control> </control> - </control> - </controls> </window> Modified: trunk/plugins/FritzBox/FritzBox/Skin/Titan/common.fritz.xml =================================================================== --- trunk/plugins/FritzBox/FritzBox/Skin/Titan/common.fritz.xml 2013-03-09 10:47:18 UTC (rev 4533) +++ trunk/plugins/FritzBox/FritzBox/Skin/Titan/common.fritz.xml 2013-03-10 15:11:53 UTC (rev 4534) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <window> <controls> + <control> <description>BG</description> <type>image</type> @@ -10,7 +11,7 @@ </control> <!-- :: Overlays :: --> - + <control> <description>background listview</description> <type>image</type> @@ -53,7 +54,7 @@ <animation effect="fade" time="250">WindowClose</animation> <animation effect="slide" time="250" start="-1890,0">WindowOpen</animation> <animation effect="slide" time="250" end="-1890,0">WindowClose</animation> - </control> + </control> </controls> -</window> +</window> \ No newline at end of file Modified: trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll =================================================================== (Binary files differ) Added: trunk/plugins/FritzBox/FritzBox/obj/Debug/DesignTimeResolveAssemblyReferences.cache =================================================================== (Binary files differ) Index: trunk/plugins/FritzBox/FritzBox/obj/Debug/DesignTimeResolveAssemblyReferences.cache =================================================================== --- trunk/plugins/FritzBox/FritzBox/obj/Debug/DesignTimeResolveAssemblyReferences.cache 2013-03-09 10:47:18 UTC (rev 4533) +++ trunk/plugins/FritzBox/FritzBox/obj/Debug/DesignTimeResolveAssemblyReferences.cache 2013-03-10 15:11:53 UTC (rev 4534) Property changes on: trunk/plugins/FritzBox/FritzBox/obj/Debug/DesignTimeResolveAssemblyReferences.cache ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.GenerateResource.Cache =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 =================================================================== --- trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2013-03-09 10:47:18 UTC (rev 4533) +++ trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2 2013-03-10 15:11:53 UTC (rev 4534) @@ -804,7 +804,7 @@ <Items> <CompatibleVersionItem> <MinRequiredVersion>1.1.0.0</MinRequiredVersion> - <DesignedForVersion>1.1.7.4532</DesignedForVersion> + <DesignedForVersion>1.1.7.4533</DesignedForVersion> </CompatibleVersionItem> </Items> </CompatibleVersion> @@ -827,7 +827,7 @@ <Major>1</Major> <Minor>0</Minor> <Build>0</Build> - <Revision>4532</Revision> + <Revision>4533</Revision> </Version> <ExtensionDescription>With FRITZ!Box Manager you can access several AVM FRITZ!Box information from MediaPortal. @@ -841,7 +841,7 @@ <VersionDescription /> <DevelopmentStatus>Stable</DevelopmentStatus> <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=118&cf_id=24</OnlineLocation> - <ReleaseDate>2013-03-09T11:36:01.9028196+01:00</ReleaseDate> + <ReleaseDate>2013-03-09T11:51:47.0125387+01:00</ReleaseDate> <Tags>fritzbox, fritzbox manager, callmonitor</Tags> <Location>..\MpeRelease\FritzBox.mpe1</Location> <Params> Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb =================================================================== (Binary files differ) Added: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache =================================================================== (Binary files differ) Index: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache =================================================================== --- trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache 2013-03-09 10:47:18 UTC (rev 4533) +++ trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache 2013-03-10 15:11:53 UTC (rev 4534) Property changes on: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.csprojResolveAssemblyReference.cache =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csprojResolveAssemblyReference.cache =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csprojResolveAssemblyReference.cache =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe =================================================================== (Binary files differ) Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |