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: <Ba...@us...> - 2012-10-06 20:17:31
|
Revision: 4514 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4514&view=rev Author: BartEv Date: 2012-10-06 20:17:25 +0000 (Sat, 06 Oct 2012) Log Message: ----------- Modified Paths: -------------- trunk/plugins/VeraControl/releases/update.xml Modified: trunk/plugins/VeraControl/releases/update.xml =================================================================== --- trunk/plugins/VeraControl/releases/update.xml 2012-10-06 20:14:02 UTC (rev 4513) +++ trunk/plugins/VeraControl/releases/update.xml 2012-10-06 20:17:25 UTC (rev 4514) @@ -1413,6 +1413,157 @@ <Build>1</Build> <Revision>0</Revision> </Version> + <ExtensionDescription>Control your Vera controller from MediaPortal. + +Supports Scene triggers for starting, hibernating and exiting MediaPortal; Also starting, pausing and stopping media streams. So dim your lights and close the curtains automatically when MediaPortal starts a movie... + +Vera is a Z-wave home automation controller from MicasaVerde. + +This version is tested with: + - Vera 1 v1.1.1338 + - Vera 2 v1.1.1267 + - Vera 2 v1.1.1362 + - Vera 2 v1.5.255 +</ExtensionDescription> + <VersionDescription>- Added multi box support (parallel update/control) +- Added fallback to remote connection +- Move scene trigger to side action menu +- Added sort options +- Added filter options +- Added view by category option +- Added flow view</VersionDescription> + <DevelopmentStatus>Stable</DevelopmentStatus> + <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/VeraControl/releases/VeraControl_v1.0.1.0.mpe1</OnlineLocation> + <ReleaseDate>2012-02-19T22:51:05</ReleaseDate> + <Tags>home automation, +z-wave, +micasaverde, +vera</Tags> + <Location>C:\Users\Bart\Documents\SharpDevelop Projects\VeraControl\releases\VeraControl_v1.0.1.0.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> + <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="IconsDefault"> + <DisplayName>IconsDefault</DisplayName> + <DefaulChecked>true</DefaulChecked> + <Description>IconsDefault</Description> + <Files> + <Items /> + </Files> + </GroupItem> + <GroupItem Name="IconsDefaultWide"> + <DisplayName>IconsDefaultWide</DisplayName> + <DefaulChecked>true</DefaulChecked> + <Description>IconsDefaultWide</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="VeraControl.dll"> + <CompatibleVersion> + <Items> + <CompatibleVersionItem> + <MinRequiredVersion>1.1.6.27644</MinRequiredVersion> + <DesignedForVersion>1.1.6.27644</DesignedForVersion> + </CompatibleVersionItem> + </Items> + </CompatibleVersion> + <SubSystemsUsed> + <Items> + <SubSystemItem Name="MP.SkinEngine" /> + <SubSystemItem Name="MP.Config" /> + </Items> + </SubSystemsUsed> + </PluginDependencyItem> + </Items> + </PluginDependencies> + <GeneralInfo> + <Name>Vera Controller</Name> + <Id>ebb6b1af-6fb9-44e5-a859-9d32ffe20a9e</Id> + <Author>Bart Eversdijk</Author> + <HomePage>http://www.team-mediaportal.com/extensions/micasaverde-vera-controller</HomePage> + <ForumPage>http://forum.team-mediaportal.com/mediaportal-plugins-47/plugin-micasaverde-vera-controller-104337/</ForumPage> + <UpdateUrl>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/VeraControl/releases/update.xml</UpdateUrl> + <Version> + <Major>1</Major> + <Minor>0</Minor> + <Build>2</Build> + <Revision>0</Revision> + </Version> <ExtensionDescription>Control your Vera controller from MediaPortal. Supports Scene triggers for starting, hibernating and exiting MediaPortal; Also starting, pausing and stopping media streams. So dim your lights and close the curtains automatically when MediaPortal starts a movie... @@ -1425,21 +1576,15 @@ - Vera 2 v1.1.1362 - Vera 2 v1.5.255 </ExtensionDescription> - <VersionDescription>- Added multi box support (parallel update/control) -- Added fallback to remote connection -- Move scene trigger to side action menu -- Added sort options -- Added filter options -- Added view by category option -- Added flow view</VersionDescription> + <VersionDescription>- Fixed: Resume bug </VersionDescription> <DevelopmentStatus>Stable</DevelopmentStatus> - <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/VeraControl/releases/VeraControl_v1.0.1.0.mpe1</OnlineLocation> - <ReleaseDate>2012-02-19T22:51:05</ReleaseDate> + <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/VeraControl/releases/VeraControl_v1.0.2.0.mpe1</OnlineLocation> + <ReleaseDate>2012-10-06T22:51:05</ReleaseDate> <Tags>home automation, z-wave, micasaverde, vera</Tags> - <Location>C:\Users\Bart\Documents\SharpDevelop Projects\VeraControl\releases\VeraControl_v1.0.1.0.mpe1</Location> + <Location>C:\Users\Bart\Documents\SharpDevelop Projects\VeraControl\releases\VeraControl_v1.0.2.0.mpe1</Location> <Params> <Items> <SectionParam Name="Online Icon"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Ba...@us...> - 2012-10-06 20:14:08
|
Revision: 4513 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4513&view=rev Author: BartEv Date: 2012-10-06 20:14:02 +0000 (Sat, 06 Oct 2012) Log Message: ----------- Modified Paths: -------------- trunk/plugins/VeraControl/releases/VeraControl.xmp2 Modified: trunk/plugins/VeraControl/releases/VeraControl.xmp2 =================================================================== --- trunk/plugins/VeraControl/releases/VeraControl.xmp2 2012-10-06 20:13:43 UTC (rev 4512) +++ trunk/plugins/VeraControl/releases/VeraControl.xmp2 2012-10-06 20:14:02 UTC (rev 4513) @@ -976,7 +976,7 @@ <Version> <Major>1</Major> <Minor>0</Minor> - <Build>1</Build> + <Build>2</Build> <Revision>0</Revision> </Version> <ExtensionDescription>Control your Vera controller from MediaPortal. @@ -991,16 +991,10 @@ - Vera 2 v1.1.1362 - Vera 2 v1.5.255 </ExtensionDescription> - <VersionDescription>- Added multi box support (parallel update/control) -- Added fallback to remote connection -- Move scene trigger to side action menu -- Added sort options -- Added filter options -- Added view by category option -- Added flow view</VersionDescription> + <VersionDescription>- Fixed: Resume bug </VersionDescription> <DevelopmentStatus>Stable</DevelopmentStatus> <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/VeraControl/releases/VeraControl_v1.0.1.0.mpe1</OnlineLocation> - <ReleaseDate>2012-02-19T22:51:05</ReleaseDate> + <ReleaseDate>2012-10-06T22:51:05</ReleaseDate> <Tags>home automation, z-wave, micasaverde, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Ba...@us...> - 2012-10-06 20:13:49
|
Revision: 4512 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4512&view=rev Author: BartEv Date: 2012-10-06 20:13:43 +0000 (Sat, 06 Oct 2012) Log Message: ----------- Added Paths: ----------- trunk/plugins/VeraControl/releases/VeraControl_v1.0.2.0.mpe1 Added: trunk/plugins/VeraControl/releases/VeraControl_v1.0.2.0.mpe1 =================================================================== (Binary files differ) Property changes on: trunk/plugins/VeraControl/releases/VeraControl_v1.0.2.0.mpe1 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Ba...@us...> - 2012-10-06 20:09:08
|
Revision: 4511 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4511&view=rev Author: BartEv Date: 2012-10-06 20:09:02 +0000 (Sat, 06 Oct 2012) Log Message: ----------- Modified Paths: -------------- trunk/plugins/VeraControl/DeviceSprinkler.cs trunk/plugins/VeraControl/VeraBox.cs trunk/plugins/VeraControl/VeraControl.cs trunk/plugins/VeraControl/VeraHelper.cs Modified: trunk/plugins/VeraControl/DeviceSprinkler.cs =================================================================== --- trunk/plugins/VeraControl/DeviceSprinkler.cs 2012-09-09 20:42:42 UTC (rev 4510) +++ trunk/plugins/VeraControl/DeviceSprinkler.cs 2012-10-06 20:09:02 UTC (rev 4511) @@ -56,7 +56,7 @@ public override bool status { get { return _status; } - set { + set { if (id > 0) // Only send when a valid ID is found { ReportPendingRequest(); Modified: trunk/plugins/VeraControl/VeraBox.cs =================================================================== --- trunk/plugins/VeraControl/VeraBox.cs 2012-09-09 20:42:42 UTC (rev 4510) +++ trunk/plugins/VeraControl/VeraBox.cs 2012-10-06 20:09:02 UTC (rev 4511) @@ -15,6 +15,7 @@ using System.Threading; using System.Collections.Generic; using System.Xml; +using System.Linq; namespace VeraControl.Properties { @@ -46,122 +47,77 @@ } public Room GetRoomById(int id) { - foreach(Room room in rooms) + var room = from r in rooms where r.id == id select r; + if (room.Count() > 0) { - if (room.id == id) - { - return room; - } + return room.First(); } return new Room(null, 0); } public Section GetSectionById(int id) { - foreach(Section section in sections) + var section = from s in sections where s.id == id select s; + if (section.Count() > 0) { - if (section.id == id) - { - return section; - } + return section.First(); } return new Section(null, 0); } public DeviceGeneric GetDeviceById(int id) { - foreach(DeviceGeneric dev in devices) + var device = from d in devices where d.id == id select d; + if (device.Count() > 0) { - if (dev.id == id) - { - return dev; - } + return device.First(); } return new DeviceGeneric(null, 0); } public Scene GetSceneById(int id) { - foreach(Scene scene in scenes) + var scene = from s in scenes where s.id == id select s; + if (scene.Count() > 0) { - if (scene.id == id) - { - return scene; - } + return scene.First(); } return new Scene(null, 0); } public DevCategories GetCategoryById(int id) { - foreach(DevCategories cat in categories) + var cat = from c in categories where c.id == id select c; + if (cat.Count() > 0) { - if (cat.id == id) - { - return cat; - } + return cat.First(); } return new DevCategories(null); } public bool IsSectionFound(int id) { - foreach(Section section in sections) - { - if (section.id == id) - { - return true; - } - } - return false; + return ((from s in sections where s.id == id select s).Count() > 0); } public bool IsRoomFound(int id) { - foreach(Room room in rooms) - { - if (room.id == id) - { - return true; - } - } - return false; + return ((from r in rooms where r.id == id select r).Count() > 0); } public bool IsDeviceFound(int id) { - foreach(DeviceGeneric dev in devices) - { - if (dev.id == id) - { - return true; - } - } - return false; + return ((from d in devices where d.id == id select d).Count() > 0); } public bool IsSceneFound(int id) { - foreach(Scene scene in scenes) - { - if (scene.id == id) - { - return true; - } - } - return false; + return ((from s in scenes where s.id == id select s).Count() > 0); } public bool IsCategoryFound(int id) { - foreach(DevCategories cat in categories) - { - if (cat.id == id) - { - return true; - } - } - return false; + return ((from c in categories where c.id == id select c).Count() > 0); } #endregion } @@ -433,6 +389,9 @@ } } + // TODO: Add non standard json devices; http://192.10.1.240:3480/data_request?id=user_data&output_format=xml + // Dynamic create controls based on the supplied information + // Process Devices xnList = xmlDoc.SelectNodes("/root/devices/device"); foreach (XmlNode xn in xnList) Modified: trunk/plugins/VeraControl/VeraControl.cs =================================================================== --- trunk/plugins/VeraControl/VeraControl.cs 2012-09-09 20:42:42 UTC (rev 4510) +++ trunk/plugins/VeraControl/VeraControl.cs 2012-10-06 20:09:02 UTC (rev 4511) @@ -147,7 +147,7 @@ public VeraControl() { - // TO DO: remove this sleep + // TODO: remove this sleep // Thread.Sleep(5000); } @@ -254,7 +254,7 @@ Player.PlayBackEnded += new Player.EndedHandler(g_Player_PlayBackEnded); Player.PlayBackStarted += new Player.StartedHandler(g_Player_PlayBackStarted); Player.PlayBackStopped += new Player.StoppedHandler(g_Player_PlayBackStopped); - + // Handle MP start-up trigger - do this is a different Thread to not block MP-start up new Thread( () => { _vera.UpdateStatusOfAllBoxes(); @@ -325,7 +325,14 @@ #region Action Trigger Detection private void OnNewAction(Action action) { - + switch(action.wID) + { // This switch is for debug purposes (set breakpoint on next switch to debug Actions add ignore mouse/key actions) + case Action.ActionType.ACTION_KEY_PRESSED: + case Action.ActionType.ACTION_MOUSE_CLICK: + case Action.ActionType.ACTION_MOUSE_DOUBLECLICK: + case Action.ActionType.ACTION_MOUSE_MOVE: + return; + } // Handle global action responders first (Scene triggers need to be handled also when we are not visible) switch(action.wID) { @@ -347,6 +354,25 @@ } break; + // Handle play button in pause mode + case Action.ActionType.ACTION_PLAY: + case Action.ActionType.ACTION_MUSIC_PLAY: + if (Player.IsMusic && _lastAction == Actiontrigger.MUSIC_PAUSED) { + HandleActionTriggers(Actiontrigger.MUSIC_PAUSE_RESUMED); + } else if (Player.IsRadio && _lastAction == Actiontrigger.RADIO_PAUSED) { + HandleActionTriggers(Actiontrigger.RADIO_PAUSE_RESUMED); + } else if (Player.IsTVRecording && _lastAction == Actiontrigger.RECORDING_PAUSED) { + HandleActionTriggers(Actiontrigger.RECORDING_PAUSE_RESUMED); + } else if ((Player.IsTV || Player.IsTimeShifting) && _lastAction == Actiontrigger.TV_PAUSED) { + HandleActionTriggers(Actiontrigger.TV_PAUSE_RESUMED); + } else if (Player.IsVideo && _lastAction == Actiontrigger.VIDEO_PAUSED) { + HandleActionTriggers(Actiontrigger.VIDEO_PAUSE_RESUMED); + } else { + if (_lastAction == Actiontrigger.UNKNOWN_PAUSED) + HandleActionTriggers(Actiontrigger.UNKNOWN_PAUSE_RESUMED); + } + break; + case Action.ActionType.ACTION_EXIT: HandleActionTriggers(Actiontrigger.MP_EXIT); break; Modified: trunk/plugins/VeraControl/VeraHelper.cs =================================================================== --- trunk/plugins/VeraControl/VeraHelper.cs 2012-09-09 20:42:42 UTC (rev 4510) +++ trunk/plugins/VeraControl/VeraHelper.cs 2012-10-06 20:09:02 UTC (rev 4511) @@ -34,7 +34,7 @@ } private static volatile VeraHelper _instance; - private static object _syncRoot = new Object(); + private static object _syncRoot = new Object(); public static VeraHelper Instance { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dos...@us...> - 2012-09-09 20:42:49
|
Revision: 4510 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4510&view=rev Author: doskabouter Date: 2012-09-09 20:42:42 +0000 (Sun, 09 Sep 2012) Log Message: ----------- Added option to change default useragent Modified Paths: -------------- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.resx Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs =================================================================== --- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-08-12 17:51:38 UTC (rev 4509) +++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-09-09 20:42:42 UTC (rev 4510) @@ -177,6 +177,9 @@ #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"); Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs =================================================================== --- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs 2012-08-12 17:51:38 UTC (rev 4509) +++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs 2012-09-09 20:42:42 UTC (rev 4510) @@ -48,6 +48,7 @@ public string Server { get; set; } public int Port { get; set; } public GUIFacadeControl.Layout View { get; set; } + public string UserAgent { get; set; } private const string section = "btWeb"; @@ -98,6 +99,7 @@ Remote_PageDown = GetActionFromString(xmlreader, "remote_pagedown", Default_Remote_PageDown); LastUrl = xmlreader.GetValueAsString(section, "lastUrl", string.Empty); + UserAgent = xmlreader.GetValueAsString(section, "useragent", string.Empty); UseProxy = xmlreader.GetValueAsBool(section, "proxy", false); Server = xmlreader.GetValueAsString(section, "proxy_server", "127.0.0.1"); @@ -160,6 +162,7 @@ xmlwriter.SetValue(section, "remote_pagedown", Remote_PageDown); xmlwriter.SetValue(section, "bookmark", View); + xmlwriter.SetValue(section, "useragent", UserAgent); xmlwriter.SetValueAsBool(section, "proxy", UseProxy); xmlwriter.SetValue(section, "proxy_server", Server); Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs =================================================================== --- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs 2012-08-12 17:51:38 UTC (rev 4509) +++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs 2012-09-09 20:42:42 UTC (rev 4510) @@ -85,6 +85,9 @@ this.label3 = new System.Windows.Forms.Label(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.tabPage5 = new System.Windows.Forms.TabPage(); + this.groupBox13 = new System.Windows.Forms.GroupBox(); + this.cbOverrideUserAgent = new System.Windows.Forms.CheckBox(); + this.cmbUserAgent = new System.Windows.Forms.ComboBox(); this.groupBox8 = new System.Windows.Forms.GroupBox(); this.txtHttpPort = new System.Windows.Forms.TextBox(); this.txtHttpServer = new System.Windows.Forms.TextBox(); @@ -156,6 +159,7 @@ this.tabPage3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.tabPage5.SuspendLayout(); + this.groupBox13.SuspendLayout(); this.groupBox8.SuspendLayout(); this.tabPage4.SuspendLayout(); this.groupBox11.SuspendLayout(); @@ -731,14 +735,57 @@ // tabPage5 // this.tabPage5.BackColor = System.Drawing.SystemColors.Control; + this.tabPage5.Controls.Add(this.groupBox13); this.tabPage5.Controls.Add(this.groupBox8); this.tabPage5.Location = new System.Drawing.Point(4, 25); this.tabPage5.Name = "tabPage5"; this.tabPage5.Padding = new System.Windows.Forms.Padding(3); this.tabPage5.Size = new System.Drawing.Size(562, 476); this.tabPage5.TabIndex = 4; - this.tabPage5.Text = "Proxy"; + this.tabPage5.Text = "Proxy/UserAgent"; // + // groupBox13 + // + this.groupBox13.Controls.Add(this.cbOverrideUserAgent); + this.groupBox13.Controls.Add(this.cmbUserAgent); + this.groupBox13.Location = new System.Drawing.Point(6, 157); + this.groupBox13.Name = "groupBox13"; + this.groupBox13.Size = new System.Drawing.Size(550, 100); + this.groupBox13.TabIndex = 2; + this.groupBox13.TabStop = false; + this.groupBox13.Text = "UserAgent"; + // + // cbOverrideUserAgent + // + this.cbOverrideUserAgent.AutoSize = true; + this.cbOverrideUserAgent.Location = new System.Drawing.Point(6, 21); + this.cbOverrideUserAgent.Name = "cbOverrideUserAgent"; + this.cbOverrideUserAgent.Size = new System.Drawing.Size(146, 20); + this.cbOverrideUserAgent.TabIndex = 1; + this.cbOverrideUserAgent.Text = "Override UserAgent"; + this.cbOverrideUserAgent.UseVisualStyleBackColor = true; + this.cbOverrideUserAgent.CheckedChanged += new System.EventHandler(this.cbOverrideUserAgent_CheckedChanged); + // + // cmbUserAgent + // + this.cmbUserAgent.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.cmbUserAgent.FormattingEnabled = true; + this.cmbUserAgent.Items.AddRange(new object[] { + "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0; Trident/4.0; SLCC1; .NET CLR 2" + + ".0.50727; Media Center PC 5.0; .NET CLR 3.0.30729; .NET CLR 3.5.30729; .NET4.0C;" + + " .NET4.0E)", + "Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.1.19) Gecko", + "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:15.0) Gecko/20100101 Firefox/15.0", + "Mozilla/5.0 (Windows; U; Windows NT 6.1; de; rv:1.9.1.3) Gecko/20090824 Firefox/3" + + ".5.3", + "Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHT" + + "ML, like Gecko) Version/4.0.4 Mobile/7B334b Safari/531.21.10"}); + this.cmbUserAgent.Location = new System.Drawing.Point(6, 46); + this.cmbUserAgent.Name = "cmbUserAgent"; + this.cmbUserAgent.Size = new System.Drawing.Size(538, 24); + this.cmbUserAgent.TabIndex = 0; + // // groupBox8 // this.groupBox8.Controls.Add(this.txtHttpPort); @@ -1313,6 +1360,8 @@ this.tabPage3.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.tabPage5.ResumeLayout(false); + this.groupBox13.ResumeLayout(false); + this.groupBox13.PerformLayout(); this.groupBox8.ResumeLayout(false); this.groupBox8.PerformLayout(); this.tabPage4.ResumeLayout(false); @@ -1437,5 +1486,8 @@ private System.Windows.Forms.ComboBox cmbPageUp; private System.Windows.Forms.Label label37; private System.Windows.Forms.Label label36; + private System.Windows.Forms.GroupBox groupBox13; + private System.Windows.Forms.ComboBox cmbUserAgent; + private System.Windows.Forms.CheckBox cbOverrideUserAgent; } } \ No newline at end of file Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs =================================================================== --- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs 2012-08-12 17:51:38 UTC (rev 4509) +++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs 2012-09-09 20:42:42 UTC (rev 4510) @@ -643,6 +643,9 @@ cmbPageDown.SelectedItem = settings.Remote_PageDown; cmbBookmarkView.SelectedItem = settings.View; + cmbUserAgent.Text = settings.UserAgent; + cbOverrideUserAgent.Checked = !String.IsNullOrEmpty(cmbUserAgent.Text); + chkProxy.Checked = settings.UseProxy; txtHttpServer.Text = settings.Server; txtHttpPort.Text = settings.Port.ToString(); @@ -678,6 +681,10 @@ settings.Remote_Status = (Action.ActionType)cmbStatusBar.SelectedItem; settings.View = (GUIFacadeControl.Layout)cmbBookmarkView.SelectedItem; + if (cbOverrideUserAgent.Checked) + settings.UserAgent = cmbUserAgent.Text; + else + settings.UserAgent = String.Empty; settings.UseProxy = chkProxy.Checked; settings.Server = txtHttpServer.Text; @@ -733,8 +740,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 @@ -835,5 +841,10 @@ cmbPageDown.SelectedItem = Settings.Default_Remote_PageDown; } + private void cbOverrideUserAgent_CheckedChanged(object sender, EventArgs e) + { + cmbUserAgent.Enabled = cbOverrideUserAgent.Checked; + } + } } Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.resx =================================================================== --- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.resx 2012-08-12 17:51:38 UTC (rev 4509) +++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.resx 2012-09-09 20:42:42 UTC (rev 4510) @@ -176,6 +176,6 @@ <value>26, 16</value> </metadata> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>47</value> + <value>46</value> </metadata> </root> \ 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: <fr...@us...> - 2012-08-12 17:51:46
|
Revision: 4509 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4509&view=rev Author: framug Date: 2012-08-12 17:51:38 +0000 (Sun, 12 Aug 2012) Log Message: ----------- - Add "official" MP 1.3 compatibility version plugin. Modified Paths: -------------- trunk/plugins/MultiShortcut/DLLFix/DLLFix.csproj trunk/plugins/MultiShortcut/MultiShortcut/MultiShortcut.csproj trunk/plugins/MultiShortcut/MultiShortcut/Properties/AssemblyInfo.cs trunk/plugins/MultiShortcut/TestServer/TestServer.csproj Modified: trunk/plugins/MultiShortcut/DLLFix/DLLFix.csproj =================================================================== --- trunk/plugins/MultiShortcut/DLLFix/DLLFix.csproj 2012-08-03 19:47:20 UTC (rev 4508) +++ trunk/plugins/MultiShortcut/DLLFix/DLLFix.csproj 2012-08-12 17:51:38 UTC (rev 4509) @@ -56,7 +56,7 @@ <ItemGroup> <Reference Include="Core, Version=1.0.4.32078, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\mediaportal\MediaPortal.Application\bin\Release\Core.dll</HintPath> + <HintPath>C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="System" /> @@ -94,9 +94,6 @@ <Install>true</Install> </BootstrapperPackage> </ItemGroup> - <ItemGroup> - <None Include="app.config" /> - </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. Modified: trunk/plugins/MultiShortcut/MultiShortcut/MultiShortcut.csproj =================================================================== --- trunk/plugins/MultiShortcut/MultiShortcut/MultiShortcut.csproj 2012-08-03 19:47:20 UTC (rev 4508) +++ trunk/plugins/MultiShortcut/MultiShortcut/MultiShortcut.csproj 2012-08-12 17:51:38 UTC (rev 4509) @@ -53,17 +53,25 @@ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> </PropertyGroup> <ItemGroup> + <Reference Include="Common.Utils"> + <HintPath>C:\Program Files (x86)\Team MediaPortal\MediaPortal\Common.Utils.dll</HintPath> + <Private>False</Private> + </Reference> <Reference Include="Core"> - <HintPath>..\..\..\mediaportal\MediaPortal.Application\bin\Release\Core.dll</HintPath> + <HintPath>C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll</HintPath> + <Private>False</Private> </Reference> <Reference Include="Databases"> - <HintPath>..\..\..\mediaportal\MediaPortal.Application\bin\Release\Databases.dll</HintPath> + <HintPath>C:\Program Files (x86)\Team MediaPortal\MediaPortal\Databases.dll</HintPath> + <Private>False</Private> </Reference> <Reference Include="Dialogs"> - <HintPath>..\..\..\mediaportal\MediaPortal.Application\bin\Release\plugins\Windows\Dialogs.dll</HintPath> + <HintPath>C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll</HintPath> + <Private>False</Private> </Reference> <Reference Include="RemotePlugins"> - <HintPath>..\..\..\mediaportal\MediaPortal.Application\bin\Release\RemotePlugins.dll</HintPath> + <HintPath>C:\Program Files (x86)\Team MediaPortal\MediaPortal\RemotePlugins.dll</HintPath> + <Private>False</Private> </Reference> <Reference Include="System" /> <Reference Include="System.Data" /> @@ -71,7 +79,8 @@ <Reference Include="System.Windows.Forms" /> <Reference Include="System.Xml" /> <Reference Include="Utils"> - <HintPath>..\..\..\mediaportal\MediaPortal.Application\bin\Release\Utils.dll</HintPath> + <HintPath>C:\Program Files (x86)\Team MediaPortal\MediaPortal\Utils.dll</HintPath> + <Private>False</Private> </Reference> </ItemGroup> <ItemGroup> Modified: trunk/plugins/MultiShortcut/MultiShortcut/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/MultiShortcut/MultiShortcut/Properties/AssemblyInfo.cs 2012-08-03 19:47:20 UTC (rev 4508) +++ trunk/plugins/MultiShortcut/MultiShortcut/Properties/AssemblyInfo.cs 2012-08-12 17:51:38 UTC (rev 4509) @@ -1,7 +1,9 @@ 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. @@ -31,5 +33,11 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("2.3.0.0")] -[assembly: AssemblyFileVersion("2.3.0.0")] +[assembly: AssemblyVersion("2.4.0.0")] +[assembly: AssemblyFileVersion("2.4.0.0")] + +// MediaPortal plugin version compatibility +[assembly: CompatibleVersion("1.2.100.0")] +[assembly: UsesSubsystem("MP.SkinEngine")] +[assembly: UsesSubsystem("MP.Config")] + Modified: trunk/plugins/MultiShortcut/TestServer/TestServer.csproj =================================================================== --- trunk/plugins/MultiShortcut/TestServer/TestServer.csproj 2012-08-03 19:47:20 UTC (rev 4508) +++ trunk/plugins/MultiShortcut/TestServer/TestServer.csproj 2012-08-12 17:51:38 UTC (rev 4509) @@ -55,7 +55,7 @@ <ItemGroup> <Reference Include="Core, Version=1.0.4.32078, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\mediaportal\MediaPortal.Application\bin\Release\Core.dll</HintPath> + <HintPath>C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="System" /> @@ -90,9 +90,6 @@ <Install>true</Install> </BootstrapperPackage> </ItemGroup> - <ItemGroup> - <None Include="app.config" /> - </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mca...@us...> - 2012-08-03 19:47:26
|
Revision: 4508 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4508&view=rev Author: mcarter2006 Date: 2012-08-03 19:47:20 +0000 (Fri, 03 Aug 2012) Log Message: ----------- Modified Paths: -------------- trunk/plugins/UKTVThumb/Normal/package/UK_Logos.mpe1 trunk/plugins/UKTVThumb/Normal/update.xml Modified: trunk/plugins/UKTVThumb/Normal/package/UK_Logos.mpe1 =================================================================== (Binary files differ) Modified: trunk/plugins/UKTVThumb/Normal/update.xml =================================================================== --- trunk/plugins/UKTVThumb/Normal/update.xml 2012-07-28 18:41:05 UTC (rev 4507) +++ trunk/plugins/UKTVThumb/Normal/update.xml 2012-08-03 19:47:20 UTC (rev 4508) @@ -23,7 +23,7 @@ </GroupItem> <GroupItem Name="Terrestrial-Standard"> <DisplayName>Terrestrial-Standard</DisplayName> - <DefaulChecked>true</DefaulChecked> + <DefaulChecked>false</DefaulChecked> <Description>Terrestrial-Standard</Description> <Files> <Items /> @@ -31,7 +31,7 @@ </GroupItem> <GroupItem Name="Satellite-Standard"> <DisplayName>Satellite-Standard</DisplayName> - <DefaulChecked>true</DefaulChecked> + <DefaulChecked>false</DefaulChecked> <Description>Satellite-Standard</Description> <Files> <Items /> @@ -39,7 +39,7 @@ </GroupItem> <GroupItem Name="Terrestrial-Glossy"> <DisplayName>Terrestrial-Glossy</DisplayName> - <DefaulChecked>true</DefaulChecked> + <DefaulChecked>false</DefaulChecked> <Description>Terrestrial-Glossy</Description> <Files> <Items /> @@ -47,7 +47,7 @@ </GroupItem> <GroupItem Name="Satellite-Glossy"> <DisplayName>Satellite-Glossy</DisplayName> - <DefaulChecked>true</DefaulChecked> + <DefaulChecked>false</DefaulChecked> <Description>Satellite-Glossy</Description> <Files> <Items /> @@ -114,7 +114,7 @@ <Major>5</Major> <Minor>0</Minor> <Build>0</Build> - <Revision>2</Revision> + <Revision>3</Revision> </Version> <ExtensionDescription>In this pack you find a large selection of UK TV and Radio channel logos. If the logo you require isn't in this pack, let me know or create your own. Please if you do make your own logos for a channel remember to share them with the rest of the community on this thread. @@ -128,7 +128,7 @@ <VersionDescription>TV and Radio logos for UK Freeview & Freesat.</VersionDescription> <DevelopmentStatus>Stable</DevelopmentStatus> <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/UKTVThumb/Normal/package/UK_Logos.mpe1</OnlineLocation> - <ReleaseDate>2012-07-07T21:46:40</ReleaseDate> + <ReleaseDate>2012-08-03T21:46:40</ReleaseDate> <Tags>logos, thumbs, tv, radio</Tags> <Location>C:\Users\Matthew\Documents\TV Logos\Logos\mp-plugins\UKTVThumb\Normal\package\UK_Logos.mpe1</Location> <Params> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dos...@us...> - 2012-07-28 18:41:11
|
Revision: 4507 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4507&view=rev Author: doskabouter Date: 2012-07-28 18:41:05 +0000 (Sat, 28 Jul 2012) Log Message: ----------- Fixed missing cursor in fullscreen-mouse mode Modified Paths: -------------- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs =================================================================== --- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-07-26 21:25:33 UTC (rev 4506) +++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-07-28 18:41:05 UTC (rev 4507) @@ -264,7 +264,7 @@ MyLog.debug("Mouse support is enabled"); originalMouseSupport = GUIGraphicsContext.MouseSupport; GUIGraphicsContext.MouseSupport = true; - Cursor.Show(); + while (ShowCursor(true) < 0) ; } Parameter = null; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dos...@us...> - 2012-07-26 21:25:45
|
Revision: 4506 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4506&view=rev Author: doskabouter Date: 2012-07-26 21:25:33 +0000 (Thu, 26 Jul 2012) Log Message: ----------- reverted gecko-13 base Modified Paths: -------------- trunk/plugins/BrowseTheWeb/Release/Files/xulrunner.zip trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.sln trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/AutoJSContext.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ChromeDialog.Designer.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ChromeDialog.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ConfirmDialog.Designer.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ConfirmDialog.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoDomEvents.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoHistoryEntry.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoPreferences.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoResponse.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoSelection.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoWebBrowser.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/PasswordDialog.Designer.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/PasswordDialog.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/PromptDialog.Designer.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/PromptDialog.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/PromptService.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Properties/AssemblyInfo.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/PropertiesDialog.Designer.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/PropertiesDialog.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Readme.txt trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Skybound.Gecko.csproj trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Skybound.Gecko.sln trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Xpcom.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/nsInterfaces.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/nsString.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/nsURI.cs Added Paths: ----------- trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/Skybound.Gecko.dll trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoDom.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoStyle.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/nsIContentViewer.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/nsIDOMStorage.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/nsIDocShell.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/nsIDocShellLoadInfo.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/nsIDocumentCharsetInfo.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/nsIMarkupDocumentViewer.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/nsISHEntry.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/nsISecureBrowserUI.cs Removed Paths: ------------- trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/geckofx-13.dll trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/AppShellService.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/BaseNsFactory.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/BaseTypes/ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ByteArrayInputStream.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Cache/ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Certificates/ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ChromeDialog.resources trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ClassDiagrams/ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Collections/ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ConfirmDialog.resources trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ConsoleMessageEventArgs.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Contracts.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Cryptography/ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/CustomMarshalers/ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoElementExtensions.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoException.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoHelperAppLauncherDialog.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoMIMEInputStream.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoMarkupDocumentViewer.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoMessageEvents.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoMouseButton.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoWebBrowser.Events.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoWebBrowser.GTK.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoWebBrowser.WinForms.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoWindow.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoWrapperCache.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GtkOnceOnly.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GtkReparentingWrapperNoThread.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GtkWrapperNoThread.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/IO/ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/IOService.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ImageCreator.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Images/ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Interop/ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/JavascriptErrorEventArgs.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Listeners/ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Microsoft.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/NavigateFinishedNotifier.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Net/ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ObserverNotifications.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Observers/ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/OffScreenGeckoWebBrowser.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/PasswordDialog.resources trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Pipe.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Plugins/ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/PrintSettings.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/PrivateBrowsingService.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/PromptDialog.resources trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Properties.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/PropertiesDialog.resources trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/RandomGenerator.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ScreenManager.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Search/ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Services/ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Sound.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/TreeView.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Utils/ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Variant.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/WiFiMonitor.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/WindowMediator.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Windows/ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/X11Structs.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/XULRunnerLocator.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/XulRuntime.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/geckofx-13.dll.config trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/nsCString.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/nsCancelable.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/nsSupportsPrimitives.cs Modified: trunk/plugins/BrowseTheWeb/Release/Files/xulrunner.zip =================================================================== (Binary files differ) Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll =================================================================== (Binary files differ) Copied: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/Skybound.Gecko.dll (from rev 4503, trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/Skybound.Gecko.dll) =================================================================== (Binary files differ) Deleted: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/geckofx-13.dll =================================================================== (Binary files differ) Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj =================================================================== --- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2012-07-16 20:51:13 UTC (rev 4505) +++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2012-07-26 21:25:33 UTC (rev 4506) @@ -34,7 +34,7 @@ <BootstrapperEnabled>true</BootstrapperEnabled> <TargetFrameworkProfile /> </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Windows|AnyCPU' "> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> @@ -45,7 +45,7 @@ <UseVSHostingProcess>false</UseVSHostingProcess> <PlatformTarget>AnyCPU</PlatformTarget> </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Windows|AnyCPU' "> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> <OutputPath>..\..\Release\Plugins\Windows\</OutputPath> @@ -218,7 +218,7 @@ </ItemGroup> <ItemGroup> <ProjectReference Include="..\Skybound.Gecko\Skybound.Gecko.csproj"> - <Project>{6AB4EEE6-1889-43AB-83F7-A4F083230BE7}</Project> + <Project>{877D1A24-2D5E-4C46-A933-FCF11EA0403B}</Project> <Name>Skybound.Gecko</Name> </ProjectReference> </ItemGroup> Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs =================================================================== --- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-07-16 20:51:13 UTC (rev 4505) +++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-07-26 21:25:33 UTC (rev 4506) @@ -34,7 +34,7 @@ using System.Windows.Forms; using System.Runtime.InteropServices; -using Gecko; +using Skybound.Gecko; namespace BrowseTheWeb { @@ -287,13 +287,13 @@ webBrowser.StatusTextChanged += new EventHandler(webBrowser_StatusTextChanged); MyLog.debug("Create dom eventhandler"); - webBrowser.DomKeyDown += new EventHandler<GeckoDomKeyEventArgs>(webBrowser_DomKeyDown); - webBrowser.DomClick += new EventHandler<GeckoDomEventArgs>(webBrowser_DomClick); + webBrowser.DomKeyDown += new GeckoDomKeyEventHandler(webBrowser_DomKeyDown); + webBrowser.DomClick += new GeckoDomEventHandler(webBrowser_DomClick); MyLog.debug("set zoom size to " + settings.FontZoom + "/" + zoom); webBrowser.Window.TextZoom = settings.FontZoom; - webBrowserZoom = zoom; + webBrowser.Zoom = zoom; if (settings.Windowed) { @@ -360,8 +360,8 @@ webBrowser.DocumentCompleted -= new EventHandler(webBrowser_DocumentCompleted); webBrowser.StatusTextChanged -= new EventHandler(webBrowser_StatusTextChanged); - webBrowser.DomKeyDown -= new EventHandler<GeckoDomKeyEventArgs>(webBrowser_DomKeyDown); - webBrowser.DomClick -= new EventHandler<GeckoDomEventArgs>(webBrowser_DomClick); + webBrowser.DomKeyDown -= new GeckoDomKeyEventHandler(webBrowser_DomKeyDown); + webBrowser.DomClick -= new GeckoDomEventHandler(webBrowser_DomClick); timer.Tick -= new EventHandler(timer_Tick); timer.Stop(); @@ -762,13 +762,13 @@ private void OnZoomIn() { if (zoom < 3) zoom += 0.1f; - webBrowserZoom = zoom; + webBrowser.Zoom = zoom; if (!settings.Remote) GUIPropertyManager.SetProperty("#btWeb.status", "Zoom set to " + (int)(zoom * 100)); } private void OnZoomOut() { if (zoom > 0.1f) zoom -= 0.1f; - webBrowserZoom = zoom; + webBrowser.Zoom = zoom; if (!settings.Remote) GUIPropertyManager.SetProperty("#btWeb.status", "Zoom set to " + (int)(zoom * 100)); } private void OnMoveLeft() @@ -876,26 +876,26 @@ } } - private void AddElements(List<GeckoHtmlElement> list, GeckoNode parent, string elName) + private void AddElements(List<GeckoElement> list, GeckoNode parent, string elName) { - if (parent is GeckoHtmlElement && ((GeckoHtmlElement)parent).TagName.ToLowerInvariant() == elName) - list.Add((GeckoHtmlElement)parent); + if (parent is GeckoElement && ((GeckoElement)parent).TagName.ToLowerInvariant() == elName) + list.Add((GeckoElement)parent); foreach (GeckoNode child in parent.ChildNodes) AddElements(list, child, elName); } - private List<GeckoHtmlElement> getElements(GeckoNode parent, string elName) + private List<GeckoElement> getElements(GeckoNode parent, string elName) { - List<GeckoHtmlElement> res = new List<GeckoHtmlElement>(); + List<GeckoElement> res = new List<GeckoElement>(); AddElements(res, parent, elName); return res; } - private GeckoHtmlElement insertSpan(int geckoId, string geckoAction, string geckoType, string className, GeckoNode after) + 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"); + GeckoElement newChild = after.OwnerDocument.CreateElement("span"); newChild.SetAttribute("style", _spanstyle); newChild.SetAttribute("gecko_id", geckoId.ToString()); newChild.SetAttribute("gecko_action", geckoAction); @@ -910,7 +910,7 @@ return newChild; } - private void SetLinkAttributes(GeckoHtmlElement link, int linkNumber, out string id, out string name) + private void SetLinkAttributes(GeckoElement link, int linkNumber, out string id, out string name) { string gb = link.GetAttribute("gb"); id = link.GetAttribute("id"); @@ -950,17 +950,17 @@ MyLog.debug("page links cnt : " + links.Count); - foreach (GeckoHtmlElement element in links) + foreach (GeckoElement element in links) { string link = element.GetAttribute("href"); if (!link.StartsWith("javascript:")) { - GeckoHtmlElement lastSpan = element; + GeckoElement lastSpan = element; bool ready = false; while (!ready) { - GeckoHtmlElement ls = lastSpan.LastChild as GeckoHtmlElement; + GeckoElement ls = lastSpan.LastChild as GeckoElement; if (ls == null || ls.TagName != "SPAN") ready = true; else @@ -968,9 +968,9 @@ }; if (!element.InnerHtml.Contains("gecko_id")) { - GeckoHtmlElement ls = element; - while (ls.LastChild != null && ls.LastChild is GeckoHtmlElement && !String.IsNullOrEmpty(ls.LastChild.TextContent)) - ls = (GeckoHtmlElement)ls.LastChild; + 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); } @@ -984,11 +984,11 @@ GeckoElementCollection objects = webBrowser.Document.GetElementsByTagName("object"); MyLog.debug("page objects cnt : " + objects.Count); - foreach (GeckoHtmlElement element in objects) + foreach (GeckoElement element in objects) if (element.GetAttribute("type") == "application/x-shockwave-flash") { string id, name; - GeckoHtmlElement element2 = element.Parent; + GeckoElement element2 = element.Parent; SetLinkAttributes(element2, i, out id, out name); if (!element2.InnerHtml.Contains("gecko_id=\"" + i + "\"")) @@ -1005,11 +1005,11 @@ MyLog.debug("page forms cnt : " + forms.Count); - foreach (GeckoHtmlElement element in forms) + foreach (GeckoElement element in forms) { - List<GeckoHtmlElement> inps = getElements(element, "input"); + List<GeckoElement> inps = getElements(element, "input"); string action = element.GetAttribute("action"); - foreach (GeckoHtmlElement link in inps) + foreach (GeckoElement link in inps) { string linkType = link.GetAttribute("type"); if (!String.IsNullOrEmpty(linkType)) @@ -1062,7 +1062,7 @@ #region reset zoom if (settings.ZoomPage) { - webBrowserZoom = settings.DefaultZoom; + webBrowser.Zoom = settings.DefaultZoom; zoom = settings.DefaultZoom; GUIPropertyManager.SetProperty("#btWeb.status", "Zoom set to " + (int)(zoom * 100)); } @@ -1071,7 +1071,7 @@ if (lastDomain != webBrowser.Document.Domain) { { - webBrowserZoom = settings.DefaultZoom; + webBrowser.Zoom = settings.DefaultZoom; zoom = settings.DefaultZoom; GUIPropertyManager.SetProperty("#btWeb.status", "Zoom set to " + (int)(zoom * 100)); } @@ -1083,7 +1083,7 @@ { using (System.IO.StreamWriter tw = new System.IO.StreamWriter(@"e:\last.html")) { - tw.WriteLine(((GeckoHtmlElement)webBrowser.Document.DocumentElement).InnerHtml); + tw.WriteLine(webBrowser.Document.DocumentElement.InnerHtml); } } } @@ -1187,7 +1187,7 @@ private bool SetInputElementValue(GeckoNode parent, int geckoId, string text) { - GeckoHtmlElement el = parent as GeckoHtmlElement; + GeckoElement el = parent as GeckoElement; if (el != null && el.TagName.ToLowerInvariant() == "input" && el.GetAttribute("gb") == "gecko_link" + geckoId) { el.SetAttribute("value", text); @@ -1234,13 +1234,5 @@ { MediaPortal.Util.Utils.PlaySound(strFilePath, false, true); } - - private float webBrowserZoom - { - set - { - webBrowser.GetMarkupDocumentViewer().SetFullZoomAttribute(value); - } - } } } Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs =================================================================== --- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs 2012-07-16 20:51:13 UTC (rev 4505) +++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs 2012-07-26 21:25:33 UTC (rev 4506) @@ -26,7 +26,7 @@ using System.Drawing; using System.Windows.Forms; -using Gecko; +using Skybound.Gecko; namespace BrowseTheWeb { Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs =================================================================== --- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs 2012-07-16 20:51:13 UTC (rev 4505) +++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs 2012-07-26 21:25:33 UTC (rev 4506) @@ -27,7 +27,7 @@ using System.Windows.Forms; using System.IO; -using Gecko; +using Skybound.Gecko; using Ionic.Zip; using MediaPortal.Configuration; @@ -82,8 +82,8 @@ FileInfo info = new FileInfo(plugins + "\\Windows\\HtmlAgilityPack.dll"); Log.Debug("BrowseTheWeb | HtmlAgilityPack: " + info.CreationTime); - info = new FileInfo(plugins + "\\Windows\\geckofx-13.dll"); - Log.Debug("BrowseTheWeb | geckofx-13.dll: " + info.CreationTime); + info = new FileInfo(plugins + "\\Windows\\Skybound.Gecko.dll"); + Log.Debug("BrowseTheWeb | Skybound.Gecko.dll: " + info.CreationTime); try { Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.sln =================================================================== --- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.sln 2012-07-16 20:51:13 UTC (rev 4505) +++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.sln 2012-07-26 21:25:33 UTC (rev 4506) @@ -3,62 +3,32 @@ # Visual Studio 2010 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BrowseTheWeb", "BrowseTheWeb\BrowseTheWeb.csproj", "{70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Skybound.Gecko", "Skybound.Gecko\Skybound.Gecko.csproj", "{6AB4EEE6-1889-43AB-83F7-A4F083230BE7}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Skybound.Gecko", "Skybound.Gecko\Skybound.Gecko.csproj", "{877D1A24-2D5E-4C46-A933-FCF11EA0403B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug_Linux|Any CPU = Debug_Linux|Any CPU - Debug_Linux|Mixed Platforms = Debug_Linux|Mixed Platforms - Debug_Linux|x86 = Debug_Linux|x86 - Debug_Windows|Any CPU = Debug_Windows|Any CPU - Debug_Windows|Mixed Platforms = Debug_Windows|Mixed Platforms - Debug_Windows|x86 = Debug_Windows|x86 - Release_Linux|Any CPU = Release_Linux|Any CPU - Release_Linux|Mixed Platforms = Release_Linux|Mixed Platforms - Release_Linux|x86 = Release_Linux|x86 - Release_Windows|Any CPU = Release_Windows|Any CPU - Release_Windows|Mixed Platforms = Release_Windows|Mixed Platforms - Release_Windows|x86 = Release_Windows|x86 + Debug 1.8|Any CPU = Debug 1.8|Any CPU + Debug 1.9|Any CPU = Debug 1.9|Any CPU + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug_Linux|Any CPU.ActiveCfg = Debug_Windows|Any CPU - {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug_Linux|Any CPU.Build.0 = Debug_Windows|Any CPU - {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug_Linux|Mixed Platforms.ActiveCfg = Debug_Windows|Any CPU - {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug_Linux|x86.ActiveCfg = Debug_Windows|Any CPU - {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug_Windows|Any CPU.ActiveCfg = Debug_Windows|Any CPU - {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug_Windows|Any CPU.Build.0 = Debug_Windows|Any CPU - {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug_Windows|Mixed Platforms.ActiveCfg = Debug_Windows|Any CPU - {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug_Windows|Mixed Platforms.Build.0 = Debug_Windows|Any CPU - {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug_Windows|x86.ActiveCfg = Debug_Windows|Any CPU - {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Release_Linux|Any CPU.ActiveCfg = Release_Windows|Any CPU - {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Release_Linux|Any CPU.Build.0 = Release_Windows|Any CPU - {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Release_Linux|Mixed Platforms.ActiveCfg = Release_Windows|Any CPU - {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Release_Linux|x86.ActiveCfg = Release_Windows|Any CPU - {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Release_Windows|Any CPU.ActiveCfg = Release_Windows|Any CPU - {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Release_Windows|Any CPU.Build.0 = Release_Windows|Any CPU - {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Release_Windows|Mixed Platforms.ActiveCfg = Release_Windows|Any CPU - {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Release_Windows|Mixed Platforms.Build.0 = Release_Windows|Any CPU - {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Release_Windows|x86.ActiveCfg = Release_Windows|Any CPU - {6AB4EEE6-1889-43AB-83F7-A4F083230BE7}.Debug_Linux|Any CPU.ActiveCfg = Debug_Linux|x86 - {6AB4EEE6-1889-43AB-83F7-A4F083230BE7}.Debug_Linux|Mixed Platforms.ActiveCfg = Debug_Linux|x86 - {6AB4EEE6-1889-43AB-83F7-A4F083230BE7}.Debug_Linux|Mixed Platforms.Build.0 = Debug_Linux|x86 - {6AB4EEE6-1889-43AB-83F7-A4F083230BE7}.Debug_Linux|x86.ActiveCfg = Debug_Linux|x86 - {6AB4EEE6-1889-43AB-83F7-A4F083230BE7}.Debug_Linux|x86.Build.0 = Debug_Linux|x86 - {6AB4EEE6-1889-43AB-83F7-A4F083230BE7}.Debug_Windows|Any CPU.ActiveCfg = Debug_Windows|x86 - {6AB4EEE6-1889-43AB-83F7-A4F083230BE7}.Debug_Windows|Mixed Platforms.ActiveCfg = Debug_Windows|x86 - {6AB4EEE6-1889-43AB-83F7-A4F083230BE7}.Debug_Windows|Mixed Platforms.Build.0 = Debug_Windows|x86 - {6AB4EEE6-1889-43AB-83F7-A4F083230BE7}.Debug_Windows|x86.ActiveCfg = Debug_Windows|x86 - {6AB4EEE6-1889-43AB-83F7-A4F083230BE7}.Debug_Windows|x86.Build.0 = Debug_Windows|x86 - {6AB4EEE6-1889-43AB-83F7-A4F083230BE7}.Release_Linux|Any CPU.ActiveCfg = Release_Linux|x86 - {6AB4EEE6-1889-43AB-83F7-A4F083230BE7}.Release_Linux|Mixed Platforms.ActiveCfg = Release_Linux|x86 - {6AB4EEE6-1889-43AB-83F7-A4F083230BE7}.Release_Linux|Mixed Platforms.Build.0 = Release_Linux|x86 - {6AB4EEE6-1889-43AB-83F7-A4F083230BE7}.Release_Linux|x86.ActiveCfg = Release_Linux|x86 - {6AB4EEE6-1889-43AB-83F7-A4F083230BE7}.Release_Linux|x86.Build.0 = Release_Linux|x86 - {6AB4EEE6-1889-43AB-83F7-A4F083230BE7}.Release_Windows|Any CPU.ActiveCfg = Release_Windows|x86 - {6AB4EEE6-1889-43AB-83F7-A4F083230BE7}.Release_Windows|Mixed Platforms.ActiveCfg = Release_Windows|x86 - {6AB4EEE6-1889-43AB-83F7-A4F083230BE7}.Release_Windows|Mixed Platforms.Build.0 = Release_Windows|x86 - {6AB4EEE6-1889-43AB-83F7-A4F083230BE7}.Release_Windows|x86.ActiveCfg = Release_Windows|x86 - {6AB4EEE6-1889-43AB-83F7-A4F083230BE7}.Release_Windows|x86.Build.0 = Release_Windows|x86 + {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug 1.8|Any CPU.ActiveCfg = Debug|Any CPU + {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug 1.8|Any CPU.Build.0 = Debug|Any CPU + {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug 1.9|Any CPU.ActiveCfg = Debug|Any CPU + {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug 1.9|Any CPU.Build.0 = Debug|Any CPU + {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug|Any CPU.Build.0 = Debug|Any CPU + {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Release|Any CPU.ActiveCfg = Release|Any CPU + {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Release|Any CPU.Build.0 = Release|Any CPU + {877D1A24-2D5E-4C46-A933-FCF11EA0403B}.Debug 1.8|Any CPU.ActiveCfg = Debug 1.8|Any CPU + {877D1A24-2D5E-4C46-A933-FCF11EA0403B}.Debug 1.8|Any CPU.Build.0 = Debug 1.8|Any CPU + {877D1A24-2D5E-4C46-A933-FCF11EA0403B}.Debug 1.9|Any CPU.ActiveCfg = Debug 1.9|Any CPU + {877D1A24-2D5E-4C46-A933-FCF11EA0403B}.Debug 1.9|Any CPU.Build.0 = Debug 1.9|Any CPU + {877D1A24-2D5E-4C46-A933-FCF11EA0403B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {877D1A24-2D5E-4C46-A933-FCF11EA0403B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {877D1A24-2D5E-4C46-A933-FCF11EA0403B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {877D1A24-2D5E-4C46-A933-FCF11EA0403B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Deleted: trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/AppShellService.cs =================================================================== --- trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/AppShellService.cs 2012-07-16 20:51:13 UTC (rev 4505) +++ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/AppShellService.cs 2012-07-26 21:25:33 UTC (rev 4506) @@ -1,30 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Gecko.Interop; - -namespace Gecko -{ - public static class AppShellService - { - private static ServiceWrapper<nsIAppShellService> _appShellService; - - static AppShellService() - { - _appShellService=new ServiceWrapper<nsIAppShellService>( Contracts.AppShellService ); - - - } - - public static void CreateHiddenWindow() - { - _appShellService.Instance.CreateHiddenWindow(); - } - - public static nsIXULWindow CreateTopLevelWindow( nsIXULWindow aParent, nsIURI aUrl, uint aChromeMask, int aInitialWidth, int aInitialHeight) - { - return _appShellService.Instance.CreateTopLevelWindow( aParent, aUrl, aChromeMask, aInitialWidth, aInitialHeight ); - } - } -} Modified: trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/AutoJSContext.cs =================================================================== --- trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/AutoJSContext.cs 2012-07-16 20:51:13 UTC (rev 4505) +++ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/AutoJSContext.cs 2012-07-26 21:25:33 UTC (rev 4506) @@ -35,84 +35,319 @@ using System; using System.Runtime.InteropServices; -using System.Runtime.CompilerServices; -using System.Text; -namespace Gecko +namespace Skybound.Gecko { /// <summary> /// Creates a scoped, fake "system principal" security context. This class is used primarly to work around bugs in gecko /// which prevent methods on nsIDOMCSSStyleSheet from working outside of javascript. /// </summary> - public class AutoJSContext : IDisposable - { - IntPtr _cx; + class AutoJSContext : IDisposable + { + #region Unmanaged Interfaces - public IntPtr ContextPointer { get { return _cx; } } - - private readonly nsIThreadJSContextStack _jsContextStack; - private readonly nsIJSContextStack _contextStack; - private readonly nsIScriptSecurityManager _securityManager; - private readonly nsIPrincipal _systemPrincipal; - - /// <summary> - /// Create a AutoJSContext using the SafeJSContext. - /// If context is IntPtr.Zero use the SafeJSContext - /// </summary> - /// <param name="context"></param> - public AutoJSContext(IntPtr context) + [Guid("c67d8270-3189-11d3-9885-006008962422"), ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] + interface nsIJSContextStack { - if (context == IntPtr.Zero) - { - _jsContextStack = Xpcom.GetService<nsIThreadJSContextStack>("@mozilla.org/js/xpc/ContextStack;1"); - context = _jsContextStack.GetSafeJSContextAttribute(); - } + int GetCount(); + IntPtr Peek(); + IntPtr Pop(); + void Push(IntPtr cx); + } + + #if GECKO_1_9_1 + [Guid("f8e350b9-9f31-451a-8c8f-d10fea26b780"), ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] + #elif GECKO_1_9 + [Guid("3fffd8e8-3fea-442e-a0ed-2ba81ae197d5"), ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] + #elif GECKO_1_8 + [Guid("f4d74511-2b2d-4a14-a3e4-a392ac5ac3ff"), ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] + #endif + interface nsIScriptSecurityManager + { + // nsIXPCSecurityManager: + void CanCreateWrapper(out IntPtr aJSContext, ref Guid aIID, nsISupports aObj, IntPtr aClassInfo, IntPtr aPolicy); // aClassInfo=nsIClassInfo + void CanCreateInstance(out IntPtr aJSContext, ref Guid aCID); + void CanGetService(out IntPtr aJSContext, ref Guid aCID); + void CanAccess(uint aAction, IntPtr aCallContext, out IntPtr aJSContext, out IntPtr aJSObject, nsISupports aObj, IntPtr aClassInfo, IntPtr aName, IntPtr aPolicy); // aCallContext=nsIXPCNativeCallContext - _cx = context; - - // begin a new request - SpiderMonkey.JS_BeginRequest(_cx); - - // push the context onto the context stack - _contextStack = Xpcom.GetService<nsIJSContextStack>("@mozilla.org/js/xpc/ContextStack;1"); - _contextStack.Push(_cx); - - // obtain the system principal (no security checks) (one could get a different principal by calling securityManager.GetObjectPrincipal()) - _securityManager = Xpcom.GetService<nsIScriptSecurityManager>("@mozilla.org/scriptsecuritymanager;1"); - _systemPrincipal = _securityManager.GetSystemPrincipal(); - _securityManager.PushContextPrincipal(_cx, IntPtr.Zero, _systemPrincipal); + #if GECKO_1_8 + // nsIScriptSecurityManager: + void CheckPropertyAccess(out IntPtr aJSContext, out IntPtr aJSObject, [MarshalAs(UnmanagedType.LPStr)] out string aClassName, IntPtr aProperty, uint aAction); + void CheckConnect(out IntPtr aJSContext, nsIURI aTargetURI, [MarshalAs(UnmanagedType.LPStr)] out string aClassName, [MarshalAs(UnmanagedType.LPStr)] string aProperty); + void CheckLoadURIFromScript(out IntPtr cx, nsIURI uri); + void CheckLoadURIWithPrincipal(nsIPrincipal aPrincipal, nsIURI uri, uint flags); + void CheckLoadURI(nsIURI from, nsIURI uri, uint flags); + void CheckLoadURIStr(nsACString from, nsACString uri, uint flags); + void CheckFunctionAccess(out IntPtr cx, out IntPtr funObj, IntPtr targetObj); + bool CanExecuteScripts(out IntPtr cx, nsIPrincipal principal); + nsIPrincipal GetSubjectPrincipal(); + nsIPrincipal GetSystemPrincipal(); + nsIPrincipal GetCertificatePrincipal(nsACString aCertFingerprint, nsACString aSubjectName, nsACString aPrettyName, nsISupports aCert, nsIURI aURI); + nsIPrincipal GetCodebasePrincipal(nsIURI aURI); + short RequestCapability(nsIPrincipal principal, [MarshalAs(UnmanagedType.LPStr)] out string capability); + bool IsCapabilityEnabled([MarshalAs(UnmanagedType.LPStr)] out string capability); + void EnableCapability([MarshalAs(UnmanagedType.LPStr)] string capability); + void RevertCapability([MarshalAs(UnmanagedType.LPStr)] string capability); + void DisableCapability([MarshalAs(UnmanagedType.LPStr)] string capability); + void SetCanEnableCapability(nsACString certificateFingerprint, [MarshalAs(UnmanagedType.LPStr)] out string capability, short canEnable); + nsIPrincipal GetObjectPrincipal(out IntPtr aJSContext, out IntPtr aJSObject); + bool SubjectPrincipalIsSystem(); + void CheckSameOrigin(out IntPtr aJSContext, nsIURI aTargetURI); + void CheckSameOriginURI(nsIURI aSourceURI, nsIURI aTargetURI); + void CheckSameOriginPrincipal(nsIPrincipal aSourcePrincipal, nsIPrincipal aTargetPrincipal); + nsIPrincipal GetPrincipalFromContext(out IntPtr aJSContext); + bool SecurityCompareURIs(nsIURI aSubjectURI, nsIURI aObjectURI); + #elif GECKO_1_9 + // nsIScriptSecurityManager: + void CheckPropertyAccess(out IntPtr aJSContext, out IntPtr aJSObject, [MarshalAs(UnmanagedType.LPStr)] string aClassName, IntPtr aProperty, uint aAction); // aProperty=jsval + void CheckConnect(out IntPtr aJSContext, nsIURI aTargetURI, [MarshalAs(UnmanagedType.LPStr)] string aClassName, [MarshalAs(UnmanagedType.LPStr)] string aProperty); + void CheckLoadURIFromScript(out IntPtr cx, nsIURI uri); + void CheckLoadURIWithPrincipal(nsIPrincipal aPrincipal, nsIURI uri, uint flags); + void CheckLoadURI(nsIURI from, nsIURI uri, uint flags); + void CheckLoadURIStrWithPrincipal(nsIPrincipal aPrincipal, nsACString uri, uint flags); + void CheckLoadURIStr(nsACString from, nsACString uri, uint flags); + void CheckFunctionAccess(out IntPtr cx, out IntPtr funObj, IntPtr targetObj); + bool CanExecuteScripts(out IntPtr cx, nsIPrincipal principal); + nsIPrincipal GetSubjectPrincipal(); + nsIPrincipal GetSystemPrincipal(); + nsIPrincipal GetCertificatePrincipal(nsACString aCertFingerprint, nsACString aSubjectName, nsACString aPrettyName, nsISupports aCert, nsIURI aURI); + nsIPrincipal GetCodebasePrincipal(nsIURI aURI); + short RequestCapability(nsIPrincipal principal, [MarshalAs(UnmanagedType.LPStr)] string capability); + bool IsCapabilityEnabled([MarshalAs(UnmanagedType.LPStr)] string capability); + void EnableCapability([MarshalAs(UnmanagedType.LPStr)] string capability); + void RevertCapability([MarshalAs(UnmanagedType.LPStr)] string capability); + void DisableCapability([MarshalAs(UnmanagedType.LPStr)] string capability); + void SetCanEnableCapability(nsACString certificateFingerprint, [MarshalAs(UnmanagedType.LPStr)] string capability, short canEnable); + nsIPrincipal GetObjectPrincipal(out IntPtr cx, out IntPtr aJSObject); + bool SubjectPrincipalIsSystem(); + void CheckSameOrigin(out IntPtr aJSContext, nsIURI aTargetURI); + void CheckSameOriginURI(nsIURI aSourceURI, nsIURI aTargetURI, bool reportError); + nsIPrincipal GetPrincipalFromContext(out IntPtr cx); + nsIPrincipal GetChannelPrincipal(IntPtr aChannel); // nsIChannel + bool IsSystemPrincipal(nsIPrincipal aPrincipal); + nsIPrincipal GetCxSubjectPrincipal(IntPtr cx); // JSContext + #if GECKO_1_9_1 + nsIPrincipal getCxSubjectPrincipalAndFrame(IntPtr cx, out IntPtr fp); + #endif + #endif } - - /// <summary> - /// Create a AutoJSContext using the SafeJSContext. - /// </summary> - public AutoJSContext() : this(IntPtr.Zero) + + #if GECKO_1_8 + [Guid("fb9ddeb9-26f9-46b8-85d5-3978aaee05aa"), ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] + #elif GECKO_1_9 + [Guid("b8268b9a-2403-44ed-81e3-614075c92034"), ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] + #endif + interface nsIPrincipal { + // nsISerializable: + void Read(IntPtr aInputStream); // nsIObjectInputStream + void Write(IntPtr aOutputStream); // nsIObjectOutputStream + + // nsIPrincipal: + void GetPreferences(out string prefBranch, out string id, out string subjectName, out string grantedList, out string deniedList); + bool Equals(nsIPrincipal other); + uint GetHashValue(); + IntPtr GetJSPrincipals(IntPtr aJSContext); // returns: JSPrincipals + IntPtr GetSecurityPolicy(); + IntPtr SetSecurityPolicy(); + short CanEnableCapability(out string capability); + void SetCanEnableCapability(out string capability, short canEnable); + bool IsCapabilityEnabled(out string capability, out IntPtr annotation); + void EnableCapability(out string capability, IntPtr annotation); + void RevertCapability(out string capability, IntPtr annotation); + void DisableCapability(out string capability, IntPtr annotation); + nsIURI GetURI(); + nsIURI GetDomain(); + void SetDomain(nsIURI aDomain); + [return: MarshalAs(UnmanagedType.LPStr)] string GetOrigin(); + bool GetHasCertificate(); + void GetFingerprint(nsACString aFingerprint); + void GetPrettyName(nsACString aPrettyName); + bool Subsumes(nsIPrincipal other); + #if GECKO_1_9 + void CheckMayLoad(nsIURI uri, bool report); + #endif + void GetSubjectName(nsACString aSubjectName); + nsISupports GetCertificate(); } - - /// <summary> - /// Evaluate javascript in the current context. - /// </summary> - /// <param name="jsScript"></param> - /// <param name="jsval"></param> - /// <returns></returns> - public bool EvaluateScript(string jsScript, out string result) + + [Guid("e7d09265-4c23-4028-b1b0-c99e02aa78f8"), ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] + interface nsIJSRuntimeService { - var ptr = new JsVal(); - IntPtr globalObject = SpiderMonkey.JS_GetGlobalForScopeChain(_cx); - bool ret = SpiderMonkey.JS_EvaluateScript(_cx, globalObject, jsScript, (uint)jsScript.Length, "script", 1, ref ptr); - - IntPtr jsStringPtr = SpiderMonkey.JS_ValueToString(_cx, ptr); - result = Marshal.PtrToStringAnsi(SpiderMonkey.JS_EncodeString(_cx, jsStringPtr)); - return ret; - } - + IntPtr GetRuntime(); + IntPtr GetBackstagePass(); // nsIXPCScriptable + } + + #if GECKO_1_8 + [StructLayout(LayoutKind.Sequential)] + struct JSStackFrame + { + IntPtr callobj; /* lazily created Call object */ + IntPtr argsobj; /* lazily created arguments object */ + IntPtr varobj; /* variables object, where vars go */ + public IntPtr script; /* script being interpreted */ + IntPtr fun; /* function being called or null */ + IntPtr thisp; /* "this" pointer if in method */ + IntPtr argc; /* actual argument count */ + IntPtr argv; /* base of argument stack slots */ + int rval; /* function return value */ + uint nvars; /* local variable count */ + IntPtr vars; /* base of variable stack slots */ + public IntPtr down; /* previous frame */ + IntPtr annotation; /* used by Java security */ + IntPtr scopeChain; /* scope chain */ + IntPtr pc; /* program counter */ + IntPtr sp; /* stack pointer */ + IntPtr spbase; /* operand stack base */ + uint sharpDepth; /* array/object initializer depth */ + IntPtr sharpArray; /* scope for #n= initializer vars */ + uint flags; /* frame flags -- see below */ + IntPtr dormantNext; /* next dormant frame chain */ + IntPtr xmlNamespace; /* null or default xml namespace in E4X */ + IntPtr blockChain; /* active compile-time block scopes */ + } + #elif GECKO_1_9_1 + [StructLayout(LayoutKind.Sequential)] + struct JSStackFrame + { + IntPtr regs; + IntPtr imacpc; /* null or interpreter macro call pc */ + IntPtr slots; /* variables, locals and operand stack */ + IntPtr callobj; /* lazily created Call object */ + IntPtr argsobj; /* lazily created arguments object */ + IntPtr varobj; /* variables object, where vars go */ + IntPtr callee; /* function or script object */ + public IntPtr script; /* script being interpreted */ + IntPtr fun; /* function being called or null */ + IntPtr thisp; /* "this" pointer if in method */ + uint argc; /* actual argument count */ + IntPtr argv; /* base of argument stack slots */ + IntPtr rval; /* function return value */ + public IntPtr down; /* previous frame */ + IntPtr annotation; /* used by Java security */ + IntPtr scopeChain; + IntPtr blockChain; + uint sharpDepth; /* array/object initializer depth */ + IntPtr sharpArray; /* scope for #n= initializer vars */ + uint flags; /* frame flags -- see below */ + IntPtr dormantNext; /* next dormant frame chain */ + IntPtr xmlNamespace; /* null or default xml namespace in E4X */ + IntPtr displaySave; /* previous value of display entry for script->staticLevel */ + } + #elif GECKO_1_9 + [StructLayout(LayoutKind.Sequential)] + struct JSStackFrame + { + IntPtr regs; + IntPtr spbase; /* operand stack base */ + IntPtr callobj; /* lazily created Call object */ + IntPtr argsobj; /* lazily created arguments object */ + IntPtr varobj; /* variables object, where vars go */ + IntPtr callee; /* function or script object */ + public IntPtr script; /* script being interpreted */ + IntPtr fun; /* function being called or null */ + IntPtr thisp; /* "this" pointer if in method */ + IntPtr argc; /* actual argument count */ + IntPtr argv; /* base of argument stack slots */ + int rval; /* function return value */ + uint nvars; /* local variable count */ + IntPtr vars; /* base of variable stack slots */ + public IntPtr down; /* previous frame */ + IntPtr annotation; /* used by Java security */ + IntPtr scopeChain; /* scope chain */ + uint sharpDepth; /* array/object initializer depth */ + IntPtr sharpArray; /* scope for #n= initializer vars */ + uint flags; /* frame flags -- see below */ + IntPtr dormantNext; /* next dormant frame chain */ + IntPtr xmlNamespace; /* null or default xml namespace in E4X */ + IntPtr blockChain; /* active compile-time block scopes */ + + IntPtr pcDisabledSave; // reserved for debug use + } + #endif + #endregion + + #region Native Members + + [DllImport("js3250", CharSet=CharSet.Ansi)] + static extern IntPtr JS_CompileScriptForPrincipals(IntPtr aJSContext, IntPtr aJSObject, IntPtr aJSPrincipals, string bytes, int length, string filename, int lineNumber); + + [DllImport("js3250")] + static extern IntPtr JS_GetGlobalObject(IntPtr aJSContext); + + [DllImport("js3250")] + static extern IntPtr JS_NewContext(IntPtr aJSRuntime, int stackchunksize); + + [DllImport("js3250")] + static extern void JS_DestroyContextNoGC(IntPtr cx); + + [DllImport("js3250")] + static extern IntPtr JS_BeginRequest(IntPtr cx); + + [DllImport("js3250")] + static extern IntPtr JS_EndRequest(IntPtr cx); + #endregion + + public AutoJSContext() + { + // obtain the JS runtime used by gecko + nsIJSRuntimeService runtimeService = (nsIJSRuntimeService)Xpcom.GetService("@mozilla.org/js/xpc/RuntimeService;1"); + IntPtr jsRuntime = runtimeService.GetRuntime(); + + // create a new JSContext + cx = JS_NewContext(jsRuntime, 8192); + + // begin a new request + JS_BeginRequest(cx); + + // push the context onto the context stack + nsIJSContextStack contextStack = Xpcom.GetService<nsIJSContextStack>("@mozilla.org/js/xpc/ContextStack;1"); + contextStack.Push(cx); + + // obtain the system principal (no security checks) which we will use when compiling the empty script below + nsIPrincipal system = Xpcom.GetService<nsIScriptSecurityManager>("@mozilla.org/scriptsecuritymanager;1").GetSystemPrincipal(); + IntPtr jsPrincipals = system.GetJSPrincipals(cx); + + // create a fake stack frame + JSStackFrame frame = new JSStackFrame(); + frame.script = JS_CompileScriptForPrincipals(cx, JS_GetGlobalObject(cx), jsPrincipals, "", 0, "", 1); + + // put a pointer to the fake stack frame on the JSContext + + // frame.down = cx->fp + IntPtr old = Marshal.ReadIntPtr(cx, OfsetOfFP); + frame.down = old; + + IntPtr framePtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(JSStackFrame))); + Marshal.StructureToPtr(frame, framePtr, true); + + // cx->fp = framePtr; + Marshal.WriteIntPtr(cx, OfsetOfFP, framePtr); + } + + //NOTE: these hard-coded field offsets are based on the unmanaged layout of JSContext objects. this will + // probably not work for versions other than 1.8, 1.9 and 1.9.1 + #if GECKO_1_9_1 + const int OfsetOfFP = 0x98; + #elif GECKO_1_9 + const int OfsetOfFP = 0x54; + #elif GECKO_1_8 + const int OfsetOfFP = 0x34; + #endif + + IntPtr cx; + public void Dispose() { - _securityManager.PopContextPrincipal(_cx); + nsIJSContextStack contextStack = Xpcom.GetService<nsIJSContextStack>("@mozilla.org/js/xpc/ContextStack;1"); + contextStack.Pop(); - _contextStack.Pop(); - SpiderMonkey.JS_EndRequest(_cx); + // free the memory allocated for the fake stack frame + Marshal.FreeHGlobal(Marshal.ReadIntPtr(cx, OfsetOfFP)); + + // end the request, destroy the context + JS_EndRequest(cx); + JS_DestroyContextNoGC(cx); } } } Deleted: trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/BaseNsFactory.cs =================================================================== --- trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/BaseNsFactory.cs 2012-07-16 20:51:13 UTC (rev 4505) +++ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/BaseNsFactory.cs 2012-07-26 21:25:33 UTC (rev 4506) @@ -1,124 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Runtime.InteropServices; -using System.Text; - -namespace Gecko -{ - public class BaseNsFactory<TFactory> - where TFactory:nsIFactory, new() - { - // If you are using resharper it will generate warning because - // BaseNsFactory<T1>._isRegistered and BaseNsFactory<T2>._isRegistered are different fields - // but for us this is good :) -// ReSharper disable StaticFieldInGenericType - private static bool _isRegistered; - private static string _contractID; - private static string _factoryTypeName; -// ReSharper restore StaticFieldInGenericType - - protected BaseNsFactory() - { - - } - - /// <summary> - /// Registration by default (using ContractIDAttribute) - /// </summary> - public static void Register() - { - if (_isRegistered) return; - - var factoryType = typeof (TFactory); - var attributes = factoryType.GetCustomAttributes( typeof (ContractIDAttribute), true ); - if (attributes.Length > 0) - { - ContractIDAttribute attribute = (ContractIDAttribute)attributes[ 0 ]; - _contractID = attribute.ContractID; - _factoryTypeName = factoryType.FullName; - try - { - Xpcom.RegisterFactory( - factoryType.GUID, - _factoryTypeName, - _contractID, - new TFactory()); - } - catch ( Exception ) - { - // - } - - _isRegistered = true; - } - } - - /// <summary> - /// Registration with given contractID - /// </summary> - /// <param name="contractID"></param> - public static void Register(string contractID) - { - if ( _isRegistered ) return; - - var factoryType = typeof (TFactory); - _factoryTypeName = factoryType.FullName; - Xpcom.RegisterFactory(factoryType.GUID,_factoryTypeName,_contractID,new TFactory() ); - _contractID = contractID; - _isRegistered = true; - } - - /// <summary> - /// Returns ContractID if registered or null if not registered. - /// </summary> - /// <returns></returns> - public static string GetContractID() - { - return _contractID; - } - - public static string GetFactoryTypeName() - { - return _factoryTypeName; - } - } - - public sealed class ContractIDAttribute - :Attribute - { - public readonly string ContractID; - - public ContractIDAttribute(string contractID) - { - ContractID = contractID; - } - } - - public class GenericOneClassNsFactory<TFactory,TType> - : BaseNsFactory<TFactory>,nsIFactory - where TFactory:nsIFactory, new() - where TType:new() - { - - protected virtual IntPtr Create( nsISupports aOuter, ref Guid iid ) - { - IntPtr result = IntPtr.Zero; - IntPtr iUnknownForObject = Marshal.GetIUnknownForObject(new TType()); - Marshal.QueryInterface(iUnknownForObject, ref iid, out result); - Marshal.Release(iUnknownForObject); - return result; - } - - public IntPtr CreateInstance( nsISupports aOuter, ref Guid iid ) - { - return Create( aOuter, ref iid ); - } - - public void LockFactory( bool @lock ) - { - - } - } - -} Deleted: trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ByteArrayInputStream.cs =================================================================== --- trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ByteArrayInputStream.cs 2012-07-16 20:51:13 UTC (rev 4505) +++ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ByteArrayInputStream.cs 2012-07-26 21:25:33 UTC (rev 4506) @@ -1,84 +0,0 @@ -using System; -using System.Runtime.InteropServices; - -namespace Gecko -{ - /// <summary> - /// Streams a byte array using nsIInputStream. - /// </summary> - #region class ByteArrayInputStream : nsIInputStream - public class ByteArrayInputStream : nsIInputStream - { - private ByteArrayInputStream(byte[] data) - { - Data = data; - } - - public static ByteArrayInputStream Create(byte[] data) - { - return (data == null) ? null : new ByteArrayInputStream(data); - } - - byte[] Data; - int Position; - - #region nsIInputStream Members - - public void Close() - { - // do nothing - } - - public uint Available() - { - return (uint)(Data.Length - Position); - } - - public uint Read(IntPtr aBuf, uint aCount) - { - uint count = Math.Min(aCount, Available()); - - if (count > 0) - { - Marshal.Copy(Data, Position, aBuf, (int)count); -#if DEBUG - for (int i = 0; i < count; ++i) - { - Console.WriteLine((char)Marshal.ReadByte(aBuf, i)); - } -#endif - Position += (int)count; - } - - return count; - } - - public unsafe uint ReadSegments(nsWriteSegmentFun aWriter, IntPtr aClosure, uint aCount) - { - int length = (int)Math.Min(aCount, Available()); - int writeCount = 0; - - if (length > 0) - { - nsWriteSegmentFun fun = aWriter; - - fixed (byte* data = &Data[Position]) - { - fun(this, aClosure, (IntPtr)data, Position, length, out writeCount); - } - - Position += writeCount; - } - - return (uint)writeCount; - } - - public bool IsNonBlocking() - { - return true; - } - - #endregion - } - #endregion - } \ No newline at end of file Modified: trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ChromeDialog.Designer.cs =================================================================== --- trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ChromeDialog.Designer.cs 2012-07-16 20:51:13 UTC (rev 4505) +++ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ChromeDialog.Designer.cs 2012-07-26 21:25:33 UTC (rev 4506) @@ -1,4 +1,4 @@ -namespace Gecko +namespace Skybound.Gecko { partial class ChromeDialog { @@ -28,21 +28,19 @@ /// </summary> private void InitializeComponent() { - this.webBrowser = new Gecko.GeckoWebBrowser(); + this.webBrowser = new Skybound.Gecko.GeckoWebBrowser(); this.SuspendLayout(); // // webBrowser // - this.webBrowser.DisableWmImeSetContext = false; this.webBrowser.Dock = System.Windows.Forms.DockStyle.Fill; this.webBrowser.Location = new System.Drawing.Point(0, 0); this.webBrowser.Name = "webBrowser"; this.webBrowser.Size = new System.Drawing.Size(500, 353); this.webBrowser.TabIndex = 0; - this.webBrowser.UseHttpActivityObserver = false; - this.webBrowser.WindowClosed += new System.EventHandler(this.webBrowser_WindowClosed); - this.webBrowser.WindowSetBounds += new System.EventHandler<Gecko.GeckoWindowSetBoundsEventArgs>(this.webBrowser_WindowSetBounds); + this.webBrowser.WindowSetBounds += new Skybound.Gecko.GeckoWindowSetBoundsEventHandler(this.webBrowser_WindowSetBounds); this.webBrowser.DocumentTitleChanged += new System.EventHandler(this.webBrowser_DocumentTitleChanged); + this.webBrowser.WindowClosed += new System.EventHandler(this.webBrowser_WindowClosed); // // ChromeDialog // Modified: trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ChromeDialog.cs =================================================================== --- trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ChromeDialog.cs 2012-07-16 20:51:13 UTC (rev 4505) +++ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ChromeDialog.cs 2012-07-26 21:25:33 UTC (rev 4506) @@ -6,7 +6,7 @@ using System.Text; using System.Windows.Forms; -namespace Gecko +namespace Skybound.Gecko { public partial class ChromeDialog : Form { @@ -34,6 +34,5 @@ { this.Close(); } - } } \ No newline at end of file Deleted: trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ChromeDialog.resources =================================================================== (Binary files differ) Modified: trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ConfirmDialog.Designer.cs =================================================================== --- trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ConfirmDialog.Designer.cs 2012-07-16 20:51:13 UTC (rev 4505) +++ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ConfirmDialog.Designer.cs 2012-07-26 21:25:33 UTC (rev 4506) @@ -1,7 +1,7 @@ using System.Windows.Forms; using System.ComponentModel; using System.Drawing; -namespace Gecko +namespace Skybound.Gecko { partial class ConfirmDialog { Modified: trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ConfirmDialog.cs =================================================================== --- trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ConfirmDialog.cs 2012-07-16 20:51:13 UTC (rev 4505) +++ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ConfirmDialog.cs 2012-07-26 21:25:33 UTC (rev 4506) @@ -38,7 +38,7 @@ using System.Drawing; using System.Windows.Forms; -namespace Gecko +namespace Skybound.Gecko { partial class ConfirmDialog : Form { Deleted: trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ConfirmDialog.resources =================================================================== (Binary files differ) Deleted: trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ConsoleMessageEventArgs.cs =================================================================== --- trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ConsoleMessageEventArgs.cs 2012-07-16 20:51:13 UTC (rev 4505) +++ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ConsoleMessageEventArgs.cs 2012-07-26 21:25:33 UTC (rev 4506) @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Gecko -{ - public class ConsoleMessageEventArgs : EventArgs - { - public string Message { get; protected set; } - - public ConsoleMessageEventArgs( string message ) - { - Message = message; - } - } -} Deleted: trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Contracts.cs =================================================================== --- trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Contracts.cs 2012-07-16 20:51:13 UTC (rev 4505) +++ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Contracts.cs 2012-07-26 21:25:33 UTC (rev 4506) @@ -1,79 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Gecko -{ - public static class Contracts - { - #region contracts for elements that HAVE wrappers - #region Network - internal static readonly string DnsService = "@mozilla.org/network/dns-service;1"; - internal static readonly string StreamListenerTee = "@mozilla.org/network/stream-listener-tee;1"; - public static readonly string CacheService = "@mozilla.org/network/cache-service;1"; - public static readonly string NetworkIOService = "@mozilla.org/network/io-service;1"; - internal static readonly string HttpActivityDistributor = "@mozilla.org/network/http-activity-distributor;1"; - #endregion - #region Security - public static readonly string X509CertDb = "@mozilla.org/security/x509certdb;1"; - public static readonly string RandomGenerator = "@mozilla.org/security/random-generator;1"; - public static readonly string KeyObjectFactory = "@mozilla.org/security/keyobjectfactory;1"; - public static readonly string Hash = "@mozilla.org/security/hash;1"; - #endregion - #region AppShell - public static readonly string AppShellService = "@mozilla.org/appshell/appShellService;1"; - public static readonly string WindowMediator = "@mozilla.org/appshell/window-mediator;1"; - #endregion - #region Image - public static readonly string ImageCache = "@mozilla.org/image/cache;1"; - public static readonly string ImageContainer = "@mozilla.org/image/container;1"; - #endregion - - public static readonly string WindowWatcher = "@mozilla.org/embedcomp/window-watcher;1"; - public static readonly string WritableVariant = "@mozilla.org/variant;1"; - public static readonly string ... [truncated message content] |
From: <dos...@us...> - 2012-07-16 20:51:19
|
Revision: 4505 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4505&view=rev Author: doskabouter Date: 2012-07-16 20:51:13 +0000 (Mon, 16 Jul 2012) Log Message: ----------- Gecko: fix for zoom issue Modified Paths: -------------- trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoWebBrowser.cs Modified: trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoWebBrowser.cs =================================================================== --- trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoWebBrowser.cs 2012-07-16 20:16:48 UTC (rev 4504) +++ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoWebBrowser.cs 2012-07-16 20:51:13 UTC (rev 4505) @@ -1075,8 +1075,8 @@ public GeckoMarkupDocumentViewer GetMarkupDocumentViewer() { - if (_MarkupDocumentViewer != null) - return _MarkupDocumentViewer; + //if (_MarkupDocumentViewer != null) + //return _MarkupDocumentViewer; if (WebNav == null) return null; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dos...@us...> - 2012-07-16 20:17:12
|
Revision: 4504 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4504&view=rev Author: doskabouter Date: 2012-07-16 20:16:48 +0000 (Mon, 16 Jul 2012) Log Message: ----------- BrowseTheWeb based on geckofx-13 Modified Paths: -------------- trunk/plugins/BrowseTheWeb/Release/Files/xulrunner.zip trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.sln Added Paths: ----------- trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/geckofx-13.dll trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/AppShellService.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/AutoJSContext.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/BaseNsFactory.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/BaseTypes/ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/BaseTypes/TextBoundaryType.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/BaseTypes/gfxContext.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/BaseTypes/gfxGraphicsFilter.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/BaseTypes/gfxMatrix.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/BaseTypes/gfxRect.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/BaseTypes/nsConstRect.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/BaseTypes/nsIntRect.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/BaseTypes/nscolor.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ByteArrayInputStream.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Cache/ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Cache/CacheDeviceInfo.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Cache/CacheEntryDescriptor.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Cache/CacheEntryInfo.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Cache/CacheService.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Cache/CacheSession.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Cache/ImageCache.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Certificates/ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Certificates/ASN1Object.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Certificates/ASN1Tree.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Certificates/CertCache.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Certificates/CertTree.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Certificates/CertTreeItem.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Certificates/Certificate.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Certificates/CertificateDatabase.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Certificates/CertificateList.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Certificates/CertificateValidity.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ChromeDialog.Designer.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ChromeDialog.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ChromeDialog.resources trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ChromeDialog.resx trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ClassDiagrams/ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ClassDiagrams/nsIDOMNode.cd trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Collections/ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Collections/GeckoArray.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Collections/GeckoCollectionsHelper.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Collections/GeckoEnumerableCollection.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Collections/GeckoEnumerator.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Collections/StringEnumerator.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ConfirmDialog.Designer.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ConfirmDialog.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ConfirmDialog.resources trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ConfirmDialog.resx trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/ConsoleMessageEventArgs.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Contracts.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Cryptography/ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Cryptography/CryptoHash.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Cryptography/Enums.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Cryptography/KeyObject.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Cryptography/KeyObjectFactory.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/CustomMarshalers/ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/CustomMarshalers/WStringMarshaler.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/DOMSelector.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/DocumentFragment.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/DomCharacterData.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/DomDocumentType.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/DomNavigator.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/GeckoAttribute.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/GeckoComment.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/GeckoDomDocument.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/GeckoElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/GeckoElementCollection.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/GeckoElementEnumerable.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/GeckoNamedNodeMap.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/GeckoNode.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/GeckoNodeCollection.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/GeckoNodeEnumerable.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/GeckoStyle.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/GeckoTextNode.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/HTMLMediaElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/GeckoDocument.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/GeckoHtmlElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/GeckoHtmlElementCollection.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLAnchorElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLAppletElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLAreaElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLBRElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLBaseElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLBaseFontElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLBodyElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLButtonElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLCanvasElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLDListElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLDirectoryElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLDivElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLEmbedElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLFieldSetElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLFontElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLFormElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLFrameElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLFrameSetElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLHRElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLHeadElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLHeadingElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLHtmlElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLIFrameElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLImageElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLInputElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLLIElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLLabelElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLLegendElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLLinkElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLMapElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLMenuElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLMetaElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLModElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLOListElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLObjectElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLOptGroupElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLOptionElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLOptionsCollection.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLParagraphElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLParamElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLPreElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLQuoteElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLScriptElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLSelectElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLStyleElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLTableCaptionElem.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLTableCellElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLTableColElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLTableElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLTableRowElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLTableSectionElem.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLTextAreaElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLTitleElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Html/HTMLUListElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/NodeType.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Svg/ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Svg/SvgDocument.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Svg/SvgElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Svg/SvgSvgElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/WindowUtils.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Xul/ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/DOM/Xul/XulElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoDomEvents.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoElementExtensions.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoException.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoFX.snk trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoHelperAppLauncherDialog.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoHistoryEntry.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoMIMEInputStream.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoMarkupDocumentViewer.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoMessageEvents.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoMouseButton.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoPreferences.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoResponse.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoSelection.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoWebBrowser.Events.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoWebBrowser.GTK.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoWebBrowser.WinForms.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoWebBrowser.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoWindow.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/GeckoWrapperCache.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/Components/ trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/IJSDebugger.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/ISimpleDOMDocument.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/ISimpleDOMNode.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/ISimpleDOMText.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/LoginManagerPrompter.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/SessionStore.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/TestScriptable.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/amIInstallTrigger.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/amIWebInstallListener.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/amIWebInstaller.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/b2g.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/domstubs.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/extIApplication.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/fuelIApplication.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/imgICache.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/imgIContainer.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/imgIContainerDebug.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/imgIContainerObserver.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/imgIDecoderObserver.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/imgIEncoder.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/imgILoader.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/imgIRequest.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/imgITools.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/inICSSValueSearch.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/inIDOMUtils.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/inIDOMView.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/inIDeepTreeWalker.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/inIFlasher.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/inISearchObserver.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/inISearchProcess.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/jsdIDebuggerService.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/mozIAsyncFavicons.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/mozIAsyncHistory.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/mozIAsyncLivemarks.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/mozIJSSubScriptLoader.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/mozIPersonalDictionary.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/mozIPlacesAutoComplete.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/mozISpellCheckingEngine.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/mozISpellI18NManager.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/mozISpellI18NUtil.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/mozIStorageAggregateFunction.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/mozIStorageAsyncStatement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/mozIStorageBaseStatement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/mozIStorageBindingParams.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/mozIStorageBindingParamsArray.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/mozIStorageCompletionCallback.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/mozIStorageConnection.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/mozIStorageError.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/mozIStorageFunction.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/mozIStoragePendingStatement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/mozIStorageProgressHandler.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/mozIStorageResultSet.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/mozIStorageRow.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/mozIStorageService.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/mozIStorageServiceQuotaManagement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/mozIStorageStatement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/mozIStorageStatementCallback.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/mozIStorageStatementWrapper.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/mozIStorageVacuumParticipant.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/mozIStorageValueArray.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/mozITXTToHTMLConv.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/mozIThirdPartyUtil.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsCDefaultURIFixup.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsCExternalHandlerService.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsCURILoader.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsCWebBrowser.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsCWebBrowserPersist.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsGtkQtIconsConverter.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIASN1Object.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIASN1PrintableItem.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIASN1Sequence.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIASN1Tree.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAboutModule.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAccessible.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAccessibleApplication.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAccessibleCursorable.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAccessibleDocument.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAccessibleEditableText.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAccessibleEvent.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAccessibleHyperLink.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAccessibleHyperText.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAccessibleImage.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAccessiblePivot.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAccessibleProvider.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAccessibleRelation.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAccessibleRetrieval.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAccessibleRole.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAccessibleSelectable.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAccessibleStates.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAccessibleTable.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAccessibleText.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAccessibleTypes.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAccessibleValue.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAlertsService.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAndroidBridge.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAnnotationService.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAppShell.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAppShellService.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAppStartup.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAppleFileDecoder.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIApplicationCache.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIApplicationCacheChannel.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIApplicationCacheContainer.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIApplicationCacheService.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIArray.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAssociatedContentSecurity.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAsyncInputStream.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAsyncOutputStream.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAsyncStreamCopier.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAsyncVerifyRedirectCallback.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAtom.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAtomService.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAudioManager.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAuthInformation.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAuthModule.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAuthPrompt.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAuthPrompt2.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAuthPromptAdapterFactory.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAuthPromptCallback.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAuthPromptProvider.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAutoCompleteController.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAutoCompleteInput.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAutoCompleteListener.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAutoCompletePopup.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAutoCompleteResult.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAutoCompleteResults.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAutoCompleteSearch.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAutoCompleteSession.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAutoCompleteSimpleResult.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIAutoConfig.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIBFCacheEntry.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIBadCertListener2.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIBaseWindow.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIBidiKeyboard.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIBinaryInputStream.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIBinaryOutputStream.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIBlocklistService.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIBoxObject.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIBrowserBoxObject.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIBrowserDOMWindow.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIBrowserGlue.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIBrowserHandler.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIBrowserHistory.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIBrowserProfileMigrator.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIBrowserSearchService.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIBufEntropyCollector.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIBufferedStreams.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIByteRangeRequest.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICMSDecoder.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICMSEncoder.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICMSMessage.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICMSMessage2.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICMSMessageErrors.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICMSSecureMessage.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICRLInfo.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICRLManager.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICache.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICacheEntryDescriptor.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICacheInfoChannel.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICacheListener.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICacheService.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICacheSession.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICacheVisitor.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICachingChannel.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICancelable.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICanvasGLPrivate.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICapturePicker.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICategoryManager.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICertOverrideService.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICertPickDialogs.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICertTree.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICertificateDialogs.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIChannel.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIChannelEventSink.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIChannelPolicy.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICharsetConverterManager.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIChildChannel.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIChromeRegistry.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIClassInfo.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIClientAuthDialogs.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIClipboard.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIClipboardCommands.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIClipboardDragDropHookList.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIClipboardDragDropHooks.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIClipboardHelper.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIClipboardOwner.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICollation.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICollection.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICommandHandler.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICommandLine.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICommandLineHandler.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICommandLineRunner.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICommandLineValidator.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICommandManager.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICommandParams.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIComponentManager.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIComponentRegistrar.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIConsoleListener.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIConsoleMessage.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIConsoleService.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIContainerBoxObject.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIContentDispatchChooser.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIContentFilter.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIContentHandler.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIContentPermissionPrompt.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIContentPolicy.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIContentPrefService.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIContentSecurityPolicy.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIContentSniffer.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIContentURIGrouper.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIContentViewer.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIContentViewerContainer.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIContentViewerEdit.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIContentViewerFile.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIContextMenuListener.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIContextMenuListener2.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIController.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIControllerCommand.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIControllerCommandTable.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIControllerContext.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIControllers.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIConverterInputStream.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIConverterOutputStream.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICookie.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICookie2.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICookieAcceptDialog.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICookieManager.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICookieManager2.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICookiePermission.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICookiePromptService.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICookieService.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICrashReporter.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICryptoFIPSInfo.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICryptoHMAC.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICryptoHash.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICurrentCharsetListener.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsICycleCollectorListener.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDNSListener.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDNSRecord.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDNSRequest.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDNSService.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMAnimationEvent.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMApplicationRegistry.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMAttr.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMBarProp.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMBatteryManager.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMBeforeUnloadEvent.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMBluetoothAdapter.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMCDATASection.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMCRMFObject.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMCSS2Properties.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMCSSCharsetRule.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMCSSFontFaceRule.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMCSSImportRule.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMCSSMediaRule.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMCSSMozDocumentRule.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMCSSPageRule.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMCSSPrimitiveValue.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMCSSRule.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMCSSRuleList.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMCSSStyleDeclaration.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMCSSStyleRule.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMCSSStyleSheet.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMCSSUnknownRule.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMCSSValue.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMCSSValueList.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMCallEvent.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMCanvasRenderingContext2D.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMCaretPosition.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMCharacterData.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMChromeWindow.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMClientInformation.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMClientRect.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMClientRectList.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMCloseEvent.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMCommandEvent.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMComment.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMCompositionEvent.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMConnection.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMConstructor.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMContactManager.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMContactProperties.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMCounter.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMCrypto.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMCryptoDialogs.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMCustomEvent.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMDOMError.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMDOMException.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMDOMImplementation.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMDOMLocator.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMDOMRequest.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMDOMSettableTokenList.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMDOMStringList.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMDOMStringMap.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMDOMTokenList.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMDataContainerEvent.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMDataTransfer.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMDesktopNotification.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMDeviceMotionEvent.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMDeviceOrientationEvent.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMDocument.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMDocumentFragment.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMDocumentType.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMDocumentXBL.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMDragEvent.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMElementCSSInlineStyle.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMElementTimeControl.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMEvent.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMEventListener.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMEventTarget.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMFile.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMFileException.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMFileList.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMFileReader.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMFontFace.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMFontFaceList.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMFormData.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMGeoGeolocation.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMGeoPosition.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMGeoPositionAddress.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMGeoPositionCallback.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMGeoPositionCoords.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMGeoPositionError.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMGeoPositionErrorCallback.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMGeoPositionOptions.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMGetSVGDocument.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMGlobalPropertyInitializer.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLAnchorElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLAppletElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLAreaElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLAudioElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLBRElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLBaseElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLBodyElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLButtonElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLByteRanges.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLCanvasElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLCollection.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLCommandElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLDListElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLDataListElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLDirectoryElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLDivElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLDocument.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLEmbedElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLFieldSetElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLFontElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLFormElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLFrameElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLFrameSetElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLHRElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLHeadElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLHeadingElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLHtmlElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLIFrameElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLImageElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLInputElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLLIElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLLabelElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLLegendElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLLinkElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLMapElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLMediaElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLMenuElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLMenuItemElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLMetaElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLModElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLOListElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLObjectElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLOptGroupElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLOptionElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLOptionsCollection.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLOutputElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLParagraphElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLParamElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLPreElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLProgressElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLQuoteElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLScriptElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLSelectElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLSourceElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLStyleElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLTableCaptionElem.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLTableCellElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLTableColElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLTableElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLTableRowElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLTableSectionElem.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLTextAreaElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLTitleElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLUListElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLUnknownElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHTMLVideoElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHashChangeEvent.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMHistory.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMJSWindow.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMKeyEvent.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMLSProgressEvent.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMLinkStyle.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMLoadStatus.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMLocation.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMMediaError.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMMediaList.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMMediaQueryList.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMMessageEvent.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMMimeType.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMMimeTypeArray.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMModalContentWindow.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMMouseEvent.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMMouseScrollEvent.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMMozBrowserFrame.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMMozCSSKeyframeRule.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMMozCSSKeyframesRule.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMMozTouchEvent.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMMutationEvent.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMNSEditableElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMNSElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMNSEvent.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMNSRGBAColor.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMNSXPathExpression.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMNamedNodeMap.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMNavigator.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMNavigatorBattery.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMNavigatorBluetooth.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMNavigatorDesktopNotification.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMNavigatorGeolocation.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMNavigatorNetwork.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMNavigatorSms.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMNavigatorTelephony.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMNode.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMNodeFilter.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMNodeIterator.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMNodeList.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMNodeSelector.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMNotifyAudioAvailableEvent.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMNotifyPaintEvent.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMOfflineResourceList.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMPageTransitionEvent.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMPaintRequest.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMPaintRequestList.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMParser.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMPerformance.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMPerformanceNavigation.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMPerformanceTiming.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMPkcs11.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMPlugin.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMPluginArray.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMPopStateEvent.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMPopupBlockedEvent.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMPowerManager.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMProcessingInstruction.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMProgressEvent.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMRGBColor.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMRange.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMRect.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGAElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGAltGlyphElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGAngle.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGAnimPresAspRatio.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGAnimTransformList.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGAnimateElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGAnimateMotionElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGAnimateTransformElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGAnimatedAngle.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGAnimatedBoolean.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGAnimatedEnum.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGAnimatedInteger.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGAnimatedLength.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGAnimatedLengthList.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGAnimatedNumber.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGAnimatedNumberList.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGAnimatedPathData.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGAnimatedPoints.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGAnimatedRect.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGAnimatedString.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGAnimationElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGCircleElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGClipPathElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGDefsElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGDescElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGDocument.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGEllipseElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGEvent.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGException.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGFilterElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGFilters.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGFitToViewBox.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGForeignObjectElem.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGGElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGGradientElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGImageElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGLength.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGLengthList.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGLineElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGLocatable.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGMarkerElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGMaskElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGMatrix.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGMetadataElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGMpathElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGNumber.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGNumberList.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGPathElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGPathSeg.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGPathSegList.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGPatternElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGPoint.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGPointList.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGPolygonElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGPolylineElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGPresAspectRatio.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGRect.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGRectElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGSVGElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGScriptElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGSetElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGStopElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGStringList.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGStylable.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGStyleElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGSwitchElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGSymbolElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGTSpanElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGTests.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGTextContentElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGTextElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGTextPathElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGTextPositionElem.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGTitleElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGTransform.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGTransformList.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGTransformable.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGURIReference.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGUnitTypes.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGUseElement.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGViewSpec.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGZoomAndPan.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSVGZoomEvent.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMScreen.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMScrollAreaEvent.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSerializer.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSimpleGestureEvent.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSmartCardEvent.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSmsCursor.cs trunk/plugins/BrowseTheWeb/Source/Skybound.Gecko/Generated/nsIDOMSms... [truncated message content] |
From: <dos...@us...> - 2012-07-16 12:22:12
|
Revision: 4503 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4503&view=rev Author: doskabouter Date: 2012-07-16 12:22:05 +0000 (Mon, 16 Jul 2012) Log Message: ----------- release version 0.3.8 Modified Paths: -------------- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1 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/Skybound.Gecko.dll Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1 =================================================================== (Binary files differ) Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml =================================================================== --- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2012-07-16 11:15:51 UTC (rev 4502) +++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2012-07-16 12:22:05 UTC (rev 4503) @@ -1876,5 +1876,137 @@ </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> + </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.SkinEngine" /> + <SubSystemItem Name="MP.Config" /> + <SubSystemItem Name="MP.DB" /> + </Items> + </SubSystemsUsed> + </PluginDependencyItem> + </Items> + </PluginDependencies> + <GeneralInfo> + <Name>Browse The Web</Name> + <Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id> + <Author>Mark Koenig (kroko) 2010</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>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml</UpdateUrl> + <Version> + <Major>0</Major> + <Minor>3</Minor> + <Build>8</Build> + <Revision>0</Revision> + </Version> + <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / Webbrowser.</ExtensionDescription> + <VersionDescription>Fixed zoom issue, Added possibility for skinners to define the area of the statusbar and webbrowser control</VersionDescription> + <DevelopmentStatus>Stable</DevelopmentStatus> + <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1</OnlineLocation> + <ReleaseDate>2012-07-16T14:19:36.713895+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>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/browser1.jpg;https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/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 2012-07-16 11:15:51 UTC (rev 4502) +++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2012-07-16 12:22:05 UTC (rev 4503) @@ -304,14 +304,14 @@ <Version> <Major>0</Major> <Minor>3</Minor> - <Build>7</Build> + <Build>8</Build> <Revision>0</Revision> </Version> <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / Webbrowser.</ExtensionDescription> - <VersionDescription>Fixed toggle mouse option, added linkid to flash objects (performs a click in the middle of the object), added compatibility with MP 1.3.0 Alpha</VersionDescription> + <VersionDescription>Fixed zoom issue, Added possibility for skinners to define the area of the statusbar and webbrowser control</VersionDescription> <DevelopmentStatus>Stable</DevelopmentStatus> <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1</OnlineLocation> - <ReleaseDate>2012-07-01T21:15:38.2282677+02:00</ReleaseDate> + <ReleaseDate>2012-07-16T14:19:36.713895+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/Skybound.Gecko.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...> - 2012-07-16 11:16:00
|
Revision: 4502 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4502&view=rev Author: doskabouter Date: 2012-07-16 11:15:51 +0000 (Mon, 16 Jul 2012) Log Message: ----------- Added possibility for skinners to define the area of the statusbar and webbrowser control Modified Paths: -------------- trunk/plugins/BrowseTheWeb/Release/Skin/Default/browsetheweb.xml trunk/plugins/BrowseTheWeb/Release/Skin/DefaultWide/browsetheweb.xml trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs Modified: trunk/plugins/BrowseTheWeb/Release/Skin/Default/browsetheweb.xml =================================================================== --- trunk/plugins/BrowseTheWeb/Release/Skin/Default/browsetheweb.xml 2012-07-16 11:10:09 UTC (rev 4501) +++ trunk/plugins/BrowseTheWeb/Release/Skin/Default/browsetheweb.xml 2012-07-16 11:15:51 UTC (rev 4502) @@ -5,24 +5,34 @@ <allowoverlay>no</allowoverlay> <disabletopbar>true</disabletopbar> <controls> - <control> + <control> <description>background image</description> <type>image</type> <id>1</id> <width>720</width> <height>576</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> + </control> + + <control> <description>Status label</description> <type>label</type> - <id>9</id> + <id>545376891</id> <posX>7</posX> <posY>540</posY> <label>#btWeb.status</label> <font>font12</font> <align>left</align> <textcolor>ffffffff</textcolor> + <height>36</height> + <visible>string.equals(#btWeb.statusvisible, true)</visible> </control> <control> <description>Link id label</description> @@ -34,6 +44,8 @@ <font>font10</font> <align>left</align> <textcolor>ffffffff</textcolor> + <height>36</height> + <visible>string.equals(#btWeb.statusvisible, true)</visible> </control> </controls> Modified: trunk/plugins/BrowseTheWeb/Release/Skin/DefaultWide/browsetheweb.xml =================================================================== --- trunk/plugins/BrowseTheWeb/Release/Skin/DefaultWide/browsetheweb.xml 2012-07-16 11:10:09 UTC (rev 4501) +++ trunk/plugins/BrowseTheWeb/Release/Skin/DefaultWide/browsetheweb.xml 2012-07-16 11:15:51 UTC (rev 4502) @@ -5,24 +5,34 @@ <allowoverlay>no</allowoverlay> <disabletopbar>true</disabletopbar> <controls> - <control> + <control> <description>background image</description> <type>image</type> <id>1</id> <width>1280</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>1280</width> + <height>720</height> + </control> + + <control> <description>Status label</description> <type>label</type> - <id>9</id> + <id>545376891</id> <posX>7</posX> <posY>690</posY> <label>#btWeb.status</label> <font>font12</font> <align>left</align> <textcolor>ffffffff</textcolor> + <height>36</height> + <visible>string.equals(#btWeb.statusvisible, true)</visible> </control> <control> <description>Link id label</description> @@ -34,6 +44,8 @@ <font>font10</font> <align>left</align> <textcolor>ffffffff</textcolor> + <height>36</height> + <visible>string.equals(#btWeb.statusvisible, true)</visible> </control> </controls> Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs =================================================================== --- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-07-16 11:10:09 UTC (rev 4501) +++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-07-16 11:15:51 UTC (rev 4502) @@ -215,6 +215,38 @@ #endregion } + private void SetBrowserWindow() + { + GUIControl cntrol = GetControl(545376890); + GUIControl statusBar = GetControl(545376891); + GUIPropertyManager.SetProperty("#btWeb.statusvisible", settings.StatusBar.ToString()); + + Point loc; + int w, h; + if (cntrol != null && statusBar != null) + { + loc = new Point(cntrol.XPosition, cntrol.YPosition); + w = cntrol.Width; + + if (settings.StatusBar) + h = cntrol.Height - statusBar.Height; + else + h = cntrol.Height; + } + else + { + loc = new Point(0, 0); + w = GUIGraphicsContext.form.Width; + if (settings.StatusBar) + h = GUIGraphicsContext.form.Height - 100; + else + h = GUIGraphicsContext.form.Height; + } + + webBrowser.Location = loc; + webBrowser.Size = new Size(w, h); + } + protected override void OnPageLoad() { GUIPropertyManager.SetProperty("#currentmodule", settings.PluginName); @@ -247,7 +279,7 @@ webBrowser.Enabled = settings.UseMouse; webBrowser.Dock = DockStyle.None; - webBrowser.Location = new System.Drawing.Point(0, 0); + SetBrowserWindow(); MyLog.debug("Create eventhandler"); @@ -258,11 +290,6 @@ webBrowser.DomKeyDown += new GeckoDomKeyEventHandler(webBrowser_DomKeyDown); webBrowser.DomClick += new GeckoDomEventHandler(webBrowser_DomClick); - if (settings.StatusBar) - webBrowser.Size = new System.Drawing.Size(GUIGraphicsContext.form.Width, GUIGraphicsContext.form.Height - 100); - else - webBrowser.Size = new System.Drawing.Size(GUIGraphicsContext.form.Width, GUIGraphicsContext.form.Height); - MyLog.debug("set zoom size to " + settings.FontZoom + "/" + zoom); webBrowser.Window.TextZoom = settings.FontZoom; @@ -469,10 +496,7 @@ if (action.wID == settings.Remote_Status) { settings.StatusBar = !settings.StatusBar; - if (settings.StatusBar) - webBrowser.Size = new System.Drawing.Size(GUIGraphicsContext.form.Width, GUIGraphicsContext.form.Height - 100); - else - webBrowser.Size = new System.Drawing.Size(GUIGraphicsContext.form.Width, GUIGraphicsContext.form.Height); + SetBrowserWindow(); } if (action.wID == settings.Remote_PageUp) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dos...@us...> - 2012-07-16 11:10:16
|
Revision: 4501 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4501&view=rev Author: doskabouter Date: 2012-07-16 11:10:09 +0000 (Mon, 16 Jul 2012) Log Message: ----------- installerscript now uses Default and DefaultWide Modified Paths: -------------- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 Added Paths: ----------- trunk/plugins/BrowseTheWeb/Release/Skin/Default/ trunk/plugins/BrowseTheWeb/Release/Skin/DefaultWide/ Removed Paths: ------------- trunk/plugins/BrowseTheWeb/Release/Skin/Blue3/ trunk/plugins/BrowseTheWeb/Release/Skin/Blue3wide/ Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 =================================================================== --- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2012-07-16 07:23:33 UTC (rev 4500) +++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2012-07-16 11:10:09 UTC (rev 4501) @@ -3,11 +3,11 @@ <Version>2.0</Version> <Groups> <Items> - <GroupItem Name="Default"> + <GroupItem Name="Common"> <ParentGroup /> - <DisplayName>Default</DisplayName> + <DisplayName>Common</DisplayName> <DefaulChecked>true</DefaulChecked> - <Description>Default</Description> + <Description>Common files</Description> <Files> <Items> <FileItem InstallType="CopyFile" SystemFile="false" Modified="true"> @@ -41,62 +41,62 @@ </Items> </Files> </GroupItem> - <GroupItem Name="Blue3"> + <GroupItem Name="Default"> <ParentGroup /> <DisplayName>Default</DisplayName> <DefaulChecked>true</DefaulChecked> - <Description>Default</Description> + <Description>Default skin</Description> <Files> <Items> <FileItem InstallType="CopyFile" SystemFile="false" Modified="true"> <Param1 /> <UpdateOption>OverwriteIfOlder</UpdateOption> - <LocalFileName>Skin\Blue3\browsetheweb.xml</LocalFileName> + <LocalFileName>Skin\Default\browsetheweb.xml</LocalFileName> <ZipFileName>Installer{CopyFile}\{f5702498-f4fe-4d93-a3e4-147b4259f022}-browsetheweb.xml</ZipFileName> <DestinationFilename>%Skin%\Default\browsetheweb.xml</DestinationFilename> </FileItem> <FileItem InstallType="CopyFile" SystemFile="false" Modified="true"> <Param1 /> <UpdateOption>OverwriteIfOlder</UpdateOption> - <LocalFileName>Skin\Blue3\browsethewebbook.xml</LocalFileName> + <LocalFileName>Skin\Default\browsethewebbook.xml</LocalFileName> <ZipFileName>Installer{CopyFile}\{ff6dcc58-3934-4b17-9304-ba0969411580}-browsethewebbook.xml</ZipFileName> <DestinationFilename>%Skin%\Default\browsethewebbook.xml</DestinationFilename> </FileItem> <FileItem InstallType="CopyFile" SystemFile="false" Modified="true"> <Param1 /> <UpdateOption>OverwriteIfOlder</UpdateOption> - <LocalFileName>Skin\Blue3\Media\hover_browsetheweb.png</LocalFileName> + <LocalFileName>Skin\Default\Media\hover_browsetheweb.png</LocalFileName> <ZipFileName>Installer{CopyFile}\{a8509fba-5a4e-45c8-ad6c-5c6a50931b30}-hover_browsetheweb.png</ZipFileName> <DestinationFilename>%Skin%\Default\Media\hover_browsetheweb.png</DestinationFilename> </FileItem> </Items> </Files> </GroupItem> - <GroupItem Name="Blue3wide"> + <GroupItem Name="DefaultWide"> <ParentGroup /> <DisplayName>DefaultWide</DisplayName> <DefaulChecked>true</DefaulChecked> - <Description>DefaultWide</Description> + <Description>DefaultWide skin</Description> <Files> <Items> <FileItem InstallType="CopyFile" SystemFile="false" Modified="true"> <Param1 /> <UpdateOption>OverwriteIfOlder</UpdateOption> - <LocalFileName>Skin\Blue3wide\browsetheweb.xml</LocalFileName> + <LocalFileName>Skin\DefaultWide\browsetheweb.xml</LocalFileName> <ZipFileName>Installer{CopyFile}\{682a1fa4-16db-4bc3-961f-e05e59ce1787}-browsetheweb.xml</ZipFileName> <DestinationFilename>%Skin%\DefaultWide\browsetheweb.xml</DestinationFilename> </FileItem> <FileItem InstallType="CopyFile" SystemFile="false" Modified="true"> <Param1 /> <UpdateOption>OverwriteIfOlder</UpdateOption> - <LocalFileName>Skin\Blue3wide\browsethewebbook.xml</LocalFileName> + <LocalFileName>Skin\DefaultWide\browsethewebbook.xml</LocalFileName> <ZipFileName>Installer{CopyFile}\{d4d67df8-81ad-4d73-b98e-350693b4644b}-browsethewebbook.xml</ZipFileName> <DestinationFilename>%Skin%\DefaultWide\browsethewebbook.xml</DestinationFilename> </FileItem> <FileItem InstallType="CopyFile" SystemFile="false" Modified="true"> <Param1 /> <UpdateOption>OverwriteIfOlder</UpdateOption> - <LocalFileName>Skin\Blue3wide\Media\hover_browsetheweb.png</LocalFileName> + <LocalFileName>Skin\DefaultWide\Media\hover_browsetheweb.png</LocalFileName> <ZipFileName>Installer{CopyFile}\{261f9f9e-cace-4e95-b709-c1db6c350606}-hover_browsetheweb.png</ZipFileName> <DestinationFilename>%Skin%\DefaultWide\Media\hover_browsetheweb.png</DestinationFilename> </FileItem> @@ -163,7 +163,7 @@ </Params> <Actions> <Items> - <ActionItem Name="InstallFiles" ActionType="InstallFiles" ConditionGroup="Default"> + <ActionItem Name="InstallFiles" ActionType="InstallFiles" ConditionGroup="Common"> <Params> <Items /> </Params> @@ -197,7 +197,7 @@ </Params> <Actions> <Items> - <ActionItem Name="ConfigurePlugin" ActionType="ConfigurePlugin" ConditionGroup="Default"> + <ActionItem Name="ConfigurePlugin" ActionType="ConfigurePlugin" ConditionGroup="Common"> <Params> <Items> <SectionParam Name="Path to plugin"> @@ -307,7 +307,7 @@ <Build>7</Build> <Revision>0</Revision> </Version> - <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.</ExtensionDescription> + <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / Webbrowser.</ExtensionDescription> <VersionDescription>Fixed toggle mouse option, added linkid to flash objects (performs a click in the middle of the object), added compatibility with MP 1.3.0 Alpha</VersionDescription> <DevelopmentStatus>Stable</DevelopmentStatus> <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1</OnlineLocation> @@ -379,42 +379,42 @@ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true"> <Param1 /> <UpdateOption>OverwriteIfOlder</UpdateOption> - <LocalFileName>Skin\Blue3\browsetheweb.xml</LocalFileName> + <LocalFileName>Skin\Default\browsetheweb.xml</LocalFileName> <ZipFileName>Installer{CopyFile}\{f5702498-f4fe-4d93-a3e4-147b4259f022}-browsetheweb.xml</ZipFileName> <DestinationFilename>%Skin%\Default\browsetheweb.xml</DestinationFilename> </FileItem> <FileItem InstallType="CopyFile" SystemFile="false" Modified="true"> <Param1 /> <UpdateOption>OverwriteIfOlder</UpdateOption> - <LocalFileName>Skin\Blue3\browsethewebbook.xml</LocalFileName> + <LocalFileName>Skin\Default\browsethewebbook.xml</LocalFileName> <ZipFileName>Installer{CopyFile}\{ff6dcc58-3934-4b17-9304-ba0969411580}-browsethewebbook.xml</ZipFileName> <DestinationFilename>%Skin%\Default\browsethewebbook.xml</DestinationFilename> </FileItem> <FileItem InstallType="CopyFile" SystemFile="false" Modified="true"> <Param1 /> <UpdateOption>OverwriteIfOlder</UpdateOption> - <LocalFileName>Skin\Blue3\Media\hover_browsetheweb.png</LocalFileName> + <LocalFileName>Skin\Default\Media\hover_browsetheweb.png</LocalFileName> <ZipFileName>Installer{CopyFile}\{a8509fba-5a4e-45c8-ad6c-5c6a50931b30}-hover_browsetheweb.png</ZipFileName> <DestinationFilename>%Skin%\Default\Media\hover_browsetheweb.png</DestinationFilename> </FileItem> <FileItem InstallType="CopyFile" SystemFile="false" Modified="true"> <Param1 /> <UpdateOption>OverwriteIfOlder</UpdateOption> - <LocalFileName>Skin\Blue3wide\browsetheweb.xml</LocalFileName> + <LocalFileName>Skin\DefaultWide\browsetheweb.xml</LocalFileName> <ZipFileName>Installer{CopyFile}\{682a1fa4-16db-4bc3-961f-e05e59ce1787}-browsetheweb.xml</ZipFileName> <DestinationFilename>%Skin%\DefaultWide\browsetheweb.xml</DestinationFilename> </FileItem> <FileItem InstallType="CopyFile" SystemFile="false" Modified="true"> <Param1 /> <UpdateOption>OverwriteIfOlder</UpdateOption> - <LocalFileName>Skin\Blue3wide\browsethewebbook.xml</LocalFileName> + <LocalFileName>Skin\DefaultWide\browsethewebbook.xml</LocalFileName> <ZipFileName>Installer{CopyFile}\{d4d67df8-81ad-4d73-b98e-350693b4644b}-browsethewebbook.xml</ZipFileName> <DestinationFilename>%Skin%\DefaultWide\browsethewebbook.xml</DestinationFilename> </FileItem> <FileItem InstallType="CopyFile" SystemFile="false" Modified="true"> <Param1 /> <UpdateOption>OverwriteIfOlder</UpdateOption> - <LocalFileName>Skin\Blue3wide\Media\hover_browsetheweb.png</LocalFileName> + <LocalFileName>Skin\DefaultWide\Media\hover_browsetheweb.png</LocalFileName> <ZipFileName>Installer{CopyFile}\{261f9f9e-cace-4e95-b709-c1db6c350606}-hover_browsetheweb.png</ZipFileName> <DestinationFilename>%Skin%\DefaultWide\Media\hover_browsetheweb.png</DestinationFilename> </FileItem> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <do...@us...> - 2012-07-16 07:23:45
|
Revision: 4500 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4500&view=rev Author: dot-i Date: 2012-07-16 07:23:33 +0000 (Mon, 16 Jul 2012) Log Message: ----------- Updated to 1.7.0.0 source code, in combination with MP 1.3 alpha. Modified Paths: -------------- trunk/plugins/ForTheRecord/ForTheRecord.MPPlugins.sln trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Channels/ChannelLink.cs trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Channels/ChannelLinks.cs trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Channels/LinkedMediaPortalChannel.cs trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/DvbEpgThread.cs trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/ForTheRecord.RecorderTuners.MediaPortalTvServer.csproj trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/MediaPortalRecorderTunerService.cs trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Properties/AssemblyInfo.cs trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/RecordingThread.cs trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/SettingName.cs trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/SetupForm.cs trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/TvServerPlugin.cs trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Utility.cs trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Wizards/ImportChannels/FinishPage.cs trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Wizards/ImportChannels/ImportChannelsContext.cs trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Wizards/ImportChannels/ImportChannelsPage.cs trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Wizards/ImportChannels/ImportChannelsPageBase.cs trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Wizards/ImportChannels/ImportChannelsWizard.cs trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Wizards/WizardForm.cs trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Wizards/WizardPage.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/ChannelNavigator.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/EventListener.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/ForTheRecord.UI.MediaPortal.csproj trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/ForTheRecordMain.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/GuideBase.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/GuideSearchBase.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/HomeBase.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/MiniGuide.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/Properties/AssemblyInfo.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/RadioGuide.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/RadioGuideSearch.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/RadioHome.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/RadioRecorded.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/RecordedBase.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/SetupForm.Designer.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/SetupForm.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TVZapOSD.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TextId.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/Translator.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvCropManager.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvCropSettings.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvFullScreen.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvGuide.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvGuideSearch.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvHome.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvOSD.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvProgramInfo.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvRecorded.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvRecordingOverlay.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/Utility.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/WindowId.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/language/fortherecord_da.xml trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/language/fortherecord_de.xml trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/language/fortherecord_en.xml trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/language/fortherecord_nl.xml trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/language/fortherecord_no.xml trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/language/fortherecord_pl.xml trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/language/fortherecord_sv.xml trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/skin/Default/4TR_Home.xml trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/skin/Default/4TR_RadioHome.xml trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/ChannelProgramView.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/ChannelProgramsList.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/CurrentAndNextProgramView.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/CurrentAndNextProgramsList.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/EditSchedule/EditScheduleController.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/EditSchedule/EditScheduleModel.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/EditSchedule/TitleRuleTypeIndex.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/Guide/ChannelPrograms.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/Guide/GuideController.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/Guide/GuideModel.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/Guide/GuideUpcomingProgram.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/KeepUntilControlUtility.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/LiveStreamView.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/LiveStreamsList.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/ProcessUtility.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/Properties/AssemblyInfo.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/RecorderTunersCache.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/Recordings/RecordingsController.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/Recordings/RecordingsModel.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/ScheduleNamesCache.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/SearchGuide/SearchGuideController.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/SearchGuide/SearchGuideModel.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/SerializableDictionary.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/SortableBindingList.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/UpcomingOrActiveProgramView.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.Process/UpcomingOrActiveProgramsList.cs trunk/plugins/ForTheRecord/ReferencedAssemblies/Common.Utils.dll trunk/plugins/ForTheRecord/ReferencedAssemblies/Core.dll trunk/plugins/ForTheRecord/ReferencedAssemblies/Databases.dll trunk/plugins/ForTheRecord/ReferencedAssemblies/Dialogs.dll trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.Client.Common.dll trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.Entities.dll trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.RecorderTuners.Common.dll trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.ServiceAgents.dll trunk/plugins/ForTheRecord/ReferencedAssemblies/ForTheRecord.ServiceContracts.dll trunk/plugins/ForTheRecord/ReferencedAssemblies/Gentle.Common.dll trunk/plugins/ForTheRecord/ReferencedAssemblies/Gentle.Framework.dll trunk/plugins/ForTheRecord/ReferencedAssemblies/PluginBase.dll trunk/plugins/ForTheRecord/ReferencedAssemblies/SetupControls.dll trunk/plugins/ForTheRecord/ReferencedAssemblies/TVDatabase.dll trunk/plugins/ForTheRecord/ReferencedAssemblies/TvBusinessLayer.dll trunk/plugins/ForTheRecord/ReferencedAssemblies/TvControl.dll trunk/plugins/ForTheRecord/ReferencedAssemblies/TvLibrary.Interfaces.dll trunk/plugins/ForTheRecord/ReferencedAssemblies/Utils.dll trunk/plugins/ForTheRecord/ReferencedAssemblies/WindowPlugins.dll Added Paths: ----------- trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TVNotifyYesNoDialog.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TuningDetails.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/UpcomingBase.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/UpcomingRadio.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/UpcomingTv.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/settings/ trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/settings/ChannelManagment.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/settings/ClientSettingsBase.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/settings/ServerSettingsBase.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/skin/Default/4TR_ManualSchedule.xml trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/skin/Default/4TR_ProgramInfo2.xml trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/skin/Default/4TR_RadioGuideSearch2.xml trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/skin/Default/4TR_RecordedRadio2.xml trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/skin/Default/4TR_RecordedTv2.xml trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/skin/Default/4TR_TvGuideSearch2.xml trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/skin/Default/4TR_UpcomingRadio.xml trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/skin/Default/4TR_UpcomingTv.xml trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/skin/DefaultWide/4TR_ChannelManagment.xml trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/skin/DefaultWide/4TR_ClientSettings.xml trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/skin/DefaultWide/4TR_ManualSchedule.xml trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/skin/DefaultWide/4TR_ProgramInfo2.xml trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/skin/DefaultWide/4TR_RadioGuideSearch2.xml trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/skin/DefaultWide/4TR_RecordedRadio2.xml trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/skin/DefaultWide/4TR_RecordedTv2.xml trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/skin/DefaultWide/4TR_ServerSettings.xml trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/skin/DefaultWide/4TR_TuningDetails.xml trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/skin/DefaultWide/4TR_TvGuideSearch2.xml trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/skin/DefaultWide/4TR_UpcomingRadio.xml trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/skin/DefaultWide/4TR_UpcomingTv.xml trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/skin/DefaultWide/settings_tv.xml trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/teletext/ trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/teletext/Hamming.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/teletext/TeletextPageRenderer.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/teletext/TvFullscreenTeletext.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/teletext/TvTeletext.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/teletext/TvTeletextBase.cs trunk/plugins/ForTheRecord/ReferencedAssemblies/DirectShowLib.dll Removed Paths: ------------- trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/ActiveRecordings.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/Hamming.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TeletextPageRenderer.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvFullscreenTeletext.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvGuideDialog.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvTeletext.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/TvTeletextBase.cs trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/UpcomingPrograms.cs Modified: trunk/plugins/ForTheRecord/ForTheRecord.MPPlugins.sln =================================================================== --- trunk/plugins/ForTheRecord/ForTheRecord.MPPlugins.sln 2012-07-11 10:05:47 UTC (rev 4499) +++ trunk/plugins/ForTheRecord/ForTheRecord.MPPlugins.sln 2012-07-16 07:23:33 UTC (rev 4500) @@ -10,6 +10,7 @@ ReferencedAssemblies\Core.dll = ReferencedAssemblies\Core.dll ReferencedAssemblies\Databases.dll = ReferencedAssemblies\Databases.dll ReferencedAssemblies\Dialogs.dll = ReferencedAssemblies\Dialogs.dll + ReferencedAssemblies\DirectShowLib.dll = ReferencedAssemblies\DirectShowLib.dll ReferencedAssemblies\ForTheRecord.Client.Common.dll = ReferencedAssemblies\ForTheRecord.Client.Common.dll ReferencedAssemblies\ForTheRecord.Entities.dll = ReferencedAssemblies\ForTheRecord.Entities.dll ReferencedAssemblies\ForTheRecord.RecorderTuners.Common.dll = ReferencedAssemblies\ForTheRecord.RecorderTuners.Common.dll Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Channels/ChannelLink.cs =================================================================== --- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Channels/ChannelLink.cs 2012-07-11 10:05:47 UTC (rev 4499) +++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Channels/ChannelLink.cs 2012-07-16 07:23:33 UTC (rev 4500) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 For The Record + * Copyright (C) 2007-2012 For The Record * http://www.4therecord.eu * * This Program is free software; you can redistribute it and/or modify Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Channels/ChannelLinks.cs =================================================================== --- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Channels/ChannelLinks.cs 2012-07-11 10:05:47 UTC (rev 4499) +++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Channels/ChannelLinks.cs 2012-07-16 07:23:33 UTC (rev 4500) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 For The Record + * Copyright (C) 2007-2012 For The Record * http://www.4therecord.eu * * This Program is free software; you can redistribute it and/or modify @@ -36,7 +36,7 @@ { internal class ChannelLinks { - private ReaderWriterLock _readerWriterLock = new ReaderWriterLock(); + private ReaderWriterLockSlim _readerWriterLock = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion); private Dictionary<Guid, ChannelLink> _linksById = new Dictionary<Guid, ChannelLink>(); private Dictionary<int, bool> _autoLinkedMPChannels = new Dictionary<int, bool>(); @@ -148,7 +148,7 @@ string settingsFileName = this.SettingsFileName; if (!File.Exists(settingsFileName)) { - _readerWriterLock.AcquireWriterLock(Timeout.Infinite); + _readerWriterLock.EnterWriteLock(); try { _linksById.Clear(); @@ -157,7 +157,7 @@ } finally { - _readerWriterLock.ReleaseWriterLock(); + _readerWriterLock.ExitWriteLock(); } } @@ -165,7 +165,7 @@ if (forceLoad || lastWriteTimeUtc != _lastFileWriteTimeUtc) { - _readerWriterLock.AcquireWriterLock(Timeout.Infinite); + _readerWriterLock.EnterWriteLock(); try { _lastFileWriteTimeUtc = lastWriteTimeUtc; @@ -198,14 +198,14 @@ } finally { - _readerWriterLock.ReleaseWriterLock(); + _readerWriterLock.ExitWriteLock(); } } } private void SaveChannelLinks() { - _readerWriterLock.AcquireReaderLock(Timeout.Infinite); + _readerWriterLock.EnterReadLock(); try { string settingsFileName = this.SettingsFileName; @@ -229,7 +229,7 @@ } finally { - _readerWriterLock.ReleaseReaderLock(); + _readerWriterLock.ExitReadLock(); } } @@ -241,7 +241,7 @@ { EnsureLoaded(); - _readerWriterLock.AcquireReaderLock(Timeout.Infinite); + _readerWriterLock.EnterReadLock(); try { isAutoLinked = false; @@ -266,7 +266,7 @@ } finally { - _readerWriterLock.ReleaseReaderLock(); + _readerWriterLock.ExitReadLock(); } } @@ -274,7 +274,7 @@ { EnsureLoaded(); - _readerWriterLock.AcquireReaderLock(Timeout.Infinite); + _readerWriterLock.EnterReadLock(); try { foreach (ChannelLink link in _linksById.Values) @@ -289,7 +289,7 @@ } finally { - _readerWriterLock.ReleaseReaderLock(); + _readerWriterLock.ExitReadLock(); } } @@ -297,14 +297,14 @@ { EnsureLoaded(); - _readerWriterLock.AcquireReaderLock(Timeout.Infinite); + _readerWriterLock.EnterReadLock(); try { return _autoLinkedMPChannels.ContainsKey(mpChannel.IdChannel); } finally { - _readerWriterLock.ReleaseReaderLock(); + _readerWriterLock.ExitReadLock(); } } @@ -312,7 +312,7 @@ { EnsureLoaded(); - _readerWriterLock.AcquireWriterLock(Timeout.Infinite); + _readerWriterLock.EnterWriteLock(); try { ClearLinkedMediaPortalChannel(channel); @@ -321,7 +321,7 @@ } finally { - _readerWriterLock.ReleaseWriterLock(); + _readerWriterLock.ExitWriteLock(); } } @@ -329,7 +329,7 @@ { EnsureLoaded(); - _readerWriterLock.AcquireWriterLock(Timeout.Infinite); + _readerWriterLock.EnterWriteLock(); try { if (_linksById.ContainsKey(channel.ChannelId)) @@ -339,7 +339,7 @@ } finally { - _readerWriterLock.ReleaseWriterLock(); + _readerWriterLock.ExitWriteLock(); } } @@ -347,7 +347,7 @@ { EnsureLoaded(); - _readerWriterLock.AcquireWriterLock(Timeout.Infinite); + _readerWriterLock.EnterWriteLock(); try { List<Guid> obsoleteLinks = new List<Guid>(); @@ -366,7 +366,7 @@ } finally { - _readerWriterLock.ReleaseWriterLock(); + _readerWriterLock.ExitWriteLock(); } } Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Channels/LinkedMediaPortalChannel.cs =================================================================== --- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Channels/LinkedMediaPortalChannel.cs 2012-07-11 10:05:47 UTC (rev 4499) +++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Channels/LinkedMediaPortalChannel.cs 2012-07-16 07:23:33 UTC (rev 4500) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 For The Record + * Copyright (C) 2007-2012 For The Record * http://www.4therecord.eu * * This Program is free software; you can redistribute it and/or modify Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/DvbEpgThread.cs =================================================================== --- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/DvbEpgThread.cs 2012-07-11 10:05:47 UTC (rev 4499) +++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/DvbEpgThread.cs 2012-07-16 07:23:33 UTC (rev 4500) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 For The Record + * Copyright (C) 2007-2012 For The Record * http://www.4therecord.eu * * This Program is free software; you can redistribute it and/or modify Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/ForTheRecord.RecorderTuners.MediaPortalTvServer.csproj =================================================================== --- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/ForTheRecord.RecorderTuners.MediaPortalTvServer.csproj 2012-07-11 10:05:47 UTC (rev 4499) +++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/ForTheRecord.RecorderTuners.MediaPortalTvServer.csproj 2012-07-16 07:23:33 UTC (rev 4500) @@ -59,12 +59,14 @@ <Reference Include="Common.Utils"> <HintPath>..\ReferencedAssemblies\Common.Utils.dll</HintPath> </Reference> + <Reference Include="DirectShowLib"> + <HintPath>..\ReferencedAssemblies\DirectShowLib.dll</HintPath> + </Reference> <Reference Include="ForTheRecord.Entities, Version=1.4.0.0, Culture=neutral, PublicKeyToken=a9a5dfc20b8d6175, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> <HintPath>..\ReferencedAssemblies\ForTheRecord.Entities.dll</HintPath> </Reference> - <Reference Include="ForTheRecord.RecorderTuners.Common, Version=1.4.0.0, Culture=neutral, PublicKeyToken=a9a5dfc20b8d6175, processorArchitecture=MSIL"> - <SpecificVersion>False</SpecificVersion> + <Reference Include="ForTheRecord.RecorderTuners.Common"> <HintPath>..\ReferencedAssemblies\ForTheRecord.RecorderTuners.Common.dll</HintPath> </Reference> <Reference Include="ForTheRecord.ServiceAgents, Version=1.4.0.0, Culture=neutral, PublicKeyToken=a9a5dfc20b8d6175, processorArchitecture=MSIL"> Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/MediaPortalRecorderTunerService.cs =================================================================== --- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/MediaPortalRecorderTunerService.cs 2012-07-11 10:05:47 UTC (rev 4499) +++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/MediaPortalRecorderTunerService.cs 2012-07-16 07:23:33 UTC (rev 4500) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 For The Record + * Copyright (C) 2007-2012 For The Record * http://www.4therecord.eu * * This Program is free software; you can redistribute it and/or modify @@ -38,6 +38,7 @@ using TvLibrary.Log; using ForTheRecord.Entities; +using ForTheRecord.Entities.Tuning; using ForTheRecord.ServiceContracts; using ForTheRecord.ServiceAgents; using ForTheRecord.RecorderTuners.Common; @@ -585,6 +586,141 @@ return liveStates.ToArray(); } + public override ServiceTuning GetLiveStreamTuningDetails(LiveStream liveStream) + { + ServiceTuning result = null; + + lock (_liveStreamsLock) + { + if (_liveStreams.ContainsKey(liveStream.RtspUrl)) + { + IUser tve3User = _liveStreamUsers[liveStream.RtspUrl]; + + IChannel channel = TvServerPlugin.TvController_CurrentChannel(tve3User); + + var dvbSChannel = channel as TvLibrary.Channels.DVBSChannel; + if (dvbSChannel != null) + { + result = new ServiceTuning() + { + CardType = Entities.Tuning.CardType.DvbS, + Frequency = (int)dvbSChannel.Frequency, + InnerFecRate = (ForTheRecord.Entities.Tuning.FecCodeRate)dvbSChannel.InnerFecRate, + Modulation = (ForTheRecord.Entities.Tuning.Modulation)dvbSChannel.ModulationType, + Name = dvbSChannel.Name, + ONID = dvbSChannel.NetworkId, + OrbitalPosition = dvbSChannel.SatelliteIndex, // TODO: check if this is the right number + Pilot = (ForTheRecord.Entities.Tuning.Pilot)dvbSChannel.Pilot, + ProviderName = dvbSChannel.Provider, + IsFreeToAir = dvbSChannel.FreeToAir, + RollOff = (ForTheRecord.Entities.Tuning.RollOff)dvbSChannel.Rolloff, + SID = dvbSChannel.ServiceId, + SignalPolarisation = (ForTheRecord.Entities.Tuning.SignalPolarisation)dvbSChannel.Polarisation, + SymbolRate = dvbSChannel.SymbolRate, + TSID = dvbSChannel.TransportId + }; + } + else + { + var dvbCChannel = channel as TvLibrary.Channels.DVBCChannel; + if (dvbCChannel != null) + { + result = new ServiceTuning() + { + CardType = Entities.Tuning.CardType.DvbC, + Frequency = (int)dvbCChannel.Frequency, + Modulation = (ForTheRecord.Entities.Tuning.Modulation)dvbCChannel.ModulationType, + Name = dvbCChannel.Name, + ONID = dvbCChannel.NetworkId, + ProviderName = dvbCChannel.Provider, + IsFreeToAir = dvbCChannel.FreeToAir, + SID = dvbCChannel.ServiceId, + SymbolRate = dvbCChannel.SymbolRate, + TSID = dvbCChannel.TransportId + }; + } + else + { + var dvbTChannel = channel as TvLibrary.Channels.DVBTChannel; + if (dvbTChannel != null) + { + result = new ServiceTuning() + { + CardType = Entities.Tuning.CardType.DvbT, + Frequency = (int)dvbTChannel.Frequency, + Bandwidth = dvbTChannel.BandWidth, + Name = dvbTChannel.Name, + ONID = dvbTChannel.NetworkId, + ProviderName = dvbTChannel.Provider, + IsFreeToAir = dvbTChannel.FreeToAir, + SID = dvbTChannel.ServiceId, + TSID = dvbTChannel.TransportId + }; + } + else + { + var atscChannel = channel as TvLibrary.Channels.ATSCChannel; + if (atscChannel != null) + { + result = new ServiceTuning() + { + CardType = Entities.Tuning.CardType.Atsc, + Frequency = (int)atscChannel.Frequency, + MajorChannel = atscChannel.MajorChannel, + MinorChannel = atscChannel.MinorChannel, + Name = atscChannel.Name, + PhysicalChannel = atscChannel.PhysicalChannel, + ProviderName = atscChannel.Provider, + IsFreeToAir = atscChannel.FreeToAir, + SID = atscChannel.ServiceId, + TSID = atscChannel.TransportId + }; + } + else + { + var analogChannel = channel as TvLibrary.Implementations.AnalogChannel; + if (analogChannel != null) + { + result = new ServiceTuning() + { + CardType = Entities.Tuning.CardType.Analog, + Frequency = (int)analogChannel.Frequency, + Name = analogChannel.Name, + IsFreeToAir = analogChannel.FreeToAir, + PhysicalChannel = analogChannel.ChannelNumber + }; + } + else + { + var dvbIPChannel = channel as TvLibrary.Channels.DVBIPChannel; + if (dvbIPChannel != null) + { + result = new ServiceTuning() + { + CardType = Entities.Tuning.CardType.DvbIP, + Url = dvbIPChannel.Url, + Name = dvbIPChannel.Name, + ProviderName = dvbIPChannel.Provider, + IsFreeToAir = dvbIPChannel.FreeToAir + }; + } + } + } + } + } + } + + if (result != null) + { + result.SignalQuality = TvServerPlugin.TvController_SignalQuality(tve3User.CardId); + result.SignalStrength = TvServerPlugin.TvController_SignalLevel(tve3User.CardId); + } + } + } + + return result; + } + #endregion #region TeleText Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Properties/AssemblyInfo.cs 2012-07-11 10:05:47 UTC (rev 4499) +++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Properties/AssemblyInfo.cs 2012-07-16 07:23:33 UTC (rev 4500) @@ -12,7 +12,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("For The Record")] [assembly: AssemblyProduct("ForTheRecord.RecorderTuners.MediaPortalTvServer")] -[assembly: AssemblyCopyright("Copyright © For The Record 2007-2011")] +[assembly: AssemblyCopyright("Copyright © For The Record 2007-2012")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -37,4 +37,4 @@ [assembly: AssemblyFileVersion(ForTheRecord.Entities.Constants.AssemblyVersion)] // MediaPortal version -[assembly: CompatibleVersion("1.1.7.0")] +[assembly: CompatibleVersion("1.2.0.0")] Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/RecordingThread.cs =================================================================== --- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/RecordingThread.cs 2012-07-11 10:05:47 UTC (rev 4499) +++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/RecordingThread.cs 2012-07-16 07:23:33 UTC (rev 4500) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 For The Record + * Copyright (C) 2007-2012 For The Record * http://www.4therecord.eu * * This Program is free software; you can redistribute it and/or modify @@ -135,7 +135,7 @@ return null; } - if (TvServerPlugin.TvController_StartRecording(ref _tve3User, ref _tve3RecordingFileName, false, 0) != TvResult.Succeeded) + if (TvServerPlugin.TvController_StartRecording(ref _tve3User, ref _tve3RecordingFileName) != TvResult.Succeeded) { errorMessage = "TV Server failed to start recording on channel " + _channel.DisplayName; return null; Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/SettingName.cs =================================================================== --- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/SettingName.cs 2012-07-11 10:05:47 UTC (rev 4499) +++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/SettingName.cs 2012-07-16 07:23:33 UTC (rev 4500) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 For The Record + * Copyright (C) 2007-2012 For The Record * http://www.4therecord.eu * * This Program is free software; you can redistribute it and/or modify Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/SetupForm.cs =================================================================== --- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/SetupForm.cs 2012-07-11 10:05:47 UTC (rev 4499) +++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/SetupForm.cs 2012-07-16 07:23:33 UTC (rev 4500) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 For The Record + * Copyright (C) 2007-2012 For The Record * http://www.4therecord.eu * * This Program is free software; you can redistribute it and/or modify Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/TvServerPlugin.cs =================================================================== --- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/TvServerPlugin.cs 2012-07-11 10:05:47 UTC (rev 4499) +++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/TvServerPlugin.cs 2012-07-16 07:23:33 UTC (rev 4500) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 For The Record + * Copyright (C) 2007-2012 For The Record * http://www.4therecord.eu * * This Program is free software; you can redistribute it and/or modify @@ -614,11 +614,11 @@ } } - public static TvResult TvController_StartRecording(ref IUser user, ref string fileName, bool contentRecording, long startTime) + public static TvResult TvController_StartRecording(ref IUser user, ref string fileName) { lock (_tvControllerLock) { - return _controller.StartRecording(ref user, ref fileName, contentRecording, startTime); + return _controller.StartRecording(ref user, ref fileName); } } @@ -686,6 +686,14 @@ } } + public static IChannel TvController_CurrentChannel(IUser user) + { + lock (_tvControllerLock) + { + return _controller.CurrentChannel(ref user); + } + } + public static void TvController_HeartBeat(IUser user) { lock (_tvControllerLock) @@ -750,6 +758,22 @@ } } + public static int TvController_SignalLevel(int cardId) + { + lock (_tvControllerLock) + { + return _controller.SignalLevel(cardId); + } + } + + public static int TvController_SignalQuality(int cardId) + { + lock (_tvControllerLock) + { + return _controller.SignalQuality(cardId); + } + } + #endregion } } Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Utility.cs =================================================================== --- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Utility.cs 2012-07-11 10:05:47 UTC (rev 4499) +++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Utility.cs 2012-07-16 07:23:33 UTC (rev 4500) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 For The Record + * Copyright (C) 2007-2012 For The Record * http://www.4therecord.eu * * This Program is free software; you can redistribute it and/or modify @@ -283,6 +283,12 @@ { return true; } + if (tuning.ChannelType == 0 // Analog + && tuning.ChannelType == otherTuning.ChannelType + && tuning.IdChannel == otherTuning.IdChannel) + { + return true; + } } return false; } Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Wizards/ImportChannels/FinishPage.cs =================================================================== --- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Wizards/ImportChannels/FinishPage.cs 2012-07-11 10:05:47 UTC (rev 4499) +++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Wizards/ImportChannels/FinishPage.cs 2012-07-16 07:23:33 UTC (rev 4500) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 For The Record + * Copyright (C) 2007-2012 For The Record * http://www.4therecord.eu * * This Program is free software; you can redistribute it and/or modify Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Wizards/ImportChannels/ImportChannelsContext.cs =================================================================== --- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Wizards/ImportChannels/ImportChannelsContext.cs 2012-07-11 10:05:47 UTC (rev 4499) +++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Wizards/ImportChannels/ImportChannelsContext.cs 2012-07-16 07:23:33 UTC (rev 4500) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 For The Record + * Copyright (C) 2007-2012 For The Record * http://www.4therecord.eu * * This Program is free software; you can redistribute it and/or modify Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Wizards/ImportChannels/ImportChannelsPage.cs =================================================================== --- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Wizards/ImportChannels/ImportChannelsPage.cs 2012-07-11 10:05:47 UTC (rev 4499) +++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Wizards/ImportChannels/ImportChannelsPage.cs 2012-07-16 07:23:33 UTC (rev 4500) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 For The Record + * Copyright (C) 2007-2012 For The Record * http://www.4therecord.eu * * This Program is free software; you can redistribute it and/or modify Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Wizards/ImportChannels/ImportChannelsPageBase.cs =================================================================== --- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Wizards/ImportChannels/ImportChannelsPageBase.cs 2012-07-11 10:05:47 UTC (rev 4499) +++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Wizards/ImportChannels/ImportChannelsPageBase.cs 2012-07-16 07:23:33 UTC (rev 4500) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 For The Record + * Copyright (C) 2007-2012 For The Record * http://www.4therecord.eu * * This Program is free software; you can redistribute it and/or modify Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Wizards/ImportChannels/ImportChannelsWizard.cs =================================================================== --- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Wizards/ImportChannels/ImportChannelsWizard.cs 2012-07-11 10:05:47 UTC (rev 4499) +++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Wizards/ImportChannels/ImportChannelsWizard.cs 2012-07-16 07:23:33 UTC (rev 4500) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 For The Record + * Copyright (C) 2007-2012 For The Record * http://www.4therecord.eu * * This Program is free software; you can redistribute it and/or modify Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Wizards/WizardForm.cs =================================================================== --- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Wizards/WizardForm.cs 2012-07-11 10:05:47 UTC (rev 4499) +++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Wizards/WizardForm.cs 2012-07-16 07:23:33 UTC (rev 4500) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 For The Record + * Copyright (C) 2007-2012 For The Record * http://www.4therecord.eu * * This Program is free software; you can redistribute it and/or modify Modified: trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Wizards/WizardPage.cs =================================================================== --- trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Wizards/WizardPage.cs 2012-07-11 10:05:47 UTC (rev 4499) +++ trunk/plugins/ForTheRecord/ForTheRecord.RecorderTuners.MediaPortalTvServer/Wizards/WizardPage.cs 2012-07-16 07:23:33 UTC (rev 4500) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 For The Record + * Copyright (C) 2007-2012 For The Record * http://www.4therecord.eu * * This Program is free software; you can redistribute it and/or modify Deleted: trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/ActiveRecordings.cs =================================================================== --- trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/ActiveRecordings.cs 2012-07-11 10:05:47 UTC (rev 4499) +++ trunk/plugins/ForTheRecord/ForTheRecord.UI.MediaPortal/ActiveRecordings.cs 2012-07-16 07:23:33 UTC (rev 4500) @@ -1,637 +0,0 @@ -#region Copyright (C) 2005-2008 Team MediaPortal - -/* - * Copyright (C) 2005-2008 Team MediaPortal - * http://www.team-mediaportal.com - * - * This Program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This Program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNU Make; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * http://www.gnu.org/copyleft/gpl.html - * - */ - -#endregion - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Threading; - -using MediaPortal.Dialogs; -using MediaPortal.GUI.Library; -using MediaPortal.Player; -using MediaPortal.Services; -using MediaPortal.Threading; -using MediaPortal.Util; -using MediaPortal.Configuration; -using Action = MediaPortal.GUI.Library.Action; - -using ForTheRecord.Entities; -using ForTheRecord.ServiceAgents; -using ForTheRecord.ServiceContracts; -using ForTheRecord.UI.Process.Recordings; - -namespace ForTheRecord.UI.MediaPortal -{ - public class ActiveRecordings : GUIWindow, IComparer<GUIListItem> - { - #region variables - - private enum SortMethod - { - Channel = 0, - Date = 1, - Name = 2, - Genre = 3, - Played = 4, - Duration = 5 - } - - private SortMethod _currentSortMethod = SortMethod.Date; - - private bool _sortAscending = true; - private int _selectedItemIndex; - - [SkinControl(10)] - protected GUIListControl _viewsList; - - #endregion - - public ActiveRecordings() - { - GetID = (int)WindowId.ActiveRecordings; - } - - #region Service Agents - - private TvSchedulerServiceAgent _tvSchedulerAgent; - - public ITvSchedulerService TvSchedulerAgent - { - get - { - if (_tvSchedulerAgent == null) - { - _tvSchedulerAgent = new TvSchedulerServiceAgent(); - } - return _tvSchedulerAgent; - } - } - - private TvGuideServiceAgent _tvGuideAgent; - - public ITvGuideService TvGuideAgent - { - get - { - if (_tvGuideAgent == null) - { - _tvGuideAgent = new TvGuideServiceAgent(); - } - return _tvGuideAgent; - } - } - - private TvControlServiceAgent _tvControlAgent; - - public ITvControlService TvControlAgent - { - get - { - if (_tvControlAgent == null) - { - _tvControlAgent = new TvControlServiceAgent(); - } - return _tvControlAgent; - } - } - - private ConfigurationServiceAgent _configurationAgent; - - public IConfigurationService ConfigurationAgent - { - get - { - if (_configurationAgent == null) - { - _configurationAgent = new ConfigurationServiceAgent(); - } - return _configurationAgent; - } - } - - #endregion - - public override void OnAdded() - { - Log.Info("ActiveRecordings:OnAdded"); - Restore(); - PreInit(); - ResetAllControls(); - } - - public override bool IsTv - { - get { return true; } - } - - #region Serialisation - - private void LoadSettings() - { - } - - private void SaveSettings() - { - } - - #endregion - - #region overrides - - public override bool Init() - { - bool bResult = Load(GUIGraphicsContext.Skin + @"\4TR_Active.xml"); - LoadSettings(); - Restore(); - PreInit(); - ResetAllControls(); - return bResult; - } - - public override void OnAction(Action action) - { - switch (action.wID) - { - case Action.ActionType.ACTION_DELETE_ITEM: - { - int itemIndex = GetSelectedItemNo(); - if (itemIndex >= 0) - { - OnAbortRecording(GetItem(itemIndex)); - } - } - break; - } - base.OnAction(action); - } - - protected override void OnPageDestroy(int newWindowId) - { - _selectedItemIndex = GetSelectedItemNo(); - SaveSettings(); - if (_tvSchedulerAgent != null) - { - _tvSchedulerAgent.Dispose(); - } - if (_tvGuideAgent != null) - { - _tvGuideAgent.Dispose(); - } - if (_tvControlAgent != null) - { - _tvControlAgent.Dispose(); - } - if (_configurationAgent != null) - { - _configurationAgent.Dispose(); - } - base.OnPageDestroy(newWindowId); - } - - protected override void OnPageLoad() - { - base.OnPageLoad(); - - LoadSettings(); - LoadActiveRecordings(); - - GUIControl.FocusControl(GetID, 10); - - //_sortByButton.SortChanged += new SortEventHandler(SortChanged); - } - - protected override void OnClicked(int controlId, GUIControl control, global::MediaPortal.GUI.Library.Action.ActionType actionType) - { - base.OnClicked(controlId, control, actionType); - - if (control == _viewsList) - { - GUIMessage msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_ITEM_SELECTED, GetID, 0, control.GetID, 0, 0, null); - OnMessage(msg); - int iItem = (int)msg.Param1; - if (actionType == Action.ActionType.ACTION_SELECT_ITEM) - { - OnPlayRecording(iItem); - } - if (actionType == Action.ActionType.ACTION_SHOW_INFO) - { - OnShowContextMenu(); - } - } - } - - public override bool OnMessage(GUIMessage message) - { - switch (message.Message) - { - case GUIMessage.MessageType.GUI_MSG_ITEM_FOCUS_CHANGED: - UpdateProperties(); - break; - } - return base.OnMessage(message); - } - - protected override void OnShowContextMenu() - { - int iItem = GetSelectedItemNo(); - GUIListItem pItem = GetItem(iItem); - if (pItem == null) return; - if (pItem.IsFolder) return; - ActiveRecording activeRecording = pItem.TVTag as ActiveRecording; - if (activeRecording != null) - { - GUIDialogMenu dlg = (GUIDialogMenu)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU); - if (dlg == null) return; - dlg.Reset(); - dlg.SetHeading(activeRecording.Program.Title); - dlg.AddLocalizedString(655); //Play recorded tv - dlg.AddLocalizedString(1449); //Stop recording - dlg.DoModal(GetID); - switch (dlg.SelectedId) - { - case 655: // Play - PlayRecording(activeRecording, false); - break; - - case 1449: // Abort - OnAbortRecording(pItem); - break; - } - } - } - - private void OnAbortRecording(GUIListItem item) - { - if (item == null) return; - ActiveRecording activeRecording = item.TVTag as ActiveRecording; - if (activeRecording != null) - { - GUIDialogYesNo dlgYesNo = (GUIDialogYesNo)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_YES_NO); - if (dlgYesNo != null) - { - UpcomingProgram program = activeRecording.Program; - - dlgYesNo.SetHeading(Utility.GetLocalizedText(TextId.StopRecording)); - dlgYesNo.SetLine(1, program.Channel.DisplayName); - dlgYesNo.SetLine(2, program.Title); - dlgYesNo.SetLine(3, string.Empty); - dlgYesNo.SetDefaultToYes(false); - dlgYesNo.DoModal(GetID); - - if (dlgYesNo.IsConfirmed) - { - this.TvSchedulerAgent.CancelUpcomingProgram(program.ScheduleId, program.GuideProgramId, - program.Channel.ChannelId, program.StartTime); - _viewsList.ListItems.Remove(item); - GUIControl.RefreshControl(GetID, _viewsList.GetID); - UpdateProperties(); - _selectedItemIndex = GetSelectedItemNo(); - } - } - } - } - - private bool OnPlayRecording(int itemIndex) - { - GUIListItem item = GetItem(itemIndex); - if (item == null) return false; - - ActiveRecording activeRecording = item.TVTag as ActiveRecording; - if (activeRecording != null) - { - return PlayRecording(activeRecording, false); - } - return false; - } - - internal static bool PlayRecording(ActiveRecording activeRecording, bool jumpToLivePoint) - { - using (TvControlServiceAgent tvControlAgent = new TvControlServiceAgent()) - { - Recording recording = tvControlAgent.GetRecordingById(activeRecording.RecordingId); - if (recording != null) - { - int? jumpTo = null; - if (jumpToLivePoint) - { - TimeSpan duration = DateTime.Now - activeRecording.RecordingStartTime; - jumpTo = (int)duration.TotalSeconds - 3; - } - RecordedBase.PlayRecording(recording, jumpTo); - return true; - } - return false; - } - } - - public override void Process() - { - base.Process(); - } - - #endregion - - #region recording methods - - private void LoadActiveRecordings() - { - string strDefaultUnseenIcon = GUIGraphicsContext.Skin + @"\Media\defaultVideoBig.png"; - string strDefaultSeenIcon = GUIGraphicsContext.Skin + @"\Media\defaultVideoSeenBig.png"; - GUIControl.ClearControl(GetID, _viewsList.GetID); - - List<ActiveRecording> activeRecordings = new List<ActiveRecording>( - this.TvControlAgent.GetActiveRecordings()); - foreach (ActiveRecording recording in activeRecordings) - { - GUIListItem item = CreateListItem(recording); - _viewsList.Add(item); - } - - GUIPropertyManager.SetProperty("#itemcount", _viewsList.Count.ToString()); - GUIPropertyManager.SetProperty("#currentmodule", Utility.GetLocalizedText(TextId.ActiveRecordings)); - - UpdateButtonStates(); // OnSort(); - UpdateProperties(); - - if (GetItemCount() > 0) - { - while (_selectedItemIndex >= GetItemCount() && _selectedItemIndex > 0) - { - _selectedItemIndex--; - } - GUIControl.SelectItemControl(GetID, _viewsList.GetID, _selectedItemIndex); - } - } - - private GUIListItem CreateListItem(ActiveRecording activeRecording) - { - GUIListItem item = new GUIListItem(); - string title = activeRecording.Program.CreateProgramTitle(); - item.Label = title; - //item.OnItemSelected += new global::MediaPortal.GUI.Library.GUIListItem.ItemSelectedHandler(item_OnItemSelected); - string logoImagePath = Utility.GetLogoImage(activeRecording.Program.Channel, TvSchedulerAgent); - if (logoImagePath == null - || !System.IO.File.Exists(logoImagePath)) - { - item.Label = String.Format("[{0}] {1}", activeRecording.Program.Channel.DisplayName, title); - logoImagePath = "defaultVideoBig.png"; - } - item.PinImage = Utility.GetIconImageFileName(activeRecording); - item.TVTag = activeRecording; - item.ThumbnailImage = logoImagePath; - item.IconImageBig = logoImagePath; - item.IconImage = logoImagePath; - item.Label2 = String.Format("{0} {1} - {2}", Utility.GetShortDayDateString(activeRecording.Program.StartTime), - activeRecording.Program.StartTime.ToString("t", CultureInfo.CurrentCulture.DateTimeFormat), - activeRecording.Program.StopTime.ToString("t", CultureInfo.CurrentCulture.DateTimeFormat)); - return item; - } - - private void UpdateButtonStates() - { - //_sortByButton.IsAscending = _sortAscending; - _viewsList.IsVisible = true; - } - - private void UpdateProperties() - { - ActiveRecording recording = null; - GUIListItem item = GetItem(GetSelectedItemNo()); - if (item != null) - { - recording = item.TVTag as ActiveRecording; - } - SetProperties(recording); - } - - private void SetProperties(ActiveRecording recording) - { - if (recording == null) - { - GUIPropertyManager.SetProperty("#TV.Active.Channel", String.Empty); - GUIPropertyManager.SetProperty("#TV.Active.Title", String.Empty); - GUIPropertyManager.SetProperty("#TV.Active.Genre", String.Empty); - GUIPropertyManager.SetProperty("#TV.Active.Time", String.Empty); - GUIPropertyManager.SetProperty("#TV.Active.Description", " "); - GUIPropertyManager.SetProperty("#TV.Active.thumb", String.Empty); - } - else - { - GuideProgram guideProgram = recording.Program.GuideProgramId.HasValue ? - this.TvGuideAgent.GetProgramById(recording.Program.GuideProgramId.Value) : null; - - string strTime = string.Format("{0} {1} - {2}", - Utility.GetShortDayDateString(recording.Program.StartTime), - recording.Program.StartTime.ToString("t", CultureInfo.CurrentCulture.DateTimeFormat), - recording.Program.StopTime.ToString("t", CultureInfo.CurrentCulture.DateTimeFormat)); - - GUIPropertyManager.SetProperty("#TV.Active.Channel", recording.Program.Channel.DisplayName); - GUIPropertyManager.SetProperty("#TV.Active.Title", recording.Program.Title); - GUIPropertyManager.SetProperty("#TV.Active.Genre", recording.Program.Category); - GUIPropertyManager.SetProperty("#TV.Active.Time", strTime); - string description; - if (guideProgram == null) - { - description = String.Empty; - } - else - { - description = guideProgram.CreateCombinedDescription(true); - } - GUIPropertyManager.SetProperty("#TV.Active.Description", description); - - string logo = Utility.GetLogoImage(recording.Program.Channel.ChannelId, - recording.Program.Channel.DisplayName, TvSchedulerAgent); - if (System.IO.File.Exists(... [truncated message content] |
From: <fr...@us...> - 2012-07-11 10:05:58
|
Revision: 4499 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4499&view=rev Author: framug Date: 2012-07-11 10:05:47 +0000 (Wed, 11 Jul 2012) Log Message: ----------- - Add "official" MP 1.3 compatibility version plugin. - Add DefaultWide skin. Modified Paths: -------------- trunk/plugins/WebEPGfr/Properties/AssemblyInfo.cs trunk/plugins/WebEPGfr/Properties/Resources.Designer.cs trunk/plugins/WebEPGfr/Properties/Settings.Designer.cs trunk/plugins/WebEPGfr/WebEPGfr.csproj trunk/plugins/WebEPGfr/WebEPGfr_planification/Properties/AssemblyInfo.cs trunk/plugins/WebEPGfr/WebEPGfr_planification/WebEPGfr_planification.csproj Added Paths: ----------- trunk/plugins/WebEPGfr/skin/DefaultWide/ trunk/plugins/WebEPGfr/skin/DefaultWide/Kazer.xml trunk/plugins/WebEPGfr/skin/DefaultWide/Media/ trunk/plugins/WebEPGfr/skin/DefaultWide/Media/hover_WebEPGfr.png trunk/plugins/WebEPGfr/skin/DefaultWide/Media/hover_ZguideTV.png trunk/plugins/WebEPGfr/skin/DefaultWide/Media/hover_kazer.png trunk/plugins/WebEPGfr/skin/DefaultWide/ZguideTV.xml Modified: trunk/plugins/WebEPGfr/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/WebEPGfr/Properties/AssemblyInfo.cs 2012-07-08 20:58:45 UTC (rev 4498) +++ trunk/plugins/WebEPGfr/Properties/AssemblyInfo.cs 2012-07-11 10:05:47 UTC (rev 4499) @@ -2,7 +2,9 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Resources; +using MediaPortal.Common.Utils; + // Les informations générales relatives à un assembly dépendent de // l'ensemble d'attributs suivant. Changez les valeurs de ces attributs pour modifier les informations // associées à un assembly. @@ -35,3 +37,9 @@ [assembly: AssemblyVersion("1.2.0.0")] [assembly: AssemblyFileVersion("1.2.0.0")] [assembly: NeutralResourcesLanguageAttribute("fr-FR")] + +// MediaPortal plugin version compatibility +[assembly: CompatibleVersion("1.2.100.0")] +[assembly: UsesSubsystem("MP.SkinEngine")] +[assembly: UsesSubsystem("MP.Config")] + Modified: trunk/plugins/WebEPGfr/Properties/Resources.Designer.cs =================================================================== --- trunk/plugins/WebEPGfr/Properties/Resources.Designer.cs 2012-07-08 20:58:45 UTC (rev 4498) +++ trunk/plugins/WebEPGfr/Properties/Resources.Designer.cs 2012-07-11 10:05:47 UTC (rev 4499) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // <auto-generated> // Ce code a été généré par un outil. -// Version du runtime :4.0.30319.1 +// Version du runtime :4.0.30319.269 // // Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si // le code est régénéré. Modified: trunk/plugins/WebEPGfr/Properties/Settings.Designer.cs =================================================================== --- trunk/plugins/WebEPGfr/Properties/Settings.Designer.cs 2012-07-08 20:58:45 UTC (rev 4498) +++ trunk/plugins/WebEPGfr/Properties/Settings.Designer.cs 2012-07-11 10:05:47 UTC (rev 4499) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // <auto-generated> // Ce code a été généré par un outil. -// Version du runtime :4.0.30319.1 +// Version du runtime :4.0.30319.269 // // Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si // le code est régénéré. Modified: trunk/plugins/WebEPGfr/WebEPGfr.csproj =================================================================== --- trunk/plugins/WebEPGfr/WebEPGfr.csproj 2012-07-08 20:58:45 UTC (rev 4498) +++ trunk/plugins/WebEPGfr/WebEPGfr.csproj 2012-07-11 10:05:47 UTC (rev 4499) @@ -10,8 +10,7 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>WebEPGfr</RootNamespace> <AssemblyName>WebEPGfr</AssemblyName> - <ApplicationIcon> - </ApplicationIcon> + <ApplicationIcon>WebEPGfr.ico</ApplicationIcon> <FileUpgradeFlags> </FileUpgradeFlags> <UpgradeBackupLocation> @@ -53,11 +52,16 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> + <PlatformTarget>AnyCPU</PlatformTarget> </PropertyGroup> <ItemGroup> + <Reference Include="Common.Utils"> + <HintPath>C:\Program Files (x86)\Team MediaPortal\MediaPortal\Common.Utils.dll</HintPath> + <Private>False</Private> + </Reference> <Reference Include="Core, Version=1.1.6.13175, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\mediaportal\MediaPortal.Application\bin\Release\Core.dll</HintPath> + <HintPath>C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Databases, Version=1.0.2.42467, Culture=neutral, processorArchitecture=x86"> @@ -67,17 +71,17 @@ </Reference> <Reference Include="Dialogs, Version=1.1.6.13177, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\mediaportal\MediaPortal.Application\bin\Release\plugins\Windows\Dialogs.dll</HintPath> + <HintPath>C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Gentle.Common, Version=1.5.0.29053, Culture=neutral, PublicKeyToken=80b5de62e27be49b, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\TvEngine3\TVLibrary\TVLibrary\bin\Release\Gentle.Common.dll</HintPath> + <HintPath>C:\Program Files (x86)\Team MediaPortal\MediaPortal\Gentle.Common.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Gentle.Framework, Version=1.5.0.29053, Culture=neutral, PublicKeyToken=80b5de62e27be49b, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\TvEngine3\TVLibrary\TVLibrary\bin\Release\Gentle.Framework.dll</HintPath> + <HintPath>C:\Program Files (x86)\Team MediaPortal\MediaPortal\Gentle.Framework.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.5.452, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL"> @@ -94,17 +98,17 @@ <Reference Include="System.Xml" /> <Reference Include="TvBusinessLayer, Version=1.1.6.13236, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\TvEngine3\TVLibrary\TVLibrary\bin\Release\TvBusinessLayer.dll</HintPath> + <HintPath>C:\Program Files (x86)\Team MediaPortal\MediaPortal\TvBusinessLayer.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="TVDatabase, Version=1.1.6.13249, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\TvEngine3\TVLibrary\TVDatabase\bin\Release\TVDatabase.dll</HintPath> + <HintPath>C:\Program Files (x86)\Team MediaPortal\MediaPortal\TVDatabase.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Utils, Version=1.1.6.13175, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\mediaportal\MediaPortal.Application\bin\Release\Utils.dll</HintPath> + <HintPath>C:\Program Files (x86)\Team MediaPortal\MediaPortal\Utils.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> @@ -235,6 +239,6 @@ </Target> --> <PropertyGroup> - <PostBuildEvent>copy $(ProjectName).dll "C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows"</PostBuildEvent> + <PostBuildEvent>rem copy $(ProjectName).dll "C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows"</PostBuildEvent> </PropertyGroup> </Project> \ No newline at end of file Modified: trunk/plugins/WebEPGfr/WebEPGfr_planification/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/WebEPGfr/WebEPGfr_planification/Properties/AssemblyInfo.cs 2012-07-08 20:58:45 UTC (rev 4498) +++ trunk/plugins/WebEPGfr/WebEPGfr_planification/Properties/AssemblyInfo.cs 2012-07-11 10:05:47 UTC (rev 4499) @@ -1,7 +1,9 @@ using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; +using MediaPortal.Common.Utils; + // Les informations générales relatives à un assembly dépendent de // l'ensemble d'attributs suivant. Changez les valeurs de ces attributs pour modifier les informations // associées à un assembly. @@ -33,3 +35,9 @@ // en utilisant '*', comme indiqué ci-dessous : [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] + +// MediaPortal plugin version compatibility +[assembly: CompatibleVersion("1.2.100.0")] +[assembly: UsesSubsystem("MP.SkinEngine")] +[assembly: UsesSubsystem("MP.Config")] + Modified: trunk/plugins/WebEPGfr/WebEPGfr_planification/WebEPGfr_planification.csproj =================================================================== --- trunk/plugins/WebEPGfr/WebEPGfr_planification/WebEPGfr_planification.csproj 2012-07-08 20:58:45 UTC (rev 4498) +++ trunk/plugins/WebEPGfr/WebEPGfr_planification/WebEPGfr_planification.csproj 2012-07-11 10:05:47 UTC (rev 4499) @@ -51,11 +51,19 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> + <PlatformTarget>AnyCPU</PlatformTarget> </PropertyGroup> + <PropertyGroup> + <ApplicationIcon>WebEPGfr.ico</ApplicationIcon> + </PropertyGroup> <ItemGroup> + <Reference Include="Common.Utils"> + <HintPath>C:\Program Files (x86)\Team MediaPortal\MediaPortal\Common.Utils.dll</HintPath> + <Private>False</Private> + </Reference> <Reference Include="Core, Version=1.1.6.13175, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\mediaportal\MediaPortal.Application\bin\Release\Core.dll</HintPath> + <HintPath>C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="System" /> @@ -63,7 +71,7 @@ <Reference Include="System.Xml" /> <Reference Include="Utils, Version=1.1.6.13175, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\mediaportal\MediaPortal.Application\bin\Release\Utils.dll</HintPath> + <HintPath>C:\Program Files (x86)\Team MediaPortal\MediaPortal\Utils.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> @@ -101,6 +109,9 @@ <Install>true</Install> </BootstrapperPackage> </ItemGroup> + <ItemGroup> + <Content Include="WebEPGfr.ico" /> + </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. @@ -110,6 +121,6 @@ </Target> --> <PropertyGroup> - <PostBuildEvent>copy $(ProjectName).dll "C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\process"</PostBuildEvent> + <PostBuildEvent>rem copy $(ProjectName).dll "C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\process"</PostBuildEvent> </PropertyGroup> </Project> \ No newline at end of file Added: trunk/plugins/WebEPGfr/skin/DefaultWide/Kazer.xml =================================================================== --- trunk/plugins/WebEPGfr/skin/DefaultWide/Kazer.xml (rev 0) +++ trunk/plugins/WebEPGfr/skin/DefaultWide/Kazer.xml 2012-07-11 10:05:47 UTC (rev 4499) @@ -0,0 +1,243 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<window> + <id>10124</id> + <defaultcontrol>2</defaultcontrol> + <allowoverlay>yes</allowoverlay> + <controls> + <!-- Description de l'écran --> + <control> + <description>BG</description> + <type>image</type> + <id>0</id> + <width>1280</width> + <height>720</height> + </control> + <!-- Description du logo du nom du plugin en haut à gauche --> + <control> + <type>image</type> + <id>0</id> + <posX>80</posX> + <posY>60</posY> + <texture flipY="true" diffuse="Thumb_Mask.png">kazer_logo.png</texture> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="500">WindowClose</animation> + </control> + <!-- Libellé Guide Télé --> + <control> + <description>Libellé Guide Télé</description> + <type>label</type> + <id>0</id> + <posX>365</posX> + <posY>144</posY> + <label>Guide Télé</label> + <font>font16</font> + <align>right</align> + <textcolor>FFFFFFFF</textcolor> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="250">WindowClose</animation> + </control> + <!-- Description du logo en bas à gauche --> + <control> + <type>image</type> + <id>0</id> + <posX>100</posX> + <posY>520</posY> + <width>300</width> + <height>200</height> + <texture>hover_kazer.png</texture> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="500">WindowClose</animation> + </control> + <!-- Description de la date --> + <control> + <description>Date</description> + <type>label</type> + <id>0</id> + <posX>1250</posX> + <posY>20</posY> + <label>#date</label> + <align>right</align> + <font>font14</font> + <textcolor>ffa9d0f7</textcolor> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="500">WindowClose</animation> + </control> + <!-- Description de l'heure --> + <control> + <description>Time</description> + <type>label</type> + <id>0</id> + <posX>1250</posX> + <posY>50</posY> + <label>#time</label> + <align>right</align> + <font>font14</font> + <textcolor>ffa9d0f7</textcolor> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="500">WindowClose</animation> + </control> + <!--**** menu ****--> + <control> + <type>group</type> + <description>group element</description> + <posX>70</posX> + <posY>260</posY> + <layout>StackLayout</layout> + <control> + <description>Guide Télé</description> + <type>button</type> + <id>99</id> + <label>Voir le Guide Télé</label> + <hyperlink>600</hyperlink> + <onleft>99</onleft> + <onright>99</onright> + <onup>99</onup> + <ondown>2</ondown> + </control> + <control> + <description>Download</description> + <type>button</type> + <id>2</id> + <label>Télécharger</label> + <onleft>2</onleft> + <onright>2</onright> + <onup>99</onup> + <ondown>3</ondown> + </control> + <control> + <description>Update</description> + <type>button</type> + <id>3</id> + <label>Mettre à jour</label> + <textcolor>ffffffff</textcolor> + <colordiffuse>ffffffff</colordiffuse> + <onleft>3</onleft> + <onright>3</onright> + <onup>2</onup> + <ondown>9</ondown> + </control> + <control> + <description>Restaurer</description> + <type>button</type> + <id>9</id> + <label>Restaurer</label> + <font>font13</font> + <textcolor>ffffffff</textcolor> + <colordiffuse>ffffffff</colordiffuse> + <onleft>9</onleft> + <onright>9</onright> + <onup>3</onup> + <ondown>99</ondown> + </control> + </control> + <!-- Libellé date tvguide MP --> + <control> + <description>Libellé date tvguide MP</description> + <type>label</type> + <id>4</id> + <posX>350</posX> + <posY>260</posY> + <label>Date du guide télé de MediaPortal : </label> + <align>left</align> + <textcolor>White</textcolor> + </control> + <!-- Libellé date tvguide kazer (caché par défaut) --> + <control> + <description>Libellé date tvguide kazer</description> + <type>label</type> + <id>5</id> + <posX>350</posX> + <posY>290</posY> + <label>Date du guide télé de kazer : </label> + <align>left</align> + <textcolor>ffffffff</textcolor> + <colordiffuse>ffffffff</colordiffuse> + </control> + <!-- Libellé date de la sauvegarde (caché par défaut) --> + <control> + <description>Libellé date de la sauvegarde</description> + <type>label</type> + <id>10</id> + <posX>350</posX> + <posY>320</posY> + <label>Date de la dernière sauvegarde : </label> + <align>left</align> + <font>font13</font> + <textcolor>ffffffff</textcolor> + <colordiffuse>ffffffff</colordiffuse> + </control> + <!-- Libellé date du guide télé dans la sauvegarde (caché par défaut) --> + <control> + <description>Libellé date du guide télé dans la sauvegarde</description> + <type>label</type> + <id>11</id> + <posX>350</posX> + <posY>350</posY> + <label>Date du guide Télé dans la sauvegarde : </label> + <align>left</align> + <font>font13</font> + <textcolor>ffffffff</textcolor> + <colordiffuse>ffffffff</colordiffuse> + </control> + <!-- date tvguide MediaPortal --> + <control> + <description>date tvguide MediaPortal</description> + <type>label</type> + <id>6</id> + <posX>850</posX> + <posY>260</posY> + <label>-</label> + <align>left</align> + <textcolor>White</textcolor> + </control> + <!-- date tvguide kazer (caché par défaut) --> + <control> + <description>date tvguide kazer</description> + <type>label</type> + <id>7</id> + <posX>850</posX> + <posY>290</posY> + <label>-</label> + <align>left</align> + <textcolor>ffffffff</textcolor> + <colordiffuse>ffffffff</colordiffuse> + </control> + <!-- date de la sauvegarde (caché par défaut) --> + <control> + <description>date de la sauvegarde</description> + <type>label</type> + <id>12</id> + <posX>850</posX> + <posY>320</posY> + <label>-</label> + <align>left</align> + <font>font13</font> + <textcolor>ffffffff</textcolor> + <colordiffuse>ffffffff</colordiffuse> + </control> + <!-- date du guide télé dans la sauvegarde (caché par défaut) --> + <control> + <description>date du guide télé dans la sauvegarde</description> + <type>label</type> + <id>13</id> + <posX>850</posX> + <posY>350</posY> + <label>-</label> + <align>left</align> + <font>font13</font> + <textcolor>ffffffff</textcolor> + <colordiffuse>ffffffff</colordiffuse> + </control> + <!-- Libellé d'information --> + <control> + <description>Libellé d'information</description> + <type>label</type> + <id>8</id> + <posX>500</posX> + <posY>600</posY> + <label>-</label> + <align>left</align> + <textcolor>White</textcolor> + </control> + </controls> +</window> \ No newline at end of file Added: trunk/plugins/WebEPGfr/skin/DefaultWide/Media/hover_WebEPGfr.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/WebEPGfr/skin/DefaultWide/Media/hover_WebEPGfr.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/WebEPGfr/skin/DefaultWide/Media/hover_ZguideTV.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/WebEPGfr/skin/DefaultWide/Media/hover_ZguideTV.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/WebEPGfr/skin/DefaultWide/Media/hover_kazer.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/WebEPGfr/skin/DefaultWide/Media/hover_kazer.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/WebEPGfr/skin/DefaultWide/ZguideTV.xml =================================================================== --- trunk/plugins/WebEPGfr/skin/DefaultWide/ZguideTV.xml (rev 0) +++ trunk/plugins/WebEPGfr/skin/DefaultWide/ZguideTV.xml 2012-07-11 10:05:47 UTC (rev 4499) @@ -0,0 +1,243 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<window> + <id>10124</id> + <defaultcontrol>2</defaultcontrol> + <allowoverlay>yes</allowoverlay> + <controls> + <!-- Description de l'écran --> + <control> + <description>BG</description> + <type>image</type> + <id>0</id> + <width>1280</width> + <height>720</height> + </control> + <!-- Description du logo du nom du plugin en haut à gauche --> + <control> + <type>image</type> + <id>0</id> + <posX>80</posX> + <posY>60</posY> + <texture flipY="true" diffuse="Thumb_Mask.png">ZguideTV_logo.png</texture> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="500">WindowClose</animation> + </control> + <!-- Libellé Guide Télé --> + <control> + <description>Libellé Guide Télé</description> + <type>label</type> + <id>0</id> + <posX>400</posX> + <posY>144</posY> + <label>Guide Télé</label> + <font>font16</font> + <align>right</align> + <textcolor>FFFFFFFF</textcolor> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="250">WindowClose</animation> + </control> + <!-- Description du logo en bas à gauche --> + <control> + <type>image</type> + <id>0</id> + <posX>100</posX> + <posY>520</posY> + <width>300</width> + <height>200</height> + <texture>hover_ZguideTV.png</texture> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="500">WindowClose</animation> + </control> + <!-- Description de la date --> + <control> + <description>Date</description> + <type>label</type> + <id>0</id> + <posX>1250</posX> + <posY>20</posY> + <label>#date</label> + <align>right</align> + <font>font14</font> + <textcolor>ffa9d0f7</textcolor> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="500">WindowClose</animation> + </control> + <!-- Description de l'heure --> + <control> + <description>Time</description> + <type>label</type> + <id>0</id> + <posX>1250</posX> + <posY>50</posY> + <label>#time</label> + <align>right</align> + <font>font14</font> + <textcolor>ffa9d0f7</textcolor> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="500">WindowClose</animation> + </control> + <!--**** menu ****--> + <control> + <type>group</type> + <description>group element</description> + <posX>70</posX> + <posY>260</posY> + <layout>StackLayout</layout> + <control> + <description>Guide Télé</description> + <type>button</type> + <id>99</id> + <label>Voir le Guide Télé</label> + <hyperlink>600</hyperlink> + <onleft>99</onleft> + <onright>99</onright> + <onup>99</onup> + <ondown>2</ondown> + </control> + <control> + <description>Download</description> + <type>button</type> + <id>2</id> + <label>Télécharger</label> + <onleft>2</onleft> + <onright>2</onright> + <onup>99</onup> + <ondown>3</ondown> + </control> + <control> + <description>Update</description> + <type>button</type> + <id>3</id> + <label>Mettre à jour</label> + <textcolor>ffffffff</textcolor> + <colordiffuse>ffffffff</colordiffuse> + <onleft>3</onleft> + <onright>3</onright> + <onup>2</onup> + <ondown>9</ondown> + </control> + <control> + <description>Restaurer</description> + <type>button</type> + <id>9</id> + <label>Restaurer</label> + <font>font13</font> + <textcolor>ffffffff</textcolor> + <colordiffuse>ffffffff</colordiffuse> + <onleft>9</onleft> + <onright>9</onright> + <onup>3</onup> + <ondown>99</ondown> + </control> + </control> + <!-- Libellé date tvguide MP --> + <control> + <description>Libellé date tvguide MP</description> + <type>label</type> + <id>4</id> + <posX>350</posX> + <posY>260</posY> + <label>Date du guide télé de MediaPortal : </label> + <align>left</align> + <textcolor>White</textcolor> + </control> + <!-- Libellé date tvguide ZguideTV (caché par défaut) --> + <control> + <description>Libellé date tvguide ZguideTV</description> + <type>label</type> + <id>5</id> + <posX>350</posX> + <posY>290</posY> + <label>Date du guide télé de ZguideTV : </label> + <align>left</align> + <textcolor>ffffffff</textcolor> + <colordiffuse>ffffffff</colordiffuse> + </control> + <!-- Libellé date de la sauvegarde (caché par défaut) --> + <control> + <description>Libellé date de la sauvegarde</description> + <type>label</type> + <id>10</id> + <posX>350</posX> + <posY>320</posY> + <label>Date de la dernière sauvegarde : </label> + <align>left</align> + <font>font13</font> + <textcolor>ffffffff</textcolor> + <colordiffuse>ffffffff</colordiffuse> + </control> + <!-- Libellé date du guide télé dans la sauvegarde (caché par défaut) --> + <control> + <description>Libellé date du guide télé dans la sauvegarde</description> + <type>label</type> + <id>11</id> + <posX>350</posX> + <posY>350</posY> + <label>Date du guide Télé dans la sauvegarde : </label> + <align>left</align> + <font>font13</font> + <textcolor>ffffffff</textcolor> + <colordiffuse>ffffffff</colordiffuse> + </control> + <!-- date tvguide MediaPortal --> + <control> + <description>date tvguide MediaPortal</description> + <type>label</type> + <id>6</id> + <posX>850</posX> + <posY>260</posY> + <label>-</label> + <align>left</align> + <textcolor>White</textcolor> + </control> + <!-- date tvguide ZguideTV (caché par défaut) --> + <control> + <description>date tvguide ZguideTV</description> + <type>label</type> + <id>7</id> + <posX>850</posX> + <posY>290</posY> + <label>-</label> + <align>left</align> + <textcolor>ffffffff</textcolor> + <colordiffuse>ffffffff</colordiffuse> + </control> + <!-- date de la sauvegarde (caché par défaut) --> + <control> + <description>date de la sauvegarde</description> + <type>label</type> + <id>12</id> + <posX>850</posX> + <posY>320</posY> + <label>-</label> + <align>left</align> + <font>font13</font> + <textcolor>ffffffff</textcolor> + <colordiffuse>ffffffff</colordiffuse> + </control> + <!-- date du guide télé dans la sauvegarde (caché par défaut) --> + <control> + <description>date du guide télé dans la sauvegarde</description> + <type>label</type> + <id>13</id> + <posX>850</posX> + <posY>350</posY> + <label>-</label> + <align>left</align> + <font>font13</font> + <textcolor>ffffffff</textcolor> + <colordiffuse>ffffffff</colordiffuse> + </control> + <!-- Libellé d'information --> + <control> + <description>Libellé d'information</description> + <type>label</type> + <id>8</id> + <posX>500</posX> + <posY>600</posY> + <label>-</label> + <align>left</align> + <textcolor>White</textcolor> + </control> + </controls> +</window> \ 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: <dos...@us...> - 2012-07-08 20:58:51
|
Revision: 4498 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4498&view=rev Author: doskabouter Date: 2012-07-08 20:58:45 +0000 (Sun, 08 Jul 2012) Log Message: ----------- fixed pageup/pagedown when zoom is not 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 2012-07-07 18:41:12 UTC (rev 4497) +++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-07-08 20:58:45 UTC (rev 4498) @@ -795,7 +795,7 @@ { if (!mouseVisible) { - int height = webBrowser.Size.Height; + int height = Convert.ToInt32((float)webBrowser.Size.Height / zoom); if (webBrowser.Window != null) ScrollTo(webBrowser.Window.ScrollX, webBrowser.Window.ScrollY - height + 100); } else @@ -808,7 +808,7 @@ { if (!mouseVisible) { - int height = webBrowser.Size.Height; + int height = Convert.ToInt32((float)webBrowser.Size.Height / zoom); if (webBrowser.Window != null) ScrollTo(webBrowser.Window.ScrollX, webBrowser.Window.ScrollY + height - 100); } else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mca...@us...> - 2012-07-07 18:41:19
|
Revision: 4497 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4497&view=rev Author: mcarter2006 Date: 2012-07-07 18:41:12 +0000 (Sat, 07 Jul 2012) Log Message: ----------- Modified Paths: -------------- trunk/plugins/UKTVThumb/Normal/package/UK_Logos.mpe1 trunk/plugins/UKTVThumb/Normal/update.xml Modified: trunk/plugins/UKTVThumb/Normal/package/UK_Logos.mpe1 =================================================================== (Binary files differ) Modified: trunk/plugins/UKTVThumb/Normal/update.xml =================================================================== --- trunk/plugins/UKTVThumb/Normal/update.xml 2012-07-07 12:29:14 UTC (rev 4496) +++ trunk/plugins/UKTVThumb/Normal/update.xml 2012-07-07 18:41:12 UTC (rev 4497) @@ -90,8 +90,8 @@ </MinVersion> <MaxVersion> <Major>1</Major> - <Minor>2</Minor> - <Build>100</Build> + <Minor>1</Minor> + <Build>6</Build> <Revision>27644</Revision> </MaxVersion> <WarnOnly>false</WarnOnly> @@ -114,16 +114,16 @@ <Major>5</Major> <Minor>0</Minor> <Build>0</Build> - <Revision>1</Revision> + <Revision>2</Revision> </Version> - <ExtensionDescription>In this pack you find a large selection of UK TV and Radio channel logos. If the logo you require isn't in this pack, let me know or create your own. Please if you do make your own logos for a channel remember to share them with the rest of the community on this thread. - -Standard TV thumbs are designed to simply use the channels logo with a transparent background and all TV logos are 80x80px. The radio guide uses the channel logo with a black background at 300x300px. - -Glossy TV & radio thumbs are 100x100px with a colour background. - -Duplicate logos are included due to different default names on Freeview and FreeToAir. All regional naming variations for BBC and ITV should be included, if I've missed yours let me know. - + <ExtensionDescription>In this pack you find a large selection of UK TV and Radio channel logos. If the logo you require isn't in this pack, let me know or create your own. Please if you do make your own logos for a channel remember to share them with the rest of the community on this thread. + +Standard TV thumbs are designed to simply use the channels logo with a transparent background and all TV logos are 80x80px. The radio guide uses the channel logo with a black background at 300x300px. + +Glossy TV & radio thumbs are 100x100px with a colour background. + +Duplicate logos are included due to different default names on Freeview and FreeToAir. All regional naming variations for BBC and ITV should be included, if I've missed yours let me know. + Big thanks go to cheetah05 for the glossy template and the core of the Freeview TV logos. Thanks also go to Mew, TritonT, jsimo01, Jasmeet_181 and many others.</ExtensionDescription> <VersionDescription>TV and Radio logos for UK Freeview & Freesat.</VersionDescription> <DevelopmentStatus>Stable</DevelopmentStatus> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mca...@us...> - 2012-07-07 12:29:20
|
Revision: 4496 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4496&view=rev Author: mcarter2006 Date: 2012-07-07 12:29:14 +0000 (Sat, 07 Jul 2012) Log Message: ----------- Modified Paths: -------------- trunk/plugins/UKTVThumb/Normal/package/UK_Logos.mpe1 trunk/plugins/UKTVThumb/Normal/update.xml Modified: trunk/plugins/UKTVThumb/Normal/package/UK_Logos.mpe1 =================================================================== (Binary files differ) Modified: trunk/plugins/UKTVThumb/Normal/update.xml =================================================================== --- trunk/plugins/UKTVThumb/Normal/update.xml 2012-07-06 17:36:09 UTC (rev 4495) +++ trunk/plugins/UKTVThumb/Normal/update.xml 2012-07-07 12:29:14 UTC (rev 4496) @@ -21,6 +21,38 @@ <Items /> </Files> </GroupItem> + <GroupItem Name="Terrestrial-Standard"> + <DisplayName>Terrestrial-Standard</DisplayName> + <DefaulChecked>true</DefaulChecked> + <Description>Terrestrial-Standard</Description> + <Files> + <Items /> + </Files> + </GroupItem> + <GroupItem Name="Satellite-Standard"> + <DisplayName>Satellite-Standard</DisplayName> + <DefaulChecked>true</DefaulChecked> + <Description>Satellite-Standard</Description> + <Files> + <Items /> + </Files> + </GroupItem> + <GroupItem Name="Terrestrial-Glossy"> + <DisplayName>Terrestrial-Glossy</DisplayName> + <DefaulChecked>true</DefaulChecked> + <Description>Terrestrial-Glossy</Description> + <Files> + <Items /> + </Files> + </GroupItem> + <GroupItem Name="Satellite-Glossy"> + <DisplayName>Satellite-Glossy</DisplayName> + <DefaulChecked>true</DefaulChecked> + <Description>Satellite-Glossy</Description> + <Files> + <Items /> + </Files> + </GroupItem> </Items> </Groups> <Sections> @@ -40,11 +72,11 @@ <MaxVersion> <Major>1</Major> <Minor>2</Minor> - <Build>9</Build> - <Revision>0</Revision> + <Build>100</Build> + <Revision>100</Revision> </MaxVersion> <WarnOnly>true</WarnOnly> - <Message>requires Installer version 1.1.8.0 to 1.2.0.0.</Message> + <Message>requires Installer version 1.1.8.0 to 1.3.0.0.</Message> <Name>Installer</Name> </DependencyItem> <DependencyItem> @@ -58,12 +90,12 @@ </MinVersion> <MaxVersion> <Major>1</Major> - <Minor>1</Minor> - <Build>6</Build> + <Minor>2</Minor> + <Build>100</Build> <Revision>27644</Revision> </MaxVersion> <WarnOnly>false</WarnOnly> - <Message>requires MediaPortal version 1.1.6.27644 to 1.2.0.0.</Message> + <Message>requires MediaPortal version 1.1.6.27644 to 1.3.0.0.</Message> <Name>MediaPortal</Name> </DependencyItem> </Items> @@ -82,21 +114,21 @@ <Major>5</Major> <Minor>0</Minor> <Build>0</Build> - <Revision>0</Revision> + <Revision>1</Revision> </Version> - <ExtensionDescription>In this pack you find a large selection of UK TV and Radio channel logos. If the logo you require isn't in this pack, let me know or create your own. Please if you do make your own logos for a channel remember to share them with the rest of the community on this thread. - -Standard TV thumbs are designed to simply use the channels logo with a transparent background and all TV logos are 80x80px. The radio guide uses the channel logo with a black background at 300x300px. - -Glossy TV & radio thumbs are 100x100px with a colour background. - -Duplicate logos are included due to different default names on Freeview and FreeToAir. All regional naming variations for BBC and ITV should be included, if I've missed yours let me know. - + <ExtensionDescription>In this pack you find a large selection of UK TV and Radio channel logos. If the logo you require isn't in this pack, let me know or create your own. Please if you do make your own logos for a channel remember to share them with the rest of the community on this thread. + +Standard TV thumbs are designed to simply use the channels logo with a transparent background and all TV logos are 80x80px. The radio guide uses the channel logo with a black background at 300x300px. + +Glossy TV & radio thumbs are 100x100px with a colour background. + +Duplicate logos are included due to different default names on Freeview and FreeToAir. All regional naming variations for BBC and ITV should be included, if I've missed yours let me know. + Big thanks go to cheetah05 for the glossy template and the core of the Freeview TV logos. Thanks also go to Mew, TritonT, jsimo01, Jasmeet_181 and many others.</ExtensionDescription> <VersionDescription>TV and Radio logos for UK Freeview & Freesat.</VersionDescription> <DevelopmentStatus>Stable</DevelopmentStatus> <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/UKTVThumb/Normal/package/UK_Logos.mpe1</OnlineLocation> - <ReleaseDate>2012-05-21T21:46:40</ReleaseDate> + <ReleaseDate>2012-07-07T21:46:40</ReleaseDate> <Tags>logos, thumbs, tv, radio</Tags> <Location>C:\Users\Matthew\Documents\TV Logos\Logos\mp-plugins\UKTVThumb\Normal\package\UK_Logos.mpe1</Location> <Params> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mic...@us...> - 2012-07-06 17:36:19
|
Revision: 4495 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4495&view=rev Author: michael-t Date: 2012-07-06 17:36:09 +0000 (Fri, 06 Jul 2012) Log Message: ----------- Stable Version 1.2.3.3 Modified Paths: -------------- trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/Common.Utils.dll trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/Core.dll trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/Gentle.Common.dll trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/Gentle.Framework.dll trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/PluginBase.dll trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/SetupControls.dll trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/TVDatabase.dll trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/TVLibrary.dll trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/TvBusinessLayer.dll trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/TvControl.dll trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/TvLibrary.Interfaces.dll trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/TvService.exe trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/Utils.dll trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/EPGWakeupConfig.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IEpgHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerController.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerScheduler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerSettings.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IStandbyHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IWakeupHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/PowerManager.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/PowerSchedulerEventArgs.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/PowerSettings.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Properties/AssemblyInfo.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/RemotePowerControl.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/TimerException.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/WaitableTimer.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/WakeOnLanManager.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/MPEI/PowerScheduler++.xmp2 trunk/plugins/PowerScheduler++/Stable/1.2.3.3/MPEI/update.xml trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ActiveNetworkStandbyHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ActiveSharesStandbyHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ActiveStreamsStandbyHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ControllerActiveStandbyHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/EpgGrabbingStandbyWakeupHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/LocalClientStandbyHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/LocalClientWakeupHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/PowerControllerStandbyHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/PowerControllerWakeupHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ProcessActiveStandbyHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/RebootWakeupHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/RemoteClientStandbyHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ScheduledRecordingsWakeupHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/XmlTvImportWakeupHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerScheduler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerSchedulerFactory.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerSchedulerPlugin.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Properties/AssemblyInfo.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Setup/PowerSchedulerSetup.Designer.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Setup/PowerSchedulerSetup.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Setup/PowerSchedulerSetup.resx trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Setup/PowerSettingsForm.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Setup/SelectProcessForm.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/WindowsController.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/VersionInfo.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/mediaportal/PowerSchedulerClientPlugin/Handlers/ActiveNetworkStandbyHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/mediaportal/PowerSchedulerClientPlugin/Handlers/ActiveSharesStandbyHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/mediaportal/PowerSchedulerClientPlugin/Handlers/ProcessActiveStandbyHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/mediaportal/PowerSchedulerClientPlugin/Handlers/RebootWakeupHandler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/mediaportal/PowerSchedulerClientPlugin/PowerScheduler.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/mediaportal/PowerSchedulerClientPlugin/PowerSchedulerClientPlugin.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/mediaportal/PowerSchedulerClientPlugin/PowerSchedulerFactory.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/mediaportal/PowerSchedulerClientPlugin/Properties/AssemblyInfo.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/mediaportal/PowerSchedulerClientPlugin/Setup/PowerSchedulerSetup.Designer.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/mediaportal/PowerSchedulerClientPlugin/Setup/PowerSchedulerSetup.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/mediaportal/PowerSchedulerClientPlugin/Setup/PowerSchedulerSetup.resx trunk/plugins/PowerScheduler++/Stable/1.2.3.3/mediaportal/PowerSchedulerClientPlugin/Setup/PowerSettingsForm.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/mediaportal/PowerSchedulerClientPlugin/Setup/SelectProcessForm.cs trunk/plugins/PowerScheduler++/Stable/1.2.3.3/mediaportal/PowerSchedulerClientPlugin/UnattendedWindow.cs Added Paths: ----------- trunk/plugins/PowerScheduler++/Stable/1.2.3.3/ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/MPEI/PowerScheduler++ 1.2.3.3.mpe1 Removed Paths: ------------- trunk/plugins/PowerScheduler++/Stable/1.2.3.3/MPEI/PowerScheduler++ 1.2.3.0.mpe1 Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/Common.Utils.dll =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/Core.dll =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/Gentle.Common.dll =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/Gentle.Framework.dll =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/PluginBase.dll =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/SetupControls.dll =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/TVDatabase.dll =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/TVLibrary.dll =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/TvBusinessLayer.dll =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/TvControl.dll =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/TvLibrary.Interfaces.dll =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/TvService.exe =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Binaries/Utils.dll =================================================================== (Binary files differ) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/EPGWakeupConfig.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/Common-MP-TVE3/PowerScheduler.Interfaces/EPGWakeupConfig.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/EPGWakeupConfig.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IEpgHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IEpgHandler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IEpgHandler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerController.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerController.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerController.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerScheduler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerScheduler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerScheduler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerSettings.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerSettings.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IPowerSettings.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IStandbyHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IStandbyHandler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IStandbyHandler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IWakeupHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IWakeupHandler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Interfaces/IWakeupHandler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/PowerManager.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/Common-MP-TVE3/PowerScheduler.Interfaces/PowerManager.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/PowerManager.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/PowerSchedulerEventArgs.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/Common-MP-TVE3/PowerScheduler.Interfaces/PowerSchedulerEventArgs.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/PowerSchedulerEventArgs.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/PowerSettings.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/Common-MP-TVE3/PowerScheduler.Interfaces/PowerSettings.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/PowerSettings.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/Common-MP-TVE3/PowerScheduler.Interfaces/Properties/AssemblyInfo.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/Properties/AssemblyInfo.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/RemotePowerControl.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/Common-MP-TVE3/PowerScheduler.Interfaces/RemotePowerControl.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/RemotePowerControl.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/TimerException.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/Common-MP-TVE3/PowerScheduler.Interfaces/TimerException.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/TimerException.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/WaitableTimer.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/Common-MP-TVE3/PowerScheduler.Interfaces/WaitableTimer.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/WaitableTimer.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/WakeOnLanManager.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/Common-MP-TVE3/PowerScheduler.Interfaces/WakeOnLanManager.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/Common-MP-TVE3/PowerScheduler.Interfaces/WakeOnLanManager.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Deleted: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/MPEI/PowerScheduler++ 1.2.3.0.mpe1 =================================================================== (Binary files differ) Added: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/MPEI/PowerScheduler++ 1.2.3.3.mpe1 =================================================================== (Binary files differ) Property changes on: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/MPEI/PowerScheduler++ 1.2.3.3.mpe1 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/MPEI/PowerScheduler++.xmp2 =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/MPEI/PowerScheduler++.xmp2 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/MPEI/PowerScheduler++.xmp2 2012-07-06 17:36:09 UTC (rev 4495) @@ -98,7 +98,7 @@ <Description /> </SectionParam> <SectionParam Name="Description"> - <Value>This will install the [Name] [Version] plugin on your computer. This plugin is designed for MediaPortal 1.2.x and will not work with other MediaPortal releases. + <Value>This will install the [Name] [Version] plugin on your computer. This plugin is designed for MediaPortal 1.2.x and 1.3 and will not work with other MediaPortal releases. It is recommended that you close all other applications before continuing. @@ -476,18 +476,18 @@ <Id /> <MinVersion> <Major>1</Major> - <Minor>1</Minor> - <Build>6</Build> - <Revision>27644</Revision> + <Minor>2</Minor> + <Build>0</Build> + <Revision>0</Revision> </MinVersion> <MaxVersion> <Major>1</Major> - <Minor>2</Minor> - <Build>99999</Build> - <Revision>99999</Revision> + <Minor>3</Minor> + <Build>5</Build> + <Revision>0</Revision> </MaxVersion> <WarnOnly>false</WarnOnly> - <Message>For MediaPortal release 1.2.x (not compatible with 1.1.x releases)</Message> + <Message>For MediaPortal version 1.2.x and 1.3 (not compatible with 1.1.x)</Message> <Name>PowerScheduler++</Name> </DependencyItem> <DependencyItem> @@ -506,7 +506,7 @@ <Revision>27644</Revision> </MaxVersion> <WarnOnly>false</WarnOnly> - <Message>For MediaPortal release 1.2.x (not compatible with 1.1.x releases)</Message> + <Message>For MediaPortal version 1.2.x and 1.3 (not compatible with 1.1.x)</Message> <Name>PowerScheduler++</Name> </DependencyItem> </Items> @@ -525,21 +525,25 @@ <Major>1</Major> <Minor>2</Minor> <Build>3</Build> - <Revision>0</Revision> + <Revision>3</Revision> </Version> - <ExtensionDescription>The PowerScheduler++ plugin is a replacement for the PowerScheduler plugin that comes as part of MediaPortal. Compared to the original PowerScheduler plugin it provides additional features: -- Plug&Play mode (just select profile and idle time) -- Windows power settings are made automatically -- Away mode is individually configurable for each standby handler (EPG, Network, Process, ...) -- Client settings are automatically matched to server configuration on single-seat scenarios -- Configurable scheduler for automatic system reboot -- Processes, Network monitor and Active shares also for standalone clients -- Audio is unmuted after wakeup or return from away mode if necessary + <ExtensionDescription>The PowerScheduler++ plugin is a replacement for the PowerScheduler plugin that comes as part of MediaPortal. Compared to the original PowerScheduler plugin it provides additional features: +- Plug&Play mode (just select profile and idle time) +- Windows power settings are made automatically +- Away mode is individually configurable for each standby handler (EPG, Network, Process, ...) +- Client settings are automatically matched to server configuration on single-seat scenarios +- Configurable scheduler for automatic system reboot +- Processes, Network monitor and Active shares also for standalone clients +- Audio is unmuted after wakeup or return from away mode if necessary - ...</ExtensionDescription> - <VersionDescription>Version 1.2.3.0 - Stable version for MP 1.2.x</VersionDescription> + <VersionDescription>Version 1.2.3.3 - Stable version for MP 1.2.x and 1.3 +- added awaymode/runmode attributes for external command (client only) +- removed workaround for 1.3 alpha compatibilty +- improved exception handling for ActiveNetworkStandbyHandler +- fixed RemoteClient standby handler and activity signalling</VersionDescription> <DevelopmentStatus>Stable</DevelopmentStatus> <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=24</OnlineLocation> - <ReleaseDate>2012-05-15T16:03:54</ReleaseDate> + <ReleaseDate>2012-07-02T16:03:54</ReleaseDate> <Tags>tv server plugins, automation</Tags> <Location>..\MPEI\[Name] [Version].mpe1</Location> <Params> @@ -631,14 +635,14 @@ <Param1 /> <UpdateOption>OverwriteIfOlder</UpdateOption> <LocalFileName>PowerScheduler_high.png</LocalFileName> - <ZipFileName>Installer{CopyFile}\{34eff1a4-e2c5-45b8-bec9-5dee831bdf50}-PowerScheduler_high.png</ZipFileName> + <ZipFileName>Installer{CopyFile}\{a677e5c5-290b-4c00-a59c-743b364b8777}-PowerScheduler_high.png</ZipFileName> <DestinationFilename /> </FileItem> <FileItem InstallType="CopyFile" SystemFile="true" Modified="true"> <Param1 /> <UpdateOption>OverwriteIfOlder</UpdateOption> <LocalFileName>..\mediaportal\PowerSchedulerClientPlugin\PowerScheduler.gif</LocalFileName> - <ZipFileName>Installer{CopyFile}\{022dd12c-f3ff-4cf1-a006-f456ecdba65c}-PowerScheduler.gif</ZipFileName> + <ZipFileName>Installer{CopyFile}\{97a773fa-9d37-4a89-b147-925ae48de647}-PowerScheduler.gif</ZipFileName> <DestinationFilename /> </FileItem> </Items> Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/MPEI/update.xml =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/MPEI/update.xml 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/MPEI/update.xml 2012-07-06 17:36:09 UTC (rev 4495) @@ -56,11 +56,11 @@ <MaxVersion> <Major>1</Major> <Minor>2</Minor> - <Build>99999</Build> - <Revision>99999</Revision> + <Build>9</Build> + <Revision>0</Revision> </MaxVersion> <WarnOnly>false</WarnOnly> - <Message>For MediaPortal release 1.2.x (not compatible with 1.1.x releases)</Message> + <Message>For MediaPortal release 1.2.x (not compatible with 1.3 alpha and 1.1.x releases)</Message> <Name>PowerScheduler++</Name> </DependencyItem> <DependencyItem> @@ -79,7 +79,7 @@ <Revision>27644</Revision> </MaxVersion> <WarnOnly>false</WarnOnly> - <Message>For MediaPortal release 1.2.x (not compatible with 1.1.x releases)</Message> + <Message>For MediaPortal release 1.2.x (not compatible with with 1.3 alpha and 1.1.x releases)</Message> <Name>PowerScheduler++</Name> </DependencyItem> </Items> @@ -159,5 +159,167 @@ </ProjectSettings> <IsSkin>false</IsSkin> </PackageClass> + <PackageClass> + <Version>2.0</Version> + <Groups> + <Items> + <GroupItem Name="Server files"> + <DisplayName>Server files</DisplayName> + <DefaulChecked>true</DefaulChecked> + <Description>Server files</Description> + <Files> + <Items /> + </Files> + </GroupItem> + <GroupItem Name="Client files"> + <DisplayName>Client files</DisplayName> + <DefaulChecked>true</DefaulChecked> + <Description>Client files</Description> + <Files> + <Items /> + </Files> + </GroupItem> + <GroupItem Name="Original Files"> + <DisplayName>Original Files</DisplayName> + <DefaulChecked>true</DefaulChecked> + <Description>Original Files</Description> + <Files> + <Items /> + </Files> + </GroupItem> + <GroupItem Name="Never"> + <DisplayName>Never</DisplayName> + <DefaulChecked>true</DefaulChecked> + <Description>Never</Description> + <Files> + <Items /> + </Files> + </GroupItem> + </Items> + </Groups> + <Sections> + <Items /> + </Sections> + <Dependencies> + <Items> + <DependencyItem> + <Type>Installer</Type> + <Id /> + <MinVersion> + <Major>1</Major> + <Minor>2</Minor> + <Build>0</Build> + <Revision>0</Revision> + </MinVersion> + <MaxVersion> + <Major>1</Major> + <Minor>3</Minor> + <Build>5</Build> + <Revision>0</Revision> + </MaxVersion> + <WarnOnly>false</WarnOnly> + <Message>For MediaPortal version 1.2.x and 1.3 (not compatible with 1.1.x)</Message> + <Name>PowerScheduler++</Name> + </DependencyItem> + <DependencyItem> + <Type>MediaPortal</Type> + <Id /> + <MinVersion> + <Major>1</Major> + <Minor>1</Minor> + <Build>6</Build> + <Revision>27644</Revision> + </MinVersion> + <MaxVersion> + <Major>1</Major> + <Minor>3</Minor> + <Build>5</Build> + <Revision>0</Revision> + </MaxVersion> + <WarnOnly>false</WarnOnly> + <Message>For MediaPortal version 1.2.x and 1.3 (not compatible with 1.1.x)</Message> + <Name>PowerScheduler++</Name> + </DependencyItem> + </Items> + </Dependencies> + <PluginDependencies> + <Items /> + </PluginDependencies> + <GeneralInfo> + <Name>PowerScheduler++</Name> + <Id>9b9bc24e-69ca-4abc-8810-f8f95bd4bbe6</Id> + <Author>michael_t (based on PowerScheduler by micheloe)</Author> + <HomePage>http://www.team-mediaportal.com/extensions/other/powerscheduler</HomePage> + <ForumPage>http://forum.team-mediaportal.com/tv-server-plugins-294/powerscheduler-1-2-2-1-stable-version-mediaportal-1-2-1-final-95463/#post733512</ForumPage> + <UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=52</UpdateUrl> + <Version> + <Major>1</Major> + <Minor>2</Minor> + <Build>3</Build> + <Revision>3</Revision> + </Version> + <ExtensionDescription>The PowerScheduler++ plugin is a replacement for the PowerScheduler plugin that comes as part of MediaPortal. Compared to the original PowerScheduler plugin it provides additional features: +- Plug&Play mode (just select profile and idle time) +- Windows power settings are made automatically +- Away mode is individually configurable for each standby handler (EPG, Network, Process, ...) +- Client settings are automatically matched to server configuration on single-seat scenarios +- Configurable scheduler for automatic system reboot +- Processes, Network monitor and Active shares also for standalone clients +- Audio is unmuted after wakeup or return from away mode if necessary +- ...</ExtensionDescription> + <VersionDescription>Version 1.2.3.3 - Stable version for MP 1.2.x and 1.3 +- added awaymode/runmode attributes for external command (client only) +- removed workaround for 1.3 alpha compatibilty +- improved exception handling for ActiveNetworkStandbyHandler +- fixed RemoteClient standby handler and activity signalling</VersionDescription> + <DevelopmentStatus>Stable</DevelopmentStatus> + <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=87&cf_id=24</OnlineLocation> + <ReleaseDate>2012-07-02T16:03:54</ReleaseDate> + <Tags>tv server plugins, automation</Tags> + <Location>..\MPEI\[Name] [Version].mpe1</Location> + <Params> + <Items> + <SectionParam Name="Online Icon"> + <Value>http://www.team-mediaportal.com/components/com_mtree/img/listings/m/471.gif</Value> + <ValueType>String</ValueType> + <Description>The icon file of the package stored online (jpg,png,bmp)</Description> + </SectionParam> + <SectionParam Name="Configuration file"> + <Value>%TvServerBase%\SetupTv.exe</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://www.team-mediaportal.com/components/com_mtree/img/listings/m/1373.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1374.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1375.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1376.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1377.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1378.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1379.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1380.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1381.png; +http://www.team-mediaportal.com/components/com_mtree/img/listings/m/1382.png;</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/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ActiveNetworkStandbyHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ActiveNetworkStandbyHandler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ActiveNetworkStandbyHandler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify @@ -137,19 +137,18 @@ private void NetworkMonitorHandler_OnPowerSchedulerEvent(PowerSchedulerEventArgs args) { + IPowerScheduler ps = GlobalServiceProvider.Instance.Get<IPowerScheduler>(); + if (ps == null) + return; + + TvBusinessLayer layer = new TvBusinessLayer(); + PowerSetting setting; + bool enabled; + switch (args.EventType) { case PowerSchedulerEventType.Elapsed: - IPowerScheduler ps = GlobalServiceProvider.Instance.Get<IPowerScheduler>(); - if (ps == null) - return; - - TvBusinessLayer layer = new TvBusinessLayer(); - PowerSetting setting; - - bool enabled; - // Check if standby should be prevented setting = ps.Settings.GetSetting("NetworkMonitorEnabled"); enabled = Convert.ToBoolean(layer.GetSetting("PowerSchedulerNetworkMonitorEnabled", "false").Value); @@ -179,15 +178,15 @@ setting.Set<Int32>(_idleLimit); Log.Debug("NetworkMonitorHandler: Idle limit in KB/s: {0}", _idleLimit); } - } - // Check if away mode should be used - setting = ps.Settings.GetSetting("NetworkMonitorAwayMode"); - _useAwayMode = Convert.ToBoolean(layer.GetSetting("PowerSchedulerNetworkMonitorAwayMode", "false").Value); - if (setting.Get<bool>() != _useAwayMode) - { - setting.Set<bool>(_useAwayMode); - Log.Debug("NetworkMonitorHandler: Use away mode: {0}", _useAwayMode); + // Check if away mode should be used + setting = ps.Settings.GetSetting("NetworkMonitorAwayMode"); + _useAwayMode = Convert.ToBoolean(layer.GetSetting("PowerSchedulerNetworkMonitorAwayMode", "false").Value); + if (setting.Get<bool>() != _useAwayMode) + { + setting.Set<bool>(_useAwayMode); + Log.Debug("NetworkMonitorHandler: Use away mode: {0}", _useAwayMode); + } } break; @@ -217,7 +216,8 @@ } catch (Exception ex) { - Log.Error("NetworkMonitorHandler: Error in StartNetworkMonitor: {0}", ex); + Log.Error("NetworkMonitorHandler: Exception in StartNetworkMonitor: {0}", ex); + Log.Info("NetworkMonitorHandler: Exception in StartNetworkMonitor: {0}", ex); } } @@ -255,14 +255,22 @@ foreach (NetworkAdapter adapter in _monitoredAdapters) { - adapter.Update(); - if ((adapter.DlSpeed >= _idleLimit) || (adapter.UlSpeed >= _idleLimit)) + try { - // Log.Debug("NetworkMonitorHandler: standby prevented: {0}", adapter.Name); - // Log.Debug("NetworkMonitorHandler: dlSpeed: {0}", adapter.DlSpeed); - // Log.Debug("NetworkMonitorHandler: ulSpeed: {0}", adapter.UlSpeed); - _preventers++; + adapter.Update(); + if ((adapter.DlSpeed >= _idleLimit) || (adapter.UlSpeed >= _idleLimit)) + { + // Log.Debug("NetworkMonitorHandler: standby prevented: {0}", adapter.Name); + // Log.Debug("NetworkMonitorHandler: dlSpeed: {0}", adapter.DlSpeed); + // Log.Debug("NetworkMonitorHandler: ulSpeed: {0}", adapter.UlSpeed); + _preventers++; + } } + catch (Exception ex) + { + Log.Error("NetworkMonitorHandler: Exception in updating adapter {0}: {1}", adapter.Name, ex.Message); + Log.Info("NetworkMonitorHandler: Exception in updating adapter {0}: {1}", adapter.Name, ex.Message); + } } if (_preventers > 0) Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ActiveSharesStandbyHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ActiveSharesStandbyHandler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ActiveSharesStandbyHandler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ActiveStreamsStandbyHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ActiveStreamsStandbyHandler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ActiveStreamsStandbyHandler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ControllerActiveStandbyHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ControllerActiveStandbyHandler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ControllerActiveStandbyHandler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify @@ -143,11 +143,12 @@ // Check if user is timeshifting if (_controller.CardCollection[cardId].TimeShifter.IsTimeShifting(ref users[i])) { - _handlerName = "ControllerActive (Timeshifting)"; + _handlerName = "ControllerActive (Local timeshifting)"; isTimeShifting = true; if (!PowerManager.IsLocal(users[i].Name)) { // Timeshifting to a remote client + _handlerName = "ControllerActive (Remote timeshifting)"; return StandbyMode.AwayModeRequested; } } Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/EpgGrabbingStandbyWakeupHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/EpgGrabbingStandbyWakeupHandler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/EpgGrabbingStandbyWakeupHandler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify @@ -263,7 +263,7 @@ psi.WindowStyle = ProcessWindowStyle.Minimized; psi.Arguments = action; psi.ErrorDialog = false; - if (OSInfo.OSInfo.VistaOrLater()) + if (System.Environment.Version.Major >= 6) { psi.Verb = "runas"; } @@ -275,9 +275,10 @@ p.Start(); p.WaitForExit(); } - catch (Exception e) + catch (Exception ex) { - Log.Write(e); + Log.Error("EpgGrabbingHandler: Exception in RunExternalCommand: {0}", ex.Message); + Log.Info("EpgGrabbingHandler: Exception in RunExternalCommand: {0}", ex.Message); } Log.Debug("EpgGrabbingHandler: External command finished"); } Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/LocalClientStandbyHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/LocalClientStandbyHandler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/LocalClientStandbyHandler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/LocalClientWakeupHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/LocalClientWakeupHandler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/LocalClientWakeupHandler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/PowerControllerStandbyHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/PowerControllerStandbyHandler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/PowerControllerStandbyHandler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/PowerControllerWakeupHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/PowerControllerWakeupHandler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/PowerControllerWakeupHandler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ProcessActiveStandbyHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ProcessActiveStandbyHandler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ProcessActiveStandbyHandler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/RebootWakeupHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/RebootWakeupHandler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/RebootWakeupHandler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -224,9 +224,10 @@ p.Start(); p.WaitForExit(); } - catch (Exception e) + catch (Exception ex) { - Log.Write(e); + Log.Error("RebootHandler: Exception in RunExternalCommand: {0}", ex.Message); + Log.Info("RebootHandler: Exception in RunExternalCommand: {0}", ex.Message); } Log.Debug("RebootHandler: External command finished"); } Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/RemoteClientStandbyHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/RemoteClientStandbyHandler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/RemoteClientStandbyHandler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -70,12 +70,11 @@ { get { - return _standbyMode != StandbyMode.StandbyAllowed; + return StandbyMode != StandbyMode.StandbyAllowed; } set { - _lastUpdate = DateTime.Now; - _standbyMode = value ? StandbyMode.AwayModeRequested : StandbyMode.StandbyAllowed; + StandbyMode = value ? StandbyMode.AwayModeRequested : StandbyMode.StandbyAllowed; } } @@ -94,7 +93,7 @@ { get { - // Check if last update was longer ago than idle timeout + // Check if last update was longer ago than timeout // If so, do not prevent standby any longer if (_lastUpdate.AddSeconds(_timeout) < DateTime.Now) { Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ScheduledRecordingsWakeupHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ScheduledRecordingsWakeupHandler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/ScheduledRecordingsWakeupHandler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/XmlTvImportWakeupHandler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/XmlTvImportWakeupHandler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/XmlTvImportWakeupHandler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerScheduler.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerScheduler.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerScheduler.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify @@ -347,7 +347,8 @@ Log.Debug("PS: Standby requested but system is configured to stay on"); break; default: - Log.Error("PS: unknown shutdown mode: {0}", _settings.ShutdownMode); + Log.Error("PS: Unknown shutdown mode: {0}", _settings.ShutdownMode); + Log.Info("PS: Unknown shutdown mode: {0}", _settings.ShutdownMode); break; } } @@ -889,7 +890,8 @@ } catch (Exception ex) { - Log.Error("PS: Exception in Start(): {0}", ex); + Log.Error("PS: Exception in Start: {0}", ex); + Log.Info("PS: Exception in Start: {0}", ex); Stop(); } } @@ -961,7 +963,8 @@ } catch (Exception ex) { - Log.Error("PS: Exception in Stop(): {0}", ex); + Log.Error("PS: Exception in Stop: {0}", ex); + Log.Info("PS: Exception in Stop: {0}", ex); } } @@ -1110,7 +1113,7 @@ if (!stringSetting.Equals(setting.Get<string>())) { setting.Set<string>(stringSetting); - Log.Debug("PS: Run command before standby / after wakeup: {0}", stringSetting); + Log.Debug("PS: Run command on power state change: {0}", stringSetting); changed = true; } @@ -1202,6 +1205,7 @@ _controller.EpgGrabberEnabled = false; DeInitController(); + // Run external command Log.Debug("PS: Run external command"); RunExternalCommand("Command", "suspend"); @@ -1422,7 +1426,7 @@ psi.WindowStyle = ProcessWindowStyle.Minimized; psi.Arguments = action; psi.ErrorDialog = false; - if (OSInfo.OSInfo.VistaOrLater()) + if (System.Environment.Version.Major >= 6) { psi.Verb = "runas"; } @@ -1436,7 +1440,8 @@ } catch (Exception ex) { - Log.Error("PS: Exception in RunExternalCommand(): {0}", ex); + Log.Error("PS: Exception in RunExternalCommand: {0}", ex); + Log.Info("PS: Exception in RunExternalCommand: {0}", ex); } Log.Debug("PS: External command finished"); } @@ -1452,7 +1457,7 @@ } else { - Log.Error("PS: Unable to register PowerScheduler as IPowerEventHandler service to GlobalServiceProvider"); + Log.Info("PS: Unable to register PowerScheduler as IPowerEventHandler service to GlobalServiceProvider"); } } @@ -1467,7 +1472,7 @@ } else { - Log.Error("PS: Unable to unregister IPowerEventHandler from GlobalServiceProvider"); + Log.Info("PS: Unable to unregister IPowerEventHandler from GlobalServiceProvider"); } } Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerSchedulerFactory.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerSchedulerFactory.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerSchedulerFactory.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerSchedulerPlugin.cs =================================================================== --- trunk/plugins/PowerScheduler++/Stable/1.2.3.0/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerSchedulerPlugin.cs 2012-07-01 19:17:59 UTC (rev 4494) +++ trunk/plugins/PowerScheduler++/Stable/1.2.3.3/TvEngine3/TVLibrary/Plugins/PowerScheduler/PowerSchedulerPlugin.cs 2012-07-06 17:36:09 UTC (rev 4495) @@ -1,6 +1,6 @@ -#region Copyright (C) 2005-2011 Team MediaPortal +#region Copyright (C) 2005-2012 Team MediaPortal -// Copyright (C) 2005-2011 Team MediaPortal +// Copyright (C) 2005-2012 Team MediaPortal // http://www.team-mediaportal.com // // MediaPortal is free software: you can redistribute it and/or modify Modified: trunk/plugins/PowerScheduler++/St... [truncated message content] |
From: <dos...@us...> - 2012-07-01 19:18:10
|
Revision: 4494 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4494&view=rev Author: doskabouter Date: 2012-07-01 19:17:59 +0000 (Sun, 01 Jul 2012) Log Message: ----------- - Fixed toggle mouse option - released version 0.3.7 Modified Paths: -------------- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1 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/Skybound.Gecko.dll trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlInputType.cs trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlLinkNumber.cs trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.Designer.cs trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.resx Added Paths: ----------- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/res/MouseCursor.cur Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1 =================================================================== (Binary files differ) Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml =================================================================== --- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2012-07-01 18:51:22 UTC (rev 4493) +++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2012-07-01 19:17:59 UTC (rev 4494) @@ -1744,5 +1744,137 @@ </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="Blue3"> + <DisplayName>Blue3</DisplayName> + <DefaulChecked>true</DefaulChecked> + <Description>Blue3</Description> + <Files> + <Items /> + </Files> + </GroupItem> + <GroupItem Name="Blue3wide"> + <DisplayName>Blue3wide</DisplayName> + <DefaulChecked>true</DefaulChecked> + <Description>Blue3wide</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.SkinEngine" /> + <SubSystemItem Name="MP.Config" /> + <SubSystemItem Name="MP.DB" /> + </Items> + </SubSystemsUsed> + </PluginDependencyItem> + </Items> + </PluginDependencies> + <GeneralInfo> + <Name>Browse The Web</Name> + <Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id> + <Author>Mark Koenig (kroko) 2010</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>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml</UpdateUrl> + <Version> + <Major>0</Major> + <Minor>3</Minor> + <Build>7</Build> + <Revision>0</Revision> + </Version> + <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.</ExtensionDescription> + <VersionDescription>Fixed toggle mouse option, added linkid to flash objects (performs a click in the middle of the object), added compatibility with MP 1.3.0 Alpha</VersionDescription> + <DevelopmentStatus>Stable</DevelopmentStatus> + <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1</OnlineLocation> + <ReleaseDate>2012-07-01T21:15:38.2282677+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>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/browser1.jpg;https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/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 2012-07-01 18:51:22 UTC (rev 4493) +++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2012-07-01 19:17:59 UTC (rev 4494) @@ -280,7 +280,7 @@ <Items> <CompatibleVersionItem> <MinRequiredVersion>1.1.7.0</MinRequiredVersion> - <DesignedForVersion>1.1.7.0</DesignedForVersion> + <DesignedForVersion>1.2.100.0</DesignedForVersion> </CompatibleVersionItem> </Items> </CompatibleVersion> @@ -304,14 +304,14 @@ <Version> <Major>0</Major> <Minor>3</Minor> - <Build>6</Build> + <Build>7</Build> <Revision>0</Revision> </Version> <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser.</ExtensionDescription> - <VersionDescription>Fixed initial defaultzoom again, improved display of numbers of the urls, fixed password dialog (show *), fixed mouse cursor not disappearing</VersionDescription> + <VersionDescription>Fixed toggle mouse option, added linkid to flash objects (performs a click in the middle of the object), added compatibility with MP 1.3.0 Alpha</VersionDescription> <DevelopmentStatus>Stable</DevelopmentStatus> <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1</OnlineLocation> - <ReleaseDate>2012-04-17T23:12:57.385693+02:00</ReleaseDate> + <ReleaseDate>2012-07-01T21:15:38.2282677+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/Skybound.Gecko.dll =================================================================== (Binary files differ) Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj =================================================================== --- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2012-07-01 18:51:22 UTC (rev 4493) +++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2012-07-01 19:17:59 UTC (rev 4494) @@ -175,6 +175,7 @@ <ItemGroup> <None Include="res\edit-icon.png" /> <Content Include="res\fav-b-icon.png" /> + <Content Include="res\MouseCursor.cur" /> <Content Include="todo.txt" /> <EmbeddedResource Include="GetThumb.resx"> <DependentUpon>GetThumb.cs</DependentUpon> Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs =================================================================== --- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-07-01 18:51:22 UTC (rev 4493) +++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-07-01 19:17:59 UTC (rev 4494) @@ -25,6 +25,7 @@ using System; using System.Collections.Generic; using System.Drawing; +using System.IO; using MediaPortal.GUI.Library; using MediaPortal.Dialogs; @@ -43,6 +44,8 @@ { [DllImport("user32.dll", CharSet = CharSet.Auto, CallingConvention = CallingConvention.StdCall)] public static extern void mouse_event(long dwFlags, long dx, long dy, long cButtons, long dwExtraInfo); + [DllImport("user32.dll", CharSet = CharSet.Auto, CallingConvention = CallingConvention.StdCall)] + public static extern int ShowCursor(bool bShow); private const int MOUSEEVENTF_LEFTDOWN = 0x02; private const int MOUSEEVENTF_LEFTUP = 0x04; @@ -50,6 +53,7 @@ private const int MOUSEEVENTF_RIGHTUP = 0x10; private const bool logHtml = false; private bool mouseVisible = false; + private bool clickFromPlugin = false; #region Links private Dictionary<int, HtmlLinkNumber> _htmlLinkNumbers = new Dictionary<int, HtmlLinkNumber>(); @@ -440,21 +444,11 @@ else { webBrowser.Enabled = true; - webBrowser.BringToFront(); - - Cursor.Show(); System.Threading.Thread.Sleep(200); - - + clickFromPlugin = true; int X = Cursor.Position.X; int Y = Cursor.Position.Y; - mouse_event(MOUSEEVENTF_LEFTDOWN | MOUSEEVENTF_LEFTUP, X, Y, 0, 0); - - Cursor.Hide(); - //webBrowser.Enabled = false; - - GUIGraphicsContext.form.BringToFront(); - //mouse.BringToFront(); + mouse_event(MOUSEEVENTF_LEFTDOWN | MOUSEEVENTF_LEFTUP, 0, 0, 0, 0); } } if (action.wID == settings.Remote_Bookmark) @@ -503,17 +497,23 @@ } break; case MediaPortal.GUI.Library.Action.ActionType.ACTION_NEXT_SUBTITLE: - if (mouseVisible) + if (!settings.UseMouse) { - mouseVisible = false; + if (mouseVisible) + { + mouseVisible = false; + Cursor.Hide(); + } + else + { + using (MemoryStream memoryStream = new MemoryStream(Properties.Resources.MouseCursor)) + { + GUIGraphicsContext.form.Cursor = new Cursor(memoryStream); + } + mouseVisible = true; + while (ShowCursor(true) < 0) ; + } } - else - { - Point x = Cursor.Position; - //mouse.Location = x; - mouseVisible = true; - //mouse.BringToFront(); - } break; case MediaPortal.GUI.Library.Action.ActionType.ACTION_KEY_PRESSED: if (!settings.UseMouse) @@ -648,6 +648,13 @@ } } } + + if (clickFromPlugin) // click succeeded, so focus can safely be reset + { + clickFromPlugin = false; + webBrowser.Enabled = false; + GUIGraphicsContext.form.Focus(); + } } private void OnEnterNewLink() @@ -951,6 +958,25 @@ } } + GeckoElementCollection objects = webBrowser.Document.GetElementsByTagName("object"); + MyLog.debug("page objects cnt : " + objects.Count); + foreach (GeckoElement element in objects) + if (element.GetAttribute("type") == "application/x-shockwave-flash") + { + string id, name; + GeckoElement 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); @@ -1055,8 +1081,9 @@ switch (hln.Type) { case HtmlInputType.Link: - webBrowser.Navigate(hln.Link); - MyLog.debug("navigate to linkid=" + LinkId + " URL=" + hln.Link); + string link = (string)hln.Obj; + webBrowser.Navigate(link); + MyLog.debug("navigate to linkid=" + LinkId + " URL=" + link); break; case HtmlInputType.Input: case HtmlInputType.InputPassword: @@ -1066,6 +1093,18 @@ 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; + + 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; } } } @@ -1078,7 +1117,8 @@ { case HtmlInputType.Link: { - if (!Uri.IsWellFormedUriString(id.Link, UriKind.Absolute)) + string link = (string)id.Obj; + if (!Uri.IsWellFormedUriString(link, UriKind.Absolute)) { Uri baseUri = webBrowser.Url; @@ -1089,11 +1129,12 @@ if (gn != null && !String.IsNullOrEmpty(gn.NodeValue)) baseUri = new Uri(gn.NodeValue); } - id.Link = new Uri(baseUri, id.Link).AbsoluteUri; + id.Obj = new Uri(baseUri, link).AbsoluteUri; } hln = id; return true; } + case HtmlInputType.FlashObject: case HtmlInputType.Input: case HtmlInputType.InputPassword: case HtmlInputType.Action: Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlInputType.cs =================================================================== --- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlInputType.cs 2012-07-01 18:51:22 UTC (rev 4493) +++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlInputType.cs 2012-07-01 19:17:59 UTC (rev 4494) @@ -30,6 +30,7 @@ Input, InputPassword, Link, - Action + Action, + FlashObject } } Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlLinkNumber.cs =================================================================== --- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlLinkNumber.cs 2012-07-01 18:51:22 UTC (rev 4493) +++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlLinkNumber.cs 2012-07-01 19:17:59 UTC (rev 4494) @@ -27,13 +27,13 @@ { public class HtmlLinkNumber { - public HtmlLinkNumber(int number, string id, string name, string link, HtmlInputType type) + public HtmlLinkNumber(int number, string id, string name, object obj, HtmlInputType type) { Type = type; Number = number; Name = name; Id = id; - Link = link; + Obj =obj; } @@ -41,6 +41,6 @@ public string Id { get; set; } public string Name { get; set; } public HtmlInputType Type { get; set; } - public string Link { get; set; } + public object Obj { get; set; } } } Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2012-07-01 18:51:22 UTC (rev 4493) +++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2012-07-01 19:17:59 UTC (rev 4494) @@ -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("0.3.5.0")] -[assembly: AssemblyFileVersion("0.3.5.0")] +[assembly: AssemblyVersion("0.3.7.0")] +[assembly: AssemblyFileVersion("0.3.7.0")] Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.Designer.cs =================================================================== --- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.Designer.cs 2012-07-01 18:51:22 UTC (rev 4493) +++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.Designer.cs 2012-07-01 19:17:59 UTC (rev 4494) @@ -87,5 +87,12 @@ return ((System.Drawing.Bitmap)(obj)); } } + + internal static byte[] MouseCursor { + get { + object obj = ResourceManager.GetObject("MouseCursor", resourceCulture); + return ((byte[])(obj)); + } + } } } Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.resx =================================================================== --- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.resx 2012-07-01 18:51:22 UTC (rev 4493) +++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.resx 2012-07-01 19:17:59 UTC (rev 4494) @@ -130,4 +130,7 @@ <data name="file-icon" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\res\file-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="MouseCursor" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\res\MouseCursor.cur;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </data> </root> \ No newline at end of file Added: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/res/MouseCursor.cur =================================================================== (Binary files differ) Property changes on: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/res/MouseCursor.cur ___________________________________________________________________ Added: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dos...@us...> - 2012-07-01 18:51:29
|
Revision: 4493 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4493&view=rev Author: doskabouter Date: 2012-07-01 18:51:22 +0000 (Sun, 01 Jul 2012) Log Message: ----------- added support for mp 1.3.0 Alpha Modified Paths: -------------- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2012-07-01 15:14:59 UTC (rev 4492) +++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2012-07-01 18:51:22 UTC (rev 4493) @@ -3,7 +3,7 @@ using System.Runtime.InteropServices; using MediaPortal.Common.Utils; -[assembly: CompatibleVersion("1.1.7.0")] +[assembly: CompatibleVersion("1.2.100.0", "1.1.7.0")] [assembly: UsesSubsystem("MP.SkinEngine")] [assembly: UsesSubsystem("MP.Config")] [assembly: UsesSubsystem("MP.DB")] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dos...@us...> - 2012-07-01 15:15:06
|
Revision: 4492 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4492&view=rev Author: doskabouter Date: 2012-07-01 15:14:59 +0000 (Sun, 01 Jul 2012) Log Message: ----------- cleanup old mouse stuff Modified Paths: -------------- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.Designer.cs trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.resx Removed Paths: ------------- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Mouse.Designer.cs trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Mouse.cs trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Mouse.resx trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/res/icon-48x48-mouse.png Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj =================================================================== --- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2012-05-25 10:34:08 UTC (rev 4491) +++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2012-07-01 15:14:59 UTC (rev 4492) @@ -123,12 +123,6 @@ <Compile Include="ImportChrome.Designer.cs"> <DependentUpon>ImportChrome.cs</DependentUpon> </Compile> - <Compile Include="Mouse.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Include="Mouse.Designer.cs"> - <DependentUpon>Mouse.cs</DependentUpon> - </Compile> <Compile Include="MyLog.cs" /> <Compile Include="OSD_LinkId.cs"> <SubType>UserControl</SubType> @@ -181,7 +175,6 @@ <ItemGroup> <None Include="res\edit-icon.png" /> <Content Include="res\fav-b-icon.png" /> - <None Include="res\icon-48x48-mouse.png" /> <Content Include="todo.txt" /> <EmbeddedResource Include="GetThumb.resx"> <DependentUpon>GetThumb.cs</DependentUpon> @@ -198,10 +191,6 @@ <DependentUpon>ImportChrome.cs</DependentUpon> <SubType>Designer</SubType> </EmbeddedResource> - <EmbeddedResource Include="Mouse.resx"> - <DependentUpon>Mouse.cs</DependentUpon> - <SubType>Designer</SubType> - </EmbeddedResource> <EmbeddedResource Include="OSD_LinkId.resx"> <DependentUpon>OSD_LinkId.cs</DependentUpon> <SubType>Designer</SubType> Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs =================================================================== --- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-05-25 10:34:08 UTC (rev 4491) +++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-07-01 15:14:59 UTC (rev 4492) @@ -49,6 +49,7 @@ private const int MOUSEEVENTF_RIGHTDOWN = 0x08; private const int MOUSEEVENTF_RIGHTUP = 0x10; private const bool logHtml = false; + private bool mouseVisible = false; #region Links private Dictionary<int, HtmlLinkNumber> _htmlLinkNumbers = new Dictionary<int, HtmlLinkNumber>(); @@ -61,7 +62,6 @@ #region declare vars private GeckoWebBrowser webBrowser; private OSD_LinkId osd_linkID; - private Mouse mouse; private string linkId = string.Empty; private int linkTime = 0; private Timer timer = new Timer(); @@ -208,9 +208,6 @@ GUIGraphicsContext.form.Controls.Add(osd_linkID); osd_linkID.Visible = false; - mouse = new Mouse(); - GUIGraphicsContext.form.Controls.Add(mouse); - mouse.Visible = false; #endregion } @@ -302,7 +299,7 @@ timer.Start(); if (settings.UseMouse) - GUIGraphicsContext.form.Controls["BrowseTheWeb"].Select(); + webBrowser.Select(); } catch (Exception ex) { @@ -408,11 +405,7 @@ public override void OnAction(MediaPortal.GUI.Library.Action action) { - if (linkId != string.Empty) - GUIPropertyManager.SetProperty("#btWeb.linkid", "Link ID = " + linkId); - else - GUIPropertyManager.SetProperty("#btWeb.linkid", linkId); - + GUIPropertyManager.SetProperty("#btWeb.linkid", String.IsNullOrEmpty(linkId) ? String.Empty : "Link ID = " + linkId); #region remote diagnostic if (settings.Remote) { @@ -428,7 +421,7 @@ #region selectable buttons if (action.wID == settings.Remote_Confirm) { - if (!mouse.Visible) + if (!mouseVisible) { if (!settings.UseMouse) { @@ -461,7 +454,7 @@ //webBrowser.Enabled = false; GUIGraphicsContext.form.BringToFront(); - mouse.BringToFront(); + //mouse.BringToFront(); } } if (action.wID == settings.Remote_Bookmark) @@ -510,17 +503,17 @@ } break; case MediaPortal.GUI.Library.Action.ActionType.ACTION_NEXT_SUBTITLE: - if (mouse.Visible) + if (mouseVisible) { - mouse.Visible = false; + mouseVisible = false; } else { Point x = Cursor.Position; - mouse.Location = x; - mouse.Visible = true; - mouse.BringToFront(); - } + //mouse.Location = x; + mouseVisible = true; + //mouse.BringToFront(); + } break; case MediaPortal.GUI.Library.Action.ActionType.ACTION_KEY_PRESSED: if (!settings.UseMouse) @@ -593,13 +586,6 @@ OnMoveDown(); return; case MediaPortal.GUI.Library.Action.ActionType.ACTION_SELECT_ITEM: - if (mouse.Visible) - { - //Cursor.Show(); - int x = GUIGraphicsContext.form.Location.X + mouse.Location.X + 20; - int y = GUIGraphicsContext.form.Location.Y + mouse.Location.Y + 50; - Cursor.Position = new Point(x, y); - } return; #endregion } @@ -608,7 +594,7 @@ private void webBrowser_DomKeyDown(object sender, GeckoDomKeyEventArgs e) { - if (settings.UseMouse) + if (settings.UseMouse || mouseVisible) { //System.Diagnostics.Debug.WriteLine("DOM " + e.KeyCode.ToString()); @@ -690,7 +676,7 @@ webBrowser.Visible = true; if (settings.UseMouse) - GUIGraphicsContext.form.Controls["BrowseTheWeb"].Select(); + webBrowser.Select(); } private void OnAddBookmark() @@ -740,7 +726,7 @@ webBrowser.Visible = true; if (settings.UseMouse) - GUIGraphicsContext.form.Controls["BrowseTheWeb"].Select(); + webBrowser.Select(); } private void OnZoomIn() { @@ -756,55 +742,51 @@ } private void OnMoveLeft() { - if (!mouse.Visible) + if (!mouseVisible) { if (webBrowser.Window != null) ScrollTo(webBrowser.Window.ScrollX - 100, webBrowser.Window.ScrollY); } else { - mouse.Location = new Point(mouse.Location.X - 20, mouse.Location.Y); - Cursor.Position = new Point(mouse.Location.X, mouse.Location.Y); + Cursor.Position = new Point(Cursor.Position.X - 20, Cursor.Position.Y); } } private void OnMoveRight() { - if (!mouse.Visible) + if (!mouseVisible) { if (webBrowser.Window != null) ScrollTo(webBrowser.Window.ScrollX + 100, webBrowser.Window.ScrollY); } else { - mouse.Location = new Point(mouse.Location.X + 20, mouse.Location.Y); - Cursor.Position = new Point(mouse.Location.X, mouse.Location.Y); + Cursor.Position = new Point(Cursor.Position.X + 20, Cursor.Position.Y); } } private void OnMoveUp() { - if (!mouse.Visible) + if (!mouseVisible) { if (webBrowser.Window != null) ScrollTo(webBrowser.Window.ScrollX, webBrowser.Window.ScrollY - 100); } else { - mouse.Location = new Point(mouse.Location.X, mouse.Location.Y - 20); - Cursor.Position = new Point(mouse.Location.X, mouse.Location.Y); + Cursor.Position = new Point(Cursor.Position.X, Cursor.Position.Y - 20); } } private void OnMoveDown() { - if (!mouse.Visible) + if (!mouseVisible) { if (webBrowser.Window != null) ScrollTo(webBrowser.Window.ScrollX, webBrowser.Window.ScrollY + 100); } else { - mouse.Location = new Point(mouse.Location.X, mouse.Location.Y + 20); - Cursor.Position = new Point(mouse.Location.X, mouse.Location.Y); + Cursor.Position = new Point(Cursor.Position.X, Cursor.Position.Y + 20); } } private void OnPageUp() { - if (!mouse.Visible) + if (!mouseVisible) { int height = webBrowser.Size.Height; if (webBrowser.Window != null) ScrollTo(webBrowser.Window.ScrollX, webBrowser.Window.ScrollY - height + 100); @@ -812,13 +794,12 @@ else { //not yet tested - mouse.Location = new Point(mouse.Location.X, mouse.Location.Y - 20); - Cursor.Position = new Point(mouse.Location.X, mouse.Location.Y); + Cursor.Position = new Point(Cursor.Position.X, Cursor.Position.Y - 20); } } private void OnPageDown() { - if (!mouse.Visible) + if (!mouseVisible) { int height = webBrowser.Size.Height; if (webBrowser.Window != null) ScrollTo(webBrowser.Window.ScrollX, webBrowser.Window.ScrollY + height - 100); @@ -826,8 +807,7 @@ else { //not yet tested - mouse.Location = new Point(mouse.Location.X, mouse.Location.Y - 20); - Cursor.Position = new Point(mouse.Location.X, mouse.Location.Y); + Cursor.Position = new Point(Cursor.Position.X, Cursor.Position.Y + 20); } } @@ -919,6 +899,7 @@ { MyLog.debug("page completed : " + webBrowser.Url.ToString()); + GUIPropertyManager.SetProperty("#btWeb.linkid", webBrowser.Url.ToString()); try { #region MP gui stuff Deleted: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Mouse.Designer.cs =================================================================== --- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Mouse.Designer.cs 2012-05-25 10:34:08 UTC (rev 4491) +++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Mouse.Designer.cs 2012-07-01 15:14:59 UTC (rev 4492) @@ -1,64 +0,0 @@ -namespace BrowseTheWeb -{ - partial class Mouse - { - /// <summary> - /// Erforderliche Designervariable. - /// </summary> - private System.ComponentModel.IContainer components = null; - - /// <summary> - /// Verwendete Ressourcen bereinigen. - /// </summary> - /// <param name="disposing">True, wenn verwaltete Ressourcen gelöscht werden sollen; andernfalls False.</param> - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Vom Komponenten-Designer generierter Code - - /// <summary> - /// Erforderliche Methode für die Designerunterstützung. - /// Der Inhalt der Methode darf nicht mit dem Code-Editor geändert werden. - /// </summary> - private void InitializeComponent() - { - this.pictureBox1 = new System.Windows.Forms.PictureBox(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); - this.SuspendLayout(); - // - // pictureBox1 - // - this.pictureBox1.Image = global::BrowseTheWeb.Properties.Resources.icon_48x48_mouse; - this.pictureBox1.Location = new System.Drawing.Point(0, 0); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(48, 48); - this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pictureBox1.TabIndex = 0; - this.pictureBox1.TabStop = false; - // - // Mouse - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.White; - this.Controls.Add(this.pictureBox1); - this.Name = "Mouse"; - this.Size = new System.Drawing.Size(48, 48); - this.Load += new System.EventHandler(this.Mouse_Load); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); - this.ResumeLayout(false); - - } - - #endregion - - private System.Windows.Forms.PictureBox pictureBox1; - - } -} Deleted: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Mouse.cs =================================================================== --- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Mouse.cs 2012-05-25 10:34:08 UTC (rev 4491) +++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Mouse.cs 2012-07-01 15:14:59 UTC (rev 4492) @@ -1,47 +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 - -using System; -using System.Windows.Forms; - -namespace BrowseTheWeb -{ - public partial class Mouse : UserControl - { - public Mouse() - { - InitializeComponent(); - } - - private void label1_Click(object sender, EventArgs e) - { - - } - - private void Mouse_Load(object sender, EventArgs e) - { - - } - } -} Deleted: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Mouse.resx =================================================================== --- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Mouse.resx 2012-05-25 10:34:08 UTC (rev 4491) +++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Mouse.resx 2012-07-01 15:14:59 UTC (rev 4492) @@ -1,120 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<root> - <!-- - Microsoft ResX Schema - - Version 2.0 - - The primary goals of this format is to allow a simple XML format - that is mostly human readable. The generation and parsing of the - various data types are done through the TypeConverter classes - associated with the data types. - - Example: - - ... ado.net/XML headers & schema ... - <resheader name="resmimetype">text/microsoft-resx</resheader> - <resheader name="version">2.0</resheader> - <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> - <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> - <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> - <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> - <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> - <value>[base64 mime encoded serialized .NET Framework object]</value> - </data> - <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> - <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> - <comment>This is a comment</comment> - </data> - - There are any number of "resheader" rows that contain simple - name/value pairs. - - Each data row contains a name, and value. The row also contains a - type or mimetype. Type corresponds to a .NET class that support - text/value conversion through the TypeConverter architecture. - Classes that don't support this are serialized and stored with the - mimetype set. - - The mimetype is used for serialized objects, and tells the - ResXResourceReader how to depersist the object. This is currently not - extensible. For a given mimetype the value must be set accordingly: - - Note - application/x-microsoft.net.object.binary.base64 is the format - that the ResXResourceWriter will generate, however the reader can - read any of the formats listed below. - - mimetype: application/x-microsoft.net.object.binary.base64 - value : The object must be serialized with - : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter - : and then encoded with base64 encoding. - - mimetype: application/x-microsoft.net.object.soap.base64 - value : The object must be serialized with - : System.Runtime.Serialization.Formatters.Soap.SoapFormatter - : and then encoded with base64 encoding. - - mimetype: application/x-microsoft.net.object.bytearray.base64 - value : The object must be serialized into a byte array - : using a System.ComponentModel.TypeConverter - : and then encoded with base64 encoding. - --> - <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> - <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> - <xsd:element name="root" msdata:IsDataSet="true"> - <xsd:complexType> - <xsd:choice maxOccurs="unbounded"> - <xsd:element name="metadata"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="value" type="xsd:string" minOccurs="0" /> - </xsd:sequence> - <xsd:attribute name="name" use="required" type="xsd:string" /> - <xsd:attribute name="type" type="xsd:string" /> - <xsd:attribute name="mimetype" type="xsd:string" /> - <xsd:attribute ref="xml:space" /> - </xsd:complexType> - </xsd:element> - <xsd:element name="assembly"> - <xsd:complexType> - <xsd:attribute name="alias" type="xsd:string" /> - <xsd:attribute name="name" type="xsd:string" /> - </xsd:complexType> - </xsd:element> - <xsd:element name="data"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> - <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> - </xsd:sequence> - <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> - <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> - <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> - <xsd:attribute ref="xml:space" /> - </xsd:complexType> - </xsd:element> - <xsd:element name="resheader"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> - </xsd:sequence> - <xsd:attribute name="name" type="xsd:string" use="required" /> - </xsd:complexType> - </xsd:element> - </xsd:choice> - </xsd:complexType> - </xsd:element> - </xsd:schema> - <resheader name="resmimetype"> - <value>text/microsoft-resx</value> - </resheader> - <resheader name="version"> - <value>2.0</value> - </resheader> - <resheader name="reader"> - <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </resheader> - <resheader name="writer"> - <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </resheader> -</root> \ No newline at end of file Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.Designer.cs =================================================================== --- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.Designer.cs 2012-05-25 10:34:08 UTC (rev 4491) +++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.Designer.cs 2012-07-01 15:14:59 UTC (rev 4492) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // <auto-generated> // This code was generated by a tool. -// Runtime Version:4.0.30319.261 +// Runtime Version:4.0.30319.269 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -87,12 +87,5 @@ return ((System.Drawing.Bitmap)(obj)); } } - - internal static System.Drawing.Bitmap icon_48x48_mouse { - get { - object obj = ResourceManager.GetObject("icon-48x48-mouse", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } } } Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.resx =================================================================== --- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.resx 2012-05-25 10:34:08 UTC (rev 4491) +++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/Resources.resx 2012-07-01 15:14:59 UTC (rev 4492) @@ -117,7 +117,7 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> - <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> + <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <data name="edit-icon" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\res\edit-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -130,7 +130,4 @@ <data name="file-icon" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\res\file-icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="icon-48x48-mouse" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\res\icon-48x48-mouse.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> </root> \ No newline at end of file Deleted: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/res/icon-48x48-mouse.png =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ks...@us...> - 2012-05-25 10:34:14
|
Revision: 4491 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4491&view=rev Author: ksya Date: 2012-05-25 10:34:08 +0000 (Fri, 25 May 2012) Log Message: ----------- not needed for svn Removed Paths: ------------- trunk/plugins/OperaMobileLauncher/Opera Mobile/bin/Release/OperaMobileLauncher.mpe1 Deleted: trunk/plugins/OperaMobileLauncher/Opera Mobile/bin/Release/OperaMobileLauncher.mpe1 =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ks...@us...> - 2012-05-25 10:31:03
|
Revision: 4490 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4490&view=rev Author: ksya Date: 2012-05-25 10:30:51 +0000 (Fri, 25 May 2012) Log Message: ----------- update Modified Paths: -------------- trunk/plugins/OperaMobileLauncher/Opera Mobile/FormSettings.Designer.cs trunk/plugins/OperaMobileLauncher/Opera Mobile/FormSettings.cs trunk/plugins/OperaMobileLauncher/Opera Mobile/OperaLauncher.cs trunk/plugins/OperaMobileLauncher/Opera Mobile/Properties/AssemblyInfo.cs trunk/plugins/OperaMobileLauncher/Opera Mobile/bin/Release/OperaMobileLauncher.dll trunk/plugins/OperaMobileLauncher/Opera Mobile/bin/Release/OperaMobileLauncher.pdb trunk/plugins/OperaMobileLauncher/Opera Mobile/bin/Release/OperaMobileLauncher.xmp2 trunk/plugins/OperaMobileLauncher/Opera Mobile/bin/Release/update.xml trunk/plugins/OperaMobileLauncher/Opera Mobile/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache trunk/plugins/OperaMobileLauncher/Opera Mobile/obj/Release/OperaMobileLauncher.dll trunk/plugins/OperaMobileLauncher/Opera Mobile/obj/Release/OperaMobileLauncher.pdb trunk/plugins/OperaMobileLauncher/Opera Mobile/obj/Release/ResGen.read.1.tlog trunk/plugins/OperaMobileLauncher/Opera Mobile/obj/Release/ResGen.write.1.tlog trunk/plugins/OperaMobileLauncher/Opera Mobile/obj/Release/ResolveAssemblyReference.cache trunk/plugins/OperaMobileLauncher/OperaMobileLauncher.suo Modified: trunk/plugins/OperaMobileLauncher/Opera Mobile/FormSettings.Designer.cs =================================================================== --- trunk/plugins/OperaMobileLauncher/Opera Mobile/FormSettings.Designer.cs 2012-05-21 19:56:24 UTC (rev 4489) +++ trunk/plugins/OperaMobileLauncher/Opera Mobile/FormSettings.Designer.cs 2012-05-25 10:30:51 UTC (rev 4490) @@ -28,332 +28,332 @@ /// </summary> private void InitializeComponent() { - this.buttonOk = new System.Windows.Forms.Button(); - this.buttonCancel = new System.Windows.Forms.Button(); - this.imageFileName_Button = new System.Windows.Forms.Button(); - this.imageFileName_Editbox = new System.Windows.Forms.TextBox(); - this.label4 = new System.Windows.Forms.Label(); - this.test_btn = new System.Windows.Forms.Button(); - this.fullscreen_chk = new System.Windows.Forms.CheckBox(); - this.touchinterface_chk = new System.Windows.Forms.CheckBox(); - this.customargs_txt = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.widthZoom_txt = new System.Windows.Forms.TextBox(); - this.widthZoom_chk = new System.Windows.Forms.CheckBox(); - this.ApplyOpera_btn = new System.Windows.Forms.Button(); - this.downloadLink = new System.Windows.Forms.LinkLabel(); - this.minFontSize_nud = new System.Windows.Forms.NumericUpDown(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.setToDesktopUA_btn = new System.Windows.Forms.Button(); - this.customUA_txt = new System.Windows.Forms.TextBox(); - this.useCustomUA_chk = new System.Windows.Forms.CheckBox(); - this.label2 = new System.Windows.Forms.Label(); - this.useMinFontsize_chk = new System.Windows.Forms.CheckBox(); - this.label3 = new System.Windows.Forms.Label(); - this.openHelp_btn = new System.Windows.Forms.Button(); - this.useButtonForwarding = new System.Windows.Forms.CheckBox(); - ((System.ComponentModel.ISupportInitialize)(this.minFontSize_nud)).BeginInit(); - this.groupBox1.SuspendLayout(); - this.SuspendLayout(); - // - // buttonOk - // - this.buttonOk.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonOk.DialogResult = System.Windows.Forms.DialogResult.OK; - this.buttonOk.Location = new System.Drawing.Point(362, 436); - this.buttonOk.Name = "buttonOk"; - this.buttonOk.Size = new System.Drawing.Size(75, 23); - this.buttonOk.TabIndex = 2; - this.buttonOk.Text = "Save"; - this.buttonOk.UseVisualStyleBackColor = true; - this.buttonOk.Click += new System.EventHandler(this.buttonOk_Click); - // - // buttonCancel - // - this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.buttonCancel.Location = new System.Drawing.Point(443, 436); - this.buttonCancel.Name = "buttonCancel"; - this.buttonCancel.Size = new System.Drawing.Size(75, 23); - this.buttonCancel.TabIndex = 2; - this.buttonCancel.Text = "Cancel"; - this.buttonCancel.UseVisualStyleBackColor = true; - // - // imageFileName_Button - // - this.imageFileName_Button.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.imageFileName_Button.Location = new System.Drawing.Point(493, 24); - this.imageFileName_Button.Name = "imageFileName_Button"; - this.imageFileName_Button.Size = new System.Drawing.Size(27, 23); - this.imageFileName_Button.TabIndex = 19; - this.imageFileName_Button.Text = "..."; - this.imageFileName_Button.UseVisualStyleBackColor = true; - this.imageFileName_Button.Click += new System.EventHandler(this.imageFileName_Button_Click); - // - // imageFileName_Editbox - // - this.imageFileName_Editbox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.imageFileName_Editbox.Location = new System.Drawing.Point(15, 26); - this.imageFileName_Editbox.Name = "imageFileName_Editbox"; - this.imageFileName_Editbox.Size = new System.Drawing.Size(472, 20); - this.imageFileName_Editbox.TabIndex = 20; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(12, 9); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(179, 13); - this.label4.TabIndex = 21; - this.label4.Text = "Select the Opera Mobile executable:"; - // - // test_btn - // - this.test_btn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.test_btn.Location = new System.Drawing.Point(15, 436); - this.test_btn.Name = "test_btn"; - this.test_btn.Size = new System.Drawing.Size(52, 23); - this.test_btn.TabIndex = 22; - this.test_btn.Text = "Test"; - this.test_btn.UseVisualStyleBackColor = true; - this.test_btn.Click += new System.EventHandler(this.test_btn_Click); - // - // fullscreen_chk - // - this.fullscreen_chk.AutoSize = true; - this.fullscreen_chk.Location = new System.Drawing.Point(15, 53); - this.fullscreen_chk.Name = "fullscreen_chk"; - this.fullscreen_chk.Size = new System.Drawing.Size(293, 17); - this.fullscreen_chk.TabIndex = 23; - this.fullscreen_chk.Text = "Do not start in fullscreen (clears the -fullscreen argument)"; - this.fullscreen_chk.UseVisualStyleBackColor = true; - // - // touchinterface_chk - // - this.touchinterface_chk.AutoSize = true; - this.touchinterface_chk.Location = new System.Drawing.Point(15, 73); - this.touchinterface_chk.Name = "touchinterface_chk"; - this.touchinterface_chk.Size = new System.Drawing.Size(231, 17); - this.touchinterface_chk.TabIndex = 24; - this.touchinterface_chk.Text = "Use the touch interface (not recommended)"; - this.touchinterface_chk.UseVisualStyleBackColor = true; - // - // customargs_txt - // - this.customargs_txt.Location = new System.Drawing.Point(15, 116); - this.customargs_txt.Name = "customargs_txt"; - this.customargs_txt.Size = new System.Drawing.Size(250, 20); - this.customargs_txt.TabIndex = 25; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(12, 99); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(97, 13); - this.label1.TabIndex = 26; - this.label1.Text = "Custom arguments:"; - // - // widthZoom_txt - // - this.widthZoom_txt.Enabled = false; - this.widthZoom_txt.Location = new System.Drawing.Point(9, 44); - this.widthZoom_txt.Name = "widthZoom_txt"; - this.widthZoom_txt.Size = new System.Drawing.Size(59, 20); - this.widthZoom_txt.TabIndex = 28; - // - // widthZoom_chk - // - this.widthZoom_chk.AutoSize = true; - this.widthZoom_chk.Location = new System.Drawing.Point(9, 24); - this.widthZoom_chk.Name = "widthZoom_chk"; - this.widthZoom_chk.Size = new System.Drawing.Size(279, 17); - this.widthZoom_chk.TabIndex = 29; - this.widthZoom_chk.Text = "Zoom to fit and use minimum width of: (recommended)"; - this.widthZoom_chk.UseVisualStyleBackColor = true; - this.widthZoom_chk.CheckedChanged += new System.EventHandler(this.widthZoom_chk_CheckedChanged); - // - // ApplyOpera_btn - // - this.ApplyOpera_btn.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.ApplyOpera_btn.ForeColor = System.Drawing.Color.DarkBlue; - this.ApplyOpera_btn.Location = new System.Drawing.Point(165, 172); - this.ApplyOpera_btn.Name = "ApplyOpera_btn"; - this.ApplyOpera_btn.Size = new System.Drawing.Size(173, 23); - this.ApplyOpera_btn.TabIndex = 30; - this.ApplyOpera_btn.Text = "Apply settings to Opera Mobile"; - this.ApplyOpera_btn.UseVisualStyleBackColor = false; - this.ApplyOpera_btn.Click += new System.EventHandler(this.ApplyOpera_btn_Click); - // - // downloadLink - // - this.downloadLink.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.downloadLink.AutoSize = true; - this.downloadLink.Location = new System.Drawing.Point(343, 416); - this.downloadLink.Name = "downloadLink"; - this.downloadLink.Size = new System.Drawing.Size(165, 13); - this.downloadLink.TabIndex = 31; - this.downloadLink.TabStop = true; - this.downloadLink.Text = "Download Opera Mobile Emulator"; - this.downloadLink.TextAlign = System.Drawing.ContentAlignment.TopRight; - this.downloadLink.Click += new System.EventHandler(this.downloadLink_Click); - // - // minFontSize_nud - // - this.minFontSize_nud.Enabled = false; - this.minFontSize_nud.Location = new System.Drawing.Point(9, 88); - this.minFontSize_nud.Name = "minFontSize_nud"; - this.minFontSize_nud.Size = new System.Drawing.Size(51, 20); - this.minFontSize_nud.TabIndex = 33; - this.minFontSize_nud.Value = new decimal(new int[] { + this.buttonOk = new System.Windows.Forms.Button(); + this.buttonCancel = new System.Windows.Forms.Button(); + this.imageFileName_Button = new System.Windows.Forms.Button(); + this.imageFileName_Editbox = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); + this.test_btn = new System.Windows.Forms.Button(); + this.fullscreen_chk = new System.Windows.Forms.CheckBox(); + this.touchinterface_chk = new System.Windows.Forms.CheckBox(); + this.customargs_txt = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.widthZoom_txt = new System.Windows.Forms.TextBox(); + this.widthZoom_chk = new System.Windows.Forms.CheckBox(); + this.ApplyOpera_btn = new System.Windows.Forms.Button(); + this.downloadLink = new System.Windows.Forms.LinkLabel(); + this.minFontSize_nud = new System.Windows.Forms.NumericUpDown(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.setToDesktopUA_btn = new System.Windows.Forms.Button(); + this.customUA_txt = new System.Windows.Forms.TextBox(); + this.useCustomUA_chk = new System.Windows.Forms.CheckBox(); + this.label2 = new System.Windows.Forms.Label(); + this.useMinFontsize_chk = new System.Windows.Forms.CheckBox(); + this.label3 = new System.Windows.Forms.Label(); + this.openHelp_btn = new System.Windows.Forms.Button(); + this.useButtonForwarding = new System.Windows.Forms.CheckBox(); + ((System.ComponentModel.ISupportInitialize)(this.minFontSize_nud)).BeginInit(); + this.groupBox1.SuspendLayout(); + this.SuspendLayout(); + // + // buttonOk + // + this.buttonOk.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonOk.DialogResult = System.Windows.Forms.DialogResult.OK; + this.buttonOk.Location = new System.Drawing.Point(362, 436); + this.buttonOk.Name = "buttonOk"; + this.buttonOk.Size = new System.Drawing.Size(75, 23); + this.buttonOk.TabIndex = 2; + this.buttonOk.Text = "Save"; + this.buttonOk.UseVisualStyleBackColor = true; + this.buttonOk.Click += new System.EventHandler(this.buttonOk_Click); + // + // buttonCancel + // + this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.buttonCancel.Location = new System.Drawing.Point(443, 436); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(75, 23); + this.buttonCancel.TabIndex = 2; + this.buttonCancel.Text = "Cancel"; + this.buttonCancel.UseVisualStyleBackColor = true; + // + // imageFileName_Button + // + this.imageFileName_Button.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.imageFileName_Button.Location = new System.Drawing.Point(493, 24); + this.imageFileName_Button.Name = "imageFileName_Button"; + this.imageFileName_Button.Size = new System.Drawing.Size(27, 23); + this.imageFileName_Button.TabIndex = 19; + this.imageFileName_Button.Text = "..."; + this.imageFileName_Button.UseVisualStyleBackColor = true; + this.imageFileName_Button.Click += new System.EventHandler(this.imageFileName_Button_Click); + // + // imageFileName_Editbox + // + this.imageFileName_Editbox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.imageFileName_Editbox.Location = new System.Drawing.Point(15, 26); + this.imageFileName_Editbox.Name = "imageFileName_Editbox"; + this.imageFileName_Editbox.Size = new System.Drawing.Size(472, 20); + this.imageFileName_Editbox.TabIndex = 20; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(12, 9); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(179, 13); + this.label4.TabIndex = 21; + this.label4.Text = "Select the Opera Mobile executable:"; + // + // test_btn + // + this.test_btn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.test_btn.Location = new System.Drawing.Point(15, 436); + this.test_btn.Name = "test_btn"; + this.test_btn.Size = new System.Drawing.Size(52, 23); + this.test_btn.TabIndex = 22; + this.test_btn.Text = "Test"; + this.test_btn.UseVisualStyleBackColor = true; + this.test_btn.Click += new System.EventHandler(this.test_btn_Click); + // + // fullscreen_chk + // + this.fullscreen_chk.AutoSize = true; + this.fullscreen_chk.Location = new System.Drawing.Point(15, 53); + this.fullscreen_chk.Name = "fullscreen_chk"; + this.fullscreen_chk.Size = new System.Drawing.Size(293, 17); + this.fullscreen_chk.TabIndex = 23; + this.fullscreen_chk.Text = "Do not start in fullscreen (clears the -fullscreen argument)"; + this.fullscreen_chk.UseVisualStyleBackColor = true; + // + // touchinterface_chk + // + this.touchinterface_chk.AutoSize = true; + this.touchinterface_chk.Location = new System.Drawing.Point(15, 73); + this.touchinterface_chk.Name = "touchinterface_chk"; + this.touchinterface_chk.Size = new System.Drawing.Size(231, 17); + this.touchinterface_chk.TabIndex = 24; + this.touchinterface_chk.Text = "Use the touch interface (not recommended)"; + this.touchinterface_chk.UseVisualStyleBackColor = true; + // + // customargs_txt + // + this.customargs_txt.Location = new System.Drawing.Point(15, 116); + this.customargs_txt.Name = "customargs_txt"; + this.customargs_txt.Size = new System.Drawing.Size(250, 20); + this.customargs_txt.TabIndex = 25; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(12, 99); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(97, 13); + this.label1.TabIndex = 26; + this.label1.Text = "Custom arguments:"; + // + // widthZoom_txt + // + this.widthZoom_txt.Enabled = false; + this.widthZoom_txt.Location = new System.Drawing.Point(9, 44); + this.widthZoom_txt.Name = "widthZoom_txt"; + this.widthZoom_txt.Size = new System.Drawing.Size(59, 20); + this.widthZoom_txt.TabIndex = 28; + // + // widthZoom_chk + // + this.widthZoom_chk.AutoSize = true; + this.widthZoom_chk.Location = new System.Drawing.Point(9, 24); + this.widthZoom_chk.Name = "widthZoom_chk"; + this.widthZoom_chk.Size = new System.Drawing.Size(279, 17); + this.widthZoom_chk.TabIndex = 29; + this.widthZoom_chk.Text = "Zoom to fit and use minimum width of: (recommended)"; + this.widthZoom_chk.UseVisualStyleBackColor = true; + this.widthZoom_chk.CheckedChanged += new System.EventHandler(this.widthZoom_chk_CheckedChanged); + // + // ApplyOpera_btn + // + this.ApplyOpera_btn.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this.ApplyOpera_btn.ForeColor = System.Drawing.Color.DarkBlue; + this.ApplyOpera_btn.Location = new System.Drawing.Point(165, 172); + this.ApplyOpera_btn.Name = "ApplyOpera_btn"; + this.ApplyOpera_btn.Size = new System.Drawing.Size(173, 23); + this.ApplyOpera_btn.TabIndex = 30; + this.ApplyOpera_btn.Text = "Apply settings to Opera Mobile"; + this.ApplyOpera_btn.UseVisualStyleBackColor = false; + this.ApplyOpera_btn.Click += new System.EventHandler(this.ApplyOpera_btn_Click); + // + // downloadLink + // + this.downloadLink.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.downloadLink.AutoSize = true; + this.downloadLink.Location = new System.Drawing.Point(343, 416); + this.downloadLink.Name = "downloadLink"; + this.downloadLink.Size = new System.Drawing.Size(165, 13); + this.downloadLink.TabIndex = 31; + this.downloadLink.TabStop = true; + this.downloadLink.Text = "Download Opera Mobile Emulator"; + this.downloadLink.TextAlign = System.Drawing.ContentAlignment.TopRight; + this.downloadLink.Click += new System.EventHandler(this.downloadLink_Click); + // + // minFontSize_nud + // + this.minFontSize_nud.Enabled = false; + this.minFontSize_nud.Location = new System.Drawing.Point(9, 88); + this.minFontSize_nud.Name = "minFontSize_nud"; + this.minFontSize_nud.Size = new System.Drawing.Size(51, 20); + this.minFontSize_nud.TabIndex = 33; + this.minFontSize_nud.Value = new decimal(new int[] { 10, 0, 0, 0}); - // - // groupBox1 - // - this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.groupBox1.Controls.Add(this.setToDesktopUA_btn); - this.groupBox1.Controls.Add(this.customUA_txt); - this.groupBox1.Controls.Add(this.useCustomUA_chk); - this.groupBox1.Controls.Add(this.label2); - this.groupBox1.Controls.Add(this.useMinFontsize_chk); - this.groupBox1.Controls.Add(this.minFontSize_nud); - this.groupBox1.Controls.Add(this.ApplyOpera_btn); - this.groupBox1.Controls.Add(this.widthZoom_txt); - this.groupBox1.Controls.Add(this.widthZoom_chk); - this.groupBox1.Location = new System.Drawing.Point(12, 196); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(505, 201); - this.groupBox1.TabIndex = 34; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "These settings need to be applied first"; - // - // setToDesktopUA_btn - // - this.setToDesktopUA_btn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.setToDesktopUA_btn.Enabled = false; - this.setToDesktopUA_btn.Location = new System.Drawing.Point(406, 133); - this.setToDesktopUA_btn.Name = "setToDesktopUA_btn"; - this.setToDesktopUA_btn.Size = new System.Drawing.Size(88, 23); - this.setToDesktopUA_btn.TabIndex = 38; - this.setToDesktopUA_btn.Text = "Set to desktop"; - this.setToDesktopUA_btn.UseVisualStyleBackColor = true; - this.setToDesktopUA_btn.Click += new System.EventHandler(this.setToDesktopUA_Click); - // - // customUA_txt - // - this.customUA_txt.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.customUA_txt.Enabled = false; - this.customUA_txt.Location = new System.Drawing.Point(9, 135); - this.customUA_txt.Name = "customUA_txt"; - this.customUA_txt.Size = new System.Drawing.Size(391, 20); - this.customUA_txt.TabIndex = 37; - // - // useCustomUA_chk - // - this.useCustomUA_chk.AutoSize = true; - this.useCustomUA_chk.Location = new System.Drawing.Point(9, 114); - this.useCustomUA_chk.Name = "useCustomUA_chk"; - this.useCustomUA_chk.Size = new System.Drawing.Size(276, 17); - this.useCustomUA_chk.TabIndex = 36; - this.useCustomUA_chk.Text = "Use custom User-Agent: (standard is Android/Mobile)"; - this.useCustomUA_chk.UseVisualStyleBackColor = true; - this.useCustomUA_chk.CheckedChanged += new System.EventHandler(this.useCustomUA_chk_CheckedChanged); - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(69, 44); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(33, 13); - this.label2.TabIndex = 35; - this.label2.Text = "pixels"; - // - // useMinFontsize_chk - // - this.useMinFontsize_chk.AutoSize = true; - this.useMinFontsize_chk.Location = new System.Drawing.Point(9, 69); - this.useMinFontsize_chk.Name = "useMinFontsize_chk"; - this.useMinFontsize_chk.Size = new System.Drawing.Size(133, 17); - this.useMinFontsize_chk.TabIndex = 34; - this.useMinFontsize_chk.Text = "Use minimum font size:"; - this.useMinFontsize_chk.UseVisualStyleBackColor = true; - this.useMinFontsize_chk.CheckedChanged += new System.EventHandler(this.useMinFontsize_chk_CheckedChanged); - // - // label3 - // - this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(14, 416); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(83, 13); - this.label3.TabIndex = 35; - this.label3.Text = "0.3 beta - Dragy"; - // - // openHelp_btn - // - this.openHelp_btn.Location = new System.Drawing.Point(268, 114); - this.openHelp_btn.Name = "openHelp_btn"; - this.openHelp_btn.Size = new System.Drawing.Size(75, 23); - this.openHelp_btn.TabIndex = 36; - this.openHelp_btn.Text = "Open help"; - this.openHelp_btn.UseVisualStyleBackColor = true; - this.openHelp_btn.Click += new System.EventHandler(this.openHelp_btn_Click); - // - // useButtonForwarding - // - this.useButtonForwarding.AutoSize = true; - this.useButtonForwarding.Checked = true; - this.useButtonForwarding.CheckState = System.Windows.Forms.CheckState.Checked; - this.useButtonForwarding.Location = new System.Drawing.Point(15, 145); - this.useButtonForwarding.Name = "useButtonForwarding"; - this.useButtonForwarding.Size = new System.Drawing.Size(445, 30); - this.useButtonForwarding.TabIndex = 37; - this.useButtonForwarding.Text = "Use MP to forward remote buttons to Opera Mobile (T9 typing not yet supported/wor" + - "king)\r\n(External app to re-map buttons is still recommended. Don\'t enable when u" + - "sing such app)\r\n"; - this.useButtonForwarding.UseVisualStyleBackColor = true; - // - // FormSettings - // - this.AcceptButton = this.buttonOk; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.buttonCancel; - this.ClientSize = new System.Drawing.Size(529, 471); - this.Controls.Add(this.useButtonForwarding); - this.Controls.Add(this.openHelp_btn); - this.Controls.Add(this.label3); - this.Controls.Add(this.downloadLink); - this.Controls.Add(this.label1); - this.Controls.Add(this.customargs_txt); - this.Controls.Add(this.touchinterface_chk); - this.Controls.Add(this.fullscreen_chk); - this.Controls.Add(this.test_btn); - this.Controls.Add(this.label4); - this.Controls.Add(this.imageFileName_Editbox); - this.Controls.Add(this.imageFileName_Button); - this.Controls.Add(this.buttonCancel); - this.Controls.Add(this.buttonOk); - this.Controls.Add(this.groupBox1); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "FormSettings"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "Opera Mobile Launcher Settings"; - this.Load += new System.EventHandler(this.FormSettings_Load); - ((System.ComponentModel.ISupportInitialize)(this.minFontSize_nud)).EndInit(); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); + // + // groupBox1 + // + this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.groupBox1.Controls.Add(this.setToDesktopUA_btn); + this.groupBox1.Controls.Add(this.customUA_txt); + this.groupBox1.Controls.Add(this.useCustomUA_chk); + this.groupBox1.Controls.Add(this.label2); + this.groupBox1.Controls.Add(this.useMinFontsize_chk); + this.groupBox1.Controls.Add(this.minFontSize_nud); + this.groupBox1.Controls.Add(this.ApplyOpera_btn); + this.groupBox1.Controls.Add(this.widthZoom_txt); + this.groupBox1.Controls.Add(this.widthZoom_chk); + this.groupBox1.Location = new System.Drawing.Point(12, 196); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(505, 201); + this.groupBox1.TabIndex = 34; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "These settings need to be applied first"; + // + // setToDesktopUA_btn + // + this.setToDesktopUA_btn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.setToDesktopUA_btn.Enabled = false; + this.setToDesktopUA_btn.Location = new System.Drawing.Point(406, 133); + this.setToDesktopUA_btn.Name = "setToDesktopUA_btn"; + this.setToDesktopUA_btn.Size = new System.Drawing.Size(88, 23); + this.setToDesktopUA_btn.TabIndex = 38; + this.setToDesktopUA_btn.Text = "Set to desktop"; + this.setToDesktopUA_btn.UseVisualStyleBackColor = true; + this.setToDesktopUA_btn.Click += new System.EventHandler(this.setToDesktopUA_Click); + // + // customUA_txt + // + this.customUA_txt.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.customUA_txt.Enabled = false; + this.customUA_txt.Location = new System.Drawing.Point(9, 135); + this.customUA_txt.Name = "customUA_txt"; + this.customUA_txt.Size = new System.Drawing.Size(391, 20); + this.customUA_txt.TabIndex = 37; + // + // useCustomUA_chk + // + this.useCustomUA_chk.AutoSize = true; + this.useCustomUA_chk.Location = new System.Drawing.Point(9, 114); + this.useCustomUA_chk.Name = "useCustomUA_chk"; + this.useCustomUA_chk.Size = new System.Drawing.Size(276, 17); + this.useCustomUA_chk.TabIndex = 36; + this.useCustomUA_chk.Text = "Use custom User-Agent: (standard is Android/Mobile)"; + this.useCustomUA_chk.UseVisualStyleBackColor = true; + this.useCustomUA_chk.CheckedChanged += new System.EventHandler(this.useCustomUA_chk_CheckedChanged); + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(69, 44); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(33, 13); + this.label2.TabIndex = 35; + this.label2.Text = "pixels"; + // + // useMinFontsize_chk + // + this.useMinFontsize_chk.AutoSize = true; + this.useMinFontsize_chk.Location = new System.Drawing.Point(9, 69); + this.useMinFontsize_chk.Name = "useMinFontsize_chk"; + this.useMinFontsize_chk.Size = new System.Drawing.Size(133, 17); + this.useMinFontsize_chk.TabIndex = 34; + this.useMinFontsize_chk.Text = "Use minimum font size:"; + this.useMinFontsize_chk.UseVisualStyleBackColor = true; + this.useMinFontsize_chk.CheckedChanged += new System.EventHandler(this.useMinFontsize_chk_CheckedChanged); + // + // label3 + // + this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(14, 416); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(83, 13); + this.label3.TabIndex = 35; + this.label3.Text = "0.3 beta - Dragy"; + // + // openHelp_btn + // + this.openHelp_btn.Location = new System.Drawing.Point(268, 114); + this.openHelp_btn.Name = "openHelp_btn"; + this.openHelp_btn.Size = new System.Drawing.Size(75, 23); + this.openHelp_btn.TabIndex = 36; + this.openHelp_btn.Text = "Open help"; + this.openHelp_btn.UseVisualStyleBackColor = true; + this.openHelp_btn.Click += new System.EventHandler(this.openHelp_btn_Click); + // + // useButtonForwarding + // + this.useButtonForwarding.AutoSize = true; + this.useButtonForwarding.Checked = true; + this.useButtonForwarding.CheckState = System.Windows.Forms.CheckState.Checked; + this.useButtonForwarding.Location = new System.Drawing.Point(15, 145); + this.useButtonForwarding.Name = "useButtonForwarding"; + this.useButtonForwarding.Size = new System.Drawing.Size(502, 30); + this.useButtonForwarding.TabIndex = 37; + this.useButtonForwarding.Text = "Use MP to forward remote buttons to Opera Mobile (or use EventGhost to remap your" + + " remote buttons \r\nDon\'t enable when you have already remapped your buttons for O" + + "pera Mobile)."; + this.useButtonForwarding.UseVisualStyleBackColor = true; + // + // FormSettings + // + this.AcceptButton = this.buttonOk; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.buttonCancel; + this.ClientSize = new System.Drawing.Size(529, 471); + this.Controls.Add(this.useButtonForwarding); + this.Controls.Add(this.openHelp_btn); + this.Controls.Add(this.label3); + this.Controls.Add(this.downloadLink); + this.Controls.Add(this.label1); + this.Controls.Add(this.customargs_txt); + this.Controls.Add(this.touchinterface_chk); + this.Controls.Add(this.fullscreen_chk); + this.Controls.Add(this.test_btn); + this.Controls.Add(this.label4); + this.Controls.Add(this.imageFileName_Editbox); + this.Controls.Add(this.imageFileName_Button); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonOk); + this.Controls.Add(this.groupBox1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "FormSettings"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "Opera Mobile Launcher Settings"; + this.Load += new System.EventHandler(this.FormSettings_Load); + ((System.ComponentModel.ISupportInitialize)(this.minFontSize_nud)).EndInit(); + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); } Modified: trunk/plugins/OperaMobileLauncher/Opera Mobile/FormSettings.cs =================================================================== --- trunk/plugins/OperaMobileLauncher/Opera Mobile/FormSettings.cs 2012-05-21 19:56:24 UTC (rev 4489) +++ trunk/plugins/OperaMobileLauncher/Opera Mobile/FormSettings.cs 2012-05-25 10:30:51 UTC (rev 4490) @@ -129,6 +129,8 @@ else arguments += " -notouchwithtouchevents"; + arguments += " -hasmenuandback"; + arguments += " "+customargs_txt.Text; opera.StartInfo.FileName = imageFileName_Editbox.Text; @@ -177,7 +179,8 @@ tw.WriteLine("}"); tw.Close(); - string OperaIniFile = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + @"\Opera\OperaMobileEmulator\opera.ini"; + string OperaIniFile = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + @"\Opera\Mobile\opera.ini"; + Log.Debug(OperaIniFile); if (File.Exists(OperaIniFile)) { Modified: trunk/plugins/OperaMobileLauncher/Opera Mobile/OperaLauncher.cs =================================================================== --- trunk/plugins/OperaMobileLauncher/Opera Mobile/OperaLauncher.cs 2012-05-21 19:56:24 UTC (rev 4489) +++ trunk/plugins/OperaMobileLauncher/Opera Mobile/OperaLauncher.cs 2012-05-25 10:30:51 UTC (rev 4490) @@ -5,6 +5,9 @@ using System.IO; using System.Windows.Forms; using System.Runtime.InteropServices; +using System.Text; +using System.Threading; +using System.Text.RegularExpressions; namespace OperaLauncher { @@ -18,55 +21,79 @@ public bool TouchInferface; public string Arguments; public bool UseButtonForwarding; + public IntPtr OperaHwnd = IntPtr.Zero; + public IntPtr MediaPortalHwnd = IntPtr.Zero; + public IntPtr TaskBarHwnd = IntPtr.Zero; - [DllImport("user32.dll")] - public static extern int FindWindow( - string lpClassName, // class name - string lpWindowName // window name - ); + [DllImport("user32.dll", SetLastError = true)] + static extern IntPtr FindWindow(string lpClassName, string lpWindowName); + [DllImport("user32.dll", SetLastError = true)] + static extern IntPtr FindWindowEx(IntPtr parentHandle, IntPtr childAfter, string className, string windowTitle); + + [DllImport("user32.dll", CharSet = CharSet.Auto)] + static extern IntPtr SendMessage(IntPtr hWnd, UInt32 Msg, int wParam, int lParam); + [DllImport("user32.dll")] - public static extern int SendMessage( - int hWnd, // handle to destination window - uint Msg, // message - int wParam, // first message parameter - int lParam // second message parameter - ); + private static extern bool ShowWindowAsync(IntPtr hWnd, int nCmdShow); [DllImport("user32.dll")] - private static extern bool ShowWindowAsync(int hWnd, int nCmdShow); + private static extern bool BringWindowToTop(IntPtr hWnd); [DllImport("user32.dll")] - private static extern bool BringWindowToTop(int hWnd); + [return: MarshalAs(UnmanagedType.Bool)] + static extern bool EnableWindow(IntPtr hWnd, bool bEnable); [DllImport("user32.dll")] - private static extern bool EnableWindow(int hWnd, bool bEnable); + private static extern IntPtr SetFocus(IntPtr hWnd); + [DllImport("user32.dll", SetLastError = true)] + static extern IntPtr SetParent(IntPtr hWndChild, IntPtr hWndNewParent); + + [DllImport("user32.dll", SetLastError = true)] + [return: MarshalAs(UnmanagedType.Bool)] + private static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int x, int y, int cx, int cy, uint uFlags); + + [DllImport("user32.dll", SetLastError = true)] + public static extern IntPtr SetActiveWindow(IntPtr hWnd); + [DllImport("user32.dll")] - private static extern int SetFocus(int hWnd); + [return: MarshalAs(UnmanagedType.Bool)] + static extern bool SetForegroundWindow(IntPtr hWnd); + [DllImport("user32.dll", SetLastError = true)] + static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint lpdwProcessId); - const int WM_KEYDOWN = 0x0100; - const int WM_KEYUP = 0x0101; - const int WM_APPCOMMAND = 0x0319; - const int SW_HIDE = 0; - const int SW_SHOWNORMAL = 1; - const int SW_SHOWMINIMIZED = 2; - const int SW_SHOWMAXIMIZED = 3; - const int SW_RESTORE = 9; - const int VK_F1 = 0x70; - const int VK_F2 = 0x71; - const int VK_NUMPAD0 = 0x60; - const int VK_NUMPAD1 = 0x61; - const int VK_NUMPAD2 = 0x62; - const int VK_NUMPAD3 = 0x63; - const int VK_NUMPAD4 = 0x64; - const int VK_NUMPAD5 = 0x65; - const int VK_NUMPAD6 = 0x66; - const int VK_NUMPAD7 = 0x67; - const int VK_NUMPAD8 = 0x68; - const int VK_NUMPAD9 = 0x69; + private const int WM_KEYDOWN = 0x0100; + private const int WM_KEYUP = 0x0101; + private const int WM_APPCOMMAND = 0x0319; + + private const int VK_RETURN = 0x0D; + private const int VK_LEFT = 0x25; + private const int VK_UP = 0x26; + private const int VK_RIGHT = 0x27; + private const int VK_DOWN = 0x28; + private const int VK_F1 = 0x70; + private const int VK_F2 = 0x71; + private const int VK_NUMPAD0 = 0x60; + private const int VK_NUMPAD1 = 0x61; + private const int VK_NUMPAD2 = 0x62; + private const int VK_NUMPAD3 = 0x63; + private const int VK_NUMPAD4 = 0x64; + private const int VK_NUMPAD5 = 0x65; + private const int VK_NUMPAD6 = 0x66; + private const int VK_NUMPAD7 = 0x67; + private const int VK_NUMPAD8 = 0x68; + private const int VK_NUMPAD9 = 0x69; + private const int VK_BACK = 0x8; + + private const int SWP_HIDEWINDOW = 0x80; + private const int SWP_SHOWWINDOW = 0x40; + private const int SWP_NOMOVE = 0x2; + + public string MediaPortalWindowName = "WindowsForms10.Window.8.app.0.2386859"; + ProcessStartInfo startInfo = new ProcessStartInfo(); Process opera = new Process(); public OperaLauncher() @@ -89,15 +116,18 @@ if(!UseButtonForwarding) GUIWindowManager.ShowPreviousWindow(); base.OnPageLoad(); + } protected override void OnPageDestroy(int newWindowId) { //close opera opera.CloseMainWindow(); - - /*int WindowToFind = FindWindow("WindowsForms10.Window.8.app.0.2386859", null); - bool test = ShowWindowAsync(WindowToFind, SW_RESTORE);*/ + if (UseButtonForwarding) + { + SetWindowPos(TaskBarHwnd, IntPtr.Zero, 0, 0, 0, 0, SWP_SHOWWINDOW); + ShowWindowAsync(FindWindow(MediaPortalWindowName, null), 9); //restore MP + } } public void startOpera(string strUrl = null) @@ -110,6 +140,7 @@ else arguments += " -notouchwithtouchevents"; + arguments += " -hasmenuandback"; arguments += " " + Arguments; opera.StartInfo.FileName = @Path; @@ -119,20 +150,43 @@ else opera.StartInfo.Arguments = arguments; + opera.StartInfo.CreateNoWindow = true; + //opera.StartInfo.WindowStyle = ProcessWindowStyle.Hidden; + try { opera.Start(); + opera.WaitForInputIdle(); - int OperaHandle = FindWindow("QWidget", null); - bool top = BringWindowToTop(OperaHandle); - + //ShowWindowAsync(MediaPortalHwnd, 0); //verberg MP + if (UseButtonForwarding) { - int MPHandle = FindWindow("WindowsForms10.Window.8.app.0.2386859", null); - int disableinput = SetFocus(MPHandle); - Log.Info("Set focus: (MP Handle: " + MPHandle.ToString() + ", Focus: " + disableinput + ")"); + Thread.Sleep(100); // <-- ugly hack + + if (opera.MainWindowHandle == IntPtr.Zero) + { + Log.Debug("Opera process handle not found, finding by Window name"); + OperaHwnd = FindOperaWindowHandle(); + } + else + { + OperaHwnd = opera.MainWindowHandle; + Log.Debug("opera.MainWindowHandle: " + opera.MainWindowHandle); + } + + MediaPortalHwnd = FindWindow(MediaPortalWindowName, null); + + Log.Debug("Opera Handle: " + OperaHwnd); + Log.Debug("MediaPortal Handle: " + MediaPortalHwnd); + + TaskBarHwnd = FindWindow("Shell_traywnd", ""); + SetWindowPos(TaskBarHwnd, IntPtr.Zero, 0, 0, 0, 0, SWP_HIDEWINDOW); // Hide Taskbar + + SetForegroundWindow(MediaPortalHwnd); //mediaportal to foreground + SetWindowPos(MediaPortalHwnd, OperaHwnd, 0, 0, SystemInformation.PrimaryMonitorSize.Width, SystemInformation.PrimaryMonitorSize.Height, SWP_HIDEWINDOW | SWP_NOMOVE); //mediaportol on top, but hidden } - //bool test = ShowWindowAsync(WindowToFind, SW_HIDE); + Cursor.Hide(); } catch (Exception ex) @@ -142,54 +196,165 @@ } } + public IntPtr FindOperaWindowHandle() + { + string OperaWindowName = "Opera Mobile (480x800)"; + if (!noFullscreen) + { + OperaWindowName = "Opera Mobile (" + SystemInformation.PrimaryMonitorSize.Width + "x" + SystemInformation.PrimaryMonitorSize.Height + ")"; + } + else if (Arguments.Contains("-displaysize")) + { + Match match = Regex.Match(Arguments, @"-displaysize ([0-9x]*)\s*", RegexOptions.IgnoreCase); + if (match.Success) + { + // Finally, we get the Group value and display it. + string resolution = match.Groups[1].Value; + OperaWindowName = "Opera Mobile (" + resolution + ")"; + } + } + + Log.Debug("OperaWindowName: " + OperaWindowName); + OperaHwnd = FindWindowEx(IntPtr.Zero, IntPtr.Zero, "QWidget", OperaWindowName); + Log.Debug("OperaHwnd: " + OperaHwnd); + return OperaHwnd; + } public override void OnAction(MediaPortal.GUI.Library.Action action) { if (UseButtonForwarding) { - int WindowToFind = FindWindow("QWidget", null); - switch (action.wID) { case MediaPortal.GUI.Library.Action.ActionType.ACTION_CONTEXT_MENU: GUIPropertyManager.SetProperty("#keypressed", "Info"); - SendMessage(WindowToFind, WM_KEYDOWN, VK_F1, 0); - SendMessage(WindowToFind, WM_KEYUP, VK_F1, 0); + Log.Debug("Info"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_F1, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_F1, 0); break; case MediaPortal.GUI.Library.Action.ActionType.ACTION_PREV_ITEM: GUIPropertyManager.SetProperty("#keypressed", "Replay"); - SendMessage(WindowToFind, WM_KEYDOWN, VK_F2, 0); - SendMessage(WindowToFind, WM_KEYUP, VK_F2, 0); + Log.Debug("Replay"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_F2, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_F2, 0); break; case MediaPortal.GUI.Library.Action.ActionType.ACTION_PAGE_UP: GUIPropertyManager.SetProperty("#keypressed", "Channel Up"); - SendMessage(WindowToFind, WM_KEYDOWN, VK_NUMPAD8, 0); - SendMessage(WindowToFind, WM_KEYUP, VK_NUMPAD8, 0); + Log.Debug("Channel Up"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_NUMPAD8, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_NUMPAD8, 0); break; case MediaPortal.GUI.Library.Action.ActionType.ACTION_PAGE_DOWN: GUIPropertyManager.SetProperty("#keypressed", "Channel Down"); - SendMessage(WindowToFind, WM_KEYDOWN, VK_NUMPAD2, 0); - SendMessage(WindowToFind, WM_KEYUP, VK_NUMPAD2, 0); + Log.Debug("Channel Down"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_NUMPAD2, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_NUMPAD2, 0); break; + case MediaPortal.GUI.Library.Action.ActionType.ACTION_SELECT_ITEM: + GUIPropertyManager.SetProperty("#keypressed", "OK"); + Log.Debug("OK"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_RETURN, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_RETURN, 0); + break; + + case MediaPortal.GUI.Library.Action.ActionType.ACTION_MOVE_LEFT: + GUIPropertyManager.SetProperty("#keypressed", "LEFT"); + Log.Debug("LEFT"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_LEFT, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_LEFT, 0); + break; + + case MediaPortal.GUI.Library.Action.ActionType.ACTION_MOVE_RIGHT: + GUIPropertyManager.SetProperty("#keypressed", "RIGHT"); + Log.Debug("RIGHT"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_RIGHT, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_RIGHT, 0); + break; + + case MediaPortal.GUI.Library.Action.ActionType.ACTION_MOVE_UP: + GUIPropertyManager.SetProperty("#keypressed", "UP"); + Log.Debug("UP"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_UP, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_UP, 0); + break; + + case MediaPortal.GUI.Library.Action.ActionType.ACTION_MOVE_DOWN: + GUIPropertyManager.SetProperty("#keypressed", "DOWN"); + Log.Debug("DOWN"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_DOWN, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_DOWN, 0); + break; + case MediaPortal.GUI.Library.Action.ActionType.REMOTE_0: GUIPropertyManager.SetProperty("#keypressed", "0"); - SendMessage(WindowToFind, WM_KEYDOWN, VK_NUMPAD0, 0); - SendMessage(WindowToFind, WM_KEYUP, VK_NUMPAD0, 0); + Log.Debug("0"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_NUMPAD0, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_NUMPAD0, 0); break; case MediaPortal.GUI.Library.Action.ActionType.REMOTE_1: GUIPropertyManager.SetProperty("#keypressed", "1"); - SendMessage(WindowToFind, WM_KEYDOWN, VK_NUMPAD1, 0); - SendMessage(WindowToFind, WM_KEYUP, VK_NUMPAD1, 0); + Log.Debug("1"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_NUMPAD1, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_NUMPAD1, 0); break; case MediaPortal.GUI.Library.Action.ActionType.REMOTE_2: GUIPropertyManager.SetProperty("#keypressed", "2"); - SendMessage(WindowToFind, WM_KEYDOWN, VK_NUMPAD2, 0); - SendMessage(WindowToFind, WM_KEYUP, VK_NUMPAD2, 0); + Log.Debug("2"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_NUMPAD2, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_NUMPAD2, 0); break; + case MediaPortal.GUI.Library.Action.ActionType.REMOTE_3: + GUIPropertyManager.SetProperty("#keypressed", "3"); + Log.Debug("3"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_NUMPAD3, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_NUMPAD3, 0); + break; + case MediaPortal.GUI.Library.Action.ActionType.REMOTE_4: + GUIPropertyManager.SetProperty("#keypressed", "4"); + Log.Debug("4"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_NUMPAD4, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_NUMPAD4, 0); + break; + case MediaPortal.GUI.Library.Action.ActionType.REMOTE_5: + GUIPropertyManager.SetProperty("#keypressed", "5"); + Log.Debug("5"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_NUMPAD5, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_NUMPAD5, 0); + break; + case MediaPortal.GUI.Library.Action.ActionType.REMOTE_6: + GUIPropertyManager.SetProperty("#keypressed", "6"); + Log.Debug("6"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_NUMPAD6, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_NUMPAD6, 0); + break; + case MediaPortal.GUI.Library.Action.ActionType.REMOTE_7: + GUIPropertyManager.SetProperty("#keypressed", "7"); + Log.Debug("7"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_NUMPAD7, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_NUMPAD7, 0); + break; + case MediaPortal.GUI.Library.Action.ActionType.REMOTE_8: + GUIPropertyManager.SetProperty("#keypressed", "8"); + Log.Debug("8"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_NUMPAD8, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_NUMPAD8, 0); + break; + case MediaPortal.GUI.Library.Action.ActionType.REMOTE_9: + GUIPropertyManager.SetProperty("#keypressed", "9"); + Log.Debug("9"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_NUMPAD9, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_NUMPAD9, 0); + break; + case MediaPortal.GUI.Library.Action.ActionType.ACTION_REWIND: + GUIPropertyManager.SetProperty("#keypressed", "REWIND"); + Log.Debug("REWIND"); + SendMessage(OperaHwnd, WM_KEYDOWN, VK_BACK, 0); + SendMessage(OperaHwnd, WM_KEYUP, VK_BACK, 0); + break; } } base.OnAction(action); Modified: trunk/plugins/OperaMobileLauncher/Opera Mobile/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/OperaMobileLauncher/Opera Mobile/Properties/AssemblyInfo.cs 2012-05-21 19:56:24 UTC (rev 4489) +++ trunk/plugins/OperaMobileLauncher/Opera Mobile/Properties/AssemblyInfo.cs 2012-05-25 10:30:51 UTC (rev 4490) @@ -13,8 +13,8 @@ [assembly: AssemblyTitle("Opera Mobile Emulator Launcher for MediaPortal")] [assembly: AssemblyDescription("Starts Opera Mobile Emulator from within MediaPortal")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("For MediaPortal")] -[assembly: AssemblyProduct("Opera Mobile MediaPortal shortcut")] +[assembly: AssemblyCompany("for MediaPortal")] +[assembly: AssemblyProduct("Opera Mobile Launcher")] [assembly: AssemblyCopyright("")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] Modified: trunk/plugins/OperaMobileLauncher/Opera Mobile/bin/Release/OperaMobileLauncher.dll =================================================================== (Binary files differ) Modified: trunk/plugins/OperaMobileLauncher/Opera Mobile/bin/Release/OperaMobileLauncher.pdb =================================================================== (Binary files differ) Modified: trunk/plugins/OperaMobileLauncher/Opera Mobile/bin/Release/OperaMobileLauncher.xmp2 =================================================================== --- trunk/plugins/OperaMobileLauncher/Opera Mobile/bin/Release/OperaMobileLauncher.xmp2 2012-05-21 19:56:24 UTC (rev 4489) +++ trunk/plugins/OperaMobileLauncher/Opera Mobile/bin/Release/OperaMobileLauncher.xmp2 2012-05-25 10:30:51 UTC (rev 4490) @@ -24,949 +24,1348 @@ <ZipFileName>Installer{CopyFile}\{f8473215-d188-4f04-a914-1a6f3e094b6f}-OperaMobileLauncher.xml</ZipFileName> <DestinationFilename>%Config%\skin\StreamedMP\OperaMobileLauncher.xml</DestinationFilename> </FileItem> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="true"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>C:\ProgramData\Team MediaPortal\MediaPortal\skin\DefaultWide\OperaMobile.xml</LocalFileName> + <ZipFileName>Installer{CopyFile}\{0f257152-b180-4088-b597-6487196c4cde}-OperaMobile.xml</ZipFileName> + <DestinationFilename>%Config%\skin\DefaultWide\OperaMobile.xml</DestinationFilename> + </FileItem> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="true"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>C:\ProgramData\Team MediaPortal\MediaPortal\skin\DefaultWide\OperaMobile.xml</LocalFileName> + <ZipFileName>Installer{CopyFile}\{e97b6954-6e0e-43a3-a397-dc42b0b6282c}-OperaMobile.xml</ZipFileName> + <DestinationFilename>%Config%\skin\Default\OperaMobile.xml</DestinationFilename> + </FileItem> </Items> </Files> </GroupItem> - <GroupItem Name="Opera Mobile Emulator"> + <GroupItem Name="StreamedMP plugin background"> <ParentGroup /> - <DisplayName>Opera Mobile Emulator</DisplayName> + <DisplayName>StreamedMP plugin hover background</DisplayName> + <DefaulChecked>false</DefaulChecked> + <Description>StreamedMP plugin hover background</Description> + <Files> + <Items> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="true"> + <Param1 /> + <UpdateOption>NeverOverwrite</UpdateOption> + <LocalFileName>hover_Opera Mobile Launcher.png</LocalFileName> + <ZipFileName>Installer{CopyFile}\{7bb57dd0-7731-4993-94f7-ecba6aa1acfc}-hover_Opera Mobile Launcher.png</ZipFileName> + <DestinationFilename>%Skin%\StreamedMP\Media\hover_Opera Mobile Launcher.png</DestinationFilename> + </FileItem> + </Items> + </Files> + </GroupItem> + <GroupItem Name="Opera Mobile Emulator 12"> + <ParentGroup /> + <DisplayName>Opera Mobile Emulator 12</DisplayName> <DefaulChecked>true</DefaulChecked> - <Description>Installs the Opera Mobile Emulator application on your computer. It will install in the Program Files Directory</Description> + <Description>Installs the Opera Mobile 12 Emulator application on your computer. It will install in the Program Files Directory</Description> <Files> <Items> <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> <Param1 /> - <UpdateOption>NeverOverwrite</UpdateOption> + <UpdateOption>OverwriteIfOlder</UpdateOption> <LocalFileName>C:\Program Files (x86)\Opera Mobile Emulator\crashreporter.exe</LocalFileName> - <ZipFileName>Installer{CopyFile}\{b4cdca54-aa81-4ae7-aade-f1f606b25289}-crashreporter.exe</ZipFileName> + <ZipFileName>Installer{CopyFile}\{0f2e4eca-c25d-43ac-b62d-bce349f5bca0}-crashreporter.exe</ZipFileName> <DestinationFilename>%ProgramFiles%\Opera Mobile Emulator\crashreporter.exe</DestinationFilename> </FileItem> <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> <Param1 /> - <UpdateOption>NeverOverwrite</UpdateOption> - <LocalFileName>C:\Program Files (x86)\Opera Mobile Emulator\crc.bin</LocalFileName> - <ZipFileName>Installer{CopyFile}\{2374a4c3-ca96-4545-8380-a44c35cb9eb5}-crc.bin</ZipFileName> - <DestinationFilename>%ProgramFiles%\Opera Mobile Emulator\crc.bin</DestinationFilename> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>C:\Program Files (x86)\Opera Mobile Emulator\Launcher.exe</LocalFileName> + <ZipFileName>Installer{CopyFile}\{bd293798-9508-4f01-afe0-519fb0db50bc}-Launcher.exe</ZipFileName> + <DestinationFilename>%ProgramFiles%\Opera Mobile Emulator\Launcher.exe</DestinationFilename> </FileItem> <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> <Param1 /> - <UpdateOption>NeverOverwrite</UpdateOption> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>C:\Program Files (x86)\Opera Mobile Emulator\LauncherDefault.ini</LocalFileName> + <ZipFileName>Installer{CopyFile}\{91925f65-b12f-4cba-b79c-affa12db8a8c}-LauncherDefault.ini</ZipFileName> + <DestinationFilename>%ProgramFiles%\Opera Mobile Emulator\LauncherDefault.ini</DestinationFilename> + </FileItem> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>C:\Program Files (x86)\Opera Mobile E... [truncated message content] |