Menu
▾
▴
mp-plugins-svn — SVN Update mailing list
You can subscribe to this list here.
| 2007 |
Jan
(36) |
Feb
(79) |
Mar
(123) |
Apr
(95) |
May
(119) |
Jun
(172) |
Jul
(124) |
Aug
(100) |
Sep
(83) |
Oct
(52) |
Nov
(97) |
Dec
(87) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(131) |
Feb
(80) |
Mar
(163) |
Apr
(178) |
May
(73) |
Jun
(54) |
Jul
(106) |
Aug
(118) |
Sep
(50) |
Oct
(125) |
Nov
(100) |
Dec
(99) |
| 2009 |
Jan
(104) |
Feb
(99) |
Mar
(68) |
Apr
(81) |
May
(52) |
Jun
(87) |
Jul
(67) |
Aug
(33) |
Sep
(27) |
Oct
(37) |
Nov
(60) |
Dec
(116) |
| 2010 |
Jan
(82) |
Feb
(79) |
Mar
(38) |
Apr
(50) |
May
(45) |
Jun
(53) |
Jul
(23) |
Aug
(86) |
Sep
(22) |
Oct
(96) |
Nov
(97) |
Dec
(73) |
| 2011 |
Jan
(24) |
Feb
(45) |
Mar
(28) |
Apr
(31) |
May
(42) |
Jun
(25) |
Jul
|
Aug
(12) |
Sep
(28) |
Oct
(13) |
Nov
(43) |
Dec
(13) |
| 2012 |
Jan
(62) |
Feb
(28) |
Mar
(6) |
Apr
(16) |
May
(7) |
Jun
|
Jul
(16) |
Aug
(2) |
Sep
(1) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
| 2013 |
Jan
(5) |
Feb
|
Mar
(34) |
Apr
(9) |
May
(6) |
Jun
(10) |
Jul
(32) |
Aug
(8) |
Sep
(11) |
Oct
(35) |
Nov
(24) |
Dec
(22) |
| 2014 |
Jan
(44) |
Feb
(9) |
Mar
(9) |
Apr
(15) |
May
(25) |
Jun
(34) |
Jul
(16) |
Aug
(11) |
Sep
(7) |
Oct
(6) |
Nov
(1) |
Dec
(12) |
| 2015 |
Jan
(33) |
Feb
(19) |
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2023 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(5) |
|
From: <dos...@us...> - 2014-10-06 20:39:57
|
Revision: 4890
http://sourceforge.net/p/mp-plugins/code/4890
Author: doskabouter
Date: 2014-10-06 20:39:54 +0000 (Mon, 06 Oct 2014)
Log Message:
-----------
Fixed prev/next issue with iframes
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/DomHelper.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/DomHelper.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/DomHelper.cs 2014-10-06 20:38:46 UTC (rev 4889)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/DomHelper.cs 2014-10-06 20:39:54 UTC (rev 4890)
@@ -44,10 +44,14 @@
public static Tuple<string, string> AddLinksToPage(GeckoDocument document, Settings settings)
{
- previousUrl = null;
- nextUrl = null;
-
int maxId = GetMaxId(document);
+ if (maxId == 0)
+ {
+ //new page, so reset prev and next
+ MyLog.debug("Reset prev and next url");
+ previousUrl = null;
+ nextUrl = null;
+ }
AddLinksToPage(document, maxId + 1, settings);
return new Tuple<string, string>(previousUrl, nextUrl);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2014-10-06 20:38:52
|
Revision: 4889
http://sourceforge.net/p/mp-plugins/code/4889
Author: doskabouter
Date: 2014-10-06 20:38:46 +0000 (Mon, 06 Oct 2014)
Log Message:
-----------
New screenshots
Added Paths:
-----------
trunk/plugins/BrowseTheWeb/Release/Setup1.png
trunk/plugins/BrowseTheWeb/Release/Setup2.png
trunk/plugins/BrowseTheWeb/Release/browser1.png
trunk/plugins/BrowseTheWeb/Release/browser2.png
trunk/plugins/BrowseTheWeb/Release/browser3.png
Removed Paths:
-------------
trunk/plugins/BrowseTheWeb/Release/browser1.jpg
trunk/plugins/BrowseTheWeb/Release/browser2.jpg
trunk/plugins/BrowseTheWeb/Release/setup1.jpg
trunk/plugins/BrowseTheWeb/Release/setup2.jpg
trunk/plugins/BrowseTheWeb/Release/setup3.jpg
trunk/plugins/BrowseTheWeb/Release/setup4.jpg
Added: trunk/plugins/BrowseTheWeb/Release/Setup1.png
===================================================================
(Binary files differ)
Index: trunk/plugins/BrowseTheWeb/Release/Setup1.png
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/Setup1.png 2014-10-05 20:59:12 UTC (rev 4888)
+++ trunk/plugins/BrowseTheWeb/Release/Setup1.png 2014-10-06 20:38:46 UTC (rev 4889)
Property changes on: trunk/plugins/BrowseTheWeb/Release/Setup1.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/BrowseTheWeb/Release/Setup2.png
===================================================================
(Binary files differ)
Index: trunk/plugins/BrowseTheWeb/Release/Setup2.png
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/Setup2.png 2014-10-05 20:59:12 UTC (rev 4888)
+++ trunk/plugins/BrowseTheWeb/Release/Setup2.png 2014-10-06 20:38:46 UTC (rev 4889)
Property changes on: trunk/plugins/BrowseTheWeb/Release/Setup2.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: trunk/plugins/BrowseTheWeb/Release/browser1.jpg
===================================================================
(Binary files differ)
Copied: trunk/plugins/BrowseTheWeb/Release/browser1.png (from rev 4648, trunk/plugins/BrowseTheWeb/Release/browser1.jpg)
===================================================================
(Binary files differ)
Deleted: trunk/plugins/BrowseTheWeb/Release/browser2.jpg
===================================================================
(Binary files differ)
Copied: trunk/plugins/BrowseTheWeb/Release/browser2.png (from rev 4648, trunk/plugins/BrowseTheWeb/Release/browser2.jpg)
===================================================================
(Binary files differ)
Added: trunk/plugins/BrowseTheWeb/Release/browser3.png
===================================================================
(Binary files differ)
Index: trunk/plugins/BrowseTheWeb/Release/browser3.png
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/browser3.png 2014-10-05 20:59:12 UTC (rev 4888)
+++ trunk/plugins/BrowseTheWeb/Release/browser3.png 2014-10-06 20:38:46 UTC (rev 4889)
Property changes on: trunk/plugins/BrowseTheWeb/Release/browser3.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: trunk/plugins/BrowseTheWeb/Release/setup1.jpg
===================================================================
(Binary files differ)
Deleted: trunk/plugins/BrowseTheWeb/Release/setup2.jpg
===================================================================
(Binary files differ)
Deleted: trunk/plugins/BrowseTheWeb/Release/setup3.jpg
===================================================================
(Binary files differ)
Deleted: trunk/plugins/BrowseTheWeb/Release/setup4.jpg
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2014-10-05 20:59:16
|
Revision: 4888
http://sourceforge.net/p/mp-plugins/code/4888
Author: doskabouter
Date: 2014-10-05 20:59:12 +0000 (Sun, 05 Oct 2014)
Log Message:
-----------
Fixed bug: Bookmarks added in Mediaportal were not saved
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/MyLog.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2014-10-01 20:47:49 UTC (rev 4887)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2014-10-05 20:59:12 UTC (rev 4888)
@@ -391,6 +391,9 @@
}
}
settings.SaveToXml(false);
+ bool result = Bookmarks.Instance.SaveToXml(Config.GetFolder(Config.Dir.Config) + "\\bookmarks.xml");
+ if (!result)
+ MyLog.error("Bookmarks could not be saved !");
webBrowser.Visible = false;
GUIGraphicsContext.form.Focus();
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/MyLog.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/MyLog.cs 2014-10-01 20:47:49 UTC (rev 4887)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/MyLog.cs 2014-10-05 20:59:12 UTC (rev 4888)
@@ -36,6 +36,11 @@
{
Log.Debug("BrowseTheWeb | " + str, new object[0]);
}
+
+ public static void error(string str)
+ {
+ Log.Error("BrowseTheWeb | " + str, new object[0]);
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2014-10-01 20:47:53
|
Revision: 4887
http://sourceforge.net/p/mp-plugins/code/4887
Author: doskabouter
Date: 2014-10-01 20:47:49 +0000 (Wed, 01 Oct 2014)
Log Message:
-----------
Release 1.6.0.0
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/readme.txt
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2014-10-01 20:38:07 UTC (rev 4886)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2014-10-01 20:47:49 UTC (rev 4887)
@@ -116,8 +116,8 @@
<SectionParam Name="Configuration file">
<Value />
<ValueType>Template</ValueType>
- <Description>The file used to configure the extension.
-If have .exe extension the will be executed
+ <Description>The file used to configure the extension.
+If have .exe extension the will be executed
If have .dll extension used like MP plugin configuration</Description>
</SectionParam>
<SectionParam Name="Online Screenshots">
@@ -256,8 +256,8 @@
<SectionParam Name="Configuration file">
<Value />
<ValueType>Template</ValueType>
- <Description>The file used to configure the extension.
-If have .exe extension the will be executed
+ <Description>The file used to configure the extension.
+If have .exe extension the will be executed
If have .dll extension used like MP plugin configuration</Description>
</SectionParam>
<SectionParam Name="Online Screenshots">
@@ -388,10 +388,10 @@
<Revision>0</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / Webbrowser.</ExtensionDescription>
- <VersionDescription>Added compatibility with 1.4.0
-More items to click on
-Added skin selection to installer
-Fixed installation issues
+ <VersionDescription>Added compatibility with 1.4.0
+More items to click on
+Added skin selection to installer
+Fixed installation issues
Skin improvements</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.1.0.0.mpe1</OnlineLocation>
@@ -408,8 +408,8 @@
<SectionParam Name="Configuration file">
<Value />
<ValueType>Template</ValueType>
- <Description>The file used to configure the extension.
-If have .exe extension the will be executed
+ <Description>The file used to configure the extension.
+If have .exe extension the will be executed
If have .dll extension used like MP plugin configuration</Description>
</SectionParam>
<SectionParam Name="Online Screenshots">
@@ -540,9 +540,9 @@
<Revision>0</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / Webbrowser.</ExtensionDescription>
- <VersionDescription>Added compatibility with 1.4.0
-Fixed click issue when zoom isn't 100%
-Fixed missing round corners at link-numbers
+ <VersionDescription>Added compatibility with 1.4.0
+Fixed click issue when zoom isn't 100%
+Fixed missing round corners at link-numbers
Improved placement of link-numbers</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.2.0.0.mpe1</OnlineLocation>
@@ -559,8 +559,8 @@
<SectionParam Name="Configuration file">
<Value />
<ValueType>Template</ValueType>
- <Description>The file used to configure the extension.
-If have .exe extension the will be executed
+ <Description>The file used to configure the extension.
+If have .exe extension the will be executed
If have .dll extension used like MP plugin configuration</Description>
</SectionParam>
<SectionParam Name="Online Screenshots">
@@ -691,8 +691,8 @@
<Revision>0</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / Webbrowser.</ExtensionDescription>
- <VersionDescription>Fixed creation of thumbnails
-Better handling of <a> elements with onclick handler
+ <VersionDescription>Fixed creation of thumbnails
+Better handling of <a> elements with onclick handler
Reuse numbers for <a> elements with same href</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.3.0.0.mpe1</OnlineLocation>
@@ -709,8 +709,8 @@
<SectionParam Name="Configuration file">
<Value />
<ValueType>Template</ValueType>
- <Description>The file used to configure the extension.
-If have .exe extension the will be executed
+ <Description>The file used to configure the extension.
+If have .exe extension the will be executed
If have .dll extension used like MP plugin configuration</Description>
</SectionParam>
<SectionParam Name="Online Screenshots">
@@ -841,7 +841,7 @@
<Revision>0</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / Webbrowser.</ExtensionDescription>
- <VersionDescription>Fixed some gui issues
+ <VersionDescription>Fixed some gui issues
Fixed Compatibility with Mediaportal 1.6.0</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.4.0.0.mpe1</OnlineLocation>
@@ -858,8 +858,8 @@
<SectionParam Name="Configuration file">
<Value />
<ValueType>Template</ValueType>
- <Description>The file used to configure the extension.
-If have .exe extension the will be executed
+ <Description>The file used to configure the extension.
+If have .exe extension the will be executed
If have .dll extension used like MP plugin configuration</Description>
</SectionParam>
<SectionParam Name="Online Screenshots">
@@ -990,10 +990,10 @@
<Revision>0</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / Webbrowser.</ExtensionDescription>
- <VersionDescription>Preserve bookmark folder structure on import
-Fixed mouse visibility
-Fixed some mouse click issues
-Uses Gecko version 22
+ <VersionDescription>Preserve bookmark folder structure on import
+Fixed mouse visibility
+Fixed some mouse click issues
+Uses Gecko version 22
</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.5.0.0.mpe1</OnlineLocation>
@@ -1010,8 +1010,8 @@
<SectionParam Name="Configuration file">
<Value />
<ValueType>Template</ValueType>
- <Description>The file used to configure the extension.
-If have .exe extension the will be executed
+ <Description>The file used to configure the extension.
+If have .exe extension the will be executed
If have .dll extension used like MP plugin configuration</Description>
</SectionParam>
<SectionParam Name="Online Screenshots">
@@ -1142,10 +1142,10 @@
<Revision>1</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / Webbrowser.</ExtensionDescription>
- <VersionDescription>Preserve bookmark folder structure on import
-Fixed mouse visibility
-Fixed some mouse click issues
-Uses Gecko version 22
+ <VersionDescription>Preserve bookmark folder structure on import
+Fixed mouse visibility
+Fixed some mouse click issues
+Uses Gecko version 22
</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.5.0.1.mpe1</OnlineLocation>
@@ -1162,8 +1162,8 @@
<SectionParam Name="Configuration file">
<Value />
<ValueType>Template</ValueType>
- <Description>The file used to configure the extension.
-If have .exe extension the will be executed
+ <Description>The file used to configure the extension.
+If have .exe extension the will be executed
If have .dll extension used like MP plugin configuration</Description>
</SectionParam>
<SectionParam Name="Online Screenshots">
@@ -1187,5 +1187,159 @@
</ProjectSettings>
<IsSkin>false</IsSkin>
</PackageClass>
+ <PackageClass>
+ <Version>2.0</Version>
+ <Groups>
+ <Items>
+ <GroupItem Name="Common">
+ <DisplayName>Common</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Common</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Default">
+ <DisplayName>Default</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Default</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="DefaultWide">
+ <DisplayName>DefaultWide</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>DefaultWide</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Titan">
+ <DisplayName>Titan</DisplayName>
+ <DefaulChecked>false</DefaulChecked>
+ <Description>Titan</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Skins">
+ <DisplayName>Skins</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Skins</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items />
+ </Sections>
+ <Dependencies>
+ <Items>
+ <DependencyItem>
+ <Type>MediaPortal</Type>
+ <Id />
+ <MinVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MinVersion>
+ <MaxVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MaxVersion>
+ <WarnOnly>false</WarnOnly>
+ <Message>requires MediaPortal version 1.6 or higher.</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ </Items>
+ </Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="BrowseTheWeb.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.6.0.0</MinRequiredVersion>
+ <DesignedForVersion>1.6.0.0</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items>
+ <SubSystemItem Name="MP.Config" />
+ <SubSystemItem Name="MP.DB" />
+ <SubSystemItem Name="MP.SkinEngine" />
+ </Items>
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
+ <GeneralInfo>
+ <Name>Browse The Web</Name>
+ <Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
+ <Author>Doskabouter</Author>
+ <HomePage>http://www.team-mediaportal.com/extensions/news-info/browse-the-web-webbrowser</HomePage>
+ <ForumPage>http://forum.team-mediaportal.com/threads/browse-the-web-webbrowser.107285/</ForumPage>
+ <UpdateUrl>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml</UpdateUrl>
+ <Version>
+ <Major>1</Major>
+ <Minor>6</Minor>
+ <Build>0</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / Webbrowser.</ExtensionDescription>
+ <VersionDescription>Added option for previous and next pages
+Improved bookmark handling
+Improved number-placing
+Improved keybindings
+Fixed missing thumbs
+Fixed spurious duplicate link numbers
+Fixed focus issues with flash player</VersionDescription>
+ <DevelopmentStatus>Stable</DevelopmentStatus>
+ <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=72&cf_id=24</OnlineLocation>
+ <ReleaseDate>2014-10-01T22:36:12.6586003+02:00</ReleaseDate>
+ <Tags>webbrowser, internet, web</Tags>
+ <Location>..\..\BrowseTheWeb.mpe1</Location>
+ <Params>
+ <Items>
+ <SectionParam Name="Online Icon">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Configuration file">
+ <Value />
+ <ValueType>Template</ValueType>
+ <Description>The file used to configure the extension.
+If have .exe extension the will be executed
+If have .dll extension used like MP plugin configuration</Description>
+ </SectionParam>
+ <SectionParam Name="Online Screenshots">
+ <Value>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/browser1.jpg;http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/setup3.jpg</Value>
+ <ValueType>String</ValueType>
+ <Description>Online stored screenshot urls separated by ; </Description>
+ </SectionParam>
+ <SectionParam Name="Force to uninstall on update">
+ <Value>YES</Value>
+ <ValueType>Bool</ValueType>
+ <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ </GeneralInfo>
+ <UniqueFileList>
+ <Items />
+ </UniqueFileList>
+ <ProjectSettings>
+ <FolderGroups />
+ </ProjectSettings>
+ <IsSkin>false</IsSkin>
+ </PackageClass>
</Items>
</ExtensionCollection>
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2014-10-01 20:38:07 UTC (rev 4886)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2014-10-01 20:47:49 UTC (rev 4887)
@@ -654,19 +654,21 @@
<UpdateUrl>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml</UpdateUrl>
<Version>
<Major>1</Major>
- <Minor>5</Minor>
+ <Minor>6</Minor>
<Build>0</Build>
- <Revision>1</Revision>
+ <Revision>0</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / Webbrowser.</ExtensionDescription>
- <VersionDescription>Preserve bookmark folder structure on import
-Fixed mouse visibility
-Fixed some mouse click issues
-Uses Gecko version 22
-</VersionDescription>
+ <VersionDescription>Added option for previous and next pages
+Improved bookmark handling
+Improved number-placing
+Improved keybindings
+Fixed missing thumbs
+Fixed spurious duplicate link numbers
+Fixed focus issues with flash player</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
- <OnlineLocation>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.[Version].mpe1</OnlineLocation>
- <ReleaseDate>2014-01-25T21:13:09.5882715+01:00</ReleaseDate>
+ <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=72&cf_id=24</OnlineLocation>
+ <ReleaseDate>2014-10-01T22:36:12.6586003+02:00</ReleaseDate>
<Tags>webbrowser, internet, web</Tags>
<Location>..\..\BrowseTheWeb.mpe1</Location>
<Params>
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2014-10-01 20:38:07 UTC (rev 4886)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2014-10-01 20:47:49 UTC (rev 4887)
@@ -38,5 +38,5 @@
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.1")]
-[assembly: AssemblyFileVersion("1.5.0.1")]
+[assembly: AssemblyVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/readme.txt
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/readme.txt 2014-10-01 20:38:07 UTC (rev 4886)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/readme.txt 2014-10-01 20:47:49 UTC (rev 4887)
@@ -1,14 +1,13 @@
Deployment new version:
1: Check assemblyinfo for version
-2: edit BrowseTheWeb.xmp2
-3: do a release build
-4: rename resulting mpe1 to include version number
+2: do a release build
+3: rename resulting mpe1 to include version number
+4: edit BrowseTheWeb.xmp2 (and Change url of OnlineLocation of old files)
5: Edit http://www.team-mediaportal.com/extensions/news-info/browse-the-web-webbrowser
- Update version
- Update changelog
- - Update External Download (version number)
- - Upload new MPE1 Update File
+ - Upload new MPE1
6: Notify on forum
Change history (not maintained)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2014-10-01 20:38:11
|
Revision: 4886
http://sourceforge.net/p/mp-plugins/code/4886
Author: doskabouter
Date: 2014-10-01 20:38:07 +0000 (Wed, 01 Oct 2014)
Log Message:
-----------
Removed dll
Removed Paths:
-------------
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
Deleted: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.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...> - 2014-10-01 19:15:02
|
Revision: 4885
http://sourceforge.net/p/mp-plugins/code/4885
Author: doskabouter
Date: 2014-10-01 19:14:53 +0000 (Wed, 01 Oct 2014)
Log Message:
-----------
Small test
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2014-09-26 21:02:46 UTC (rev 4884)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2014-10-01 19:14:53 UTC (rev 4885)
@@ -116,8 +116,8 @@
<SectionParam Name="Configuration file">
<Value />
<ValueType>Template</ValueType>
- <Description>The file used to configure the extension.
-If have .exe extension the will be executed
+ <Description>The file used to configure the extension.
+If have .exe extension the will be executed
If have .dll extension used like MP plugin configuration</Description>
</SectionParam>
<SectionParam Name="Online Screenshots">
@@ -256,8 +256,8 @@
<SectionParam Name="Configuration file">
<Value />
<ValueType>Template</ValueType>
- <Description>The file used to configure the extension.
-If have .exe extension the will be executed
+ <Description>The file used to configure the extension.
+If have .exe extension the will be executed
If have .dll extension used like MP plugin configuration</Description>
</SectionParam>
<SectionParam Name="Online Screenshots">
@@ -388,10 +388,10 @@
<Revision>0</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / Webbrowser.</ExtensionDescription>
- <VersionDescription>Added compatibility with 1.4.0
-More items to click on
-Added skin selection to installer
-Fixed installation issues
+ <VersionDescription>Added compatibility with 1.4.0
+More items to click on
+Added skin selection to installer
+Fixed installation issues
Skin improvements</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.1.0.0.mpe1</OnlineLocation>
@@ -408,8 +408,8 @@
<SectionParam Name="Configuration file">
<Value />
<ValueType>Template</ValueType>
- <Description>The file used to configure the extension.
-If have .exe extension the will be executed
+ <Description>The file used to configure the extension.
+If have .exe extension the will be executed
If have .dll extension used like MP plugin configuration</Description>
</SectionParam>
<SectionParam Name="Online Screenshots">
@@ -540,9 +540,9 @@
<Revision>0</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / Webbrowser.</ExtensionDescription>
- <VersionDescription>Added compatibility with 1.4.0
-Fixed click issue when zoom isn't 100%
-Fixed missing round corners at link-numbers
+ <VersionDescription>Added compatibility with 1.4.0
+Fixed click issue when zoom isn't 100%
+Fixed missing round corners at link-numbers
Improved placement of link-numbers</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.2.0.0.mpe1</OnlineLocation>
@@ -559,8 +559,8 @@
<SectionParam Name="Configuration file">
<Value />
<ValueType>Template</ValueType>
- <Description>The file used to configure the extension.
-If have .exe extension the will be executed
+ <Description>The file used to configure the extension.
+If have .exe extension the will be executed
If have .dll extension used like MP plugin configuration</Description>
</SectionParam>
<SectionParam Name="Online Screenshots">
@@ -691,8 +691,8 @@
<Revision>0</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / Webbrowser.</ExtensionDescription>
- <VersionDescription>Fixed creation of thumbnails
-Better handling of <a> elements with onclick handler
+ <VersionDescription>Fixed creation of thumbnails
+Better handling of <a> elements with onclick handler
Reuse numbers for <a> elements with same href</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.3.0.0.mpe1</OnlineLocation>
@@ -709,8 +709,8 @@
<SectionParam Name="Configuration file">
<Value />
<ValueType>Template</ValueType>
- <Description>The file used to configure the extension.
-If have .exe extension the will be executed
+ <Description>The file used to configure the extension.
+If have .exe extension the will be executed
If have .dll extension used like MP plugin configuration</Description>
</SectionParam>
<SectionParam Name="Online Screenshots">
@@ -841,7 +841,7 @@
<Revision>0</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / Webbrowser.</ExtensionDescription>
- <VersionDescription>Fixed some gui issues
+ <VersionDescription>Fixed some gui issues
Fixed Compatibility with Mediaportal 1.6.0</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.4.0.0.mpe1</OnlineLocation>
@@ -858,8 +858,8 @@
<SectionParam Name="Configuration file">
<Value />
<ValueType>Template</ValueType>
- <Description>The file used to configure the extension.
-If have .exe extension the will be executed
+ <Description>The file used to configure the extension.
+If have .exe extension the will be executed
If have .dll extension used like MP plugin configuration</Description>
</SectionParam>
<SectionParam Name="Online Screenshots">
@@ -990,10 +990,10 @@
<Revision>0</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / Webbrowser.</ExtensionDescription>
- <VersionDescription>Preserve bookmark folder structure on import
-Fixed mouse visibility
-Fixed some mouse click issues
-Uses Gecko version 22
+ <VersionDescription>Preserve bookmark folder structure on import
+Fixed mouse visibility
+Fixed some mouse click issues
+Uses Gecko version 22
</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.5.0.0.mpe1</OnlineLocation>
@@ -1010,8 +1010,8 @@
<SectionParam Name="Configuration file">
<Value />
<ValueType>Template</ValueType>
- <Description>The file used to configure the extension.
-If have .exe extension the will be executed
+ <Description>The file used to configure the extension.
+If have .exe extension the will be executed
If have .dll extension used like MP plugin configuration</Description>
</SectionParam>
<SectionParam Name="Online Screenshots">
@@ -1142,10 +1142,10 @@
<Revision>1</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / Webbrowser.</ExtensionDescription>
- <VersionDescription>Preserve bookmark folder structure on import
-Fixed mouse visibility
-Fixed some mouse click issues
-Uses Gecko version 22
+ <VersionDescription>Preserve bookmark folder structure on import
+Fixed mouse visibility
+Fixed some mouse click issues
+Uses Gecko version 22
</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.5.0.1.mpe1</OnlineLocation>
@@ -1162,12 +1162,12 @@
<SectionParam Name="Configuration file">
<Value />
<ValueType>Template</ValueType>
- <Description>The file used to configure the extension.
-If have .exe extension the will be executed
+ <Description>The file used to configure the extension.
+If have .exe extension the will be executed
If have .dll extension used like MP plugin configuration</Description>
</SectionParam>
<SectionParam Name="Online Screenshots">
- <Value>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/browser1.jpg;http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/setup3.jpg</Value>
+ <Value>http://svn.code.sf.net/p/mp-plugins/code/TRUNK/plugins/BrowseTheWeb/Release/browser1.jpg;http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/setup3.jpg</Value>
<ValueType>String</ValueType>
<Description>Online stored screenshot urls separated by ; </Description>
</SectionParam>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2014-09-26 21:02:56
|
Revision: 4884
http://sourceforge.net/p/mp-plugins/code/4884
Author: doskabouter
Date: 2014-09-26 21:02:46 +0000 (Fri, 26 Sep 2014)
Log Message:
-----------
Added option for previous and next pages
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/DomHelper.cs
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/DomHelper.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/DomHelper.cs 2014-09-26 20:57:52 UTC (rev 4883)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/DomHelper.cs 2014-09-26 21:02:46 UTC (rev 4884)
@@ -39,10 +39,17 @@
private const string btwebId = "btweb_id";
- public static void AddLinksToPage(GeckoDocument document)
+ private static string previousUrl;
+ private static string nextUrl;
+
+ public static Tuple<string, string> AddLinksToPage(GeckoDocument document, Settings settings)
{
+ previousUrl = null;
+ nextUrl = null;
+
int maxId = GetMaxId(document);
- AddLinksToPage(document, maxId + 1);
+ AddLinksToPage(document, maxId + 1, settings);
+ return new Tuple<string, string>(previousUrl, nextUrl);
}
public static GeckoHtmlElement GetElement(string linkId, GeckoDocument document)
@@ -96,8 +103,16 @@
return new Point(0, 0);
}
- private static int AddLinksToPage(GeckoDocument document, int id)
+ private static void Check(GeckoAnchorElement element, string[] tags, ref string url)
{
+ if (String.IsNullOrEmpty(url))
+ foreach (string tag in tags)
+ if (element.TextContent.ToUpperInvariant().Contains(tag.ToUpperInvariant()))
+ url = element.Href;
+ }
+
+ private static int AddLinksToPage(GeckoDocument document, int id, Settings settings)
+ {
Dictionary<string, int> hrefs = new Dictionary<string, int>();
GeckoElementCollection links = document.Links;
MyLog.debug("page links cnt : " + links.Count<GeckoHtmlElement>());
@@ -131,6 +146,12 @@
newId = id++;
hrefs.Add(url, newId);
}
+
+ if (!String.IsNullOrEmpty(url) && element is GeckoAnchorElement)
+ {
+ Check((GeckoAnchorElement)element, settings.PreviousTags, ref previousUrl);
+ Check((GeckoAnchorElement)element, settings.NextTags, ref nextUrl);
+ }
}
else
newId = id++;
@@ -264,7 +285,7 @@
GeckoElementCollection iframes = document.GetElementsByTagName("iframe");
MyLog.debug("page iframes cnt : " + iframes.Count<GeckoHtmlElement>());
foreach (GeckoIFrameElement element in iframes)
- id = AddLinksToPage(element.ContentDocument, id);
+ id = AddLinksToPage(element.ContentDocument, id, settings);
return id;
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2014-09-26 20:57:52 UTC (rev 4883)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2014-09-26 21:02:46 UTC (rev 4884)
@@ -81,6 +81,8 @@
private bool clickFromPlugin = false;
private bool aeroDisabled = false;
+ private Tuple<string, string> prevNextUrls;
+
#region Constants
public const int PluginWindowId = 54537689;
#endregion
@@ -659,6 +661,19 @@
return;
#endregion
}
+
+ if (prevNextUrls != null)
+ switch (action.wID)
+ {
+ case Action.ActionType.ACTION_PREV_CHAPTER:
+ if (!String.IsNullOrEmpty(prevNextUrls.Item1))
+ webBrowser.Navigate(prevNextUrls.Item1);
+ return;
+ case Action.ActionType.ACTION_NEXT_CHAPTER:
+ if (!String.IsNullOrEmpty(prevNextUrls.Item2))
+ webBrowser.Navigate(prevNextUrls.Item2);
+ return;
+ }
base.OnAction(action);
}
@@ -893,7 +908,7 @@
#endregion
if (!settings.UseMouse)
- DomHelper.AddLinksToPage(webBrowser.Document);
+ prevNextUrls = DomHelper.AddLinksToPage(webBrowser.Document, settings);
#region reset zoom
if (settings.ZoomPage)
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs 2014-09-26 20:57:52 UTC (rev 4883)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs 2014-09-26 21:02:46 UTC (rev 4884)
@@ -52,6 +52,8 @@
public GUIFacadeControl.Layout View { get; set; }
public string UserAgent { get; set; }
+ public string[] PreviousTags;
+ public string[] NextTags;
private const string section = "btWeb";
#region Singleton
@@ -73,6 +75,16 @@
Path.Combine("Windows", "xulrunner"));
}
+ public static string TagsToString(string[] tags)
+ {
+ return String.Join(";", tags);
+ }
+
+ public static string[] StringToTags(string tags)
+ {
+ return tags.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
+ }
+
private void LoadFromXml()
{
string dir = Config.GetFolder(Config.Dir.Config);
@@ -110,6 +122,9 @@
LastUrl = xmlreader.GetValueAsString(section, "lastUrl", string.Empty);
UserAgent = xmlreader.GetValueAsString(section, "useragent", string.Empty);
+ PreviousTags = StringToTags(xmlreader.GetValueAsString(section, "previousTags", string.Empty));
+ NextTags = StringToTags(xmlreader.GetValueAsString(section, "nextTags", string.Empty));
+
UseProxy = xmlreader.GetValueAsBool(section, "proxy", false);
Server = xmlreader.GetValueAsString(section, "proxy_server", "127.0.0.1");
Port = xmlreader.GetValueAsInt(section, "proxy_port", 8888);
@@ -174,6 +189,9 @@
xmlwriter.SetValue(section, "bookmark", View);
xmlwriter.SetValue(section, "useragent", UserAgent);
+ xmlwriter.SetValue(section, "previousTags", TagsToString(PreviousTags));
+ xmlwriter.SetValue(section, "nextTags", TagsToString(NextTags));
+
xmlwriter.SetValueAsBool(section, "proxy", UseProxy);
xmlwriter.SetValue(section, "proxy_server", Server);
xmlwriter.SetValue(section, "proxy_port", Port);
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs 2014-09-26 20:57:52 UTC (rev 4883)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs 2014-09-26 21:02:46 UTC (rev 4884)
@@ -131,6 +131,11 @@
this.label1 = new System.Windows.Forms.Label();
this.cmbConfirmLink = new System.Windows.Forms.ComboBox();
this.chkRemote = new System.Windows.Forms.CheckBox();
+ this.tabPage6 = new System.Windows.Forms.TabPage();
+ this.textBoxNext = new System.Windows.Forms.TextBox();
+ this.label39 = new System.Windows.Forms.Label();
+ this.textBoxPrevious = new System.Windows.Forms.TextBox();
+ this.label38 = new System.Windows.Forms.Label();
this.label15 = new System.Windows.Forms.Label();
this.label16 = new System.Windows.Forms.Label();
this.label17 = new System.Windows.Forms.Label();
@@ -142,6 +147,7 @@
this.label22 = new System.Windows.Forms.Label();
this.comboBox4 = new System.Windows.Forms.ComboBox();
this.checkBox1 = new System.Windows.Forms.CheckBox();
+ this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.contextMenuStrip1.SuspendLayout();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
@@ -1300,6 +1306,58 @@
this.chkRemote.Text = "Show diagnose on status bar";
this.chkRemote.UseVisualStyleBackColor = true;
//
+ // tabPage6
+ //
+ this.tabPage6.Controls.Add(this.textBoxNext);
+ this.tabPage6.Controls.Add(this.label39);
+ this.tabPage6.Controls.Add(this.textBoxPrevious);
+ this.tabPage6.Controls.Add(this.label38);
+ this.tabPage6.Location = new System.Drawing.Point(4, 25);
+ this.tabPage6.Name = "tabPage6";
+ this.tabPage6.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage6.Size = new System.Drawing.Size(562, 476);
+ this.tabPage6.TabIndex = 5;
+ this.tabPage6.Text = "Prev/Next";
+ this.tabPage6.UseVisualStyleBackColor = true;
+ //
+ // textBoxNext
+ //
+ this.textBoxNext.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.textBoxNext.Location = new System.Drawing.Point(9, 91);
+ this.textBoxNext.Name = "textBoxNext";
+ this.textBoxNext.Size = new System.Drawing.Size(547, 22);
+ this.textBoxNext.TabIndex = 3;
+ this.toolTip1.SetToolTip(this.textBoxNext, "Values must be separated by \";\"");
+ //
+ // label39
+ //
+ this.label39.AutoSize = true;
+ this.label39.Location = new System.Drawing.Point(6, 72);
+ this.label39.Name = "label39";
+ this.label39.Size = new System.Drawing.Size(64, 16);
+ this.label39.TabIndex = 2;
+ this.label39.Text = "Next tags";
+ //
+ // textBoxPrevious
+ //
+ this.textBoxPrevious.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.textBoxPrevious.Location = new System.Drawing.Point(9, 33);
+ this.textBoxPrevious.Name = "textBoxPrevious";
+ this.textBoxPrevious.Size = new System.Drawing.Size(547, 22);
+ this.textBoxPrevious.TabIndex = 1;
+ this.toolTip1.SetToolTip(this.textBoxPrevious, "Values must be separated by \";\"");
+ //
+ // label38
+ //
+ this.label38.AutoSize = true;
+ this.label38.Location = new System.Drawing.Point(6, 14);
+ this.label38.Name = "label38";
+ this.label38.Size = new System.Drawing.Size(90, 16);
+ this.label38.TabIndex = 0;
+ this.label38.Text = "Previous tags";
+ //
// label15
//
this.label15.AutoSize = true;
@@ -1452,6 +1510,8 @@
this.groupBox10.PerformLayout();
this.groupBox9.ResumeLayout(false);
this.groupBox9.PerformLayout();
+ this.tabPage6.ResumeLayout(false);
+ this.tabPage6.PerformLayout();
this.ResumeLayout(false);
}
@@ -1570,5 +1630,11 @@
private System.Windows.Forms.ComboBox cmbUserAgent;
private System.Windows.Forms.CheckBox cbOverrideUserAgent;
private System.Windows.Forms.CheckBox chkDisableAero;
+ private System.Windows.Forms.TabPage tabPage6;
+ private System.Windows.Forms.TextBox textBoxNext;
+ private System.Windows.Forms.Label label39;
+ private System.Windows.Forms.TextBox textBoxPrevious;
+ private System.Windows.Forms.Label label38;
+ private System.Windows.Forms.ToolTip toolTip1;
}
}
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs 2014-09-26 20:57:52 UTC (rev 4883)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs 2014-09-26 21:02:46 UTC (rev 4884)
@@ -502,6 +502,9 @@
cmbUserAgent.Text = settings.UserAgent;
cbOverrideUserAgent.Checked = !String.IsNullOrEmpty(cmbUserAgent.Text);
+ textBoxPrevious.Text = Settings.TagsToString(settings.PreviousTags);
+ textBoxNext.Text = Settings.TagsToString(settings.NextTags);
+
chkProxy.Checked = settings.UseProxy;
txtHttpServer.Text = settings.Server;
txtHttpPort.Text = settings.Port.ToString();
@@ -543,6 +546,9 @@
else
settings.UserAgent = String.Empty;
+ settings.PreviousTags = Settings.StringToTags(textBoxPrevious.Text);
+ settings.NextTags = Settings.StringToTags(textBoxNext.Text);
+
settings.UseProxy = chkProxy.Checked;
settings.Server = txtHttpServer.Text;
settings.Port = Int32.Parse(txtHttpPort.Text);
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.resx
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.resx 2014-09-26 20:57:52 UTC (rev 4883)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.resx 2014-09-26 21:02:46 UTC (rev 4884)
@@ -112,12 +112,12 @@
<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>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.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>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>180, 22</value>
</metadata>
<data name="imageList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
@@ -125,7 +125,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABM
- CgAAAk1TRnQBSQFMAgEBAwEAAUgBAQFIAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ CgAAAk1TRnQBSQFMAgEBAwEAAVgBAQFYAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -172,10 +172,16 @@
Cw==
</value>
</data>
- <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>26, 16</value>
</metadata>
- <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>285, 22</value>
+ </metadata>
+ <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>285, 22</value>
+ </metadata>
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<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: <dos...@us...> - 2014-09-26 20:57:58
|
Revision: 4883
http://sourceforge.net/p/mp-plugins/code/4883
Author: doskabouter
Date: 2014-09-26 20:57:52 +0000 (Fri, 26 Sep 2014)
Log Message:
-----------
Minor cosmetic improvements
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs 2014-09-22 21:36:13 UTC (rev 4882)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs 2014-09-26 20:57:52 UTC (rev 4883)
@@ -166,6 +166,7 @@
this.groupBox11.SuspendLayout();
this.groupBox10.SuspendLayout();
this.groupBox9.SuspendLayout();
+ this.tabPage6.SuspendLayout();
this.SuspendLayout();
//
// treeView1
@@ -221,7 +222,7 @@
this.toolStripMenuItem5,
this.deleteToolStripMenuItem});
this.contextMenuStrip1.Name = "contextMenuStrip1";
- this.contextMenuStrip1.Size = new System.Drawing.Size(154, 164);
+ this.contextMenuStrip1.Size = new System.Drawing.Size(143, 142);
this.contextMenuStrip1.MouseLeave += new System.EventHandler(this.contextMenuStrip1_MouseLeave);
//
// titleToolStripMenuItem
@@ -229,19 +230,19 @@
this.titleToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
this.titleToolStripMenuItem.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.titleToolStripMenuItem.Name = "titleToolStripMenuItem";
- this.titleToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
+ this.titleToolStripMenuItem.Size = new System.Drawing.Size(142, 24);
this.titleToolStripMenuItem.Text = "Title";
//
// toolStripMenuItem4
//
this.toolStripMenuItem4.Name = "toolStripMenuItem4";
- this.toolStripMenuItem4.Size = new System.Drawing.Size(150, 6);
+ this.toolStripMenuItem4.Size = new System.Drawing.Size(139, 6);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Image = global::BrowseTheWeb.Properties.Resources.file_icon;
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
- this.toolStripMenuItem1.Size = new System.Drawing.Size(153, 24);
+ this.toolStripMenuItem1.Size = new System.Drawing.Size(142, 24);
this.toolStripMenuItem1.Text = "Add bookmark";
this.toolStripMenuItem1.Click += new System.EventHandler(this.onAddBookmark);
//
@@ -249,33 +250,33 @@
//
this.toolStripMenuItem2.Image = global::BrowseTheWeb.Properties.Resources.folder_icon;
this.toolStripMenuItem2.Name = "toolStripMenuItem2";
- this.toolStripMenuItem2.Size = new System.Drawing.Size(153, 24);
+ this.toolStripMenuItem2.Size = new System.Drawing.Size(142, 24);
this.toolStripMenuItem2.Text = "Add folder";
this.toolStripMenuItem2.Click += new System.EventHandler(this.onAddFolder);
//
// toolStripMenuItem3
//
this.toolStripMenuItem3.Name = "toolStripMenuItem3";
- this.toolStripMenuItem3.Size = new System.Drawing.Size(150, 6);
+ this.toolStripMenuItem3.Size = new System.Drawing.Size(139, 6);
//
// editToolStripMenuItem
//
this.editToolStripMenuItem.Image = global::BrowseTheWeb.Properties.Resources.edit_icon;
this.editToolStripMenuItem.Name = "editToolStripMenuItem";
- this.editToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
+ this.editToolStripMenuItem.Size = new System.Drawing.Size(142, 24);
this.editToolStripMenuItem.Text = "Edit";
this.editToolStripMenuItem.Click += new System.EventHandler(this.onEditEntry_Click);
//
// toolStripMenuItem5
//
this.toolStripMenuItem5.Name = "toolStripMenuItem5";
- this.toolStripMenuItem5.Size = new System.Drawing.Size(150, 6);
+ this.toolStripMenuItem5.Size = new System.Drawing.Size(139, 6);
//
// deleteToolStripMenuItem
//
this.deleteToolStripMenuItem.Image = global::BrowseTheWeb.Properties.Resources.delete_icon;
this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem";
- this.deleteToolStripMenuItem.Size = new System.Drawing.Size(153, 24);
+ this.deleteToolStripMenuItem.Size = new System.Drawing.Size(142, 24);
this.deleteToolStripMenuItem.Text = "Delete";
this.deleteToolStripMenuItem.Click += new System.EventHandler(this.onRemoveEntry);
//
@@ -304,6 +305,8 @@
//
// txtHome
//
+ this.txtHome.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.txtHome.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.txtHome.Location = new System.Drawing.Point(19, 55);
this.txtHome.Name = "txtHome";
@@ -316,9 +319,9 @@
this.chkHome.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.chkHome.Location = new System.Drawing.Point(19, 29);
this.chkHome.Name = "chkHome";
- this.chkHome.Size = new System.Drawing.Size(118, 20);
+ this.chkHome.Size = new System.Drawing.Size(121, 20);
this.chkHome.TabIndex = 16;
- this.chkHome.Text = "use homepage";
+ this.chkHome.Text = "Use homepage";
this.chkHome.UseVisualStyleBackColor = true;
//
// tabControl1
@@ -331,6 +334,7 @@
this.tabControl1.Controls.Add(this.tabPage3);
this.tabControl1.Controls.Add(this.tabPage5);
this.tabControl1.Controls.Add(this.tabPage4);
+ this.tabControl1.Controls.Add(this.tabPage6);
this.tabControl1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.tabControl1.Location = new System.Drawing.Point(12, 12);
this.tabControl1.Name = "tabControl1";
@@ -353,6 +357,8 @@
//
// groupBox5
//
+ this.groupBox5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox5.Controls.Add(this.chkDisableAero);
this.groupBox5.Controls.Add(this.chkMouse);
this.groupBox5.Controls.Add(this.chkWindowed);
@@ -375,7 +381,7 @@
this.chkDisableAero.Name = "chkDisableAero";
this.chkDisableAero.Size = new System.Drawing.Size(242, 20);
this.chkDisableAero.TabIndex = 7;
- this.chkDisableAero.Text = "disable Aero while running (for Vista)";
+ this.chkDisableAero.Text = "Disable Aero while running (for Vista)";
this.chkDisableAero.UseVisualStyleBackColor = true;
//
// chkMouse
@@ -385,7 +391,7 @@
this.chkMouse.Name = "chkMouse";
this.chkMouse.Size = new System.Drawing.Size(154, 20);
this.chkMouse.TabIndex = 6;
- this.chkMouse.Text = "use mouse to browse";
+ this.chkMouse.Text = "Use mouse to browse";
this.chkMouse.UseVisualStyleBackColor = true;
//
// chkWindowed
@@ -395,7 +401,7 @@
this.chkWindowed.Name = "chkWindowed";
this.chkWindowed.Size = new System.Drawing.Size(223, 20);
this.chkWindowed.TabIndex = 5;
- this.chkWindowed.Text = "use windowed mode in fullscreen";
+ this.chkWindowed.Text = "Use windowed mode in fullscreen";
this.chkWindowed.UseVisualStyleBackColor = true;
//
// chkOSD
@@ -405,7 +411,7 @@
this.chkOSD.Name = "chkOSD";
this.chkOSD.Size = new System.Drawing.Size(147, 20);
this.chkOSD.TabIndex = 4;
- this.chkOSD.Text = "show OSD for link ID";
+ this.chkOSD.Text = "Show OSD for link ID";
this.chkOSD.UseVisualStyleBackColor = true;
//
// chkStatus
@@ -415,7 +421,7 @@
this.chkStatus.Name = "chkStatus";
this.chkStatus.Size = new System.Drawing.Size(188, 20);
this.chkStatus.TabIndex = 3;
- this.chkStatus.Text = "enable statusbar as default";
+ this.chkStatus.Text = "Enable statusbar as default";
this.chkStatus.UseVisualStyleBackColor = true;
//
// chkBlank
@@ -425,7 +431,7 @@
this.chkBlank.Name = "chkBlank";
this.chkBlank.Size = new System.Drawing.Size(224, 20);
this.chkBlank.TabIndex = 2;
- this.chkBlank.Text = "blank browser on window change";
+ this.chkBlank.Text = "Blank browser on window change";
this.chkBlank.UseVisualStyleBackColor = true;
//
// txtName
@@ -446,6 +452,8 @@
//
// groupBox4
//
+ this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox4.Controls.Add(this.txtRemote);
this.groupBox4.Controls.Add(this.trkRemote);
this.groupBox4.Location = new System.Drawing.Point(16, 111);
@@ -460,17 +468,19 @@
this.txtRemote.AutoSize = true;
this.txtRemote.Location = new System.Drawing.Point(16, 53);
this.txtRemote.Name = "txtRemote";
- this.txtRemote.Size = new System.Drawing.Size(133, 16);
+ this.txtRemote.Size = new System.Drawing.Size(139, 16);
this.txtRemote.TabIndex = 2;
- this.txtRemote.Text = "reset link ID after 1,5s";
+ this.txtRemote.Text = "Reset link ID after 1,5s";
//
// trkRemote
//
+ this.trkRemote.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.trkRemote.Location = new System.Drawing.Point(5, 24);
this.trkRemote.Maximum = 100;
this.trkRemote.Minimum = 1;
this.trkRemote.Name = "trkRemote";
- this.trkRemote.Size = new System.Drawing.Size(525, 45);
+ this.trkRemote.Size = new System.Drawing.Size(525, 42);
this.trkRemote.SmallChange = 5;
this.trkRemote.TabIndex = 1;
this.trkRemote.TickFrequency = 5;
@@ -479,6 +489,8 @@
//
// groupBox3
//
+ this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox3.Controls.Add(this.txtHome);
this.groupBox3.Controls.Add(this.chkHome);
this.groupBox3.Location = new System.Drawing.Point(16, 13);
@@ -505,6 +517,8 @@
//
// groupBox12
//
+ this.groupBox12.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox12.Controls.Add(this.cmbBookmarkView);
this.groupBox12.Location = new System.Drawing.Point(6, 391);
this.groupBox12.Name = "groupBox12";
@@ -524,6 +538,8 @@
//
// groupBox7
//
+ this.groupBox7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox7.Controls.Add(this.chkThumbsOnVisit);
this.groupBox7.Controls.Add(this.chkUseThumbs);
this.groupBox7.Location = new System.Drawing.Point(6, 303);
@@ -540,7 +556,7 @@
this.chkThumbsOnVisit.Name = "chkThumbsOnVisit";
this.chkThumbsOnVisit.Size = new System.Drawing.Size(213, 20);
this.chkThumbsOnVisit.TabIndex = 1;
- this.chkThumbsOnVisit.Text = "cache thumb if a page is visited";
+ this.chkThumbsOnVisit.Text = "Cache thumb if a page is visited";
this.chkThumbsOnVisit.UseVisualStyleBackColor = true;
this.chkThumbsOnVisit.Visible = false;
//
@@ -551,11 +567,13 @@
this.chkUseThumbs.Name = "chkUseThumbs";
this.chkUseThumbs.Size = new System.Drawing.Size(167, 20);
this.chkUseThumbs.TabIndex = 0;
- this.chkUseThumbs.Text = "use thumbs for favorites";
+ this.chkUseThumbs.Text = "Use thumbs for favorites";
this.chkUseThumbs.UseVisualStyleBackColor = true;
//
// groupBox6
//
+ this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox6.Controls.Add(this.optNoZoom);
this.groupBox6.Controls.Add(this.optZoomDomain);
this.groupBox6.Controls.Add(this.optZoomPage);
@@ -575,7 +593,7 @@
this.optNoZoom.Size = new System.Drawing.Size(132, 20);
this.optNoZoom.TabIndex = 2;
this.optNoZoom.TabStop = true;
- this.optNoZoom.Text = "do not reset zoom";
+ this.optNoZoom.Text = "Do not reset zoom";
this.optNoZoom.UseVisualStyleBackColor = true;
//
// optZoomDomain
@@ -585,7 +603,7 @@
this.optZoomDomain.Name = "optZoomDomain";
this.optZoomDomain.Size = new System.Drawing.Size(206, 20);
this.optZoomDomain.TabIndex = 1;
- this.optZoomDomain.Text = "reset zoom on domain change";
+ this.optZoomDomain.Text = "Reset zoom on domain change";
this.optZoomDomain.UseVisualStyleBackColor = true;
//
// optZoomPage
@@ -595,11 +613,13 @@
this.optZoomPage.Name = "optZoomPage";
this.optZoomPage.Size = new System.Drawing.Size(193, 20);
this.optZoomPage.TabIndex = 0;
- this.optZoomPage.Text = "reset zoom on page change";
+ this.optZoomPage.Text = "Reset zoom on page change";
this.optZoomPage.UseVisualStyleBackColor = true;
//
// groupBox2
//
+ this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox2.Controls.Add(this.txtFont);
this.groupBox2.Controls.Add(this.trkFont);
this.groupBox2.Location = new System.Drawing.Point(6, 97);
@@ -620,12 +640,14 @@
//
// trkFont
//
+ this.trkFont.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.trkFont.LargeChange = 10;
this.trkFont.Location = new System.Drawing.Point(6, 21);
this.trkFont.Maximum = 200;
this.trkFont.Minimum = 10;
this.trkFont.Name = "trkFont";
- this.trkFont.Size = new System.Drawing.Size(538, 45);
+ this.trkFont.Size = new System.Drawing.Size(538, 42);
this.trkFont.SmallChange = 10;
this.trkFont.TabIndex = 0;
this.trkFont.TickFrequency = 10;
@@ -634,6 +656,8 @@
//
// groupBox1
//
+ this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox1.Controls.Add(this.txtZoom);
this.groupBox1.Controls.Add(this.trkZoom);
this.groupBox1.Location = new System.Drawing.Point(6, 6);
@@ -654,12 +678,14 @@
//
// trkZoom
//
+ this.trkZoom.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.trkZoom.LargeChange = 10;
this.trkZoom.Location = new System.Drawing.Point(6, 21);
this.trkZoom.Maximum = 300;
this.trkZoom.Minimum = 10;
this.trkZoom.Name = "trkZoom";
- this.trkZoom.Size = new System.Drawing.Size(538, 45);
+ this.trkZoom.Size = new System.Drawing.Size(538, 42);
this.trkZoom.SmallChange = 10;
this.trkZoom.TabIndex = 0;
this.trkZoom.TickFrequency = 10;
@@ -775,6 +801,8 @@
//
// groupBox13
//
+ this.groupBox13.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox13.Controls.Add(this.cbOverrideUserAgent);
this.groupBox13.Controls.Add(this.cmbUserAgent);
this.groupBox13.Location = new System.Drawing.Point(6, 157);
@@ -817,6 +845,8 @@
//
// groupBox8
//
+ this.groupBox8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox8.Controls.Add(this.txtHttpPort);
this.groupBox8.Controls.Add(this.txtHttpServer);
this.groupBox8.Controls.Add(this.label6);
@@ -874,7 +904,7 @@
this.chkProxy.Name = "chkProxy";
this.chkProxy.Size = new System.Drawing.Size(85, 20);
this.chkProxy.TabIndex = 0;
- this.chkProxy.Text = "use proxy";
+ this.chkProxy.Text = "Use proxy";
this.chkProxy.UseVisualStyleBackColor = true;
this.chkProxy.CheckedChanged += new System.EventHandler(this.chkProxy_CheckedChanged);
//
@@ -894,16 +924,19 @@
//
// btnDefault
//
+ this.btnDefault.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnDefault.Location = new System.Drawing.Point(417, 439);
this.btnDefault.Name = "btnDefault";
this.btnDefault.Size = new System.Drawing.Size(119, 31);
this.btnDefault.TabIndex = 33;
- this.btnDefault.Text = "set to default";
+ this.btnDefault.Text = "Set to default";
this.btnDefault.UseVisualStyleBackColor = true;
this.btnDefault.Click += new System.EventHandler(this.btnDefault_Click);
//
// groupBox11
//
+ this.groupBox11.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox11.Controls.Add(this.cmbPageDown);
this.groupBox11.Controls.Add(this.cmbPageUp);
this.groupBox11.Controls.Add(this.label37);
@@ -923,6 +956,8 @@
//
// cmbPageDown
//
+ this.cmbPageDown.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.cmbPageDown.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbPageDown.FormattingEnabled = true;
this.cmbPageDown.Location = new System.Drawing.Point(184, 120);
@@ -932,6 +967,8 @@
//
// cmbPageUp
//
+ this.cmbPageUp.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.cmbPageUp.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbPageUp.FormattingEnabled = true;
this.cmbPageUp.Location = new System.Drawing.Point(184, 95);
@@ -962,9 +999,9 @@
this.label33.AutoSize = true;
this.label33.Location = new System.Drawing.Point(181, 71);
this.label33.Name = "label33";
- this.label33.Size = new System.Drawing.Size(149, 16);
+ this.label33.Size = new System.Drawing.Size(151, 16);
this.label33.TabIndex = 29;
- this.label33.Text = "cursor up/down/left/right";
+ this.label33.Text = "Cursor up/down/left/right";
//
// label34
//
@@ -973,10 +1010,12 @@
this.label34.Name = "label34";
this.label34.Size = new System.Drawing.Size(42, 16);
this.label34.TabIndex = 28;
- this.label34.Text = "move";
+ this.label34.Text = "Move";
//
// cmbZoomOut
//
+ this.cmbZoomOut.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.cmbZoomOut.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbZoomOut.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.cmbZoomOut.FormattingEnabled = true;
@@ -991,21 +1030,23 @@
this.label31.AutoSize = true;
this.label31.Location = new System.Drawing.Point(6, 45);
this.label31.Name = "label31";
- this.label31.Size = new System.Drawing.Size(62, 16);
+ this.label31.Size = new System.Drawing.Size(64, 16);
this.label31.TabIndex = 26;
- this.label31.Text = "zoom out";
+ this.label31.Text = "Zoom out";
//
// label32
//
this.label32.AutoSize = true;
this.label32.Location = new System.Drawing.Point(6, 18);
this.label32.Name = "label32";
- this.label32.Size = new System.Drawing.Size(54, 16);
+ this.label32.Size = new System.Drawing.Size(56, 16);
this.label32.TabIndex = 25;
- this.label32.Text = "zoom in";
+ this.label32.Text = "Zoom in";
//
// cmbZoomIn
//
+ this.cmbZoomIn.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.cmbZoomIn.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbZoomIn.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.cmbZoomIn.FormattingEnabled = true;
@@ -1017,6 +1058,8 @@
//
// groupBox10
//
+ this.groupBox10.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox10.Controls.Add(this.label35);
this.groupBox10.Controls.Add(this.cmbShowBookmarks);
this.groupBox10.Controls.Add(this.label29);
@@ -1049,6 +1092,8 @@
//
// cmbShowBookmarks
//
+ this.cmbShowBookmarks.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.cmbShowBookmarks.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbShowBookmarks.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.cmbShowBookmarks.FormattingEnabled = true;
@@ -1072,9 +1117,9 @@
this.label30.AutoSize = true;
this.label30.Location = new System.Drawing.Point(6, 101);
this.label30.Name = "label30";
- this.label30.Size = new System.Drawing.Size(96, 16);
+ this.label30.Size = new System.Drawing.Size(97, 16);
this.label30.TabIndex = 22;
- this.label30.Text = "add bookmark";
+ this.label30.Text = "Add bookmark";
//
// label27
//
@@ -1090,9 +1135,9 @@
this.label28.AutoSize = true;
this.label28.Location = new System.Drawing.Point(6, 85);
this.label28.Name = "label28";
- this.label28.Size = new System.Drawing.Size(86, 16);
+ this.label28.Size = new System.Drawing.Size(88, 16);
this.label28.TabIndex = 20;
- this.label28.Text = "go backward";
+ this.label28.Text = "Go backward";
//
// label25
//
@@ -1108,9 +1153,9 @@
this.label26.AutoSize = true;
this.label26.Location = new System.Drawing.Point(6, 69);
this.label26.Name = "label26";
- this.label26.Size = new System.Drawing.Size(71, 16);
+ this.label26.Size = new System.Drawing.Size(73, 16);
this.label26.TabIndex = 18;
- this.label26.Text = "go forward";
+ this.label26.Text = "Go forward";
//
// label23
//
@@ -1126,9 +1171,9 @@
this.label24.AutoSize = true;
this.label24.Location = new System.Drawing.Point(6, 53);
this.label24.Name = "label24";
- this.label24.Size = new System.Drawing.Size(85, 16);
+ this.label24.Size = new System.Drawing.Size(86, 16);
this.label24.TabIndex = 16;
- this.label24.Text = "blank screen";
+ this.label24.Text = "Blank screen";
//
// label13
//
@@ -1144,9 +1189,9 @@
this.label14.AutoSize = true;
this.label14.Location = new System.Drawing.Point(6, 37);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(75, 16);
+ this.label14.Size = new System.Drawing.Size(77, 16);
this.label14.TabIndex = 14;
- this.label14.Text = "go to home";
+ this.label14.Text = "Go to home";
//
// label11
//
@@ -1162,12 +1207,14 @@
this.label12.AutoSize = true;
this.label12.Location = new System.Drawing.Point(6, 21);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(85, 16);
+ this.label12.Size = new System.Drawing.Size(87, 16);
this.label12.TabIndex = 12;
- this.label12.Text = "select a URL";
+ this.label12.Text = "Select a URL";
//
// groupBox9
//
+ this.groupBox9.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox9.Controls.Add(this.cmbStatusBar);
this.groupBox9.Controls.Add(this.label10);
this.groupBox9.Controls.Add(this.label9);
@@ -1183,6 +1230,8 @@
//
// cmbStatusBar
//
+ this.cmbStatusBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.cmbStatusBar.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbStatusBar.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.cmbStatusBar.FormattingEnabled = true;
@@ -1230,6 +1279,8 @@
//
// cmbConfirmLink
//
+ this.cmbConfirmLink.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.cmbConfirmLink.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbConfirmLink.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.cmbConfirmLink.FormattingEnabled = true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2014-09-22 21:36:21
|
Revision: 4882
http://sourceforge.net/p/mp-plugins/code/4882
Author: doskabouter
Date: 2014-09-22 21:36:13 +0000 (Mon, 22 Sep 2014)
Log Message:
-----------
Unified responses to keypresses
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2014-09-22 21:28:48 UTC (rev 4881)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2014-09-22 21:36:13 UTC (rev 4882)
@@ -666,31 +666,22 @@
{
if (settings.UseMouse || mouseVisible)
{
- //System.Diagnostics.Debug.WriteLine("DOM " + e.KeyCode.ToString());
-
- if (e.KeyCode == (uint)Keys.Escape)
- GUIWindowManager.ShowPreviousWindow();
-
- if (e.KeyCode == (uint)Keys.PageUp) OnZoomIn();
- if (e.KeyCode == (uint)Keys.PageDown) OnZoomOut();
-
- if (e.KeyCode == (uint)Keys.Down) OnMoveDown();
- if (e.KeyCode == (uint)Keys.Up) OnMoveUp();
- if (e.KeyCode == (uint)Keys.Left) OnMoveLeft();
- if (e.KeyCode == (uint)Keys.Right) OnMoveRight();
-
- if (e.KeyCode == (uint)Keys.F3) GUIWindowManager.ActivateWindow(GUIBookmark.BookmarkWindowId);
-
- if (e.KeyCode == (uint)Keys.F7) webBrowser.GoBack();
- if (e.KeyCode == (uint)Keys.F8) webBrowser.GoForward();
-
- if (e.CtrlKey == true)
+ GeckoHtmlElement element = webBrowser.Document.ActiveElement;
+ bool keyIsChar = e.KeyCode >= 65 && (e.KeyCode <= 90);
+ if (keyIsChar && ((element is GeckoInputElement) || (element is GeckoTextAreaElement)))
+ { }//user is typing text, so don't convert to MediaPortal.GUI.Library.Action
+ else
{
- if (e.KeyCode == (uint)Keys.R) OnAddBookmark();
- if (e.KeyCode == (uint)Keys.P) OnEnterNewLink();
- if (e.KeyCode == (uint)Keys.B) webBrowser.Navigate("about:blank");
+ Action action = new Action();
+ Key key;
+ //Uppercase keys (f.e. Record=R) isn't recognized, so hack to get mp to find the correct action
+ if (keyIsChar)
+ key = new Key((int)e.KeyCode + 32, 0);
+ else
+ key = new Key((int)e.KeyChar, (int)e.KeyCode);
+ if (ActionTranslator.GetAction(-1, key, ref action) && action.wID != Action.ActionType.ACTION_INVALID)
+ OnAction(action);
}
-
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2014-09-22 21:28:56
|
Revision: 4881
http://sourceforge.net/p/mp-plugins/code/4881
Author: doskabouter
Date: 2014-09-22 21:28:48 +0000 (Mon, 22 Sep 2014)
Log Message:
-----------
Fixed focus issues
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2014-09-22 21:21:23 UTC (rev 4880)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2014-09-22 21:28:48 UTC (rev 4881)
@@ -91,6 +91,7 @@
private string linkId = string.Empty;
private int linkTime = 0;
private Timer timer = new Timer();
+ private Timer restoreClickTimer = new Timer();
private string lastDomain = string.Empty;
private float zoom = Settings.Instance.DefaultZoom;
@@ -360,6 +361,10 @@
timer.Tick += new EventHandler(timer_Tick);
timer.Start();
+ restoreClickTimer.Enabled = false;
+ restoreClickTimer.Interval = 500;
+ restoreClickTimer.Tick += new EventHandler(restoreClickTimer_Tick);
+
if (settings.UseMouse)
webBrowser.Select();
}
@@ -397,10 +402,14 @@
timer.Tick -= timer_Tick;
timer.Stop();
+ restoreClickTimer.Stop();
+ restoreClickTimer.Tick -= restoreClickTimer_Tick;
if (settings.UseMouse)
{
Cursor.Hide();
GUIGraphicsContext.MouseSupport = originalMouseSupport;
+ FieldInfo fi = GUIGraphicsContext.form.GetType().GetField("AutoHideMouse", BindingFlags.NonPublic | BindingFlags.Instance);
+ fi.SetValue(GUIGraphicsContext.form, originalMouseAutoHide);
}
base.OnPageDestroy(new_windowId);
}
@@ -684,16 +693,27 @@
}
}
+
+ void ResetFocus()
+ {
+ clickFromPlugin = false;
+ restoreClickTimer.Stop();
+
+ webBrowser.Enabled = false;
+ GUIGraphicsContext.form.Focus();
+ }
+
void webBrowser_DomClick(object sender, DomEventArgs e)
{
if (clickFromPlugin) // click succeeded, so focus can safely be reset
- {
- clickFromPlugin = false;
- webBrowser.Enabled = false;
- GUIGraphicsContext.form.Focus();
- }
+ ResetFocus();
}
+ void restoreClickTimer_Tick(object sender, EventArgs e)
+ {
+ ResetFocus();
+ }
+
private void OnEnterNewLink()
{
webBrowser.Visible = false;
@@ -1000,6 +1020,7 @@
ips[1].Mouse.Flags = MOUSEEVENTF_LEFTUP;
clickFromPlugin = true;
+ restoreClickTimer.Start();
if (SendInput(2, ips, Marshal.SizeOf(typeof(INPUT))) == 0)
MyLog.debug("Error sendinput");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2014-09-22 21:21:31
|
Revision: 4880
http://sourceforge.net/p/mp-plugins/code/4880
Author: doskabouter
Date: 2014-09-22 21:21:23 +0000 (Mon, 22 Sep 2014)
Log Message:
-----------
Fixed typo
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs 2014-09-02 20:27:57 UTC (rev 4879)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.Designer.cs 2014-09-22 21:21:23 UTC (rev 4880)
@@ -501,7 +501,7 @@
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(562, 476);
this.tabPage2.TabIndex = 1;
- this.tabPage2.Text = "Appeareance";
+ this.tabPage2.Text = "Appearance";
//
// groupBox12
//
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2014-09-02 20:28:06
|
Revision: 4879
http://sourceforge.net/p/mp-plugins/code/4879
Author: doskabouter
Date: 2014-09-02 20:27:57 +0000 (Tue, 02 Sep 2014)
Log Message:
-----------
Numbers for flash objects and other html-objects now displayed on top of the flash instead of above it
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/DomHelper.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/DomHelper.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/DomHelper.cs 2014-09-02 20:14:58 UTC (rev 4878)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/DomHelper.cs 2014-09-02 20:27:57 UTC (rev 4879)
@@ -30,6 +30,13 @@
"top: 0; " +
"left: 0; ";
+ private const string _spanStyleObject = _baseSpanStyle +
+ "padding: 0px 2px 4px 2px ! important; " +
+ "margin-right: 8px; " +
+ "max-width: 30px; " +
+ "position: absolute ! important;" +
+ "z-index-100; ";
+
private const string btwebId = "btweb_id";
public static void AddLinksToPage(GeckoDocument document)
@@ -182,7 +189,7 @@
{
if (!elementDone(element))
{
- insertSpanAfter(id, null, element.Parent, "color:black;background-color:white");
+ insertSpanAfter(id, null, element.Parent, "color:black;background-color:white", true);
SetLinkAttributes(element, id);
id++;
}
@@ -195,7 +202,7 @@
{
if (!elementDone(element))
{
- insertSpanAfter(id, null, element.Parent, "color:black;background-color:white");
+ insertSpanAfter(id, null, element.Parent, "color:black;background-color:white;position:absolute;z-index:2000");
SetLinkAttributes(element, id);
id++;
}
@@ -284,9 +291,12 @@
return maxId;
}
- private static GeckoHtmlElement CreateSpan(GeckoDocument owner, int geckoId, string className, string extra)
+ private static GeckoHtmlElement CreateSpan(GeckoDocument owner, int geckoId, string className, string extra, bool isObject = false)
{
GeckoHtmlElement result = owner.CreateHtmlElement("span");
+ if (isObject)
+ result.SetAttribute("style", _spanStyleObject + extra);
+ else
result.SetAttribute("style", _spanstyle + extra);
result.InnerHtml = geckoId.ToString();
if (!String.IsNullOrEmpty(className))
@@ -294,11 +304,11 @@
return result;
}
- private static GeckoElement insertSpanAfter(int geckoId, string className, GeckoNode after, string extra = "")
+ private static GeckoElement insertSpanAfter(int geckoId, string className, GeckoNode after, string extra = "", bool isObject = false)
{
if (after == null)
throw new ArgumentNullException("after");
- GeckoHtmlElement newChild = CreateSpan(after.OwnerDocument, geckoId, className, extra);
+ GeckoHtmlElement newChild = CreateSpan(after.OwnerDocument, geckoId, className, extra, isObject);
if (after.FirstChild == null)
after.AppendChild(newChild);
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2014-09-02 20:15:02
|
Revision: 4878
http://sourceforge.net/p/mp-plugins/code/4878
Author: doskabouter
Date: 2014-09-02 20:14:58 +0000 (Tue, 02 Sep 2014)
Log Message:
-----------
minor refactoring
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/DomHelper.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/DomHelper.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/DomHelper.cs 2014-08-25 20:47:24 UTC (rev 4877)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/DomHelper.cs 2014-09-02 20:14:58 UTC (rev 4878)
@@ -10,22 +10,26 @@
{
public class DomHelper
{
- private const string _spanstyle = "font-family: arial,sans-serif; " +
+ private const string _baseSpanStyle =
+ "font-family: arial,sans-serif; " +
"font-size: 12px ! important; " +
"line-height: 130% ! important; " +
"border-width: 1px ! important; " +
"border-style: solid ! important; " +
"border-radius: 2px 2px 2px 2px ! important; " +
+ "max-height: 10px ! important; " +
+ "overflow: visible ! important; " +
+ "float: none ! important; " +
+ "display: inline;";
+
+ private const string _spanstyle = _baseSpanStyle +
"padding: 0px 2px ! important; " +
"margin-right: 2px; " +
"max-width: 20px; " +
- "max-height: 10px ! important; " +
- "overflow: visible ! important; " +
- "float: none ! important; " +
- "position: relative !important; " +
+ "position: relative ! important; " +
"top: 0; " +
- "left: 0; " +
- "display: inline;";
+ "left: 0; ";
+
private const string btwebId = "btweb_id";
public static void AddLinksToPage(GeckoDocument document)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2014-08-25 20:47:32
|
Revision: 4877
http://sourceforge.net/p/mp-plugins/code/4877
Author: doskabouter
Date: 2014-08-25 20:47:24 +0000 (Mon, 25 Aug 2014)
Log Message:
-----------
Minor cleanup
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2014-08-25 20:30:49 UTC (rev 4876)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2014-08-25 20:47:24 UTC (rev 4877)
@@ -39,6 +39,8 @@
using Gecko.Collections;
using Gecko.DOM;
+using Action = MediaPortal.GUI.Library.Action;
+
namespace BrowseTheWeb
{
[PluginIcons("BrowseTheWeb.xulrunner.png", "BrowseTheWeb.xulrunnerOff.png")]
@@ -474,13 +476,13 @@
base.OnPreviousWindow();
}
- public override void OnAction(MediaPortal.GUI.Library.Action action)
+ public override void OnAction(Action action)
{
GUIPropertyManager.SetProperty("#btWeb.linkid", String.IsNullOrEmpty(linkId) ? String.Empty : "Link ID = " + linkId);
#region remote diagnostic
if (settings.Remote)
{
- if (action.wID != MediaPortal.GUI.Library.Action.ActionType.ACTION_KEY_PRESSED)
+ if (action.wID != Action.ActionType.ACTION_KEY_PRESSED)
GUIPropertyManager.SetProperty("#btWeb.status", DateTime.Now.ToLongTimeString() + " : " +
action.wID.ToString());
else
@@ -519,12 +521,12 @@
return;
}
if ((action.wID == settings.Remote_Zoom_In) ||
- (action.wID == MediaPortal.GUI.Library.Action.ActionType.ACTION_MUSIC_FORWARD))
+ (action.wID == Action.ActionType.ACTION_MUSIC_FORWARD))
{
OnZoomIn();
}
if ((action.wID == settings.Remote_Zoom_Out) ||
- (action.wID == MediaPortal.GUI.Library.Action.ActionType.ACTION_MUSIC_REWIND))
+ (action.wID == Action.ActionType.ACTION_MUSIC_REWIND))
{
OnZoomOut();
}
@@ -545,17 +547,17 @@
switch (action.wID)
{
- case MediaPortal.GUI.Library.Action.ActionType.ACTION_MOUSE_CLICK:
+ case Action.ActionType.ACTION_MOUSE_CLICK:
{
break;
}
- case MediaPortal.GUI.Library.Action.ActionType.ACTION_MOUSE_MOVE:
+ case Action.ActionType.ACTION_MOUSE_MOVE:
if (settings.UseMouse)
{
}
break;
- case MediaPortal.GUI.Library.Action.ActionType.ACTION_NEXT_SUBTITLE:
+ case Action.ActionType.ACTION_NEXT_SUBTITLE:
if (!settings.UseMouse)
{
if (mouseVisible)
@@ -574,7 +576,7 @@
}
}
break;
- case MediaPortal.GUI.Library.Action.ActionType.ACTION_KEY_PRESSED:
+ case Action.ActionType.ACTION_KEY_PRESSED:
if (!settings.UseMouse)
{
linkTime = 0;
@@ -599,52 +601,52 @@
if (linkId.Length > 4) linkId = linkId.Substring(0, 1);
}
break;
- case MediaPortal.GUI.Library.Action.ActionType.ACTION_PREVIOUS_MENU:
+ case Action.ActionType.ACTION_PREVIOUS_MENU:
linkId = string.Empty;
break;
- case MediaPortal.GUI.Library.Action.ActionType.ACTION_PLAY:
- case MediaPortal.GUI.Library.Action.ActionType.ACTION_MUSIC_PLAY:
+ case Action.ActionType.ACTION_PLAY:
+ case Action.ActionType.ACTION_MUSIC_PLAY:
OnEnterNewLink();
return;
- case MediaPortal.GUI.Library.Action.ActionType.ACTION_PAUSE:
+ case Action.ActionType.ACTION_PAUSE:
webBrowser.Navigate(settings.HomePage);
MyLog.debug("load home page " + settings.HomePage);
if (!settings.Remote) GUIPropertyManager.SetProperty("#btWeb.status", "go to homepage");
return;
- case MediaPortal.GUI.Library.Action.ActionType.ACTION_STOP:
+ case Action.ActionType.ACTION_STOP:
webBrowser.Navigate("about:blank");
if (!settings.Remote) GUIPropertyManager.SetProperty("#btWeb.status", "Stop");
return;
- case MediaPortal.GUI.Library.Action.ActionType.ACTION_PREV_ITEM:
- case MediaPortal.GUI.Library.Action.ActionType.ACTION_REWIND:
+ case Action.ActionType.ACTION_PREV_ITEM:
+ case Action.ActionType.ACTION_REWIND:
webBrowser.GoBack();
if (!settings.Remote) GUIPropertyManager.SetProperty("#btWeb.status", "go backward");
MyLog.debug("navigate go back");
return;
- case MediaPortal.GUI.Library.Action.ActionType.ACTION_NEXT_ITEM:
- case MediaPortal.GUI.Library.Action.ActionType.ACTION_FORWARD:
+ case Action.ActionType.ACTION_NEXT_ITEM:
+ case Action.ActionType.ACTION_FORWARD:
webBrowser.GoForward();
if (!settings.Remote) GUIPropertyManager.SetProperty("#btWeb.status", "go forward");
MyLog.debug("navigate go forward");
return;
- case MediaPortal.GUI.Library.Action.ActionType.ACTION_RECORD:
+ case Action.ActionType.ACTION_RECORD:
OnAddBookmark();
return;
#region move
- case MediaPortal.GUI.Library.Action.ActionType.ACTION_MOVE_RIGHT:
+ case Action.ActionType.ACTION_MOVE_RIGHT:
OnMoveRight();
return;
- case MediaPortal.GUI.Library.Action.ActionType.ACTION_MOVE_LEFT:
+ case Action.ActionType.ACTION_MOVE_LEFT:
OnMoveLeft();
return;
- case MediaPortal.GUI.Library.Action.ActionType.ACTION_MOVE_UP:
+ case Action.ActionType.ACTION_MOVE_UP:
OnMoveUp();
return;
- case MediaPortal.GUI.Library.Action.ActionType.ACTION_MOVE_DOWN:
+ case Action.ActionType.ACTION_MOVE_DOWN:
OnMoveDown();
return;
- case MediaPortal.GUI.Library.Action.ActionType.ACTION_SELECT_ITEM:
+ case Action.ActionType.ACTION_SELECT_ITEM:
return;
#endregion
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2014-08-25 20:30:53
|
Revision: 4876
http://sourceforge.net/p/mp-plugins/code/4876
Author: doskabouter
Date: 2014-08-25 20:30:49 +0000 (Mon, 25 Aug 2014)
Log Message:
-----------
Minor cleanup
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2014-08-25 20:29:27 UTC (rev 4875)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2014-08-25 20:30:49 UTC (rev 4876)
@@ -393,7 +393,7 @@
webBrowser.DomKeyDown -= webBrowser_DomKeyDown;
webBrowser.DomClick -= webBrowser_DomClick;
- timer.Tick -= new EventHandler(timer_Tick);
+ timer.Tick -= timer_Tick;
timer.Stop();
if (settings.UseMouse)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2014-08-25 20:29:29
|
Revision: 4875
http://sourceforge.net/p/mp-plugins/code/4875
Author: doskabouter
Date: 2014-08-25 20:29:27 +0000 (Mon, 25 Aug 2014)
Log Message:
-----------
Minor cleanup
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2014-08-18 19:59:48 UTC (rev 4874)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2014-08-25 20:29:27 UTC (rev 4875)
@@ -388,10 +388,10 @@
osd_linkID.Visible = false;
- webBrowser.DocumentCompleted -= new EventHandler(webBrowser_DocumentCompleted);
- webBrowser.StatusTextChanged -= new EventHandler(webBrowser_StatusTextChanged);
- webBrowser.DomKeyDown -= new EventHandler<DomKeyEventArgs>(webBrowser_DomKeyDown);
- webBrowser.DomClick -= new EventHandler<DomEventArgs>(webBrowser_DomClick);
+ webBrowser.DocumentCompleted -= webBrowser_DocumentCompleted;
+ webBrowser.StatusTextChanged -= webBrowser_StatusTextChanged;
+ webBrowser.DomKeyDown -= webBrowser_DomKeyDown;
+ webBrowser.DomClick -= webBrowser_DomClick;
timer.Tick -= new EventHandler(timer_Tick);
timer.Stop();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ba...@us...> - 2014-08-18 19:59:56
|
Revision: 4874
http://sourceforge.net/p/mp-plugins/code/4874
Author: bartev
Date: 2014-08-18 19:59:48 +0000 (Mon, 18 Aug 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/VeraControl/releases/VeraControl.xmp2
Modified: trunk/plugins/VeraControl/releases/VeraControl.xmp2
===================================================================
--- trunk/plugins/VeraControl/releases/VeraControl.xmp2 2014-08-18 19:53:45 UTC (rev 4873)
+++ trunk/plugins/VeraControl/releases/VeraControl.xmp2 2014-08-18 19:59:48 UTC (rev 4874)
@@ -467,6 +467,13 @@
<ZipFileName>Installer{CopyFile}\{f1ebac2f-1a07-4c79-9cba-0a5992f26af8}-Window_Covering_75.png</ZipFileName>
<DestinationFilename>%Skin%\Default\media\Vera\Window_Covering_75.png</DestinationFilename>
</FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Thumbs.db</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{2dc1e254-a2f0-4d5c-b9fe-e0784896da38}-Thumbs.db</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Thumbs.db</DestinationFilename>
+ </FileItem>
</Items>
</Files>
</GroupItem>
@@ -833,6 +840,13 @@
<ZipFileName>Installer{CopyFile}\{bf7a8ca3-ee4b-4847-ac47-b6a1d1afe94d}-Window_Covering_75.png</ZipFileName>
<DestinationFilename>%Skin%\DefaultWide\media\Vera\Window_Covering_75.png</DestinationFilename>
</FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Thumbs.db</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{3d9d438f-e6d8-4a92-9c39-5e7e71c9f84d}-Thumbs.db</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\media\Vera\Thumbs.db</DestinationFilename>
+ </FileItem>
</Items>
</Files>
</GroupItem>
@@ -1380,41 +1394,41 @@
<Build>0</Build>
<Revision>1</Revision>
</Version>
- <ExtensionDescription>Control your Vera controller from MediaPortal.
+ <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...
-
+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 is a Z-wave home automation controller from MicasaVerde.
- - Vera 1 v1.1.1338
- - Vera 2 v1.1.1267
- - Vera 2 v1.1.1362
+This version is tested with:
- - Vera 2 v1.5.255
+ - Vera 1 v1.1.1338
- - VeraLite
+ - Vera 2 v1.1.1267
- - Vera 3
+ - Vera 2 v1.1.1362
+ - Vera 2 v1.5.255
+
+ - VeraLite
+
+ - Vera 3
+
- UI4 & UI5</ExtensionDescription>
- <VersionDescription>- upgrade to MP 1.8.x
+ <VersionDescription>- upgrade to MP 1.8.x and 1.9.0 pre release
-
+
Do NOT update when you still use MP1.4.x.x !!!! or lower</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/VeraControl/releases/VeraControl_v1.2.0.1.mpe1</OnlineLocation>
- <ReleaseDate>2014-08-13T22:51:05</ReleaseDate>
+ <ReleaseDate>2014-08-18T22:51:05</ReleaseDate>
<Tags>home automation,
z-wave,
micasaverde,
@@ -1888,6 +1902,13 @@
<ZipFileName>Installer{CopyFile}\{f1ebac2f-1a07-4c79-9cba-0a5992f26af8}-Window_Covering_75.png</ZipFileName>
<DestinationFilename>%Skin%\Default\media\Vera\Window_Covering_75.png</DestinationFilename>
</FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>..\skin\Media\Vera\Thumbs.db</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{2dc1e254-a2f0-4d5c-b9fe-e0784896da38}-Thumbs.db</ZipFileName>
+ <DestinationFilename>%Skin%\Default\media\Vera\Thumbs.db</DestinationFilename>
+ </FileItem>
</Items>
</UniqueFileList>
<ProjectSettings>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ba...@us...> - 2014-08-18 19:53:54
|
Revision: 4873
http://sourceforge.net/p/mp-plugins/code/4873
Author: bartev
Date: 2014-08-18 19:53:45 +0000 (Mon, 18 Aug 2014)
Log Message:
-----------
Added direct scene trigger control and MP 1.8.0 and 1.9.0 pre release support
Added Paths:
-----------
trunk/plugins/VeraControl/releases/VeraControl_v1.2.0.1.mpe1
Added: trunk/plugins/VeraControl/releases/VeraControl_v1.2.0.1.mpe1
===================================================================
(Binary files differ)
Index: trunk/plugins/VeraControl/releases/VeraControl_v1.2.0.1.mpe1
===================================================================
--- trunk/plugins/VeraControl/releases/VeraControl_v1.2.0.1.mpe1 2014-08-18 19:52:49 UTC (rev 4872)
+++ trunk/plugins/VeraControl/releases/VeraControl_v1.2.0.1.mpe1 2014-08-18 19:53:45 UTC (rev 4873)
Property changes on: trunk/plugins/VeraControl/releases/VeraControl_v1.2.0.1.mpe1
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ba...@us...> - 2014-08-18 19:52:56
|
Revision: 4872
http://sourceforge.net/p/mp-plugins/code/4872
Author: bartev
Date: 2014-08-18 19:52:49 +0000 (Mon, 18 Aug 2014)
Log Message:
-----------
Added direct scene trigger control and MP 1.8.0 and 1.9.0 pre release support
Modified Paths:
--------------
trunk/plugins/VeraControl/releases/VeraControl.xmp2
trunk/plugins/VeraControl/releases/update.xml
Modified: trunk/plugins/VeraControl/releases/VeraControl.xmp2
===================================================================
--- trunk/plugins/VeraControl/releases/VeraControl.xmp2 2014-08-18 19:27:39 UTC (rev 4871)
+++ trunk/plugins/VeraControl/releases/VeraControl.xmp2 2014-08-18 19:52:49 UTC (rev 4872)
@@ -99,7 +99,7 @@
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\skin\Titan\VeraDialogSceneControl.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{3f236831-9424-4370-92b1-f0779833f42e}-VeraDialogSceneControl.xml</ZipFileName>
- <DestinationFilename>%Skin%\TitanVeraDialogSceneControl.xml</DestinationFilename>
+ <DestinationFilename>%Skin%\Titan\VeraDialogSceneControl.xml</DestinationFilename>
</FileItem>
</Items>
</Files>
@@ -1376,7 +1376,7 @@
<UpdateUrl>https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/VeraControl/releases/update.xml</UpdateUrl>
<Version>
<Major>1</Major>
- <Minor>1</Minor>
+ <Minor>2</Minor>
<Build>0</Build>
<Revision>1</Revision>
</Version>
@@ -1406,15 +1406,15 @@
- Vera 3
- - UI4 7 UI5</ExtensionDescription>
- <VersionDescription>- Fixed UTF8 "Cyrilic" bug
+ - UI4 & UI5</ExtensionDescription>
+ <VersionDescription>- upgrade to MP 1.8.x
-Do NOT update when you still use MP1.2.x.x !!!!</VersionDescription>
+Do NOT update when you still use MP1.4.x.x !!!! or lower</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
- <OnlineLocation>https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/VeraControl/releases/VeraControl_v1.1.0.1.mpe1</OnlineLocation>
- <ReleaseDate>2013-08-19T22:51:05</ReleaseDate>
+ <OnlineLocation>https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/VeraControl/releases/VeraControl_v1.2.0.1.mpe1</OnlineLocation>
+ <ReleaseDate>2014-08-13T22:51:05</ReleaseDate>
<Tags>home automation,
z-wave,
micasaverde,
@@ -1543,7 +1543,7 @@
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>..\skin\Titan\VeraDialogSceneControl.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{3f236831-9424-4370-92b1-f0779833f42e}-VeraDialogSceneControl.xml</ZipFileName>
- <DestinationFilename>%Skin%\TitanVeraDialogSceneControl.xml</DestinationFilename>
+ <DestinationFilename>%Skin%\Titan\VeraDialogSceneControl.xml</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
Modified: trunk/plugins/VeraControl/releases/update.xml
===================================================================
--- trunk/plugins/VeraControl/releases/update.xml 2014-08-18 19:27:39 UTC (rev 4871)
+++ trunk/plugins/VeraControl/releases/update.xml 2014-08-18 19:52:49 UTC (rev 4872)
@@ -1953,5 +1953,385 @@
</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>
+ <GroupItem Name="IconsTitan">
+ <DisplayName>IconsTitan</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>IconsTitan</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items />
+ </Sections>
+ <Dependencies>
+ <Items>
+ <DependencyItem>
+ <Type>Skin</Type>
+ <Id />
+ <MinVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MinVersion>
+ <MaxVersion>
+ <Major>1</Major>
+ <Minor>4</Minor>
+ <Build>0</Build>
+ <Revision>0</Revision>
+ </MaxVersion>
+ <WarnOnly>false</WarnOnly>
+ <Message>requires MediaPortal version 1.1.6.27644 to 1.4.0.0</Message>
+ <Name>MediaPortal</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>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.3.100.0</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items>
+ <SubSystemItem Name="MP.Config" />
+ <SubSystemItem Name="MP.SkinEngine" />
+ </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/home-automation/micasaverde-vera-controller</HomePage>
+ <ForumPage>http://forum.team-mediaportal.com/mediaportal-plugins-47/plugin-micasaverde-vera-controller-104337/</ForumPage>
+ <UpdateUrl>https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/VeraControl/releases/update.xml</UpdateUrl>
+ <Version>
+ <Major>1</Major>
+ <Minor>2</Minor>
+ <Build>0</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
+
+ - VeraLite
+
+ - Vera 3
+
+ - UI4 7 UI5</ExtensionDescription>
+ <VersionDescription>- upgrade to MP 1.6.x
+
+Do NOT update when you still use MP1.4.x.x !!!! or lower</VersionDescription>
+ <DevelopmentStatus>Stable</DevelopmentStatus>
+ <OnlineLocation>https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/VeraControl/releases/VeraControl_v1.1.0.1.mpe1</OnlineLocation>
+ <ReleaseDate>2014-01-14T22:51:05</ReleaseDate>
+ <Tags>home automation,
+z-wave,
+micasaverde,
+vera</Tags>
+ <Location>C:\Users\Bart\Documents\SharpDevelop Projects\VeraControl\releases\VeraControl_v[Version].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>
+ <GroupItem Name="IconsTitan">
+ <DisplayName>IconsTitan</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>IconsTitan</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items />
+ </Sections>
+ <Dependencies>
+ <Items>
+ <DependencyItem>
+ <Type>Skin</Type>
+ <Id />
+ <MinVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MinVersion>
+ <MaxVersion>
+ <Major>1</Major>
+ <Minor>4</Minor>
+ <Build>0</Build>
+ <Revision>0</Revision>
+ </MaxVersion>
+ <WarnOnly>false</WarnOnly>
+ <Message>requires MediaPortal version 1.1.6.27644 to 1.4.0.0</Message>
+ <Name>MediaPortal</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>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.3.100.0</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items>
+ <SubSystemItem Name="MP.Config" />
+ <SubSystemItem Name="MP.SkinEngine" />
+ </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/home-automation/micasaverde-vera-controller</HomePage>
+ <ForumPage>http://forum.team-mediaportal.com/mediaportal-plugins-47/plugin-micasaverde-vera-controller-104337/</ForumPage>
+ <UpdateUrl>https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/VeraControl/releases/update.xml</UpdateUrl>
+ <Version>
+ <Major>1</Major>
+ <Minor>2</Minor>
+ <Build>0</Build>
+ <Revision>1</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
+
+ - VeraLite
+
+ - Vera 3
+
+ - UI4 & UI5</ExtensionDescription>
+ <VersionDescription>- upgrade to MP 1.8.0
+- upgrade to MP 1.9.x pre release
+
+
+Do NOT update when you still use MP1.4.x.x !!!! or lower</VersionDescription>
+ <DevelopmentStatus>Stable</DevelopmentStatus>
+ <OnlineLocation>https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/VeraControl/releases/VeraControl_v1.2.0.1.mpe1</OnlineLocation>
+ <ReleaseDate>2014-08-18T22:51:05</ReleaseDate>
+ <Tags>home automation,
+z-wave,
+micasaverde,
+vera</Tags>
+ <Location>C:\Users\Bart\Documents\SharpDevelop Projects\VeraControl\releases\VeraControl_v[Version].mpe1</Location>
+ <Params>
+ <Items>
+ <SectionParam Name="Online Icon">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Configuration file">
+ <Value />
+ <ValueType>Template</ValueType>
+ <Description>The file used to configure the extension.
+ If have .exe extension the will be executed
+ If have .dll extension used like MP plugin configuration</Description>
+ </SectionParam>
+ <SectionParam Name="Online Screenshots">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>Online stored screenshot urls separated by ; </Description>
+ </SectionParam>
+ <SectionParam Name="Force to uninstall on update">
+ <Value>yes</Value>
+ <ValueType>Bool</ValueType>
+ <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ </GeneralInfo>
+ <UniqueFileList>
+ <Items />
+ </UniqueFileList>
+ <ProjectSettings>
+ <FolderGroups />
+ </ProjectSettings>
+ <IsSkin>false</IsSkin>
+ </PackageClass>
</Items>
-</ExtensionCollection>
+</ExtensionCollection>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ba...@us...> - 2014-08-18 19:27:47
|
Revision: 4871
http://sourceforge.net/p/mp-plugins/code/4871
Author: bartev
Date: 2014-08-18 19:27:39 +0000 (Mon, 18 Aug 2014)
Log Message:
-----------
Added direct scene trigger settings
Modified Paths:
--------------
trunk/plugins/VeraControl/skin/StreamedMP/VeraDialogActionTrigger.xml
Modified: trunk/plugins/VeraControl/skin/StreamedMP/VeraDialogActionTrigger.xml
===================================================================
--- trunk/plugins/VeraControl/skin/StreamedMP/VeraDialogActionTrigger.xml 2014-08-14 21:47:03 UTC (rev 4870)
+++ trunk/plugins/VeraControl/skin/StreamedMP/VeraDialogActionTrigger.xml 2014-08-18 19:27:39 UTC (rev 4871)
@@ -33,7 +33,7 @@
<posX>441</posX>
<posY>155</posY>
<width>1040</width>
- <height>588</height>
+ <height>788</height>
<texture>dialogmenumiddle.png</texture>
<colordiffuse>eeffffff</colordiffuse>
<animation effect="fade" time="200">windowopen</animation>
@@ -43,7 +43,7 @@
<type>image</type>
<id>0</id>
<posX>441</posX>
- <posY>742</posY>
+ <posY>942</posY>
<width>1040</width>
<height>18</height>
<texture>dialogmenubottom.png</texture>
@@ -1027,7 +1027,7 @@
<posX>1290</posX>
<posY>520</posY>
<onup>43</onup>
- <ondown>100</ondown>
+ <ondown>64</ondown>
<onleft>47</onleft>
<onright>45</onright>
<type>spinbutton</type>
@@ -1212,12 +1212,480 @@
<animation effect="fade" time="200">windowclose</animation>
</control>
+
+
+
<control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>550</posX>
+ <posY>680</posY>
+ <label>Key 0</label>
+ <font>mediastream10</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>760</posX>
+ <posY>680</posY>
+ <label>Key 1</label>
+ <font>mediastream10</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>940</posX>
+ <posY>680</posY>
+ <label>Key 2</label>
+ <font>mediastream10</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>1120</posX>
+ <posY>680</posY>
+ <label>Key 3</label>
+ <font>mediastream10</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>1310</posX>
+ <posY>680</posY>
+ <label>Key 4</label>
+ <font>mediastream10</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+
+ <control>
+ <description>Key 0</description>
+ <id>60</id>
+ <posX>530</posX>
+ <posY>720</posY>
+ <onup>65</onup>
+ <ondown>65</ondown>
+ <onleft>64</onleft>
+ <onright>61</onright>
+ <type>spinbutton</type>
+ <textureUp>arrowupnf.png</textureUp>
+ <textureDown>arrowdownnf.png</textureDown>
+ <textureUpFocus>arrowupfo.png</textureUpFocus>
+ <textureDownFocus>arrowdownfo.png</textureDownFocus>
+ <textcolor>ff909090</textcolor>
+ <textcolorNofocus>ffffffff</textcolorNofocus>
+ <textureFocus>dialogmenubutton.png</textureFocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>40</height>
+ <width>140</width>
+ <font>mediastream10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="550" start="1200,0">WindowOpen</animation>
+ <animation effect="fade" time="200">windowclose</animation>
+ </control>
+ <control>
+ <description>Key 1</description>
+ <id>61</id>
+ <posX>740</posX>
+ <posY>720</posY>
+ <onup>50</onup>
+ <ondown>66</ondown>
+ <onleft>60</onleft>
+ <onright>62</onright>
+ <type>spinbutton</type>
+ <textureUp>arrowupnf.png</textureUp>
+ <textureDown>arrowdownnf.png</textureDown>
+ <textureUpFocus>arrowupfo.png</textureUpFocus>
+ <textureDownFocus>arrowdownfo.png</textureDownFocus>
+ <textcolor>ff909090</textcolor>
+ <textcolorNofocus>ffffffff</textcolorNofocus>
+ <textureFocus>dialogmenubutton.png</textureFocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>40</height>
+ <width>140</width>
+ <font>mediastream10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="550" start="1200,0">WindowOpen</animation>
+ <animation effect="fade" time="200">windowclose</animation>
+ </control>
+ <control>
+ <description>Key 2</description>
+ <id>62</id>
+ <posX>920</posX>
+ <posY>720</posY>
+ <onup>51</onup>
+ <ondown>67</ondown>
+ <onleft>61</onleft>
+ <onright>63</onright>
+ <type>spinbutton</type>
+ <textureUp>arrowupnf.png</textureUp>
+ <textureDown>arrowdownnf.png</textureDown>
+ <textureUpFocus>arrowupfo.png</textureUpFocus>
+ <textureDownFocus>arrowdownfo.png</textureDownFocus>
+ <textcolor>ff909090</textcolor>
+ <textcolorNofocus>ffffffff</textcolorNofocus>
+ <textureFocus>dialogmenubutton.png</textureFocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>40</height>
+ <width>140</width>
+ <font>mediastream10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="550" start="1200,0">WindowOpen</animation>
+ <animation effect="fade" time="200">windowclose</animation>
+ </control>
+ <control>
+ <description>Key 3</description>
+ <id>63</id>
+ <posX>1100</posX>
+ <posY>720</posY>
+ <onup>52</onup>
+ <ondown>68</ondown>
+ <onleft>62</onleft>
+ <onright>64</onright>
+ <type>spinbutton</type>
+ <textureUp>arrowupnf.png</textureUp>
+ <textureDown>arrowdownnf.png</textureDown>
+ <textureUpFocus>arrowupfo.png</textureUpFocus>
+ <textureDownFocus>arrowdownfo.png</textureDownFocus>
+ <textcolor>ff909090</textcolor>
+ <textcolorNofocus>ffffffff</textcolorNofocus>
+ <textureFocus>dialogmenubutton.png</textureFocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>40</height>
+ <width>140</width>
+ <font>mediastream10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="550" start="1200,0">WindowOpen</animation>
+ <animation effect="fade" time="200">windowclose</animation>
+ </control>
+ <control>
+ <description>Key 4</description>
+ <id>64</id>
+ <posX>1290</posX>
+ <posY>720</posY>
+ <onup>48</onup>
+ <ondown>69</ondown>
+ <onleft>63</onleft>
+ <onright>60</onright>
+ <type>spinbutton</type>
+ <textureUp>arrowupnf.png</textureUp>
+ <textureDown>arrowdownnf.png</textureDown>
+ <textureUpFocus>arrowupfo.png</textureUpFocus>
+ <textureDownFocus>arrowdownfo.png</textureDownFocus>
+ <textcolor>ff909090</textcolor>
+ <textcolorNofocus>ffffffff</textcolorNofocus>
+ <textureFocus>dialogmenubutton.png</textureFocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>40</height>
+ <width>140</width>
+ <font>mediastream10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="550" start="1200,0">WindowOpen</animation>
+ <animation effect="fade" time="200">windowclose</animation>
+ </control>
+
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>550</posX>
+ <posY>780</posY>
+ <label>Key 5</label>
+ <font>mediastream10</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>760</posX>
+ <posY>780</posY>
+ <label>Key 6</label>
+ <font>mediastream10</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>940</posX>
+ <posY>780</posY>
+ <label>Key 7</label>
+ <font>mediastream10</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>1120</posX>
+ <posY>780</posY>
+ <label>Key 8</label>
+ <font>mediastream10</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>1310</posX>
+ <posY>780</posY>
+ <label>Key 9</label>
+ <font>mediastream10</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+
+ <control>
+ <description>Key 5</description>
+ <id>65</id>
+ <posX>530</posX>
+ <posY>820</posY>
+ <onup>60</onup>
+ <ondown>60</ondown>
+ <onleft>69</onleft>
+ <onright>66</onright>
+ <type>spinbutton</type>
+ <textureUp>arrowupnf.png</textureUp>
+ <textureDown>arrowdownnf.png</textureDown>
+ <textureUpFocus>arrowupfo.png</textureUpFocus>
+ <textureDownFocus>arrowdownfo.png</textureDownFocus>
+ <textcolor>ff909090</textcolor>
+ <textcolorNofocus>ffffffff</textcolorNofocus>
+ <textureFocus>dialogmenubutton.png</textureFocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>40</height>
+ <width>140</width>
+ <font>mediastream10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="550" start="1200,0">WindowOpen</animation>
+ <animation effect="fade" time="200">windowclose</animation>
+ </control>
+ <control>
+ <description>Key 6</description>
+ <id>66</id>
+ <posX>740</posX>
+ <posY>820</posY>
+ <onup>61</onup>
+ <ondown>20</ondown>
+ <onleft>65</onleft>
+ <onright>67</onright>
+ <type>spinbutton</type>
+ <textureUp>arrowupnf.png</textureUp>
+ <textureDown>arrowdownnf.png</textureDown>
+ <textureUpFocus>arrowupfo.png</textureUpFocus>
+ <textureDownFocus>arrowdownfo.png</textureDownFocus>
+ <textcolor>ff909090</textcolor>
+ <textcolorNofocus>ffffffff</textcolorNofocus>
+ <textureFocus>dialogmenubutton.png</textureFocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>40</height>
+ <width>140</width>
+ <font>mediastream10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="550" start="1200,0">WindowOpen</animation>
+ <animation effect="fade" time="200">windowclose</animation>
+ </control>
+ <control>
+ <description>Key 7</description>
+ <id>67</id>
+ <posX>920</posX>
+ <posY>820</posY>
+ <onup>62</onup>
+ <ondown>21</ondown>
+ <onleft>66</onleft>
+ <onright>68</onright>
+ <type>spinbutton</type>
+ <textureUp>arrowupnf.png</textureUp>
+ <textureDown>arrowdownnf.png</textureDown>
+ <textureUpFocus>arrowupfo.png</textureUpFocus>
+ <textureDownFocus>arrowdownfo.png</textureDownFocus>
+ <textcolor>ff909090</textcolor>
+ <textcolorNofocus>ffffffff</textcolorNofocus>
+ <textureFocus>dialogmenubutton.png</textureFocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>40</height>
+ <width>140</width>
+ <font>mediastream10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="550" start="1200,0">WindowOpen</animation>
+ <animation effect="fade" time="200">windowclose</animation>
+ </control>
+ <control>
+ <description>Key 8</description>
+ <id>68</id>
+ <posX>1100</posX>
+ <posY>820</posY>
+ <onup>63</onup>
+ <ondown>22</ondown>
+ <onleft>67</onleft>
+ <onright>69</onright>
+ <type>spinbutton</type>
+ <textureUp>arrowupnf.png</textureUp>
+ <textureDown>arrowdownnf.png</textureDown>
+ <textureUpFocus>arrowupfo.png</textureUpFocus>
+ <textureDownFocus>arrowdownfo.png</textureDownFocus>
+ <textcolor>ff909090</textcolor>
+ <textcolorNofocus>ffffffff</textcolorNofocus>
+ <textureFocus>dialogmenubutton.png</textureFocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>40</height>
+ <width>140</width>
+ <font>mediastream10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="550" start="1200,0">WindowOpen</animation>
+ <animation effect="fade" time="200">windowclose</animation>
+ </control>
+ <control>
+ <description>Key 9</description>
+ <id>69</id>
+ <posX>1290</posX>
+ <posY>820</posY>
+ <onup>64</onup>
+ <ondown>100</ondown>
+ <onleft>68</onleft>
+ <onright>65</onright>
+ <type>spinbutton</type>
+ <textureUp>arrowupnf.png</textureUp>
+ <textureDown>arrowdownnf.png</textureDown>
+ <textureUpFocus>arrowupfo.png</textureUpFocus>
+ <textureDownFocus>arrowdownfo.png</textureDownFocus>
+ <textcolor>ff909090</textcolor>
+ <textcolorNofocus>ffffffff</textcolorNofocus>
+ <textureFocus>dialogmenubutton.png</textureFocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>40</height>
+ <width>140</width>
+ <font>mediastream10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="550" start="1200,0">WindowOpen</animation>
+ <animation effect="fade" time="200">windowclose</animation>
+ </control>
+
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>520</posX>
+ <posY>890</posY>
+ <label>Scene shortcut with: * * numeric key # </label>
+ <font>mediastream10</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+
+ <control>
<description>Store button</description>
<type>button</type>
<id>100</id>
<posX>1290</posX>
- <posY>660</posY>
+ <posY>880</posY>
<textXOff>5</textXOff>
<textYOff>6</textYOff>
<width>140</width>
@@ -1227,7 +1695,7 @@
<textvalign>middle</textvalign>
<onleft>52</onleft>
<onright>50</onright>
- <onup>48</onup>
+ <onup>69</onup>
<ondown>2</ondown>
<animation effect="fade" time="250">visiblechange</animation>
<animation effect="fade" delay="900" time="250">WindowOpen</animation>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ba...@us...> - 2014-08-14 21:47:13
|
Revision: 4870
http://sourceforge.net/p/mp-plugins/code/4870
Author: bartev
Date: 2014-08-14 21:47:03 +0000 (Thu, 14 Aug 2014)
Log Message:
-----------
Added direct scene trigger control and MP 1.8.x support
Modified Paths:
--------------
trunk/plugins/VeraControl/DialogActionTrigger.cs
trunk/plugins/VeraControl/DialogDeviceControl.cs
trunk/plugins/VeraControl/VeraControl.cs
trunk/plugins/VeraControl/VeraControl.csproj
trunk/plugins/VeraControl/VeraControl.sln
Modified: trunk/plugins/VeraControl/DialogActionTrigger.cs
===================================================================
--- trunk/plugins/VeraControl/DialogActionTrigger.cs 2014-08-14 21:45:58 UTC (rev 4869)
+++ trunk/plugins/VeraControl/DialogActionTrigger.cs 2014-08-14 21:47:03 UTC (rev 4870)
@@ -63,7 +63,18 @@
[SkinControlAttribute(50)] protected GUISpinButton _spMPStart = null;
[SkinControlAttribute(51)] protected GUISpinButton _spMPSleep = null;
[SkinControlAttribute(52)] protected GUISpinButton _spMPExit = null;
-
+
+ [SkinControlAttribute(60)] protected GUISpinButton _spNumkey0 = null;
+ [SkinControlAttribute(61)] protected GUISpinButton _spNumkey1 = null;
+ [SkinControlAttribute(62)] protected GUISpinButton _spNumkey2 = null;
+ [SkinControlAttribute(63)] protected GUISpinButton _spNumkey3 = null;
+ [SkinControlAttribute(64)] protected GUISpinButton _spNumkey4 = null;
+ [SkinControlAttribute(65)] protected GUISpinButton _spNumkey5 = null;
+ [SkinControlAttribute(66)] protected GUISpinButton _spNumkey6 = null;
+ [SkinControlAttribute(67)] protected GUISpinButton _spNumkey7 = null;
+ [SkinControlAttribute(68)] protected GUISpinButton _spNumkey8 = null;
+ [SkinControlAttribute(69)] protected GUISpinButton _spNumkey9 = null;
+
private VeraCommunication _vera = VeraCommunication.Instance;
public DialogActionTrigger()
@@ -84,7 +95,9 @@
_spRecStart, _spRecPause, _spRecResume, _spRecStop,
_spRadioStart, _spRadioPause, _spRadioResume, _spRadioStop,
_spUnknownStart, _spUnknownPause, _spUnknownResume, _spUnknownStop,
- _spMPStart, _spMPSleep, _spMPExit
+ _spMPStart, _spMPSleep, _spMPExit,
+ _spNumkey0, _spNumkey1, _spNumkey2, _spNumkey3, _spNumkey4,
+ _spNumkey5, _spNumkey6, _spNumkey7, _spNumkey8, _spNumkey9
};
// (P)re load spin contor
@@ -153,7 +166,9 @@
_spRecStart, _spRecPause, _spRecResume, _spRecStop,
_spRadioStart, _spRadioPause, _spRadioResume, _spRadioStop,
_spUnknownStart, _spUnknownPause, _spUnknownResume, _spUnknownStop,
- _spMPStart, _spMPSleep, _spMPExit
+ _spMPStart, _spMPSleep, _spMPExit,
+ _spNumkey0, _spNumkey1, _spNumkey2, _spNumkey3, _spNumkey4,
+ _spNumkey5, _spNumkey6, _spNumkey7, _spNumkey8, _spNumkey9
};
for (int i = 0; i < spinList.Length; i++)
{
Modified: trunk/plugins/VeraControl/DialogDeviceControl.cs
===================================================================
--- trunk/plugins/VeraControl/DialogDeviceControl.cs 2014-08-14 21:45:58 UTC (rev 4869)
+++ trunk/plugins/VeraControl/DialogDeviceControl.cs 2014-08-14 21:47:03 UTC (rev 4870)
@@ -9,6 +9,7 @@
* E-mail: ba...@ev...
*/
using System;
+using System.Windows;
using System.Threading;
using System.Collections;
using MediaPortal;
Modified: trunk/plugins/VeraControl/VeraControl.cs
===================================================================
--- trunk/plugins/VeraControl/VeraControl.cs 2014-08-14 21:45:58 UTC (rev 4869)
+++ trunk/plugins/VeraControl/VeraControl.cs 2014-08-14 21:47:03 UTC (rev 4870)
@@ -72,6 +72,17 @@
MP_SHUTDOWN,
MP_EXIT,
+ NUMKEY_0,
+ NUMKEY_1,
+ NUMKEY_2,
+ NUMKEY_3,
+ NUMKEY_4,
+ NUMKEY_5,
+ NUMKEY_6,
+ NUMKEY_7,
+ NUMKEY_8,
+ NUMKEY_9,
+
LAST_ACTIONTRIGGER
};
@@ -117,6 +128,7 @@
private long _lastSystemStatusChg = 0;
private int _lastSystemStatusId = 0;
+ private int _directSceneState = 0; // 1 = 1 star = pressed, 2 = 2 stars pressen '0' - '9' num key pressen --> waiting for # to confirm
public bool _enableSceneTrigger = false;
private bool _autoSelectRoom = true;
private bool _viewPerCategory = false;
@@ -238,6 +250,7 @@
{
_selectedRoom = ALL;
_selectedSection = ALL;
+
using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.MPSettings())
{
@@ -327,12 +340,20 @@
{
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;
}
+
+
+ switch(action.wID)
+ {
+
+ default:
+ break;
+ }
+
// Handle global action responders first (Scene triggers need to be handled also when we are not visible)
switch(action.wID)
{
@@ -385,6 +406,80 @@
HandleActionTriggers(Actiontrigger.MP_SHUTDOWN);
break;
+ // This case is for handling direct scene request **<num>#
+ case Action.ActionType.ACTION_KEY_PRESSED:
+ // 1 = 1 star = pressed, 2 = 2 stars pressed, '0' - '9' num key pressed --> waiting for # to confirm
+ if (action.m_key.KeyChar == '*' && _directSceneState <= 1)
+ {
+ this._directSceneState++;
+
+ // TODO: prevent key-pressed action from begin handled further by MP
+ break;
+ }
+
+ if (_directSceneState == 2 && action.m_key.KeyChar >= '0' && action.m_key.KeyChar <= '9')
+ {
+ // Store selected scene key number
+ this._directSceneState = action.m_key.KeyChar;
+
+ // TODO: prevent key-pressed action from begin handled further by MP
+ break;
+ }
+
+ if (_directSceneState >= '0' && _directSceneState <= '9' && action.m_key.KeyChar == '#')
+ {
+ #region Yes we have a go for Scene execution!
+ Log.Info("Action Key pressed run scene for key: " + this._directSceneState);
+ switch (this._directSceneState)
+ {
+ case '0':
+ HandleActionTriggers(Actiontrigger.NUMKEY_0);
+ break;
+
+ case '1':
+ HandleActionTriggers(Actiontrigger.NUMKEY_1);
+ break;
+
+ case '2':
+ HandleActionTriggers(Actiontrigger.NUMKEY_2);
+ break;
+
+ case '3':
+ HandleActionTriggers(Actiontrigger.NUMKEY_3);
+ break;
+
+ case '4':
+ HandleActionTriggers(Actiontrigger.NUMKEY_4);
+ break;
+
+ case '5':
+ HandleActionTriggers(Actiontrigger.NUMKEY_5);
+ break;
+
+ case '6':
+ HandleActionTriggers(Actiontrigger.NUMKEY_6);
+ break;
+
+ case '7':
+ HandleActionTriggers(Actiontrigger.NUMKEY_7);
+ break;
+
+ case '8':
+ HandleActionTriggers(Actiontrigger.NUMKEY_8);
+ break;
+
+ case '9':
+ HandleActionTriggers(Actiontrigger.NUMKEY_9);
+ break;
+ }
+ #endregion
+ // TODO: prevent key-pressed action from begin handled further by MP
+ }
+
+ // Reset direct scene state
+ _directSceneState = 0;
+ break;
+
// Resume ? how to determine (Plug in init?)
default:
break;
@@ -402,6 +497,7 @@
case Action.ActionType.ACTION_MOUSE_MOVE:
break;
+ // Handle menu info key
case Action.ActionType.ACTION_CONTEXT_MENU:
case Action.ActionType.ACTION_SHOW_INFO:
ShowInfoDialog();
Modified: trunk/plugins/VeraControl/VeraControl.csproj
===================================================================
--- trunk/plugins/VeraControl/VeraControl.csproj 2014-08-14 21:45:58 UTC (rev 4869)
+++ trunk/plugins/VeraControl/VeraControl.csproj 2014-08-14 21:47:03 UTC (rev 4870)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
<PropertyGroup>
<ProjectGuid>{B403D22F-BFFF-41F5-846E-E60586CFB39F}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -7,7 +7,7 @@
<OutputType>Library</OutputType>
<RootNamespace>VeraControl</RootNamespace>
<AssemblyName>VeraControl</AssemblyName>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<AppDesignerFolder>Properties</AppDesignerFolder>
<SourceAnalysisOverrideSettingsFile>C:\Users\Bart\AppData\Roaming\ICSharpCode/SharpDevelop4\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
@@ -47,29 +47,32 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Common.Utils">
- <HintPath>..\..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Common.Utils.dll</HintPath>
+ <HintPath>..\..\..\..\..\Program Files %28x86%29\Team MediaPortal\MediaPortal\Common.Utils.dll</HintPath>
</Reference>
<Reference Include="Core">
- <HintPath>..\..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Core.dll</HintPath>
+ <HintPath>..\..\..\..\..\Program Files %28x86%29\Team MediaPortal\MediaPortal\Core.dll</HintPath>
</Reference>
<Reference Include="Dialogs">
- <HintPath>..\..\..\..\..\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll</HintPath>
+ <HintPath>..\..\..\..\..\Program Files %28x86%29\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll</HintPath>
</Reference>
<Reference Include="MediaFoundation">
- <HintPath>..\..\..\..\..\Program Files\Team MediaPortal\MediaPortal\MediaFoundation.dll</HintPath>
+ <HintPath>..\..\..\..\..\Program Files %28x86%29\Team MediaPortal\MediaPortal\MediaFoundation.dll</HintPath>
</Reference>
+ <Reference Include="PresentationCore">
+ <RequiredTargetFramework>3.0</RequiredTargetFramework>
+ </Reference>
<Reference Include="RemotePlugins">
- <HintPath>..\..\..\..\..\Program Files\Team MediaPortal\MediaPortal\RemotePlugins.dll</HintPath>
+ <HintPath>..\..\..\..\..\Program Files %28x86%29\Team MediaPortal\MediaPortal\RemotePlugins.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Drawing" />
- <Reference Include="System.Runtime.Serialization, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <Reference Include="System.Runtime.Serialization">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
</Reference>
- <Reference Include="System.Runtime.Serialization.Formatters.Soap, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <Reference Include="System.Runtime.Serialization.Formatters.Soap" />
<Reference Include="System.ServiceModel.Web">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
@@ -77,16 +80,18 @@
<Reference Include="System.Web.Extensions">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
+ <Reference Include="System.Windows" />
<Reference Include="System.Windows.Forms" />
+ <Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="Utils">
- <HintPath>..\..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Utils.dll</HintPath>
+ <HintPath>..\..\..\..\..\Program Files %28x86%29\Team MediaPortal\MediaPortal\Utils.dll</HintPath>
</Reference>
<Reference Include="WindowPlugins">
- <HintPath>..\..\..\..\..\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\WindowPlugins.dll</HintPath>
+ <HintPath>..\..\..\..\..\Program Files %28x86%29\Team MediaPortal\MediaPortal\plugins\Windows\WindowPlugins.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Modified: trunk/plugins/VeraControl/VeraControl.sln
===================================================================
--- trunk/plugins/VeraControl/VeraControl.sln 2014-08-14 21:45:58 UTC (rev 4869)
+++ trunk/plugins/VeraControl/VeraControl.sln 2014-08-14 21:47:03 UTC (rev 4870)
@@ -1,7 +1,7 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-# SharpDevelop 4.1.0.8000
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+# SharpDevelop 4.4
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VeraControl", "VeraControl.csproj", "{B403D22F-BFFF-41F5-846E-E60586CFB39F}"
EndProject
Global
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ba...@us...> - 2014-08-14 21:46:10
|
Revision: 4869
http://sourceforge.net/p/mp-plugins/code/4869
Author: bartev
Date: 2014-08-14 21:45:58 +0000 (Thu, 14 Aug 2014)
Log Message:
-----------
Added direct scene trigger settings
Modified Paths:
--------------
trunk/plugins/VeraControl/skin/Default/VeraDialogActionTrigger.xml
trunk/plugins/VeraControl/skin/Default/VeraDialogDeviceControl.xml
trunk/plugins/VeraControl/skin/Default/VeraDialogSceneControl.xml
Modified: trunk/plugins/VeraControl/skin/Default/VeraDialogActionTrigger.xml
===================================================================
--- trunk/plugins/VeraControl/skin/Default/VeraDialogActionTrigger.xml 2014-08-14 21:45:29 UTC (rev 4868)
+++ trunk/plugins/VeraControl/skin/Default/VeraDialogActionTrigger.xml 2014-08-14 21:45:58 UTC (rev 4869)
@@ -29,7 +29,7 @@
<posX>210</posX>
<posY>100</posY>
<width>550</width>
- <height>440</height>
+ <height>600</height>
<texture>context_background.png</texture>
</control>
<control>
@@ -40,8 +40,8 @@
<posY>130</posY>
<width>40</width>
<height>40</height>
- <textureFocus>dialogue_shutdown_focus.png</textureFocus>
- <textureNoFocus>dialogue_shutdown_nofocus.png</textureNoFocus>
+ <textureFocus>top_exit_enabled.png</textureFocus>
+ <textureNoFocus>top_exit_disabled.png</textureNoFocus>
<label>-</label>
<onleft>10</onleft>
<onright>15</onright>
@@ -113,7 +113,7 @@
<posY>200</posY>
<onleft>23</onleft>
<onright>21</onright>
- <onup>50</onup>
+ <onup>66</onup>
<ondown>25</ondown>
<type>spinbutton</type>
<textureUp>arrow_round_up_nofocus.png</textureUp>
@@ -142,7 +142,7 @@
<id>21</id>
<posX>470</posX>
<posY>200</posY>
- <onup>51</onup>
+ <onup>67</onup>
<ondown>26</ondown>
<onleft>20</onleft>
<onright>22</onright>
@@ -173,7 +173,7 @@
<id>22</id>
<posX>560</posX>
<posY>200</posY>
- <onup>52</onup>
+ <onup>68</onup>
<ondown>27</ondown>
<onleft>21</onleft>
<onright>23</onright>
@@ -880,7 +880,7 @@
<posX>650</posX>
<posY>350</posY>
<onup>43</onup>
- <ondown>100</ondown>
+ <ondown>64</ondown>
<onleft>47</onleft>
<onright>45</onright>
<type>spinbutton</type>
@@ -953,7 +953,7 @@
<posX>380</posX>
<posY>410</posY>
<onup>45</onup>
- <ondown>20</ondown>
+ <ondown>61</ondown>
<onleft>100</onleft>
<onright>51</onright>
<type>spinbutton</type>
@@ -984,7 +984,7 @@
<posX>470</posX>
<posY>410</posY>
<onup>46</onup>
- <ondown>21</ondown>
+ <ondown>62</ondown>
<onleft>50</onleft>
<onright>52</onright>
<type>spinbutton</type>
@@ -1015,9 +1015,9 @@
<posX>560</posX>
<posY>410</posY>
<onup>47</onup>
- <ondown>22</ondown>
+ <ondown>63</ondown>
<onleft>51</onleft>
- <onright>100</onright>
+ <onright>50</onright>
<type>spinbutton</type>
<textureUp>arrow_round_up_nofocus.png</textureUp>
<textureDown>arrow_round_down_nofocus.png</textureDown>
@@ -1041,12 +1041,440 @@
<animation effect="slide" time="650" start="1200,0">WindowOpen</animation>
</control>
+
<control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>290</posX>
+ <posY>465</posY>
+ <label>Key 0</label>
+ <font>font10</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>380</posX>
+ <posY>465</posY>
+ <label>Key 1</label>
+ <font>font10</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>470</posX>
+ <posY>465</posY>
+ <label>Key 2</label>
+ <font>font10</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>560</posX>
+ <posY>465</posY>
+ <label>Key 3</label>
+ <font>font10</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>650</posX>
+ <posY>465</posY>
+ <label>Key 4</label>
+ <font>font10</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+
+ <control>
+ <description>Key 0</description>
+ <id>60</id>
+ <posX>290</posX>
+ <posY>490</posY>
+ <onup>65</onup>
+ <ondown>65</ondown>
+ <onleft>64</onleft>
+ <onright>61</onright>
+ <type>spinbutton</type>
+ <textureUp>arrow_round_up_nofocus.png</textureUp>
+ <textureDown>arrow_round_down_nofocus.png</textureDown>
+ <textureUpFocus>arrow_round_up_focus.png</textureUpFocus>
+ <textureDownFocus>arrow_round_down_focus.png</textureDownFocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>20</height>
+ <width>50</width>
+ <font>font10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="450" start="1200,0">WindowOpen</animation>
+ </control>
+ <control>
+ <description>Key 1</description>
+ <id>61</id>
+ <posX>380</posX>
+ <posY>490</posY>
+ <onup>50</onup>
+ <ondown>66</ondown>
+ <onleft>60</onleft>
+ <onright>62</onright>
+ <type>spinbutton</type>
+ <textureUp>arrow_round_up_nofocus.png</textureUp>
+ <textureDown>arrow_round_down_nofocus.png</textureDown>
+ <textureUpFocus>arrow_round_up_focus.png</textureUpFocus>
+ <textureDownFocus>arrow_round_down_focus.png</textureDownFocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>20</height>
+ <width>50</width>
+ <font>font10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="450" start="1200,0">WindowOpen</animation>
+ </control>
+ <control>
+ <description>Key 2</description>
+ <id>62</id>
+ <posX>470</posX>
+ <posY>490</posY>
+ <onup>51</onup>
+ <ondown>67</ondown>
+ <onleft>61</onleft>
+ <onright>63</onright>
+ <type>spinbutton</type>
+ <textureUp>arrow_round_up_nofocus.png</textureUp>
+ <textureDown>arrow_round_down_nofocus.png</textureDown>
+ <textureUpFocus>arrow_round_up_focus.png</textureUpFocus>
+ <textureDownFocus>arrow_round_down_focus.png</textureDownFocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>20</height>
+ <width>50</width>
+ <font>font10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="550" start="1200,0">WindowOpen</animation>
+ </control>
+ <control>
+ <description>Key 3</description>
+ <id>63</id>
+ <posX>560</posX>
+ <posY>490</posY>
+ <onup>52</onup>
+ <ondown>68</ondown>
+ <onleft>62</onleft>
+ <onright>64</onright>
+ <type>spinbutton</type>
+ <textureUp>arrow_round_up_nofocus.png</textureUp>
+ <textureDown>arrow_round_down_nofocus.png</textureDown>
+ <textureUpFocus>arrow_round_up_focus.png</textureUpFocus>
+ <textureDownFocus>arrow_round_down_focus.png</textureDownFocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>20</height>
+ <width>50</width>
+ <font>font10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="650" start="1200,0">WindowOpen</animation>
+ </control>
+ <control>
+ <description>Key 4</description>
+ <id>64</id>
+ <posX>650</posX>
+ <posY>490</posY>
+ <onup>48</onup>
+ <ondown>69</ondown>
+ <onleft>63</onleft>
+ <onright>60</onright>
+ <type>spinbutton</type>
+ <textureUp>arrow_round_up_nofocus.png</textureUp>
+ <textureDown>arrow_round_down_nofocus.png</textureDown>
+ <textureUpFocus>arrow_round_up_focus.png</textureUpFocus>
+ <textureDownFocus>arrow_round_down_focus.png</textureDownFocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>20</height>
+ <width>50</width>
+ <font>font10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="750" start="1200,0">WindowOpen</animation>
+ </control>
+
+
+
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>290</posX>
+ <posY>520</posY>
+ <label>Key 5</label>
+ <font>font10</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>380</posX>
+ <posY>520</posY>
+ <label>Key 6</label>
+ <font>font10</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>470</posX>
+ <posY>520</posY>
+ <label>Key 7</label>
+ <font>font10</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>560</posX>
+ <posY>520</posY>
+ <label>Key 8</label>
+ <font>font10</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>650</posX>
+ <posY>520</posY>
+ <label>Key 9</label>
+ <font>font10</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+
+ <control>
+ <description>Key 5</description>
+ <id>65</id>
+ <posX>290</posX>
+ <posY>550</posY>
+ <onup>60</onup>
+ <ondown>60</ondown>
+ <onleft>69</onleft>
+ <onright>66</onright>
+ <type>spinbutton</type>
+ <textureUp>arrow_round_up_nofocus.png</textureUp>
+ <textureDown>arrow_round_down_nofocus.png</textureDown>
+ <textureUpFocus>arrow_round_up_focus.png</textureUpFocus>
+ <textureDownFocus>arrow_round_down_focus.png</textureDownFocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>20</height>
+ <width>50</width>
+ <font>font10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="450" start="1200,0">WindowOpen</animation>
+ </control>
+ <control>
+ <description>Key 6</description>
+ <id>66</id>
+ <posX>380</posX>
+ <posY>550</posY>
+ <onup>61</onup>
+ <ondown>20</ondown>
+ <onleft>65</onleft>
+ <onright>67</onright>
+ <type>spinbutton</type>
+ <textureUp>arrow_round_up_nofocus.png</textureUp>
+ <textureDown>arrow_round_down_nofocus.png</textureDown>
+ <textureUpFocus>arrow_round_up_focus.png</textureUpFocus>
+ <textureDownFocus>arrow_round_down_focus.png</textureDownFocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>20</height>
+ <width>50</width>
+ <font>font10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="450" start="1200,0">WindowOpen</animation>
+ </control>
+ <control>
+ <description>Key 7</description>
+ <id>67</id>
+ <posX>470</posX>
+ <posY>550</posY>
+ <onup>62</onup>
+ <ondown>21</ondown>
+ <onleft>66</onleft>
+ <onright>68</onright>
+ <type>spinbutton</type>
+ <textureUp>arrow_round_up_nofocus.png</textureUp>
+ <textureDown>arrow_round_down_nofocus.png</textureDown>
+ <textureUpFocus>arrow_round_up_focus.png</textureUpFocus>
+ <textureDownFocus>arrow_round_down_focus.png</textureDownFocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>20</height>
+ <width>50</width>
+ <font>font10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="550" start="1200,0">WindowOpen</animation>
+ </control>
+ <control>
+ <description>Key 8</description>
+ <id>68</id>
+ <posX>560</posX>
+ <posY>550</posY>
+ <onup>63</onup>
+ <ondown>22</ondown>
+ <onleft>67</onleft>
+ <onright>69</onright>
+ <type>spinbutton</type>
+ <textureUp>arrow_round_up_nofocus.png</textureUp>
+ <textureDown>arrow_round_down_nofocus.png</textureDown>
+ <textureUpFocus>arrow_round_up_focus.png</textureUpFocus>
+ <textureDownFocus>arrow_round_down_focus.png</textureDownFocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>20</height>
+ <width>50</width>
+ <font>font10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="650" start="1200,0">WindowOpen</animation>
+ </control>
+ <control>
+ <description>Key 9</description>
+ <id>69</id>
+ <posX>650</posX>
+ <posY>550</posY>
+ <onup>64</onup>
+ <ondown>100</ondown>
+ <onleft>68</onleft>
+ <onright>65</onright>
+ <type>spinbutton</type>
+ <textureUp>arrow_round_up_nofocus.png</textureUp>
+ <textureDown>arrow_round_down_nofocus.png</textureDown>
+ <textureUpFocus>arrow_round_up_focus.png</textureUpFocus>
+ <textureDownFocus>arrow_round_down_focus.png</textureDownFocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>20</height>
+ <width>50</width>
+ <font>font10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="750" start="1200,0">WindowOpen</animation>
+ </control>
+
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>260</posX>
+ <posY>620</posY>
+ <label>Scene shortcut with: * * numeric key # </label>
+ <font>font10</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+
+ <control>
<description>Store button</description>
<type>button</type>
<id>100</id>
<posX>620</posX>
- <posY>445</posY>
+ <posY>620</posY>
<textXOff>5</textXOff>
<textYOff>6</textYOff>
<width>100</width>
@@ -1056,9 +1484,9 @@
<label>190</label>
<textalign>center</textalign>
<textvalign>middle</textvalign>
- <onleft>52</onleft>
- <onright>50</onright>
- <onup>48</onup>
+ <onleft>65</onleft>
+ <onright>69</onright>
+ <onup>69</onup>
<ondown>2</ondown>
<animation effect="fade" time="250">visiblechange</animation>
<animation effect="fade" delay="700" time="250">WindowOpen</animation>
Modified: trunk/plugins/VeraControl/skin/Default/VeraDialogDeviceControl.xml
===================================================================
--- trunk/plugins/VeraControl/skin/Default/VeraDialogDeviceControl.xml 2014-08-14 21:45:29 UTC (rev 4868)
+++ trunk/plugins/VeraControl/skin/Default/VeraDialogDeviceControl.xml 2014-08-14 21:45:58 UTC (rev 4869)
@@ -40,8 +40,8 @@
<posY>130</posY>
<width>40</width>
<height>40</height>
- <textureFocus>dialogue_shutdown_focus.png</textureFocus>
- <textureNoFocus>dialogue_shutdown_nofocus.png</textureNoFocus>
+ <textureFocus>top_exit_enabled.png</textureFocus>
+ <textureNoFocus>top_exit_disabled.png</textureNoFocus>
<label>-</label>
<onleft>10</onleft>
<onright>15</onright>
Modified: trunk/plugins/VeraControl/skin/Default/VeraDialogSceneControl.xml
===================================================================
--- trunk/plugins/VeraControl/skin/Default/VeraDialogSceneControl.xml 2014-08-14 21:45:29 UTC (rev 4868)
+++ trunk/plugins/VeraControl/skin/Default/VeraDialogSceneControl.xml 2014-08-14 21:45:58 UTC (rev 4869)
@@ -40,8 +40,8 @@
<posY>130</posY>
<width>40</width>
<height>40</height>
- <textureFocus>dialogue_shutdown_focus.png</textureFocus>
- <textureNoFocus>dialogue_shutdown_nofocus.png</textureNoFocus>
+ <textureFocus>top_exit_enabled.png</textureFocus>
+ <textureNoFocus>top_exit_disabled.png</textureNoFocus>
<label>-</label>
<onleft>11</onleft>
<onright>11</onright>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ba...@us...> - 2014-08-14 21:45:39
|
Revision: 4868
http://sourceforge.net/p/mp-plugins/code/4868
Author: bartev
Date: 2014-08-14 21:45:29 +0000 (Thu, 14 Aug 2014)
Log Message:
-----------
Added direct scene trigger settings
Modified Paths:
--------------
trunk/plugins/VeraControl/skin/DefaultWide/VeraDialogActionTrigger.xml
trunk/plugins/VeraControl/skin/DefaultWide/VeraDialogDeviceControl.xml
trunk/plugins/VeraControl/skin/DefaultWide/VeraDialogSceneControl.xml
Modified: trunk/plugins/VeraControl/skin/DefaultWide/VeraDialogActionTrigger.xml
===================================================================
--- trunk/plugins/VeraControl/skin/DefaultWide/VeraDialogActionTrigger.xml 2014-08-14 21:44:11 UTC (rev 4867)
+++ trunk/plugins/VeraControl/skin/DefaultWide/VeraDialogActionTrigger.xml 2014-08-14 21:45:29 UTC (rev 4868)
@@ -30,7 +30,7 @@
<posX>206</posX>
<posY>80</posY>
<width>970</width>
- <height>457</height>
+ <height>627</height>
<texture>context_background.png</texture>
</control>
<control>
@@ -38,11 +38,11 @@
<type>button</type>
<id>2</id>
<posX>1078</posX>
- <posY>102</posY>
- <width>50</width>
- <height>50</height>
- <textureFocus>dialogue_shutdown_focus.png</textureFocus>
- <textureNoFocus>dialogue_shutdown_nofocus.png</textureNoFocus>
+ <posY>122</posY>
+ <width>40</width>
+ <height>40</height>
+ <textureFocus>top_exit_enabled.png</textureFocus>
+ <textureNoFocus>top_exit_disabled.png</textureNoFocus>
<label>-</label>
<onleft>10</onleft>
<onright>15</onright>
@@ -50,9 +50,6 @@
<ondown>23</ondown>
</control>
-
-
-
<control>
<description>Play label</description>
<type>label</type>
@@ -881,7 +878,7 @@
<posX>950</posX>
<posY>390</posY>
<onup>43</onup>
- <ondown>100</ondown>
+ <ondown>64</ondown>
<onleft>47</onleft>
<onright>45</onright>
<type>spinbutton</type>
@@ -954,7 +951,7 @@
<posX>440</posX>
<posY>460</posY>
<onup>45</onup>
- <ondown>20</ondown>
+ <ondown>61</ondown>
<onleft>100</onleft>
<onright>51</onright>
<type>spinbutton</type>
@@ -1042,12 +1039,439 @@
<animation effect="slide" time="650" start="1200,0">WindowOpen</animation>
</control>
+
<control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>270</posX>
+ <posY>495</posY>
+ <label>Key 0</label>
+ <font>font10</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>440</posX>
+ <posY>495</posY>
+ <label>Key 1</label>
+ <font>font10</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>610</posX>
+ <posY>495</posY>
+ <label>Key 2</label>
+ <font>font10</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>780</posX>
+ <posY>495</posY>
+ <label>Key 3</label>
+ <font>font10</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>950</posX>
+ <posY>495</posY>
+ <label>Key 4</label>
+ <font>font10</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+
+ <control>
+ <description>Key 0</description>
+ <id>60</id>
+ <posX>270</posX>
+ <posY>520</posY>
+ <onup>65</onup>
+ <ondown>65</ondown>
+ <onleft>64</onleft>
+ <onright>61</onright>
+ <type>spinbutton</type>
+ <textureUp>arrow_round_up_nofocus.png</textureUp>
+ <textureDown>arrow_round_down_nofocus.png</textureDown>
+ <textureUpFocus>arrow_round_up_focus.png</textureUpFocus>
+ <textureDownFocus>arrow_round_down_focus.png</textureDownFocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>20</height>
+ <width>50</width>
+ <font>font10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="450" start="1200,0">WindowOpen</animation>
+ </control>
+ <control>
+ <description>Key 1</description>
+ <id>61</id>
+ <posX>440</posX>
+ <posY>520</posY>
+ <onup>50</onup>
+ <ondown>66</ondown>
+ <onleft>60</onleft>
+ <onright>62</onright>
+ <type>spinbutton</type>
+ <textureUp>arrow_round_up_nofocus.png</textureUp>
+ <textureDown>arrow_round_down_nofocus.png</textureDown>
+ <textureUpFocus>arrow_round_up_focus.png</textureUpFocus>
+ <textureDownFocus>arrow_round_down_focus.png</textureDownFocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>20</height>
+ <width>50</width>
+ <font>font10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="450" start="1200,0">WindowOpen</animation>
+ </control>
+ <control>
+ <description>Key 2</description>
+ <id>62</id>
+ <posX>610</posX>
+ <posY>520</posY>
+ <onup>51</onup>
+ <ondown>67</ondown>
+ <onleft>61</onleft>
+ <onright>63</onright>
+ <type>spinbutton</type>
+ <textureUp>arrow_round_up_nofocus.png</textureUp>
+ <textureDown>arrow_round_down_nofocus.png</textureDown>
+ <textureUpFocus>arrow_round_up_focus.png</textureUpFocus>
+ <textureDownFocus>arrow_round_down_focus.png</textureDownFocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>20</height>
+ <width>50</width>
+ <font>font10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="550" start="1200,0">WindowOpen</animation>
+ </control>
+ <control>
+ <description>Key 3</description>
+ <id>63</id>
+ <posX>780</posX>
+ <posY>520</posY>
+ <onup>52</onup>
+ <ondown>68</ondown>
+ <onleft>62</onleft>
+ <onright>64</onright>
+ <type>spinbutton</type>
+ <textureUp>arrow_round_up_nofocus.png</textureUp>
+ <textureDown>arrow_round_down_nofocus.png</textureDown>
+ <textureUpFocus>arrow_round_up_focus.png</textureUpFocus>
+ <textureDownFocus>arrow_round_down_focus.png</textureDownFocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>20</height>
+ <width>50</width>
+ <font>font10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="650" start="1200,0">WindowOpen</animation>
+ </control>
+ <control>
+ <description>Key 4</description>
+ <id>64</id>
+ <posX>950</posX>
+ <posY>520</posY>
+ <onup>48</onup>
+ <ondown>69</ondown>
+ <onleft>63</onleft>
+ <onright>60</onright>
+ <type>spinbutton</type>
+ <textureUp>arrow_round_up_nofocus.png</textureUp>
+ <textureDown>arrow_round_down_nofocus.png</textureDown>
+ <textureUpFocus>arrow_round_up_focus.png</textureUpFocus>
+ <textureDownFocus>arrow_round_down_focus.png</textureDownFocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>20</height>
+ <width>50</width>
+ <font>font10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="750" start="1200,0">WindowOpen</animation>
+ </control>
+
+
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>270</posX>
+ <posY>550</posY>
+ <label>Key 5</label>
+ <font>font10</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>440</posX>
+ <posY>550</posY>
+ <label>Key 6</label>
+ <font>font10</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>610</posX>
+ <posY>550</posY>
+ <label>Key 7</label>
+ <font>font10</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>780</posX>
+ <posY>550</posY>
+ <label>Key 8</label>
+ <font>font10</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>950</posX>
+ <posY>550</posY>
+ <label>Key 9</label>
+ <font>font10</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+
+ <control>
+ <description>Key 5</description>
+ <id>65</id>
+ <posX>270</posX>
+ <posY>580</posY>
+ <onup>60</onup>
+ <ondown>60</ondown>
+ <onleft>69</onleft>
+ <onright>66</onright>
+ <type>spinbutton</type>
+ <textureUp>arrow_round_up_nofocus.png</textureUp>
+ <textureDown>arrow_round_down_nofocus.png</textureDown>
+ <textureUpFocus>arrow_round_up_focus.png</textureUpFocus>
+ <textureDownFocus>arrow_round_down_focus.png</textureDownFocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>20</height>
+ <width>50</width>
+ <font>font10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="450" start="1200,0">WindowOpen</animation>
+ </control>
+ <control>
+ <description>Key 6</description>
+ <id>66</id>
+ <posX>440</posX>
+ <posY>580</posY>
+ <onup>61</onup>
+ <ondown>20</ondown>
+ <onleft>65</onleft>
+ <onright>67</onright>
+ <type>spinbutton</type>
+ <textureUp>arrow_round_up_nofocus.png</textureUp>
+ <textureDown>arrow_round_down_nofocus.png</textureDown>
+ <textureUpFocus>arrow_round_up_focus.png</textureUpFocus>
+ <textureDownFocus>arrow_round_down_focus.png</textureDownFocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>20</height>
+ <width>50</width>
+ <font>font10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="450" start="1200,0">WindowOpen</animation>
+ </control>
+ <control>
+ <description>Key 7</description>
+ <id>67</id>
+ <posX>610</posX>
+ <posY>580</posY>
+ <onup>62</onup>
+ <ondown>21</ondown>
+ <onleft>66</onleft>
+ <onright>68</onright>
+ <type>spinbutton</type>
+ <textureUp>arrow_round_up_nofocus.png</textureUp>
+ <textureDown>arrow_round_down_nofocus.png</textureDown>
+ <textureUpFocus>arrow_round_up_focus.png</textureUpFocus>
+ <textureDownFocus>arrow_round_down_focus.png</textureDownFocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>20</height>
+ <width>50</width>
+ <font>font10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="550" start="1200,0">WindowOpen</animation>
+ </control>
+ <control>
+ <description>Key 8</description>
+ <id>68</id>
+ <posX>780</posX>
+ <posY>580</posY>
+ <onup>63</onup>
+ <ondown>22</ondown>
+ <onleft>67</onleft>
+ <onright>69</onright>
+ <type>spinbutton</type>
+ <textureUp>arrow_round_up_nofocus.png</textureUp>
+ <textureDown>arrow_round_down_nofocus.png</textureDown>
+ <textureUpFocus>arrow_round_up_focus.png</textureUpFocus>
+ <textureDownFocus>arrow_round_down_focus.png</textureDownFocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>20</height>
+ <width>50</width>
+ <font>font10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="650" start="1200,0">WindowOpen</animation>
+ </control>
+ <control>
+ <description>Key 9</description>
+ <id>69</id>
+ <posX>950</posX>
+ <posY>580</posY>
+ <onup>64</onup>
+ <ondown>100</ondown>
+ <onleft>68</onleft>
+ <onright>65</onright>
+ <type>spinbutton</type>
+ <textureUp>arrow_round_up_nofocus.png</textureUp>
+ <textureDown>arrow_round_down_nofocus.png</textureDown>
+ <textureUpFocus>arrow_round_up_focus.png</textureUpFocus>
+ <textureDownFocus>arrow_round_down_focus.png</textureDownFocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>20</height>
+ <width>50</width>
+ <font>font10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="750" start="1200,0">WindowOpen</animation>
+ </control>
+
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>260</posX>
+ <posY>630</posY>
+ <label>Scene shortcut with: * * numeric key # </label>
+ <font>font10</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+
+ <control>
<description>Store button</description>
<type>button</type>
<id>100</id>
<posX>950</posX>
- <posY>440</posY>
+ <posY>610</posY>
<textXOff>5</textXOff>
<textYOff>6</textYOff>
<width>160</width>
@@ -1057,9 +1481,9 @@
<label>190</label>
<textalign>center</textalign>
<textvalign>middle</textvalign>
- <onleft>52</onleft>
- <onright>50</onright>
- <onup>48</onup>
+ <onleft>65</onleft>
+ <onright>69</onright>
+ <onup>69</onup>
<ondown>2</ondown>
<animation effect="fade" time="250">visiblechange</animation>
<animation effect="fade" delay="700" time="250">WindowOpen</animation>
Modified: trunk/plugins/VeraControl/skin/DefaultWide/VeraDialogDeviceControl.xml
===================================================================
--- trunk/plugins/VeraControl/skin/DefaultWide/VeraDialogDeviceControl.xml 2014-08-14 21:44:11 UTC (rev 4867)
+++ trunk/plugins/VeraControl/skin/DefaultWide/VeraDialogDeviceControl.xml 2014-08-14 21:45:29 UTC (rev 4868)
@@ -38,12 +38,11 @@
<type>button</type>
<id>2</id>
<posX>1078</posX>
- <posY>102</posY>
- <width>50</width>
- <height>50</height>
- <textureFocus>dialogue_shutdown_focus.png</textureFocus>
- <textureNoFocus>dialogue_shutdown_nofocus.png</textureNoFocus>
- <label>-</label>
+ <posY>112</posY>
+ <width>40</width>
+ <height>40</height>
+ <textureFocus>top_exit_enabled.png</textureFocus>
+ <textureNoFocus>top_exit_disabled.png</textureNoFocus> <label>-</label>
<onleft>10</onleft>
<onright>15</onright>
<onup>11</onup>
Modified: trunk/plugins/VeraControl/skin/DefaultWide/VeraDialogSceneControl.xml
===================================================================
--- trunk/plugins/VeraControl/skin/DefaultWide/VeraDialogSceneControl.xml 2014-08-14 21:44:11 UTC (rev 4867)
+++ trunk/plugins/VeraControl/skin/DefaultWide/VeraDialogSceneControl.xml 2014-08-14 21:45:29 UTC (rev 4868)
@@ -38,11 +38,11 @@
<type>button</type>
<id>2</id>
<posX>1078</posX>
- <posY>102</posY>
- <width>50</width>
- <height>50</height>
- <textureFocus>dialogue_shutdown_focus.png</textureFocus>
- <textureNoFocus>dialogue_shutdown_nofocus.png</textureNoFocus>
+ <posY>112</posY>
+ <width>40</width>
+ <height>40</height>
+ <textureFocus>top_exit_enabled.png</textureFocus>
+ <textureNoFocus>top_exit_disabled.png</textureNoFocus>
<label>-</label>
<onleft>11</onleft>
<onright>11</onright>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ba...@us...> - 2014-08-14 21:44:21
|
Revision: 4867
http://sourceforge.net/p/mp-plugins/code/4867
Author: bartev
Date: 2014-08-14 21:44:11 +0000 (Thu, 14 Aug 2014)
Log Message:
-----------
Added direct scene trigger settings
Modified Paths:
--------------
trunk/plugins/VeraControl/skin/Titan/VeraDialogActionTrigger.xml
Modified: trunk/plugins/VeraControl/skin/Titan/VeraDialogActionTrigger.xml
===================================================================
--- trunk/plugins/VeraControl/skin/Titan/VeraDialogActionTrigger.xml 2014-07-12 15:35:48 UTC (rev 4866)
+++ trunk/plugins/VeraControl/skin/Titan/VeraDialogActionTrigger.xml 2014-08-14 21:44:11 UTC (rev 4867)
@@ -17,9 +17,9 @@
<type>image</type>
<id>0</id>
<posX>400</posX>
- <posY>200</posY>
+ <posY>50</posY>
<width>1200</width>
- <height>800</height>
+ <height>1050</height>
<texture>context_background.png</texture>
</control>
<control>
@@ -28,7 +28,7 @@
<description>Heading text label</description>
<type>label</type>
<posX>520</posX>
- <posY>300</posY>
+ <posY>150</posY>
<width>820</width>
<font>font22</font>
<textcolor>ff393939</textcolor>
@@ -38,7 +38,7 @@
<type>button</type>
<id>2</id>
<posX>1390</posX>
- <posY>280</posY>
+ <posY>130</posY>
<width>140</width>
<height>100</height>
<textureFocus>topbar_exit_focus.png</textureFocus>
@@ -58,7 +58,7 @@
<type>label</type>
<id>0</id>
<posX>780</posX>
- <posY>380</posY>
+ <posY>230</posY>
<label>2553</label>
<font>TitanLight12</font>
<textcolor>FF393939</textcolor>
@@ -68,7 +68,7 @@
<type>label</type>
<id>0</id>
<posX>960</posX>
- <posY>380</posY>
+ <posY>230</posY>
<label>19011</label>
<font>TitanLight12</font>
<textcolor>FF393939</textcolor>
@@ -78,7 +78,7 @@
<type>label</type>
<id>0</id>
<posX>1140</posX>
- <posY>380</posY>
+ <posY>230</posY>
<label>732</label>
<font>TitanLight12</font>
<textcolor>FF393939</textcolor>
@@ -88,7 +88,7 @@
<type>label</type>
<id>0</id>
<posX>1330</posX>
- <posY>380</posY>
+ <posY>230</posY>
<label>2552</label>
<font>TitanLight12</font>
<textcolor>FF393939</textcolor>
@@ -101,7 +101,7 @@
<type>label</type>
<id>0</id>
<posX>520</posX>
- <posY>430</posY>
+ <posY>280</posY>
<label>249</label>
<font>TitanLight12</font>
<textcolor>FF393939</textcolor>
@@ -111,10 +111,10 @@
<description>Music started</description>
<id>20</id>
<posX>780</posX>
- <posY>430</posY>
+ <posY>280</posY>
<onleft>23</onleft>
<onright>21</onright>
- <onup>50</onup>
+ <onup>66</onup>
<ondown>25</ondown>
<type>spinbutton</type>
<textureUp>page_up_nofocus.png</textureUp>
@@ -144,8 +144,8 @@
<description>Music paused</description>
<id>21</id>
<posX>960</posX>
- <posY>430</posY>
- <onup>51</onup>
+ <posY>280</posY>
+ <onup>67</onup>
<ondown>26</ondown>
<onleft>20</onleft>
<onright>22</onright>
@@ -177,8 +177,8 @@
<description>Music resumed</description>
<id>22</id>
<posX>1140</posX>
- <posY>430</posY>
- <onup>52</onup>
+ <posY>280</posY>
+ <onup>68</onup>
<ondown>27</ondown>
<onleft>21</onleft>
<onright>23</onright>
@@ -210,7 +210,7 @@
<description>Music stopped</description>
<id>23</id>
<posX>1330</posX>
- <posY>430</posY>
+ <posY>280</posY>
<onup>2</onup>
<ondown>28</ondown>
<onleft>22</onleft>
@@ -245,7 +245,7 @@
<type>label</type>
<id>0</id>
<posX>520</posX>
- <posY>480</posY>
+ <posY>330</posY>
<label>291</label>
<font>TitanLight12</font>
<textcolor>FF393939</textcolor>
@@ -255,7 +255,7 @@
<description>Video start</description>
<id>25</id>
<posX>780</posX>
- <posY>480</posY>
+ <posY>330</posY>
<onup>20</onup>
<ondown>30</ondown>
<onleft>28</onleft>
@@ -288,7 +288,7 @@
<description>Video paused</description>
<id>26</id>
<posX>960</posX>
- <posY>480</posY>
+ <posY>330</posY>
<onup>21</onup>
<ondown>31</ondown>
<onleft>25</onleft>
@@ -321,7 +321,7 @@
<description>Video resumed</description>
<id>27</id>
<posX>1140</posX>
- <posY>480</posY>
+ <posY>330</posY>
<onup>22</onup>
<ondown>32</ondown>
<onleft>26</onleft>
@@ -354,7 +354,7 @@
<description>Video stopped</description>
<id>28</id>
<posX>1330</posX>
- <posY>480</posY>
+ <posY>330</posY>
<onup>23</onup>
<ondown>33</ondown>
<onleft>27</onleft>
@@ -389,7 +389,7 @@
<type>label</type>
<id>0</id>
<posX>520</posX>
- <posY>530</posY>
+ <posY>380</posY>
<label>605</label>
<font>TitanLight12</font>
<textcolor>FF393939</textcolor>
@@ -398,7 +398,7 @@
<description>TV start</description>
<id>30</id>
<posX>780</posX>
- <posY>530</posY>
+ <posY>380</posY>
<onup>25</onup>
<ondown>35</ondown>
<onleft>33</onleft>
@@ -431,7 +431,7 @@
<description>TV paused</description>
<id>31</id>
<posX>960</posX>
- <posY>530</posY>
+ <posY>380</posY>
<onup>26</onup>
<ondown>36</ondown>
<onleft>30</onleft>
@@ -464,7 +464,7 @@
<description>TV resumed</description>
<id>32</id>
<posX>1140</posX>
- <posY>530</posY>
+ <posY>380</posY>
<onup>27</onup>
<ondown>37</ondown>
<onleft>31</onleft>
@@ -497,7 +497,7 @@
<description>TV stopped</description>
<id>33</id>
<posX>1330</posX>
- <posY>530</posY>
+ <posY>380</posY>
<onup>28</onup>
<ondown>38</ondown>
<onleft>32</onleft>
@@ -532,7 +532,7 @@
<type>label</type>
<id>0</id>
<posX>520</posX>
- <posY>580</posY>
+ <posY>430</posY>
<label>652</label>
<font>TitanLight12</font>
<textcolor>FF393939</textcolor>
@@ -541,7 +541,7 @@
<description>Recordings start</description>
<id>35</id>
<posX>780</posX>
- <posY>580</posY>
+ <posY>430</posY>
<onup>30</onup>
<ondown>40</ondown>
<onleft>38</onleft>
@@ -574,7 +574,7 @@
<description>Recordings paused</description>
<id>36</id>
<posX>960</posX>
- <posY>580</posY>
+ <posY>430</posY>
<onup>31</onup>
<ondown>41</ondown>
<onleft>35</onleft>
@@ -607,7 +607,7 @@
<description>Recordings resumed</description>
<id>37</id>
<posX>1140</posX>
- <posY>580</posY>
+ <posY>430</posY>
<onup>32</onup>
<ondown>42</ondown>
<onleft>36</onleft>
@@ -640,7 +640,7 @@
<description>Recordings stopped</description>
<id>38</id>
<posX>1330</posX>
- <posY>580</posY>
+ <posY>430</posY>
<onup>33</onup>
<ondown>43</ondown>
<onleft>37</onleft>
@@ -675,7 +675,7 @@
<type>label</type>
<id>0</id>
<posX>520</posX>
- <posY>630</posY>
+ <posY>480</posY>
<label>862</label>
<font>TitanLight12</font>
<textcolor>FF393939</textcolor>
@@ -684,7 +684,7 @@
<description>Radio start</description>
<id>40</id>
<posX>780</posX>
- <posY>630</posY>
+ <posY>480</posY>
<onup>35</onup>
<ondown>45</ondown>
<onleft>43</onleft>
@@ -717,7 +717,7 @@
<description>Radio paused</description>
<id>41</id>
<posX>960</posX>
- <posY>630</posY>
+ <posY>480</posY>
<onup>36</onup>
<ondown>46</ondown>
<onleft>40</onleft>
@@ -750,7 +750,7 @@
<description>Radio resumed</description>
<id>42</id>
<posX>1140</posX>
- <posY>630</posY>
+ <posY>480</posY>
<onup>37</onup>
<ondown>47</ondown>
<onleft>41</onleft>
@@ -783,7 +783,7 @@
<description>Radio stopped</description>
<id>43</id>
<posX>1330</posX>
- <posY>630</posY>
+ <posY>480</posY>
<onup>38</onup>
<ondown>48</ondown>
<onleft>42</onleft>
@@ -818,7 +818,7 @@
<type>label</type>
<id>0</id>
<posX>520</posX>
- <posY>680</posY>
+ <posY>530</posY>
<label>2014</label>
<font>TitanLight12</font>
<textcolor>FF393939</textcolor>
@@ -827,7 +827,7 @@
<description>Unknown start</description>
<id>45</id>
<posX>780</posX>
- <posY>680</posY>
+ <posY>530</posY>
<onup>40</onup>
<ondown>50</ondown>
<onleft>48</onleft>
@@ -860,7 +860,7 @@
<description>Unknown paused</description>
<id>46</id>
<posX>960</posX>
- <posY>680</posY>
+ <posY>530</posY>
<onup>41</onup>
<ondown>51</ondown>
<onleft>45</onleft>
@@ -893,7 +893,7 @@
<description>Unknown resumed</description>
<id>47</id>
<posX>1140</posX>
- <posY>680</posY>
+ <posY>530</posY>
<onup>42</onup>
<ondown>52</ondown>
<onleft>46</onleft>
@@ -926,9 +926,9 @@
<description>Unknown stopped</description>
<id>48</id>
<posX>1330</posX>
- <posY>680</posY>
+ <posY>530</posY>
<onup>43</onup>
- <ondown>100</ondown>
+ <ondown>64</ondown>
<onleft>47</onleft>
<onright>45</onright>
<type>spinbutton</type>
@@ -961,7 +961,7 @@
<type>label</type>
<id>0</id>
<posX>780</posX>
- <posY>730</posY>
+ <posY>580</posY>
<label>3017</label>
<font>TitanLight12</font>
<textcolor>FF393939</textcolor>
@@ -971,7 +971,7 @@
<type>label</type>
<id>0</id>
<posX>960</posX>
- <posY>730</posY>
+ <posY>580</posY>
<label>1032</label>
<font>TitanLight12</font>
<textcolor>FF393939</textcolor>
@@ -981,7 +981,7 @@
<type>label</type>
<id>0</id>
<posX>1140</posX>
- <posY>730</posY>
+ <posY>580</posY>
<label>1030</label>
<font>TitanLight12</font>
<textcolor>FF393939</textcolor>
@@ -992,7 +992,7 @@
<type>label</type>
<id>0</id>
<posX>520</posX>
- <posY>780</posY>
+ <posY>630</posY>
<label>MediaPortal</label>
<font>TitanLight12</font>
<textcolor>FF393939</textcolor>
@@ -1001,9 +1001,9 @@
<description>MediaPortal start</description>
<id>50</id>
<posX>780</posX>
- <posY>780</posY>
+ <posY>630</posY>
<onup>45</onup>
- <ondown>20</ondown>
+ <ondown>61</ondown>
<onleft>100</onleft>
<onright>51</onright>
<type>spinbutton</type>
@@ -1034,9 +1034,9 @@
<description>MediaPortal Sleep</description>
<id>51</id>
<posX>960</posX>
- <posY>780</posY>
+ <posY>630</posY>
<onup>46</onup>
- <ondown>21</ondown>
+ <ondown>62</ondown>
<onleft>50</onleft>
<onright>52</onright>
<type>spinbutton</type>
@@ -1067,11 +1067,11 @@
<description>MediaPortal Exit</description>
<id>52</id>
<posX>1140</posX>
- <posY>780</posY>
+ <posY>630</posY>
<onup>47</onup>
- <ondown>22</ondown>
+ <ondown>63</ondown>
<onleft>51</onleft>
- <onright>100</onright>
+ <onright>50</onright>
<type>spinbutton</type>
<textureUp>page_up_nofocus.png</textureUp>
<textureDown>page_down_nofocus.png</textureDown>
@@ -1097,12 +1097,460 @@
<animation effect="slide" time="650" start="1200,0">WindowOpen</animation>
</control>
+
<control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>570</posX>
+ <posY>680</posY>
+ <label>Key 0</label>
+ <font>TitanLight12</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>780</posX>
+ <posY>680</posY>
+ <label>Key 1</label>
+ <font>TitanLight12</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>960</posX>
+ <posY>680</posY>
+ <label>Key 2</label>
+ <font>TitanLight12</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>1140</posX>
+ <posY>680</posY>
+ <label>Key 3</label>
+ <font>TitanLight12</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>1330</posX>
+ <posY>680</posY>
+ <label>Key 4</label>
+ <font>TitanLight12</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+
+ <control>
+ <description>Key 0</description>
+ <id>60</id>
+ <posX>570</posX>
+ <posY>720</posY>
+ <onup>65</onup>
+ <ondown>65</ondown>
+ <onleft>64</onleft>
+ <onright>61</onright>
+ <type>spinbutton</type>
+ <textureUp>page_up_nofocus.png</textureUp>
+ <textureDown>page_down_nofocus.png</textureDown>
+ <textureUpFocus>page_up_focus.png</textureUpFocus>
+ <textureDownFocus>page_down_focus.png</textureDownFocus>
+ <textcolor>ff000000</textcolor>
+ <textcolorNofocus>ff393939</textcolorNofocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>40</height>
+ <width>140</width>
+ <font>font10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="450" start="1200,0">WindowOpen</animation>
+ </control>
+ <control>
+ <description>Key 1</description>
+ <id>61</id>
+ <posX>780</posX>
+ <posY>720</posY>
+ <onup>50</onup>
+ <ondown>66</ondown>
+ <onleft>60</onleft>
+ <onright>62</onright>
+ <type>spinbutton</type>
+ <textureUp>page_up_nofocus.png</textureUp>
+ <textureDown>page_down_nofocus.png</textureDown>
+ <textureUpFocus>page_up_focus.png</textureUpFocus>
+ <textureDownFocus>page_down_focus.png</textureDownFocus>
+ <textcolor>ff000000</textcolor>
+ <textcolorNofocus>ff393939</textcolorNofocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>40</height>
+ <width>140</width>
+ <font>font10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="450" start="1200,0">WindowOpen</animation>
+ </control>
+ <control>
+ <description>Key 2</description>
+ <id>62</id>
+ <posX>960</posX>
+ <posY>720</posY>
+ <onup>51</onup>
+ <ondown>67</ondown>
+ <onleft>61</onleft>
+ <onright>63</onright>
+ <type>spinbutton</type>
+ <textureUp>page_up_nofocus.png</textureUp>
+ <textureDown>page_down_nofocus.png</textureDown>
+ <textureUpFocus>page_up_focus.png</textureUpFocus>
+ <textureDownFocus>page_down_focus.png</textureDownFocus>
+ <textcolor>ff000000</textcolor>
+ <textcolorNofocus>ff393939</textcolorNofocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>40</height>
+ <width>140</width>
+ <font>font10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="550" start="1200,0">WindowOpen</animation>
+ </control>
+ <control>
+ <description>Key 3</description>
+ <id>63</id>
+ <posX>1140</posX>
+ <posY>720</posY>
+ <onup>52</onup>
+ <ondown>68</ondown>
+ <onleft>62</onleft>
+ <onright>64</onright>
+ <type>spinbutton</type>
+ <textureUp>page_up_nofocus.png</textureUp>
+ <textureDown>page_down_nofocus.png</textureDown>
+ <textureUpFocus>page_up_focus.png</textureUpFocus>
+ <textureDownFocus>page_down_focus.png</textureDownFocus>
+ <textcolor>ff000000</textcolor>
+ <textcolorNofocus>ff393939</textcolorNofocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>40</height>
+ <width>140</width>
+ <font>font10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="650" start="1200,0">WindowOpen</animation>
+ </control>
+ <control>
+ <description>Key 4</description>
+ <id>64</id>
+ <posX>1330</posX>
+ <posY>720</posY>
+ <onup>48</onup>
+ <ondown>69</ondown>
+ <onleft>63</onleft>
+ <onright>60</onright>
+ <type>spinbutton</type>
+ <textureUp>page_up_nofocus.png</textureUp>
+ <textureDown>page_down_nofocus.png</textureDown>
+ <textureUpFocus>page_up_focus.png</textureUpFocus>
+ <textureDownFocus>page_down_focus.png</textureDownFocus>
+ <textcolor>ff000000</textcolor>
+ <textcolorNofocus>ff393939</textcolorNofocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>40</height>
+ <width>140</width>
+ <font>font10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="750" start="1200,0">WindowOpen</animation>
+ </control>
+
+
+
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>570</posX>
+ <posY>780</posY>
+ <label>Key 5</label>
+ <font>TitanLight12</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>780</posX>
+ <posY>780</posY>
+ <label>Key 6</label>
+ <font>TitanLight12</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>960</posX>
+ <posY>780</posY>
+ <label>Key 7</label>
+ <font>TitanLight12</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>1140</posX>
+ <posY>780</posY>
+ <label>Key 8</label>
+ <font>TitanLight12</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>1330</posX>
+ <posY>780</posY>
+ <label>Key 9</label>
+ <font>TitanLight12</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+
+ <control>
+ <description>Key 5</description>
+ <id>65</id>
+ <posX>570</posX>
+ <posY>820</posY>
+ <onup>60</onup>
+ <ondown>60</ondown>
+ <onleft>69</onleft>
+ <onright>66</onright>
+ <type>spinbutton</type>
+ <textureUp>page_up_nofocus.png</textureUp>
+ <textureDown>page_down_nofocus.png</textureDown>
+ <textureUpFocus>page_up_focus.png</textureUpFocus>
+ <textureDownFocus>page_down_focus.png</textureDownFocus>
+ <textcolor>ff000000</textcolor>
+ <textcolorNofocus>ff393939</textcolorNofocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>40</height>
+ <width>140</width>
+ <font>font10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="450" start="1200,0">WindowOpen</animation>
+ </control>
+ <control>
+ <description>Key 6</description>
+ <id>66</id>
+ <posX>780</posX>
+ <posY>820</posY>
+ <onup>61</onup>
+ <ondown>20</ondown>
+ <onleft>65</onleft>
+ <onright>67</onright>
+ <type>spinbutton</type>
+ <textureUp>page_up_nofocus.png</textureUp>
+ <textureDown>page_down_nofocus.png</textureDown>
+ <textureUpFocus>page_up_focus.png</textureUpFocus>
+ <textureDownFocus>page_down_focus.png</textureDownFocus>
+ <textcolor>ff000000</textcolor>
+ <textcolorNofocus>ff393939</textcolorNofocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>40</height>
+ <width>140</width>
+ <font>font10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="450" start="1200,0">WindowOpen</animation>
+ </control>
+ <control>
+ <description>Key 7</description>
+ <id>67</id>
+ <posX>960</posX>
+ <posY>820</posY>
+ <onup>62</onup>
+ <ondown>21</ondown>
+ <onleft>66</onleft>
+ <onright>68</onright>
+ <type>spinbutton</type>
+ <textureUp>page_up_nofocus.png</textureUp>
+ <textureDown>page_down_nofocus.png</textureDown>
+ <textureUpFocus>page_up_focus.png</textureUpFocus>
+ <textureDownFocus>page_down_focus.png</textureDownFocus>
+ <textcolor>ff000000</textcolor>
+ <textcolorNofocus>ff393939</textcolorNofocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>40</height>
+ <width>140</width>
+ <font>font10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="550" start="1200,0">WindowOpen</animation>
+ </control>
+ <control>
+ <description>Key 8</description>
+ <id>68</id>
+ <posX>1140</posX>
+ <posY>820</posY>
+ <onup>63</onup>
+ <ondown>22</ondown>
+ <onleft>67</onleft>
+ <onright>69</onright>
+ <type>spinbutton</type>
+ <textureUp>page_up_nofocus.png</textureUp>
+ <textureDown>page_down_nofocus.png</textureDown>
+ <textureUpFocus>page_up_focus.png</textureUpFocus>
+ <textureDownFocus>page_down_focus.png</textureDownFocus>
+ <textcolor>ff000000</textcolor>
+ <textcolorNofocus>ff393939</textcolorNofocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>40</height>
+ <width>140</width>
+ <font>font10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="650" start="1200,0">WindowOpen</animation>
+ </control>
+ <control>
+ <description>Key 9</description>
+ <id>69</id>
+ <posX>1330</posX>
+ <posY>820</posY>
+ <onup>64</onup>
+ <ondown>100</ondown>
+ <onleft>68</onleft>
+ <onright>65</onright>
+ <type>spinbutton</type>
+ <textureUp>page_up_nofocus.png</textureUp>
+ <textureDown>page_down_nofocus.png</textureDown>
+ <textureUpFocus>page_up_focus.png</textureUpFocus>
+ <textureDownFocus>page_down_focus.png</textureDownFocus>
+ <textcolor>ff000000</textcolor>
+ <textcolorNofocus>ff393939</textcolorNofocus>
+ <spinWidth>25</spinWidth>
+ <spinHeight>15</spinHeight>
+ <spinalign>left</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>vertical</orientation>
+ <showrange>no</showrange>
+ <cycleItems>yes</cycleItems>
+ <height>40</height>
+ <width>140</width>
+ <font>font10</font>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <animation effect="Zoom" end="110,110" start="100,100" time="100">Focus</animation>
+ <animation effect="Zoom" end="100,100" start="110,110" time="300">UnFocus</animation>
+ <animation effect="slide" time="750" start="1200,0">WindowOpen</animation>
+ </control>
+
+ <control>
+ <description>Direct scene label</description>
+ <type>label</type>
+ <id>0</id>
+ <posX>520</posX>
+ <posY>890</posY>
+ <label>Scene shortcut with: * * numeric key # </label>
+ <font>TitanLight12</font>
+ <textcolor>FF393939</textcolor>
+ </control>
+
+ <control>
<description>Store button</description>
<type>button</type>
<id>100</id>
<posX>1330</posX>
- <posY>820</posY>
+ <posY>890</posY>
<textXOff>5</textXOff>
<textYOff>6</textYOff>
<width>140</width>
@@ -1110,9 +1558,9 @@
<label>190</label>
<textalign>center</textalign>
<textvalign>middle</textvalign>
- <onleft>52</onleft>
- <onright>50</onright>
- <onup>48</onup>
+ <onleft>65</onleft>
+ <onright>69</onright>
+ <onup>69</onup>
<ondown>2</ondown>
<animation effect="fade" time="250">visiblechange</animation>
<animation effect="fade" delay="700" time="250">WindowOpen</animation>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 4866
http://sourceforge.net/p/mp-plugins/code/4866
Author: nicsergio
Date: 2014-07-12 15:35:48 +0000 (Sat, 12 Jul 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/MpeProject/Files/Skin/Black Glass Nova HD/ShortCuter.Navigator.DialogMenu.xml
Modified: trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/MpeProject/Files/Skin/Black Glass Nova HD/ShortCuter.Navigator.DialogMenu.xml
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/MpeProject/Files/Skin/Black Glass Nova HD/ShortCuter.Navigator.DialogMenu.xml 2014-07-12 14:56:54 UTC (rev 4865)
+++ trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/MpeProject/Files/Skin/Black Glass Nova HD/ShortCuter.Navigator.DialogMenu.xml 2014-07-12 15:35:48 UTC (rev 4866)
@@ -80,7 +80,6 @@
<texture>bg_button_vertical.png</texture>
<colordiffuse>c0ffffff</colordiffuse>
</control>
-
<control>
<description>links list</description>
<type>listcontrol</type>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
2 messages has been excluded from this view by a project administrator.
