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: <che...@us...> - 2007-11-04 12:27:38
|
Revision: 1023
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1023&view=rev
Author: chef_koch
Date: 2007-11-04 04:27:37 -0800 (Sun, 04 Nov 2007)
Log Message:
-----------
fixed: context menu used old windowID 9999 for fileinfo
Modified Paths:
--------------
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs
trunk/plugins/myGUIProgramsAlt/README.txt
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs 2007-11-04 12:20:05 UTC (rev 1022)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs 2007-11-04 12:27:37 UTC (rev 1023)
@@ -837,11 +837,12 @@
if (item.MusicTag is FileItem)
{
curFile = (FileItem)item.MusicTag;
- GUIProgramsAltFileInfo fileInfo = (GUIProgramsAltFileInfo)GUIWindowManager.GetWindow(9999);
+ int windowID = ProgramUtils.GetIDFileInfo;
+ GUIProgramsAltFileInfo fileInfo = (GUIProgramsAltFileInfo)GUIWindowManager.GetWindow(windowID);
fileInfo.CurrentFileItem = curFile;
fileInfo.CurrentApplicationItem = currentApplicationItem;
fileInfo.FolderForThumbs = string.Empty;
- GUIWindowManager.ActivateWindow(9999);
+ GUIWindowManager.ActivateWindow(windowID);
}
}
Modified: trunk/plugins/myGUIProgramsAlt/README.txt
===================================================================
--- trunk/plugins/myGUIProgramsAlt/README.txt 2007-11-04 12:20:05 UTC (rev 1022)
+++ trunk/plugins/myGUIProgramsAlt/README.txt 2007-11-04 12:27:37 UTC (rev 1023)
@@ -30,6 +30,13 @@
---------------
-- ChangeLog --
---------------
+
+
+changed: plugin uses now it's own WindowsIDs (not Window.Files anymore) to prevent problems with old MyPrograms PluginName
+fixed: if default title "My Programs Alt." was used, "My Programs" was displayed in GUI
+
+fixed exception when no profiles config file was found
+
2007-10-09: chefkoch : new readme layout
2007-10-09: chefkoch : fixed navigation in bluetwo skin file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2007-11-04 12:20:09
|
Revision: 1022
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1022&view=rev
Author: chef_koch
Date: 2007-11-04 04:20:05 -0800 (Sun, 04 Nov 2007)
Log Message:
-----------
changed: plugin uses now it's own WindowsIDs (not Window.Files anymore) to prevent problems with old MyPrograms PluginName
fixed: if default title "My Programs Alt." was used, "My Programs" was displayed in GUI
Modified Paths:
--------------
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsRoot.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAltFileInfo.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramUtils.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/skin/BlueTwo/myProgramsAlt.xml
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/skin/BlueTwo/myProgramsAltFileInfo.xml
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs 2007-11-04 03:33:14 UTC (rev 1021)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs 2007-11-04 12:20:05 UTC (rev 1022)
@@ -202,17 +202,18 @@
fileDirTextBox.Text = currentApplicationItem.FileDirectory;
}
- if(imageDirsTextBox != null)
+ if (imageDirsTextBox != null)
{
- if (ProgramUtils.UseThumbsDir())
- {
- ProgramUtils.GetApplicationImageFolder(currentApplicationItem);
+ if (ProgramUtils.UseThumbsDir())
+ {
+ MediaPortal.GUI.Library.Log.Debug("MyPrograms::: image folder is parsed now.");
+ ProgramUtils.GetApplicationImageFolder(currentApplicationItem);
+ }
+ else
+ {
+ imageDirsTextBox.Text = currentApplicationItem.ImageDirectory;
+ }
}
- else
- {
- imageDirsTextBox.Text = currentApplicationItem.ImageDirectory;
- }
- }
if (fileExtensionsTextBox != null)
{
fileExtensionsTextBox.Text = currentApplicationItem.ValidExtensions;
@@ -229,7 +230,7 @@
{
mameCatverTextBox.Text = currentApplicationItem.mameCatVerIniPath;
}
-
+
//filePathsLabel.Text = currentApplicationItem.CurrentFilePath().Replace("&", "&&");
}
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsRoot.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsRoot.cs 2007-11-04 03:33:14 UTC (rev 1021)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsRoot.cs 2007-11-04 12:20:05 UTC (rev 1022)
@@ -56,7 +56,6 @@
titleTextBox.Text = dbHandlerInstance.ReadSetting(ProgramUtils.cPLUGINTITLE);
if (titleTextBox.Text == "")
{
- // PluginTitle.Text = GUILocalizeStrings.Get(0);
titleTextBox.Text = ProgramUtils.cDefaultPluginTitle;
}
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs 2007-11-04 03:33:14 UTC (rev 1021)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs 2007-11-04 12:20:05 UTC (rev 1022)
@@ -104,7 +104,7 @@
public GUIProgramsAlt()
{
- GetID = (int)Window.WINDOW_FILES;
+ GetID = ProgramUtils.GetID;
}
#endregion Constructor / Destructor
@@ -1118,8 +1118,9 @@
}
else
{
- strButtonText = GUILocalizeStrings.Get(0);
+ strButtonText = ProgramUtils.cDefaultPluginTitle;
}
+
strButtonImage = "";
strButtonImageFocus = "";
strPictureImage = "";
@@ -1154,7 +1155,7 @@
// get ID of windowplugin belonging to this setup
public int GetWindowId()
{
- return (int)GUIWindow.Window.WINDOW_FILES;
+ return ProgramUtils.GetID;
}
public bool DefaultEnabled()
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAltFileInfo.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAltFileInfo.cs 2007-11-04 03:33:14 UTC (rev 1021)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAltFileInfo.cs 2007-11-04 12:20:05 UTC (rev 1022)
@@ -91,7 +91,7 @@
public GUIProgramsAltFileInfo()
{
- GetID = 9999;
+ GetID = ProgramUtils.GetIDFileInfo;
}
public override bool Init()
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramUtils.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramUtils.cs 2007-11-04 03:33:14 UTC (rev 1021)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramUtils.cs 2007-11-04 12:20:05 UTC (rev 1022)
@@ -55,7 +55,6 @@
{
#region enums
-
public enum Layout
{
List = 0,
@@ -124,8 +123,8 @@
{
#region Variables
- public const int GetID = (int)GUIWindow.Window.WINDOW_FILES;
- public const int ProgramInfoID = 1206; // some magic number, sync with DialogAppInfo.xml
+ public const int GetID = 63228713;
+ public const int GetIDFileInfo = 12058177; // some magic number, sync with DialogAppInfo.xml
public const string cBackLabel = "..";
public const string cDefaultPluginTitle = "My Programs Alt.";
public const int cDefaultSleepTime = 3000;
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/skin/BlueTwo/myProgramsAlt.xml
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/skin/BlueTwo/myProgramsAlt.xml 2007-11-04 03:33:14 UTC (rev 1021)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/skin/BlueTwo/myProgramsAlt.xml 2007-11-04 12:20:05 UTC (rev 1022)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<window>
- <id>3</id>
+ <id>63228713</id>
<defaultcontrol>2</defaultcontrol>
<allowoverlay>yes</allowoverlay>
<define>#header.label:#curheader</define>
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/skin/BlueTwo/myProgramsAltFileInfo.xml
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/skin/BlueTwo/myProgramsAltFileInfo.xml 2007-11-04 03:33:14 UTC (rev 1021)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/skin/BlueTwo/myProgramsAltFileInfo.xml 2007-11-04 12:20:05 UTC (rev 1022)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<window>
- <id>9999</id>
+ <id>12058177</id>
<defaultcontrol>2</defaultcontrol>
<allowoverlay>no</allowoverlay>
<controls>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2007-11-04 03:33:16
|
Revision: 1021
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1021&view=rev
Author: chef_koch
Date: 2007-11-03 20:33:14 -0700 (Sat, 03 Nov 2007)
Log Message:
-----------
fixed exception when no profiles config file was found
Modified Paths:
--------------
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsBase.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/MameImport.cs
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs 2007-11-03 15:21:08 UTC (rev 1020)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppFilesView.cs 2007-11-04 03:33:14 UTC (rev 1021)
@@ -32,7 +32,8 @@
using System.Text;
using System.Windows.Forms;
-using Core.Util;
+using MediaPortal.Util;
+
using GUIProgramsAlt;
using GUIProgramsAlt.Items;
using GUIProgramsAlt.Database;
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.cs 2007-11-03 15:21:08 UTC (rev 1020)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.cs 2007-11-04 03:33:14 UTC (rev 1021)
@@ -32,12 +32,13 @@
using System.IO;
using System.Text;
using System.Windows.Forms;
-using Core.Util;
+using MediaPortal.Util;
+using MediaPortal.Configuration;
+
using GUIProgramsAlt;
using GUIProgramsAlt.Items;
using GUIProgramsAlt.Database;
-using MediaPortal.Configuration;
namespace GUIProgramsAlt.Design
{
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.cs 2007-11-03 15:21:08 UTC (rev 1020)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileDetailsForm.cs 2007-11-04 03:33:14 UTC (rev 1021)
@@ -29,8 +29,9 @@
using System.Diagnostics;
using System.IO;
using System.Windows.Forms;
-using Core.Util;
+using MediaPortal.Util;
+
using GUIProgramsAlt;
using GUIProgramsAlt.Items;
using GUIProgramsAlt.Database;
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsBase.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsBase.cs 2007-11-03 15:21:08 UTC (rev 1020)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SettingsBase.cs 2007-11-04 03:33:14 UTC (rev 1021)
@@ -32,12 +32,13 @@
using System.IO;
using System.Text;
using System.Windows.Forms;
-using Core.Util;
+using MediaPortal.Util;
+using MediaPortal.GUI.Library;
+
using GUIProgramsAlt;
using GUIProgramsAlt.Items;
using GUIProgramsAlt.Database;
-using MediaPortal.GUI.Library;
namespace GUIProgramsAlt.Design
{
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs 2007-11-03 15:21:08 UTC (rev 1020)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/SetupForm.cs 2007-11-04 03:33:14 UTC (rev 1021)
@@ -546,14 +546,16 @@
private void FillProfileMenu()
{
+ if (profilesIsLoaded) return;
int id = 0;
string titleNode = string.Empty;
+ string profilesFile = Config.GetFile(Config.Dir.Config, "myProgramsAltPreconfiguration.xml");
+
+ this.emulatorSetupToolStripMenuItem.DropDownItems.Clear();
- if (!profilesIsLoaded)
+ if (File.Exists(profilesFile))
{
- this.emulatorSetupToolStripMenuItem.DropDownItems.Clear();
-
XmlDocument document = new XmlDocument();
document.Load(Config.GetFile(Config.Dir.Config, "myProgramsAltPreconfiguration.xml"));
XmlElement rootElement = document.DocumentElement;
@@ -588,6 +590,10 @@
profilesIsLoaded = true;
}
+ else
+ {
+ Log.Warn("myPrograms: ProfilesFile (myProgramsAltPreconfiguration.xml) was not found. To get the profiles back, reinstall the plugin.");
+ }
}
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/MameImport.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/MameImport.cs 2007-11-03 15:21:08 UTC (rev 1020)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Imports/MameImport.cs 2007-11-04 03:33:14 UTC (rev 1021)
@@ -29,18 +29,17 @@
using System.Collections.Specialized;
using System.Diagnostics;
using System.IO;
-using Core.Util;
-using MediaPortal.GUI.Library;
using System.Data.SQLite;
using System.Text.RegularExpressions;
using System.Text;
-using GUIProgramsAlt.Items;
+using MediaPortal.Util;
+using MediaPortal.GUI.Library;
+
using GUIProgramsAlt;
+using GUIProgramsAlt.Items;
using GUIProgramsAlt.Database;
-
-
namespace GUIProgramsAlt.Imports
{
/// <summary>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mis...@us...> - 2007-11-03 15:21:10
|
Revision: 1020
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1020&view=rev
Author: misterd_sf
Date: 2007-11-03 08:21:08 -0700 (Sat, 03 Nov 2007)
Log Message:
-----------
Fixed external osd was displayed, even when playing music
Fixed playlist handling
Added possibility to treat playlist as folders
Modified Paths:
--------------
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.Designer.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.Designer.cs
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationPanel/GUIConfiguration.Designer.cs
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationPanel/GUIConfiguration.cs
trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs 2007-11-03 12:48:07 UTC (rev 1019)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs 2007-11-03 15:21:08 UTC (rev 1020)
@@ -815,13 +815,51 @@
#region public methods
/// <summary>
+ /// Checks if the fileName has a video or not
+ /// </summary>
+ /// <param name="fileName">Filename to check</param>
+ /// <returns>true, when file or stream has a video</returns>
+ public bool HasFileOrStreamVideo(String fileName) {
+ bool isVideo = false;
+ if (fileName.StartsWith("dvd://")) {
+ isVideo = true;
+ } else if (fileName.StartsWith("vcd://")) {
+ isVideo = true;
+ } else if (fileName.StartsWith("svcd://")) {
+ isVideo = true;
+ } else if (fileName.StartsWith("cue://") ||
+ fileName.StartsWith("ftp://") ||
+ fileName.StartsWith("http://") ||
+ fileName.StartsWith("http_proxy://") ||
+ fileName.StartsWith("mms://") ||
+ fileName.StartsWith("mmst://") ||
+ fileName.StartsWith("mpst://") ||
+ fileName.StartsWith("rtp://") ||
+ fileName.StartsWith("rtsp://") ||
+ fileName.StartsWith("sdp://") ||
+ fileName.StartsWith("udp://") ||
+ fileName.StartsWith("unsv://")) {
+ if (_extensionSettings.ContainsKey(System.IO.Path.GetExtension(fileName))) {
+ isVideo = _extensionSettings[System.IO.Path.GetExtension(fileName)].PlayMode == PlayMode.Video;
+ } else {
+ isVideo = true;
+ }
+ } else if (fileName.EndsWith(".cda")) {
+ isVideo = false;
+ } else {
+ ExtensionSettings extSettings = _extensionSettings[System.IO.Path.GetExtension(fileName).Trim().ToLower()];
+ isVideo = (extSettings.PlayMode == PlayMode.Video);
+ }
+ return isVideo;
+ }
+
+ /// <summary>
/// Creates a process object and sets the starting arguments
/// </summary>
/// <param name="fileName">FileName that should be started</param>
/// <param name="handle">Handle of inner panel</param>
- /// <param name="isVideo">Boolean for indicating if file is video</param>
/// <returns>UpdateGUI object</returns>
- public Process createProcessForFileName(String fileName, IntPtr handle, out bool isVideo) {
+ public Process createProcessForFileName(String fileName, IntPtr handle) {
Process mplayerProcess = new Process();
mplayerProcess.StartInfo.UseShellExecute = false;
mplayerProcess.StartInfo.RedirectStandardInput = true;
@@ -840,21 +878,18 @@
arguments.Append(" -slang ");
arguments.Append(CultureInfo.CurrentCulture.TwoLetterISOLanguageName);
arguments.Append(" dvd://");
- isVideo = true;
} else if (fileName.StartsWith("vcd://")) {
String file = fileName.Substring(6);
arguments.Append(_extensionSettings["vcd://"].Arguments);
arguments.Append(" \"vcd://");
arguments.Append(file);
arguments.Append("\"");
- isVideo = true;
} else if (fileName.StartsWith("svcd://")) {
String file = fileName.Substring(7);
arguments.Append(_extensionSettings["svcd://"].Arguments);
arguments.Append(" \"vcd://");
arguments.Append(file);
arguments.Append("\"");
- isVideo = true;
} else if (fileName.StartsWith("cue://") ||
fileName.StartsWith("ftp://") ||
fileName.StartsWith("http://") ||
@@ -875,9 +910,6 @@
arguments.Append(_extensionSettings[protocol].Arguments);
if (_extensionSettings.ContainsKey(System.IO.Path.GetExtension(fileName))) {
arguments.Append(_extensionSettings[System.IO.Path.GetExtension(fileName)].Arguments);
- isVideo = _extensionSettings[System.IO.Path.GetExtension(fileName)].PlayMode == PlayMode.Video;
- } else {
- isVideo = true;
}
arguments.Append(" \"");
arguments.Append(protocol);
@@ -895,14 +927,12 @@
arguments.Append(" -cdrom-device ");
arguments.Append(drive);
arguments.Append(" ");
- isVideo = false;
} else {
ExtensionSettings extSettings = _extensionSettings[System.IO.Path.GetExtension(fileName).Trim().ToLower()];
arguments.Append(extSettings.Arguments);
arguments.Append(" \"");
arguments.Append(fileName);
arguments.Append("\" ");
- isVideo = (extSettings.PlayMode == PlayMode.Video);
}
arguments.Append(getScreenArguments());
Log.Info("MPlayer: All Arguments: " + arguments);
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.Designer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.Designer.cs 2007-11-03 12:48:07 UTC (rev 1019)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.Designer.cs 2007-11-03 15:21:08 UTC (rev 1020)
@@ -202,10 +202,10 @@
this.externalOSDLibraryBlank.CheckState = System.Windows.Forms.CheckState.Checked;
this.externalOSDLibraryBlank.Location = new System.Drawing.Point(6, 31);
this.externalOSDLibraryBlank.Name = "externalOSDLibraryBlank";
- this.externalOSDLibraryBlank.Size = new System.Drawing.Size(345, 30);
+ this.externalOSDLibraryBlank.Size = new System.Drawing.Size(354, 30);
this.externalOSDLibraryBlank.TabIndex = 0;
- this.externalOSDLibraryBlank.Text = "Blank screen in fullscreen\r\n(If you see black screen in fullscreen, you should tu" +
- "rn this option off)";
+ this.externalOSDLibraryBlank.Text = "Blank screen in fullscreen\r\n(If you see a black screen in fullscreen, you should " +
+ "turn this option off)";
this.externalOSDLibraryBlank.UseVisualStyleBackColor = true;
//
// GeneralSection
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs 2007-11-03 12:48:07 UTC (rev 1019)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/MPlayer_ExtPlayer.cs 2007-11-03 15:21:08 UTC (rev 1020)
@@ -218,16 +218,16 @@
bool result;
bool controlAdded = false;
try {
- initSystem();
if (strFile.EndsWith(".mplayer")) {
strFile = strFile.Remove(strFile.LastIndexOf(".mplayer"));
}
if (strFile.StartsWith("ZZZZ:")) {
strFile = "rtsp:" + strFile.Remove(0, 5);
}
+ bool isVideo = _configManager.HasFileOrStreamVideo(strFile);
+ initSystem(isVideo);
_currentFile = strFile;
- bool isVideo;
- _mplayerProcess = _configManager.createProcessForFileName(strFile, _videoHandler.GetVideoHandle(), out isVideo);
+ _mplayerProcess = _configManager.createProcessForFileName(strFile, _videoHandler.GetVideoHandle());
_videoHandler.HasVideo = isVideo;
if (isVideo) {
_isVisible = true;
@@ -407,9 +407,10 @@
/// <summary>
/// Initialize the system (Objects, Controls etc.)
/// </summary>
- private void initSystem() {
+ /// <param name="isVideo">Ind\xEDcate if the file has video</param>
+ private void initSystem(bool isVideo) {
_playState = PlayState.Playing;
- if (_configManager.OsdMode == OSDMode.InternalMPlayer) {
+ if (_configManager.OsdMode == OSDMode.InternalMPlayer || !isVideo) {
_osdHandler = new InternalOSDHandler(this,true);
} else if (_configManager.OsdMode == OSDMode.ExternalOSDLibrary) {
_osdHandler = new ExternalOSDLibrary(this);
Modified: trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.Designer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.Designer.cs 2007-11-03 12:48:07 UTC (rev 1019)
+++ trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.Designer.cs 2007-11-03 15:21:08 UTC (rev 1020)
@@ -53,7 +53,7 @@
//
// okButton
//
- this.okButton.Location = new System.Drawing.Point(12, 307);
+ this.okButton.Location = new System.Drawing.Point(12, 330);
this.okButton.Name = "okButton";
this.okButton.Size = new System.Drawing.Size(75, 23);
this.okButton.TabIndex = 3;
@@ -64,7 +64,7 @@
// cancelButton
//
this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.cancelButton.Location = new System.Drawing.Point(334, 307);
+ this.cancelButton.Location = new System.Drawing.Point(334, 330);
this.cancelButton.Name = "cancelButton";
this.cancelButton.Size = new System.Drawing.Size(75, 23);
this.cancelButton.TabIndex = 20;
@@ -77,13 +77,13 @@
this.guiConfiguration1.BackColor = System.Drawing.Color.Transparent;
this.guiConfiguration1.Location = new System.Drawing.Point(12, 5);
this.guiConfiguration1.Name = "guiConfiguration1";
- this.guiConfiguration1.Size = new System.Drawing.Size(402, 296);
+ this.guiConfiguration1.Size = new System.Drawing.Size(402, 319);
this.guiConfiguration1.TabIndex = 21;
//
// ConfigurationForm
//
this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
- this.ClientSize = new System.Drawing.Size(421, 343);
+ this.ClientSize = new System.Drawing.Size(421, 367);
this.Controls.Add(this.guiConfiguration1);
this.Controls.Add(this.cancelButton);
this.Controls.Add(this.okButton);
Modified: trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationPanel/GUIConfiguration.Designer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationPanel/GUIConfiguration.Designer.cs 2007-11-03 12:48:07 UTC (rev 1019)
+++ trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationPanel/GUIConfiguration.Designer.cs 2007-11-03 15:21:08 UTC (rev 1020)
@@ -38,6 +38,7 @@
this.pluginName = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
+ this.playlistFolder = new System.Windows.Forms.CheckBox();
this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
@@ -183,18 +184,29 @@
//
this.folderBrowserDialog1.Description = "Select the recording folder:";
//
+ // playlistFolder
+ //
+ this.playlistFolder.AutoSize = true;
+ this.playlistFolder.Location = new System.Drawing.Point(7, 292);
+ this.playlistFolder.Name = "playlistFolder";
+ this.playlistFolder.Size = new System.Drawing.Size(139, 17);
+ this.playlistFolder.TabIndex = 46;
+ this.playlistFolder.Text = "Treat Playlists as folders";
+ this.playlistFolder.UseVisualStyleBackColor = true;
+ //
// GUIConfiguration
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.Transparent;
+ this.Controls.Add(this.playlistFolder);
this.Controls.Add(this.myMusicShare);
this.Controls.Add(this.myVideoShare);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.pluginName);
this.Controls.Add(this.label2);
this.Name = "GUIConfiguration";
- this.Size = new System.Drawing.Size(402, 296);
+ this.Size = new System.Drawing.Size(402, 322);
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.ResumeLayout(false);
@@ -219,5 +231,6 @@
private System.Windows.Forms.TextBox pluginName;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1;
+ private System.Windows.Forms.CheckBox playlistFolder;
}
}
Modified: trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationPanel/GUIConfiguration.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationPanel/GUIConfiguration.cs 2007-11-03 12:48:07 UTC (rev 1019)
+++ trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationPanel/GUIConfiguration.cs 2007-11-03 15:21:08 UTC (rev 1020)
@@ -149,6 +149,7 @@
pluginName.Text = xmlreader.GetValueAsString("mplayer", "displayNameOfGUI", "My MPlayer GUI");
myVideoShare.Checked = xmlreader.GetValueAsBool("mplayer", "useMyVideoShares", true);
myMusicShare.Checked = xmlreader.GetValueAsBool("mplayer", "useMyMusicShares", true);
+ playlistFolder.Checked = xmlreader.GetValueAsBool("mplayer", "treatPlaylistAsFolders", false);
}
} catch (Exception e) {
Log.Info("MPlayer GUI Error: Configuration could not be loaded: " + e.Message);
@@ -187,6 +188,7 @@
}
xmlWriter.SetValueAsBool("mplayer", "useMyMusicShares", myMusicShare.Checked);
xmlWriter.SetValueAsBool("mplayer", "useMyVideoShares", myVideoShare.Checked);
+ xmlWriter.SetValueAsBool("mplayer", "treatPlaylistAsFolders", playlistFolder.Checked);
}
}
#endregion
Modified: trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs 2007-11-03 12:48:07 UTC (rev 1019)
+++ trunk/plugins/My MPlayer/MPlayer_GUIPlugin/MPlayer_GUIPlugin.cs 2007-11-03 15:21:08 UTC (rev 1020)
@@ -145,18 +145,26 @@
/// Display name of the plugin
/// </summary>
private string displayName;
+
/// <summary>
/// Indicates if the my video Shares are used
/// </summary>
private bool useMyVideoShares;
+
/// <summary>
/// Indicates if the my music Shares are used
/// </summary>
private bool useMyMusicShares;
+
/// <summary>
/// List of path of all shares
/// </summary>
private List<String> sharePaths;
+
+ /// <summary>
+ /// Indicates if playlists should be treat as folders
+ /// </summary>
+ private bool treatPlaylistsAsFolders;
#endregion
#region ctor
@@ -177,6 +185,7 @@
displayName = xmlreader.GetValueAsString("mplayer", "displayNameOfGUI", "My MPlayer");
useMyVideoShares = xmlreader.GetValueAsBool("mplayer", "useMyVideoShares", true);
useMyMusicShares = xmlreader.GetValueAsBool("mplayer", "useMyMusicShares", true);
+ treatPlaylistsAsFolders = xmlreader.GetValueAsBool("mplayer", "treatPlaylistAsFolders", false);
String m_strLanguage = xmlreader.GetValueAsString("skin", "language", "English");
LocalizeStrings.Load(m_strLanguage);
}
@@ -449,15 +458,15 @@
virtualPath = path;
LoadDirectory(path);
} else {
+ if (PlayListFactory.IsPlayList(path)) {
+ LoadPlayList(path);
+ return;
+ }
string movieFileName = path + ".mplayer";
if (movieFileName.StartsWith("rtsp:")) {
movieFileName = "ZZZZ:" + movieFileName.Remove(0, 5);
}
movieFileName = m_directory.GetLocalFilename(movieFileName);
- if (PlayListFactory.IsPlayList(movieFileName)) {
- LoadPlayList(movieFileName);
- return;
- }
g_Player.Play(movieFileName);
if (g_Player.IsVideo) {
GUIGraphicsContext.IsFullScreenVideo = true;
@@ -544,9 +553,9 @@
}
CurrentSortAsc = true;
OnSort();
- GUIControl.SetControlLabel(GetID, btnPlayStream.GetID,LocalizeStrings.Get((int)LocalizedMessages.PlayStream));
+ GUIControl.SetControlLabel(GetID, btnPlayStream.GetID, LocalizeStrings.Get((int)LocalizedMessages.PlayStream));
GUIControl.SetControlLabel(GetID, btnPlayDisc.GetID, LocalizeStrings.Get((int)LocalizedMessages.PlayDisc));
- GUIControl.SetControlLabel(GetID, btnDelete.GetID, LocalizeStrings.Get((int)LocalizedMessages.Delete));
+ GUIControl.SetControlLabel(GetID, btnDelete.GetID, LocalizeStrings.Get((int)LocalizedMessages.Delete));
}
/// <summary>
@@ -583,10 +592,13 @@
}
return;
}
-
if (playlist.Count == 1) {
- if (g_Player.Play(playlist[0].FileName + ".mplayer")) {
- if (MediaPortal.Util.Utils.IsVideo(playlist[0].FileName)) {
+ string movieFileName = playlist[0].FileName + ".mplayer";
+ if (movieFileName.StartsWith("rtsp:")) {
+ movieFileName = "ZZZZ:" + movieFileName.Remove(0, 5);
+ }
+ if (g_Player.Play(movieFileName)) {
+ if (g_Player.Player != null && g_Player.IsVideo) {
GUIGraphicsContext.IsFullScreenVideo = true;
GUIWindowManager.ActivateWindow((int)GUIWindow.Window.WINDOW_FULLSCREEN_VIDEO);
}
@@ -597,8 +609,13 @@
playlistPlayer.GetPlaylist(PlayListType.PLAYLIST_VIDEO).Clear();
for (int i = 0; i < playlist.Count; ++i) {
- playlist[i].FileName += ".mplayer";
+ string movieFileName = playlist[i].FileName + ".mplayer";
+ if (movieFileName.StartsWith("rtsp:")) {
+ movieFileName = "ZZZZ:" + movieFileName.Remove(0, 5);
+ }
+ playlist[i].FileName = movieFileName;
PlayListItem playListItem = playlist[i];
+ playListItem.Type = PlayListItem.PlayListItemType.Unknown;
playlistPlayer.GetPlaylist(PlayListType.PLAYLIST_VIDEO).Add(playListItem);
}
@@ -606,13 +623,13 @@
if (playlistPlayer.GetPlaylist(PlayListType.PLAYLIST_VIDEO).Count > 0) {
playlist = playlistPlayer.GetPlaylist(PlayListType.PLAYLIST_VIDEO);
PlayListItem item = playlist[0];
-
playlistPlayer.CurrentPlaylistType = PlayListType.PLAYLIST_VIDEO;
playlistPlayer.Reset();
playlistPlayer.Play(0);
- if (GetID == GUIWindowManager.ActiveWindow) {
- GUIWindowManager.ActivateWindow((int)GUIWindow.Window.WINDOW_VIDEO_PLAYLIST);
+ if (g_Player.Player != null && g_Player.IsVideo) {
+ GUIGraphicsContext.IsFullScreenVideo = true;
+ GUIWindowManager.ActivateWindow((int)GUIWindow.Window.WINDOW_FULLSCREEN_VIDEO);
}
}
}
@@ -641,7 +658,7 @@
if (String.Compare(item1.Path, item2.Path, true) > 0) {
addItem = false;
// Update to reflect the stacked size
- item2.FileInfo.Length += item1.FileInfo.Length;
+ item1.FileInfo.Length += item2.FileInfo.Length;
}
}
}
@@ -654,11 +671,32 @@
MediaPortal.Util.Utils.RemoveStackEndings(ref label);
item1.Label = label;
+ if (treatPlaylistsAsFolders && PlayListFactory.IsPlayList(item1.Path)) {
+ item1.IsFolder = true;
+ Utils.SetDefaultIcons(item1);
+ }
itemfiltered.Add(item1);
}
}
itemlist = itemfiltered;
+ if (treatPlaylistsAsFolders && PlayListFactory.IsPlayList(newFolderName)) {
+ IPlayListIO loader = PlayListFactory.CreateIO(newFolderName);
+ PlayList playlist = new PlayList();
+
+ if (loader.Load(playlist, newFolderName)) {
+ GUIListItem item;
+ foreach (PlayListItem plItem in playlist) {
+ item = new GUIListItem();
+ item.Path = plItem.FileName;
+ item.Label = plItem.Description;
+ item.IsFolder = false;
+ Utils.SetDefaultIcons(item);
+ itemlist.Add(item);
+ }
+ }
+ }
+
foreach (GUIListItem item in itemlist) {
facadeView.Add(item);
}
@@ -752,6 +790,9 @@
private void initializeVirtualDirectory() {
sharePaths = new List<string>();
m_directory.SetExtensions(getExtenstions());
+ m_directory.AddExtension(".pls");
+ m_directory.AddExtension(".m3u");
+
m_directory.Clear();
if (useMyVideoShares) {
AddSection("movies");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2007-11-03 12:48:09
|
Revision: 1019
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1019&view=rev
Author: and-81
Date: 2007-11-03 05:48:07 -0700 (Sat, 03 Nov 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MCEReplacement/Forms/LearnIR.cs
trunk/plugins/MCEReplacement/Forms/MacroEditor.cs
trunk/plugins/MCEReplacement/Forms/SetupForm.cs
trunk/plugins/MCEReplacement/InputMapper/InputHandler.cs
trunk/plugins/MCEReplacement/MCEReplacement.cs
Modified: trunk/plugins/MCEReplacement/Forms/LearnIR.cs
===================================================================
--- trunk/plugins/MCEReplacement/Forms/LearnIR.cs 2007-11-03 12:41:55 UTC (rev 1018)
+++ trunk/plugins/MCEReplacement/Forms/LearnIR.cs 2007-11-03 12:48:07 UTC (rev 1019)
@@ -90,7 +90,7 @@
string fileName = MCEReplacement.IRFolder + name + Common.FileExtensionIR;
- IRServerPluginInterface.LearnStatus status = MCEReplacement.LearnIRCommand(fileName);
+ IRServerPluginInterface.LearnStatus status = MCEReplacement.LearnIR(fileName);
switch (status)
{
Modified: trunk/plugins/MCEReplacement/Forms/MacroEditor.cs
===================================================================
--- trunk/plugins/MCEReplacement/Forms/MacroEditor.cs 2007-11-03 12:41:55 UTC (rev 1018)
+++ trunk/plugins/MCEReplacement/Forms/MacroEditor.cs 2007-11-03 12:48:07 UTC (rev 1019)
@@ -32,7 +32,7 @@
{
InitializeComponent();
- textBoxName.Text = "New";
+ textBoxName.Text = "New";
textBoxName.Enabled = true;
}
@@ -65,7 +65,10 @@
comboBoxCommands.Items.Add(Common.UITextPause);
comboBoxCommands.Items.Add(Common.UITextSerial);
comboBoxCommands.Items.Add(Common.UITextWindowMsg);
+ comboBoxCommands.Items.Add(Common.UITextTcpMsg);
comboBoxCommands.Items.Add(Common.UITextKeys);
+ comboBoxCommands.Items.Add(Common.UITextMouse);
+ comboBoxCommands.Items.Add(Common.UITextEject);
comboBoxCommands.Items.Add(Common.UITextGoto);
comboBoxCommands.Items.Add(Common.UITextPopup);
comboBoxCommands.Items.Add(Common.UITextMultiMap);
@@ -139,11 +142,26 @@
writer.WriteAttributeString("command", Common.XmlTagWindowMsg);
writer.WriteAttributeString("cmdproperty", item.Substring(Common.CmdPrefixWindowMsg.Length));
}
+ else if (item.StartsWith(Common.CmdPrefixTcpMsg))
+ {
+ writer.WriteAttributeString("command", Common.XmlTagTcpMsg);
+ writer.WriteAttributeString("cmdproperty", item.Substring(Common.CmdPrefixTcpMsg.Length));
+ }
else if (item.StartsWith(Common.CmdPrefixKeys))
{
writer.WriteAttributeString("command", Common.XmlTagKeys);
writer.WriteAttributeString("cmdproperty", item.Substring(Common.CmdPrefixKeys.Length));
}
+ else if (item.StartsWith(Common.CmdPrefixMouse))
+ {
+ writer.WriteAttributeString("command", Common.XmlTagMouse);
+ writer.WriteAttributeString("cmdproperty", item.Substring(Common.CmdPrefixMouse.Length));
+ }
+ else if (item.StartsWith(Common.CmdPrefixEject))
+ {
+ writer.WriteAttributeString("command", Common.XmlTagEject);
+ writer.WriteAttributeString("cmdproperty", item.Substring(Common.CmdPrefixEject.Length));
+ }
else if (item.StartsWith(Common.CmdPrefixPopup))
{
writer.WriteAttributeString("command", Common.XmlTagPopup);
@@ -265,10 +283,22 @@
listBoxMacro.Items.Add(Common.CmdPrefixWindowMsg + commandProperty);
break;
+ case Common.XmlTagTcpMsg:
+ listBoxMacro.Items.Add(Common.CmdPrefixTcpMsg + commandProperty);
+ break;
+
case Common.XmlTagKeys:
listBoxMacro.Items.Add(Common.CmdPrefixKeys + commandProperty);
break;
+ case Common.XmlTagMouse:
+ listBoxMacro.Items.Add(Common.CmdPrefixMouse + commandProperty);
+ break;
+
+ case Common.XmlTagEject:
+ listBoxMacro.Items.Add(Common.CmdPrefixEject + commandProperty);
+ break;
+
case Common.XmlTagGoto:
listBoxMacro.Items.Add(Common.CmdPrefixGoto + commandProperty);
break;
@@ -361,12 +391,32 @@
if (messageCommand.ShowDialog(this) == DialogResult.OK)
listBoxMacro.Items.Add(Common.CmdPrefixWindowMsg + messageCommand.CommandString);
}
+ else if (selected == Common.UITextTcpMsg)
+ {
+ TcpMessageCommand tcpMessageCommand = new TcpMessageCommand();
+ if (tcpMessageCommand.ShowDialog(this) == DialogResult.Cancel)
+ return;
+
+ listBoxMacro.Items.Add(Common.CmdPrefixTcpMsg + tcpMessageCommand.CommandString);
+ }
else if (selected == Common.UITextKeys)
{
KeysCommand keysCommand = new KeysCommand();
if (keysCommand.ShowDialog(this) == DialogResult.OK)
listBoxMacro.Items.Add(Common.CmdPrefixKeys + keysCommand.CommandString);
}
+ else if (selected == Common.UITextMouse)
+ {
+ MouseCommand mouseCommand = new MouseCommand();
+ if (mouseCommand.ShowDialog(this) == DialogResult.OK)
+ listBoxMacro.Items.Add(Common.CmdPrefixMouse + mouseCommand.CommandString);
+ }
+ else if (selected == Common.UITextEject)
+ {
+ EjectCommand ejectCommand = new EjectCommand();
+ if (ejectCommand.ShowDialog(this) == DialogResult.OK)
+ listBoxMacro.Items.Add(Common.CmdPrefixEject + ejectCommand.CommandString);
+ }
else if (selected == Common.UITextGoto)
{
GoToScreen goToScreen = new GoToScreen();
@@ -381,18 +431,10 @@
}
else if (selected == Common.UITextMultiMap)
{
- //SelectBlasterSpeed selectBlasterSpeed = new SelectBlasterSpeed(_blastSpeed);
- //if (selectBlasterSpeed.ShowDialog(this) == DialogResult.Cancel)
- //return;
-
listBoxMacro.Items.Add(Common.CmdPrefixMultiMap + "TOGGLE");
}
else if (selected == Common.UITextMouseMode)
{
- //SelectBlasterSpeed selectBlasterSpeed = new SelectBlasterSpeed(_blastSpeed);
- //if (selectBlasterSpeed.ShowDialog(this) == DialogResult.Cancel)
- //return;
-
listBoxMacro.Items.Add(Common.CmdPrefixMouseMode + "TOGGLE");
}
else if (selected == Common.UITextInputLayer)
@@ -524,6 +566,7 @@
if (name.Length == 0)
{
MessageBox.Show(this, "You must supply a name for this Macro", "Name missing", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+ textBoxName.Focus();
return;
}
@@ -599,6 +642,18 @@
listBoxMacro.Items.Insert(index, Common.CmdPrefixWindowMsg + messageCommand.CommandString);
listBoxMacro.SelectedIndex = index;
}
+ else if (selected.StartsWith(Common.CmdPrefixTcpMsg))
+ {
+ string[] commands = Common.SplitTcpMessageCommand(selected.Substring(Common.CmdPrefixTcpMsg.Length));
+ TcpMessageCommand tcpMessageCommand = new TcpMessageCommand(commands);
+ if (tcpMessageCommand.ShowDialog(this) == DialogResult.Cancel)
+ return;
+
+ int index = listBoxMacro.SelectedIndex;
+ listBoxMacro.Items.RemoveAt(index);
+ listBoxMacro.Items.Insert(index, Common.CmdPrefixTcpMsg + tcpMessageCommand.CommandString);
+ listBoxMacro.SelectedIndex = index;
+ }
else if (selected.StartsWith(Common.CmdPrefixKeys))
{
KeysCommand keysCommand = new KeysCommand(selected.Substring(Common.CmdPrefixKeys.Length));
@@ -610,6 +665,28 @@
listBoxMacro.Items.Insert(index, Common.CmdPrefixKeys + keysCommand.CommandString);
listBoxMacro.SelectedIndex = index;
}
+ else if (selected.StartsWith(Common.CmdPrefixMouse))
+ {
+ MouseCommand mouseCommand = new MouseCommand(selected.Substring(Common.CmdPrefixMouse.Length));
+ if (mouseCommand.ShowDialog(this) == DialogResult.Cancel)
+ return;
+
+ int index = listBoxMacro.SelectedIndex;
+ listBoxMacro.Items.RemoveAt(index);
+ listBoxMacro.Items.Insert(index, Common.CmdPrefixMouse + mouseCommand.CommandString);
+ listBoxMacro.SelectedIndex = index;
+ }
+ else if (selected.StartsWith(Common.CmdPrefixEject))
+ {
+ EjectCommand ejectCommand = new EjectCommand(selected.Substring(Common.CmdPrefixEject.Length));
+ if (ejectCommand.ShowDialog(this) == DialogResult.Cancel)
+ return;
+
+ int index = listBoxMacro.SelectedIndex;
+ listBoxMacro.Items.RemoveAt(index);
+ listBoxMacro.Items.Insert(index, Common.CmdPrefixEject + ejectCommand.CommandString);
+ listBoxMacro.SelectedIndex = index;
+ }
else if (selected.StartsWith(Common.CmdPrefixGoto))
{
GoToScreen goToScreen = new GoToScreen(selected.Substring(Common.CmdPrefixGoto.Length));
Modified: trunk/plugins/MCEReplacement/Forms/SetupForm.cs
===================================================================
--- trunk/plugins/MCEReplacement/Forms/SetupForm.cs 2007-11-03 12:41:55 UTC (rev 1018)
+++ trunk/plugins/MCEReplacement/Forms/SetupForm.cs 2007-11-03 12:48:07 UTC (rev 1019)
@@ -194,8 +194,16 @@
comboBoxCommands.Items.Add(Common.UITextRun);
comboBoxCommands.Items.Add(Common.UITextSerial);
comboBoxCommands.Items.Add(Common.UITextWindowMsg);
+ comboBoxCommands.Items.Add(Common.UITextTcpMsg);
comboBoxCommands.Items.Add(Common.UITextKeys);
+ comboBoxCommands.Items.Add(Common.UITextEject);
comboBoxCommands.Items.Add(Common.UITextGoto);
+ //comboBoxCommands.Items.Add(Common.UITextWindowState);
+ comboBoxCommands.Items.Add(Common.UITextExit);
+ comboBoxCommands.Items.Add(Common.UITextStandby);
+ comboBoxCommands.Items.Add(Common.UITextHibernate);
+ comboBoxCommands.Items.Add(Common.UITextReboot);
+ comboBoxCommands.Items.Add(Common.UITextShutdown);
string[] fileList = MCEReplacement.GetFileList(true);
@@ -484,14 +492,6 @@
command = Common.CmdPrefixRun + externalProgram.CommandString;
}
- else if (selected == Common.UITextGoto)
- {
- GoToScreen goToScreen = new GoToScreen();
- if (goToScreen.ShowDialog(this) == DialogResult.Cancel)
- return;
-
- command = Common.CmdPrefixGoto + goToScreen.Screen;
- }
else if (selected == Common.UITextSerial)
{
SerialCommand serialCommand = new SerialCommand();
@@ -508,6 +508,14 @@
command = Common.CmdPrefixWindowMsg + messageCommand.CommandString;
}
+ else if (selected == Common.UITextTcpMsg)
+ {
+ TcpMessageCommand tcpMessageCommand = new TcpMessageCommand();
+ if (tcpMessageCommand.ShowDialog(this) == DialogResult.Cancel)
+ return;
+
+ command = Common.CmdPrefixTcpMsg + tcpMessageCommand.CommandString;
+ }
else if (selected == Common.UITextKeys)
{
KeysCommand keysCommand = new KeysCommand();
@@ -516,6 +524,22 @@
command = Common.CmdPrefixKeys + keysCommand.CommandString;
}
+ else if (selected == Common.UITextEject)
+ {
+ EjectCommand ejectCommand = new EjectCommand();
+ if (ejectCommand.ShowDialog(this) == DialogResult.Cancel)
+ return;
+
+ command = Common.CmdPrefixEject + ejectCommand.CommandString;
+ }
+ else if (selected == Common.UITextGoto)
+ {
+ GoToScreen goToScreen = new GoToScreen();
+ if (goToScreen.ShowDialog(this) == DialogResult.Cancel)
+ return;
+
+ command = Common.CmdPrefixGoto + goToScreen.Screen;
+ }
else if (selected.StartsWith(Common.CmdPrefixBlast))
{
BlastCommand blastCommand = new BlastCommand(
@@ -529,7 +553,7 @@
command = Common.CmdPrefixBlast + blastCommand.CommandString;
}
- else if (selected.StartsWith(Common.CmdPrefixMacro))
+ else
{
command = selected;
}
@@ -546,8 +570,8 @@
string mappingName = multiMapNameBox.MapName;
- string pathCustom = MCEReplacement.CustomInputDevice + "MCE Replacement.xml";
- string pathDefault = MCEReplacement.CustomInputDefault + "MCE Replacement.xml";
+ string pathCustom = MPUtils.MPCommon.CustomInputDevice + "MCE Replacement.xml";
+ string pathDefault = MPUtils.MPCommon.CustomInputDefault + "MCE Replacement.xml";
string sourceFile;
if (File.Exists(pathCustom))
@@ -560,7 +584,7 @@
return;
}
- string destinationFile = MCEReplacement.CustomInputDevice + mappingName + ".xml";
+ string destinationFile = MPUtils.MPCommon.CustomInputDevice + mappingName + ".xml";
File.Copy(sourceFile, destinationFile, true);
@@ -700,16 +724,18 @@
return;
}
- if (!Common.IsValidFileName(e.Label))
+ string name = e.Label.Trim();
+
+ if (!Common.IsValidFileName(name))
{
- MessageBox.Show("File name not valid: " + e.Label, "Cannot rename, New file name not valid", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ MessageBox.Show("File name not valid: " + name, "Cannot rename, New file name not valid", MessageBoxButtons.OK, MessageBoxIcon.Error);
e.CancelEdit = true;
return;
}
try
{
- string newFileName = MCEReplacement.IRFolder + e.Label + Common.FileExtensionIR;
+ string newFileName = MCEReplacement.IRFolder + name + Common.FileExtensionIR;
File.Move(oldFileName, newFileName);
}
@@ -744,16 +770,18 @@
return;
}
- if (!Common.IsValidFileName(e.Label))
+ string name = e.Label.Trim();
+
+ if (!Common.IsValidFileName(name))
{
- MessageBox.Show("File name not valid: " + e.Label, "Cannot rename, New file name not valid", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ MessageBox.Show("File name not valid: " + name, "Cannot rename, New file name not valid", MessageBoxButtons.OK, MessageBoxIcon.Error);
e.CancelEdit = true;
return;
}
try
{
- string newFileName = MCEReplacement.MacroFolder + e.Label + Common.FileExtensionMacro;
+ string newFileName = MCEReplacement.MacroFolder + name + Common.FileExtensionMacro;
File.Move(oldFileName, newFileName);
}
Modified: trunk/plugins/MCEReplacement/InputMapper/InputHandler.cs
===================================================================
--- trunk/plugins/MCEReplacement/InputMapper/InputHandler.cs 2007-11-03 12:41:55 UTC (rev 1018)
+++ trunk/plugins/MCEReplacement/InputMapper/InputHandler.cs 2007-11-03 12:48:07 UTC (rev 1019)
@@ -134,8 +134,7 @@
/// <param name="deviceXmlName">Input device name.</param>
public InputHandler(string deviceXmlName)
{
-
- using (Profile.Settings xmlreader = new Profile.Settings(MCEReplacement.MPConfigFile))
+ using (Profile.Settings xmlreader = new Profile.Settings(MPUtils.MPCommon.MPConfigFile))
_basicHome = xmlreader.GetValueAsBool("general", "startbasichome", false);
string xmlPath = GetXmlPath(deviceXmlName);
@@ -182,8 +181,8 @@
public string GetXmlPath(string deviceXmlName)
{
string path = String.Empty;
- string pathCustom = MCEReplacement.CustomInputDevice + deviceXmlName + ".xml";
- string pathDefault = MCEReplacement.CustomInputDefault + deviceXmlName + ".xml";
+ string pathCustom = MPUtils.MPCommon.CustomInputDevice + deviceXmlName + ".xml";
+ string pathDefault = MPUtils.MPCommon.CustomInputDefault + deviceXmlName + ".xml";
if (System.IO.File.Exists(pathCustom) && CheckXmlFile(pathCustom))
{
Modified: trunk/plugins/MCEReplacement/MCEReplacement.cs
===================================================================
--- trunk/plugins/MCEReplacement/MCEReplacement.cs 2007-11-03 12:41:55 UTC (rev 1018)
+++ trunk/plugins/MCEReplacement/MCEReplacement.cs 2007-11-03 12:48:07 UTC (rev 1019)
@@ -41,22 +41,13 @@
/// <summary>
/// The plugin version string.
/// </summary>
- internal const string PluginVersion = "MCE Replacement Plugin 1.0.3.5 for MediaPortal 0.2.3.0";
+ internal const string PluginVersion = "MCE Replacement Plugin 1.0.3.5 for MediaPortal 0.2.3.0";
/// <summary>
/// The wParam for Message Mode Windows Messages.
/// </summary>
- public const int MessageModeCommand = 0x0018;
+ public const int MessageModeCommand = 0x0018;
- // Macro Commands
- //internal const string WindowStateCommand = "Toggle Window State";
-
- // Macro File Commands
- //internal const string WindowStateMacroText = "WINDOW_STATE";
-
- // English text for Macro commands
- //internal const string ChangeWindowStateText = "Change Window State";
-
internal static readonly string AppDataFolder =
Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData) +
"\\MediaPortal MCE Replacement Plugin\\";
@@ -65,11 +56,6 @@
internal static readonly string MacroFolder = AppDataFolder + "Macro\\";
internal static readonly string STBFolder = AppDataFolder + "STB\\";
- internal static readonly string CustomInputDevice = Config.GetFolder(Config.Dir.CustomInputDevice) + "\\";
- internal static readonly string CustomInputDefault = Config.GetFolder(Config.Dir.CustomInputDefault) + "\\";
-
- internal static readonly string MPConfigFile = Config.GetFolder(Config.Dir.Config) + "\\MediaPortal.xml";
-
internal static readonly string MCERemoteFile = AppDataFolder + "MCERemote.xml";
internal static readonly string DifferentRemoteFile = AppDataFolder + "DifferentRemote.xml";
internal static readonly string MultiMappingFile = AppDataFolder + "MultiMapping.xml";
@@ -147,18 +133,7 @@
get { return _logVerbose; }
set { _logVerbose = value; }
}
-
/// <summary>
- /// Gets or sets a value indicating whether in configuration.
- /// </summary>
- /// <value><c>true</c> if in configuration; otherwise, <c>false</c>.</value>
- internal static bool InConfiguration
- {
- get { return _inConfiguration; }
- set { _inConfiguration = value; }
- }
-
- /// <summary>
/// Gets or sets a value indicating whether MediaPortal will require focus to handle input.
/// </summary>
/// <value><c>true</c> if requires focus; otherwise, <c>false</c>.</value>
@@ -198,7 +173,7 @@
/// Gets or sets a value indicating whether different remote handling is enabled.
/// </summary>
/// <value>
- /// <c>true</c> if different remote handling is enabled; otherwise, <c>false</c>.
+ /// <c>true</c> if different remote handling is enabled; otherwise, <c>false</c>.
/// </value>
internal static bool DifferentRemoteEnabled
{
@@ -300,6 +275,16 @@
}
/// <summary>
+ /// Gets or sets a value indicating whether in configuration.
+ /// </summary>
+ /// <value><c>true</c> if in configuration; otherwise, <c>false</c>.</value>
+ internal static bool InConfiguration
+ {
+ get { return _inConfiguration; }
+ set { _inConfiguration = value; }
+ }
+
+ /// <summary>
/// Count of available TV Cards.
/// </summary>
internal static int TvCardCount
@@ -429,7 +414,7 @@
GUIWindowManager.Receivers -= new SendMessageHandler(OnMessage);
_defaultInputHandler = null;
-
+
if (MultiMappingEnabled)
for (int i = 0; i < _multiInputHandlers.Count; i++)
_multiInputHandlers[i] = null;
@@ -451,41 +436,41 @@
/// Determines whether this plugin can be enabled.
/// </summary>
/// <returns>
- /// <c>true</c> if this plugin can be enabled; otherwise, <c>false</c>.
+ /// <c>true</c> if this plugin can be enabled; otherwise, <c>false</c>.
/// </returns>
- public bool CanEnable() { return true; }
+ public bool CanEnable() { return true; }
/// <summary>
/// Determines whether this plugin has setup.
/// </summary>
/// <returns>
- /// <c>true</c> if this plugin has setup; otherwise, <c>false</c>.
+ /// <c>true</c> if this plugin has setup; otherwise, <c>false</c>.
/// </returns>
- public bool HasSetup() { return true; }
+ public bool HasSetup() { return true; }
/// <summary>
/// Gets the plugin name.
/// </summary>
/// <returns>The plugin name.</returns>
- public string PluginName() { return "MCE Replacement"; }
+ public string PluginName() { return "MCE Replacement"; }
/// <summary>
/// Defaults enabled.
/// </summary>
/// <returns>true if this plugin is enabled by default, otherwise false.</returns>
- public bool DefaultEnabled() { return true; }
+ public bool DefaultEnabled() { return true; }
/// <summary>
/// Gets the window id.
/// </summary>
/// <returns>The window id.</returns>
- public int GetWindowId() { return 0; }
+ public int GetWindowId() { return 0; }
/// <summary>
/// Gets the plugin author.
/// </summary>
/// <returns>The plugin author.</returns>
- public string Author() { return "and-81"; }
+ public string Author() { return "and-81"; }
/// <summary>
/// Gets the description of the plugin.
/// </summary>
/// <returns>The plugin description.</returns>
- public string Description() { return "Replaces MediaPortal's native MCE remote control support"; }
+ public string Description() { return "Replaces MediaPortal's native MCE remote control support"; }
/// <summary>
/// Shows the plugin configuration.
@@ -559,7 +544,7 @@
/// <param name="strButtonImageFocus">The button image focus.</param>
/// <param name="strPictureImage">The picture image.</param>
/// <returns>true if the plugin can be seen, otherwise false.</returns>
- public bool GetHome(out string strButtonText, out string strButtonImage, out string strButtonImageFocus, out string strPictureImage)
+ public bool GetHome(out string strButtonText, out string strButtonImage, out string strButtonImageFocus, out string strPictureImage)
{
strButtonText = strButtonImage = strButtonImageFocus = strPictureImage = String.Empty;
return false;
@@ -657,7 +642,7 @@
_mouseModeMiddleHeld = false;
}
- MPCommands.ShowNotifyDialog("Mouse Mode", notifyMessage, 2);
+ MPCommon.ShowNotifyDialog("Mouse Mode", notifyMessage, 2);
if (LogVerbose)
Log.Info("MCEReplacement: {0}", notifyMessage);
@@ -999,14 +984,14 @@
{
// Cycle through Multi-Mappings ...
_multiMappingSet = (_multiMappingSet + 1) % MultiMaps.Length;
-
+
// Show the mapping set name on screen ...
string setName = MultiMaps[_multiMappingSet];
if (LogVerbose)
Log.Info("MCEReplacement: Multi-Mapping has changed to \"{0}\"", setName);
- MPCommands.ShowNotifyDialog("Multi-Mapping", setName, 2);
+ MPCommon.ShowNotifyDialog("Multi-Mapping", setName, 2);
}
/// <summary>
/// Changes the multi mapping.
@@ -1034,7 +1019,7 @@
if (LogVerbose)
Log.Info("MCEReplacement: Multi-Mapping has changed to \"{0}\"", setName);
- MPCommands.ShowNotifyDialog("Multi-Mapping", setName, 2);
+ MPCommon.ShowNotifyDialog("Multi-Mapping", setName, 2);
return;
}
@@ -1431,6 +1416,62 @@
MapEvent(MappedEvent.MappingEvent.PC_Resume);
}
+ static void Hibernate()
+ {
+ if (InConfiguration)
+ return;
+
+ GUIGraphicsContext.ResetLastActivity();
+ // Stop all media before hibernating
+ g_Player.Stop();
+
+ GUIMessage msg;
+
+ if (_mpBasicHome)
+ msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_GOTO_WINDOW, 0, 0, 0, (int)GUIWindow.Window.WINDOW_SECOND_HOME, 0, null);
+ else
+ msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_GOTO_WINDOW, 0, 0, 0, (int)GUIWindow.Window.WINDOW_HOME, 0, null);
+
+ GUIWindowManager.SendThreadMessage(msg);
+
+ OnSuspend();
+ WindowsController.ExitWindows(RestartOptions.Hibernate, false);
+ }
+
+ static void Standby()
+ {
+ if (InConfiguration)
+ return;
+
+ GUIGraphicsContext.ResetLastActivity();
+ // Stop all media before suspending
+ g_Player.Stop();
+
+ GUIMessage msg;
+
+ if (_mpBasicHome)
+ msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_GOTO_WINDOW, 0, 0, 0, (int)GUIWindow.Window.WINDOW_SECOND_HOME, 0, null);
+ else
+ msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_GOTO_WINDOW, 0, 0, 0, (int)GUIWindow.Window.WINDOW_HOME, 0, null);
+
+ GUIWindowManager.SendThreadMessage(msg);
+
+ OnSuspend();
+ WindowsController.ExitWindows(RestartOptions.Suspend, false);
+ }
+
+ static void Reboot()
+ {
+ if (!InConfiguration)
+ GUIGraphicsContext.OnAction(new Action(Action.ActionType.ACTION_SHUTDOWN, 0, 0));
+ }
+
+ static void ShutDown()
+ {
+ if (!InConfiguration)
+ GUIGraphicsContext.OnAction(new Action(Action.ActionType.ACTION_REBOOT, 0, 0));
+ }
+
/// <summary>
/// Adds to the Macro Stack.
/// </summary>
@@ -1511,7 +1552,6 @@
case Common.XmlTagBlast:
{
string[] commands = Common.SplitBlastCommand(commandProperty);
-
BlastIR(IRFolder + commands[0] + Common.FileExtensionIR, commands[1]);
break;
}
@@ -1542,7 +1582,7 @@
if (InConfiguration)
MessageBox.Show(commandProperty, "Go To Window", MessageBoxButtons.OK, MessageBoxIcon.Information);
else
- MPCommands.ProcessGoTo(commandProperty, MP_BasicHome);
+ MPCommon.ProcessGoTo(commandProperty, MP_BasicHome);
break;
}
@@ -1553,7 +1593,7 @@
if (InConfiguration)
MessageBox.Show(commands[1], commands[0], MessageBoxButtons.OK, MessageBoxIcon.Information);
else
- MPCommands.ShowNotifyDialog(commands[0], commands[1], int.Parse(commands[2]));
+ MPCommon.ShowNotifyDialog(commands[0], commands[1], int.Parse(commands[2]));
break;
}
@@ -1565,6 +1605,13 @@
break;
}
+ case Common.XmlTagTcpMsg:
+ {
+ string[] commands = Common.SplitTcpMessageCommand(commandProperty);
+ Common.ProcessTcpMessageCommand(commands);
+ break;
+ }
+
case Common.XmlTagKeys:
{
if (InConfiguration)
@@ -1634,7 +1681,7 @@
_mouseModeMiddleHeld = false;
}
- MPCommands.ShowNotifyDialog("Mouse Mode", notifyMessage, 2);
+ MPCommon.ShowNotifyDialog("Mouse Mode", notifyMessage, 2);
if (LogVerbose)
Log.Info("MCEReplacement: {0}", notifyMessage);
@@ -1703,63 +1750,33 @@
break;
}
+ case Common.XmlTagEject:
+ {
+ Common.ProcessEjectCommand(commandProperty);
+ break;
+ }
+
case Common.XmlTagStandby:
{
- if (!InConfiguration)
- {
- GUIGraphicsContext.ResetLastActivity();
- // Stop all media before suspending or hibernating
- g_Player.Stop();
-
- GUIMessage msg;
-
- if (_mpBasicHome)
- msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_GOTO_WINDOW, 0, 0, 0, (int)GUIWindow.Window.WINDOW_SECOND_HOME, 0, null);
- else
- msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_GOTO_WINDOW, 0, 0, 0, (int)GUIWindow.Window.WINDOW_HOME, 0, null);
-
- GUIWindowManager.SendThreadMessage(msg);
-
- MCEReplacement.OnSuspend();
- WindowsController.ExitWindows(RestartOptions.Suspend, true);
- }
+ Standby();
break;
}
case Common.XmlTagHibernate:
{
- if (!InConfiguration)
- {
- GUIGraphicsContext.ResetLastActivity();
- // Stop all media before suspending or hibernating
- g_Player.Stop();
-
- GUIMessage msg;
-
- if (_mpBasicHome)
- msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_GOTO_WINDOW, 0, 0, 0, (int)GUIWindow.Window.WINDOW_SECOND_HOME, 0, null);
- else
- msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_GOTO_WINDOW, 0, 0, 0, (int)GUIWindow.Window.WINDOW_HOME, 0, null);
-
- GUIWindowManager.SendThreadMessage(msg);
-
- MCEReplacement.OnSuspend();
- WindowsController.ExitWindows(RestartOptions.Hibernate, true);
- }
+ Hibernate();
break;
}
- case Common.XmlTagReboot:
+ case Common.XmlTagShutdown:
{
- if (!InConfiguration)
- GUIGraphicsContext.OnAction(new Action(Action.ActionType.ACTION_REBOOT, 0, 0));
+ ShutDown();
break;
}
- case Common.XmlTagShutdown:
+ case Common.XmlTagReboot:
{
- if (!InConfiguration)
- GUIGraphicsContext.OnAction(new Action(Action.ActionType.ACTION_SHUTDOWN, 0, 0));
+ Reboot();
break;
}
}
@@ -1772,6 +1789,37 @@
}
/// <summary>
+ /// Learn an IR command.
+ /// </summary>
+ /// <param name="fileName">File to place learned IR command in (absolute path).</param>
+ /// <returns>true if successful, otherwise false.</returns>
+ internal static IRServerPluginInterface.LearnStatus LearnIR(string fileName)
+ {
+ IRServerPluginInterface.LearnStatus status = IRServerPluginInterface.LearnStatus.Failure;
+
+ try
+ {
+ byte[] data;
+ status = _mceTransceiver.Learn(out data);
+
+ if (status == IRServerPluginInterface.LearnStatus.Success)
+ {
+ if (data == null || data.Length == 0)
+ throw new ApplicationException("No data learned");
+
+ using (FileStream file = File.Create(fileName))
+ file.Write(data, 0, data.Length);
+ }
+ }
+ catch (Exception ex)
+ {
+ Log.Error("MCEReplacement: LearnIRCommand() {0}", ex.ToString());
+ }
+
+ return status;
+ }
+
+ /// <summary>
/// Blast an IR command.
/// </summary>
/// <param name="fileName">File to blast (absolute path).</param>
@@ -1827,7 +1875,7 @@
string[] commands = Common.SplitBlastCommand(command.Substring(Common.CmdPrefixBlast.Length));
BlastIR(IRFolder + commands[0] + Common.FileExtensionIR, commands[1]);
}
- else if (command.StartsWith(Common.CmdPrefixSTB)) // STB IR Code
+ else if (command.StartsWith(Common.CmdPrefixSTB, StringComparison.InvariantCultureIgnoreCase)) // STB IR Code
{
string[] commands = Common.SplitBlastCommand(command.Substring(Common.CmdPrefixSTB.Length));
BlastIR(STBFolder + commands[0] + Common.FileExtensionIR, commands[1]);
@@ -1855,45 +1903,40 @@
else
Common.ProcessKeyCommand(keyCommand);
}
- else if (command.StartsWith(Common.CmdPrefixGoto, StringComparison.InvariantCultureIgnoreCase)) // Go To Screen
+ else if (command.StartsWith(Common.CmdPrefixMouse, StringComparison.InvariantCultureIgnoreCase)) // Mouse Command
{
- MPCommands.ProcessGoTo(command.Substring(Common.CmdPrefixGoto.Length), MP_BasicHome);
+ string mouseCommand = command.Substring(Common.CmdPrefixMouse.Length);
+ Common.ProcessMouseCommand(mouseCommand);
}
- else
+ else if (command.StartsWith(Common.CmdPrefixEject, StringComparison.InvariantCultureIgnoreCase)) // Eject Command
{
- throw new ArgumentException(String.Format("Cannot process unrecognized command \"{0}\"", command), "command");
+ string ejectCommand = command.Substring(Common.CmdPrefixEject.Length);
+ Common.ProcessEjectCommand(ejectCommand);
}
- }
-
- /// <summary>
- /// Learn an IR Command and put it in a file.
- /// </summary>
- /// <param name="fileName">File to place learned IR command in (absolute path).</param>
- /// <returns>true if successful, otherwise false.</returns>
- internal static IRServerPluginInterface.LearnStatus LearnIRCommand(string fileName)
- {
- IRServerPluginInterface.LearnStatus status = IRServerPluginInterface.LearnStatus.Failure;
-
- try
+ else if (command.StartsWith(Common.CmdPrefixHibernate, StringComparison.InvariantCultureIgnoreCase)) // Hibernate Command
{
- byte[] data;
- status = _mceTransceiver.Learn(out data);
-
- if (status == IRServerPluginInterface.LearnStatus.Success)
- {
- if (data == null || data.Length == 0)
- throw new ApplicationException("No data learned");
-
- using (FileStream file = File.Create(fileName))
- file.Write(data, 0, data.Length);
- }
+ Hibernate();
}
- catch (Exception ex)
+ else if (command.StartsWith(Common.CmdPrefixReboot, StringComparison.InvariantCultureIgnoreCase)) // Reboot Command
{
- Log.Error("MCEReplacement: LearnIRCommand() {0}", ex.ToString());
+ Reboot();
}
-
- return status;
+ else if (command.StartsWith(Common.CmdPrefixShutdown, StringComparison.InvariantCultureIgnoreCase)) // Shutdown Command
+ {
+ ShutDown();
+ }
+ else if (command.StartsWith(Common.CmdPrefixStandby, StringComparison.InvariantCultureIgnoreCase)) // Standby Command
+ {
+ Standby();
+ }
+ else if (command.StartsWith(Common.CmdPrefixGoto, StringComparison.InvariantCultureIgnoreCase)) // Go To Screen
+ {
+ MPCommon.ProcessGoTo(command.Substring(Common.CmdPrefixGoto.Length), MP_BasicHome);
+ }
+ else
+ {
+ throw new ArgumentException(String.Format("Cannot process unrecognized command \"{0}\"", command), "command");
+ }
}
/// <summary>
@@ -1976,7 +2019,7 @@
{
try
{
- using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(MPConfigFile))
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(MPCommon.MPConfigFile))
{
LogVerbose = xmlreader.GetValueAsBool("MCEReplacement", "LogVerbose", false);
RequireFocus = xmlreader.GetValueAsBool("MCEReplacement", "RequireFocus", false);
@@ -2009,7 +2052,7 @@
{
try
{
- using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings(MPConfigFile))
+ using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings(MPCommon.MPConfigFile))
{
xmlwriter.SetValueAsBool("MCEReplacement", "LogVerbose", LogVerbose);
xmlwriter.SetValueAsBool("MCEReplacement", "RequireFocus", RequireFocus);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2007-11-03 12:41:56
|
Revision: 1018
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1018&view=rev
Author: and-81
Date: 2007-11-03 05:41:55 -0700 (Sat, 03 Nov 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/EditProgramForm.Designer.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.resx
trunk/plugins/IR Server Suite/Applications/Translator/MappedEvent.cs
trunk/plugins/IR Server Suite/Applications/Translator/Program.cs
trunk/plugins/IR Server Suite/Applications/Translator/Properties/Resources.Designer.cs
trunk/plugins/IR Server Suite/Applications/Translator/Properties/Resources.resx
trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj
trunk/plugins/IR Server Suite/Common/IrssComms/Server.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/MouseCommand.Designer.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/MouseCommand.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/MouseCommand.resx
trunk/plugins/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
trunk/plugins/IR Server Suite/Common/IrssUtils/Properties/Resources.Designer.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Properties/Resources.resx
trunk/plugins/IR Server Suite/Common/IrssUtils/Win32.cs
trunk/plugins/IR Server Suite/Common/MPUtils/MPUtils.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/AdvancedSettings.Designer.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/AdvancedSettings.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/DeviceSelect.Designer.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/DeviceSelect.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IRServerPluginBase.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverXP.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/IrCode.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/IrDecoder.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Program.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/MacroEditor.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/SetupForm.Designer.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/SetupForm.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/SetupForm.resx
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/MacroEditor.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/InputMapper/InputHandler.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/MacroEditor.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/SetupForm.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/MacroEditor.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/PluginSetup.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs
Added Paths:
-----------
trunk/plugins/IR Server Suite/Applications/Translator/Graphics/Edit.png
trunk/plugins/IR Server Suite/Applications/Translator/Graphics/WinLogo.png
trunk/plugins/IR Server Suite/Common/MPUtils/MPCommon.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/RawInput.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/ReceiverWindow.cs
Removed Paths:
-------------
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/NativeMethods.cs
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs 2007-11-02 14:13:28 UTC (rev 1017)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs 2007-11-03 12:41:55 UTC (rev 1018)
@@ -612,15 +612,15 @@
if (!origin.Checked)
return;
- if (origin != checkBoxMouseClickLeft) checkBoxMouseClickLeft.Checked = false;
- if (origin != checkBoxMouseClickRight) checkBoxMouseClickRight.Checked = false;
- if (origin != checkBoxMouseClickMiddle) checkBoxMouseClickMiddle.Checked = false;
- if (origin != checkBoxMouseMoveUp) checkBoxMouseMoveUp.Checked = false;
- if (origin != checkBoxMouseMoveDown) checkBoxMouseMoveDown.Checked = false;
- if (origin != checkBoxMouseMoveLeft) checkBoxMouseMoveLeft.Checked = false;
- if (origin != checkBoxMouseMoveRight) checkBoxMouseMoveRight.Checked = false;
- if (origin != checkBoxMouseScrollUp) checkBoxMouseScrollUp.Checked = false;
- if (origin != checkBoxMouseScrollDown) checkBoxMouseScrollDown.Checked = false;
+ if (origin != checkBoxMouseClickLeft) checkBoxMouseClickLeft.Checked = false;
+ if (origin != checkBoxMouseClickRight) checkBoxMouseClickRight.Checked = false;
+ if (origin != checkBoxMouseClickMiddle) checkBoxMouseClickMiddle.Checked = false;
+ if (origin != checkBoxMouseMoveUp) checkBoxMouseMoveUp.Checked = false;
+ if (origin != checkBoxMouseMoveDown) checkBoxMouseMoveDown.Checked = false;
+ if (origin != checkBoxMouseMoveLeft) checkBoxMouseMoveLeft.Checked = false;
+ if (origin != checkBoxMouseMoveRight) checkBoxMouseMoveRight.Checked = false;
+ if (origin != checkBoxMouseScrollUp) checkBoxMouseScrollUp.Checked = false;
+ if (origin != checkBoxMouseScrollDown) checkBoxMouseScrollDown.Checked = false;
}
private void KeystrokeToolStripMenuItem_Click(object sender, EventArgs e)
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/EditProgramForm.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/EditProgramForm.Designer.cs 2007-11-02 14:13:28 UTC (rev 1017)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/EditProgramForm.Designer.cs 2007-11-03 12:41:55 UTC (rev 1018)
@@ -269,7 +269,7 @@
this.Controls.Add(this.textBoxApp);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MinimizeBox = false;
- this.MinimumSize = new System.Drawing.Size(392, 308);
+ this.MinimumSize = new System.Drawing.Size(392, 396);
this.Name = "EditProgramForm";
this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs 2007-11-02 14:13:28 UTC (rev 1017)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs 2007-11-03 12:41:55 UTC (rev 1018)
@@ -62,6 +62,7 @@
comboBoxCommands.Items.Add(Common.UITextWindowMsg);
comboBoxCommands.Items.Add(Common.UITextTcpMsg);
comboBoxCommands.Items.Add(Common.UITextKeys);
+ comboBoxCommands.Items.Add(Common.UITextMouse);
comboBoxCommands.Items.Add(Common.UITextEject);
comboBoxCommands.Items.Add(Common.UITextStandby);
comboBoxCommands.Items.Add(Common.UITextHibernate);
@@ -137,6 +138,11 @@
writer.WriteAttributeString("command", Common.XmlTagKeys);
writer.WriteAttributeString("cmdproperty", item.Substring(Common.CmdPrefixKeys.Length));
}
+ else if (item.StartsWith(Common.CmdPrefixMouse))
+ {
+ writer.WriteAttributeString("command", Common.XmlTagMouse);
+ writer.WriteAttributeString("cmdproperty", item.Substring(Common.CmdPrefixMouse.Length));
+ }
else if (item.StartsWith(Common.CmdPrefixEject))
{
writer.WriteAttributeString("command", Common.XmlTagEject);
@@ -234,6 +240,10 @@
listBoxMacro.Items.Add(Common.CmdPrefixKeys + commandProperty);
break;
+ case Common.XmlTagMouse:
+ listBoxMacro.Items.Add(Common.CmdPrefixMouse + commandProperty);
+ break;
+
case Common.XmlTagEject:
listBoxMacro.Items.Add(Common.CmdPrefixEject + commandProperty);
break;
@@ -312,6 +322,12 @@
if (keysCommand.ShowDialog(this) == DialogResult.OK)
listBoxMacro.Items.Add(Common.CmdPrefixKeys + keysCommand.CommandString);
}
+ else if (selected == Common.UITextMouse)
+ {
+ MouseCommand mouseCommand = new MouseCommand();
+ if (mouseCommand.ShowDialog(this) == DialogResult.OK)
+ listBoxMacro.Items.Add(Common.CmdPrefixMouse + mouseCommand.CommandString);
+ }
else if (selected == Common.UITextEject)
{
EjectCommand ejectCommand = new EjectCommand();
@@ -528,6 +544,17 @@
listBoxMacro.Items.Insert(index, Common.CmdPrefixKeys + keysCommand.CommandString);
listBoxMacro.SelectedIndex = index;
}
+ else if (selected.StartsWith(Common.CmdPrefixMouse))
+ {
+ MouseCommand mouseCommand = new MouseCommand(selected.Substring(Common.CmdPrefixMouse.Length));
+ if (mouseCommand.ShowDialog(this) == DialogResult.Cancel)
+ return;
+
+ int index = listBoxMacro.SelectedIndex;
+ listBoxMacro.Items.RemoveAt(index);
+ listBoxMacro.Items.Insert(index, Common.CmdPrefixMouse + mouseCommand.CommandString);
+ listBoxMacro.SelectedIndex = index;
+ }
else if (selected.StartsWith(Common.CmdPrefixEject))
{
EjectCommand ejectCommand = new EjectCommand(selected.Substring(Common.CmdPrefixEject.Length));
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs 2007-11-02 14:13:28 UTC (rev 1017)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.Designer.cs 2007-11-03 12:41:55 UTC (rev 1018)
@@ -1,7 +1,9 @@
namespace Translator
{
+
partial class MainForm
{
+
/// <summary>
/// Required designer variable.
/// </summary>
@@ -30,11 +32,9 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
- this.comboBoxProgram = new System.Windows.Forms.ComboBox();
- this.groupBoxProgram = new System.Windows.Forms.GroupBox();
- this.buttonEditProgram = new System.Windows.Forms.Button();
- this.buttonRemoveProgram = new System.Windows.Forms.Button();
- this.buttonAddProgram = new System.Windows.Forms.Button();
+ this.listViewPrograms = new System.Windows.Forms.ListView();
+ this.contextMenuStripPrograms = new System.Windows.Forms.ContextMenuStrip(this.components);
+ this.imageListPrograms = new System.Windows.Forms.ImageList(this.components);
this.buttonClear = new System.Windows.Forms.Button();
this.buttonModify = new System.Windows.Forms.Button();
this.buttonDelete = new System.Windows.Forms.Button();
@@ -55,18 +55,20 @@
this.comboBoxEvents = new System.Windows.Forms.ComboBox();
this.listViewEventMap = new System.Windows.Forms.ListView();
this.columnHeaderEvent = new System.Windows.Forms.ColumnHeader();
- this.columnHeader1 = new System.Windows.Forms.ColumnHeader();
- this.tabPageIRCommands = new System.Windows.Forms.TabPage();
- this.listViewIR = new System.Windows.Forms.ListView();
- this.buttonNewIR = new System.Windows.Forms.Button();
- this.buttonEditIR = new System.Windows.Forms.Button();
- this.buttonDeleteIR = new System.Windows.Forms.Button();
+ this.columnHeaderEventCommand = new System.Windows.Forms.ColumnHeader();
+ this.contextMenuStripEvents = new System.Windows.Forms.ContextMenuStrip(this.components);
+ this.removeEventToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tabPageMacro = new System.Windows.Forms.TabPage();
this.listViewMacro = new System.Windows.Forms.ListView();
this.buttonTestMacro = new System.Windows.Forms.Button();
this.buttonDeleteMacro = new System.Windows.Forms.Button();
this.buttonNewMacro = new System.Windows.Forms.Button();
this.buttonEditMacro = new System.Windows.Forms.Button();
+ this.tabPageIRCommands = new System.Windows.Forms.TabPage();
+ this.listViewIR = new System.Windows.Forms.ListView();
+ this.buttonNewIR = new System.Windows.Forms.Button();
+ this.buttonEditIR = new System.Windows.Forms.Button();
+ this.buttonDeleteIR = new System.Windows.Forms.Button();
this.toolTip = new System.Windows.Forms.ToolTip(this.components);
this.checkBoxAutoRun = new System.Windows.Forms.CheckBox();
this.menuStrip = new System.Windows.Forms.MenuStrip();
@@ -84,83 +86,53 @@
this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
- this.groupBoxProgram.SuspendLayout();
this.tabControl.SuspendLayout();
this.tabPagePrograms.SuspendLayout();
this.tabPageEvents.SuspendLayout();
- this.tabPageIRCommands.SuspendLayout();
+ this.contextMenuStripEvents.SuspendLayout();
this.tabPageMacro.SuspendLayout();
+ this.tabPageIRCommands.SuspendLayout();
this.menuStrip.SuspendLayout();
this.SuspendLayout();
//
- // comboBoxProgram
+ // listViewPrograms
//
- this.comboBoxProgram.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ this.listViewPrograms.Alignment = System.Windows.Forms.ListViewAlignment.Left;
+ this.listViewPrograms.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
- this.comboBoxProgram.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.comboBoxProgram.FormattingEnabled = true;
- this.comboBoxProgram.Location = new System.Drawing.Point(8, 16);
- this.comboBoxProgram.Name = "comboBoxProgram";
- this.comboBoxProgram.Size = new System.Drawing.Size(288, 21);
- this.comboBoxProgram.TabIndex = 0;
- this.toolTip.SetToolTip(this.comboBoxProgram, "Select a program to setup button mappings for");
- this.comboBoxProgram.SelectedIndexChanged += new System.EventHandler(this.comboBoxProgram_SelectedIndexChanged);
+ this.listViewPrograms.ContextMenuStrip = this.contextMenuStripPrograms;
+ this.listViewPrograms.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
+ this.listViewPrograms.HideSelection = false;
+ this.listViewPrograms.LargeImageList = this.imageListPrograms;
+ this.listViewPrograms.Location = new System.Drawing.Point(8, 8);
+ this.listViewPrograms.MultiSelect = false;
+ this.listViewPrograms.Name = "listViewPrograms";
+ this.listViewPrograms.ShowGroups = false;
+ this.listViewPrograms.ShowItemToolTips = true;
+ this.listViewPrograms.Size = new System.Drawing.Size(504, 80);
+ this.listViewPrograms.TabIndex = 0;
+ this.listViewPrograms.TileSize = new System.Drawing.Size(128, 48);
+ this.toolTip.SetToolTip(this.listViewPrograms, "Choose a Program to modify mappings for here");
+ this.listViewPrograms.UseCompatibleStateImageBehavior = false;
+ this.listViewPrograms.DoubleClick += new System.EventHandler(this.listViewPrograms_DoubleClick);
+ this.listViewPrograms.SelectedIndexChanged += new System.EventHandler(this.listViewPrograms_SelectedIndexChanged);
//
- // groupBoxProgram
+ // contextMenuStripPrograms
//
- this.groupBoxProgram.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.groupBoxProgram.Controls.Add(this.buttonEditProgram);
- this.groupBoxProgram.Controls.Add(this.buttonRemoveProgram);
- this.groupBoxProgram.Controls.Add(this.buttonAddProgram);
- this.groupBoxProgram.Controls.Add(this.comboBoxProgram);
- this.groupBoxProgram.Location = new System.Drawing.Point(8, 8);
- this.groupBoxProgram.Name = "groupBoxProgram";
- this.groupBoxProgram.Size = new System.Drawing.Size(416, 48);
- this.groupBoxProgram.TabIndex = 0;
- this.groupBoxProgram.TabStop = false;
- this.groupBoxProgram.Text = "Program";
+ this.contextMenuStripPrograms.Name = "contextMenuStripPrograms";
+ this.contextMenuStripPrograms.Size = new System.Drawing.Size(61, 4);
+ this.contextMenuStripPrograms.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStripPrograms_Opening);
//
- // buttonEditProgram
+ // imageListPrograms
//
- this.buttonEditProgram.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonEditProgram.Location = new System.Drawing.Point(368, 16);
- this.buttonEditProgram.Name = "buttonEditProgram";
- this.buttonEditProgram.Size = new System.Drawing.Size(40, 24);
- this.buttonEditProgram.TabIndex = 3;
- this.buttonEditProgram.Text = "Edit";
- this.toolTip.SetToolTip(this.buttonEditProgram, "Edit the current program");
- this.buttonEditProgram.UseVisualStyleBackColor = true;
- this.buttonEditProgram.Click += new System.EventHandler(this.buttonEditProgram_Click);
+ this.imageListPrograms.ColorDepth = System.Windows.Forms.ColorDepth.Depth32Bit;
+ this.imageListPrograms.ImageSize = new System.Drawing.Size(32, 32);
+ this.imageListPrograms.TransparentColor = System.Drawing.Color.Transparent;
//
- // buttonRemoveProgram
- //
- this.buttonRemoveProgram.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonRemoveProgram.Image = global::Translator.Properties.Resources.Delete;
- this.buttonRemoveProgram.Location = new System.Drawing.Point(336, 16);
- this.buttonRemoveProgram.Name = "buttonRemoveProgram";
- this.buttonRemoveProgram.Size = new System.Drawing.Size(24, 24);
- this.buttonRemoveProgram.TabIndex = 2;
- this.toolTip.SetToolTip(this.buttonRemoveProgram, "Remove the current program from the list");
- this.buttonRemoveProgram.UseVisualStyleBackColor = true;
- this.buttonRemoveProgram.Click += new System.EventHandler(this.buttonRemoveProgram_Click);
- //
- // buttonAddProgram
- //
- this.buttonAddProgram.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonAddProgram.Image = global::Translator.Properties.Resources.Plus;
- this.buttonAddProgram.Location = new System.Drawing.Point(304, 16);
- this.buttonAddProgram.Name = "buttonAddProgram";
- this.buttonAddProgram.Size = new System.Drawing.Size(24, 24);
- this.buttonAddProgram.TabIndex = 1;
- this.toolTip.SetToolTip(this.buttonAddProgram, "Add a program to the list");
- this.buttonAddProgram.UseVisualStyleBackColor = true;
- this.buttonAddProgram.Click += new System.EventHandler(this.buttonAddProgram_Click);
- //
// buttonClear
//
this.buttonClear.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonClear.Location = new System.Drawing.Point(368, 344);
+ this.buttonClear.Location = new System.Drawing.Point(456, 344);
this.buttonClear.Name = "buttonClear";
this.buttonClear.Size = new System.Drawing.Size(56, 24);
this.buttonClear.TabIndex = 5;
@@ -217,10 +189,10 @@
this.listViewButtons.FullRowSelect = true;
this.listViewButtons.GridLines = true;
this.listViewButtons.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
- this.listViewButtons.Location = new System.Drawing.Point(8, 64);
+ this.listViewButtons.Location = new System.Drawing.Point(8, 96);
this.listViewButtons.MultiSelect = false;
this.listViewButtons.Name = "listViewButtons";
- this.listViewButtons.Size = new System.Drawing.Size(416, 272);
+ this.listViewButtons.Size = new System.Drawing.Size(504, 240);
this.listViewButtons.TabIndex = 1;
this.listViewButtons.UseCompatibleStateImageBehavior = false;
this.listViewButtons.View = System.Windows.Forms.View.Details;
@@ -230,23 +202,23 @@
// columnHeaderButton
//
this.columnHeaderButton.Text = "Code";
- this.columnHeaderButton.Width = 50;
+ this.columnHeaderButton.Width = 100;
//
// columnHeaderDescription
//
this.columnHeaderDescription.Text = "Description";
- this.columnHeaderDescription.Width = 102;
+ this.columnHeaderDescription.Width = 180;
//
// columnHeaderCommand
//
this.columnHeaderCommand.Text = "Command";
- this.columnHeaderCommand.Width = 239;
+ this.columnHeaderCommand.Width = 200;
//
// buttonOK
//
this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonOK.DialogResult = System.Windows.Forms.DialogResult.OK;
- this.buttonOK.Location = new System.Drawing.Point(384, 440);
+ this.buttonOK.Location = new System.Drawing.Point(472, 440);
this.buttonOK.Name = "buttonOK";
this.buttonOK.Size = new System.Drawing.Size(64, 24);
this.buttonOK.TabIndex = 3;
@@ -261,27 +233,27 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.tabControl.Controls.Add(this.tabPagePrograms);
this.tabControl.Controls.Add(this.tabPageEvents);
- this.tabControl.Controls.Add(this.tabPageIRCommands);
this.tabControl.Controls.Add(this.tabPageMacro);
+ this.tabControl.Controls.Add(this.tabPageIRCommands);
this.tabControl.Location = new System.Drawing.Point(8, 32);
this.tabControl.Name = "tabControl";
this.tabControl.SelectedIndex = 0;
- this.tabControl.Size = new System.Drawing.Size(440, 400);
+ this.tabControl.Size = new System.Drawing.Size(528, 400);
this.tabControl.TabIndex = 1;
this.tabControl.SelectedIndexChanged += new System.EventHandler(this.tabControl_SelectedIndexChanged);
//
// tabPagePrograms
//
this.tabPagePrograms.Controls.Add(this.buttonClear);
- this.tabPagePrograms.Controls.Add(this.groupBoxProgram);
this.tabPagePrograms.Controls.Add(this.buttonModify);
- this.tabPagePrograms.Controls.Add(this.listViewButtons);
this.tabPagePrograms.Controls.Add(this.buttonDelete);
this.tabPagePrograms.Controls.Add(this.buttonNew);
+ this.tabPagePrograms.Controls.Add(this.listViewButtons);
+ this.tabPagePrograms.Controls.Add(this.listViewPrograms);
this.tabPagePrograms.Location = new System.Drawing.Point(4, 22);
this.tabPagePrograms.Name = "tabPagePrograms";
this.tabPagePrograms.Padding = new System.Windows.Forms.Padding(3);
- this.tabPagePrograms.Size = new System.Drawing.Size(432, 374);
+ this.tabPagePrograms.Size = new System.Drawing.Size(520, 374);
this.tabPagePrograms.TabIndex = 0;
this.tabPagePrograms.Text = "Programs";
this.tabPagePrograms.UseVisualStyleBackColor = true;
@@ -298,15 +270,15 @@
this.tabPageEvents.Location = new System.Drawing.Point(4, 22);
this.tabPageEvents.Name = "tabPageEvents";
this.tabPageEvents.Padding = new System.Windows.Forms.Padding(3);
- this.tabPageEvents.Size = new System.Drawing.Size(432, 374);
- this.tabPageEvents.TabIndex = 2;
+ this.tabPageEvents.Size = new System.Drawing.Size(520, 374);
+ this.tabPageEvents.TabIndex = 1;
this.tabPageEvents.Text = "Events";
this.tabPageEvents.UseVisualStyleBackColor = true;
//
// buttonSetCommand
//
this.buttonSetCommand.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonSetCommand.Location = new System.Drawing.Point(368, 344);
+ this.buttonSetCommand.Location = new System.Drawing.Point(456, 344);
this.buttonSetCommand.Name = "buttonSetCommand";
this.buttonSetCommand.Size = new System.Drawing.Size(56, 24);
this.buttonSetCommand.TabIndex = 6;
@@ -317,7 +289,7 @@
// buttonAddEvent
//
this.buttonAddEvent.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonAddEvent.Location = new System.Drawing.Point(368, 312);
+ this.buttonAddEvent.Location = new System.Drawing.Point(456, 312);
this.buttonAddEvent.Name = "buttonAddEvent";
this.buttonAddEvent.Size = new System.Drawing.Size(56, 24);
this.buttonAddEvent.TabIndex = 3;
@@ -343,7 +315,7 @@
this.comboBoxCommands.FormattingEnabled = true;
this.comboBoxCommands.Location = new System.Drawing.Point(88, 344);
this.comboBoxCommands.Name = "comboBoxCommands";
- this.comboBoxCommands.Size = new System.Drawing.Size(272, 21);
+ this.comboBoxCommands.Size = new System.Drawing.Size(352, 21);
this.comboBoxCommands.TabIndex = 5;
//
// labelEvent
@@ -364,7 +336,7 @@
this.comboBoxEvents.FormattingEnabled = true;
this.comboBoxEvents.Location = new System.Drawing.Point(88, 312);
this.comboBoxEvents.Name = "comboBoxEvents";
- this.comboBoxEvents.Size = new System.Drawing.Size(272, 21);
+ this.comboBoxEvents.Size = new System.Drawing.Size(352, 21);
this.comboBoxEvents.TabIndex = 2;
//
// listViewEventMap
@@ -374,14 +346,15 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.listViewEventMap.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.columnHeaderEvent,
- this.columnHeader1});
+ this.columnHeaderEventCommand});
+ this.listViewEventMap.ContextMenuStrip = this.contextMenuStripEvents;
this.listViewEventMap.FullRowSelect = true;
this.listViewEventMap.GridLines = true;
this.listViewEventMap.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
this.listViewEventMap.HideSelection = false;
this.listViewEventMap.Location = new System.Drawing.Point(8, 8);
this.listViewEventMap.Name = "listViewEventMap";
- this.listViewEventMap.Size = new System.Drawing.Size(416, 296);
+ this.listViewEventMap.Size = new System.Drawing.Size(504, 296);
this.listViewEventMap.TabIndex = 0;
this.listViewEventMap.UseCompatibleStateImageBehavior = false;
this.listViewEventMap.View = System.Windows.Forms.View.Details;
@@ -391,83 +364,29 @@
// columnHeaderEvent
//
this.columnHeaderEvent.Text = "Event";
- this.columnHeaderEvent.Width = 163;
+ this.columnHeaderEvent.Width = 200;
//
- // columnHeader1
+ // columnHeaderEventCommand
//
- this.columnHeader1.Text = "Command";
- this.columnHeader1.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
- this.columnHeader1.Width = 230;
+ this.columnHeaderEventCommand.Text = "Command";
+ this.columnHeaderEventCommand.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
+ this.columnHeaderEventCommand.Width = 280;
//
- // tabPageIRCommands
+ // contextMenuStripEvents
//
- this.tabPageIRCommands.Controls.Add(this.listViewIR);
- this.tabPageIRCommands.Controls.Add(this.buttonNewIR);
- this.tabPageIRCommands.Controls.Add(this.buttonEditIR);
- this.tabPageIRCommands.Controls.Add(this.buttonDeleteIR);
- this.tabPageIRCommands.Location = new System.Drawing.Point(4, 22);
- this.tabPageIRCommands.Name = "tabPageIRCommands";
- this.tabPageIRCommands.Padding = new System.Windows.Forms.Padding(3);
- this.tabPageIRCommands.Size = new System.Drawing.Size(432, 374);
- this.tabPageIRCommands.TabIndex = 2;
- this.tabPageIRCommands.Text = "IR Commands";
- this.tabPageIRCommands.UseVisualStyleBackColor = true;
+ this.contextMenuStripEvents.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.removeEventToolStripMenuItem});
+ this.contextMenuStripEvents.Name = "contextMenuStripEvents";
+ this.contextMenuStripEvents.Size = new System.Drawing.Size(125, 26);
//
- // listViewIR
+ // removeEventToolStripMenuItem
//
- this.listViewIR.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.listViewIR.FullRowSelect = true;
- this.listViewIR.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
- this.listViewIR.HideSelection = false;
- this.listViewIR.LabelEdit = true;
- this.listViewIR.Location = new System.Drawing.Point(8, 8);
- this.listViewIR.MultiSelect = false;
- this.listViewIR.Name = "listViewIR";
- this.listViewIR.Size = new System.Drawing.Size(416, 328);
- this.listViewIR.TabIndex = 0;
- this.listViewIR.UseCompatibleStateImageBehavior = false;
- this.listViewIR.View = System.Windows.Forms.View.List;
- this.listViewIR.DoubleClick += new System.EventHandler(this.listViewIR_DoubleClick);
- this.listViewIR.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.listViewIR_AfterLabelEdit);
+ this.removeEventToolStripMenuItem.Image = global::Translator.Properties.Resources.Delete;
+ this.removeEventToolStripMenuItem.Name = "removeEventToolStripMenuItem";
+ this.removeEventToolStripMenuItem.Size = new System.Drawing.Size(124, 22);
+ this.removeEventToolStripMenuItem.Text = "&Remove";
+ this.removeEventToolStripMenuItem.Click += new System.EventHandler(this.removeEventToolStripMenuItem_Click);
//
- // buttonNewIR
- //
- this.buttonNewIR.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.buttonNewIR.Location = new System.Drawing.Point(8, 344);
- this.buttonNewIR.Name = "buttonNewIR";
- this.buttonNewIR.Size = new System.Drawing.Size(56, 24);
- this.buttonNewIR.TabIndex = 1;
- this.buttonNewIR.Text = "New";
- this.toolTip.SetToolTip(this.buttonNewIR, "Learn a new IR Command");
- this.buttonNewIR.UseVisualStyleBackColor = true;
- this.buttonNewIR.Click += new System.EventHandler(this.buttonNewIR_Click);
- //
- // buttonEditIR
- //
- this.buttonEditIR.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.buttonEditIR.Location = new System.Drawing.Point(72, 344);
- this.buttonEditIR.Name = "buttonEditIR";
- this.buttonEditIR.Size = new System.Drawing.Size(56, 24);
- this.buttonEditIR.TabIndex = 2;
- this.buttonEditIR.Text = "Edit";
- this.toolTip.SetToolTip(this.buttonEditIR, "Re-Learn the currently selected IR Command");
- this.buttonEditIR.UseVisualStyleBackColor = true;
- this.buttonEditIR.Click += new System.EventHandler(this.buttonEditIR_Click);
- //
- // buttonDeleteIR
- //
- this.buttonDeleteIR.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.buttonDeleteIR.Location = new System.Drawing.Point(136, 344);
- this.buttonDeleteIR.Name = "buttonDeleteIR";
- this.buttonDeleteIR.Size = new System.Drawing.Size(56, 24);
- this.buttonDeleteIR.TabIndex = 3;
- this.buttonDeleteIR.Text = "Delete";
- this.toolTip.SetToolTip(this.buttonDeleteIR, "Delete the currently selected IR Command");
- this.buttonDeleteIR.UseVisualStyleBackColor = true;
- this.buttonDeleteIR.Click += new System.EventHandler(this.buttonDeleteIR_Click);
- //
// tabPageMacro
//
this.tabPageMacro.Controls.Add(this.listViewMacro);
@@ -478,8 +397,8 @@
this.tabPageMacro.Location = new System.Drawing.Point(4, 22);
this.tabPageMacro.Name = "tabPageMacro";
this.tabPageMacro.Padding = new System.Windows.Forms.Padding(3);
- this.tabPageMacro.Size = new System.Drawing.Size(432, 374);
- this.tabPageMacro.TabIndex = 3;
+ this.tabPageMacro.Size = new System.Drawing.Size(520, 374);
+ this.tabPageMacro.TabIndex = 2;
this.tabPageMacro.Text = "Macros";
this.tabPageMacro.UseVisualStyleBackColor = true;
//
@@ -495,7 +414,7 @@
this.listViewMacro.Location = new System.Drawing.Point(8, 8);
this.listViewMacro.MultiSelect = false;
this.listViewMacro.Name = "listViewMacro";
- this.listViewMacro.Size = new System.Drawing.Size(416, 328);
+ this.listViewMacro.Size = new System.Drawing.Size(504, 328);
this.listViewMacro.TabIndex = 5;
this.listViewMacro.UseCompatibleStateImageBehavior = false;
this.listViewMacro.View = System.Windows.Forms.View.List;
@@ -550,6 +469,75 @@
this.buttonEditMacro.UseVisualStyleBackColor = true;
this.buttonEditMacro.Click += new System.EventHandler(this.buttonEditMacro_Click);
//
+ // tabPageIRCommands
+ //
+ this.tabPageIRCommands.Controls.Add(this.listViewIR);
+ this.tabPageIRCommands.Controls.Add(this.buttonNewIR);
+ this.tabPageIRCommands.Controls.Add(this.buttonEditIR);
+ this.tabPageIRCommands.Controls.Add(this.buttonDeleteIR);
+ this.tabPageIRCommands.Location = new System.Drawing.Point(4, 22);
+ this.tabPageIRCommands.Name = "tabPageIRCommands";
+ this.tabPageIRCommands.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPageIRCommands.Size = new System.Drawing.Size(520, 374);
+ this.tabPageIRCommands.TabIndex = 3;
+ this.tabPageIRCommands.Text = "IR Commands";
+ this.tabPageIRCommands.UseVisualStyleBackColor = true;
+ //
+ // listViewIR
+ //
+ this.listViewIR.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.listViewIR.FullRowSelect = true;
+ this.listViewIR.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
+ this.listViewIR.HideSelection = false;
+ this.listViewIR.LabelEdit = true;
+ this.listViewIR.Location = new System.Drawing.Point(8, 8);
+ this.listViewIR.MultiSelect = false;
+ this.listViewIR.Name = "listViewIR";
+ this.listViewIR.Size = new System.Drawing.Size(504, 328);
+ this.listViewIR.TabIndex = 0;
+ this.listViewIR.UseCompatibleStateImageBehavior = false;
+ this.listViewIR.View = System.Windows.Forms.View.List;
+ this.listViewIR.DoubleClick += new System.EventHandler(this.listViewIR_DoubleClick);
+ this.listViewIR.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.listViewIR_AfterLabelEdit);
+ //
+ // buttonNewIR
+ //
+ this.buttonNewIR.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.buttonNewIR.Location = new System.Drawing.Point(8, 344);
+ this.buttonNewIR.Name = "buttonNewIR";
+ this.buttonNewIR.Size = new System.Drawing.Size(56, 24);
+ this.buttonNewIR.TabIndex = 1;
+ this.buttonNewIR.Text = "New";
+ this.toolTip.SetToolTip(this.buttonNewIR, "Learn a new IR Command");
+ this.buttonNewIR.UseVisualStyleBackColor = true;
+ this.buttonNewIR.Click += new System.EventHandler(this.buttonNewIR_Click);
+ //
+ // buttonEditIR
+ //
+ this.buttonEditIR.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.buttonEditIR.Location = new System.Drawing.Point(72, 344);
+ this.buttonEditIR.Name = "buttonEditIR";
+ this.buttonEditIR.Size = new System.Drawing.Size(56, 24);
+ this.buttonEditIR.TabIndex = 2;
+ this.buttonEditIR.Text = "Edit";
+ this.toolTip.SetToolTip(this.buttonEditIR, "Re-Learn the currently selected IR Command");
+ this.buttonEditIR.UseVisualStyleBackColor = true;
+ this.buttonEditIR.Click += new System.EventHandler(this.buttonEditIR_Click);
+ //
+ // buttonDeleteIR
+ //
+ this.buttonDeleteIR.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.buttonDeleteIR.Location = new System.Drawing.Point(136, 344);
+ this.buttonDeleteIR.Name = "buttonDeleteIR";
+ this.buttonDeleteIR.Size = new System.Drawing.Size(56, 24);
+ this.buttonDeleteIR.TabIndex = 3;
+ this.buttonDeleteIR.Text = "Delete";
+ this.toolTip.SetToolTip(this.buttonDeleteIR, "Delete the currently selected IR Command");
+ this.buttonDeleteIR.UseVisualStyleBackColor = true;
+ this.buttonDeleteIR.Click += new System.EventHandler(this.buttonDeleteIR_Click);
+ //
// checkBoxAutoRun
//
this.checkBoxAutoRun.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
@@ -570,7 +558,7 @@
this.helpToolStripMenuItem});
this.menuStrip.Location = new System.Drawing.Point(0, 0);
this.menuStrip.Name = "menuStrip";
- this.menuStrip.Size = new System.Drawing.Size(456, 24);
+ this.menuStrip.Size = new System.Drawing.Size(544, 24);
this.menuStrip.TabIndex = 0;
this.menuStrip.Text = "menuStrip";
//
@@ -586,58 +574,58 @@
this.toolStripSeparator2,
this.quitToolStripMenuItem});
this.configurationToolStripMenuItem.Name = "configurationToolStripMenuItem";
- this.configurationToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
+ this.configurationToolStripMenuItem.Size = new System.Drawing.Size(35, 20);
this.configurationToolStripMenuItem.Text = "&File";
//
// newToolStripMenuItem
//
this.newToolStripMenuItem.Name = "newToolStripMenuItem";
- this.newToolStripMenuItem.Size = new System.Drawing.Size(122, 22);
+ this.newToolStripMenuItem.Size = new System.Drawing.Size(132, 22);
this.newToolStripMenuItem.Text = "&New";
this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click);
//
// openToolStripMenuItem
//
this.openToolStripMenuItem.Name = "openToolStripMenuItem";
- this.openToolStripMenuItem.Size = new System.Drawing.Size(122, 22);
+ this.openToolStripMenuItem.Size = new System.Drawing.Size(132, 22);
this.openToolStripMenuItem.Text = "&Open ...";
this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click);
//
// importToolStripMenuItem
//
this.importToolStripMenuItem.Name = "importToolStripMenuItem";
- this.importToolStripMenuItem.Size = new System.Drawing.Size(122, 22);
+ this.importToolStripMenuItem.Size = new System.Drawing.Size(132, 22);
this.importToolStripMenuItem.Text = "&Import ...";
this.importToolStripMenuItem.Click += new System.EventHandler(this.importToolStripMenuItem_Click);
//
// exportToolStripMenuItem
//
this.exportToolStripMenuItem.Name = "exportToolStripMenuItem";
- this.exportToolStripMenuItem.Size = new System.Drawing.Size(122, 22);
+ this.exportToolStripMenuItem.Size = new System.Drawing.Size(132, 22);
this.exportToolStripMenuItem.Text = "&Export ...";
this.exportToolStripMenuItem.Click += new System.EventHandler(this.exportToolStripMenuItem_Click);
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(119, 6);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(129, 6);
//
// serverToolStripMenuItem
//
this.serverToolStripMenuItem.Name = "serverToolStripMenuItem";
- this.serverToolStripMenuItem.Size = new System.Drawing.Size(122, 22);
+ this.serverToolStripMenuItem.Size = new System.Drawing.Size(132, 22);
this.serverToolStripMenuItem.Text = "&Server ...";
this.serverToolStripMenuItem.Click += new System.EventHandler(this.serverToolStripMenuItem_Click);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(119, 6);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(129, 6);
//
// quitToolStripMenuItem
//
this.quitToolStripMenuItem.Name = "quitToolStripMenuItem";
- this.quitToolStripMenuItem.Size = new System.Drawing.Size(122, 22);
+ this.quitToolStripMenuItem.Size = new System.Drawing.Size(132, 22);
this.quitToolStripMenuItem.Text = "&Quit";
this.quitToolStripMenuItem.Click += new System.EventHandler(this.quitToolStripMenuItem_Click);
//
@@ -647,20 +635,20 @@
this.translatorHelpToolStripMenuItem,
this.aboutToolStripMenuItem});
this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
- this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
+ this.helpToolStripMenuItem.Size = new System.Drawing.Size(40, 20);
this.helpToolStripMenuItem.Text = "&Help";
//
// translatorHelpToolStripMenuItem
//
this.translatorHelpToolStripMenuItem.Name = "translatorHelpToolStripMenuItem";
- this.translatorHelpToolStripMenuItem.Size = new System.Drawing.Size(122, 22);
+ this.translatorHelpToolStripMenuItem.Size = new System.Drawing.Size(129, 22);
this.translatorHelpToolStripMenuItem.Text = "&Contents";
this.translatorHelpToolStripMenuItem.Click += new System.EventHandler(this.translatorHelpToolStripMenuItem_Click);
//
// aboutToolStripMenuItem
//
this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
- this.aboutToolStripMenuItem.Size = new System.Drawing.Size(122, 22);
+ this.aboutToolStripMenuItem.Size = new System.Drawing.Size(129, 22);
this.aboutToolStripMenuItem.Text = "&About";
this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click);
//
@@ -679,26 +667,26 @@
this.AcceptButton = this.buttonOK;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(456, 472);
- this.Controls.Add(this.checkBoxAutoRun);
+ this.ClientSize = new System.Drawing.Size(544, 472);
this.Controls.Add(this.tabControl);
this.Controls.Add(this.buttonOK);
+ this.Controls.Add(this.checkBoxAutoRun);
this.Controls.Add(this.menuStrip);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MainMenuStrip = this.menuStrip;
this.MinimizeBox = false;
- this.MinimumSize = new System.Drawing.Size(472, 508);
+ this.MinimumSize = new System.Drawing.Size(472, 448);
this.Name = "MainForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Translator";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing);
this.Load += new System.EventHandler(this.MainForm_Load);
- this.groupBoxProgram.ResumeLayout(false);
this.tabControl.ResumeLayout(false);
this.tabPagePrograms.ResumeLayout(false);
this.tabPageEvents.ResumeLayout(false);
- this.tabPageIRCommands.ResumeLayout(false);
+ this.contextMenuStripEvents.ResumeLayout(false);
this.tabPageMacro.ResumeLayout(false);
+ this.tabPageIRCommands.ResumeLayout(false);
this.menuStrip.ResumeLayout(false);
this.menuStrip.PerformLayout();
this.ResumeLayout(false);
@@ -708,18 +696,13 @@
#endregion
- private System.Windows.Forms.ComboBox comboBoxProgram;
- private System.Windows.Forms.GroupBox groupBoxProgram;
- private System.Windows.Forms.Button buttonAddProgram;
private System.Windows.Forms.ListView listViewButtons;
private System.Windows.Forms.ColumnHeader columnHeaderButton;
private System.Windows.Forms.ColumnHeader columnHeaderCommand;
private System.Windows.Forms.Button buttonNew;
private System.Windows.Forms.Button buttonModify;
private System.Windows.Forms.Button buttonDelete;
- private System.Windows.Forms.Button buttonRemoveProgram;
private System.Windows.Forms.Button buttonClear;
- private System.Windows.Forms.Button buttonEditProgram;
private System.Windows.Forms.Button buttonOK;
private System.Windows.Forms.TabControl tabControl;
private System.Windows.Forms.TabPage tabPagePrograms;
@@ -740,7 +723,7 @@
private System.Windows.Forms.ComboBox comboBoxEvents;
private System.Windows.Forms.ListView listViewEventMap;
private System.Windows.Forms.ColumnHeader columnHeaderEvent;
- private System.Windows.Forms.ColumnHeader columnHeader1;
+ private System.Windows.Forms.ColumnHeader columnHeaderEventCommand;
private System.Windows.Forms.Button buttonSetCommand;
private System.Windows.Forms.Button buttonAddEvent;
private System.Windows.Forms.Label labelCommand;
@@ -762,6 +745,11 @@
private System.Windows.Forms.SaveFileDialog saveFileDialog;
private System.Windows.Forms.ListView listViewIR;
private System.Windows.Forms.ListView listViewMacro;
+ private System.Windows.Forms.ListView listViewPrograms;
+ private System.Windows.Forms.ImageList imageListPrograms;
+ private System.Windows.Forms.ContextMenuStrip contextMenuStripPrograms;
+ private System.Windows.Forms.ContextMenuStrip contextMenuStripEvents;
+ private System.Windows.Forms.ToolStripMenuItem removeEventToolStripMenuItem;
}
}
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2007-11-02 14:13:28 UTC (rev 1017)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2007-11-03 12:41:55 UTC (rev 1018)
@@ -19,6 +19,12 @@
partial class MainForm : Form
{
+ #region Constants
+
+ const string SystemWide = "System Wide";
+
+ #endregion Constants
+
#region Enumerations
/// <summary>
@@ -87,6 +93,10 @@
#region Variables
LearnIR _learnIR;
+
+ ToolStripMenuItem _addProgramToolStripMenuItem;
+ ToolStripMenuItem _editProgramToolStripMenuItem;
+ ToolStripMenuItem _removeProgramToolStripMenuItem;
#endregion Variables
@@ -97,12 +107,16 @@
InitializeComponent();
RefreshProgramList();
+ listViewPrograms.Items[0].Selected = true;
+
RefreshButtonList();
RefreshEventList();
RefreshEventCommands();
RefreshIRList();
RefreshMacroList();
+ SetupProgramsContextMenu();
+
try
{
checkBoxAutoRun.Checked = SystemRegistry.GetAutoRun("Translator");
@@ -114,14 +128,27 @@
void RefreshProgramList()
{
- comboBoxProgram.Items.Clear();
- comboBoxProgram.Items.Add("System wide");
+ imageListPrograms.Images.Clear();
+ imageListPrograms.Images.Add(Properties.Resources.WinLogo);
+ listViewPrograms.Items.Clear();
+
+ ListViewItem newItem = new ListViewItem(SystemWide, 0);
+ newItem.ToolTipText = "Defines mappings that effect the whole computer";
+ listViewPrograms.Items.Add(newItem);
+
+ int imageIndex = 1;
foreach (ProgramSettings progSettings in Program.Config.Programs)
- comboBoxProgram.Items.Add(progSettings.Name);
+ {
+ Icon icon = Win32.GetIconFor(progSettings.Filename);
- comboBoxProgram.SelectedIndex = 0;
+ imageListPrograms.Images.Add(icon);
+ newItem = new ListViewItem(progSettings.Name, imageIndex++);
+ newItem.ToolTipText = progSettings.Filename;
+ listViewPrograms.Items.Add(newItem);
+ }
+
Program.UpdateNotifyMenu();
}
void RefreshButtonList()
@@ -210,14 +237,13 @@
List<ButtonMapping> GetCurrentSettings()
{
- string selectedItem = comboBoxProgram.SelectedItem as string;
+ if (listViewPrograms.SelectedItems.Count == 0)
+ return null;
- if (selectedItem == null)
+ string selectedItem = listViewPrograms.SelectedItems[0].Text;
+
+ if (selectedItem == SystemWide)
{
- return null;
- }
- else if (selectedItem == "System wide")
- {
return Program.Config.SystemWideMappings;
}
else
@@ -230,6 +256,59 @@
return null;
}
+ void SetupProgramsContextMenu()
+ {
+ _addProgramToolStripMenuItem = new ToolStripMenuItem("&Add Program", Properties.Resources.Plus, new EventHandler(addProgramToolStripMenuItem_Click));
+ _editProgramToolStripMenuItem = new ToolStripMenuItem("&Edit Program", Properties.Resources.Edit, new EventHandler(editProgramToolStripMenuItem_Click));
+ _removeProgramToolStripMenuItem = new ToolStripMenuItem("&Remove Program", Properties.Resources.Delete, new EventHandler(removeProgramToolStripMenuItem_Click));
+
+ contextMenuStripPrograms.Items.Add(_addProgramToolStripMenuItem);
+ contextMenuStripPrograms.Items.Add(_editProgramToolStripMenuItem);
+ contextMenuStripPrograms.Items.Add(_removeProgramToolStripMenuItem);
+ }
+ void RefreshProgramsContextMenu()
+ {
+ if (listViewPrograms.SelectedItems.Count == 0 ||
+ listViewPrograms.SelectedItems[0].Text == SystemWide)
+ {
+ _editProgramToolStripMenuItem.Enabled = false;
+ _removeProgramToolStripMenuItem.Enabled = false;
+ }
+ else
+ {
+ _editProgramToolStripMenuItem.Enabled = true;
+ _removeProgramToolStripMenuItem.Enabled = true;
+ }
+
+ if (listViewPrograms.SelectedItems.Count == 0)
+ {
+ _editProgramToolStripMenuItem.Text = "&Edit ...";
+ _removeProgramToolStripMenuItem.Text = "&Remove ...";
+ }/*
+ else if (listViewPrograms.SelectedItems[0].Text == SystemWide)
+ {
+ }*/
+ else
+ {
+ string program = listViewPrograms.SelectedItems[0].Text;
+ _editProgramToolStripMenuItem.Text = "&Edit \"" + program + "\"";
+ _removeProgramToolStripMenuItem.Text = "&Remove \"" + program + "\"";
+ }
+
+ }
+
+ void AddProgram()
+ {
+ ProgramSettings progSettings = new ProgramSettings();
+
+ if (EditProgram(progSettings))
+ {
+ Program.Config.Programs.Add(progSettings);
+
+ RefreshProgramList();
+ }
+ }
+
bool EditProgram(ProgramSettings progSettings)
{
EditProgramForm editProg = new EditProgramForm(progSettings);
@@ -250,7 +329,27 @@
return false;
}
+ bool EditProgram(string programName)
+ {
+ foreach (ProgramSettings progSettings in Program.Config.Programs)
+ {
+ if (progSettings.Name.Equals(programName))
+ {
+ if (EditProgram(progSettings))
+ {
+ RefreshProgramList();
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ }
+ return false;
+ }
+
void EditIR()
{
if (listViewIR.SelectedItems.Count != 1)
@@ -378,71 +477,6 @@
}
}
- private void comboBoxProgram_SelectedIndexChanged(object sender, EventArgs e)
- {
- if ((comboBoxProgram.SelectedItem as string) == "System wide")
- {
- buttonRemoveProgram.Enabled = false;
- buttonEditProgram.Enabled = false;
- }
- else
- {
- buttonRemoveProgram.Enabled = true;
- buttonEditProgram.Enabled = true;
- }
-
- RefreshButtonList();
- }
-
- private void buttonAddProgram_Click(object sender, EventArgs e)
- {
- ProgramSettings progSettings = new ProgramSettings();
-
- if (EditProgram(progSettings))
- {
- // TODO: check for duplicates in Program.Config.Programs ...
-
- comboBoxProgram.Items.Add(progSettings.Name);
- Program.Config.Programs.Add(progSettings);
- comboBoxProgram.SelectedIndex = comboBoxProgram.Items.Count - 1;
- }
- }
- private void buttonRemoveProgram_Click(object sender, EventArgs e)
- {
- ProgramSettings progSettings = null;
-
- foreach (ProgramSettings settings in Program.Config.Programs)
- {
- if (settings.Name == comboBoxProgram.SelectedItem as string)
- {
- progSettings = settings;
- }
- }
-
- if (progSettings != null)
- {
- if (MessageBox.Show(this, String.Format("Are you sure you want to remove all mappings for {0}?", progSettings.Name), String.Format("Remove {0}?", progSettings.Name), MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
- {
- Program.Config.Programs.Remove(progSettings);
- comboBoxProgram.Items.Remove(comboBoxProgram.SelectedItem);
- comboBoxProgram.SelectedIndex = 0;
-
- Program.UpdateNotifyMenu();
- }
- }
- }
- private void buttonEditProgram_Click(object sender, EventArgs e)
- {
- foreach (ProgramSettings progSettings in Program.Config.Programs)
- if (progSettings.Name == comboBoxProgram.SelectedItem as string)
- if (EditProgram(progSettings))
- {
- comboBoxProgram.Items.Remove(comboBoxProgram.SelectedItem);
- comboBoxProgram.Items.Add(progSettings.Name);
- comboBoxProgram.SelectedItem = progSettings.Name;
- }
- }
-
private void buttonNew_Click(object sender, EventArgs e)
{
GetKeyCodeForm getKeyCode = new GetKeyCodeForm();
@@ -716,16 +750,18 @@
return;
}
- if (!Common.IsValidFileName(e.Label))
+ string name = e.Label.Trim();
+
+ if (!Common.IsValidFileName(name))
{
- MessageBox.Show("File name not valid: " + e.Label, "Cannot rename, New file name not valid", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ MessageBox.Show("File name not valid: " + name, "Cannot rename, New file name not valid", MessageBoxButtons.OK, MessageBoxIcon.Error);
e.CancelEdit = true;
return;
}
try
{
- string newFileName = Common.FolderIRCommands + e.Label + Common.FileExtensionIR;
+ string newFileName = Common.FolderIRCommands + name + Common.FileExtensionIR;
File.Move(oldFileName, newFileName);
}
@@ -760,16 +796,18 @@
return;
}
- if (!Common.IsValidFileName(e.Label))
+ string name = e.Label.Trim();
+
+ if (!Common.IsValidFileName(name))
{
- MessageBox.Show("File name not valid: " + e.Label, "Cannot rename, New file name not valid", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ MessageBox.Show("File name not valid: " + name, "Cannot rename, New file name not valid", MessageBoxButtons.OK, MessageBoxIcon.Error);
e.CancelEdit = true;
return;
}
try
{
- string newFileName = Program.FolderMacros + e.Label + Common.FileExtensionMacro;
+ string newFileName = Program.FolderMacros + name + Common.FileExtensionMacro;
File.Move(oldFileName, newFileName);
}
@@ -790,11 +828,12 @@
private void buttonAddEvent_Click(object sender, EventArgs e)
{
- listViewEventMap.Items.Add(
- new ListViewItem(
- new string[] { comboBoxEvents.SelectedItem as string, String.Empty }
- )
- );
+ ListViewItem newItem =
+ new ListViewItem(new string[] { comboBoxEvents.SelectedItem as string, String.Empty });
+
+ listViewEventMap.SelectedIndices.Clear();
+ listViewEventMap.Items.Add(newItem);
+ newItem.Selected = true;
}
private void buttonSetCommand_Click(object sender, EventArgs e)
{
@@ -870,7 +909,6 @@
foreach (ListViewItem listViewItem in listViewEventMap.SelectedItems)
listViewEventMap.Items.Remove(listViewItem);
}
-
private void listViewEventMap_DoubleClick(object sender, EventArgs e)
{
if (listViewEventMap.SelectedItems.Count != 1)
@@ -936,6 +974,20 @@
listViewEventMap.SelectedItems[0].SubItems[1].Text = command;
}
+ private void listViewPrograms_DoubleClick(object sender, EventArgs e)
+ {
+ if (listViewPrograms.SelectedItems.Count == 1 && listViewPrograms.SelectedItems[0].Text != SystemWide)
+ {
+ string selectedItem = listViewPrograms.SelectedItems[0].Text;
+
+ EditProgram(selectedItem);
+ }
+ }
+ private void listViewPrograms_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ RefreshButtonList();
+ }
+
#endregion Controls
#region Menu
@@ -1034,6 +1086,55 @@
MessageBox.Show(this, "Translator\nVersion 1.0.3.5 for IR Server Suite\nBy Aaron Dinnage, 2007", "About Translator", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
+ private void addProgramToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ AddProgram();
+ }
+ private void editProgramToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ if (listViewPrograms.SelectedItems.Count == 0)
+ return;
+
+ stri...
[truncated message content] |
|
From: <rs...@us...> - 2007-11-02 14:13:31
|
Revision: 1017
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1017&view=rev
Author: rsparey
Date: 2007-11-02 07:13:28 -0700 (Fri, 02 Nov 2007)
Log Message:
-----------
working on tv section with new layout
Modified Paths:
--------------
trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicgenres.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicsongs.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/myradio.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvguide.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvhome.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvrecordedtv.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvsearch.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideo.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideoTitle.xml
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicgenres.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicgenres.xml 2007-10-30 19:57:43 UTC (rev 1016)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicgenres.xml 2007-11-02 14:13:28 UTC (rev 1017)
@@ -169,7 +169,7 @@
<animation effect="fade" time="1000" delay="500" >WindowOpen</animation>
<animation effect="fade" time="1000" delay="500">WindowClose</animation>
<animation effect="zoom" start="100,100" end="140,140" center="1168,685" time="300" acceleration ="-1" >Focus</animation>
- <animation effect="zoom" start="140,140" end="100,100" center="1165,665" time="300" acceleration ="-1" >Unfocus</animation>
+ <animation effect="zoom" start="140,140" end="100,100" center="1165,685" time="300" acceleration ="-1" >Unfocus</animation>
</control>
<control>
@@ -197,8 +197,8 @@
<ondown>21</ondown>
<animation effect="fade" time="1000" delay="500" >WindowOpen</animation>
<animation effect="fade" time="1000" delay="500">WindowClose</animation>
- <animation effect="zoom" start="100,100" end="140,140" center="1238,685" time="300" acceleration ="-1" >Focus</animation>
- <animation effect="zoom" start="140,140" end="100,100" center="1238,665" time="300" acceleration ="-1" >Unfocus</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="1238,685" time="300" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="140,140" end="100,100" center="1238,685" time="300" acceleration ="-1" >Unfocus</animation>
</control>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicsongs.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicsongs.xml 2007-10-30 19:57:43 UTC (rev 1016)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicsongs.xml 2007-11-02 14:13:28 UTC (rev 1017)
@@ -171,7 +171,7 @@
<animation effect="fade" time="1000" delay="500" >WindowOpen</animation>
<animation effect="fade" time="1000" delay="500">WindowClose</animation>
<animation effect="zoom" start="100,100" end="140,140" center="1168,685" time="300" acceleration ="-1" >Focus</animation>
- <animation effect="zoom" start="140,140" end="100,100" center="1165,665" time="300" acceleration ="-1" >Unfocus</animation>
+ <animation effect="zoom" start="140,140" end="100,100" center="1165,685" time="300" acceleration ="-1" >Unfocus</animation>
</control>
<control>
@@ -199,8 +199,8 @@
<ondown>21</ondown>
<animation effect="fade" time="1000" delay="500" >WindowOpen</animation>
<animation effect="fade" time="1000" delay="500">WindowClose</animation>
- <animation effect="zoom" start="100,100" end="140,140" center="1238,685" time="300" acceleration ="-1" >Focus</animation>
- <animation effect="zoom" start="140,140" end="100,100" center="1238,665" time="300" acceleration ="-1" >Unfocus</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="1238,685" time="300" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="140,140" end="100,100" center="1238,685" time="300" acceleration ="-1" >Unfocus</animation>
</control>
<control>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/myradio.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/myradio.xml 2007-10-30 19:57:43 UTC (rev 1016)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/myradio.xml 2007-11-02 14:13:28 UTC (rev 1017)
@@ -158,7 +158,7 @@
<animation effect="fade" time="1000" delay="500" >WindowOpen</animation>
<animation effect="fade" time="1000" delay="500">WindowClose</animation>
<animation effect="zoom" start="100,100" end="140,140" center="1168,685" time="300" acceleration ="-1" >Focus</animation>
- <animation effect="zoom" start="140,140" end="100,100" center="1165,665" time="300" acceleration ="-1" >Unfocus</animation>
+ <animation effect="zoom" start="140,140" end="100,100" center="1165,685" time="300" acceleration ="-1" >Unfocus</animation>
</control>
<control>
@@ -186,8 +186,8 @@
<ondown>21</ondown>
<animation effect="fade" time="1000" delay="500" >WindowOpen</animation>
<animation effect="fade" time="1000" delay="500">WindowClose</animation>
- <animation effect="zoom" start="100,100" end="140,140" center="1238,685" time="300" acceleration ="-1" >Focus</animation>
- <animation effect="zoom" start="140,140" end="100,100" center="1238,665" time="300" acceleration ="-1" >Unfocus</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="1238,685" time="300" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="140,140" end="100,100" center="1238,685" time="300" acceleration ="-1" >Unfocus</animation>
</control>
<control>
<description>Selected item Label</description>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvguide.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvguide.xml 2007-10-30 19:57:43 UTC (rev 1016)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvguide.xml 2007-11-02 14:13:28 UTC (rev 1017)
@@ -19,8 +19,45 @@
<texture>top-strip.png</texture>
</control>
+ <control>
+ <type>image</type>
+ <decription>lowbar info block</decription>
+ <id>1</id>
+ <posX>12</posX>
+ <posY>590</posY>
+ <width>1342</width>
+ <height>168</height>
+ <texture>lowbar.png</texture>
+ </control>
+ <control>
+ <description>home BM Radio</description>
+ <type>button</type>
+ <id>04081980</id>
+ <posX>1002</posX>
+ <posY>635</posY>
+ <width>50</width>
+ <height>100</height>
+ <textureFocus>Radio.png</textureFocus>
+ <textureNoFocus>Radio.png</textureNoFocus>
+ <thumbZoom>yes</thumbZoom>
+ <hyperlink>30</hyperlink>
+ <label>665</label>
+ <textcolor>00ffffff</textcolor>
+ <textcolorNoFocus>00ffffff</textcolorNoFocus>
+ <onleft>7</onleft>
+ <onright>05081980</onright>
+ <onup>50</onup>
+ <ondown>21</ondown>
+ <animation effect="fade" time="1000" delay="1000" >WindowOpen</animation>
+ <animation effect="fade" time="1000">WindowClose</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="1027,685" time="300" acceleration ="-1" >Focus</animation>
- <control>
+ <animation effect="zoom" start="140,140" end="100,100" center="1027,685" time="300" acceleration ="-1" >Unfocus</animation>
+ </control>
+
+
+
+ <control>
<description>icon background</description>
<type>image</type>
<id>1</id>
@@ -81,7 +118,7 @@
<width>24</width>
<height>24</height>
<posX>43</posX>
- <posY>160</posY>
+ <posY>105</posY>
<showrange>no</showrange>
<orientation>horizontal</orientation>
<align>center</align>
@@ -114,9 +151,9 @@
<type>image</type>
<id>2</id>
<posX>5</posX>
- <posY>200</posY>
+ <posY>100</posY>
<width>1322</width>
- <height>380</height>
+ <height>486</height>
<colordiffuse>60ffffff</colordiffuse>
<texture>-</texture>
<animation effect="fade" time="250">WindowOpen</animation>
@@ -127,7 +164,7 @@
<type>label</type>
<id>32</id>
<posX>240</posX>
- <posY>160</posY>
+ <posY>100</posY>
<font>font10</font>
<align>left</align>
<textcolor>FFFFFFFF</textcolor>
@@ -139,9 +176,9 @@
<type>image</type>
<id>33</id>
<posX>200</posX>
- <posY>158</posY>
+ <posY>100</posY>
<width>35</width>
- <height>35</height>
+ <height>38</height>
<keepaspectratio>yes</keepaspectratio>
<zoom>yes</zoom>
<texture>defaultVideoBig.png</texture>
@@ -157,7 +194,7 @@
<posX>200</posX>
<posY>100</posY>
<width>209</width>
- <height>36</height>
+ <height>38</height>
<texture>tab_up.png</texture>
<animation effect="fade" time="250">WindowOpen</animation>
<animation effect="fade" time="500">WindowClose</animation>
@@ -179,9 +216,9 @@
<type>image</type>
<id>20</id>
<posX>50</posX>
- <posY>200</posY>
+ <posY>140</posY>
<width>155</width>
- <height>35</height>
+ <height>40</height>
<animation effect="fade" time="250">WindowOpen</animation>
<animation effect="fade" time="500">WindowClose</animation>
</control>
@@ -189,8 +226,8 @@
<description>Channel image template</description>
<type>image</type>
<id>7</id>
- <width>36</width>
- <height>32</height>
+ <width>40</width>
+ <height>40</height>
<zoom>no</zoom>
<texture>defaultVideoBig.png</texture>
<animation effect="fade" time="250">WindowOpen</animation>
@@ -214,7 +251,7 @@
<type>fadelabel</type>
<id>13</id>
<posX>400</posX>
- <posY>580</posY>
+ <posY>587</posY>
<width>600</width>
<label>#TV.Guide.Title</label>
<font>font16</font>
@@ -227,7 +264,7 @@
<type>label</type>
<id>14</id>
<posX>230</posX>
- <posY>585</posY>
+ <posY>593</posY>
<label>#TV.Guide.Time</label>
<align>left</align>
<font>font14</font>
@@ -240,7 +277,7 @@
<type>label</type>
<id>27</id>
<posX>1320</posX>
- <posY>580</posY>
+ <posY>590</posY>
<label>#TV.Guide.Genre</label>
<align>Right</align>
<font>font14</font>
@@ -254,14 +291,12 @@
<id>15</id>
<posX>230</posX>
<posY>620</posY>
- <width>1100</width>
+ <width>700</width>
<height>93</height>
<seperator>----------------------------------------------------------------------------------------------</seperator>
<label>#TV.Guide.Description</label>
<font>font14</font>
<textcolor>FFFFFFFF</textcolor>
- <animation effect="slide" time="500" start="2000,0" end="0,0" delay="800" acceleration="-1">WindowOpen</animation>
- <animation effect="slide" time="500" start="0,0" end="2000,0" acceleration="-1">WindowClose</animation>
</control>
<!-- <control>
<description>template for program genre light area</description>
@@ -287,8 +322,8 @@
<type>image</type>
<id>25</id>
<posX>55</posX>
- <posY>200</posY>
- <height>280</height>
+ <posY>140</posY>
+ <height>445</height>
<colordiffuse>c0ffffff</colordiffuse>
<texture>tvguide_slider.png</texture>
<animation effect="fade" time="250">WindowOpen</animation>
@@ -319,5 +354,7 @@
<animation effect="fade" time="250">WindowOpen</animation>
<animation effect="fade" time="500">WindowClose</animation>
</control>
+
+
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvhome.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvhome.xml 2007-10-30 19:57:43 UTC (rev 1016)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvhome.xml 2007-11-02 14:13:28 UTC (rev 1017)
@@ -29,9 +29,131 @@
<width>1342</width>
<height>36</height>
<texture>top-strip.png</texture>
-
</control>
+ <control>
+ <type>image</type>
+ <decription>lowbar info block</decription>
+ <id>1</id>
+ <posX>12</posX>
+ <posY>590</posY>
+ <width>1342</width>
+ <height>168</height>
+ <texture>lowbar.png</texture>
+ </control>
+ <control>
+ <description>home BM Radio</description>
+ <type>button</type>
+ <id>04081980</id>
+ <posX>1002</posX>
+ <posY>635</posY>
+ <width>50</width>
+ <height>100</height>
+ <textureFocus>Radio.png</textureFocus>
+ <textureNoFocus>Radio.png</textureNoFocus>
+ <thumbZoom>yes</thumbZoom>
+ <hyperlink>30</hyperlink>
+ <label>665</label>
+ <textcolor>00ffffff</textcolor>
+ <textcolorNoFocus>00ffffff</textcolorNoFocus>
+ <onleft>7</onleft>
+ <onright>05081980</onright>
+ <onup>99</onup>
+ <ondown>21</ondown>
+ <animation effect="fade" time="1000" delay="1000" >WindowOpen</animation>
+ <animation effect="fade" time="1000">WindowClose</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="1027,685" time="300" acceleration ="-1" >Focus</animation>
+
+ <animation effect="zoom" start="140,140" end="100,100" center="1027,685" time="300" acceleration ="-1" >Unfocus</animation>
+ </control>
+ <control>
+ <description>home BM Video</description>
+ <type>button</type>
+ <id>05081980</id>
+ <posX>1073</posX>
+ <posY>635</posY>
+ <width>50</width>
+ <height>100</height>
+ <textureFocus>Video.png</textureFocus>
+ <textureNoFocus>Video.png</textureNoFocus>
+ <hyperlink>6</hyperlink>
+ <hover>-</hover>
+ <hoverX>502</hoverX>
+ <hoverY>250</hoverY>
+ <hoverWidth>272</hoverWidth>
+ <hoverHeight>306</hoverHeight>
+ <label>3</label>
+ <textcolor>00ffffff</textcolor>
+ <textcolorNoFocus>00ffffff</textcolorNoFocus>
+ <onleft>04081980</onleft>
+ <onright>06081980</onright>
+ <onup>99</onup>
+ <ondown>21</ondown>
+ <animation effect="fade" time="1000" delay="750" >WindowOpen</animation>
+ <animation effect="fade" time="1000" delay="250" >WindowClose</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="1098,685" time="300" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="140,140" end="100,100" center="1098,685" time="300" acceleration ="-1" >Unfocus</animation>
+ </control>
+
+ <control>
+ <description>home Music</description>
+ <type>button</type>
+ <id>06081980</id>
+ <posX>1143</posX>
+ <posY>635</posY>
+ <width>50</width>
+ <height>100</height>
+ <textureFocus>Music.png</textureFocus>
+ <textureNoFocus>Music.png</textureNoFocus>
+ <hyperlink>501</hyperlink>
+ <label>605</label>
+ <textcolor>00ffffff</textcolor>
+ <textcolorNoFocus>00ffffff</textcolorNoFocus>
+ <hover>-</hover>
+ <hoverX>502</hoverX>
+ <hoverY>250</hoverY>
+ <hoverWidth>272</hoverWidth>
+ <hoverHeight>306</hoverHeight>
+ <onleft>05081980</onleft>
+ <onright>07081980</onright>
+ <onup>99</onup>
+ <ondown>21</ondown>
+ <animation effect="fade" time="1000" delay="500" >WindowOpen</animation>
+ <animation effect="fade" time="1000" delay="500">WindowClose</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="1168,685" time="300" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="140,140" end="100,100" center="1165,685" time="300" acceleration ="-1" >Unfocus</animation>
+ </control>
+
+ <control>
+ <description>home Pictures</description>
+ <type>button</type>
+ <id>07081980</id>
+ <posX>1213</posX>
+ <posY>635</posY>
+ <width>50</width>
+ <height>100</height>
+ <textureFocus>Pictures.png</textureFocus>
+ <textureNoFocus>Pictures.png</textureNoFocus>
+ <hyperlink>2</hyperlink>
+ <label>1</label>
+ <textcolor>00ffffff</textcolor>
+ <textcolorNoFocus>00ffffff</textcolorNoFocus>
+ <hover>-</hover>
+ <hoverX>502</hoverX>
+ <hoverY>250</hoverY>
+ <hoverWidth>272</hoverWidth>
+ <hoverHeight>306</hoverHeight>
+ <onleft>06081980</onleft>
+ <onright>11</onright>
+ <onup>99</onup>
+ <ondown>21</ondown>
+ <animation effect="fade" time="1000" delay="500" >WindowOpen</animation>
+ <animation effect="fade" time="1000" delay="500">WindowClose</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="1238,685" time="300" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="140,140" end="100,100" center="1238,685" time="300" acceleration ="-1" >Unfocus</animation>
+ </control>
+
+
<control>
<description>RECORDED TV</description>
<type>button</type>
@@ -52,7 +174,7 @@
<onup>41</onup>
<ondown>99</ondown>
- <onleft>22</onleft>
+ <onleft>07081980</onleft>
<onright>8</onright>
</control>
<control>
@@ -117,7 +239,7 @@
<width>209</width>
<height>36</height>
<onleft>2</onleft>
- <onright>11</onright>
+ <onright>04081980</onright>
<onup>21</onup>
<ondown>99</ondown>
<textureFocus>tab_down.png</textureFocus>
@@ -235,9 +357,10 @@
<description>record info label</description>
<type>fadelabel</type>
<id>23</id>
- <width>200</width>
+ <width>530</width>
<height>40</height>
- <posX>161</posX>
+ <posX>60</posX>
+ <posY>670</posY>
<label>#TV.Record.channel\r#TV.Record.title\r#TV.Record.start-#TV.Record.stop</label>
<font>font13</font>
<textcolor>White</textcolor>
@@ -428,12 +551,73 @@
<onleft>2</onleft>
<onright>2</onright>
<onup>11</onup>
- <ondown>11</ondown>
+ <ondown>04081980</ondown>
<action>18</action>
<textureFocus>tv_green_border.png</textureFocus>
<animation effect="fade" time="250">WindowOpen</animation>
<animation effect="fade" time="100">WindowClose</animation>
</control>
+ <control>
+ <type>image</type>
+ <description> mid selection box</description>
+ <id>1</id>
+ <posX>582</posX>
+ <posY>314</posY>
+ <width>203</width>
+ <height>140</height>
+ <texture>osd_mid box.png</texture>
+ <visible>Control.HasFocus(04081980)|Control.HasFocus(05081980)|Control.HasFocus(06081980)|Control.HasFocus(07081980)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <description> mid selection box - radio</description>
+ <id>1</id>
+ <posX>633</posX>
+ <posY>325</posY>
+ <width>100</width>
+ <height>200</height>
+ <texture>Radio.png</texture>
+ <visible>Control.HasFocus(04081980)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <description> mid selection box - Video</description>
+ <id>1</id>
+ <posX>633</posX>
+ <posY>325</posY>
+ <width>100</width>
+ <height>200</height>
+ <texture>Video.png</texture>
+ <visible>Control.HasFocus(05081980)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <description> mid selection box - music</description>
+ <id>1</id>
+ <posX>633</posX>
+ <posY>325</posY>
+ <width>100</width>
+ <height>200</height>
+ <texture>Music.png</texture>
+ <visible>Control.HasFocus(06081980)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <description> mid selection box - photo</description>
+ <id>1</id>
+ <posX>633</posX>
+ <posY>325</posY>
+ <width>100</width>
+ <height>200</height>
+ <texture>Pictures.png</texture>
+ <visible>Control.HasFocus(07081980)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ </control>
+
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvrecordedtv.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvrecordedtv.xml 2007-10-30 19:57:43 UTC (rev 1016)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvrecordedtv.xml 2007-11-02 14:13:28 UTC (rev 1017)
@@ -6,14 +6,7 @@
<controls>
- <control>
- <description>BG</description>
- <type>image</type>
- <id>1</id>
- <width>1366</width>
- <height>768</height>
-
- </control>
+ <import>common.window.xml</import>
<import>common.time.xml</import>
@@ -27,10 +20,129 @@
<width>1342</width>
<height>36</height>
<texture>top-strip.png</texture>
-
</control>
-
+<control>
+ <type>image</type>
+ <decription>lowbar info block</decription>
+ <id>1</id>
+ <posX>12</posX>
+ <posY>590</posY>
+ <width>1342</width>
+ <height>168</height>
+ <texture>lowbar.png</texture>
+ </control>
+ <control>
+ <description>home BM Radio</description>
+ <type>button</type>
+ <id>04081980</id>
+ <posX>1002</posX>
+ <posY>635</posY>
+ <width>50</width>
+ <height>100</height>
+ <textureFocus>Radio.png</textureFocus>
+ <textureNoFocus>Radio.png</textureNoFocus>
+ <thumbZoom>yes</thumbZoom>
+ <hyperlink>30</hyperlink>
+ <label>665</label>
+ <textcolor>00ffffff</textcolor>
+ <textcolorNoFocus>00ffffff</textcolorNoFocus>
+ <onleft>7</onleft>
+ <onright>05081980</onright>
+ <onup>50</onup>
+ <ondown>21</ondown>
+ <animation effect="fade" time="1000" delay="1000" >WindowOpen</animation>
+ <animation effect="fade" time="1000">WindowClose</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="1027,685" time="300" acceleration ="-1" >Focus</animation>
+
+ <animation effect="zoom" start="140,140" end="100,100" center="1027,685" time="300" acceleration ="-1" >Unfocus</animation>
+ </control>
+ <control>
+ <description>home BM Video</description>
+ <type>button</type>
+ <id>05081980</id>
+ <posX>1073</posX>
+ <posY>635</posY>
+ <width>50</width>
+ <height>100</height>
+ <textureFocus>Video.png</textureFocus>
+ <textureNoFocus>Video.png</textureNoFocus>
+ <hyperlink>6</hyperlink>
+ <hover>-</hover>
+ <hoverX>502</hoverX>
+ <hoverY>250</hoverY>
+ <hoverWidth>272</hoverWidth>
+ <hoverHeight>306</hoverHeight>
+ <label>3</label>
+ <textcolor>00ffffff</textcolor>
+ <textcolorNoFocus>00ffffff</textcolorNoFocus>
+ <onleft>04081980</onleft>
+ <onright>06081980</onright>
+ <onup>50</onup>
+ <ondown>21</ondown>
+ <animation effect="fade" time="1000" delay="750" >WindowOpen</animation>
+ <animation effect="fade" time="1000" delay="250" >WindowClose</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="1098,685" time="300" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="140,140" end="100,100" center="1098,685" time="300" acceleration ="-1" >Unfocus</animation>
+ </control>
+
+ <control>
+ <description>home Music</description>
+ <type>button</type>
+ <id>06081980</id>
+ <posX>1143</posX>
+ <posY>635</posY>
+ <width>50</width>
+ <height>100</height>
+ <textureFocus>Music.png</textureFocus>
+ <textureNoFocus>Music.png</textureNoFocus>
+ <hyperlink>501</hyperlink>
+ <label>605</label>
+ <textcolor>00ffffff</textcolor>
+ <textcolorNoFocus>00ffffff</textcolorNoFocus>
+ <hover>-</hover>
+ <hoverX>502</hoverX>
+ <hoverY>250</hoverY>
+ <hoverWidth>272</hoverWidth>
+ <hoverHeight>306</hoverHeight>
+ <onleft>05081980</onleft>
+ <onright>07081980</onright>
+ <onup>50</onup>
+ <ondown>21</ondown>
+ <animation effect="fade" time="1000" delay="500" >WindowOpen</animation>
+ <animation effect="fade" time="1000" delay="500">WindowClose</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="1168,685" time="300" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="140,140" end="100,100" center="1165,685" time="300" acceleration ="-1" >Unfocus</animation>
+ </control>
+
<control>
+ <description>home Pictures</description>
+ <type>button</type>
+ <id>07081980</id>
+ <posX>1213</posX>
+ <posY>635</posY>
+ <width>50</width>
+ <height>100</height>
+ <textureFocus>Pictures.png</textureFocus>
+ <textureNoFocus>Pictures.png</textureNoFocus>
+ <hyperlink>2</hyperlink>
+ <label>1</label>
+ <textcolor>00ffffff</textcolor>
+ <textcolorNoFocus>00ffffff</textcolorNoFocus>
+ <hover>-</hover>
+ <hoverX>502</hoverX>
+ <hoverY>250</hoverY>
+ <hoverWidth>272</hoverWidth>
+ <hoverHeight>306</hoverHeight>
+ <onleft>06081980</onleft>
+ <onright>2</onright>
+ <onup>50</onup>
+ <ondown>21</ondown>
+ <animation effect="fade" time="1000" delay="500" >WindowOpen</animation>
+ <animation effect="fade" time="1000" delay="500">WindowClose</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="1238,685" time="300" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="140,140" end="100,100" center="1238,685" time="300" acceleration ="-1" >Unfocus</animation>
+ </control>
+ <control>
<description>icon background</description>
<type>image</type>
<id>1</id>
@@ -109,7 +221,7 @@
<posX>12</posX>
<label>100</label>
<font>font14</font>
- <onleft>7</onleft>
+ <onleft>07081980</onleft>
<onright>10</onright>
<onup>22</onup>
<ondown>10</ondown>
@@ -207,7 +319,7 @@
<width>209</width>
<height>36</height>
<onleft>6</onleft>
- <onright>2</onright>
+ <onright>04081980</onright>
<onup>22</onup>
<ondown>10</ondown>
<textureFocus>tab_down.png</textureFocus>
@@ -228,25 +340,27 @@
<control>
<type>listcontrol</type>
- <description>recordings listcontrol</description>
+ <description>recordings icon control</description>
<id>10</id>
- <posX>20</posX>
- <posY>140</posY>
-
- <height>462</height>
- <width>600</width>
+ <onleft>2</onleft>
+ <onright>04081980</onright>
+ <onup>2</onup>
+ <ondown>04081980</ondown>
+ <posX>542</posX>
+ <posY>140</posY>
+ <width>800</width>
+ <height>500</height>
- <spinWidth>20</spinWidth>
- <spinHeight>20</spinHeight>
- <spinPosX>535</spinPosX>
- <spinPosY>650</spinPosY>
- <spinColor>ffffffff</spinColor>
-
- <textureUp>page_up_nofocus.png</textureUp>
- <textureDown>page_down_nofocus.png</textureDown>
- <textureUpFocus>page_up_focu.png</textureUpFocus>
- <textureDownFocus>page_down_focus.png</textureDownFocus>
+ <spinWidth>28</spinWidth>
+ <spinHeight>28</spinHeight>
+ <spinPosX>1250</spinPosX>
+ <spinPosY>592</spinPosY>
+ <spinColor>ffffffff</spinColor>
+ <textureUp>page_up_nofocus.png</textureUp>
+ <textureDown>page_down_nofocus.png</textureDown>
+ <textureUpFocus>page_up_focus.png</textureUpFocus>
+ <textureDownFocus>page_down_focus.png</textureDownFocus>
<onleft>2</onleft>
<onright>11</onright>
@@ -256,8 +370,8 @@
<font>font14</font>
<font2>font10</font2>
<font3>font10</font3>
- <textXOff>32</textXOff>
- <textXOff2>530</textXOff2>
+ <textXOff>12</textXOff>
+ <textXOff2>800</textXOff2>
<textXOff3>92</textXOff3>
<textYOff>12</textYOff>
<textYOff2>12</textYOff2>
@@ -286,35 +400,24 @@
<description>listcontrol</description>
<id>11</id>
- <onleft>10</onleft>
- <onright>3</onright>
- <onup>2</onup>
- <ondown>2</ondown>
-
- <textureHeight>42</textureHeight>
- <height>600</height>
- <width>590</width>
- <textYOff2>5</textYOff2>
-
- <posX>30</posX>
+ <onleft>2</onleft>
+ <onright>04081980</onright>
+ <onup>2</onup>
+ <ondown>04081980</ondown>
+ <posX>542</posX>
<posY>140</posY>
-
- <spinWidth>27</spinWidth>
- <spinHeight>27</spinHeight>
- <spinPosX>1270</spinPosX>
- <spinPosY>480</spinPosY>
- <spinColor>ffffffff</spinColor>
- <spinWidth>27</spinWidth>
- <spinHeight>27</spinHeight>
-
- <spinPosX>530</spinPosX>
- <spinPosY>650</spinPosY>
- <spinColor>ffffffff</spinColor>
-
- <textureUp>page_up_nofocus.png</textureUp>
- <textureDown>page_down_nofocus.png</textureDown>
- <textureUpFocus>page_up_focu.png</textureUpFocus>
- <textureDownFocus>page_down_focus.png</textureDownFocus>
+ <width>800</width>
+ <height>500</height>
+ <spinWidth>28</spinWidth>
+ <spinHeight>28</spinHeight>
+ <spinPosX>1252</spinPosX>
+ <spinPosY>592</spinPosY>
+ <spinColor>ffffffff</spinColor>
+ <textureUp>page_up_nofocus.png</textureUp>
+ <textureDown>page_down_nofocus.png</textureDown>
+ <textureUpFocus>page_up_focus.png</textureUpFocus>
+ <textureDownFocus>page_down_focus.png</textureDownFocus>
+ <textureHeight>35</textureHeight>
<image>folder_focus.png</image>
<font>font12</font>
@@ -329,7 +432,7 @@
<downloadColor>ffccef61</downloadColor>
<textXOff>32</textXOff>
<textYOff>7</textYOff>
- <textXOff2>590</textXOff2>
+ <textXOff2>780</textXOff2>
<textYOff2>7</textYOff2>
<IconXOff>24</IconXOff>
<IconYOff>9</IconYOff>
@@ -337,37 +440,29 @@
</control>
- <control>
- <description>Grey Background</description>
- <type>image</type>
- <id>10</id>
- <posX>628</posX>
- <posY>140</posY>
- <width>715</width>
- <height>550</height>
- <texture>grey_background.png</texture>
- </control>
+
- <control>
- <type>fadelabel</type>
- <description>Selected item Label</description>
- <id>18</id>
- <posX>700</posX>
- <posY>240</posY>
- <label>#selecteditem</label>
- <width>555</width>
- <height>30</height>
- <align>Center</align>
- <font>font16</font>
- <disabledcolor>ff808080</disabledcolor>
- </control>
+ <control>
+ <description>Selected item Label</description>
+ <type>fadelabel</type>
+ <id>1</id>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <posX>240</posX>
+ <posY>650</posY>
+ <width>750</width>
+ <label>#selecteditem</label>
+ <font>wipeout</font>
+ <align>Left</align>
+ <textcolor>ffffffff</textcolor>
+ </control>
<control>
<type>label</type>
<description>Current program time</description>
<id>14</id>
- <posX>1325</posX>
+ <posX>200</posX>
<posY>285</posY>
<align>right</align>
<label>#TV.RecordedTV.Time</label>
@@ -379,29 +474,16 @@
<type>label</type>
<description>genre</description>
<id>17</id>
- <posX>650</posX>
- <posY>285</posY>
+ <posX>100</posX>
+ <posY>150</posY>
<label>#TV.RecordedTV.Genre</label>
<align>left</align>
<textcolor>ffccef61</textcolor>
</control>
- <control>
- <description>Number of Files Label</description>
- <type>label</type>
- <id>1</id>
- <posX>20</posX>
- <posY>650</posY>
- <label>#itemcount</label>
- <align>left</align>
- <textcolor>White</textcolor>
- <font>font1</font>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
- </control>
+
- <animation effect="fade" time="500" delay="500">WindowOpen</animation>
- <animation effect="fade" time="100" delay="0">WindowClose</animation>
+
</control>
@@ -412,23 +494,21 @@
<type>textboxscrollup</type>
<description>Description1</description>
<id>15</id>
- <posX>650</posX>
- <posY>340</posY>
- <width>680</width>
+ <posX>20</posX>
+ <posY>170</posY>
+ <width>500</width>
<height>300</height>
<align>Center</align>
<colordiffuse>ffffffff</colordiffuse>
<font>font14</font>
<label>#TV.RecordedTV.Description</label>
- <animation effect="slide" time="500" start="2000,0" end="0,0" delay="800" acceleration="-1">WindowOpen</animation>
- <animation effect="slide" time="500" start="0,0" end="2000,0" acceleration="-1">WindowClose</animation>
-
+
</control>
<control>
<id>1</id>
<type>image</type>
- <posX>700</posX>
- <posY>460</posY>
+ <posX>20</posX>
+ <posY>350</posY>
<width>500</width>
<height>150</height>
<centered>yes</centered>
@@ -438,7 +518,66 @@
<animation effect="fade" time="1000">visiblechange</animation>
<animation effect="slide" time="500" start="2000,0" end="0,0" delay="800" acceleration="-1">WindowOpen</animation>
</control>
-
+<control>
+ <type>image</type>
+ <description> mid selection box</description>
+ <id>1</id>
+ <posX>582</posX>
+ <posY>314</posY>
+ <width>203</width>
+ <height>140</height>
+ <texture>osd_mid box.png</texture>
+ <visible>Control.HasFocus(04081980)|Control.HasFocus(05081980)|Control.HasFocus(06081980)|Control.HasFocus(07081980)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <description> mid selection box - radio</description>
+ <id>1</id>
+ <posX>633</posX>
+ <posY>325</posY>
+ <width>100</width>
+ <height>200</height>
+ <texture>Radio.png</texture>
+ <visible>Control.HasFocus(04081980)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <description> mid selection box - Video</description>
+ <id>1</id>
+ <posX>633</posX>
+ <posY>325</posY>
+ <width>100</width>
+ <height>200</height>
+ <texture>Video.png</texture>
+ <visible>Control.HasFocus(05081980)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <description> mid selection box - music</description>
+ <id>1</id>
+ <posX>633</posX>
+ <posY>325</posY>
+ <width>100</width>
+ <height>200</height>
+ <texture>Music.png</texture>
+ <visible>Control.HasFocus(06081980)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <description> mid selection box - photo</description>
+ <id>1</id>
+ <posX>633</posX>
+ <posY>325</posY>
+ <width>100</width>
+ <height>200</height>
+ <texture>Pictures.png</texture>
+ <visible>Control.HasFocus(07081980)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ </control>
</controls>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvsearch.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvsearch.xml 2007-10-30 19:57:43 UTC (rev 1016)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvsearch.xml 2007-11-02 14:13:28 UTC (rev 1017)
@@ -4,13 +4,7 @@
<defaultcontrol>10</defaultcontrol>
<allowoverlay>no</allowoverlay>
<controls>
- <control>
- <description>BG</description>
- <type>image</type>
- <id>1</id>
- <width>1366</width>
- <height>768</height>
- </control>
+ <import>common.window.xml</import>
<import>common.time.xml</import>
<control>
<description>icon background</description>
@@ -68,23 +62,129 @@
<width>1342</width>
<height>36</height>
<texture>top-strip.png</texture>
-
- </control>
+ </control>
+ <control>
+ <type>image</type>
+ <decription>lowbar info block</decription>
+ <id>1</id>
+ <posX>12</posX>
+ <posY>590</posY>
+ <width>1342</width>
+ <height>168</height>
+ <texture>lowbar.png</texture>
+ </control>
<control>
- <description>Number of Files Label</description>
- <type>label</type>
- <id>12</id>
- <posX>1100</posX>
- <posY>706</posY>
- <label>#itemcount</label>
- <font>font13</font>
- <align>left</align>
- <textcolor>FFFFFFFF</textcolor>
- <animation effect="fade" time="250">WindowOpen</animation>
- <animation effect="fade" time="500">WindowClose</animation>
- <visible>Control.HasFocus(10)|Control.HasFocus(11)</visible>
- <animation effect="fade" time="250">visiblechange</animation>
+ <description>home BM Radio</description>
+ <type>button</type>
+ <id>04081980</id>
+ <posX>1002</posX>
+ <posY>635</posY>
+ <width>50</width>
+ <height>100</height>
+ <textureFocus>Radio.png</textureFocus>
+ <textureNoFocus>Radio.png</textureNoFocus>
+ <thumbZoom>yes</thumbZoom>
+ <hyperlink>30</hyperlink>
+ <label>665</label>
+ <textcolor>00ffffff</textcolor>
+ <textcolorNoFocus>00ffffff</textcolorNoFocus>
+ <onleft>6</onleft>
+ <onright>05081980</onright>
+ <onup>99</onup>
+ <ondown>21</ondown>
+ <animation effect="fade" time="1000" delay="1000" >WindowOpen</animation>
+ <animation effect="fade" time="1000">WindowClose</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="1027,685" time="300" acceleration ="-1" >Focus</animation>
+
+ <animation effect="zoom" start="140,140" end="100,100" center="1027,685" time="300" acceleration ="-1" >Unfocus</animation>
+ </control>
+ <control>
+ <description>home BM Video</description>
+ <type>button</type>
+ <id>05081980</id>
+ <posX>1073</posX>
+ <posY>635</posY>
+ <width>50</width>
+ <height>100</height>
+ <textureFocus>Video.png</textureFocus>
+ <textureNoFocus>Video.png</textureNoFocus>
+ <hyperlink>6</hyperlink>
+ <hover>-</hover>
+ <hoverX>502</hoverX>
+ <hoverY>250</hoverY>
+ <hoverWidth>272</hoverWidth>
+ <hoverHeight>306</hoverHeight>
+ <label>3</label>
+ <textcolor>00ffffff</textcolor>
+ <textcolorNoFocus>00ffffff</textcolorNoFocus>
+ <onleft>04081980</onleft>
+ <onright>06081980</onright>
+ <onup>99</onup>
+ <ondown>21</ondown>
+ <animation effect="fade" time="1000" delay="750" >WindowOpen</animation>
+ <animation effect="fade" time="1000" delay="250" >WindowClose</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="1098,685" time="300" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="140,140" end="100,100" center="1098,685" time="300" acceleration ="-1" >Unfocus</animation>
+ </control>
+
+ <control>
+ <description>home Music</description>
+ <type>button</type>
+ <id>06081980</id>
+ <posX>1143</posX>
+ <posY>635</posY>
+ <width>50</width>
+ <height>100</height>
+ <textureFocus>Music.png</textureFocus>
+ <textureNoFocus>Music.png</textureNoFocus>
+ <hyperlink>501</hyperlink>
+ <label>605</label>
+ <textcolor>00ffffff</textcolor>
+ <textcolorNoFocus>00ffffff</textcolorNoFocus>
+ <hover>-</hover>
+ <hoverX>502</hoverX>
+ <hoverY>250</hoverY>
+ <hoverWidth>272</hoverWidth>
+ <hoverHeight>306</hoverHeight>
+ <onleft>05081980</onleft>
+ <onright>07081980</onright>
+ <onup>99</onup>
+ <ondown>21</ondown>
+ <animation effect="fade" time="1000" delay="500" >WindowOpen</animation>
+ <animation effect="fade" time="1000" delay="500">WindowClose</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="1168,685" time="300" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="140,140" end="100,100" center="1165,685" time="300" acceleration ="-1" >Unfocus</animation>
</control>
+
+ <control>
+ <description>home Pictures</description>
+ <type>button</type>
+ <id>07081980</id>
+ <posX>1213</posX>
+ <posY>635</posY>
+ <width>50</width>
+ <height>100</height>
+ <textureFocus>Pictures.png</textureFocus>
+ <textureNoFocus>Pictures.png</textureNoFocus>
+ <hyperlink>2</hyperlink>
+ <label>1</label>
+ <textcolor>00ffffff</textcolor>
+ <textcolorNoFocus>00ffffff</textcolorNoFocus>
+ <hover>-</hover>
+ <hoverX>502</hoverX>
+ <hoverY>250</hoverY>
+ <hoverWidth>272</hoverWidth>
+ <hoverHeight>306</hoverHeight>
+ <onleft>06081980</onleft>
+ <onright>2</onright>
+ <onup>99</onup>
+ <ondown>21</ondown>
+ <animation effect="fade" time="1000" delay="500" >WindowOpen</animation>
+ <animation effect="fade" time="1000" delay="500">WindowClose</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="1238,685" time="300" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="140,140" end="100,100" center="1238,685" time="300" acceleration ="-1" >Unfocus</animation>
+ </control>
+
<control>
@@ -96,7 +196,7 @@
<animation effect="fade" time="400" delay="100">WindowOpen</animation>
<posY>100</posY>
<posX>12</posX> <font>font14</font>
- <onleft>8</onleft>
+ <onleft>07081980</onleft>
<onright>4</onright>
<onup>22</onup>
<ondown>10</ondown>
@@ -169,7 +269,7 @@
<width>209</width>
<height>36</height>
<onleft>5</onleft>
- <onright>2</onright>
+ <onright>04081980</onright>
<onup>22</onup>
<ondown>7</ondown>
<textureFocus>tab_toggleon_focus.png</textureFocus>
@@ -179,20 +279,8 @@
</control>
- <control>
- <description>Grey Background</description>
- <type>image</type>
- <id>1</id>
- <posX>20</posX>
- <posY>140</posY>
- <width>715</width>
- <height>460</height>
- <texture>grey_background.png</texture>
- <visible>Control.HasFocus(11)</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- </control>
+
-
<control>
<type>group</type>
<description>group element</description>
@@ -202,27 +290,26 @@
<description>listcontrol</description>
<type>listcontrol</type>
<id>10</id>
- <onleft>2</onleft>
- <onright>2</onright>
- <onup>2</onup>
- <ondown>22</ondown>
- <posX>542</posX>
+ <onleft>2</onleft>
+ <onright>04081980</onright>
+ <onup>2</onup>
+ <ondown>04081980</ondown>
+ <posX>542</posX>
<posY>140</posY>
<width>800</width>
- <height>520</height>
- <spinWidth>27</spinWidth>
- <spinHeight>27</spinHeight>
- <spinPosX>1240</spinPosX>
- <spinPosY>650</spinPosY>
- <spinColor>ffffffff</spinColor>
- <textureUp>page_up_nofocus.png</textureUp>
- <textureDown>page_down_nofocus.png</textureDown>
- <textureUpFocus>page_up_focu.png</textureUpFocus>
- <textureDownFocus>page_down_focus.png</textureDownFocus>
- <textureFocus>list_sub_focus.png</textureFocus>
- <textureNoFocus>list_sub_nofocus.png</textureNoFocus>
+ <height>500</height>
+ <spinWidth>28</spinWidth>
+ <spinHeight>28</spinHeight>
+ <spinPosX>1242</spinPosX>
+ <spinPosY>592</spinPosY>
+ <spinColor>ffffffff</spinColor>
+ <textureUp>page_up_nofocus.png</textureUp>
+ <textureDown>page_down_nofocus.png</textureDown>
+ <textureUpFocus>page_up_focus.png</textureUpFocus>
+ <textureDownFocus>page_down_focus.png</textureDownFocus>
<textureHeight>35</textureHeight>
- <image>folder_focus.png</image> <font>font14</font>
+ <image>folder_focus.png</image>
+ <font>font10</font>
<shadedColor>20ffffff</shadedColor>
<selectedColor>FFF8BC70</selectedColor>
<playedColor>ffa0d0ff</playedColor>
@@ -232,13 +319,13 @@
<colordiffuse>ffffffff</colordiffuse>
<remoteColor>ffFFA075</remoteColor>
<downloadColor>ff80ff80</downloadColor>
- <textXOff>10</textXOff>
- <textYOff>2</textYOff>
- <textXOff2>780</textXOff2>
- <textYOff2>2</textYOff2>
- <textXOff3>5</textXOff3>
- <textYOff3>5</textYOff3>
- <IconXOff>5</IconXOff>
+ <textXOff>32</textXOff>
+ <textYOff>7</textYOff>
+ <textXOff2>1250</textXOff2>
+ <textYOff2>7</textYOff2>
+ <textXOff3>1300</textXOff3>
+ <textYOff3>7</textYOff3>
+ <IconXOff>24</IconXOff>
<IconYOff>9</IconYOff>
<suffix>|</suffix>
</control>
@@ -247,48 +334,55 @@
<type>listcontrol</type>
<id>11</id>
- <posX>780</posX>
+ <onleft>2</onleft>
+ <onright>04081980</onright>
+ <onup>2</onup>
+ <ondown>04081980</ondown>
+ <posX>542</posX>
<posY>140</posY>
+ <width>800</width>
+ <height>500</height>
+
+ <spinWidth>28</spinWidth>
+ <spinHeight>28</spinHeight>
+ <spinPosX>1250</spinPosX>
+ <spinPosY>592</spinPosY>
+ <spinColor>ffffffff</spinColor>
+ <textureUp>page_up_nofocus.png</textureUp>
+ <textureDown>page_down_nofocus.png</textureDown>
+ <textureUpFocus>page_up_focus.png</textureUpFocus>
+ <textureDownFocus>page_down_focus.png</textureDownFocus>
- <subitems>
- <subitem>=370</subitem>
- <subitem>=450</subitem>
- </subitems>
- <width>566</width>
- <height>800</height>
- <textXOff>5</textXOff>
- <textYOff>25</textYOff>
- <textXOff2>500</textXOff2>
- <textYOff2>5</textYOff2>
- <textXOff3>189</textXOff3>
- <textYOff3>38</textYOff3>
- <IconXOff>5</IconXOff>
- <IconYOff>15</IconYOff>
- <PinIconXOff>45</PinIconXOff>
- <PinIconYOff>19</PinIconYOff>
- <spinWidth>27</spinWidth>
- <spinHeight>27</spinHeight>
- <spinPosX>1240</spinPosX>
- <spinPosY>650</spinPosY>
- <spinColor>ffffffff</spinColor>
- <textureUp>page_up_nofocus.png</textureUp>
- <textureDown>page_down_nofocus.png</textureDown>
- <textureUpFocus>page_up_focu.png</textureUpFocus>
- <textureDownFocus>page_down_focus.png</textureDownFocus>
-
- <itemWidth>46</itemWidth>
- <itemHeight>46</itemHeight>
- <textureFocus>recording_background_focus.png</textureFocus>
- <textureNoFocus>recording_background_nofocus.png</textureNoFocus>
- <spaceBetweenItems>6</spaceBetweenItems>
- <textureHeight>66</textureHeight>
- <keepaspectratio>yes</keepaspectratio>
+ <onleft>2</onleft>
+ <onright>11</onright>
+ <onup>2</onup>
+ <ondown>2</ondown>
+
+ <font>font14</font>
<font2>font10</font2>
<font3>font10</font3>
- <onleft>10</onleft>
- <onright>2</onright>
- <onup>2</onup>
- <ondown>2</ondown>
+ <textXOff>12</textXOff>
+ <textXOff2>800</textXOff2>
+ <textXOff3>92</textXOff3>
+ <textYOff>12</textYOff>
+ <textYOff2>12</textYOff2>
+ <textYOff3>48</textYOff3>
+ <IconXOff>10</IconXOff>
+ <IconYOff>10</IconYOff>
+ <textcolor2>ffffffff</textcolor2>
+ <textcolor3>ffccef61</textcolor3>
+
+ <itemHeight>70</itemHeight>
+ <itemWidth>75</itemWidth>
+ <textureHeight>132</textureHeight>
+ <keepaspectratio>yes</keepaspectratio>
+
+ <textureFocus>recording_background_focus.png</textureFocus>
+ <textureNoFocus>recording_background_nofocus.png</textureNoFocus>
+ <textureHeight>85</textureHeight>
+
+ <animation effect="fade" time="500" delay="500">WindowOpen</animation>
+ <animation effect="fade" time="100" delay="0">WindowClose</animation>
</control>
</control>
<control>
@@ -297,7 +391,7 @@
<id>13</id>
<posX>50</posX>
<posY>180</posY>
- <width>333</width>
+ <width>420</width>
<label>#TV.Search.Title</label>
<font>font18</font>
<textcolor>FFFFFFFF</textcolor>
@@ -327,9 +421,9 @@
<type>textboxscrollup</type>
<id>15</id>
<posX>50</posX>
- <posY>280</posY>
+ <posY>215</posY>
<width>450</width>
- <height>86</height>
+ <height>200</height>
<label>#TV.Search.Description</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
@@ -353,6 +447,7 @@
<visible>Control.HasFocus(10)|Control.HasFocus(11)</visible>
<animation effect="fade" time="250">visiblechange</animation>
</control>
+
<control>
<description>Letter Button</description>
<type>selectbutton</type>
@@ -436,6 +531,66 @@
<textureRight>arrow_round_right_nofocus.png</textureRight>
<textureRightFocus>arrow_round_right_focus.png</textureRightFocus>
</control>
-
+ <control>
+ <type>image</type>
+ <description> mid selection box</description>
+ <id>1</id>
+ <posX>582</posX>
+ <posY>314</posY>
+ <width>203</width>
+ <height>140</height>
+ <texture>osd_mid box.png</texture>
+ <visible>Control.HasFocus(04081980)|Control.HasFocus(05081980)|Control.HasFocus(06081980)|Control.HasFocus(07081980)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <description> mid selection box - radio</description>
+ <id>1</id>
+ <posX>633</posX>
+ <posY>325</posY>
+ <width>100</width>
+ <height>200</height>
+ <texture>Radio.png</texture>
+ <visible>Control.HasFocus(04081980)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <description> mid selection box - Video</description>
+ <id>1</id>
+ <posX>633</posX>
+ <posY>325</posY>
+ <width>100</width>
+ <height>200</height>
+ <texture>Video.png</texture>
+ <visible>Control.HasFocus(05081980)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <description> mid selection box - music</description>
+ <id>1</id>
+ <posX>633</posX>
+ <posY>325</posY>
+ <width>100</width>
+ <height>200</height>
+ <texture>Music.png</texture>
+ <visible>Control.HasFocus(06081980)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <description> mid selection box - photo</description>
+ <id>1</id>
+ <posX>633</posX>
+ <posY>325</posY>
+ <width>100</width>
+ <height>200</height>
+ <texture>Pictures.png</texture>
+ <visible>Control.HasFocus(07081980)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ </control>
+
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideo.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideo.xml 2007-10-30 19:57:43 UTC (rev 1016)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideo.xml 2007-11-02 14:13:28 UTC (rev 1017)
@@ -73,7 +73,7 @@
<animation effect="fade" time="400">WindowOpen</animation>
<posX>240</posX>
<posY>650</posY>
- <width>1000</width>
+ <width>750</width>
<label>#selecteditem</label>
<font>wipeout</font>
<align>Left</align>
@@ -185,7 +185,7 @@
<animation effect="fade" time="1000" delay="500" >WindowOpen</animation>
<animation effect="fade" time="1000" delay="500">WindowClose</animation>
<animation effect="zoom" start="100,100" end="140,140" center="1168,685" time="300" acceleration ="-1" >Focus</animation>
- <animation effect="zoom" start="140,140" end="100,100" center="1165,665" time="300" acceleration ="-1" >Unfocus</animation>
+ <animation effect="zoom" start="140,140" end="100,100" center="1165,685" time="300" acceleration ="-1" >Unfocus</animation>
</control>
<control>
@@ -213,8 +213,8 @@
<ondown>21</ondown>
<animation effect="fade" time="1000" delay="500" >WindowOpen</animation>
<animation effect="fade" time="1000" delay="500">WindowClose</animation>
- <animation effect="zoom" start="100,100" end="140,140" center="1238,685" time="300" acceleration ="-1" >Focus</animation>
- <animation effect="zoom" start="140,140" end="100,100" center="1238,665" time="300" acceleration ="-1" >Unfocus</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="1238,685" time="300" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="140,140" end="100,100" center="1238,685" time="300" acceleration ="-1" >Unfocus</animation>
</control>
<control>
@@ -571,7 +571,7 @@
<InfoImagediffuse>ffffffff</InfoImagediffuse>
- <textureWidth>190</textureWidth>
+ <textureWidth>196</textureWidth>
<textureHeight>250</textureHeight>
<showFolder>yes</showFolder>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideoTitle.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideoTitle.xml 2007-10-30 19:57:43 UTC (rev 1016)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideoTitle.xml 2007-11-02 14:13:28 UTC (rev 1017)
@@ -3,10 +3,7 @@
<id>25</id>
<defaultcontrol>2</defaultcontrol>
<allowoverlay>yes</allowoverlay>
-
-
-
- <controls>
+ <controls>
<import>common.window.xml</import>
<import>common.time.xml</import>
@@ -73,7 +70,7 @@
<animation effect="fade" time="400">WindowOpen</animation>
<posX>240</posX>
<posY>650</posY>
- <width>1000</width>
+ <width>750</width>
<label>#selecteditem</label>
<font>wipeout</font>
<align>Left</align>
@@ -91,6 +88,132 @@
<texture>top-strip.png</texture>
</control>
+
+
+ <control>
+ <type>image</type>
+ <decription>lowbar info block</decription>
+ <id>1</id>
+ <posX>12</posX>
+ <posY>590</posY>
+ <width>1342</width>
+ <height>168</height>
+ <texture>lowbar.png</texture>
+ </control>
+
+
+ <control>
+ <description>home BM Radio</description>
+ <type>button</type>
+ <id>04081980</id>
+ <posX>1002</posX>
+ <posY>635</posY>
+ <width>50</width>
+ <height>100</height>
+ <textureFocus>Radio.png</textureFocus>
+ <textureNoFocus>Radio.png</textureNoFocus>
+ <thumbZoom>yes</thumbZoom>
+ <hyperlink>30</hyperlink>
+ <label>665</label>
+ <textcolor>00ffffff</textcolor>
+ <textcolorNoFocus>00ffffff</textcolorNoFocus>
+ <onleft>20</onleft>
+ <onright>05081980</onright>
+ <onup>50</onup>
+ <ondown>21</ondown>
+ <animation effect="fade" time="1000" delay="1000" >WindowOpen</animation>
+ <animation effect="fade" time="1000">WindowClose</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="1027,685" time="300" acceleration ="-1" >Focus</animation>
+
+ <animation effect="zoom" start="140,140" end="100,100" center="1027,685" time="300" acceleration ="-1" >Unfocus</animation>
+ </control>
+ <control>
+ <description>home BM TV</description>
+ <type>button</type>
+ <id>05081980</id>
+ <posX>1073</posX>
+ <posY>635</posY>
+ <width>50</width>
+ <height>100</height>
+ <textureFocus>TV.png</textureFocus>
+ <textureNoFocus>TV.png</textureNoFocus>
+ <hyperlink>1</hyperlink>
+ <hover>-</hover>
+ <hoverX>502</hoverX>
+ <hoverY>250</hoverY>
+ <hoverWidth>272</hoverWidth>
+ <hoverHeight>306</hoverHeight>
+ <label>3</label>
+ <textcolor>00ffffff</textcolor>
+ <textcolorNoFocus>00ffffff</textcolorNoFocus>
+ <onleft>04081980</onleft>
+ <onright>06081980</onright>
+ <onup>50</onup>
+ <ondown>21</ondown>
+ <animation effect="fade" time="1000" delay="750" >WindowOpen</animation>
+ <animation effect="fade" time="1000" delay="250" >WindowClose</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="1098,685" time="300" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="140,140" end="100,100" center="1098,685" time="300" acceleration ="-1" >Unfocus</animation>
+ </control>
+
+ <control>
+ <description>home Music</description>
+ <type>button</type>
+ <id>06081980</id>
+ <posX>1143</posX>
+ <posY>635</posY>
+ <width>50</width>
+ <height>100</height>
+ <textureFocus>Music.png</textureFocus>
+ <textureNoFocus>Music.png</textureNoFocus>
+ <hyperlink>501</hyperlink>
+ <label>605</label>
+ <textcolor>00ffffff</textcolor>
+ <textcolorNoFocus>00ffffff</textcolorNoFocus>
+ <hover>-</hover>
+ <hoverX>502</hoverX>
+ <hoverY>250</hoverY>
+ <hoverWidth>272</hoverWidth>
+ <hoverHeight>306</hoverHeight>
+ <onleft>05081980</onleft>
+ <onright>07081980</onright>
+ <onup>50</onup>
+ <ondown>21</ondown>
+ <animation effect="fade" time="1000" delay="500" >WindowOpen</animation>
+ <animation effect="fade" time="1000" delay="500">WindowClose</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="1168,685" time="300" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="140,140" end="100,100" center="1165,685" time="300" acceleration ="-1" >Unfocus</animation>
+ </control>
+
+ <control>
+ <description>home Pictures</description>
+ <type>button</type>
+ <id>07081980</id>
+ <posX>1213</posX>
+ <posY>635</posY>
+ <width>50</width>
+ <height>100</height>
+ <textureFocus>Pictures.png</textureFocus>
+ <textureNoFocus>Pictures.png</textureNoFocus>
+ <hyperlink>2</hyperlink>
+ <label>1</label>
+ <textcolor>00ffffff</textcolor>
+ <textcolorNoFocus>00ffffff</textcolorNoFocus>
+ <hover>-</hover>
+ <hoverX>502</hoverX>
+ <hoverY>250</hoverY>
+ <hoverWidth>272</hoverWidth>
+ <hoverHeight>306</hoverHeight>
+ <onleft>06081980</onleft>
+ <onright>2</onright>
+ <onup>50</onup>
+ <ondown>21</ondown>
+ <animation effect="fade" time="1000" delay="500" >WindowOpen</animation>
+ <animation effect="fade" time="1000" delay="500">WindowClose</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="1238,685" time="300" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="140,140" end="100,100" center="1238,685" time="300" acceleration ="-1" >Unfocus</animation>
+ </control>
+
<control>
<description>View-As button</description>
<type>button</type>
@@ -101,7 +224,7 @@
<posX>12</posX>
<label>100</label>
<font>font14</font>
- <onleft>20</onleft>
+ <onleft>07081980</onleft>
<onright>3</onright>
<onup>21</onup>
<ondown>50</ondown>
@@ -119,6 +242,7 @@
<id>3</id>
<animation effect="fade" time="400">WindowClose</animation>
<animation effect="fade" time="400">WindowOpen</animation>
+
<posY>100</posY>
<posX>221</posX>
<label>103</label>
@@ -217,13 +341,13 @@
<animation effect="fade" time="400">WindowOpen</animation>
<posY>100</posY>
<posX>1057</posX>
-
+ <action>33</action>
<font>font14</font>
<ondown>99</ondown>
<width>209</width>
<height>36</height>
<onleft>6</onleft>
- <onright>2</onright>
+ <onright>04081980</onright>...
[truncated message content] |
|
From: <chr...@us...> - 2007-10-30 19:57:45
|
Revision: 1016
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1016&view=rev
Author: chreekar
Date: 2007-10-30 12:57:43 -0700 (Tue, 30 Oct 2007)
Log Message:
-----------
Changed the paths of thumbs and DB file to the absolute path gotten from Assemby info instead of just using the working folder
Modified Paths:
--------------
trunk/plugins/MyEmulators/myEmulators/DB.cs
trunk/plugins/MyEmulators/myEmulators/Options.cs
trunk/plugins/MyEmulators/output.rar
Modified: trunk/plugins/MyEmulators/myEmulators/DB.cs
===================================================================
--- trunk/plugins/MyEmulators/myEmulators/DB.cs 2007-10-29 21:28:42 UTC (rev 1015)
+++ trunk/plugins/MyEmulators/myEmulators/DB.cs 2007-10-30 19:57:43 UTC (rev 1016)
@@ -38,7 +38,9 @@
public static void launch()
{
- String path = "database\\" + dbName;
+ //String path = System.Reflection.Assembly.GetExecutingAssembly().Location;
+ //path = new FileInfo(path).Directory.Parent.Parent.FullName + @"\database\" + dbName;
+ String path = Options.getMainFolder() + @"\database\" + dbName;
if (!File.Exists(path))
{
File.Create(path);
Modified: trunk/plugins/MyEmulators/myEmulators/Options.cs
===================================================================
--- trunk/plugins/MyEmulators/myEmulators/Options.cs 2007-10-29 21:28:42 UTC (rev 1015)
+++ trunk/plugins/MyEmulators/myEmulators/Options.cs 2007-10-30 19:57:43 UTC (rev 1016)
@@ -12,10 +12,10 @@
public const int STRING = 2;
//Static options
- public static String thumb_main = "thumbs\\myEmulators";
- public static String thumb_emulators = "thumbs\\myEmulators\\emulators";
- public static String thumb_previews = "thumbs\\myEmulators\\previews";
- public static String thumb_games = "thumbs\\myEmulators\\games";
+ public static String thumb_main = getMainFolder() + @"\thumbs\myEmulators";
+ public static String thumb_emulators = getMainFolder() + @"\thumbs\myEmulators\emulators";
+ public static String thumb_previews = getMainFolder() + @"\thumbs\myEmulators\previews";
+ public static String thumb_games = getMainFolder() + @"\thumbs\myEmulators\games";
//Dynamic options
private static List<String> bool_names = new List<String>();
@@ -25,6 +25,13 @@
private static List<String> string_names = new List<String>();
private static List<String> string_values = new List<String>();
+ public static String getMainFolder()
+ {
+ String path = System.Reflection.Assembly.GetExecutingAssembly().Location;
+ path = new System.IO.FileInfo(path).Directory.Parent.Parent.FullName;
+ return path;
+ }
+
//
// ADD OPTION
//
Modified: trunk/plugins/MyEmulators/output.rar
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2007-10-29 21:28:44
|
Revision: 1015
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1015&view=rev
Author: saamand
Date: 2007-10-29 14:28:42 -0700 (Mon, 29 Oct 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2007-10-29 20:30:27 UTC (rev 1014)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2007-10-29 21:28:42 UTC (rev 1015)
@@ -62,6 +62,12 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Convert\ConvertFromXMLtoLyricsDatabase.cs" />
+ <Compile Include="MyLyrics Configuration\MusicDatabaseBrowse.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="MyLyrics Configuration\MusicDatabaseBrowse.Designer.cs">
+ <DependentUpon>MusicDatabaseBrowse.cs</DependentUpon>
+ </Compile>
<Compile Include="MyLyricsExternCode.cs" />
<Compile Include="MyLyricsSettings.cs" />
<Compile Include="MyLyrics Configuration\MyLyricsSetup_test.cs" />
@@ -103,6 +109,10 @@
<SubType>Designer</SubType>
<DependentUpon>LyricsLibrary.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="MyLyrics Configuration\MusicDatabaseBrowse.resx">
+ <SubType>Designer</SubType>
+ <DependentUpon>MusicDatabaseBrowse.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="MyLyrics Configuration\MyLyricsSetup.resx">
<SubType>Designer</SubType>
<DependentUpon>MyLyricsSetup.cs</DependentUpon>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2007-10-29 20:30:30
|
Revision: 1014
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1014&view=rev
Author: saamand
Date: 2007-10-29 13:30:27 -0700 (Mon, 29 Oct 2007)
Log Message:
-----------
Version 1.0 beta 1
Modified Paths:
--------------
trunk/plugins/MyLyrics/LyricsEngine/LRC/SimpleLRCTimeAndLineCollection.cs
trunk/plugins/MyLyrics/LyricsEngine/LyricSearch.cs
trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs
trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/EvilLabs.cs
trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsOnDemand.cs
trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs
trunk/plugins/MyLyrics/My Lyrics/Changelog.txt
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
trunk/plugins/MyLyrics/My Lyrics/MyLyricsExternCode.cs
trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs
Modified: trunk/plugins/MyLyrics/LyricsEngine/LRC/SimpleLRCTimeAndLineCollection.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LRC/SimpleLRCTimeAndLineCollection.cs 2007-10-29 14:04:34 UTC (rev 1013)
+++ trunk/plugins/MyLyrics/LyricsEngine/LRC/SimpleLRCTimeAndLineCollection.cs 2007-10-29 20:30:27 UTC (rev 1014)
@@ -1,6 +1,8 @@
using System;
using System.Collections;
using System.Text;
+using System.IO;
+using System.IO.IsolatedStorage;
namespace LyricsEngine.LRC
{
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricSearch.cs
===================================================================
(Binary files differ)
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs 2007-10-29 14:04:34 UTC (rev 1013)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs 2007-10-29 20:30:27 UTC (rev 1014)
@@ -24,6 +24,9 @@
private bool m_StopSearches;
+ private bool m_allowAllToComplete;
+ private bool m_automaticUpdate;
+
ArrayList threadList = new ArrayList();
// Main thread sets this event to stop LyricController
@@ -36,9 +39,12 @@
public LyricsController(ILyricForm mainForm,
ManualResetEvent eventStopThread,
- string[] lyricSites, bool allowAllToSearch)
+ string[] lyricSites,
+ bool allowAllToSearch, bool automaticUpdate)
{
this.m_Form = mainForm;
+ this.m_allowAllToComplete = allowAllToSearch;
+ this.m_automaticUpdate = automaticUpdate;
noOfLyricsToSearch = 1;
noOfLyricsSearched = 0;
@@ -133,7 +139,7 @@
// create worker thread instance
ThreadStart easySitesThreadInstance = delegate
{
- LyricSearch lyricSearch_EasySites = new LyricSearch(this, artist, title);
+ LyricSearch lyricSearch_EasySites = new LyricSearch(this, artist, title, m_allowAllToComplete, m_automaticUpdate);
lyricSearch_EasySites.Run();
};
@@ -173,7 +179,7 @@
internal void LyricFound(String lyricStrings, String artist, String title, String site)
{
- if (m_StopSearches == false)
+ if (m_allowAllToComplete || m_StopSearches == false)
{
m_Form.LyricFound = new Object[] { lyricStrings, artist, title, site };
StatusUpdate(artist, title, site, true);
@@ -182,7 +188,7 @@
internal void LyricNotFound(String artist, String title, String message, String site)
{
- if (m_StopSearches == false)
+ if (m_allowAllToComplete || m_StopSearches == false)
{
m_Form.LyricNotFound = new Object[] { artist, title, message, site };
StatusUpdate(artist, title, site, false);
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/EvilLabs.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/EvilLabs.cs 2007-10-29 14:04:34 UTC (rev 1013)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/EvilLabs.cs 2007-10-29 20:30:27 UTC (rev 1014)
@@ -11,6 +11,7 @@
{
class EvilLabs
{
+
string lyric = "";
bool complete;
System.Timers.Timer timer;
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsOnDemand.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsOnDemand.cs 2007-10-29 14:04:34 UTC (rev 1013)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsOnDemand.cs 2007-10-29 20:30:27 UTC (rev 1014)
@@ -143,6 +143,7 @@
lyricTemp.Replace("?v", "'v");
lyricTemp.Replace("<p>", " \r\n");
lyricTemp.Replace("<BR>", " \r\n");
+ lyricTemp.Replace("<br />", " \r\n");
lyric = lyricTemp.ToString().Trim();
Modified: trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs 2007-10-29 14:04:34 UTC (rev 1013)
+++ trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs 2007-10-29 20:30:27 UTC (rev 1014)
@@ -26,7 +26,7 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("0.22")]
+[assembly: AssemblyVersion("0.23")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
Modified: trunk/plugins/MyLyrics/My Lyrics/Changelog.txt
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/Changelog.txt 2007-10-29 14:04:34 UTC (rev 1013)
+++ trunk/plugins/MyLyrics/My Lyrics/Changelog.txt 2007-10-29 20:30:27 UTC (rev 1014)
@@ -1,3 +1,6 @@
+Changes from version 0.23 to 0.24:
+- Fix: Better for
+
Changes from version 0.14 to 0.15:
- Fix: A LOT of performance improvemence issues and code-clean up
- Fix: One lyric site added (HotLyrics), and one removed (SeekLyrics) due to instable server
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2007-10-29 14:04:34 UTC (rev 1013)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2007-10-29 20:30:27 UTC (rev 1014)
@@ -666,7 +666,7 @@
{
lyricsFound = false;
- lc = new LyricsController(this, m_EventStopThread, m_sitesToSearch, false);
+ lc = new LyricsController(this, m_EventStopThread, m_sitesToSearch, false, false);
// create worker thread instance
ThreadStart job = delegate
{
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2007-10-29 14:04:34 UTC (rev 1013)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2007-10-29 20:30:27 UTC (rev 1014)
@@ -5,7 +5,7 @@
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{BBB2DAE2-0D83-4B4B-85B6-D1B5A7E10039}</ProjectGuid>
- <OutputType>Library</OutputType>
+ <OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MyLyrics</RootNamespace>
<AssemblyName>MyLyrics</AssemblyName>
@@ -64,61 +64,61 @@
<Compile Include="Convert\ConvertFromXMLtoLyricsDatabase.cs" />
<Compile Include="MyLyricsExternCode.cs" />
<Compile Include="MyLyricsSettings.cs" />
- <Compile Include="MyLyricsSetup_test.cs" />
+ <Compile Include="MyLyrics Configuration\MyLyricsSetup_test.cs" />
<Compile Include="DatabaseUtil.cs" />
<Compile Include="MyLyrics.cs" />
- <Compile Include="MyLyricsSetup.cs">
+ <Compile Include="MyLyrics Configuration\MyLyricsSetup.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="MyLyricsSetup.Designer.cs">
+ <Compile Include="MyLyrics Configuration\MyLyricsSetup.Designer.cs">
<DependentUpon>MyLyricsSetup.cs</DependentUpon>
</Compile>
- <Compile Include="MyLyricsSetup_AddNewSong.cs">
+ <Compile Include="MyLyrics Configuration\AddNewSong.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="MyLyricsSetup_AddNewSong.Designer.cs">
- <DependentUpon>MyLyricsSetup_AddNewSong.cs</DependentUpon>
+ <Compile Include="MyLyrics Configuration\AddNewSong.Designer.cs">
+ <DependentUpon>AddNewSong.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="MyLyricsSetup_LyricsLibrary.cs">
+ <Compile Include="MyLyrics Configuration\LyricsLibrary.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Include="MyLyricsSetup_LyricsLibrary.Designer.cs">
- <DependentUpon>MyLyricsSetup_LyricsLibrary.cs</DependentUpon>
+ <Compile Include="MyLyrics Configuration\LyricsLibrary.Designer.cs">
+ <DependentUpon>LyricsLibrary.cs</DependentUpon>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
- <Compile Include="MyLyricsSetup_SearchTitleDialog.cs">
+ <Compile Include="MyLyrics Configuration\FindLyric.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="MyLyricsSetup_SearchTitleDialog.Designer.cs">
- <DependentUpon>MyLyricsSetup_SearchTitleDialog.cs</DependentUpon>
+ <Compile Include="MyLyrics Configuration\FindLyric.Designer.cs">
+ <DependentUpon>FindLyric.cs</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Include="MyLyricsSetup_LyricsLibrary.resx">
+ <EmbeddedResource Include="MyLyrics Configuration\LyricsLibrary.resx">
<SubType>Designer</SubType>
- <DependentUpon>MyLyricsSetup_LyricsLibrary.cs</DependentUpon>
+ <DependentUpon>LyricsLibrary.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="MyLyricsSetup.resx">
+ <EmbeddedResource Include="MyLyrics Configuration\MyLyricsSetup.resx">
<SubType>Designer</SubType>
<DependentUpon>MyLyricsSetup.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="MyLyricsSetup_AddNewSong.resx">
+ <EmbeddedResource Include="MyLyrics Configuration\AddNewSong.resx">
<SubType>Designer</SubType>
- <DependentUpon>MyLyricsSetup_AddNewSong.cs</DependentUpon>
+ <DependentUpon>AddNewSong.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<SubType>Designer</SubType>
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
- <EmbeddedResource Include="MyLyricsSetup_SearchTitleDialog.resx">
+ <EmbeddedResource Include="MyLyrics Configuration\FindLyric.resx">
<SubType>Designer</SubType>
- <DependentUpon>MyLyricsSetup_SearchTitleDialog.cs</DependentUpon>
+ <DependentUpon>FindLyric.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsExternCode.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyricsExternCode.cs 2007-10-29 14:04:34 UTC (rev 1013)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsExternCode.cs 2007-10-29 20:30:27 UTC (rev 1014)
@@ -34,13 +34,6 @@
GetTrackTags();
CurrentThumbFileName = GUIMusicFiles.GetCoverArt(false, CurrentTrackFileName, CurrentTrackTag);
-
- if (CurrentThumbFileName.Length < 1) // no ThumbFile currently -> check if there is a folder.jpg
- {
- CurrentThumbFileName = String.Format(@"{0}\folder.jpg", MediaPortal.Util.Utils.RemoveTrailingSlash(System.IO.Path.GetDirectoryName(CurrentTrackFileName)));
- if (!System.IO.File.Exists(CurrentThumbFileName)) CurrentThumbFileName = string.Empty;
- }
-
if (CurrentThumbFileName.Length > 0)
{
// let us test if there is a larger cover art image
@@ -118,7 +111,7 @@
{
bool isCurSongCdTrack = IsCdTrack(CurrentTrackFileName);
bool isNextSongCdTrack = IsCdTrack(NextTrackFileName);
- MusicDatabase dbs = new MusicDatabase();
+ MusicDatabase dbs = MusicDatabase.Instance;
if (CurrentTrackTag != null)
PreviousTrackTag = CurrentTrackTag;
Modified: trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs 2007-10-29 14:04:34 UTC (rev 1013)
+++ trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs 2007-10-29 20:30:27 UTC (rev 1014)
@@ -31,5 +31,5 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("0.22")]
-[assembly: AssemblyFileVersion("0.22")]
+[assembly: AssemblyVersion("0.23")]
+[assembly: AssemblyFileVersion("0.23")]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rs...@us...> - 2007-10-29 14:04:37
|
Revision: 1013
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1013&view=rev
Author: rsparey
Date: 2007-10-29 07:04:34 -0700 (Mon, 29 Oct 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/common.time.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/common.window.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicgenres.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicsongs.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/mypics.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/myradio.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/myradioguide.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideo.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideoTitle.xml
Added Paths:
-----------
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/lowbar.png
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/musictrivia.png
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/osd_mid box.png
trunk/skins/Foofaraw/Development Skin/Foofaraw/musictrivia.xml
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml 2007-10-29 09:11:38 UTC (rev 1012)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml 2007-10-29 14:04:34 UTC (rev 1013)
@@ -28,19 +28,7 @@
<animation effect="fade" time="500" delay="1000">WindowOpen</animation>
<animation effect="fade" time="500">WindowClose</animation>
</control>
- <control>
- <description>Big text</description>
- <type>label</type>
- <id>200</id>
- <posX>673</posX>
- <posY>650</posY>
- <label>#highlightedbutton</label>
- <align>center</align>
- <font>wipeout</font>
- <textcolor>40ffffff</textcolor>
- <animation effect="fade" time="250" delay="2000" >WindowOpen</animation>
- <animation effect="fade" time="500" delay="5">WindowClose</animation>
- </control>
+
<control>
<type>image</type>
@@ -51,17 +39,35 @@
<width>1342</width>
<height>36</height>
<texture>top-strip.png</texture>
- <visible>Control.HasFocus(3)|Control.HasFocus(31)|Control.HasFocus(32)|Control.HasFocus(2)|Control.HasFocus(21)|Control.HasFocus(22)|Control.HasFocus(4)|Control.HasFocus(41)|Control.HasFocus(42)|Control.HasFocus(43)|Control.HasFocus(5)|Control.HasFocus(51)|Control.HasFocus(52)</visible>
- <animation effect="fade" time="500" >Visible</animation>
- <animation effect="fade" time="500" >Hidden</animation>
- <animation effect="fade" time="400" delay="2000">WindowOpen</animation>
- <animation effect="fade" time="400">WindowClose</animation>
+
+
+ </control>
+
+ <control>
+ <type>image</type>
+ <decription>lowbar info block</decription>
+ <id>1</id>
+ <posX>12</posX>
+ <posY>590</posY>
+ <width>1342</width>
+ <height>168</height>
+ <texture>lowbar.png</texture>
</control>
-
-
-
+ <control>
+ <description>Big text</description>
+ <type>label</type>
+ <id>200</id>
+ <posX>673</posX>
+ <posY>680</posY>
+ <label>#highlightedbutton</label>
+ <align>center</align>
+ <font>wipeout</font>
+ <textcolor>40ffffff</textcolor>
+ <animation effect="fade" time="250" delay="2000" >WindowOpen</animation>
+ <animation effect="fade" time="500" delay="5">WindowClose</animation>
+ </control>
<control>
<description>home BM Radio</description>
<type>button</type>
Added: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/lowbar.png
===================================================================
(Binary files differ)
Property changes on: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/lowbar.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/musictrivia.png
===================================================================
(Binary files differ)
Property changes on: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/musictrivia.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/osd_mid box.png
===================================================================
(Binary files differ)
Property changes on: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/osd_mid box.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/common.time.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/common.time.xml 2007-10-29 09:11:38 UTC (rev 1012)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/common.time.xml 2007-10-29 14:04:34 UTC (rev 1013)
@@ -3,22 +3,13 @@
<controls>
- <control>
- <description>time block</description>
- <type>image</type>
- <id>1</id>
- <posX>885</posX>
- <posY>720</posY>
- <width>471</width>
- <height>36</height>
- <texture>time_block.png</texture>
- </control>
+
<control>
<description>Date</description>
<type>label</type>
<id>1</id>
<posX>1065</posX>
- <posY>738</posY>
+ <posY>725</posY>
<label>#date</label>
<align>center</align>
<font>font14</font>
@@ -29,7 +20,7 @@
<type>label</type>
<id>1</id>
<posX>1294</posX>
- <posY>738</posY>
+ <posY>725</posY>
<label>#time</label>
<align>center</align>
<font>font13</font>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/common.window.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/common.window.xml 2007-10-29 09:11:38 UTC (rev 1012)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/common.window.xml 2007-10-29 14:04:34 UTC (rev 1013)
@@ -13,8 +13,8 @@
<description>Number of Files Label</description>
<type>label</type>
<id>1</id>
- <posX>1200</posX>
- <posY>650</posY>
+ <posX>1180</posX>
+ <posY>596</posY>
<label>#itemcount</label>
<align>right</align>
<textcolor>White</textcolor>
Added: trunk/skins/Foofaraw/Development Skin/Foofaraw/musictrivia.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/musictrivia.xml (rev 0)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/musictrivia.xml 2007-10-29 14:04:34 UTC (rev 1013)
@@ -0,0 +1,364 @@
+<window>
+ <id>6622</id>
+ <defaultcontrol>1</defaultcontrol>
+ <allowoverlay>no</allowoverlay>
+ <controls>
+ <import>common.time.xml</import>
+
+ <control>
+ <description>BackGround</description>
+ <type>image</type>
+ <id>6</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1366</width>
+ <height>768</height>
+ <texture>background.png</texture>
+ </control>
+
+ <control>
+ <description>header</description>
+ <type>image</type>
+ <id>30</id>
+ <posX>75</posX>
+ <posY>45</posY>
+ <texture flipY="true" diffuse="Thumb_Mask.png">musictrivia.png</texture>
+ </control>
+
+
+ <control>
+ <description>Start Button</description>
+ <type>button</type>
+ <id>1</id>
+ <posX>60</posX>
+ <posY>97</posY>
+ <label>Start</label>
+ <onleft>1</onleft>
+ <onright>9</onright>
+ <onup>1</onup>
+ <ondown>2</ondown>
+ </control>
+
+ <control>
+ <description>Stop</description>
+ <type>button</type>
+ <id>2</id>
+ <posX>60</posX>
+ <posY>135</posY>
+ <label>Stop</label>
+ <onleft>2</onleft>
+ <onright>9</onright>
+ <onup>1</onup>
+ <ondown>4</ondown>
+ </control>
+
+ <control>
+ <description>time</description>
+ <type>button</type>
+ <id>3</id>
+ <posX>60</posX>
+ <posY>212</posY>
+ <label>Time: 15</label>
+ <onleft>3</onleft>
+ <onright>9</onright>
+ <onup>4</onup>
+ <ondown>3</ondown>
+ </control>
+
+ <control>
+ <description>tries</description>
+ <type>button</type>
+ <id>4</id>
+ <posX>60</posX>
+ <posY>173</posY>
+ <label>Tries: 2</label>
+ <onleft>4</onleft>
+ <onright>9</onright>
+ <onup>2</onup>
+ <ondown>3</ondown>
+ </control>
+
+ <control>
+ <type>label</type>
+ <id>10</id>
+ <posX>380</posX>
+ <posY>245</posY>
+ <label>:00</label>
+ <font>font72</font>
+ <align>left</align>
+ <textcolor>White</textcolor>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
+
+ <control>
+ <type>label</type>
+ <id>11</id>
+ <posX>445</posX>
+ <posY>425</posY>
+ <label>Points</label>
+ <font>font18</font>
+ <align>left</align>
+ <textcolor>White</textcolor>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
+
+ <control>
+ <type>label</type>
+ <id>12</id>
+ <posX>395</posX>
+ <posY>415</posY>
+ <label></label>
+ <font>font32</font>
+ <align>left</align>
+ <textcolor>White</textcolor>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
+
+ <control>
+ <type>label</type>
+ <description>Player 1 label</description>
+ <id>100</id>
+ <posX>75</posX>
+ <posY>265</posY>
+ <label>Player 1</label>
+ <font>font18</font>
+ <align>left</align>
+ <visible>false</visible>
+ <textcolor>White</textcolor>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
+
+ <control>
+ <type>label</type>
+ <description>p1 correct: label</description>
+ <id>13</id>
+ <posX>75</posX>
+ <posY>325</posY>
+ <label>Correct:</label>
+ <font>font12</font>
+ <align>left</align>
+ <textcolor>White</textcolor>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
+
+ <control>
+ <type>label</type>
+ <id>14</id>
+ <description>p1 number of correct label</description>
+ <posX>155</posX>
+ <posY>325</posY>
+ <label></label>
+ <font>font12</font>
+ <align>left</align>
+ <textcolor>White</textcolor>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
+
+
+ <control>
+ <type>label</type>
+ <id>15</id>
+ <description>p1 wrong: label</description>
+ <posX>75</posX>
+ <posY>365</posY>
+ <label>Wrong:</label>
+ <font>font12</font>
+ <align>left</align>
+ <textcolor>White</textcolor>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
+
+ <control>
+ <type>label</type>
+ <id>16</id>
+ <description>p1 number wrong label</description>
+ <posX>155</posX>
+ <posY>365</posY>
+ <label></label>
+ <font>font12</font>
+ <align>left</align>
+ <textcolor>White</textcolor>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
+
+
+ <control>
+ <type>label</type>
+ <id>17</id>
+ <description>p1 score: label</description>
+ <posX>75</posX>
+ <posY>405</posY>
+ <label>Score:</label>
+ <font>font18</font>
+ <align>left</align>
+ <textcolor>White</textcolor>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
+
+ <control>
+ <type>label</type>
+ <id>18</id>
+ <description>p1 number score label</description>
+ <posX>200</posX>
+ <posY>408</posY>
+ <label></label>
+ <font>font18</font>
+ <align>left</align>
+ <textcolor>White</textcolor>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
+
+
+ <control>
+ <type>label</type>
+ <description>Player 2 label</description>
+ <id>20</id>
+ <posX>75</posX>
+ <posY>495</posY>
+ <label>Player 2</label>
+ <font>font18</font>
+ <align>left</align>
+ <visible>false</visible>
+ <textcolor>White</textcolor>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
+
+ <control>
+ <type>label</type>
+ <description>p2 correct: label</description>
+ <id>23</id>
+ <posX>75</posX>
+ <posY>555</posY>
+ <label>Correct:</label>
+ <font>font12</font>
+ <align>left</align>
+ <visible>false</visible>
+ <textcolor>White</textcolor>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
+
+ <control>
+ <type>label</type>
+ <id>24</id>
+ <description>p2 number of correct label</description>
+ <posX>155</posX>
+ <posY>555</posY>
+ <label></label>
+ <font>font12</font>
+ <align>left</align>
+ <visible>false</visible>
+ <textcolor>White</textcolor>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
+
+
+ <control>
+ <type>label</type>
+ <id>25</id>
+ <description>p2 wrong: label</description>
+ <posX>75</posX>
+ <posY>595</posY>
+ <label>Wrong:</label>
+ <font>font12</font>
+ <align>left</align>
+ <visible>false</visible>
+ <textcolor>White</textcolor>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
+
+ <control>
+ <type>label</type>
+ <id>26</id>
+ <description>p2 number wrong label</description>
+ <posX>155</posX>
+ <posY>595</posY>
+ <label></label>
+ <font>font12</font>
+ <align>left</align>
+ <visible>false</visible>
+ <textcolor>White</textcolor>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
+
+
+ <control>
+ <type>label</type>
+ <id>27</id>
+ <description>p2 score: label</description>
+ <posX>75</posX>
+ <posY>635</posY>
+ <label>Score:</label>
+ <font>font18</font>
+ <align>left</align>
+ <visible>false</visible>
+ <textcolor>White</textcolor>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
+
+ <control>
+ <type>label</type>
+ <id>28</id>
+ <description>p2 number score label</description>
+ <posX>200</posX>
+ <posY>638</posY>
+ <label></label>
+ <font>font18</font>
+ <align>left</align>
+ <visible>false</visible>
+ <textcolor>White</textcolor>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
+
+
+
+ <control>
+
+ <type>listcontrol</type>
+ <description>scheduler recordings listcontrol</description>
+ <id>9</id>
+ <posX>600</posX>
+ <height>600</height>
+ <width>750</width>
+ <onleft>2</onleft>
+ <onright>9</onright>
+ <onup>9</onup>
+ <ondown>9</ondown>
+ <font>font16</font>
+ <font2>font12</font2>
+ <font3>font12</font3>
+ <textXOff>27</textXOff>
+ <textXOff2>780</textXOff2>
+ <textXOff3>172</textXOff3>
+ <textYOff>12</textYOff>
+ <textYOff2>88</textYOff2>
+ <textYOff3>48</textYOff3>
+ <IconXOff>22</IconXOff>
+ <IconYOff>16</IconYOff>
+ <textcolor2>ffa9d0f7</textcolor2>
+ <textcolor3>ffa9d0f7</textcolor3>
+ <itemHeight>100</itemHeight>
+ <itemWidth>133</itemWidth>
+ <textureHeight>133</textureHeight>
+ <keepaspectratio>yes</keepaspectratio>
+
+ </control>
+
+</controls>
+</window>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicgenres.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicgenres.xml 2007-10-29 09:11:38 UTC (rev 1012)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicgenres.xml 2007-10-29 14:04:34 UTC (rev 1013)
@@ -78,7 +78,129 @@
<texture>top-strip.png</texture>
</control>
+ <control>
+ <type>image</type>
+ <decription>lowbar info block</decription>
+ <id>1</id>
+ <posX>12</posX>
+ <posY>590</posY>
+ <width>1342</width>
+ <height>168</height>
+ <texture>lowbar.png</texture>
+
+ </control>
+ <control>
+ <description>home BM Radio</description>
+ <type>button</type>
+ <id>04081980</id>
+ <posX>1002</posX>
+ <posY>635</posY>
+ <width>50</width>
+ <height>100</height>
+ <textureFocus>Radio.png</textureFocus>
+ <textureNoFocus>Radio.png</textureNoFocus>
+ <thumbZoom>yes</thumbZoom>
+ <hyperlink>30</hyperlink>
+ <label>665</label>
+ <textcolor>00ffffff</textcolor>
+ <textcolorNoFocus>00ffffff</textcolorNoFocus>
+ <onleft>10</onleft>
+ <onright>05081980</onright>
+ <onup>50</onup>
+ <ondown>21</ondown>
+ <animation effect="fade" time="1000" delay="1000" >WindowOpen</animation>
+ <animation effect="fade" time="1000">WindowClose</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="1027,685" time="300" acceleration ="-1" >Focus</animation>
+
+ <animation effect="zoom" start="140,140" end="100,100" center="1027,685" time="300" acceleration ="-1" >Unfocus</animation>
+ </control>
+ <control>
+ <description>home BM Video</description>
+ <type>button</type>
+ <id>05081980</id>
+ <posX>1073</posX>
+ <posY>635</posY>
+ <width>50</width>
+ <height>100</height>
+ <textureFocus>Video.png</textureFocus>
+ <textureNoFocus>Video.png</textureNoFocus>
+ <hyperlink>6</hyperlink>
+ <hover>-</hover>
+ <hoverX>502</hoverX>
+ <hoverY>250</hoverY>
+ <hoverWidth>272</hoverWidth>
+ <hoverHeight>306</hoverHeight>
+ <label>3</label>
+ <textcolor>00ffffff</textcolor>
+ <textcolorNoFocus>00ffffff</textcolorNoFocus>
+ <onleft>04081980</onleft>
+ <onright>06081980</onright>
+ <onup>50</onup>
+ <ondown>21</ondown>
+ <animation effect="fade" time="1000" delay="750" >WindowOpen</animation>
+ <animation effect="fade" time="1000" delay="250" >WindowClose</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="1098,685" time="300" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="140,140" end="100,100" center="1098,685" time="300" acceleration ="-1" >Unfocus</animation>
+ </control>
+ <control>
+ <description>home BM TV</description>
+ <type>button</type>
+ <id>06081980</id>
+ <posX>1143</posX>
+ <posY>635</posY>
+ <width>50</width>
+ <height>100</height>
+ <textureFocus>TV.png</textureFocus>
+ <textureNoFocus>TV.png</textureNoFocus>
+ <hyperlink>1</hyperlink>
+ <label>605</label>
+ <textcolor>00ffffff</textcolor>
+ <textcolorNoFocus>00ffffff</textcolorNoFocus>
+ <hover>-</hover>
+ <hoverX>502</hoverX>
+ <hoverY>250</hoverY>
+ <hoverWidth>272</hoverWidth>
+ <hoverHeight>306</hoverHeight>
+ <onleft>05081980</onleft>
+ <onright>07081980</onright>
+ <onup>50</onup>
+ <ondown>21</ondown>
+ <animation effect="fade" time="1000" delay="500" >WindowOpen</animation>
+ <animation effect="fade" time="1000" delay="500">WindowClose</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="1168,685" time="300" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="140,140" end="100,100" center="1165,665" time="300" acceleration ="-1" >Unfocus</animation>
+ </control>
+
+ <control>
+ <description>home Pictures</description>
+ <type>button</type>
+ <id>07081980</id>
+ <posX>1213</posX>
+ <posY>635</posY>
+ <width>50</width>
+ <height>100</height>
+ <textureFocus>Pictures.png</textureFocus>
+ <textureNoFocus>Pictures.png</textureNoFocus>
+ <hyperlink>2</hyperlink>
+ <label>1</label>
+ <textcolor>00ffffff</textcolor>
+ <textcolorNoFocus>00ffffff</textcolorNoFocus>
+ <hover>-</hover>
+ <hoverX>502</hoverX>
+ <hoverY>250</hoverY>
+ <hoverWidth>272</hoverWidth>
+ <hoverHeight>306</hoverHeight>
+ <onleft>06081980</onleft>
+ <onright>2</onright>
+ <onup>50</onup>
+ <ondown>21</ondown>
+ <animation effect="fade" time="1000" delay="500" >WindowOpen</animation>
+ <animation effect="fade" time="1000" delay="500">WindowClose</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="1238,685" time="300" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="140,140" end="100,100" center="1238,665" time="300" acceleration ="-1" >Unfocus</animation>
+ </control>
+
<control>
<description>View-As button</description>
@@ -90,7 +212,7 @@
<posX>12</posX>
<label>100</label>
<font>font14</font>
- <onleft>10</onleft>
+ <onleft>07081980</onleft>
<onright>3</onright>
<onup>21</onup>
<ondown>50</ondown>
@@ -205,7 +327,7 @@
<width>209</width>
<height>36</height>
<onleft>9</onleft>
- <onright>2</onright>
+ <onright>04081980</onright>
<onup>21</onup>
<ondown>11</ondown>
<textureFocus>tab_down.png</textureFocus>
@@ -255,7 +377,7 @@
<animation effect="fade" time="400">WindowOpen</animation>
<posX>240</posX>
<posY>650</posY>
- <width>1000</width>
+ <width>700</width>
<label>#selecteditem</label>
<font>wipeout</font>
<align>Left</align>
@@ -283,20 +405,18 @@
<onup>2</onup>
<ondown>50</ondown>
<posX>542</posX>
- <posY>160</posY>
+ <posY>140</posY>
<width>800</width>
- <height>520</height>
- <spinWidth>27</spinWidth>
- <spinHeight>27</spinHeight>
- <spinPosX>1240</spinPosX>
- <spinPosY>650</spinPosY>
- <spinColor>ffffffff</spinColor>
- <textureUp>page_up_nofocus.png</textureUp>
- <textureDown>page_down_nofocus.png</textureDown>
- <textureUpFocus>page_up_focu.png</textureUpFocus>
- <textureDownFocus>page_down_focus.png</textureDownFocus>
- <textureFocus>list_sub_focus.png</textureFocus>
- <textureNoFocus>list_sub_nofocus.png</textureNoFocus>
+ <height>500</height>
+ <spinWidth>28</spinWidth>
+ <spinHeight>28</spinHeight>
+ <spinPosX>1252</spinPosX>
+ <spinPosY>592</spinPosY>
+ <spinColor>ffffffff</spinColor>
+ <textureUp>page_up_nofocus.png</textureUp>
+ <textureDown>page_down_nofocus.png</textureDown>
+ <textureUpFocus>page_up_focus.png</textureUpFocus>
+ <textureDownFocus>page_down_focus.png</textureDownFocus>
<textureHeight>35</textureHeight>
<image>folder_focus.png</image>
<font>font10</font>
@@ -331,28 +451,28 @@
<onup>2</onup>
<ondown>50</ondown>
<posX>30</posX>
- <posY>140</posY>
+ <posY>140</posY>
<width>1316</width>
<height>480</height>
- <spinWidth>27</spinWidth>
- <spinHeight>27</spinHeight>
- <spinPosX>1240</spinPosX>
- <spinPosY>650</spinPosY>
+ <spinWidth>28</spinWidth>
+ <spinHeight>28</spinHeight>
+ <spinPosX>1262</spinPosX>
+ <spinPosY>592</spinPosY>
<spinColor>ffffffff</spinColor>
- <textureUp>arrow_round_right_nofocus.png</textureUp>
- <textureDown>arrow_round_left_nofocus.png</textureDown>
- <textureUpFocus>arrow_round_right_focus.png</textureUpFocus>
- <textureDownFocus>arrow_round_left_focus.png</textureDownFocus>
+ <textureUp>page_up_nofocus.png</textureUp>
+ <textureDown>page_down_nofocus.png</textureDown>
+ <textureUpFocus>page_up_focus.png</textureUpFocus>
+ <textureDownFocus>page_down_focus.png</textureDownFocus>
<itemWidth>80</itemWidth>
- <itemHeight>60</itemHeight>
+ <itemHeight>80</itemHeight>
<textureWidth>80</textureWidth>
- <textureHeight>60</textureHeight>
- <thumbWidth>80</thumbWidth>
- <thumbHeight>60</thumbHeight>
- <thumbPosX>15</thumbPosX>
- <thumbPosY>15</thumbPosY>
- <imageFolder>-</imageFolder>
- <imageFolderFocus>-</imageFolderFocus>
+ <textureHeight>80</textureHeight>
+ <thumbWidth>70</thumbWidth>
+ <thumbHeight>70</thumbHeight>
+ <thumbPosX>5</thumbPosX>
+ <thumbPosY>5</thumbPosY>
+ <imageFolder>icon_empty_nofocus.png</imageFolder>
+ <imageFolderFocus>icon_empty_focus.png</imageFolderFocus>
<font>-</font>
<selectedColor>ffffffff</selectedColor>
@@ -361,14 +481,14 @@
<remoteColor>ffFFA075</remoteColor>
<downloadColor>ff80ff80</downloadColor>
<suffix>|</suffix>
- <textureWidthBig>105</textureWidthBig><!-- 150 -->
- <textureHeightBig>105</textureHeightBig> <!-- 150 -->
- <itemWidthBig>105</itemWidthBig><!-- 180 -->
- <itemHeightBig>105</itemHeightBig><!-- 180 -->
- <thumbWidthBig>105</thumbWidthBig>
- <thumbHeightBig>105</thumbHeightBig>
- <thumbPosXBig>0</thumbPosXBig><!-- 19 -->
- <thumbPosYBig>0</thumbPosYBig> <!-- 19 -->
+ <textureWidthBig>145</textureWidthBig><!-- 150 -->
+ <textureHeightBig>145</textureHeightBig> <!-- 150 -->
+ <itemWidthBig>145</itemWidthBig><!-- 180 -->
+ <itemHeightBig>145</itemHeightBig><!-- 180 -->
+ <thumbWidthBig>135</thumbWidthBig>
+ <thumbHeightBig>135</thumbHeightBig>
+ <thumbPosXBig>5</thumbPosXBig><!-- 19 -->
+ <thumbPosYBig>5</thumbPosYBig> <!-- 19 -->
<unfocusedAlpha>180</unfocusedAlpha>
<textXOff>-5000</textXOff>
<showFrame>yes</showFrame>
@@ -392,10 +512,10 @@
<posY>220</posY>
<width>1400</width>
<height>400</height>
- <spinWidth>36</spinWidth>
- <spinHeight>36</spinHeight>
- <spinPosX>1200</spinPosX>
- <spinPosY>515</spinPosY>
+ <spinWidth>28</spinWidth>
+ <spinHeight>28</spinHeight>
+ <spinPosX>1254</spinPosX>
+ <spinPosY>592</spinPosY>
<spinColor>ffffffff</spinColor>
<textureUp>arrow_round_right_nofocus.png</textureUp>
<textureDown>arrow_round_left_nofocus.png</textureDown>
@@ -466,8 +586,8 @@
<description>Number of Files Label</description>
<type>label</type>
<id>1</id>
- <posX>1200</posX>
- <posY>650</posY>
+ <posX>1180</posX>
+ <posY>596</posY>
<label>#itemcount</label>
<align>right</align>
<textcolor>White</textcolor>
@@ -524,5 +644,66 @@
<animation effect="fade" time="250">visiblechange</animation>
<animation effect="slide" start="0,-72" end="0,0" time="250">visiblechange</animation>
</control>
+
+ <control>
+ <type>image</type>
+ <description> mid selection box</description>
+ <id>1</id>
+ <posX>582</posX>
+ <posY>314</posY>
+ <width>203</width>
+ <height>140</height>
+ <texture>osd_mid box.png</texture>
+ <visible>Control.HasFocus(04081980)|Control.HasFocus(05081980)|Control.HasFocus(06081980)|Control.HasFocus(07081980)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <description> mid selection box - radio</description>
+ <id>1</id>
+ <posX>633</posX>
+ <posY>325</posY>
+ <width>100</width>
+ <height>200</height>
+ <texture>Radio.png</texture>
+ <visible>Control.HasFocus(04081980)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <description> mid selection box - video</description>
+ <id>1</id>
+ <posX>633</posX>
+ <posY>325</posY>
+ <width>100</width>
+ <height>200</height>
+ <texture>Video.png</texture>
+ <visible>Control.HasFocus(05081980)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <description> mid selection box - tv</description>
+ <id>1</id>
+ <posX>633</posX>
+ <posY>325</posY>
+ <width>100</width>
+ <height>200</height>
+ <texture>TV.png</texture>
+ <visible>Control.HasFocus(06081980)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <description> mid selection box - photo</description>
+ <id>1</id>
+ <posX>633</posX>
+ <posY>325</posY>
+ <width>100</width>
+ <height>200</height>
+ <texture>Pictures.png</texture>
+ <visible>Control.HasFocus(07081980)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ </control>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicsongs.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicsongs.xml 2007-10-29 09:11:38 UTC (rev 1012)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicsongs.xml 2007-10-29 14:04:34 UTC (rev 1013)
@@ -79,7 +79,130 @@
</control>
+ <control>
+ <type>image</type>
+ <decription>lowbar info block</decription>
+ <id>1</id>
+ <posX>12</posX>
+ <posY>590</posY>
+ <width>1342</width>
+ <height>168</height>
+ <texture>lowbar.png</texture>
+ </control>
+
+ <control>
+ <description>home BM Radio</description>
+ <type>button</type>
+ <id>04081980</id>
+ <posX>1002</posX>
+ <posY>635</posY>
+ <width>50</width>
+ <height>100</height>
+ <textureFocus>Radio.png</textureFocus>
+ <textureNoFocus>Radio.png</textureNoFocus>
+ <thumbZoom>yes</thumbZoom>
+ <hyperlink>30</hyperlink>
+ <label>665</label>
+ <textcolor>00ffffff</textcolor>
+ <textcolorNoFocus>00ffffff</textcolorNoFocus>
+ <onleft>10</onleft>
+ <onright>05081980</onright>
+ <onup>50</onup>
+ <ondown>21</ondown>
+ <animation effect="fade" time="1000" delay="1000" >WindowOpen</animation>
+ <animation effect="fade" time="1000">WindowClose</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="1027,685" time="300" acceleration ="-1" >Focus</animation>
+
+ <animation effect="zoom" start="140,140" end="100,100" center="1027,685" time="300" acceleration ="-1" >Unfocus</animation>
+ </control>
+ <control>
+ <description>home BM Video</description>
+ <type>button</type>
+ <id>05081980</id>
+ <posX>1073</posX>
+ <posY>635</posY>
+ <width>50</width>
+ <height>100</height>
+ <textureFocus>Video.png</textureFocus>
+ <textureNoFocus>Video.png</textureNoFocus>
+ <hyperlink>6</hyperlink>
+ <hover>-</hover>
+ <hoverX>502</hoverX>
+ <hoverY>250</hoverY>
+ <hoverWidth>272</hoverWidth>
+ <hoverHeight>306</hoverHeight>
+ <label>3</label>
+ <textcolor>00ffffff</textcolor>
+ <textcolorNoFocus>00ffffff</textcolorNoFocus>
+ <onleft>04081980</onleft>
+ <onright>06081980</onright>
+ <onup>50</onup>
+ <ondown>21</ondown>
+ <animation effect="fade" time="1000" delay="750" >WindowOpen</animation>
+ <animation effect="fade" time="1000" delay="250" >WindowClose</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="1098,685" time="300" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="140,140" end="100,100" center="1098,685" time="300" acceleration ="-1" >Unfocus</animation>
+ </control>
+
+ <control>
+ <description>home BM TV</description>
+ <type>button</type>
+ <id>06081980</id>
+ <posX>1143</posX>
+ <posY>635</posY>
+ <width>50</width>
+ <height>100</height>
+ <textureFocus>TV.png</textureFocus>
+ <textureNoFocus>TV.png</textureNoFocus>
+ <hyperlink>1</hyperlink>
+ <label>605</label>
+ <textcolor>00ffffff</textcolor>
+ <textcolorNoFocus>00ffffff</textcolorNoFocus>
+ <hover>-</hover>
+ <hoverX>502</hoverX>
+ <hoverY>250</hoverY>
+ <hoverWidth>272</hoverWidth>
+ <hoverHeight>306</hoverHeight>
+ <onleft>05081980</onleft>
+ <onright>07081980</onright>
+ <onup>50</onup>
+ <ondown>21</ondown>
+ <animation effect="fade" time="1000" delay="500" >WindowOpen</animation>
+ <animation effect="fade" time="1000" delay="500">WindowClose</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="1168,685" time="300" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="140,140" end="100,100" center="1165,665" time="300" acceleration ="-1" >Unfocus</animation>
+ </control>
+
+ <control>
+ <description>home Pictures</description>
+ <type>button</type>
+ <id>07081980</id>
+ <posX>1213</posX>
+ <posY>635</posY>
+ <width>50</width>
+ <height>100</height>
+ <textureFocus>Pictures.png</textureFocus>
+ <textureNoFocus>Pictures.png</textureNoFocus>
+ <hyperlink>2</hyperlink>
+ <label>1</label>
+ <textcolor>00ffffff</textcolor>
+ <textcolorNoFocus>00ffffff</textcolorNoFocus>
+ <hover>-</hover>
+ <hoverX>502</hoverX>
+ <hoverY>250</hoverY>
+ <hoverWidth>272</hoverWidth>
+ <hoverHeight>306</hoverHeight>
+ <onleft>06081980</onleft>
+ <onright>2</onright>
+ <onup>50</onup>
+ <ondown>21</ondown>
+ <animation effect="fade" time="1000" delay="500" >WindowOpen</animation>
+ <animation effect="fade" time="1000" delay="500">WindowClose</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="1238,685" time="300" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="140,140" end="100,100" center="1238,665" time="300" acceleration ="-1" >Unfocus</animation>
+ </control>
+
<control>
<description>View-As button</description>
<type>button</type>
@@ -90,7 +213,7 @@
<posX>12</posX>
<label>100</label>
<font>font14</font>
- <onleft>10</onleft>
+ <onleft>07081980</onleft>
<onright>3</onright>
<onup>21</onup>
<ondown>50</ondown>
@@ -205,7 +328,7 @@
<width>209</width>
<height>36</height>
<onleft>9</onleft>
- <onright>2</onright>
+ <onright>04081980</onright>
<onup>21</onup>
<ondown>11</ondown>
<textureFocus>tab_down.png</textureFocus>
@@ -255,7 +378,7 @@
<animation effect="fade" time="400">WindowOpen</animation>
<posX>240</posX>
<posY>650</posY>
- <width>1000</width>
+ <width>700</width>
<label>#selecteditem</label>
<font>wipeout</font>
<align>Left</align>
@@ -279,24 +402,22 @@
<type>listcontrol</type>
<id>50</id>
<onleft>2</onleft>
- <onright>2</onright>
+ <onright>04081980</onright>
<onup>2</onup>
- <ondown>50</ondown>
+ <ondown>04081980</ondown>
<posX>542</posX>
- <posY>160</posY>
+ <posY>140</posY>
<width>800</width>
- <height>520</height>
- <spinWidth>27</spinWidth>
- <spinHeight>27</spinHeight>
- <spinPosX>1240</spinPosX>
- <spinPosY>650</spinPosY>
- <spinColor>ffffffff</spinColor>
- <textureUp>page_up_nofocus.png</textureUp>
- <textureDown>page_down_nofocus.png</textureDown>
- <textureUpFocus>page_up_focu.png</textureUpFocus>
- <textureDownFocus>page_down_focus.png</textureDownFocus>
- <textureFocus>list_sub_focus.png</textureFocus>
- <textureNoFocus>list_sub_nofocus.png</textureNoFocus>
+ <height>500</height>
+ <spinWidth>28</spinWidth>
+ <spinHeight>28</spinHeight>
+ <spinPosX>1252</spinPosX>
+ <spinPosY>592</spinPosY>
+ <spinColor>ffffffff</spinColor>
+ <textureUp>page_up_nofocus.png</textureUp>
+ <textureDown>page_down_nofocus.png</textureDown>
+ <textureUpFocus>page_up_focus.png</textureUpFocus>
+ <textureDownFocus>page_down_focus.png</textureDownFocus>
<textureHeight>35</textureHeight>
<image>folder_focus.png</image>
<font>font10</font>
@@ -327,22 +448,22 @@
<type>thumbnailpanel</type>
<id>50</id>
<onleft>2</onleft>
- <onright>2</onright>
+ <onright>04081980</onright>
<onup>2</onup>
- <ondown>50</ondown>
+ <ondown>04081980</ondown>
<posX>30</posX>
- <posY>140</posY>
+ <posY>140</posY>
<width>1316</width>
<height>480</height>
- <spinWidth>27</spinWidth>
- <spinHeight>27</spinHeight>
- <spinPosX>1240</spinPosX>
- <spinPosY>650</spinPosY>
+ <spinWidth>28</spinWidth>
+ <spinHeight>28</spinHeight>
+ <spinPosX>1262</spinPosX>
+ <spinPosY>592</spinPosY>
<spinColor>ffffffff</spinColor>
- <textureUp>arrow_round_right_nofocus.png</textureUp>
- <textureDown>arrow_round_left_nofocus.png</textureDown>
- <textureUpFocus>arrow_round_right_focus.png</textureUpFocus>
- <textureDownFocus>arrow_round_left_focus.png</textureDownFocus>
+ <textureUp>page_up_nofocus.png</textureUp>
+ <textureDown>page_down_nofocus.png</textureDown>
+ <textureUpFocus>page_up_focus.png</textureUpFocus>
+ <textureDownFocus>page_down_focus.png</textureDownFocus>
<itemWidth>80</itemWidth>
<itemHeight>80</itemHeight>
<textureWidth>80</textureWidth>
@@ -361,12 +482,12 @@
<remoteColor>ffFFA075</remoteColor>
<downloadColor>ff80ff80</downloadColor>
<suffix>|</suffix>
- <textureWidthBig>105</textureWidthBig><!-- 150 -->
- <textureHeightBig>105</textureHeightBig> <!-- 150 -->
- <itemWidthBig>105</itemWidthBig><!-- 180 -->
- <itemHeightBig>105</itemHeightBig><!-- 180 -->
- <thumbWidthBig>95</thumbWidthBig>
- <thumbHeightBig>95</thumbHeightBig>
+ <textureWidthBig>145</textureWidthBig><!-- 150 -->
+ <textureHeightBig>145</textureHeightBig> <!-- 150 -->
+ <itemWidthBig>145</itemWidthBig><!-- 180 -->
+ <itemHeightBig>145</itemHeightBig><!-- 180 -->
+ <thumbWidthBig>135</thumbWidthBig>
+ <thumbHeightBig>135</thumbHeightBig>
<thumbPosXBig>5</thumbPosXBig><!-- 19 -->
<thumbPosYBig>5</thumbPosYBig> <!-- 19 -->
<unfocusedAlpha>180</unfocusedAlpha>
@@ -385,17 +506,17 @@
<type>filmstrip</type>
<id>50</id>
<onleft>2</onleft>
- <onright>2</onright>
+ <onright>04081980</onright>
<onup>2</onup>
- <ondown>50</ondown>
+ <ondown>04081980</ondown>
<posX>60</posX>
<posY>220</posY>
<width>1400</width>
<height>400</height>
- <spinWidth>36</spinWidth>
- <spinHeight>36</spinHeight>
- <spinPosX>1200</spinPosX>
- <spinPosY>515</spinPosY>
+ <spinWidth>28</spinWidth>
+ <spinHeight>28</spinHeight>
+ <spinPosX>1254</spinPosX>
+ <spinPosY>592</spinPosY>
<spinColor>ffffffff</spinColor>
<textureUp>arrow_round_right_nofocus.png</textureUp>
<textureDown>arrow_round_left_nofocus.png</textureDown>
@@ -466,8 +587,8 @@
<description>Number of Files Label</description>
<type>label</type>
<id>1</id>
- <posX>1200</posX>
- <posY>650</posY>
+ <posX>1180</posX>
+ <posY>596</posY>
<label>#itemcount</label>
<align>right</align>
<textcolor>White</textcolor>
@@ -476,6 +597,7 @@
<animation effect="fade" time="200">WindowClose</animation>
</control>
+
<control>
<description> playlist</description>
@@ -524,6 +646,67 @@
<animation effect="fade" time="250">visiblechange</animation>
<animation effect="slide" start="0,-72" end="0,0" time="250">visiblechange</animation>
</control>
+
+ <control>
+ <type>image</type>
+ <description> mid selection box</description>
+ <id>1</id>
+ <posX>582</posX>
+ <posY>314</posY>
+ <width>203</width>
+ <height>140</height>
+ <texture>osd_mid box.png</texture>
+ <visible>Control.HasFocus(04081980)|Control.HasFocus(05081980)|Control.HasFocus(06081980)|Control.HasFocus(07081980)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <description> mid selection box - radio</description>
+ <id>1</id>
+ <posX>633</posX>
+ <posY>325</posY>
+ <width>100</width>
+ <height>200</height>
+ <texture>Radio.png</texture>
+ <visible>Control.HasFocus(04081980)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <description> mid selection box - video</description>
+ <id>1</id>
+ <posX>633</posX>
+ <posY>325</posY>
+ <width>100</width>
+ <height>200</height>
+ <texture>Video.png</texture>
+ <visible>Control.HasFocus(05081980)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <description> mid selection box - tv</description>
+ <id>1</id>
+ <posX>633</posX>
+ <posY>325</posY>
+ <width>100</width>
+ <height>200</height>
+ <texture>TV.png</texture>
+ <visible>Control.HasFocus(06081980)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <description> mid selection box - photo</description>
+ <id>1</id>
+ <posX>633</posX>
+ <posY>325</posY>
+ <width>100</width>
+ <height>200</height>
+ <texture>Pictures.png</texture>
+ <visible>Control.HasFocus(07081980)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ </control>
</controls>
</window>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mypics.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/mypics.xml 2007-10-29 09:11:38 UTC (rev 1012)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mypics.xml 2007-10-29 14:04:34 UTC (rev 1013)
@@ -241,17 +241,15 @@
<posY>160</posY>
<width>800</width>
<height>520</height>
- <spinWidth>27</spinWidth>
- <spinHeight>27</spinHeight>
- <spinPosX>1240</spinPosX>
- <spinPosY>650</spinPosY>
- <spinColor>ffffffff</spinColor>
- <textureUp>page_up_nofocus.png</textureUp>
- <textureDown>page_down_nofocus.png</textureDown>
- <textureUpFocus>page_up_focu.png</textureUpFocus>
- <textureDownFocus>page_down_focus.png</textureDownFocus>
- <textureFocus>list_sub_focus.png</textureFocus>
- <textureNoFocus>list_sub_nofocus.png</textureNoFocus>
+ <spinWidth>36</spinWidth>
+ <spinHeight>36</spinHeight>
+ <spinPosX>1200</spinPosX>
+ <spinPosY>640</spinPosY>
+ <spinColor>ffffffff</spinColor>
+ <textureUp>page_up_nofocus.png</textureUp>
+ <textureDown>page_down_nofocus.png</textureDown>
+ <textureUpFocus>page_up_focus.png</textureUpFocus>
+ <textureDownFocus>page_down_focus.png</textureDownFocus>
<textureHeight>35</textureHeight>
<image>folder_focus.png</image>
<font>font10</font>
@@ -275,7 +273,7 @@
<suffix>|</suffix>
</control>
- <control>
+ <control>
<description>Thumbnail Panel</description>
<type>thumbnailpanel</type>
<id>50</id>
@@ -283,29 +281,29 @@
<onright>2</onright>
<onup>2</onup>
<ondown>50</ondown>
- <posX>30</posX>
- <posY>198</posY>
+ <posX>30</posX>
+ <posY>140</posY>
<width>1316</width>
- <height>350</height>
- <spinWidth>27</spinWidth>
- <spinHeight>27</spinHeight>
- <spinPosX>1240</spinPosX>
- <spinPosY>515</spinPosY>
+ <height>480</height>
+ <spinWidth>36</spinWidth>
+ <spinHeight>36</spinHeight>
+ <spinPosX>1200</spinPosX>
+ <spinPosY>640</spinPosY>
<spinColor>ffffffff</spinColor>
- <textureUp>page_up_nofocus.png</textureUp>
- <textureDown>page_down_nofocus.png</textureDown>
- <textureUpFocus>page_up_focu.png</textureUpFocus>
- <textureDownFocus>page_down_focus.png</textureDownFocus>
+ <textureUp>page_up_nofocus.png</textureUp>
+ <textureDown>page_down_nofocus.png</textureDown>
+ <textureUpFocus>page_up_focus.png</textureUpFocus>
+ <textureDownFocus>page_down_focus.png</textureDownFocus>
<itemWidth>80</itemWidth>
- <itemHeight>60</itemHeight>
+ <itemHeight>80</itemHeight>
<textureWidth>80</textureWidth>
- <textureHeight>60</textureHeight>
- <thumbWidth>80</thumbWidth>
- <thumbHeight>60</thumbHeight>
- <thumbPosX>15</thumbPosX>
- <thumbPosY>15</thumbPosY>
- <imageFolder>-</imageFolder>
- <imageFolderFocus>-</imageFolderFocus>
+ <textureHeight>80</textureHeight>
+ <thumbWidth>70</thumbWidth>
+ <thumbHeight>70</thumbHeight>
+ <thumbPosX>5</thumbPosX>
+ <thumbPosY>5</thumbPosY>
+ <imageFolder>icon_empty_nofocus.png</imageFolder>
+ <imageFolderFocus>icon_empty_focus.png</imageFolderFocus>
<font>-</font>
<selectedColor>ffffffff</selectedColor>
@@ -314,14 +312,14 @@
<remoteColor>ffFFA075</remoteColor>
<downloadColor>ff80ff80</downloadColor>
<suffix>|</suffix>
- <textureWidthBig>105</textureWidthBig><!-- 150 -->
- <textureHeightBig>105</textureHeightBig> <!-- 150 -->
- <itemWidthBig>105</itemWidthBig><!-- 180 -->
- <itemHeightBig>105</itemHeightBig><!-- 180 -->
- <thumbWidthBig>105</thumbWidthBig>
- <thumbHeightBig>105</thumbHeightBig>
- <thumbPosXBig>0</thumbPosXBig><!-- 19 -->
- <thumbPosYBig>0</thumbPosYBig> <!-- 19 -->
+ <textureWidthBig>155</textureWidthBig><!-- 150 -->
+ <textureHeightBig>155</textureHeightBig> <!-- 150 -->
+ <itemWidthBig>155</itemWidthBig><!-- 180 -->
+ <itemHeightBig>155</itemHeightBig><!-- 180 -->
+ <thumbWidthBig>145</thumbWidthBig>
+ <thumbHeightBig>145</thumbHeightBig>
+ <thumbPosXBig>5</thumbPosXBig><!-- 19 -->
+ <thumbPosYBig>5</thumbPosYBig> <!-- 19 -->
<unfocusedAlpha>180</unfocusedAlpha>
<textXOff>-5000</textXOff>
<showFrame>yes</showFrame>
@@ -332,7 +330,7 @@
<thumbs flipY="false" diffuse="Thumb_Mask.png"/>
<thumbAnimation effect="zoom" start="100,100" end="150,150" time="200">focus</thumbAnimation>
<thumbAnimation effect="zoom" start="150,150" end="100,100" time="200">unfocus</thumbAnimation>
- </control>
+ </control>
<control>
<description>Filmstrip view</description>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/myradio.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/myradio.xml 2007-10-29 09:11:38 UTC (rev 1012)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/myradio.xml 2007-10-29 14:04:34 UTC (rev 1013)
@@ -65,18 +65,142 @@
<texture>top-strip.png</texture>
</control>
+
+
+ <control>
+ <type>image</type>
+ <decription>lowbar info block</decription>
+ <id>1</id>
+ <posX>12</posX>
+ <posY>590</posY>
+ <width>1342</width>
+ <height>168</height>
+ <texture>lowbar.png</texture>
+ </control>
+
+ <control>
+ <description>home Video</description>
+ <type>button</type>
+ <id>04081980</id>
+ <posX>1002</posX>
+ <posY>635</posY>
+ <width>50</width>
+ <height>100</height>
+ <textureFocus>Video.png</textureFocus>
+ <textureNoFocus>Video.png</textureNoFocus>
+ <thumbZoom>yes</thumbZoom>
+ <hyperlink>6</hyperlink>
+ <label>665</label>
+ <textcolor>00ffffff</textcolor>
+ <textcolorNoFocus>00ffffff</textcolorNoFocus>
+ <onleft>8</onleft>
+ <onright>05081980</onright>
+ <onup>50</onup>
+ <ondown>21</ondown>
+ <animation effect="fade" time="1000" delay="1000" >WindowOpen</animation>
+ <animation effect="fade" time="1000">WindowClose</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="1027,685" time="300" acceleration ="-1" >Focus</animation>
+
+ <animation effect="zoom" start="140,140" end="100,100" center="1027,685" time="300" acceleration ="-1" >Unfocus</animation>
+ </control>
+ <control>
+ <description>home TV</description>
+ <type>button</type>
+ <id>05081980</id>
+ <posX>1073</posX>
+ <posY>635</posY>
+ <width>50</width>
+ <height>100</height>
+ <textureFocus>TV.png</textureFocus>
+ <textureNoFocus>TV.png</textureNoFocus>
+ <hyperlink>1</hyperlink>
+ <hover>-</hover>
+ <hoverX>502</hoverX>
+ <hoverY>250</hoverY>
+ <hoverWidth>272</hoverWidth>
+ <hoverHeight>306</hoverHeight>
+ <label>3</label>
+ <textcolor>00ffffff</textcolor>
+ <textcolorNoFocus>00ffffff</textcolorNoFocus>
+ <onleft>04081980</onleft>
+ <onright>06081980</onright>
+ <onup>50</onup>
+ <ondown>21</ondown>
+ <animation effect="fade" time="1000" delay="750" >WindowOpen</animation>
+ <animation effect="fade" time="1000" delay="250" >WindowClose</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="1098,685" time="300" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="140,140" end="100,100" center="1098,685" time="300" acceleration ="-1" >Unfocus</animation>
+ </control>
+
+ <control>
+ <description>music</description>
+ <type>button</type>
+ <id>06081980</id>
+ <posX>1143</posX>
+ <posY>635</posY>
+ <width>50</width>
+ <height>100</height>
+ <textureFocus>Music.png</textureFocus>
+ <textureNoFocus>Music.png</textureNoFocus>
+ <hyperlink>501</hyperlink>
+ <label>605</label>
+ <textcolor>00ffffff</textcolor>
+ <textcolorNoFocus>00ffffff</textcolorNoFocus>
+ <hover>-</hover>
+ <hoverX>502</hoverX>
+ <hoverY>250</hoverY>
+ <hoverWidth>272</hoverWidth>
+ <hoverHeight>306</hoverHeight>
+ <onleft>05081980</onleft>
+ <onright>07081980</onright>
+ <onup>50</onup>
+ <ondown>21</ondown>
+ <animation effect="fade" time="1000" delay="500" >WindowOpen</animation>
+ <animation effect="fade" time="1000" delay="500">WindowClose</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="1168,685" time="300" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="140,140" end="100,100" center="1165,665" time="300" acceleration ="-1" >Unfocus</animation>
+ </control>
+
<control>
+ <description>home Pictures</description>
+ <type>button</type>
+ <id>07081980</id>
+ <posX>1213</posX>
+ <posY>635</posY>
+ <width>50</width>
+ <height>100</height>
+ <textureFocus>Pictures.png</textureFocus>
+ <textureNoFocus>Pictures.png</textureNoFocus>
+ <hyperlink>2</hyperlink>
+ <label>1</label>
+ <textcolor>00ffffff</textcolor>
+ <textcolorNoFocus>00ffffff</textcolorNoFocus>
+ <hover>-</hover>
+ <hoverX>502</hoverX>
+ <hoverY>250</hoverY>
+ <hoverWidth>272</hoverWidth>
+ <hoverHeight>306</hoverHeight>
+ <onleft>06081980</onleft>
+ <onright>2</onright>
+ <onup>50</onup>
+ <ondown>21</ondown>
+ <animation effect="fade" time="1000" delay="500" >WindowOpen</animation>
+ <animation effect="fade" time="1000" delay="500">WindowClose</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="1238,685" time="300" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="140,140" end="100,100" center="1238,665" time="300" acceleration ="-1" >Unfocus</animation>
+ </control>
+ <control>
<description>Selected item Label</description>
<type>fadelabel</type>
<id>1</id>
<animation effect="fade" time="400">WindowClose</animation>
<animation effect="fade" time="400">WindowOpen</animation>
- <posX>250</posX>
- <posY>600</posY>
- <width>1000</width>
+ <posX>240</posX>
+ <posY>650</posY>
+ <width>700</width>
<label>#selecteditem</label>
<font>wipeout</font>
- <align>center</align>
+ <align>Left</align>
<textcolor>ffffffff</textcolor>
</control>
@@ -90,7 +214,7 @@
<posY>100</posY>
<posX>12</posX>
<label>100</label> <font>font14</font>
- <onleft>2</onleft>
+ <onleft>07081980</onleft>
<onright>3</onright>
<onup>2</onup>
<ondown>51</ondown>
@@ -190,7 +314,7 @@
<width>209</width>
<height>36</height>
<onleft>7</onleft>
- <onright>9</onright>
+ <onright>04081980</onright>
<onup>8</onup>
<ondown>50</ondown>
<hyperlink>762</hyperlink>
@@ -213,25 +337,23 @@
<description>listcontrol</description>
<type>listcontrol</type>v
<id>50</id>
- <onleft>51</onleft>
- <onright>51</onright>
- <onup>2</onup>
- <ondown>50</ondown>
- <posX>30</posX>
- <posY>200</posY>
- <width>1310</width>
- <height>320</height>
- <spinWidth>27</spinWidth>
- <spinHeight>27</spinHeight>
- <spinPosX>1270</spinPosX>
- <spinPosY>480</spinPosY>
- <spinColor>ffffffff</spinColor>
- <textureUp>page_up_nofocus.png</textureUp>
- <textureDown>page_down_nofocus.png</textureDown>
- <textureUpFocus>page_up_focu.png</textureUpFocus>
- <textureDownFocus>page_down_focus.png</textureDownFocus>
- <textureFocus>list_sub_focus.png</textureFocus>
- <textureNoFocus>list_sub_nofocus.png</textureNoFocus>
+ <onleft>2</onleft>
+ <onright>04081980</onright>
+ <onup>2</onup>
+ <ondown>04081980</ondown>
+ <posX>542</posX>
+ <posY>140</posY>
+ <width>800</width>
+ <height>500</height>
+ <spinWidth>28</spinWidth>
+ <spinHeight>28</spinHeight>
+ <spinPosX>1252</spinPosX>
+ <spinPosY>592</spinPosY>
+ <spinColor>ffffffff</spinColor>
+ <textureUp>page_up_nofocus.png</textureUp>
+ <textureDown>page_down_nofocus.png</textureDown>
+ <textureUpFocus>page_up_focus.png</textureUpFocus>
+ <textureDownFocus>page_down_focus.png</textureDownFocus>
<textureHeight>35</textureHeight>
<image>folder_focus.png</image>
<font>font12</font>
@@ -258,38 +380,36 @@
<suffix>|</suffix>
</control>
<control>
- <description>Thumbnail Panel</description>
- <type>thumbnailpanel</type>
- <id>51</id>
- <onleft>2</onleft>
- <onright>2</onright>
- <onup>2</onup>
- <ondown>50</ondown><ondown>51</ondown>
- <posX>30</posX>
- <posY>198</posY>
+ <description>Thumbnail Panel</description>
+ <type>thumbnailpanel</type>
+ <id>51</id>
+ <onleft>2</onleft>
+ <onright>04081980</onright>
+ <onup>2</onup>
+ <ondown>04081980</ondown>
+ <posX>30</posX>
+ <posY>140</posY>
<width>1316</width>
- <height>350</height>
- <spinWidth>27</spinWidth>
- <spinHeight>27</spinHeight>
- <spinPosX>1240</spinPosX>
- <spinPosY>515</spinPosY>
+ <height>480</height>
+ <spinWidth>28</spinWidth>
+ <spinHeight>28</spinHeight>
+ <spinPosX>1262</spinPosX>
+ <spinPosY>592</spinPosY>
<spinColor>ffffffff</spinColor>
- <textureUp>page_up_nofocus.png</textureUp>
- <textureDown>page_down_nofocus.png</textureDown>
- <textureUpFocus>page_up_focu.png</textureUpFocus>
- <textureDownFocus>page_down_focus.png</textureDownFocus>
- <textureFocus>list_sub_focus.png</textureFocus>
- <textureNoFocus>list_sub_nofocus.png</textureNoFocus>
- <itemWidth>120</itemWidth>
- <itemHeight>110</itemHeight>
- <textureWidth>50</textureWidth>
- <textureHeight>50</textureHeight>
- <thumbWidth>101</thumbWidth>
- <thumbHeight>101</thumbHeight>
- <thumbPosX>0</thumbPosX>
- <thumbPosY>0</thumbPosY>
- <imageFolder>-</imageFolder>
- <imageFolderFocus>-</imageFolderFocus>
+ <textureUp>page_up_nofocus.png</textureUp>
+ <textureDown>page_down_nofocus.png</textureDown>
+ <textureUpFocus>page_up_focus.png</textureUpFocus>
+ <textureDownFocus>page_down_focus.png</textureDownFocus>
+ <itemWidth>80</itemWidth>
+ <itemHeight>80</itemHeight>
+ <textureWidth>80</textureWidth>
+ <textureHeight>80</textureHeight>
+ <thumbWidth>70</thumbWidth>
+ <thumbHeight>70</thumbHeight>
+ <thumbPosX>5</thumbPosX>
+ <thumbPosY>5</thumbPosY>
+ <imageFolder>icon_empty_nofocus.png</imageFolder>
+ <imageFolderFocus>icon_empty_focus.png</imageFolderFocus>
<font>-</font>
<selectedColor>ffffffff</selectedColor>
@@ -298,28 +418,86 @@
<remoteColor>ffFFA075</remoteColor>
<downloadColor>ff80ff80</downloadColor>
<suffix>|</suffix>
- <textureWidthBig>105</textureWidthBig><!-- 150 -->
- <textureHeightBig>105</textureHeightBig> <!-- 150 -->
- <itemWidthBig>150</itemWidthBig><!-- 180 -->
- <itemHeightBig>150</itemHeightBig><!-- 180 -->
- <thumbWidthBig>130</thumbWidthBig>
- <thumbHeightBig>130</thumbHeightBig>
- <thumbPosXBig>0</thumbPosXBig><!-- 19 -->
- <thumbPosYBig>20</thumbPosYBig> <!-- 19 -->
+ <textureWidthBig>145</textureWidthBig><!-- 150 -->
+ <textureHeightBig>145</textureHeightBig> <!-- 150 -->
+ <itemWidthBig>145</itemWidthBig><!-- 180 -->
+ <itemHeightBig>145</itemHeightBig><!-- 180 -->
+ <thumbWidthBig>135</thumbWidthBig>
+ <thumbHeightBig>135</thumbHeightBig>
+ <thumbPosXBig>5</thumbPosXBig><!-- 19 -->
+ <thumbPosYBig>5</thumbPosYBig> <!-- 19 -->
<unfocusedAlpha>180</unfocusedAlpha>
- <textXOff>5</textXOff>
- <textyOff>150</textyOff>
+ <textXOff>-5000</textXOff>
<showFrame>yes</showFrame>
<showFolder>no</showFolder>
<showBackGround>yes</showBackGround>
<showInfoImage>no</showInfoImage>
<enableFocusZoom>no</enableFocusZoom>
- <thumbs flipY="true" diffuse="Thumb_Mask.png"/>
+ <thumbs flipY="false" diffuse="Thumb_Mask.png"/>
<thumbAnimation effect="zoom" start="100,100" end="150,150" time="200">focus</thumbAnimation>
<thumbAnimation effect="zoom" start="150,150" end="100,100" time="200">unfocus</thumbAnimation>
- </control>
+ </control>
</control>
-
+ <control>
+ <type>image</type>
+ <description> mid selection box</description>
+ <id>1</id>
+ <posX>582</posX>
+ <posY>314</posY>
+ <width>203</width>
+ <height>140</height>
+ <texture>osd_mid box.png</texture>
+ <visible>Control.HasFocus(04081980)|Control.HasFocus(05081980)|Control.HasFocus(06081980)|Control.HasFocus(07081980)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <description> mid selection box - radio</description>
+ <id>1</id>
+ <posX>633</posX>
+ <posY>325</posY>
+ <width>100</width>
+ <height>200</height>
+ <texture>Video.png</texture>
+ <visible>Control.HasFocus(04081980)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <description> mid selection box - video</description>
+ <id>1</id>
+ <posX>633</posX>
+ <posY>325</posY>
+ <width>100</width>
+ <height>200</height>
+ <texture>TV.png</texture>
+ <visible>Control.HasFocus(05081980)</visible>
+ ...
[truncated message content] |
|
From: <i-...@us...> - 2007-10-29 09:12:10
|
Revision: 1012
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1012&view=rev
Author: i-loop
Date: 2007-10-29 02:11:38 -0700 (Mon, 29 Oct 2007)
Log Message:
-----------
synced with latest BlueTwo svn
Modified Paths:
--------------
trunk/skins/BlueTwoBig/Development Version/Media/previewbackground.png
trunk/skins/BlueTwoBig/Development Version/MyMusicPlayingNow.xml
Modified: trunk/skins/BlueTwoBig/Development Version/Media/previewbackground.png
===================================================================
(Binary files differ)
Modified: trunk/skins/BlueTwoBig/Development Version/MyMusicPlayingNow.xml
===================================================================
--- trunk/skins/BlueTwoBig/Development Version/MyMusicPlayingNow.xml 2007-10-28 23:01:41 UTC (rev 1011)
+++ trunk/skins/BlueTwoBig/Development Version/MyMusicPlayingNow.xml 2007-10-29 09:11:38 UTC (rev 1012)
@@ -60,6 +60,7 @@
<width>250</width>
<height>250</height>
<texture>-</texture>
+ <keepaspectratio>yes</keepaspectratio>
<centered>yes</centered>
<zoom>yes</zoom>
</control>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ze...@us...> - 2007-10-28 23:01:43
|
Revision: 1011
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1011&view=rev
Author: zebons
Date: 2007-10-28 16:01:41 -0700 (Sun, 28 Oct 2007)
Log Message:
-----------
Some view corrections
Modified Paths:
--------------
trunk/plugins/MyFilms/MesFilms.cs
Modified: trunk/plugins/MyFilms/MesFilms.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilms.cs 2007-10-28 18:07:26 UTC (rev 1010)
+++ trunk/plugins/MyFilms/MesFilms.cs 2007-10-28 23:01:41 UTC (rev 1011)
@@ -969,7 +969,7 @@
string[] arSplit;
int Wnb_enr = 0;
int wi = 0;
- string[] Sep = new string[] { ",", "(", ")" };
+ string[] Sep = new string[] { ",", ")" };
conf.Wstar = NewWstar;
BtnSrtBy.Label = GUILocalizeStrings.Get(103);
@@ -986,15 +986,18 @@
if ((WStrSort == "Date") || (WStrSort == "DateAdded"))
champselect = string.Format("{0:yyyy/MM/dd}", enr["DateAdded"]);
else
- {
champselect = enr[WStrSort].ToString();
- }
- arSplit = champselect.Split(Sep, StringSplitOptions.None);//will add "" entries also, //StringSplitOptions.RemoveEmptyEntries
+ arSplit = champselect.Split(Sep,StringSplitOptions.None); // remove entries empty // StringSplitOptions.None);//will add "" entries also
+ string wzone = "";
for (wi = 0; wi < arSplit.Length; wi++)
+ {
if (arSplit[wi].IndexOf("(") > 0)
- w_tableau.Add(arSplit[wi].Substring(0, arSplit[wi].IndexOf("(")).Trim());
+ wzone = arSplit[wi].Substring(0, arSplit[wi].IndexOf("(")).Trim();
else
- w_tableau.Add(arSplit[wi].Trim());
+ wzone = arSplit[wi].Trim();
+ if (wzone.Length > 0)
+ w_tableau.Add(wzone);
+ }
}
if (WStrSortSens == " ASC")
w_tableau.Sort(0, w_tableau.Count, null);
@@ -1003,30 +1006,31 @@
IComparer myComparer = new myReverserClass();
w_tableau.Sort(0, w_tableau.Count, myComparer);
}
-
+ item = new GUIListItem();
for (wi = 0; wi != w_tableau.Count; wi++)
{
champselect = w_tableau[wi].ToString();
- if ((Wnb_enr > 0) && (string.Compare(champselect.ToString(), wchampselect.ToString(), true) == 0))
- {
+// if ((Wnb_enr > 0) && (string.Compare(champselect.ToString(), wchampselect.ToString(), true) == 0))
+ if (string.Compare(champselect.ToString(), wchampselect.ToString(), true) == 0)
Wnb_enr++;
- item.Label2 = Wnb_enr.ToString();
- }
else
{
- if (conf.Wstar == "*" || champselect.ToUpper().Contains(conf.Wstar.ToUpper()))
+ if (conf.Wstar == "*" || champselect.ToUpper().Contains(conf.Wstar.ToUpper()))
{
+ if (Wnb_enr > 0)
+ {
+ item = new GUIListItem();
+ item.Label = wchampselect.ToString();
+ item.Label2 = Wnb_enr.ToString();
+ facadeView.Add(item);
+ if (SelItem != "" && item.Label == SelItem) conf.StrIndex = facadeView.Count - 1; //test if this item is one to select
+ }
Wnb_enr = 1;
- item = new GUIListItem();
- item.Label = champselect.ToString();
- item.Label2 = Wnb_enr.ToString();
- facadeView.Add(item);
- if (SelItem != "" && item.Label == SelItem) conf.StrIndex = facadeView.Count - 1; //test if this item is one to select
+ wchampselect = champselect.ToString();
}
- else
- Wnb_enr = 0;
+
- wchampselect = champselect.ToString();
+
}
}
conf.StrTxtSelect = "Selection";
@@ -1073,7 +1077,7 @@
{
//chargement des films
BaseMesFilms.LoadFilm(conf.StrFileXml);
- conf = new Configuration(Configuration.CurrentConfig, false);
+// conf = new Configuration(Configuration.CurrentConfig, false);
}
Layout = conf.StrLayOut;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ze...@us...> - 2007-10-28 18:07:29
|
Revision: 1010
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1010&view=rev
Author: zebons
Date: 2007-10-28 11:07:26 -0700 (Sun, 28 Oct 2007)
Log Message:
-----------
Corrected Actors search
Modified Paths:
--------------
trunk/plugins/MyFilms/MesFilms.cs
Modified: trunk/plugins/MyFilms/MesFilms.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilms.cs 2007-10-28 13:09:21 UTC (rev 1009)
+++ trunk/plugins/MyFilms/MesFilms.cs 2007-10-28 18:07:26 UTC (rev 1010)
@@ -235,6 +235,11 @@
if ((actionType.wID == Action.ActionType.ACTION_PREVIOUS_MENU) && (conf.Boolreturn))
{
conf.Boolreturn = false;
+ if (conf.WStrSort.ToString() == "ACTORS")
+ if (GetPrevFilmList())
+ return;
+ else
+ base.OnAction(actionType);
Change_view(conf.WStrSort);
return;
}
@@ -522,7 +527,7 @@
{
conf.StrSelect = "Actors like '*" + conf.StrActors + "*'";
conf.StrTxtSelect = "Selection";
- getSelectFromDivx("Actors like '*" + conf.StrActors + "*'", conf.WStrSort, conf.WStrSortSens, conf.StrActors, true, "");
+ getSelectFromDivx(conf.StrSelect, conf.WStrSort, conf.WStrSortSens, conf.StrActors, true, "");
}
else
{
@@ -619,18 +624,30 @@
{
if (conf.Boolreturn)//in case of selection by view verify if value correspond excatly to the searched string
{
- string[] split;
- if (conf.WStrSort == "DateAdded")
- split = string.Format("{0:yyyy/MM/dd}", r[conf.WStrSort]).Split(new Char[] { ',' });
- else
- split = r[conf.WStrSort].ToString().Split(new Char[] { ',' });
- foreach (string s in split)
- {
- if (s.Trim().ToLower() == conf.Wselectedlabel.Trim().ToLower())
- goto suite;
- }
- goto fin;
- }
+ //string[] split;
+ //if (conf.WStrSort == "DateAdded")
+ // split = string.Format("{0:yyyy/MM/dd}", r[conf.WStrSort]).Split(new Char[] { ',' });
+ //else
+ // split = r[conf.WStrSort].ToString().Split(new Char[] { ',','(',')',});
+ //foreach (string s in split)
+ //{
+ // if (s.Trim().ToLower() == conf.Wselectedlabel.Trim().ToLower())
+ // goto suite;
+ //}
+ //goto fin;
+ //string[] split;
+ //if (conf.WStrSort == "DateAdded")
+ // split = string.Format("{0:yyyy/MM/dd}", r[conf.WStrSort]).Split(new Char[] { ',' });
+ //else
+ // split = r[conf.WStrSort].ToString().Split(new Char[] { ',','(',')',});
+ //foreach (string s in split)
+ //{
+ // if (s.Trim().ToLower() == conf.Wselectedlabel.Trim().ToLower())
+ // goto suite;
+ //}
+ if (r[conf.WStrSort].ToString().IndexOfAny (conf.Wselectedlabel.Trim().ToCharArray ()) >=0)
+ goto suite;
+ goto fin; }
suite:
string wthumb = item.ThumbnailImage;
@@ -952,13 +969,13 @@
string[] arSplit;
int Wnb_enr = 0;
int wi = 0;
- string[] Sep = new string[] { "," };
+ string[] Sep = new string[] { ",", "(", ")" };
conf.Wstar = NewWstar;
BtnSrtBy.Label = GUILocalizeStrings.Get(103);
conf.Boolselect = true;
conf.Wselectedlabel = "";
- conf.StrActors = "";
+ //conf.StrActors = "";
// boolreturn = true;
if (ClearIndex) conf.StrIndex = 0;
facadeView.Clear();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ze...@us...> - 2007-10-28 13:09:27
|
Revision: 1009
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1009&view=rev
Author: zebons
Date: 2007-10-28 06:09:21 -0700 (Sun, 28 Oct 2007)
Log Message:
-----------
Somme corrections for DVDProfiler
Modified Paths:
--------------
trunk/plugins/MyFilms/MesFilms.cs
trunk/plugins/MyFilms/MesFilmsDetail.cs
Modified: trunk/plugins/MyFilms/MesFilms.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilms.cs 2007-10-27 13:40:24 UTC (rev 1008)
+++ trunk/plugins/MyFilms/MesFilms.cs 2007-10-28 13:09:21 UTC (rev 1009)
@@ -615,7 +615,7 @@
facadeView.Clear();
//----------------------------------------------------------------------------------------
// Load the DataSet.
- foreach (DataRow r in BaseMesFilms.LectureDonn\xE9es(conf.StrFilmSelect, conf.StrSort, conf.StrSortSens))
+ foreach (DataRow r in BaseMesFilms.LectureDonn\xE9es(conf.StrDfltSelect, conf.StrFilmSelect, conf.StrSort, conf.StrSortSens))
{
if (conf.Boolreturn)//in case of selection by view verify if value correspond excatly to the searched string
{
Modified: trunk/plugins/MyFilms/MesFilmsDetail.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilmsDetail.cs 2007-10-27 13:40:24 UTC (rev 1008)
+++ trunk/plugins/MyFilms/MesFilmsDetail.cs 2007-10-28 13:09:21 UTC (rev 1009)
@@ -134,6 +134,12 @@
{
//if ((actionType.wID == Action.ActionType.ACTION_PREVIOUS_MENU) || (actionType.wID == Action.ActionType.ACTION_PARENT_DIR))
// actionType.wID = Action.ActionType.ACTION_PREVIOUS_MENU; // exit plugin DEINIT Msg will call save func
+ if ((actionType.wID == Action.ActionType.ACTION_PREVIOUS_MENU) || (actionType.wID == Action.ActionType.ACTION_PARENT_DIR))
+ {
+ MesFilms.conf.LastID = MesFilms.ID_MesFilms;
+ GUIWindowManager.ShowPreviousWindow();
+ return;
+ }
base.OnAction(actionType);
return;
}
@@ -436,7 +442,8 @@
// selects records and sets StrIndex based on ItemId (leaves unchanged if ItemId=-1).
private void afficher_init(int ItemId)
{
- r = BaseMesFilms.LectureDonn\xE9es(MesFilms.conf.StrDfltSelect, MesFilms.conf.StrSelect, MesFilms.conf.StrSort, MesFilms.conf.StrSortSens);
+ // r = BaseMesFilms.LectureDonn\xE9es(MesFilms.conf.StrDfltSelect, MesFilms.conf.StrSelect, MesFilms.conf.StrSort, MesFilms.conf.StrSortSens);
+ r = BaseMesFilms.LectureDonn\xE9es(MesFilms.conf.StrDfltSelect, MesFilms.conf.StrFilmSelect, MesFilms.conf.StrSort, MesFilms.conf.StrSortSens);
StrMax = r.Length;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2007-10-27 13:40:28
|
Revision: 1008
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1008&view=rev
Author: and-81
Date: 2007-10-27 06:40:24 -0700 (Sat, 27 Oct 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MCEReplacement/Forms/ExternalChannels.cs
trunk/plugins/MCEReplacement/Forms/SetupForm.Designer.cs
trunk/plugins/MCEReplacement/Forms/SetupForm.cs
trunk/plugins/MCEReplacement/Forms/StbSetup.cs
trunk/plugins/MCEReplacement/MCEReplacement.cs
trunk/plugins/MCEReplacement/Properties/AssemblyInfo.cs
Modified: trunk/plugins/MCEReplacement/Forms/ExternalChannels.cs
===================================================================
--- trunk/plugins/MCEReplacement/Forms/ExternalChannels.cs 2007-10-27 13:36:02 UTC (rev 1007)
+++ trunk/plugins/MCEReplacement/Forms/ExternalChannels.cs 2007-10-27 13:40:24 UTC (rev 1008)
@@ -39,7 +39,8 @@
private void ExternalChannels_Load(object sender, EventArgs e)
{
- int cards = MCEReplacement.ExternalChannelConfigs.Length;
+ int cards = MCEReplacement.TvCardCount;
+
string cardName;
string cardNumber;
@@ -103,8 +104,8 @@
foreach (StbSetup setup in _tvCardStbSetups)
setup.Save();
- foreach (ExternalChannelConfig config in MCEReplacement.ExternalChannelConfigs)
- config.Save();
+ for (int index = 0; index < MCEReplacement.TvCardCount; index++)
+ MCEReplacement.GetExternalChannelConfig(index).Save();
this.DialogResult = DialogResult.OK;
this.Close();
Modified: trunk/plugins/MCEReplacement/Forms/SetupForm.Designer.cs
===================================================================
--- trunk/plugins/MCEReplacement/Forms/SetupForm.Designer.cs 2007-10-27 13:36:02 UTC (rev 1007)
+++ trunk/plugins/MCEReplacement/Forms/SetupForm.Designer.cs 2007-10-27 13:40:24 UTC (rev 1008)
@@ -675,7 +675,7 @@
this.listViewIR.TabIndex = 0;
this.listViewIR.UseCompatibleStateImageBehavior = false;
this.listViewIR.View = System.Windows.Forms.View.List;
- this.listViewIR.DoubleClick += new System.EventHandler(this.listBoxIR_DoubleClick);
+ this.listViewIR.DoubleClick += new System.EventHandler(this.listViewIR_DoubleClick);
this.listViewIR.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.listViewIR_AfterLabelEdit);
//
// tabPageMacros
@@ -709,7 +709,7 @@
this.listViewMacro.TabIndex = 0;
this.listViewMacro.UseCompatibleStateImageBehavior = false;
this.listViewMacro.View = System.Windows.Forms.View.List;
- this.listViewMacro.DoubleClick += new System.EventHandler(this.listBoxMacro_DoubleClick);
+ this.listViewMacro.DoubleClick += new System.EventHandler(this.listViewMacro_DoubleClick);
this.listViewMacro.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.listViewMacro_AfterLabelEdit);
//
// tabPageMultiMapping
Modified: trunk/plugins/MCEReplacement/Forms/SetupForm.cs
===================================================================
--- trunk/plugins/MCEReplacement/Forms/SetupForm.cs 2007-10-27 13:36:02 UTC (rev 1007)
+++ trunk/plugins/MCEReplacement/Forms/SetupForm.cs 2007-10-27 13:40:24 UTC (rev 1008)
@@ -19,6 +19,7 @@
using MicrosoftMceTransceiver;
using IrssUtils;
using IrssUtils.Forms;
+using MPUtils.Forms;
namespace MediaPortal.Plugins
{
@@ -485,7 +486,7 @@
}
else if (selected == Common.UITextGoto)
{
- MPUtils.Forms.GoToScreen goToScreen = new MPUtils.Forms.GoToScreen();
+ GoToScreen goToScreen = new GoToScreen();
if (goToScreen.ShowDialog(this) == DialogResult.Cancel)
return;
@@ -665,15 +666,104 @@
#region Other Controls
- private void listBoxIR_DoubleClick(object sender, EventArgs e)
+ private void listViewIR_DoubleClick(object sender, EventArgs e)
{
EditIR();
}
- private void listBoxMacro_DoubleClick(object sender, EventArgs e)
+ private void listViewMacro_DoubleClick(object sender, EventArgs e)
{
EditMacro();
}
+ private void listViewIR_AfterLabelEdit(object sender, LabelEditEventArgs e)
+ {
+ ListView origin = sender as ListView;
+ if (origin == null)
+ {
+ e.CancelEdit = true;
+ return;
+ }
+
+ if (String.IsNullOrEmpty(e.Label))
+ {
+ e.CancelEdit = true;
+ return;
+ }
+
+ ListViewItem originItem = origin.Items[e.Item];
+
+ string oldFileName = MCEReplacement.IRFolder + originItem.Text + Common.FileExtensionIR;
+ if (!File.Exists(oldFileName))
+ {
+ MessageBox.Show("File not found: " + oldFileName, "Cannot rename, Original file not found", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ e.CancelEdit = true;
+ return;
+ }
+
+ if (!Common.IsValidFileName(e.Label))
+ {
+ MessageBox.Show("File name not valid: " + e.Label, "Cannot rename, New file name not valid", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ e.CancelEdit = true;
+ return;
+ }
+
+ try
+ {
+ string newFileName = MCEReplacement.IRFolder + e.Label + Common.FileExtensionIR;
+
+ File.Move(oldFileName, newFileName);
+ }
+ catch (Exception ex)
+ {
+ IrssLog.Error(ex.ToString());
+ MessageBox.Show(ex.ToString(), "Failed to rename file", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ }
+ private void listViewMacro_AfterLabelEdit(object sender, LabelEditEventArgs e)
+ {
+ ListView origin = sender as ListView;
+ if (origin == null)
+ {
+ e.CancelEdit = true;
+ return;
+ }
+
+ if (String.IsNullOrEmpty(e.Label))
+ {
+ e.CancelEdit = true;
+ return;
+ }
+
+ ListViewItem originItem = origin.Items[e.Item];
+
+ string oldFileName = MCEReplacement.MacroFolder + originItem.Text + Common.FileExtensionMacro;
+ if (!File.Exists(oldFileName))
+ {
+ MessageBox.Show("File not found: " + oldFileName, "Cannot rename, Original file not found", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ e.CancelEdit = true;
+ return;
+ }
+
+ if (!Common.IsValidFileName(e.Label))
+ {
+ MessageBox.Show("File name not valid: " + e.Label, "Cannot rename, New file name not valid", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ e.CancelEdit = true;
+ return;
+ }
+
+ try
+ {
+ string newFileName = MCEReplacement.MacroFolder + e.Label + Common.FileExtensionMacro;
+
+ File.Move(oldFileName, newFileName);
+ }
+ catch (Exception ex)
+ {
+ IrssLog.Error(ex.ToString());
+ MessageBox.Show(ex.ToString(), "Failed to rename file", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ }
+
private void listViewEventMap_KeyDown(object sender, KeyEventArgs e)
{
if (e.KeyCode == Keys.Delete)
@@ -698,7 +788,7 @@
}
else if (command.StartsWith(Common.CmdPrefixGoto))
{
- MPUtils.Forms.GoToScreen goToScreen = new MPUtils.Forms.GoToScreen(command.Substring(Common.CmdPrefixGoto.Length));
+ GoToScreen goToScreen = new GoToScreen(command.Substring(Common.CmdPrefixGoto.Length));
if (goToScreen.ShowDialog(this) == DialogResult.Cancel)
return;
@@ -764,77 +854,6 @@
#endregion Other Controls
- private void listViewIR_AfterLabelEdit(object sender, LabelEditEventArgs e)
- {
- ListView origin = sender as ListView;
- if (origin == null)
- return;
-
- ListViewItem originItem = origin.Items[e.Item];
-
- string oldFileName = MCEReplacement.IRFolder + originItem.Text + Common.FileExtensionIR;
- if (!File.Exists(oldFileName))
- {
- MessageBox.Show("File not found: " + oldFileName, "Cannot rename, Original file not found", MessageBoxButtons.OK, MessageBoxIcon.Error);
- e.CancelEdit = true;
- return;
- }
-
- if (String.IsNullOrEmpty(e.Label) || !Common.IsValidFileName(e.Label))
- {
- MessageBox.Show("File name not valid: " + e.Label, "Cannot rename, New file name not valid", MessageBoxButtons.OK, MessageBoxIcon.Error);
- e.CancelEdit = true;
- return;
- }
-
- try
- {
- string newFileName = MCEReplacement.IRFolder + e.Label + Common.FileExtensionIR;
-
- File.Move(oldFileName, newFileName);
- }
- catch (Exception ex)
- {
- IrssLog.Error(ex.ToString());
- MessageBox.Show(ex.ToString(), "Failed to rename file", MessageBoxButtons.OK, MessageBoxIcon.Error);
- }
- }
- private void listViewMacro_AfterLabelEdit(object sender, LabelEditEventArgs e)
- {
- ListView origin = sender as ListView;
- if (origin == null)
- return;
-
- ListViewItem originItem = origin.Items[e.Item];
-
- string oldFileName = MCEReplacement.MacroFolder + originItem.Text + Common.FileExtensionMacro;
- if (!File.Exists(oldFileName))
- {
- MessageBox.Show("File not found: " + oldFileName, "Cannot rename, Original file not found", MessageBoxButtons.OK, MessageBoxIcon.Error);
- e.CancelEdit = true;
- return;
- }
-
- if (String.IsNullOrEmpty(e.Label) || !Common.IsValidFileName(e.Label))
- {
- MessageBox.Show("File name not valid: " + e.Label, "Cannot rename, New file name not valid", MessageBoxButtons.OK, MessageBoxIcon.Error);
- e.CancelEdit = true;
- return;
- }
-
- try
- {
- string newFileName = MCEReplacement.MacroFolder + e.Label + Common.FileExtensionMacro;
-
- File.Move(oldFileName, newFileName);
- }
- catch (Exception ex)
- {
- IrssLog.Error(ex.ToString());
- MessageBox.Show(ex.ToString(), "Failed to rename file", MessageBoxButtons.OK, MessageBoxIcon.Error);
- }
- }
-
}
}
Modified: trunk/plugins/MCEReplacement/Forms/StbSetup.cs
===================================================================
--- trunk/plugins/MCEReplacement/Forms/StbSetup.cs 2007-10-27 13:36:02 UTC (rev 1007)
+++ trunk/plugins/MCEReplacement/Forms/StbSetup.cs 2007-10-27 13:40:24 UTC (rev 1008)
@@ -141,7 +141,7 @@
public void SetToCard(int cardId)
{
- ExternalChannelConfig config = MCEReplacement.ExternalChannelConfigs[cardId];
+ ExternalChannelConfig config = MCEReplacement.GetExternalChannelConfig(cardId);
if (config == null)
return;
@@ -172,7 +172,7 @@
public void SetToConfig(int cardId)
{
- ExternalChannelConfig config = MCEReplacement.ExternalChannelConfigs[cardId];
+ ExternalChannelConfig config = MCEReplacement.GetExternalChannelConfig(cardId);
if (config == null)
return;
Modified: trunk/plugins/MCEReplacement/MCEReplacement.cs
===================================================================
--- trunk/plugins/MCEReplacement/MCEReplacement.cs 2007-10-27 13:36:02 UTC (rev 1007)
+++ trunk/plugins/MCEReplacement/MCEReplacement.cs 2007-10-27 13:40:24 UTC (rev 1008)
@@ -41,7 +41,7 @@
/// <summary>
/// The plugin version string.
/// </summary>
- public const string PluginVersion = "MCE Replacement Plugin 1.0.3.4 for MediaPortal 0.2.3.0";
+ internal const string PluginVersion = "MCE Replacement Plugin 1.0.3.5 for MediaPortal 0.2.3.0";
/// <summary>
/// The wParam for Message Mode Windows Messages.
@@ -49,13 +49,13 @@
public const int MessageModeCommand = 0x0018;
// Macro Commands
- //public const string WindowStateCommand = "Toggle Window State";
+ //internal const string WindowStateCommand = "Toggle Window State";
// Macro File Commands
- //public const string WindowStateMacroText = "WINDOW_STATE";
+ //internal const string WindowStateMacroText = "WINDOW_STATE";
// English text for Macro commands
- //public const string ChangeWindowStateText = "Change Window State";
+ //internal const string ChangeWindowStateText = "Change Window State";
internal static readonly string AppDataFolder =
Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData) +
@@ -113,7 +113,7 @@
static ExternalChannelConfig[] _externalChannelConfigs;
- static bool _inConfiguration = false;
+ static bool _inConfiguration;
static bool _mpBasicHome;
static bool _mpMCERemote;
@@ -132,7 +132,7 @@
/// Gets or sets the mce transceiver.
/// </summary>
/// <value>The mce transceiver.</value>
- public static MicrosoftMceTransceiver.MicrosoftMceTransceiver MceTransceiver
+ internal static MicrosoftMceTransceiver.MicrosoftMceTransceiver MceTransceiver
{
get { return _mceTransceiver; }
set { _mceTransceiver = value; }
@@ -142,16 +142,27 @@
/// Gets or sets a value indicating whether to log verbosely.
/// </summary>
/// <value><c>true</c> if logging is set to verbose; otherwise, <c>false</c>.</value>
- public static bool LogVerbose
+ internal static bool LogVerbose
{
get { return _logVerbose; }
set { _logVerbose = value; }
}
+
/// <summary>
+ /// Gets or sets a value indicating whether in configuration.
+ /// </summary>
+ /// <value><c>true</c> if in configuration; otherwise, <c>false</c>.</value>
+ internal static bool InConfiguration
+ {
+ get { return _inConfiguration; }
+ set { _inConfiguration = value; }
+ }
+
+ /// <summary>
/// Gets or sets a value indicating whether MediaPortal will require focus to handle input.
/// </summary>
/// <value><c>true</c> if requires focus; otherwise, <c>false</c>.</value>
- public static bool RequireFocus
+ internal static bool RequireFocus
{
get { return _requireFocus; }
set { _requireFocus = value; }
@@ -160,7 +171,7 @@
/// Gets or sets a value indicating whether to control external channel tuning.
/// </summary>
/// <value><c>true</c> if controlling external channel tuning; otherwise, <c>false</c>.</value>
- public static bool ControlExternalEnabled
+ internal static bool ControlExternalEnabled
{
get { return _controlExternalEnabled; }
set { _controlExternalEnabled = value; }
@@ -169,7 +180,7 @@
/// Gets or sets a value indicating whether message mode is enabled.
/// </summary>
/// <value><c>true</c> if message mode is enabled; otherwise, <c>false</c>.</value>
- public static bool MessageModeEnabled
+ internal static bool MessageModeEnabled
{
get { return _messageModeEnabled; }
set { _messageModeEnabled = value; }
@@ -178,7 +189,7 @@
/// Gets or sets a value indicating whether the MCE remote is enabled.
/// </summary>
/// <value><c>true</c> if MCE remote is enabled; otherwise, <c>false</c>.</value>
- public static bool MCERemoteEnabled
+ internal static bool MCERemoteEnabled
{
get { return _mceRemoteEnabled; }
set { _mceRemoteEnabled = value; }
@@ -189,7 +200,7 @@
/// <value>
/// <c>true</c> if different remote handling is enabled; otherwise, <c>false</c>.
/// </value>
- public static bool DifferentRemoteEnabled
+ internal static bool DifferentRemoteEnabled
{
get { return _differentRemoteEnabled; }
set { _differentRemoteEnabled = value; }
@@ -198,7 +209,7 @@
/// Gets or sets a value indicating whether multi mapping is enabled.
/// </summary>
/// <value><c>true</c> if multi mapping is enabled; otherwise, <c>false</c>.</value>
- public static bool MultiMappingEnabled
+ internal static bool MultiMappingEnabled
{
get { return _multiMappingEnabled; }
set { _multiMappingEnabled = value; }
@@ -207,7 +218,7 @@
/// Gets or sets a value indicating whether the event mapper is enabled.
/// </summary>
/// <value><c>true</c> if the event mapper is enabled; otherwise, <c>false</c>.</value>
- public static bool EventMapperEnabled
+ internal static bool EventMapperEnabled
{
get { return _eventMapperEnabled; }
set { _eventMapperEnabled = value; }
@@ -217,7 +228,7 @@
/// Gets or sets the mouse mode button.
/// </summary>
/// <value>The mouse mode button.</value>
- public static RemoteButton MouseModeButton
+ internal static RemoteButton MouseModeButton
{
get { return _mouseModeButton; }
set { _mouseModeButton = value; }
@@ -226,7 +237,7 @@
/// Gets or sets a value indicating whether mouse mode is enabled.
/// </summary>
/// <value><c>true</c> if mouse mode is enabled; otherwise, <c>false</c>.</value>
- public static bool MouseModeEnabled
+ internal static bool MouseModeEnabled
{
get { return _mouseModeEnabled; }
set { _mouseModeEnabled = value; }
@@ -235,7 +246,7 @@
/// Gets or sets a value indicating whether mouse mode is active.
/// </summary>
/// <value><c>true</c> if mouse mode is active; otherwise, <c>false</c>.</value>
- public static bool MouseModeActive
+ internal static bool MouseModeActive
{
get { return _mouseModeActive; }
set { _mouseModeActive = value; }
@@ -244,7 +255,7 @@
/// Gets or sets the mouse mode step distance.
/// </summary>
/// <value>The mouse mode step distance.</value>
- public static int MouseModeStep
+ internal static int MouseModeStep
{
get { return _mouseModeStep; }
set { _mouseModeStep = value; }
@@ -253,9 +264,9 @@
/// Gets or sets a value indicating whether mouse mode acceleration is enabled.
/// </summary>
/// <value>
- /// <c>true</c> if mouse mode acceleration is enabled; otherwise, <c>false</c>.
+ /// <c>true</c> if mouse mode acceleration is enabled; otherwise, <c>false</c>.
/// </value>
- public static bool MouseModeAcceleration
+ internal static bool MouseModeAcceleration
{
get { return _mouseModeAcceleration; }
set { _mouseModeAcceleration = value; }
@@ -265,7 +276,7 @@
/// Gets the event mappings.
/// </summary>
/// <value>The event mappings.</value>
- public static List<MappedEvent> EventMappings
+ internal static List<MappedEvent> EventMappings
{
get { return _eventMappings; }
}
@@ -274,7 +285,7 @@
/// Gets or sets the multi mapping button.
/// </summary>
/// <value>The multi mapping button.</value>
- public static RemoteButton MultiMappingButton
+ internal static RemoteButton MultiMappingButton
{
get { return _multiMappingButton; }
set { _multiMappingButton = value; }
@@ -283,35 +294,34 @@
/// Gets the multi maps.
/// </summary>
/// <value>The multi maps.</value>
- public static string[] MultiMaps
+ internal static string[] MultiMaps
{
get { return _multiMaps; }
}
/// <summary>
- /// Gets the external channel configs.
+ /// Count of available TV Cards.
/// </summary>
- /// <value>The external channel configs.</value>
- public static ExternalChannelConfig[] ExternalChannelConfigs
+ internal static int TvCardCount
{
- get { return _externalChannelConfigs; }
- }
+ get
+ {
+ ArrayList cards = new ArrayList();
+ MediaPortal.TV.Database.TVDatabase.GetCards(ref cards);
- /// <summary>
- /// Gets or sets a value indicating whether in configuration.
- /// </summary>
- /// <value><c>true</c> if in configuration; otherwise, <c>false</c>.</value>
- public static bool InConfiguration
- {
- get { return _inConfiguration; }
- set { _inConfiguration = value; }
+ int cardCount = cards.Count;
+ if (cardCount == 0)
+ cardCount = 1;
+
+ return cardCount;
+ }
}
/// <summary>
/// Gets a value indicating whether MediaPortal has basic home enabled.
/// </summary>
/// <value><c>true</c> if MediaPortal has basic home enabled; otherwise, <c>false</c>.</value>
- public static bool MP_BasicHome
+ internal static bool MP_BasicHome
{
get { return _mpBasicHome; }
}
@@ -319,7 +329,7 @@
/// Gets a value indicating whether MediaPortal has MCE remote enabled.
/// </summary>
/// <value><c>true</c> if MediaPortal has MCE remote enabled; otherwise, <c>false</c>.</value>
- public static bool MP_MCERemote
+ internal static bool MP_MCERemote
{
get { return _mpMCERemote; }
}
@@ -327,7 +337,7 @@
/// Gets the MediaPortal serial uir port.
/// </summary>
/// <value>The MediaPortal serial uir port.</value>
- public static string MP_SerialUirPort
+ internal static string MP_SerialUirPort
{
get { return _mpSerialUirPort; }
}
@@ -551,7 +561,7 @@
/// <returns>true if the plugin can be seen, otherwise false.</returns>
public bool GetHome(out string strButtonText, out string strButtonImage, out string strButtonImageFocus, out string strPictureImage)
{
- strButtonText = strButtonImage = strButtonImageFocus = strPictureImage = "";
+ strButtonText = strButtonImage = strButtonImageFocus = strPictureImage = String.Empty;
return false;
}
@@ -610,128 +620,9 @@
#endregion IPluginReceiver methods
- #region Private Methods
+ #region Implementation
/// <summary>
- /// Handles remote buttons received.
- /// </summary>
- /// <param name="remoteButton">The remote button.</param>
- void RemoteButtonReceived(string remoteButton)
- {
- int keyCode = int.Parse(remoteButton);
-
- // Handle MCE Remote button presses ...
- if (!MessageModeEnabled)
- {
- // If user has stipulated that MP must have focus to recognize commands ...
- if (RequireFocus && !GUIGraphicsContext.HasFocus)
- return;
-
- int button = -1;
-
- // Map keyCode to button on MCE remote ...
- if (MCERemoteEnabled)
- {
- for (int i = 0; i < _mceRemoteMap.Length; i += 2)
- {
- if (_mceRemoteMap[i] == keyCode)
- {
- button = _mceRemoteMap[i + 1];
-
- if (MultiMappingEnabled && (RemoteButton)button == MultiMappingButton)
- {
- ChangeMultiMapping();
- return;
- }
-
- if (MouseModeEnabled)
- if (HandleMouseMode((RemoteButton)button))
- return;
-
- // Get & execute Mapping
- bool gotMapped;
- if (MultiMappingEnabled)
- gotMapped = _multiInputHandlers[_multiMappingSet].MapAction(button);
- else
- gotMapped = _defaultInputHandler.MapAction(button);
-
- if (LogVerbose)
- {
- if (gotMapped)
- Log.Debug("MCEReplacement: Command \"{0}\" mapped to MCE remote", button);
- else
- Log.Debug("MCEReplacement: Command \"{0}\" not mapped to MCE remote", button);
- }
-
- return;
- }
- }
- }
-
- // Check for different remote mapping ...
- if (DifferentRemoteEnabled)
- {
- for (int i = 0; i < _differentRemoteMap.Length; i += 2)
- {
- if (_differentRemoteMap[i] == keyCode)
- {
- button = _differentRemoteMap[i + 1];
-
- if (MultiMappingEnabled && (RemoteButton)button == MultiMappingButton)
- {
- ChangeMultiMapping();
- return;
- }
-
- if (MouseModeEnabled)
- if (HandleMouseMode((RemoteButton)button))
- return;
-
- // Get & execute Mapping
- bool gotMapped;
- if (MultiMappingEnabled)
- gotMapped = _multiInputHandlers[_multiMappingSet].MapAction(button);
- else
- gotMapped = _defaultInputHandler.MapAction(button);
-
- if (LogVerbose)
- {
- if (gotMapped)
- Log.Debug("MCEReplacement: Command \"{0}\" mapped to different remote", button);
- else
- Log.Debug("MCEReplacement: Command \"{0}\" not mapped to different remote", button);
- }
-
- return;
- }
- }
- }
-
- if (LogVerbose)
- Log.Info("MCEReplacement: keyCode \"{0}\" was not handled", keyCode);
- }
- }
-
- /// <summary>
- /// Handles the PowerModeChanged event of the SystemEvents control.
- /// </summary>
- /// <param name="sender">The source of the event.</param>
- /// <param name="e">The <see cref="Microsoft.Win32.PowerModeChangedEventArgs"/> instance containing the event data.</param>
- void SystemEvents_PowerModeChanged(object sender, PowerModeChangedEventArgs e)
- {
- switch (e.Mode)
- {
- case PowerModes.Suspend:
- OnSuspend();
- break;
-
- case PowerModes.Resume:
- OnResume();
- break;
- }
- }
-
- /// <summary>
/// Handles the mouse mode.
/// </summary>
/// <param name="button">The button pressed.</param>
@@ -933,9 +824,153 @@
}
/// <summary>
+ /// Handles remote buttons received.
+ /// </summary>
+ /// <param name="remoteButton">The remote button.</param>
+ void RemoteButtonReceived(string remoteButton)
+ {
+ int keyCode = int.Parse(remoteButton);
+
+ // Handle MCE Remote button presses ...
+ if (!MessageModeEnabled)
+ {
+ // If user has stipulated that MP must have focus to recognize commands ...
+ if (RequireFocus && !GUIGraphicsContext.HasFocus)
+ return;
+
+ int button = -1;
+
+ // Map keyCode to button on MCE remote ...
+ if (MCERemoteEnabled)
+ {
+ for (int i = 0; i < _mceRemoteMap.Length; i += 2)
+ {
+ if (_mceRemoteMap[i] == keyCode)
+ {
+ button = _mceRemoteMap[i + 1];
+
+ if (MultiMappingEnabled && (RemoteButton)button == MultiMappingButton)
+ {
+ ChangeMultiMapping();
+ return;
+ }
+
+ if (MouseModeEnabled)
+ if (HandleMouseMode((RemoteButton)button))
+ return;
+
+ // Get & execute Mapping
+ bool gotMapped;
+ if (MultiMappingEnabled)
+ gotMapped = _multiInputHandlers[_multiMappingSet].MapAction(button);
+ else
+ gotMapped = _defaultInputHandler.MapAction(button);
+
+ if (LogVerbose)
+ {
+ if (gotMapped)
+ Log.Debug("MCEReplacement: Command \"{0}\" mapped to MCE remote", button);
+ else
+ Log.Debug("MCEReplacement: Command \"{0}\" not mapped to MCE remote", button);
+ }
+
+ return;
+ }
+ }
+ }
+
+ // Check for different remote mapping ...
+ if (DifferentRemoteEnabled)
+ {
+ for (int i = 0; i < _differentRemoteMap.Length; i += 2)
+ {
+ if (_differentRemoteMap[i] == keyCode)
+ {
+ button = _differentRemoteMap[i + 1];
+
+ if (MultiMappingEnabled && (RemoteButton)button == MultiMappingButton)
+ {
+ ChangeMultiMapping();
+ return;
+ }
+
+ if (MouseModeEnabled)
+ if (HandleMouseMode((RemoteButton)button))
+ return;
+
+ // Get & execute Mapping
+ bool gotMapped;
+ if (MultiMappingEnabled)
+ gotMapped = _multiInputHandlers[_multiMappingSet].MapAction(button);
+ else
+ gotMapped = _defaultInputHandler.MapAction(button);
+
+ if (LogVerbose)
+ {
+ if (gotMapped)
+ Log.Debug("MCEReplacement: Command \"{0}\" mapped to different remote", button);
+ else
+ Log.Debug("MCEReplacement: Command \"{0}\" not mapped to different remote", button);
+ }
+
+ return;
+ }
+ }
+ }
+
+ if (LogVerbose)
+ Log.Info("MCEReplacement: keyCode \"{0}\" was not handled", keyCode);
+ }
+ }
+
+ /// <summary>
+ /// Load external channel configurations.
+ /// </summary>
+ static void LoadExternalConfigs()
+ {
+ int cardCount = TvCardCount;
+
+ _externalChannelConfigs = new ExternalChannelConfig[cardCount];
+
+ string fileName;
+ for (int index = 0; index < cardCount; index++)
+ {
+ fileName = String.Format("{0}ExternalChannelConfig{1}.xml", AppDataFolder, Convert.ToString(index + 1));
+ try
+ {
+ _externalChannelConfigs[index] = ExternalChannelConfig.Load(fileName);
+ }
+ catch (Exception ex)
+ {
+ _externalChannelConfigs[index] = new ExternalChannelConfig(fileName);
+ Log.Error(ex);
+ }
+
+ _externalChannelConfigs[index].CardId = index;
+ }
+ }
+
+ /// <summary>
+ /// Given a card ID returns the configuration for that card.
+ /// </summary>
+ /// <param name="cardId">ID of card to retreive configuration for.</param>
+ /// <returns>Card configuration, null if it doesn't exist.</returns>
+ internal static ExternalChannelConfig GetExternalChannelConfig(int cardId)
+ {
+ if (_externalChannelConfigs == null)
+ return null;
+
+ foreach (ExternalChannelConfig config in _externalChannelConfigs)
+ if (config.CardId == cardId)
+ return config;
+
+ return null;
+ }
+
+ /// <summary>
/// OnMessage is used to receive requests to Tune External Channels and for event mapping.
/// </summary>
- /// <param name="msg">Message</param>
+ /// <param name="msg">Message.</param>
void OnMessage(GUIMessage msg)
{
if (ControlExternalEnabled && msg.Message == GUIMessage.MessageType.GUI_MSG_TUNE_EXTERNAL_CHANNEL)
@@ -958,24 +993,6 @@
}
/// <summary>
- /// Loads the external configs.
- /// </summary>
- static void LoadExternalConfigs()
- {
- ArrayList cards = new ArrayList();
- MediaPortal.TV.Database.TVDatabase.GetCards(ref cards);
-
- int cardCount = cards.Count;
- if (cardCount == 0)
- cardCount = 1;
-
- _externalChannelConfigs = new ExternalChannelConfig[cardCount];
-
- for (int index = 0; index < cardCount; index++)
- ExternalChannelConfigs[index] = new ExternalChannelConfig(AppDataFolder + "ExternalChannelConfig" + (index + 1).ToString() + ".xml");
- }
-
- /// <summary>
/// Changes the multi mapping.
/// </summary>
static void ChangeMultiMapping()
@@ -997,6 +1014,8 @@
/// <param name="multiMapping">The multi mapping.</param>
static void ChangeMultiMapping(string multiMapping)
{
+ Log.Debug("MCEReplacement: ChangeMultiMapping: {0}", multiMapping);
+
if (multiMapping == "TOGGLE")
{
ChangeMultiMapping();
@@ -1023,68 +1042,6 @@
}
/// <summary>
- /// Loads the settings.
- /// </summary>
- static void LoadSettings()
- {
- try
- {
- using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(MPConfigFile))
- {
- LogVerbose = xmlreader.GetValueAsBool("MCEReplacement", "LogVerbose", false);
- RequireFocus = xmlreader.GetValueAsBool("MCEReplacement", "RequireFocus", false);
- MCERemoteEnabled = xmlreader.GetValueAsBool("MCEReplacement", "MapMCERemote", true);
- DifferentRemoteEnabled = xmlreader.GetValueAsBool("MCEReplacement", "MapDifferentRemote", false);
- MessageModeEnabled = xmlreader.GetValueAsBool("MCEReplacement", "MessageModeEnabled", false);
- ControlExternalEnabled = xmlreader.GetValueAsBool("MCEReplacement", "ControlExternalEnabled", false);
- MultiMappingEnabled = xmlreader.GetValueAsBool("MCEReplacement", "MultiMappingEnabled", false);
- MultiMappingButton = (RemoteButton)xmlreader.GetValueAsInt("MCEReplacement", "MultiMappingButton", (int)RemoteButton.Start);
- EventMapperEnabled = xmlreader.GetValueAsBool("MCEReplacement", "EventMapperEnabled", false);
- MouseModeButton = (RemoteButton)xmlreader.GetValueAsInt("MCEReplacement", "MouseModeButton", (int)RemoteButton.Teletext);
- MouseModeEnabled = xmlreader.GetValueAsBool("MCEReplacement", "MouseModeEnabled", false);
- MouseModeStep = xmlreader.GetValueAsInt("MCEReplacement", "MouseModeStep", 10);
-
- // MediaPortal settings ...
- _mpBasicHome = xmlreader.GetValueAsBool("general", "startbasichome", false);
- _mpMCERemote = xmlreader.GetValueAsBool("remote", "MCE", false);
- _mpSerialUirPort = xmlreader.GetValueAsString("SerialUIR", "commport", "");
- }
- }
- catch (Exception ex)
- {
- Log.Error("MCEReplacement: LoadSettings() {0}", ex.Message);
- }
- }
- /// <summary>
- /// Saves the settings.
- /// </summary>
- static void SaveSettings()
- {
- try
- {
- using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings(MPConfigFile))
- {
- xmlwriter.SetValueAsBool("MCEReplacement", "LogVerbose", LogVerbose);
- xmlwriter.SetValueAsBool("MCEReplacement", "RequireFocus", RequireFocus);
- xmlwriter.SetValueAsBool("MCEReplacement", "MapMCERemote", MCERemoteEnabled);
- xmlwriter.SetValueAsBool("MCEReplacement", "MapDifferentRemote", DifferentRemoteEnabled);
- xmlwriter.SetValueAsBool("MCEReplacement", "MessageModeEnabled", MessageModeEnabled);
- xmlwriter.SetValueAsBool("MCEReplacement", "ControlExternalEnabled", ControlExternalEnabled);
- xmlwriter.SetValueAsBool("MCEReplacement", "MultiMappingEnabled", MultiMappingEnabled);
- xmlwriter.SetValue("MCEReplacement", "MultiMappingButton", (int)MultiMappingButton);
- xmlwriter.SetValueAsBool("MCEReplacement", "EventMapperEnabled", EventMapperEnabled);
- xmlwriter.SetValue("MCEReplacement", "MouseModeButton", (int)MouseModeButton);
- xmlwriter.SetValueAsBool("MCEReplacement", "MouseModeEnabled", MouseModeEnabled);
- xmlwriter.SetValue("MCEReplacement", "MouseModeStep", MouseModeStep);
- }
- }
- catch (Exception ex)
- {
- Log.Error("MCEReplacement: SaveSettings() {0}", ex.Message);
- }
- }
-
- /// <summary>
/// Loads the remote map.
/// </summary>
/// <param name="remoteFile">The remote file.</param>
@@ -1193,15 +1150,14 @@
if (LogVerbose)
Log.Info("MCEReplacement: Event Mapper - Event \"{0}\"", Enum.GetName(typeof(MappedEvent.MappingEvent), eventType));
- string command = mappedEvent.Command;
-
- if (command.StartsWith(Common.CmdPrefixBlast))
- command = command.Substring(Common.CmdPrefixBlast.Length);
-
- if (!ProcessCommand(command))
+ try
{
- Log.Error("MCEReplacement: Failed to execute Event Mapper command \"{0}\"", mappedEvent.EventType);
+ ProcessCommand(mappedEvent.Command);
}
+ catch (Exception ex)
+ {
+ Log.Error("MCEReplacement: Failed to execute Event Mapper command \"{0}\" - {1}", mappedEvent.EventType, ex.ToString());
+ }
}
}
}
@@ -1222,20 +1178,38 @@
if (LogVerbose)
Log.Info("MCEReplacement: Event Mapper - Event \"{0}\"", Enum.GetName(typeof(MappedEvent.MappingEvent), eventType));
- string command = mappedEvent.Command;
-
- if (command.StartsWith(Common.CmdPrefixBlast))
- command = command.Substring(Common.CmdPrefixBlast.Length);
-
- if (!ProcessCommand(command))
+ try
{
- Log.Error("MCEReplacement: Failed to execute Event Mapper command \"{0}\"", mappedEvent.EventType);
+ ProcessCommand(mappedEvent.Command);
}
+ catch (Exception ex)
+ {
+ Log.Error("MCEReplacement: Failed to execute Event Mapper command \"{0}\" - {1}", mappedEvent.EventType, ex.ToString());
+ }
}
}
}
/// <summary>
+ /// Handles the PowerModeChanged event of the SystemEvents control.
+ /// </summary>
+ /// <param name="sender">The source of the event.</param>
+ /// <param name="e">The <see cref="Microsoft.Win32.PowerModeChangedEventArgs"/> instance containing the event data.</param>
+ static void SystemEvents_PowerModeChanged(object sender, PowerModeChangedEventArgs e)
+ {
+ switch (e.Mode)
+ {
+ case PowerModes.Resume:
+ OnResume();
+ break;
+
+ case PowerModes.Suspend:
+ OnSuspend();
+ break;
+ }
+ }
+
+ /// <summary>
/// Processes the external channel.
/// </summary>
/// <param name="externalChannel">The external channel.</param>
@@ -1248,10 +1222,10 @@
if (card < 0)
card = 0;
- if (card >= ExternalChannelConfigs.Length)
+ if (card >= _externalChannelConfigs.Length)
throw new ArgumentException("Card number is higher than last card in list, reconfigure plugin TV cards.", "tunerCard");
- ExternalChannelConfig config = ExternalChannelConfigs[card];
+ ExternalChannelConfig config = _externalChannelConfigs[card];
// Clean up the "externalChannel" string into "channel".
StringBuilder channel = new StringBuilder();
@@ -1387,62 +1361,9 @@
}
/// <summary>
- /// Adds to the Macro Stack.
- /// </summary>
- /// <param name="fileName">Name of the macro file.</param>
- static void MacroStackAdd(string fileName)
- {
- string lowerCasedFileName = fileName.ToLowerInvariant();
-
- if (_macroStack == null)
- {
- _macroStack = new List<string>();
- }
- else if (_macroStack.Contains(lowerCasedFileName))
- {
- StringBuilder macroStackTrace = new StringBuilder();
- macroStackTrace.AppendLine("Macro infinite loop detected!");
- macroStackTrace.AppendLine();
- macroStackTrace.AppendLine("Stack trace:");
-
- foreach (string macro in _macroStack)
- {
- if (macro.Equals(lowerCasedFileName))
- macroStackTrace.AppendLine(String.Format("--> {0}", macro));
- else
- macroStackTrace.AppendLine(macro);
- }
-
- macroStackTrace.AppendLine(String.Format("--> {0}", lowerCasedFileName));
-
- throw new ApplicationException(macroStackTrace.ToString());
- }
-
- _macroStack.Add(lowerCasedFileName);
- }
- /// <summary>
- /// Removes from the Macro Stack.
- /// </summary>
- /// <param name="fileName">Name of the macro file.</param>
- static void MacroStackRemove(string fileName)
- {
- string lowerCasedFileName = fileName.ToLowerInvariant();
-
- if (_macroStack.Contains(lowerCasedFileName))
- _macroStack.Remove(lowerCasedFileName);
-
- if (_macroStack.Count == 0)
- _macroStack = null;
- }
-
- #endregion Private Methods
-
- #region Public Methods
-
- /// <summary>
/// Loads the default remote button input handler.
/// </summary>
- public static void LoadDefaultMapping()
+ internal static void LoadDefaultMapping()
{
_defaultInputHandler = new InputHandler("MCE Replacement");
@@ -1453,7 +1374,7 @@
/// <summary>
/// Loads multi-mappings for input handling.
/// </summary>
- public static void LoadMultiMappings()
+ internal static void LoadMultiMappings()
{
XmlDocument doc = new XmlDocument();
doc.Load(MultiMappingFile);
@@ -1479,7 +1400,7 @@
/// <summary>
/// Call this when entering standby to ensure that the Event Mapper is informed.
/// </summary>
- public static void OnSuspend()
+ internal static void OnSuspend()
{
if (!InConfiguration && EventMapperEnabled)
MapEvent(MappedEvent.MappingEvent.PC_Suspend);
@@ -1496,7 +1417,7 @@
/// <summary>
/// Call this when leaving standby to ensure the Event Mapper is informed.
/// </summary>
- public static void OnResume()
+ internal static void OnResume()
{
if (_mceTransceiver != null)
{
@@ -1511,11 +1432,59 @@
}
/// <summary>
+ /// Adds to the Macro Stack.
+ /// </summary>
+ /// <param name="fileName">Name of the macro file.</param>
+ static void MacroStackAdd(string fileName)
+ {
+ string lowerCasedFileName = fileName.ToLowerInvariant();
+
+ if (_macroStack == null)
+ {
+ _macroStack = new List<string>();
+ }
+ else if (_macroStack.Contains(lowerCasedFileName))
+ {
+ StringBuilder macroStackTrace = new StringBuilder();
+ macroStackTrace.AppendLine("Macro infinite loop detected!");
+ macroStackTrace.AppendLine();
+ macroStackTrace.AppendLine("Stack trace:");
+
+ foreach (string macro in _macroStack)
+ {
+ if (macro.Equals(lowerCasedFileName))
+ macroStackTrace.AppendLine(String.Format("--> {0}", macro));
+ else
+ macroStackTrace.AppendLine(macro);
+ }
+
+ macroStackTrace.AppendLine(String.Format("--> {0}", lowerCasedFileName));
+
+ throw new ApplicationException(macroStackTrace.ToString());
+ }
+
+ _macroStack.Add(lowerCasedFileName);
+ }
+ /// <summary>
+ /// Removes from the Macro Stack.
+ /// </summary>
+ /// <param name="fileName">Name of the macro file.</param>
+ static void MacroStackRemove(string fileName)
+ {
+ string lowerCasedFileName = fileName.ToLowerInvariant();
+
+ if (_macroStack.Contains(lowerCasedFileName))
+ _macroStack.Remove(lowerCasedFileName);
+
+ if (_macroStack.Count == 0)
+ _macroStack = null;
+ }
+
+ /// <summary>
/// Process the supplied Macro file.
/// </summary>
/// <param name="fileName">Macro file to process (absolute path).</param>
- /// <returns>Sucess.</returns>
- public static bool ProcessMacro(string fileName)
+ internal static void ProcessMacro(string fileName)
{
MacroStackAdd(fileName);
@@ -1793,11 +1762,8 @@
GUIGraphicsContext.OnAction(new Action(Action.ActionType.ACTION_SHUTDOWN, 0, 0));
break;
}
-
}
}
-
- return true;
}
finally
{
@@ -1810,7 +1776,7 @@
/// </summary>
/// <param name="fileName">File to blast (absolute path).</param>
/// <param name="port">Port to blast to.</param>
- public static void BlastIR(string fileName, string port)
+ internal static void BlastIR(string fileName, string port)
{
try
{
@@ -1843,13 +1809,10 @@
}
/// <summary>
- /// Given a command this method checks if the file exists as an IR
- /// command, macro or other command and then processes the request
- /// accordingly.
+ /// Given a command this method processes the request accordingly.
/// </summary>
/// <param name="command">Command to process.</param>
- /// <returns>true if successful, otherwise false.</returns>
- public static bool ProcessCommand(string command)
+ internal static void ProcessCommand(string command)
{
if (String.IsNullOrEmpty(command))
throw new ArgumentNullException("command");
@@ -1857,7 +1820,7 @@
if (command.StartsWith(Common.CmdPrefixMacro, StringComparison.InvariantCultureIgnoreCase)) // Macro
{
string fileName = MacroFolder + command.Substring(Common.CmdPrefixMacro.Length) + Common.FileExtensionMacro;
- return ProcessMacro(fileName);
+ ProcessMacro(fileName);
}
else if (command.StartsWith(Common.CmdPrefixBlast, StringComparison.InvariantCultureIgnoreCase)) // IR Code
{
@@ -1872,19 +1835,16 @@
else if (command.StartsWith(Common.CmdPrefixRun, StringComparison.InvariantCultureIgnoreCase)) // External Program
{
string[] commands = Common.SplitRunCommand(command.Substring(Common.CmdPrefixRun.Length));
-
Common.ProcessRunCommand(commands);
}
else if (command.StartsWith(Common.CmdPrefixSerial, StringComparison.InvariantCultureIgnoreCase)) // Serial Port Command
{
string[] commands = Common.SplitSerialCommand(command.Substring(Common.CmdPrefixSerial.Length));
-
Common.ProcessSerialCommand(commands);
}
else if (command.StartsWith(Common.CmdPrefixWindowMsg, StringComparison.InvariantCultureIgnoreCase)) // Message Command
{
string[] commands = Common.SplitWindowMessageCommand(command.Substring(Common.CmdPrefixWindowMsg.Length));
-
Common.ProcessWindowMessageCommand(commands);
}
else if (command.StartsWith(Common.CmdPrefixKeys, StringComparison.InvariantCultureIgnoreCase)) // Keystroke Command
@@ -1901,11 +1861,8 @@
}
else
{
- Log.Error("MCEReplacement: Unprocessed command \"{0}\"", command);
- return false;
+ throw new ArgumentException(String.Format("Cannot process unrecognized command \"{0}\"", command), "command");
}
-
- return true;
}
/// <summary>
@@ -1913,7 +1870,7 @@
/// </summary>
/// <param name="fileName">File to place learned IR command in (absolute path).</param>
/// <returns>true if successful, otherwise false.</returns>
- public static IRServerPluginInterface.LearnStatus LearnIRCommand(string fileName)
+ internal static IRServerPluginInterface.LearnStatus LearnIRCommand(string fileName)
{
IRServerPluginInterface.LearnStatus status = IRServerPluginInterface.LearnStatus.Failure;
@@ -1944,27 +1901,19 @@
/// </summary>
/// <param name="commandPrefix">Add the command prefix to each list item.</param>
/// <returns>string[] of IR Commands.</returns>
- public static string[] GetIRList(bool commandPrefix)
+ internal static string[] GetIRList(bool commandPrefix)
{
- try
- {
- string[] files = Directory.GetFiles(IRFolder, "*" + Common.FileExtensionIR);
- string[] list = new string[files.Length];
+ string[] files = Directory.GetFiles(IRFolder, "*" + Common.FileExtensionIR);
+ string[] list = new string[files.Length];
- int i = 0;
- foreach (string file in files)
- if (commandPrefix)
- list[i++] = Common.CmdPrefixBlast + Path.GetFileNameWithoutExtension(file);
- else
- list[i++] = Path.GetFileNameWithoutExtension(file);
+ int i = 0;
+ foreach (string file in files)
+ if (commandPrefix)
+ list[i++] = Common.CmdPrefixBlast + Path.GetFileNameWithoutExtension(file);
+ else
+ list[i++] = Path.GetFileNameWithoutExtension(file);
- return list;
- }
- catch (Exception ex)
- {
- Log.Error("MCEReplacement: GetIRList() - {0}", ex.ToString());
- return null;
- }
+ return list;
}
/// <summary>
@@ -1972,29 +1921,21 @@
/// </summary>
/// <param name="commandPrefix">Add the command prefix to each list item.</param>
/// <returns>string[] of Macros.</returns>
- public static string[] GetMacroList(bool commandPrefix)
+ internal static string[] GetMacroList(bool commandPrefix)
{
- try
- {
- string[] files = Directory.GetFiles(MacroFolder, "*" + Common.FileExtensionMacro);
- string[] list = new string[files.Length];
+ string[] files = Directory.GetFiles(MacroFolder, '*' + Common.FileExtensionMacro);
+ string[] list = new string[files.Length];
- int i = 0;
- foreach (string file in files)
- {
- if (commandPrefix)
- list[i++] = Common.CmdPrefixMacro + Path.GetFileNameWithoutExtension(file);
- else
- list[i++] = Path.GetFileNameWithoutExtension(file);
- }
-
- return list;
- }
- catch (Exception ex)
+ int i = 0;
+ foreach (string file in files)
{
- Log.Error("MCEReplacement: GetMacroList() - {0}", ex.ToString());
- return null;
+ if (commandPrefix)
+ list[i++] = Common.CmdPrefixMacro + Path.GetFileNameWithoutExtension(file);
+ else
+ list[i++] = Path.GetFileNameWithoutExtension(file);
}
+
+ return list;
}
/// <summary>
@@ -2002,10 +1943,10 @@
/// </summary>
/// <param name="commandPrefix">Add the command prefix to each list item.</param>
/// <returns>string[] of IR Commands and Macros.</returns>
- public static string[] GetFileList(bool commandPrefix)
+ internal static string[] GetFileList(bool commandPrefix)
{
- string[] MacroFiles = Directory.GetFiles(MacroFolder, "*" + Common.FileExtensionMacro);
- string[] IRFiles = Directory.GetFiles(IRFolder, "*" + Common.FileExtensionIR);
+ string[] MacroFiles = Directory.GetFiles(MacroFolder, '*' + Common.FileExtensionMacro);
+ string[] IRFiles = Directory.GetFiles(IRFolder, '*' + Common.FileExtensionIR);
string[] list = new string[MacroFiles.Length + IRFiles.Length];
int i = 0;
@@ -2028,8 +1969,70 @@
return list;
}
- #endregion Public Methods
+ /// <summary>
+ /// Loads the settings.
+ /// </summary>
+ static void LoadSettings()
+ {
+ try
+ {
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(MPConfigFile))
+ {
+ LogVerbose = xmlreader.GetValueAsBool("MCEReplacement", "LogVerbose", false);
+ RequireFocus = xmlreader.GetValueAsBool("MCEReplacement", "RequireFocus", false);
+ MCERemoteEnabled = xmlreader.GetValueAsBool("MCEReplacement", "MapMCERemote", true);
+ DifferentRemoteEnabled = xmlreader.GetValueAsBool("MCEReplacement", "MapDifferentRemote", false);
+ MessageModeEnabled = xmlreader.GetValueAsBool("MCEReplacement", "MessageModeEnabled", false);
+ ControlExternalEnabled = xmlreader.GetValueAsBool("MCEReplacement", "ControlExternalEnabled", false);
+ MultiMappingEnabled = xmlreader.GetValueAsBool("MCEReplacement", "MultiMappingEnabled", false);
+ MultiMappingButton = (RemoteButton)xmlreader.GetValueAsInt("MCEReplacement", "MultiMappingButton", (int)RemoteButton.Start);
+ EventMapperEnabled = xmlreader.GetValueAsBool("MCEReplacement", "EventMapperEnabled", false);
+ MouseModeButton = (RemoteButton)xmlreader.GetValueAsInt("MCEReplacement", "MouseModeButton", (int)RemoteButton.Teletext);
+ MouseModeEnabled = xmlreader.GetValueAsBool("MCEReplacement", "MouseModeEnabled", false);
+ MouseModeStep = xmlreader.GetValueAsInt("MCEReplacement", "MouseModeStep", 10);
+ // MediaPortal settings ...
+ _mpBasicHome = xmlreader.GetValueAsBool("general", "startbasichome", false);
+ _mpMCERemote = xmlreader.GetValueAsBool("remote", "MCE", false);
+ _mpSerialUirPort = xmlreader.GetValueAsString("SerialUIR", "commport", "");
+ }
+ }
+ catch (Exception ex)
+ {
+ Log.Error("MCEReplacement: LoadSettings() {0}", ex.Message);
+ }
+ }
+ /// <summary>
+ /// Saves the settings.
+ /// </summary>
+ static void SaveSettings()
+ {
+ try
+ {
+ using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings(MPConfigFile))
+ {
+ xmlwriter.SetValueAsBool("MCEReplacement", "LogVerbose", LogVerbose);
+ xmlwriter.SetValueAsBool("MCEReplacement", "RequireFocus", RequireFocus);
+ xmlwriter.SetValueAsBool("MCEReplacement", "MapMCERemote", MCERemoteEnabled);
+ xmlwriter.SetValueAsBool("MCEReplacement", "MapDifferentRemote", DifferentRemoteEnabled);
+ xmlwriter.SetValueAsBool("MCEReplacement", "MessageModeEnabled", MessageModeEnabled);
+ xmlwriter.SetValueAsBool("MCEReplacement", "ControlExternalEnabled", ControlExternalEnabled);
+ xmlwriter.SetValueAsBool("MCEReplacement", "MultiMappingEnabled", MultiMappingEnabled);
+ xmlwriter.SetValue("MCEReplacement", "MultiMappingButton", (int)MultiMappingButton);
+ xmlwriter.SetValueAsBool("MCEReplacement", "EventMapperEnabled", EventMapperEnabled);
+ xmlwriter.SetValue("MCEReplacement", "MouseModeButton", (int)MouseModeButton);
+ xmlwriter.SetValueAsBool("MCEReplacement", "MouseModeEnabled", MouseModeEnabled);
+ xmlwriter.SetValue("MCEReplacement", "MouseModeStep", MouseModeStep);
+ }
+ }
+ catch (Exception ex)
+ {
+ Log.Error("MCEReplacement: SaveSettings() {0}", ex.Message);
+ }
+ }
+
+ #endregion Implementation
+
}
}
Modified: trunk/plugins/MCEReplacement/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/MCEReplacement/Properties/AssemblyInfo.cs 2007-10-27 13:36:02 UTC (rev 1007)
+++ trunk/plugins/MCEReplacement/Properties/AssemblyInfo.cs 2007-10-27 13:40:24 UTC (rev 1008)
@@ -34,8 +34,8 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.3.4")]
-[assembly: AssemblyFileVersionAttribute("1.0.3.4")]
+[assembly: AssemblyVersion("1.0.3.5")]
+[assembly: AssemblyFileVersionAttribute("1.0.3.5")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2007-10-27 13:36:06
|
Revision: 1007
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1007&view=rev
Author: and-81
Date: 2007-10-27 06:36:02 -0700 (Sat, 27 Oct 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/Debug Client/Debug Client.csproj
trunk/plugins/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.exe.manifest
trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/SageSetup/FormMain.cs
trunk/plugins/IR Server Suite/Applications/SageSetup/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/SageSetup/Sage Setup.csproj
trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs
trunk/plugins/IR Server Suite/Applications/Translator/Program.cs
trunk/plugins/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Translator/Properties/Resources.Designer.cs
trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj
trunk/plugins/IR Server Suite/Applications/Tray Launcher/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray Launcher.csproj
trunk/plugins/IR Server Suite/Applications/Virtual Remote/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote/Virtual Remote.csproj
trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Virtual Remote Skin Editor.csproj
trunk/plugins/IR Server Suite/Common/IrssComms/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Keyboard.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Common/MPUtils/MPUtils.csproj
trunk/plugins/IR Server Suite/Common/MPUtils/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTransTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Configure.Designer.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Configure.resx
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Driver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverXP.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/IrCode.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/IrDecoder.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Pronto.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/RemoteDetectionData.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Serial IR Blaster/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Serial IR Blaster/Serial IR Blaster.cs
trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/UirtTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Windows Message Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Windows Message Receiver/Windows Message Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/X10 Transceiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/X10 Transceiver/X10Transceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.cs
trunk/plugins/IR Server Suite/Input Service/Input Service/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Configuration.csproj
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Input Service Configuration.exe.manifest
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/SetupForm.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/MP Blast Zone Plugin.csproj
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.Designer.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MP Control Plugin.csproj
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/SetupForm.Designer.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/SetupForm.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2 Blaster Plugin.csproj
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/PluginSetup.Designer.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/PluginSetup.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3 Blaster Plugin.csproj
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs
Added Paths:
-----------
trunk/plugins/IR Server Suite/Applications/SageSetup/SageSetup.exe.manifest
trunk/plugins/IR Server Suite/Applications/Translator/CopyDataWM.cs
Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/Debug Client.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Debug Client/Debug Client.csproj 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/Applications/Debug Client/Debug Client.csproj 2007-10-27 13:36:02 UTC (rev 1007)
@@ -49,6 +49,7 @@
</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs 2007-10-27 13:36:02 UTC (rev 1007)
@@ -33,8 +33,8 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.3.4")]
-[assembly: AssemblyFileVersion("1.0.3.4")]
+[assembly: AssemblyVersion("1.0.3.5")]
+[assembly: AssemblyFileVersion("1.0.3.5")]
[assembly: CLSCompliant(true)]
[assembly: GuidAttribute("8eeb5fcb-322c-45ee-80a9-3d30cc08a48c")]
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs 2007-10-27 13:36:02 UTC (rev 1007)
@@ -33,8 +33,8 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.3.4")]
-[assembly: AssemblyFileVersion("1.0.3.4")]
+[assembly: AssemblyVersion("1.0.3.5")]
+[assembly: AssemblyFileVersion("1.0.3.5")]
[assembly: CLSCompliant(true)]
[assembly: GuidAttribute("5eeca936-da49-4952-ab3b-9f11ec57e4aa")]
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs 2007-10-27 13:36:02 UTC (rev 1007)
@@ -33,8 +33,8 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.3.4")]
-[assembly: AssemblyFileVersion("1.0.3.4")]
+[assembly: AssemblyVersion("1.0.3.5")]
+[assembly: AssemblyFileVersion("1.0.3.5")]
[assembly: CLSCompliant(true)]
[assembly: GuidAttribute("81eb136b-cc74-4eed-976d-f96ebccd1ce4")]
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.exe.manifest
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.exe.manifest 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.exe.manifest 2007-10-27 13:36:02 UTC (rev 1007)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" >
- <assemblyIdentity version="1.0.3.4" processorArchitecture="X86" name="IRServer" type="win32" />
+ <assemblyIdentity version="1.0.3.5" processorArchitecture="X86" name="IRServer" type="win32" />
<description>Provides multiple connections for local and network access to a remote control transceiver</description>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs 2007-10-27 13:36:02 UTC (rev 1007)
@@ -34,8 +34,8 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.3.4")]
-[assembly: AssemblyFileVersion("1.0.3.4")]
+[assembly: AssemblyVersion("1.0.3.5")]
+[assembly: AssemblyFileVersion("1.0.3.5")]
[assembly: CLSCompliant(true)]
Modified: trunk/plugins/IR Server Suite/Applications/SageSetup/FormMain.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/SageSetup/FormMain.cs 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/Applications/SageSetup/FormMain.cs 2007-10-27 13:36:02 UTC (rev 1007)
@@ -24,7 +24,7 @@
private void FormMain_Load(object sender, EventArgs e)
{
- ArrayList networkPCs = Win32.GetNetworkComputers();
+ string[] networkPCs = Win32.GetNetworkComputers(false);
if (networkPCs == null)
{
MessageBox.Show(this, "No server names detected.", "Network Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
@@ -33,7 +33,7 @@
}
else
{
- comboBoxComputer.Items.AddRange(networkPCs.ToArray());
+ comboBoxComputer.Items.AddRange(networkPCs);
}
_irBlastLocation = SystemRegistry.GetInstallFolder();
@@ -63,9 +63,10 @@
return;
}
+ RegistryKey mainKey = null;
+
try
{
- RegistryKey mainKey;
if (radioButtonExeTuner.Checked)
mainKey = Registry.LocalMachine.CreateSubKey("SOFTWARE\\Sage\\EXETunerPlugin");
else
@@ -93,7 +94,6 @@
command.Append(" -channel %CHANNEL%");
mainKey.SetValue("Command", command.ToString(), RegistryValueKind.String);
- mainKey.Close();
MessageBox.Show(this, "Sage plugin setup complete", "Done", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
@@ -101,6 +101,11 @@
{
MessageBox.Show(this, ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
+ finally
+ {
+ if (mainKey != null)
+ mainKey.Close();
+ }
}
}
Modified: trunk/plugins/IR Server Suite/Applications/SageSetup/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/SageSetup/Properties/AssemblyInfo.cs 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/Applications/SageSetup/Properties/AssemblyInfo.cs 2007-10-27 13:36:02 UTC (rev 1007)
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("1.0.3.4")]
-[assembly: AssemblyFileVersion("1.0.3.4")]
+[assembly: AssemblyVersion("1.0.3.5")]
+[assembly: AssemblyFileVersion("1.0.3.5")]
Modified: trunk/plugins/IR Server Suite/Applications/SageSetup/Sage Setup.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/SageSetup/Sage Setup.csproj 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/Applications/SageSetup/Sage Setup.csproj 2007-10-27 13:36:02 UTC (rev 1007)
@@ -74,6 +74,11 @@
<Name>IrssUtils</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <Content Include="SageSetup.exe.manifest">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Added: trunk/plugins/IR Server Suite/Applications/SageSetup/SageSetup.exe.manifest
===================================================================
--- trunk/plugins/IR Server Suite/Applications/SageSetup/SageSetup.exe.manifest (rev 0)
+++ trunk/plugins/IR Server Suite/Applications/SageSetup/SageSetup.exe.manifest 2007-10-27 13:36:02 UTC (rev 1007)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" >
+ <assemblyIdentity version="1.0.3.5" processorArchitecture="X86" name="SageSetup" type="win32" />
+ <description>Setup the Sage EXE Tuner plugins for use with IR Server</description>
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel level="requireAdministrator" />
+ </requestedPrivileges>
+ </security>
+ </trustInfo>
+</assembly>
Added: trunk/plugins/IR Server Suite/Applications/Translator/CopyDataWM.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/CopyDataWM.cs (rev 0)
+++ trunk/plugins/IR Server Suite/Applications/Translator/CopyDataWM.cs 2007-10-27 13:36:02 UTC (rev 1007)
@@ -0,0 +1,153 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Windows.Forms;
+
+using IrssUtils;
+
+namespace Translator
+{
+
+ class CopyDataWM : NativeWindow, IDisposable
+ {
+
+ #region Constants
+
+ static readonly string CopyDataTarget = "Translator CopyData Target";
+
+ const int CopyDataID = 24;
+
+ #endregion Constants
+
+ #region Constructor / Destructor
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="NotifyWindow"/> class.
+ /// </summary>
+ public CopyDataWM()
+ {
+ Create();
+ }
+
+ /// <summary>
+ /// Releases unmanaged resources and performs other cleanup operations before the
+ /// <see cref="NotifyWindow"/> is reclaimed by garbage collection.
+ /// </summary>
+ ~CopyDataWM()
+ {
+ // Call Dispose with false. Since we're in the destructor call, the managed resources will be disposed of anyway.
+ Dispose(false);
+ }
+
+ #endregion Constructor / Destructor
+
+ #region IDisposable Members
+
+ /// <summary>
+ /// Releases unmanaged and - optionally - managed resources
+ /// </summary>
+ public void Dispose()
+ {
+ // Dispose of the managed and unmanaged resources
+ Dispose(true);
+
+ // Tell the GC that the Finalize process no longer needs to be run for this object.
+ GC.SuppressFinalize(this);
+ }
+
+ /// <summary>
+ /// Releases unmanaged and - optionally - managed resources
+ /// </summary>
+ /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
+ private void Dispose(bool disposing)
+ {
+ if (disposing)
+ {
+ // Dispose managed resources ...
+
+ Destroy();
+ }
+
+ // Free native resources ...
+ }
+
+ #endregion IDisposable Members
+
+ #region Methods
+
+ void Create()
+ {
+ if (Handle != IntPtr.Zero)
+ return;
+
+ CreateParams Params = new CreateParams();
+ Params.ExStyle = 0x80;
+ Params.Style = unchecked((int)0x80000000);
+ Params.Caption = CopyDataTarget;
+
+ CreateHandle(Params);
+ }
+
+ void Destroy()
+ {
+ if (Handle == IntPtr.Zero)
+ return;
+
+ DestroyHandle();
+ }
+
+ #endregion Methods
+
+ #region Overrides
+
+ protected override void WndProc(ref Message m)
+ {
+ if (m.Msg == (int)Win32.WindowsMessage.WM_COPYDATA)
+ {
+ IrssLog.Info("Received WM_COPYDATA message");
+
+ try
+ {
+ Win32.COPYDATASTRUCT dataStructure = (Win32.COPYDATASTRUCT)m.GetLParam(typeof(Win32.COPYDATASTRUCT));
+
+ if (dataStructure.dwData != CopyDataID)
+ {
+ IrssLog.Warn("WM_COPYDATA ID ({0}) does not match expected ID ({1})", dataStructure.dwData, CopyDataID);
+ return;
+ }
+
+ byte[] dataBytes = new byte[dataStructure.cbData];
+ IntPtr lpData = new IntPtr(dataStructure.lpData);
+ Marshal.Copy(lpData, dataBytes, 0, dataStructure.cbData);
+ string strData = Encoding.ASCII.GetString(dataBytes);
+
+ Program.ProcessCommand(strData);
+ }
+ catch (Exception ex)
+ {
+ IrssLog.Error("Error processing WM_COPYDATA message: {0}", ex.ToString());
+ }
+ }
+ }
+
+ #endregion Overrides
+
+ internal static void SendCopyDataMessage(string data)
+ {
+ Win32.COPYDATASTRUCT copyData;
+
+ byte[] dataBytes = Encoding.ASCII.GetBytes(data);
+
+ copyData.dwData = CopyDataID;
+ copyData.lpData = Win32.VarPtr(dataBytes).ToInt32();
+ copyData.cbData = dataBytes.Length;
+
+ IntPtr windowHandle = Win32.FindWindowByTitle(CopyDataTarget);
+
+ if (windowHandle != IntPtr.Zero)
+ Win32.SendWindowsMessage(windowHandle, (int)Win32.WindowsMessage.WM_COPYDATA, IntPtr.Zero, Win32.VarPtr(copyData));
+ }
+
+ }
+
+}
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2007-10-27 13:36:02 UTC (rev 1007)
@@ -351,36 +351,6 @@
}
}
- // TODO: Move to a notify window
- protected override void WndProc(ref Message m)
- {
- try
- {
- if (m.Msg == (int)Win32.WindowsMessage.WM_COPYDATA)
- {
- IrssLog.Info("Received WM_COPYDATA message");
-
- Win32.COPYDATASTRUCT dataStructure = (Win32.COPYDATASTRUCT)m.GetLParam(typeof(Win32.COPYDATASTRUCT));
-
- if (dataStructure.dwData != 24)
- return;
-
- byte[] dataBytes = new byte[dataStructure.cbData];
- IntPtr lpData = new IntPtr(dataStructure.lpData);
- System.Runtime.InteropServices.Marshal.Copy(lpData, dataBytes, 0, dataStructure.cbData);
- string strData = Encoding.ASCII.GetString(dataBytes);
-
- Program.ProcessCommand(strData);
- }
- }
- catch (Exception ex)
- {
- IrssLog.Error(ex.ToString());
- }
-
- base.WndProc(ref m);
- }
-
#region Controls
private void listViewButtons_DoubleClick(object sender, EventArgs e)
@@ -716,12 +686,26 @@
{
EditIR();
}
+ private void listViewMacro_DoubleClick(object sender, EventArgs e)
+ {
+ EditMacro();
+ }
+
private void listViewIR_AfterLabelEdit(object sender, LabelEditEventArgs e)
{
ListView origin = sender as ListView;
if (origin == null)
+ {
+ e.CancelEdit = true;
return;
+ }
+ if (String.IsNullOrEmpty(e.Label))
+ {
+ e.CancelEdit = true;
+ return;
+ }
+
ListViewItem originItem = origin.Items[e.Item];
string oldFileName = Common.FolderIRCommands + originItem.Text + Common.FileExtensionIR;
@@ -732,7 +716,7 @@
return;
}
- if (String.IsNullOrEmpty(e.Label) || !Common.IsValidFileName(e.Label))
+ if (!Common.IsValidFileName(e.Label))
{
MessageBox.Show("File name not valid: " + e.Label, "Cannot rename, New file name not valid", MessageBoxButtons.OK, MessageBoxIcon.Error);
e.CancelEdit = true;
@@ -751,17 +735,21 @@
MessageBox.Show(ex.ToString(), "Failed to rename file", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
-
- private void listViewMacro_DoubleClick(object sender, EventArgs e)
- {
- EditMacro();
- }
private void listViewMacro_AfterLabelEdit(object sender, LabelEditEventArgs e)
{
ListView origin = sender as ListView;
if (origin == null)
+ {
+ e.CancelEdit = true;
return;
+ }
+ if (String.IsNullOrEmpty(e.Label))
+ {
+ e.CancelEdit = true;
+ return;
+ }
+
ListViewItem originItem = origin.Items[e.Item];
string oldFileName = Program.FolderMacros + originItem.Text + Common.FileExtensionMacro;
@@ -772,7 +760,7 @@
return;
}
- if (String.IsNullOrEmpty(e.Label) || !Common.IsValidFileName(e.Label))
+ if (!Common.IsValidFileName(e.Label))
{
MessageBox.Show("File name not valid: " + e.Label, "Cannot rename, New file name not valid", MessageBoxButtons.OK, MessageBoxIcon.Error);
e.CancelEdit = true;
@@ -1043,7 +1031,7 @@
}
private void aboutToolStripMenuItem_Click(object sender, EventArgs e)
{
- MessageBox.Show(this, "Translator\nVersion 1.0.3.4 for IR Server Suite\nBy Aaron Dinnage, 2007", "About Translator", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ MessageBox.Show(this, "Translator\nVersion 1.0.3.5 for IR Server Suite\nBy Aaron Dinnage, 2007", "About Translator", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
#endregion Menu
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2007-10-27 13:36:02 UTC (rev 1007)
@@ -54,6 +54,8 @@
static List<string> _macroStack;
+ static CopyDataWM _copyDataWM;
+
#endregion Variables
#region Properties
@@ -94,10 +96,17 @@
{
if (args.Length > 0)
{
- ProcessCommandLine(args);
+ try
+ {
+ ProcessCommandLine(args);
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine(ex.ToString());
+ }
return;
}
-
+
// Check for multiple instances.
if (Process.GetProcessesByName(Process.GetCurrentProcess().ProcessName).Length != 1)
return;
@@ -160,8 +169,23 @@
SystemEvents.SessionEnding += new SessionEndingEventHandler(SystemEvents_SessionEnding);
SystemEvents.PowerModeChanged += new PowerModeChangedEventHandler(SystemEvents_PowerModeChanged);
+ try
+ {
+ _copyDataWM = new CopyDataWM();
+ }
+ catch (Win32Exception ex)
+ {
+ IrssLog.Error("Error enabling CopyData messages: {0}", ex.ToString());
+ }
+
Application.Run();
+ if (_copyDataWM != null)
+ {
+ _copyDataWM.Dispose();
+ _copyDataWM = null;
+ }
+
SystemEvents.SessionEnding -= new SessionEndingEventHandler(SystemEvents_SessionEnding);
SystemEvents.PowerModeChanged -= new PowerModeChangedEventHandler(SystemEvents_PowerModeChanged);
@@ -197,7 +221,7 @@
/// </summary>
/// <param name="sender">Sender.</param>
/// <param name="e">Event args.</param>
- public static void Application_ThreadException(object sender, ThreadExceptionEventArgs e)
+ static void Application_ThreadException(object sender, ThreadExceptionEventArgs e)
{
IrssLog.Error(e.Exception.ToString());
}
@@ -259,32 +283,45 @@
switch (command)
{
+ case "-blast":
+ if (args.Length > index + 2)
+ CopyDataWM.SendCopyDataMessage(Common.CmdPrefixBlast + args[++index] + '|' + args[++index]);
+ else
+ Console.WriteLine("Blast command requires two parameters.");
+ continue;
+
case "-macro":
- SendCopyDataMessage("Translator", Common.CmdPrefixMacro + args[++index]);
+ if (args.Length > index + 1)
+ CopyDataWM.SendCopyDataMessage(Common.CmdPrefixMacro + args[++index]);
+ else
+ Console.WriteLine("Macro command requires a parameter.");
continue;
case "-eject":
- SendCopyDataMessage("Translator", Common.CmdPrefixEject + args[++index]);
+ if (args.Length > index + 1)
+ CopyDataWM.SendCopyDataMessage(Common.CmdPrefixEject + args[++index]);
+ else
+ Console.WriteLine("Eject command requires a parameter.");
continue;
case "-shutdown":
- SendCopyDataMessage("Translator", Common.CmdPrefixShutdown);
+ CopyDataWM.SendCopyDataMessage(Common.CmdPrefixShutdown);
continue;
case "-reboot":
- SendCopyDataMessage("Translator", Common.CmdPrefixReboot);
+ CopyDataWM.SendCopyDataMessage(Common.CmdPrefixReboot);
continue;
case "-standby":
- SendCopyDataMessage("Translator", Common.CmdPrefixStandby);
+ CopyDataWM.SendCopyDataMessage(Common.CmdPrefixStandby);
continue;
case "-hibernate":
- SendCopyDataMessage("Translator", Common.CmdPrefixHibernate);
+ CopyDataWM.SendCopyDataMessage(Common.CmdPrefixHibernate);
continue;
case "-logoff":
- SendCopyDataMessage("Translator", Common.CmdPrefixLogOff);
+ CopyDataWM.SendCopyDataMessage(Common.CmdPrefixLogOff);
continue;
//TODO: Add more command line options.
@@ -303,21 +340,6 @@
//_notifyIcon.ContextMenuStrip.Focus();
}
- static void SendCopyDataMessage(string targetWindow, string data)
- {
- Win32.COPYDATASTRUCT copyData;
-
- byte[] dataBytes = Encoding.ASCII.GetBytes(data);
-
- copyData.dwData = 24;
- copyData.lpData = Win32.VarPtr(dataBytes).ToInt32();
- copyData.cbData = dataBytes.Length;
-
- IntPtr windowHandle = Win32.FindWindowByTitle(targetWindow);
- if (windowHandle != IntPtr.Zero)
- Win32.SendWindowsMessage(windowHandle, (int)Win32.WindowsMessage.WM_COPYDATA, IntPtr.Zero, Win32.VarPtr(copyData));
- }
-
static void SystemEvents_PowerModeChanged(object sender, PowerModeChangedEventArgs e)
{
switch (e.Mode)
@@ -1006,6 +1028,10 @@
}
}
+ /// <summary>
+ /// Adds to the Macro Stack.
+ /// </summary>
+ /// <param name="fileName">Name of the macro file.</param>
static void MacroStackAdd(string fileName)
{
string lowerCasedFileName = fileName.ToLowerInvariant();
@@ -1036,6 +1062,10 @@
_macroStack.Add(lowerCasedFileName);
}
+ /// <summary>
+ /// Removes from the Macro Stack.
+ /// </summary>
+ /// <param name="fileName">Name of the macro file.</param>
static void MacroStackRemove(string fileName)
{
string lowerCasedFileName = fileName.ToLowerInvariant();
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs 2007-10-27 13:36:02 UTC (rev 1007)
@@ -33,8 +33,8 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.3.4")]
-[assembly: AssemblyFileVersion("1.0.3.4")]
+[assembly: AssemblyVersion("1.0.3.5")]
+[assembly: AssemblyFileVersion("1.0.3.5")]
[assembly: CLSCompliant(true)]
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Properties/Resources.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Properties/Resources.Designer.cs 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Properties/Resources.Designer.cs 2007-10-27 13:36:02 UTC (rev 1007)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.312
+// Runtime Version:2.0.50727.832
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj 2007-10-27 13:36:02 UTC (rev 1007)
@@ -53,7 +53,7 @@
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
- <UseVSHostingProcess>false</UseVSHostingProcess>
+ <UseVSHostingProcess>true</UseVSHostingProcess>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -96,6 +96,7 @@
<DependentUpon>MainForm.cs</DependentUpon>
</Compile>
<Compile Include="MappedEvent.cs" />
+ <Compile Include="CopyDataWM.cs" />
<Compile Include="Program.cs" />
<Compile Include="ProgramSettings.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
Modified: trunk/plugins/IR Server Suite/Applications/Tray Launcher/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Tray Launcher/Properties/AssemblyInfo.cs 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/Applications/Tray Launcher/Properties/AssemblyInfo.cs 2007-10-27 13:36:02 UTC (rev 1007)
@@ -33,8 +33,8 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.3.4")]
-[assembly: AssemblyFileVersion("1.0.3.4")]
+[assembly: AssemblyVersion("1.0.3.5")]
+[assembly: AssemblyFileVersion("1.0.3.5")]
[assembly: CLSCompliant(true)]
[assembly: GuidAttribute("2011f0d4-cec8-43d2-8678-79f24cd6c517")]
Modified: trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray Launcher.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray Launcher.csproj 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray Launcher.csproj 2007-10-27 13:36:02 UTC (rev 1007)
@@ -42,7 +42,7 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
- <UseVSHostingProcess>false</UseVSHostingProcess>
+ <UseVSHostingProcess>true</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote/Properties/AssemblyInfo.cs 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote/Properties/AssemblyInfo.cs 2007-10-27 13:36:02 UTC (rev 1007)
@@ -33,8 +33,8 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.3.4")]
-[assembly: AssemblyFileVersion("1.0.3.4")]
+[assembly: AssemblyVersion("1.0.3.5")]
+[assembly: AssemblyFileVersion("1.0.3.5")]
[assembly: CLSCompliant(true)]
[assembly: GuidAttribute("b9084277-405c-48e6-80d1-c0d0e1dae27d")]
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote/Virtual Remote.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote/Virtual Remote.csproj 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote/Virtual Remote.csproj 2007-10-27 13:36:02 UTC (rev 1007)
@@ -51,7 +51,7 @@
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
- <UseVSHostingProcess>false</UseVSHostingProcess>
+ <UseVSHostingProcess>true</UseVSHostingProcess>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Properties/AssemblyInfo.cs 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Properties/AssemblyInfo.cs 2007-10-27 13:36:02 UTC (rev 1007)
@@ -30,7 +30,7 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("1.0.3.4")]
-[assembly: AssemblyFileVersion("1.0.3.4")]
+[assembly: AssemblyVersion("1.0.3.5")]
+[assembly: AssemblyFileVersion("1.0.3.5")]
[assembly: CLSCompliant(true)]
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Virtual Remote Skin Editor.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Virtual Remote Skin Editor.csproj 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Virtual Remote Skin Editor.csproj 2007-10-27 13:36:02 UTC (rev 1007)
@@ -49,6 +49,7 @@
</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Modified: trunk/plugins/IR Server Suite/Common/IrssComms/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssComms/Properties/AssemblyInfo.cs 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/Common/IrssComms/Properties/AssemblyInfo.cs 2007-10-27 13:36:02 UTC (rev 1007)
@@ -33,8 +33,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.3.4")]
-[assembly: AssemblyFileVersion("1.0.3.4")]
+[assembly: AssemblyVersion("1.0.3.5")]
+[assembly: AssemblyFileVersion("1.0.3.5")]
[assembly: CLSCompliant(true)]
Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/Keyboard.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/Keyboard.cs 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/Keyboard.cs 2007-10-27 13:36:02 UTC (rev 1007)
@@ -1,11 +1,13 @@
using System;
using System.Runtime.InteropServices;
+using System.Windows.Forms;
namespace IrssUtils
{
/// <summary>
/// Win32 native method wrapper for Keyboard control functions.
+ /// http://msdn2.microsoft.com/en-us/library/ms646304.aspx
/// </summary>
public static class Keyboard
{
@@ -19,6 +21,10 @@
uint dwFlags,
IntPtr dwExtraInfo);
+ [DllImport("user32.dll")]
+ static extern short VkKeyScan(
+ char ch);
+
#endregion Interop
#region Enumerations
@@ -623,7 +629,7 @@
#region Public Methods
/// <summary>
- /// Simulate a key being pressed down
+ /// Simulate a key being pressed down.
/// </summary>
/// <param name="vKey">Virtual key to press.</param>
public static void KeyDown(VKey vKey)
@@ -632,7 +638,7 @@
}
/// <summary>
- /// Simulate a key being released
+ /// Simulate a key being released.
/// </summary>
/// <param name="vKey">Virtual key to release.</param>
public static void KeyUp(VKey vKey)
@@ -641,7 +647,7 @@
}
/// <summary>
- /// Simulate a Virtual Key event
+ /// Simulate a Virtual Key event.
/// </summary>
/// <param name="vKey">Virtual Key.</param>
/// <param name="scan">Scan code.</param>
@@ -652,6 +658,52 @@
keybd_event((byte)vKey, scan, (uint)flags, extraInfo);
}
+ /// <summary>
+ /// Simulate a Virtual Key event.
+ /// </summary>
+ /// <param name="vKey">Virtual key code.</param>
+ /// <param name="scan">Scan code.</param>
+ /// <param name="flags">Event type.</param>
+ /// <param name="extraInfo">Pointer to additional information.</param>
+ public static void Event(byte vKey, byte scan, KeyEvents flags, IntPtr extraInfo)
+ {
+ keybd_event(vKey, scan, (uint)flags, extraInfo);
+ }
+
+
+ public static void Process(string keystrokes)
+ {
+ if (String.IsNullOrEmpty(keystrokes))
+ throw new ArgumentNullException("keystrokes");
+
+
+
+ for (int index = 0; index < keystrokes.Length; index++)
+ {
+ char curChar = keystrokes[index];
+
+ short keyScan = VkKeyScan(curChar);
+
+ byte keyCode = (byte)curChar;
+ byte scanCode = 0;
+
+ bool isExtended = false;
+
+ if (isExtended)
+ {
+ Event(keyCode, scanCode, KeyEvents.ExtendedKey | KeyEvents.KeyDown, IntPtr.Zero);
+ Event(keyCode, scanCode, KeyEvents.ExtendedKey | KeyEvents.KeyUp, IntPtr.Zero);
+ }
+ else
+ {
+ Event(keyCode, scanCode, KeyEvents.KeyDown, IntPtr.Zero);
+ Event(keyCode, scanCode, KeyEvents.KeyUp, IntPtr.Zero);
+ }
+ }
+
+
+ }
+
#endregion Public Methods
}
Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/Properties/AssemblyInfo.cs 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/Properties/AssemblyInfo.cs 2007-10-27 13:36:02 UTC (rev 1007)
@@ -33,8 +33,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.3.4")]
-[assembly: AssemblyFileVersion("1.0.3.4")]
+[assembly: AssemblyVersion("1.0.3.5")]
+[assembly: AssemblyFileVersion("1.0.3.5")]
[assembly: CLSCompliant(true)]
Modified: trunk/plugins/IR Server Suite/Common/MPUtils/MPUtils.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Common/MPUtils/MPUtils.csproj 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/Common/MPUtils/MPUtils.csproj 2007-10-27 13:36:02 UTC (rev 1007)
@@ -43,6 +43,7 @@
<RegisterForComInterop>false</RegisterForComInterop>
<DocumentationFile>bin\x86\Debug\MPUtils.XML</DocumentationFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+ <UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>bin\x86\Release\</OutputPath>
Modified: trunk/plugins/IR Server Suite/Common/MPUtils/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/MPUtils/Properties/AssemblyInfo.cs 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/Common/MPUtils/Properties/AssemblyInfo.cs 2007-10-27 13:36:02 UTC (rev 1007)
@@ -33,8 +33,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.3.4")]
-[assembly: AssemblyFileVersion("1.0.3.4")]
+[assembly: AssemblyVersion("1.0.3.5")]
+[assembly: AssemblyFileVersion("1.0.3.5")]
[assembly: CLSCompliant(true)]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs 2007-10-27 13:36:02 UTC (rev 1007)
@@ -209,7 +209,7 @@
/// IR Server plugin version.
/// </summary>
/// <value>The version.</value>
- public override string Version { get { return "1.0.3.4"; } }
+ public override string Version { get { return "1.0.3.5"; } }
/// <summary>
/// The IR Server plugin's author.
/// </summary>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/Properties/AssemblyInfo.cs 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/Properties/AssemblyInfo.cs 2007-10-27 13:36:02 UTC (rev 1007)
@@ -30,8 +30,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.3.4")]
-[assembly: AssemblyFileVersion("1.0.3.4")]
+[assembly: AssemblyVersion("1.0.3.5")]
+[assembly: AssemblyFileVersion("1.0.3.5")]
[assembly: CLSCompliant(true)]
[assembly: GuidAttribute("db244336-eeac-4789-af94-6fbe53df225f")]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/Properties/AssemblyInfo.cs 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/Properties/AssemblyInfo.cs 2007-10-27 13:36:02 UTC (rev 1007)
@@ -29,8 +29,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.3.4")]
-[assembly: AssemblyFileVersion("1.0.3.4")]
+[assembly: AssemblyVersion("1.0.3.5")]
+[assembly: AssemblyFileVersion("1.0.3.5")]
[assembly: CLSCompliant(true)]
[assembly: GuidAttribute("efdc4eaa-6ccc-4928-a1e7-f4b634780081")]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.cs 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.cs 2007-10-27 13:36:02 UTC (rev 1007)
@@ -57,7 +57,7 @@
/// IR Server plugin version.
/// </summary>
/// <value>The version.</value>
- public override string Version { get { return "1.0.3.4"; } }
+ public override string Version { get { return "1.0.3.5"; } }
/// <summary>
/// The IR Server plugin's author.
/// </summary>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/Properties/AssemblyInfo.cs 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/Properties/AssemblyInfo.cs 2007-10-27 13:36:02 UTC (rev 1007)
@@ -29,8 +29,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.3.4")]
-[assembly: AssemblyFileVersion("1.0.3.4")]
+[assembly: AssemblyVersion("1.0.3.5")]
+[assembly: AssemblyFileVersion("1.0.3.5")]
[assembly: CLSCompliant(true)]
[assembly: GuidAttribute("a50e930e-1653-40d5-ba5a-3c0315868c1b")]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTransTransceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTransTransceiver.cs 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTransTransceiver.cs 2007-10-27 13:36:02 UTC (rev 1007)
@@ -220,7 +220,7 @@
/// IR Server plugin version.
/// </summary>
/// <value>The version.</value>
- public override string Version { get { return "1.0.3.4"; } }
+ public override string Version { get { return "1.0.3.5"; } }
/// <summary>
/// The IR Server plugin's author.
/// </summary>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/Properties/AssemblyInfo.cs 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/Properties/AssemblyInfo.cs 2007-10-27 13:36:02 UTC (rev 1007)
@@ -29,8 +29,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.3.4")]
-[assembly: AssemblyFileVersion("1.0.3.4")]
+[assembly: AssemblyVersion("1.0.3.5")]
+[assembly: AssemblyFileVersion("1.0.3.5")]
[assembly: CLSCompliant(true)]
[assembly: GuidAttribute("fef45a20-12af-4750-b7fa-8c8b6ea42a15")]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Configure.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Configure.Designer.cs 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Configure.Designer.cs 2007-10-27 13:36:02 UTC (rev 1007)
@@ -183,7 +183,7 @@
0,
0,
0});
- this.numericUpDownLearnTimeout.Location = new System.Drawing.Point(152, 40);
+ this.numericUpDownLearnTimeout.Location = new System.Drawing.Point(152, 64);
this.numericUpDownLearnTimeout.Maximum = new decimal(new int[] {
60000,
0,
@@ -317,7 +317,7 @@
this.checkBoxDisableMCEServices.AutoSize = true;
this.checkBoxDisableMCEServices.Checked = true;
this.checkBoxDisableMCEServices.CheckState = System.Windows.Forms.CheckState.Checked;
- this.checkBoxDisableMCEServices.Location = new System.Drawing.Point(8, 80);
+ this.checkBoxDisableMCEServices.Location = new System.Drawing.Point(8, 96);
this.checkBoxDisableMCEServices.Name = "checkBoxDisableMCEServices";
this.checkBoxDisableMCEServices.Size = new System.Drawing.Size(216, 17);
this.checkBoxDisableMCEServices.TabIndex = 2;
@@ -339,7 +339,7 @@
//
// labelLearnIRTimeout
//
- this.labelLearnIRTimeout.Location = new System.Drawing.Point(8, 40);
+ this.labelLearnIRTimeout.Location = new System.Drawing.Point(8, 64);
this.labelLearnIRTimeout.Name = "labelLearnIRTimeout";
this.labelLearnIRTimeout.Size = new System.Drawing.Size(136, 20);
this.labelLearnIRTimeout.TabIndex = 0;
@@ -492,7 +492,7 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.buttonCancel;
- this.ClientSize = new System.Drawing.Size(272, 239);
+ this.ClientSize = new System.Drawing.Size(272, 258);
this.ControlBox = false;
this.Controls.Add(this.buttonAdvanced);
this.Controls.Add(this.tabControl);
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Configure.resx
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Configure.resx 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Configure.resx 2007-10-27 13:36:02 UTC (rev 1007)
@@ -120,4 +120,7 @@
<metadata name="toolTips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>58</value>
+ </metadata>
</root>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Driver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Driver.cs 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Driver.cs 2007-10-27 13:36:02 UTC (rev 1007)
@@ -318,13 +318,13 @@
#if DEBUG
- protected StreamWriter _debugFile;
+ protected static StreamWriter _debugFile;
/// <summary>
/// Opens a debug output file.
/// </summary>
/// <param name="fileName">Name of the file.</param>
- protected void DebugOpen(string fileName)
+ protected static void DebugOpen(string fileName)
{
try
{
@@ -340,7 +340,7 @@
/// <summary>
/// Closes the debug output file.
/// </summary>
- protected void DebugClose()
+ protected static void DebugClose()
{
if (_debugFile != null)
{
@@ -353,24 +353,47 @@
/// Writes a line to the debug output file.
/// </summary>
/// <param name="line">The line.</param>
- protected void DebugWriteLine(string line)
+ protected static void DebugWriteLine(string line)
{
if (_debugFile != null)
_debugFile.WriteLine(line);
}
/// <summary>
+ /// Writes a string to the debug output file.
+ /// </summary>
+ /// <param name="text">The string to write.</param>
+ protected static void DebugWrite(string text)
+ {
+ if (_debugFile != null)
+ _debugFile.Write(text);
+ }
+
+ /// <summary>
+ /// Writes a new line to the debug output file.
+ /// </summary>
+ protected static void DebugWriteNewLine()
+ {
+ if (_debugFile != null)
+ _debugFile.WriteLine();
+ }
+
+ /// <summary>
/// Dumps an Array to the debug output file.
/// </summary>
/// <param name="array">The array.</param>
- protected void DebugDump(Array array)
+ protected static void DebugDump(Array array)
{
if (_debugFile == null)
return;
foreach (object item in array)
{
- _debugFile.Write(item);
+ if (item is byte) _debugFile.Write("{0:X2}", (byte) item);
+ else if (item is ushort) _debugFile.Write("{0:X4}", (ushort) item);
+ else if (item is int) _debugFile.Write("{1}{0}", (int) item, (int)item > 0 ? "+" : "");
+ else _debugFile.Write("{0}", item);
+
_debugFile.Write(", ");
}
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs 2007-10-26 14:59:29 UTC (rev 1006)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs 2007-10-27 13:36:02 UTC (rev 1007)
@@ -60,6 +60,11 @@
static extern bool CancelIo(
SafeFileHandle handle);
+ [DllImport("kernel32.dll", SetLastError = true)]
+ [return: MarshalAs(UnmanagedType.Bool)]
+ static extern bool CloseHandle(
+ SafeFileHandle handle);
+
#endregion Interop
#region Enumerations
@@ -112,7 +117,7 @@
// Device variables
const int DeviceBufferSize = 100;
const int PacketTimeout = 100;
- const int WriteSyncTimeout = 5000;
+ const int WriteSyncTimeout = 10000;
// Microsoft Port Packets
static readonly byte[][] MicrosoftPorts = new byte[][]
@@ -200,7 +205,7 @@
{
#if DEBUG
DebugOpen("\\MicrosoftMceTransceiver_DriverReplacement.log");
- DebugWriteLine("DriverReplacement.Start()");
+ DebugWriteLine("Start()");
#endif
_notifyWindow = new NotifyWindow();
@@ -237,7 +242,7 @@
public override void Stop()
{
#if DEBUG
- DebugWriteLine("DriverReplacement.Stop()");
+ DebugWriteLine("Stop()");
#endif
_notifyWindow.DeviceArrival -= new DeviceEventHandler(OnDeviceArrival);
@@ -263,8 +268,11 @@
/// </summary>
public override void Suspend()
{
- Stop();
- //WriteSync(StopPacket);
+#if DEBUG
+ DebugWriteLine("Suspend()");
+#endif
+
+ Stop(); // Unlike the default driver, the replacement driver requires this.
}
/// <summary>
@@ -272,8 +280,11 @@
/// </summary>
public override void Resume()
{
- Start();
- //WriteSync(StartPacket);
+#if DEBUG
+ DebugWriteLine("Resume()");
+#endif
+
+ Start(); // Unlike the default driver, the replacement driver requires this.
}
/// <summary>
@@ -285,7 +296,7 @@
public override LearnStatus Learn(int learnTimeout, out IrCode learned)
{
#if DEBUG
- DebugWriteLine("Start Learn");
+ DebugWriteLine("Learn()");
#endif
learned = null;
@@ -298,7 +309,7 @@
// Wait for the learning to finish ...
while (_readThreadMode == ReadThreadMode.Learning && Environment.TickCount < learnStartTick + learnTimeout)
- Thread.Sleep(100);
+ Thread.Sleep(PacketTimeout);
#if DEBUG
DebugWriteLine("End Learn");
@@ -345,7 +356,8 @@
public override void Send(IrCode code, uint port)
{
#if DEBUG
- DebugWriteLine("Send");
+ DebugWriteLine("Send()");
+ DebugDump(code.TimingData);
#endif
byte[] portPacket;
@@ -376,14 +388,24 @@
byte[] carrierPacket = new byte[SetCarrierFreqPacket.Length];
SetCarrierFreqPacket.CopyTo(carrierPacket, 0);
- if (code.Carrier == IrCode.CarrierFrequencyUnknown || code.Carrier == IrCode.CarrierFrequencyDCMode)
+ if (code.Carrier == IrCode.CarrierFrequencyDCMode)
return carrierPacket;
+ int carrier = code.Carrier;
+
+ if (code.Carrier == IrCode.CarrierFrequencyUnknown)
+ {
+ carrier = IrCode.CarrierFrequencyDefault;
+#if DEBUG
+ DebugWriteLine(String.Format("CarrierPacket(): No carrier frequency specificied, using default ({0})", carrier));
+#endif
+ }
+
for (int scaler = 1; scaler <= 4; scaler++)
{
- int divisor = (10000000 >> (2 * scaler)) / code.Carrier;
+ int divisor = (10000000 >> (2 * scaler)) / carrier;
- if (divisor <= 0xFF)
+ if (divisor < 0xFF)
{
carrierPacket[2] = (byte)scaler;
carrierPacket[3] = (byte)divisor;
@@ -402,6 +424,10 @@
// Construct data bytes into "packet" ...
List<byte> packet = new List<byte>();
+#if DEBUG
+ DebugWriteLine("DataPacket()");
+#endif
+
for (int index = 0; index < code.TimingData.Length; index++)
{
double time = (double)code.TimingData[index];
@@ -409,6 +435,10 @@
byte duration = (byte)Math.Abs(Math.Round(time / 50));
bool pulse = (time > 0);
+#if DEBUG
+ DebugWrite(String.Format("{0}{1}, ", pulse ? '+' : '-', duration * 50));
+#endif
+
while (duration > 0x7F)
{
packet.Add((byte)(pulse ? 0xFF : 0x7F));
@@ -419,6 +449,10 @@
packet.Add((byte)(pulse ? 0x80 | duration : duration));
}
+#if DEBUG
+ DebugWriteNewLine();
+#endif
+
// Insert byte count markers into packet data bytes ...
int subpackets = (int)Math.Ceiling(packet.Count / (double)4);
@@ -471,7 +505,7 @@
void StartReadThread()
{
#if DEBUG
- DebugWriteLine("DriverReplacement.StartReadThread()");
+ DebugWriteLine("StartReadThread()");
#endif
_stopReadThread = new ManualResetEvent(false);
@@ -485,7 +519,7 @@
void StopReadThread()
{
#if DEBUG
- DebugWriteLine("DriverReplacement.StopReadThread()");
+ DebugWriteLine("StopReadThread()");
#endif
if (_readThread != null)
@@ -493,8 +527,6 @@
_readThreadMode = ReadThreadMode.Stop;
_stopReadThread.Set();
- //_readThread.Abort();
-
if (Thread.CurrentThread != _readThread)
_readThread.Join();
@@ -508,17 +540,21 @@
void CloseDevice()
{
#if DEBUG
- DebugWriteLin...
[truncated message content] |
|
From: <chr...@us...> - 2007-10-26 14:59:32
|
Revision: 1006
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1006&view=rev
Author: chreekar
Date: 2007-10-26 07:59:29 -0700 (Fri, 26 Oct 2007)
Log Message:
-----------
in DB.init(): create DB file through File.Create if it doesn't exist
Modified Paths:
--------------
trunk/plugins/MyEmulators/myEmulators/DB.cs
trunk/plugins/MyEmulators/output.rar
Modified: trunk/plugins/MyEmulators/myEmulators/DB.cs
===================================================================
--- trunk/plugins/MyEmulators/myEmulators/DB.cs 2007-10-22 13:00:37 UTC (rev 1005)
+++ trunk/plugins/MyEmulators/myEmulators/DB.cs 2007-10-26 14:59:29 UTC (rev 1006)
@@ -38,7 +38,12 @@
public static void launch()
{
- sqlDB = new SQLiteClient("database\\" + dbName);
+ String path = "database\\" + dbName;
+ if (!File.Exists(path))
+ {
+ File.Create(path);
+ }
+ sqlDB = new SQLiteClient(path);
createDBs();
try
{
Modified: trunk/plugins/MyEmulators/output.rar
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rs...@us...> - 2007-10-22 13:00:40
|
Revision: 1005
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1005&view=rev
Author: rsparey
Date: 2007-10-22 06:00:37 -0700 (Mon, 22 Oct 2007)
Log Message:
-----------
added border to icon view in my music
Modified Paths:
--------------
trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/icon_empty_focus.png
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/icon_empty_nofocus.png
trunk/skins/Foofaraw/Development Skin/Foofaraw/VideoEditorStartScreen.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/myHome.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicsongs.xml
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml 2007-10-20 03:47:15 UTC (rev 1004)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml 2007-10-22 13:00:37 UTC (rev 1005)
@@ -561,7 +561,7 @@
<width>1342</width>
<height>36</height>
<texture>top-strip.png</texture>
- <animation effect="fade" time="500" delay="1000" start="0" end="0">WindowOpen</animation>
+ <animation effect="fade" time="500" delay="1000" start="100" end="0">WindowOpen</animation>
<animation effect="fade" time="500" delay="1000" start="0" end="100">WindowClose</animation>
</control>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/icon_empty_focus.png
===================================================================
(Binary files differ)
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/icon_empty_nofocus.png
===================================================================
(Binary files differ)
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/VideoEditorStartScreen.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/VideoEditorStartScreen.xml 2007-10-20 03:47:15 UTC (rev 1004)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/VideoEditorStartScreen.xml 2007-10-22 13:00:37 UTC (rev 1005)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<window>
- <id>170601</id>
+ <id>2959</id>
<defaultcontrol>101</defaultcontrol>
<allowoverlay>no</allowoverlay>
<define>#header.label:2090</define>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/myHome.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/myHome.xml 2007-10-20 03:47:15 UTC (rev 1004)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/myHome.xml 2007-10-22 13:00:37 UTC (rev 1005)
@@ -361,5 +361,18 @@
<animation effect="fade" time="250">WindowOpen</animation>
<animation effect="fade" time="500">WindowClose</animation>
</control>
+ <control>
+ <type>image</type>
+ <decription>top-strip</decription>
+ <id>0</id>
+ <posX>12</posX>
+ <posY>100</posY>
+ <width>1342</width>
+ <height>36</height>
+ <texture>top-strip.png</texture>
+ <animation effect="fade" time="5000" delay="0" start="100" end="0">WindowOpen</animation>
+ <animation effect="fade" time="500" delay="0" start="0" end="100">WindowClose</animation>
+
+ </control>
</controls>
</window>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicsongs.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicsongs.xml 2007-10-20 03:47:15 UTC (rev 1004)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicsongs.xml 2007-10-22 13:00:37 UTC (rev 1005)
@@ -344,15 +344,15 @@
<textureUpFocus>arrow_round_right_focus.png</textureUpFocus>
<textureDownFocus>arrow_round_left_focus.png</textureDownFocus>
<itemWidth>80</itemWidth>
- <itemHeight>60</itemHeight>
+ <itemHeight>80</itemHeight>
<textureWidth>80</textureWidth>
- <textureHeight>60</textureHeight>
- <thumbWidth>80</thumbWidth>
- <thumbHeight>60</thumbHeight>
- <thumbPosX>15</thumbPosX>
- <thumbPosY>15</thumbPosY>
- <imageFolder>-</imageFolder>
- <imageFolderFocus>-</imageFolderFocus>
+ <textureHeight>80</textureHeight>
+ <thumbWidth>70</thumbWidth>
+ <thumbHeight>70</thumbHeight>
+ <thumbPosX>5</thumbPosX>
+ <thumbPosY>5</thumbPosY>
+ <imageFolder>icon_empty_nofocus.png</imageFolder>
+ <imageFolderFocus>icon_empty_focus.png</imageFolderFocus>
<font>-</font>
<selectedColor>ffffffff</selectedColor>
@@ -365,10 +365,10 @@
<textureHeightBig>105</textureHeightBig> <!-- 150 -->
<itemWidthBig>105</itemWidthBig><!-- 180 -->
<itemHeightBig>105</itemHeightBig><!-- 180 -->
- <thumbWidthBig>105</thumbWidthBig>
- <thumbHeightBig>105</thumbHeightBig>
- <thumbPosXBig>0</thumbPosXBig><!-- 19 -->
- <thumbPosYBig>0</thumbPosYBig> <!-- 19 -->
+ <thumbWidthBig>95</thumbWidthBig>
+ <thumbHeightBig>95</thumbHeightBig>
+ <thumbPosXBig>5</thumbPosXBig><!-- 19 -->
+ <thumbPosYBig>5</thumbPosYBig> <!-- 19 -->
<unfocusedAlpha>180</unfocusedAlpha>
<textXOff>-5000</textXOff>
<showFrame>yes</showFrame>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2007-10-20 03:47:28
|
Revision: 1004
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1004&view=rev
Author: framug
Date: 2007-10-19 20:47:15 -0700 (Fri, 19 Oct 2007)
Log Message:
-----------
Latest strings update. Thanks misterd
Modified Paths:
--------------
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/Language/strings_fr.xml
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/Language/strings_fr.xml
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/Language/strings_fr.xml 2007-10-19 15:28:36 UTC (rev 1003)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/Language/strings_fr.xml 2007-10-20 03:47:15 UTC (rev 1004)
@@ -18,5 +18,6 @@
<String id="14">Lit le flux</String>
<String id="15">Lit Disque</String>
<String id="16">Supprimer item</String>
+ <String id="17">Initialisation</String>
</Section>
</Language>
\ 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: <rs...@us...> - 2007-10-19 15:28:40
|
Revision: 1003
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1003&view=rev
Author: rsparey
Date: 2007-10-19 08:28:36 -0700 (Fri, 19 Oct 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml
Added Paths:
-----------
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/search.png
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/tab_right_corner_down.png
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/tab_right_corner_up.png
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml 2007-10-16 05:38:49 UTC (rev 1002)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml 2007-10-19 15:28:36 UTC (rev 1003)
@@ -42,8 +42,25 @@
<animation effect="fade" time="500" delay="5">WindowClose</animation>
</control>
+ <control>
+ <type>image</type>
+ <decription>top-strip</decription>
+ <id>1</id>
+ <posX>12</posX>
+ <posY>100</posY>
+ <width>1342</width>
+ <height>36</height>
+ <texture>top-strip.png</texture>
+ <visible>Control.HasFocus(3)|Control.HasFocus(31)|Control.HasFocus(32)|Control.HasFocus(2)|Control.HasFocus(21)|Control.HasFocus(22)|Control.HasFocus(4)|Control.HasFocus(41)|Control.HasFocus(42)|Control.HasFocus(43)|Control.HasFocus(5)|Control.HasFocus(51)|Control.HasFocus(52)</visible>
+ <animation effect="fade" time="500" >Visible</animation>
+ <animation effect="fade" time="500" >Hidden</animation>
+ <animation effect="fade" time="400" delay="2000">WindowOpen</animation>
+ <animation effect="fade" time="400">WindowClose</animation>
+
+ </control>
+
<control>
<description>home BM Radio</description>
@@ -68,28 +85,28 @@
<animation effect="slide" time="1000" start="-161,0" end="0,0" delay="1000" acceleration="-1" >WindowOpen</animation>
<animation effect="fade" time="1000">WindowClose</animation>
<animation effect="slide" time="1000" start="0,0" end="-161,0" acceleration="-1" >WindowClose</animation>
- <animation effect="zoom" start="100,100" end="120,120" center="161,450" time="1000" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="161,450" time="1000" acceleration ="-1" >Focus</animation>
- <animation effect="zoom" start="120,120" end="100,100" center="161,450" time="1000" acceleration ="-1" >Unfocus</animation>
+ <animation effect="zoom" start="140,140" end="100,100" center="161,450" time="1000" acceleration ="-1" >Unfocus</animation>
<animation effect="zoom" start="100,100" end="5,5" center="161,450" time="1000" acceleration ="-1" >Control.HasFocus(21)</animation>
-
-
</control>
<control>
<description>MY LAST FM</description>
<type>button</type>
<id>21</id>
- <posX>111</posX>
- <posY>100</posY>
- <width>100</width>
- <height>200</height>
- <textureFocus>Radio.png</textureFocus>
- <textureNoFocus>Radio.png</textureNoFocus>
+ <posY>100</posY>
+ <posX>12</posX>
+ <height>36</height>
+ <width>209</width>
+ <align>left</align>
+ <textureFocus>tab_left_corner_down.png</textureFocus>
+ <textureNoFocus>tab_left_corner_up.png</textureNoFocus>
<label>34000</label>
<hyperlink>7890</hyperlink>
<font>font13</font>
<textcolor>white</textcolor>
+
<onup>11</onup>
<ondown>2</ondown>
<onleft>22</onleft>
@@ -97,12 +114,8 @@
<visible>Control.HasFocus(2)|Control.HasFocus(21)|Control.HasFocus(22)</visible>
<animation effect="fade" time="500" >Visible</animation>
<animation effect="fade" time="500" >Hidden</animation>
- <animation effect="fade" time="400" delay="500">WindowOpen</animation>
+ <animation effect="fade" time="400" delay="2000">WindowOpen</animation>
<animation effect="fade" time="400">WindowClose</animation>
- <animation effect="zoom" start="100,100" end="120,120" center="161,450" time="1000" acceleration ="-1" >Focus</animation>
- <animation effect="zoom" start="120,120" end="100,100" center="161,450" time="1000" acceleration ="-1" >Unfocus</animation>
-
-
</control>
<control>
<description>MY RADIO GUIDE</description>
@@ -131,8 +144,7 @@
<visible>Control.HasFocus(2)|Control.HasFocus(21)|Control.HasFocus(22)</visible>
<animation effect="fade" time="500" >Visible</animation>
<animation effect="fade" time="500" >Hidden</animation>
- <animation effect="slide" time="500" start="1000,0" end="0,0" delay="100" acceleration="-1">Visible</animation> <animation effect="slide" time="500" start="0,0" end="-1000,0" delay="100" acceleration="-1">Hidden</animation>
- <animation effect="fade" time="400" delay="500">WindowOpen</animation>
+ <animation effect="fade" time="400" delay="2000">WindowOpen</animation>
<animation effect="fade" time="400">WindowClose</animation>
</control>
@@ -165,9 +177,8 @@
<animation effect="slide" time="1000" start="-422,0" end="0,0" delay="750" acceleration="-1" >WindowOpen</animation>
<animation effect="fade" time="1000" delay="250" >WindowClose</animation>
<animation effect="slide" time="1000" start="0,0" end="-422,0" delay="250" acceleration="-1" >Windowclose</animation>
- <animation effect="zoom" start="100,100" end="120,120" center="422,450" time="1000" acceleration ="-1" >Focus</animation>
- <animation effect="zoom" start="120,120" end="100,100" center="422,450" time="1000" acceleration ="-1" >Unfocus</animation>
-
+ <animation effect="zoom" start="100,100" end="140,140" center="422,450" time="1000" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="140,140" end="100,100" center="422,450" time="1000" acceleration ="-1" >Unfocus</animation>
</control>
<control>
@@ -193,8 +204,7 @@
<visible>Control.HasFocus(3)|Control.HasFocus(31)|Control.HasFocus(32)</visible>
<animation effect="fade" time="500" >Visible</animation>
<animation effect="fade" time="500" >Hidden</animation>
- <animation effect="slide" time="500" start="1000,0" end="0,0" delay="100" acceleration="-1">Visible</animation> <animation effect="slide" time="500" start="0,0" end="-1000,0" delay="100" acceleration="-1">Hidden</animation>
- <animation effect="fade" time="400" delay="500">WindowOpen</animation>
+ <animation effect="fade" time="400" delay="2000">WindowOpen</animation>
<animation effect="fade" time="400">WindowClose</animation>
</control>
@@ -227,8 +237,7 @@
<visible>Control.HasFocus(3)|Control.HasFocus(31)|Control.HasFocus(32)</visible>
<animation effect="fade" time="500" >Visible</animation>
<animation effect="fade" time="500" >Hidden</animation>
- <animation effect="slide" time="500" start="1000,0" end="0,0" delay="100" acceleration="-1">Visible</animation> <animation effect="slide" time="500" start="0,0" end="-1000,0" delay="100" acceleration="-1">Hidden</animation>
- <animation effect="fade" time="400" delay="500">WindowOpen</animation>
+ <animation effect="fade" time="400" delay="2000">WindowOpen</animation>
<animation effect="fade" time="400">WindowClose</animation>
</control>
@@ -254,14 +263,14 @@
<textcolorNoFocus>00ffffff</textcolorNoFocus>
<onleft>3</onleft>
<onright>5</onright>
- <onup>11</onup>
- <ondown>41</ondown>
+ <onup>41</onup>
+ <ondown>11</ondown>
<animation effect="fade" time="1000" delay="500" >WindowOpen</animation>
<animation effect="slide" time="1000" start="-683,0" end="0,0" delay="500" acceleration="-1" >WindowOpen</animation>
<animation effect="fade" time="1000" delay="500">WindowClose</animation>
<animation effect="slide" time="1000" start="0,0" end="-683,0" delay="500" acceleration="-1" >Windowclose</animation>
- <animation effect="zoom" start="100,100" end="120,120" center="683,450" time="1000" acceleration ="-1" >Focus</animation>
- <animation effect="zoom" start="120,120" end="100,100" center="683,450" time="1000" acceleration ="-1" >Unfocus</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="683,450" time="1000" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="140,140" end="100,100" center="683,450" time="1000" acceleration ="-1" >Unfocus</animation>
</control>
@@ -269,13 +278,13 @@
<description>Recorded TV</description>
<type>button</type>
<id>41</id>
- <posY>500</posY>
- <posX>630</posX>
- <height>100</height>
- <width>100</width>
+ <posY>100</posY>
+ <posX>12</posX>
+ <height>36</height>
+ <width>209</width>
<align>left</align>
- <textureFocus>record.png</textureFocus>
- <textureNoFocus>record.png</textureNoFocus>
+ <textureFocus>tab_left_corner_down.png</textureFocus>
+ <textureNoFocus>tab_left_corner_up.png</textureNoFocus>
<label>604</label>
<hyperlink>603</hyperlink>
<font>font14</font>
@@ -290,8 +299,6 @@
<animation effect="fade" time="500" >Hidden</animation>
<animation effect="fade" time="400" delay="2000">WindowOpen</animation>
<animation effect="fade" time="400">WindowClose</animation>
- <animation effect="zoom" start="100,100" end="120,120" center="683,450" time="1000" acceleration ="-1" >Focus</animation>
- <animation effect="zoom" start="120,120" end="100,100" center="683,450" time="1000" acceleration ="-1" >Unfocus</animation>
</control>
@@ -302,20 +309,20 @@
<id>42</id>
<animation effect="fade" time="400">WindowClose</animation>
<animation effect="fade" time="400" delay="500">WindowOpen</animation>
- <posY>500</posY>
- <posX>500</posX>
+ <posY>100</posY>
+ <posX>221</posX>
<label>600</label>
<hyperlink>600</hyperlink>
<font>font14</font>
- <width>100</width>
- <height>100</height>
+ <width>209</width>
+ <height>36</height>
<onleft>2</onleft>
<onright>6</onright>
<onup>3</onup>
<ondown>50</ondown>
- <textureFocus>guide.png</textureFocus>
- <textureNoFocus>guide.png</textureNoFocus>
-
+ <textureFocus>tab_down.png</textureFocus>
+ <textureNoFocus>tab_up.png</textureNoFocus>
+ <textureAscending>arrow_round_up_nofocus.png</textureAscending>
<onup>11</onup>
<ondown>4</ondown>
<onleft>41</onleft>
@@ -323,33 +330,30 @@
<visible>Control.HasFocus(4)|Control.HasFocus(41)|Control.HasFocus(42)|Control.HasFocus(43)</visible>
<animation effect="fade" time="500" >Visible</animation>
<animation effect="fade" time="500" >Hidden</animation>
-
<animation effect="fade" time="400" delay="2000">WindowOpen</animation>
<animation effect="fade" time="400">WindowClose</animation>
- <animation effect="zoom" start="100,100" end="120,120" center="683,450" time="1000" acceleration ="-1" >Focus</animation>
- <animation effect="zoom" start="120,120" end="100,100" center="683,450" time="1000" acceleration ="-1" >Unfocus</animation>
</control>
<control>
- <description>search</description>
+ <description>scheduler</description>
<type>button</type>
<id>43</id>
<animation effect="fade" time="400">WindowClose</animation>
<animation effect="fade" time="400" delay="500">WindowOpen</animation>
- <posY>500</posY>
- <posX>750</posX>
+ <posY>100</posY>
+ <posX>430</posX>
<label>137</label>
<hyperlink>604</hyperlink>
<font>font14</font>
- <width>100</width>
- <height>100</height>
+ <width>209</width>
+ <height>36</height>
<onleft>2</onleft>
<onright>6</onright>
<onup>3</onup>
<ondown>50</ondown>
- <textureFocus>search.png</textureFocus>
- <textureNoFocus>search.png</textureNoFocus>
-
+ <textureFocus>tab_down.png</textureFocus>
+ <textureNoFocus>tab_up.png</textureNoFocus>
+ <textureAscending>arrow_round_up_nofocus.png</textureAscending>
<onup>11</onup>
<ondown>4</ondown>
<onleft>42</onleft>
@@ -357,11 +361,8 @@
<visible>Control.HasFocus(4)|Control.HasFocus(41)|Control.HasFocus(42)|Control.HasFocus(43)</visible>
<animation effect="fade" time="500" >Visible</animation>
<animation effect="fade" time="500" >Hidden</animation>
-
<animation effect="fade" time="400" delay="2000">WindowOpen</animation>
<animation effect="fade" time="400">WindowClose</animation>
- <animation effect="zoom" start="100,100" end="120,120" center="683,450" time="1000" acceleration ="-1" >Focus</animation>
- <animation effect="zoom" start="120,120" end="100,100" center="683,450" time="1000" acceleration ="-1" >Unfocus</animation>
</control>
@@ -416,8 +417,8 @@
<animation effect="slide" time="1000" start="-944,0" end="0,0" delay="250" acceleration="-1" >WindowOpen</animation>
<animation effect="fade" time="1000" delay="750">WindowClose</animation>
<animation effect="slide" time="1000" start="0,0" end="-944,0" delay="750" acceleration="-1" >Windowclose</animation>
- <animation effect="zoom" start="100,100" end="120,120" center="944,450" time="1000" acceleration ="-1" >Focus</animation>
- <animation effect="zoom" start="120,120" end="100,100" center="944,450" time="1000" acceleration ="-1" >Unfocus</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="944,450" time="1000" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="140,140" end="100,100" center="944,450" time="1000" acceleration ="-1" >Unfocus</animation>
</control>
<control>
<description>Playing Now</description>
@@ -441,9 +442,7 @@
<visible>Control.HasFocus(5)|Control.HasFocus(51)|Control.HasFocus(52)</visible>
<animation effect="fade" time="500" >Visible</animation>
<animation effect="fade" time="500" >Hidden</animation>
- <animation effect="slide" time="500" start="1000,0" end="0,0" delay="100" acceleration="-1" reversible="false">Visible</animation>
- <animation effect="slide" time="500" start="0,0" end="-1000,0" delay="100" acceleration="-1">Hidden</animation>
- <animation effect="fade" time="400" delay="500">WindowOpen</animation>
+ <animation effect="fade" time="400" delay="2000">WindowOpen</animation>
<animation effect="fade" time="400">WindowClose</animation>
</control>
@@ -475,9 +474,7 @@
<visible>Control.HasFocus(5)|Control.HasFocus(51)|Control.HasFocus(52)</visible>
<animation effect="fade" time="500" >Visible</animation>
<animation effect="fade" time="500" >Hidden</animation>
- <animation effect="slide" time="500" start="1000,0" end="0,0" delay="100" acceleration="-1">Visible</animation>
- <animation effect="slide" time="500" start="0,0" end="-1000,0" delay="100" acceleration="-1">Hidden</animation>
- <animation effect="fade" time="400" delay="500">WindowOpen</animation>
+ <animation effect="fade" time="400" delay="2000">WindowOpen</animation>
<animation effect="fade" time="400">WindowClose</animation>
@@ -509,8 +506,8 @@
<animation effect="slide" time="500" start="-1205,0" end="0,0" acceleration="-1" >WindowOpen</animation>
<animation effect="fade" time="1000" delay="1000">WindowClose</animation>
<animation effect="slide" time="1000" start="0,0" end="-1205,0" delay="1000" acceleration="-1" >Windowclose</animation>
- <animation effect="zoom" start="100,100" end="120,120" center="1205,450" time="1000" acceleration ="-1" >Focus</animation>
- <animation effect="zoom" start="120,120" end="100,100" center="1205,450" time="1000" acceleration ="-1" >Unfocus</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="1205,450" time="1000" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="140,140" end="100,100" center="1205,450" time="1000" acceleration ="-1" >Unfocus</animation>
</control>
@@ -538,7 +535,7 @@
</control>
<control>
<type>label</type>
- <description>current selection Label</description>
+ <description>Basic Home Label</description>
<id>1</id>
<posX>251</posX>
<posY>68</posY>
@@ -555,12 +552,22 @@
+<control>
+ <type>image</type>
+ <decription>top-strip</decription>
+ <id>0</id>
+ <posX>12</posX>
+ <posY>100</posY>
+ <width>1342</width>
+ <height>36</height>
+ <texture>top-strip.png</texture>
+ <animation effect="fade" time="500" delay="1000" start="0" end="0">WindowOpen</animation>
+ <animation effect="fade" time="500" delay="1000" start="0" end="100">WindowClose</animation>
+
+ </control>
-
-
-
</controls>
</window>
\ No newline at end of file
Added: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/search.png
===================================================================
(Binary files differ)
Property changes on: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/search.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/tab_right_corner_down.png
===================================================================
(Binary files differ)
Property changes on: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/tab_right_corner_down.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/tab_right_corner_up.png
===================================================================
(Binary files differ)
Property changes on: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/tab_right_corner_up.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2007-10-16 05:38:54
|
Revision: 1002
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1002&view=rev
Author: framug
Date: 2007-10-15 22:38:49 -0700 (Mon, 15 Oct 2007)
Log Message:
-----------
FileExplorer --> File Explorer + missing strPictureImage
Modified Paths:
--------------
trunk/plugins/file explorer/Source/AssemblyInfo.cs
trunk/plugins/file explorer/Source/Constants.cs
trunk/plugins/file explorer/Source/FileExplorer.csproj
trunk/plugins/file explorer/Source/Preview/TextPreview.cs
trunk/plugins/file explorer/Source/Setup.cs
Added Paths:
-----------
trunk/plugins/file explorer/Release/Skin/BlueTwo/Media/
trunk/plugins/file explorer/Release/Skin/BlueTwo/Media/hover_File Explorer.png
Added: trunk/plugins/file explorer/Release/Skin/BlueTwo/Media/hover_File Explorer.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/file explorer/Release/Skin/BlueTwo/Media/hover_File Explorer.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/file explorer/Source/AssemblyInfo.cs
===================================================================
--- trunk/plugins/file explorer/Source/AssemblyInfo.cs 2007-10-15 20:28:59 UTC (rev 1001)
+++ trunk/plugins/file explorer/Source/AssemblyInfo.cs 2007-10-16 05:38:49 UTC (rev 1002)
@@ -8,11 +8,11 @@
// change them to the information which is associated with the assembly
// you compile.
-[assembly: AssemblyTitle("FileExplorer")]
+[assembly: AssemblyTitle("File Explorer")]
[assembly: AssemblyDescription("File Explorer")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Sinus Arts")]
-[assembly: AssemblyProduct("FileExplorer")]
+[assembly: AssemblyProduct("File Explorer")]
[assembly: AssemblyCopyright("2006 Andreas Groß")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
Modified: trunk/plugins/file explorer/Source/Constants.cs
===================================================================
--- trunk/plugins/file explorer/Source/Constants.cs 2007-10-15 20:28:59 UTC (rev 1001)
+++ trunk/plugins/file explorer/Source/Constants.cs 2007-10-16 05:38:49 UTC (rev 1002)
@@ -38,12 +38,12 @@
/// <summary>
/// Name of PlugIn.
/// </summary>
- public static readonly string NAME = "FileExplorer";
+ public static readonly string NAME = "File Explorer";
/// <summary>
/// Description of PlugIn.
/// </summary>
- public static readonly string DESCRIPTION = "FileExplorer";
+ public static readonly string DESCRIPTION = "File Explorer";
/// <summary>
/// Author of PlugIn.
Modified: trunk/plugins/file explorer/Source/FileExplorer.csproj
===================================================================
--- trunk/plugins/file explorer/Source/FileExplorer.csproj 2007-10-15 20:28:59 UTC (rev 1001)
+++ trunk/plugins/file explorer/Source/FileExplorer.csproj 2007-10-16 05:38:49 UTC (rev 1002)
@@ -68,6 +68,7 @@
<Compile Include="Constants.cs" />
<EmbeddedResource Include="Setup.resx">
<DependentUpon>Setup.cs</DependentUpon>
+ <SubType>Designer</SubType>
</EmbeddedResource>
<Compile Include="FileExplorer.cs" />
<Compile Include="DrivesView.cs" />
Modified: trunk/plugins/file explorer/Source/Preview/TextPreview.cs
===================================================================
--- trunk/plugins/file explorer/Source/Preview/TextPreview.cs 2007-10-15 20:28:59 UTC (rev 1001)
+++ trunk/plugins/file explorer/Source/Preview/TextPreview.cs 2007-10-16 05:38:49 UTC (rev 1002)
@@ -120,7 +120,7 @@
/// <returns></returns>
public string Description()
{
- return "Text Viewer used by File FileExplorer";
+ return "Text Viewer used by File File Explorer";
}
/// <summary>
@@ -192,7 +192,7 @@
strButtonText = String.Empty;
strButtonImage = String.Empty;
strButtonImageFocus = String.Empty;
- strPictureImage = String.Empty;
+ strPictureImage = String.Format("hover_{0}.png", "File Explorer"); ;
return false;
}
Modified: trunk/plugins/file explorer/Source/Setup.cs
===================================================================
--- trunk/plugins/file explorer/Source/Setup.cs 2007-10-15 20:28:59 UTC (rev 1001)
+++ trunk/plugins/file explorer/Source/Setup.cs 2007-10-16 05:38:49 UTC (rev 1002)
@@ -149,7 +149,7 @@
strButtonText = this.PluginName();
strButtonImage = String.Empty;
strButtonImageFocus = String.Empty;
- strPictureImage = String.Empty;
+ strPictureImage = String.Format("hover_{0}.png", "File Explorer"); ;
return true;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mis...@us...> - 2007-10-15 20:29:05
|
Revision: 1001
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1001&view=rev
Author: misterd_sf
Date: 2007-10-15 13:28:59 -0700 (Mon, 15 Oct 2007)
Log Message:
-----------
Added blank screen option to osd library. It seems that it is needed on XP, but on Vista it must be deactivated.
Modified Paths:
--------------
trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDController.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.Designer.cs
trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.cs
Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDController.cs
===================================================================
--- trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDController.cs 2007-10-15 13:10:06 UTC (rev 1000)
+++ trunk/plugins/My MPlayer/ExternalOSDLibrary/OSDController.cs 2007-10-15 20:28:59 UTC (rev 1001)
@@ -31,6 +31,7 @@
using System.Windows.Forms;
using MediaPortal.GUI.Library;
using MediaPortal.Player;
+using MediaPortal.Configuration;
namespace ExternalOSDLibrary {
@@ -123,6 +124,11 @@
/// Indicates if MP is minimized
/// </summary>
private bool _minimized;
+
+ /// <summary>
+ /// Indicates if the screen should be blanked in fullscreen
+ /// </summary>
+ private bool _blankScreen;
#endregion
#region ctor
@@ -150,6 +156,9 @@
_sizeChanged = new EventHandler(parent_SizeChanged);
_parentForm.SizeChanged += _sizeChanged;
_minimized = false;
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml"))) {
+ _blankScreen = xmlreader.GetValueAsBool("externalOSDLibrary", "blankScreen", true);
+ }
}
#endregion
@@ -182,7 +191,7 @@
if (update) {
Bitmap image = new Bitmap(_osdForm.Width, _osdForm.Height);
Graphics graph = Graphics.FromImage(image);
- if (GUIGraphicsContext.Fullscreen) {
+ if (_blankScreen && GUIGraphicsContext.Fullscreen) {
graph.FillRectangle(new SolidBrush(Color.FromArgb(0, 0, 0)), new Rectangle(0,0,_osdForm.Size.Width,_osdForm.Size.Height));
}
graph.TextRenderingHint = TextRenderingHint.AntiAlias;
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.Designer.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.Designer.cs 2007-10-15 13:10:06 UTC (rev 1000)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.Designer.cs 2007-10-15 20:28:59 UTC (rev 1001)
@@ -62,6 +62,9 @@
this.optionalArguments = new System.Windows.Forms.TextBox();
this.toolTip = new System.Windows.Forms.ToolTip(this.components);
this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
+ this.externalLibGroup = new System.Windows.Forms.GroupBox();
+ this.externalOSDLibraryBlank = new System.Windows.Forms.CheckBox();
+ this.externalLibGroup.SuspendLayout();
this.SuspendLayout();
//
// label35
@@ -182,11 +185,35 @@
this.openFileDialog1.FileName = "openFileDialog1";
this.openFileDialog1.Title = "Select MPlayer:";
//
+ // externalLibGroup
+ //
+ this.externalLibGroup.Controls.Add(this.externalOSDLibraryBlank);
+ this.externalLibGroup.Location = new System.Drawing.Point(9, 202);
+ this.externalLibGroup.Name = "externalLibGroup";
+ this.externalLibGroup.Size = new System.Drawing.Size(380, 105);
+ this.externalLibGroup.TabIndex = 77;
+ this.externalLibGroup.TabStop = false;
+ this.externalLibGroup.Text = "External OSD Library";
+ //
+ // externalOSDLibraryBlank
+ //
+ this.externalOSDLibraryBlank.AutoSize = true;
+ this.externalOSDLibraryBlank.Checked = true;
+ this.externalOSDLibraryBlank.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.externalOSDLibraryBlank.Location = new System.Drawing.Point(6, 31);
+ this.externalOSDLibraryBlank.Name = "externalOSDLibraryBlank";
+ this.externalOSDLibraryBlank.Size = new System.Drawing.Size(345, 30);
+ this.externalOSDLibraryBlank.TabIndex = 0;
+ this.externalOSDLibraryBlank.Text = "Blank screen in fullscreen\r\n(If you see black screen in fullscreen, you should tu" +
+ "rn this option off)";
+ this.externalOSDLibraryBlank.UseVisualStyleBackColor = true;
+ //
// GeneralSection
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.Transparent;
+ this.Controls.Add(this.externalLibGroup);
this.Controls.Add(this.label35);
this.Controls.Add(this.osdSelect);
this.Controls.Add(this.label30);
@@ -200,6 +227,8 @@
this.Controls.Add(this.optionalArguments);
this.Name = "GeneralSection";
this.Size = new System.Drawing.Size(403, 405);
+ this.externalLibGroup.ResumeLayout(false);
+ this.externalLibGroup.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -220,5 +249,7 @@
private System.Windows.Forms.TextBox optionalArguments;
private System.Windows.Forms.ToolTip toolTip;
private System.Windows.Forms.OpenFileDialog openFileDialog1;
+ private System.Windows.Forms.GroupBox externalLibGroup;
+ private System.Windows.Forms.CheckBox externalOSDLibraryBlank;
}
}
Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.cs
===================================================================
--- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.cs 2007-10-15 13:10:06 UTC (rev 1000)
+++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.cs 2007-10-15 20:28:59 UTC (rev 1001)
@@ -63,6 +63,7 @@
cacheSize.Text = String.Empty;
}
mplayerPath.Text = xmlreader.GetValueAsString("mplayer", "mplayerPath", "C:\\Program Files\\MPlayer\\MPlayer.exe");
+ externalOSDLibraryBlank.Checked = xmlreader.GetValueAsBool("externalOSDLibrary", "blankScreen", true);
}
}
@@ -81,6 +82,7 @@
xmlWriter.SetValue("mplayer", "cacheSize", cacheSize.Text);
}
xmlWriter.SetValue("mplayer", "mplayerPath", mplayerPath.Text);
+ xmlWriter.SetValueAsBool("externalOSDLibrary", "blankScreen", externalOSDLibraryBlank.Checked);
}
}
#endregion
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rs...@us...> - 2007-10-15 13:10:09
|
Revision: 1000
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1000&view=rev
Author: rsparey
Date: 2007-10-15 06:10:06 -0700 (Mon, 15 Oct 2007)
Log Message:
-----------
updating basic home page
Modified Paths:
--------------
trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml
Added Paths:
-----------
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/guide.png
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/record.png
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml 2007-10-15 05:47:44 UTC (rev 999)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml 2007-10-15 13:10:06 UTC (rev 1000)
@@ -42,18 +42,9 @@
<animation effect="fade" time="500" delay="5">WindowClose</animation>
</control>
- <control>
- <type>image</type>
- <decription>top-strip</decription>
- <id>1</id>
- <posX>-12</posX>
- <posY>155</posY>
- <width>1390</width>
- <height>36</height>
- <texture>top-strip.png</texture>
-
- </control>
+
+
<control>
<description>home BM Radio</description>
<type>button</type>
@@ -77,28 +68,28 @@
<animation effect="slide" time="1000" start="-161,0" end="0,0" delay="1000" acceleration="-1" >WindowOpen</animation>
<animation effect="fade" time="1000">WindowClose</animation>
<animation effect="slide" time="1000" start="0,0" end="-161,0" acceleration="-1" >WindowClose</animation>
- <animation effect="zoom" start="100,100" end="120,120" center="161,450" time="1000" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="100,100" end="120,120" center="161,450" time="1000" acceleration ="-1" >Focus</animation>
<animation effect="zoom" start="120,120" end="100,100" center="161,450" time="1000" acceleration ="-1" >Unfocus</animation>
<animation effect="zoom" start="100,100" end="5,5" center="161,450" time="1000" acceleration ="-1" >Control.HasFocus(21)</animation>
+
+
</control>
<control>
<description>MY LAST FM</description>
<type>button</type>
<id>21</id>
- <posY>155</posY>
- <posX>12</posX>
- <height>36</height>
- <width>209</width>
- <align>left</align>
- <textureFocus>tab_left_corner_down.png</textureFocus>
- <textureNoFocus>tab_left_corner_up.png</textureNoFocus>
+ <posX>111</posX>
+ <posY>100</posY>
+ <width>100</width>
+ <height>200</height>
+ <textureFocus>Radio.png</textureFocus>
+ <textureNoFocus>Radio.png</textureNoFocus>
<label>34000</label>
<hyperlink>7890</hyperlink>
<font>font13</font>
<textcolor>white</textcolor>
-
<onup>11</onup>
<ondown>2</ondown>
<onleft>22</onleft>
@@ -106,10 +97,12 @@
<visible>Control.HasFocus(2)|Control.HasFocus(21)|Control.HasFocus(22)</visible>
<animation effect="fade" time="500" >Visible</animation>
<animation effect="fade" time="500" >Hidden</animation>
- <animation effect="slide" time="500" start="1000,0" end="0,0" delay="100" acceleration="-1">Visible</animation>
- <animation effect="slide" time="500" start="0,0" end="-1000,0" delay="100" acceleration="-1">Hidden</animation>
<animation effect="fade" time="400" delay="500">WindowOpen</animation>
<animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="zoom" start="100,100" end="120,120" center="161,450" time="1000" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="120,120" end="100,100" center="161,450" time="1000" acceleration ="-1" >Unfocus</animation>
+
+
</control>
<control>
<description>MY RADIO GUIDE</description>
@@ -117,7 +110,7 @@
<id>22</id>
<animation effect="fade" time="400">WindowClose</animation>
<animation effect="fade" time="400" delay="500">WindowOpen</animation>
- <posY>155</posY>
+ <posY>100</posY>
<posX>221</posX>
<label>533</label>
<hyperlink>762</hyperlink>
@@ -174,13 +167,14 @@
<animation effect="slide" time="1000" start="0,0" end="-422,0" delay="250" acceleration="-1" >Windowclose</animation>
<animation effect="zoom" start="100,100" end="120,120" center="422,450" time="1000" acceleration ="-1" >Focus</animation>
<animation effect="zoom" start="120,120" end="100,100" center="422,450" time="1000" acceleration ="-1" >Unfocus</animation>
+
</control>
<control>
<description>MY TV SERIES</description>
<type>button</type>
<id>31</id>
- <posY>155</posY>
+ <posY>100</posY>
<posX>12</posX>
<height>36</height>
<width>209</width>
@@ -212,7 +206,7 @@
<id>32</id>
<animation effect="fade" time="400">WindowClose</animation>
<animation effect="fade" time="400" delay="500">WindowOpen</animation>
- <posY>155</posY>
+ <posY>100</posY>
<posX>221</posX>
<label>5906</label>
<hyperlink>5900</hyperlink>
@@ -260,8 +254,8 @@
<textcolorNoFocus>00ffffff</textcolorNoFocus>
<onleft>3</onleft>
<onright>5</onright>
- <onup>41</onup>
- <ondown>11</ondown>
+ <onup>11</onup>
+ <ondown>41</ondown>
<animation effect="fade" time="1000" delay="500" >WindowOpen</animation>
<animation effect="slide" time="1000" start="-683,0" end="0,0" delay="500" acceleration="-1" >WindowOpen</animation>
<animation effect="fade" time="1000" delay="500">WindowClose</animation>
@@ -275,13 +269,13 @@
<description>Recorded TV</description>
<type>button</type>
<id>41</id>
- <posY>155</posY>
- <posX>12</posX>
- <height>36</height>
- <width>209</width>
+ <posY>500</posY>
+ <posX>630</posX>
+ <height>100</height>
+ <width>100</width>
<align>left</align>
- <textureFocus>tab_left_corner_down.png</textureFocus>
- <textureNoFocus>tab_left_corner_up.png</textureNoFocus>
+ <textureFocus>record.png</textureFocus>
+ <textureNoFocus>record.png</textureNoFocus>
<label>604</label>
<hyperlink>603</hyperlink>
<font>font14</font>
@@ -294,9 +288,10 @@
<visible>Control.HasFocus(4)|Control.HasFocus(41)|Control.HasFocus(42)|Control.HasFocus(43)</visible>
<animation effect="fade" time="500" >Visible</animation>
<animation effect="fade" time="500" >Hidden</animation>
- <animation effect="slide" time="500" start="1000,0" end="0,0" delay="100" acceleration="-1">Visible</animation> <animation effect="slide" time="500" start="0,0" end="-1000,0" delay="100" acceleration="-1">Hidden</animation>
- <animation effect="fade" time="400" delay="500">WindowOpen</animation>
+ <animation effect="fade" time="400" delay="2000">WindowOpen</animation>
<animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="zoom" start="100,100" end="120,120" center="683,450" time="1000" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="120,120" end="100,100" center="683,450" time="1000" acceleration ="-1" >Unfocus</animation>
</control>
@@ -307,20 +302,20 @@
<id>42</id>
<animation effect="fade" time="400">WindowClose</animation>
<animation effect="fade" time="400" delay="500">WindowOpen</animation>
- <posY>155</posY>
- <posX>221</posX>
+ <posY>500</posY>
+ <posX>500</posX>
<label>600</label>
<hyperlink>600</hyperlink>
<font>font14</font>
- <width>209</width>
- <height>36</height>
+ <width>100</width>
+ <height>100</height>
<onleft>2</onleft>
<onright>6</onright>
<onup>3</onup>
<ondown>50</ondown>
- <textureFocus>tab_down.png</textureFocus>
- <textureNoFocus>tab_up.png</textureNoFocus>
- <textureAscending>arrow_round_up_nofocus.png</textureAscending>
+ <textureFocus>guide.png</textureFocus>
+ <textureNoFocus>guide.png</textureNoFocus>
+
<onup>11</onup>
<ondown>4</ondown>
<onleft>41</onleft>
@@ -328,31 +323,33 @@
<visible>Control.HasFocus(4)|Control.HasFocus(41)|Control.HasFocus(42)|Control.HasFocus(43)</visible>
<animation effect="fade" time="500" >Visible</animation>
<animation effect="fade" time="500" >Hidden</animation>
- <animation effect="slide" time="500" start="1000,0" end="0,0" delay="100" acceleration="-1">Visible</animation> <animation effect="slide" time="500" start="0,0" end="-1000,0" delay="100" acceleration="-1">Hidden</animation>
- <animation effect="fade" time="400" delay="500">WindowOpen</animation>
+
+ <animation effect="fade" time="400" delay="2000">WindowOpen</animation>
<animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="zoom" start="100,100" end="120,120" center="683,450" time="1000" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="120,120" end="100,100" center="683,450" time="1000" acceleration ="-1" >Unfocus</animation>
</control>
<control>
- <description>scheduler</description>
+ <description>search</description>
<type>button</type>
<id>43</id>
<animation effect="fade" time="400">WindowClose</animation>
<animation effect="fade" time="400" delay="500">WindowOpen</animation>
- <posY>155</posY>
- <posX>430</posX>
+ <posY>500</posY>
+ <posX>750</posX>
<label>137</label>
<hyperlink>604</hyperlink>
<font>font14</font>
- <width>209</width>
- <height>36</height>
+ <width>100</width>
+ <height>100</height>
<onleft>2</onleft>
<onright>6</onright>
<onup>3</onup>
<ondown>50</ondown>
- <textureFocus>tab_down.png</textureFocus>
- <textureNoFocus>tab_up.png</textureNoFocus>
- <textureAscending>arrow_round_up_nofocus.png</textureAscending>
+ <textureFocus>search.png</textureFocus>
+ <textureNoFocus>search.png</textureNoFocus>
+
<onup>11</onup>
<ondown>4</ondown>
<onleft>42</onleft>
@@ -360,9 +357,11 @@
<visible>Control.HasFocus(4)|Control.HasFocus(41)|Control.HasFocus(42)|Control.HasFocus(43)</visible>
<animation effect="fade" time="500" >Visible</animation>
<animation effect="fade" time="500" >Hidden</animation>
- <animation effect="slide" time="500" start="1000,0" end="0,0" delay="100" acceleration="-1">Visible</animation> <animation effect="slide" time="500" start="0,0" end="-1000,0" delay="100" acceleration="-1">Hidden</animation>
- <animation effect="fade" time="400" delay="500">WindowOpen</animation>
+
+ <animation effect="fade" time="400" delay="2000">WindowOpen</animation>
<animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="zoom" start="100,100" end="120,120" center="683,450" time="1000" acceleration ="-1" >Focus</animation>
+ <animation effect="zoom" start="120,120" end="100,100" center="683,450" time="1000" acceleration ="-1" >Unfocus</animation>
</control>
@@ -424,7 +423,7 @@
<description>Playing Now</description>
<type>button</type>
<id>51</id>
- <posY>155</posY>
+ <posY>100</posY>
<posX>12</posX>
<height>36</height>
<width>209</width>
@@ -456,7 +455,7 @@
<id>52</id>
<animation effect="fade" time="400">WindowClose</animation>
<animation effect="fade" time="400" delay="500">WindowOpen</animation>
- <posY>155</posY>
+ <posY>100</posY>
<posX>221</posX>
<label>136</label>
<hyperlink>500</hyperlink>
@@ -539,7 +538,7 @@
</control>
<control>
<type>label</type>
- <description>Basic Home Label</description>
+ <description>current selection Label</description>
<id>1</id>
<posX>251</posX>
<posY>68</posY>
@@ -560,88 +559,8 @@
- <control>
- <description>Other submenu 1</description>
- <type>button</type>
- <id>71</id>
- <posX>100</posX>
- <posY>687</posY>
- <height>25</height>
- <width>200</width>
- <align>left</align>
- <textureFocus>menu_list_focus.png</textureFocus>
- <textureNoFocus>menu_list_nofocus.png</textureNoFocus>
- <visible>Control.HasFocus(7)|Control.HasFocus(71)|Control.HasFocus(72)|Control.HasFocus(73)</visible>
- <label>weather</label>
- <hyperlink>2600</hyperlink>
- <font>font14</font>
- <textcolor>white</textcolor>
-
- <onup>7</onup>
- <ondown>71</ondown>
- <onleft>71</onleft>
- <onright>72</onright>
- <animation effect="fade" time="500" >Visible</animation>
- <animation effect="fade" time="500" >Hidden</animation>
- <animation effect="slide" time="500" start="1000,0" end="0,0" delay="100" acceleration="-1">Visible</animation> <animation effect="slide" time="500" start="0,0" end="-1000,0" delay="100" acceleration="-1">Hidden</animation>
- <animation effect="fade" time="400" delay="500">WindowOpen</animation>
- <animation effect="fade" time="400">WindowClose</animation>
- </control>
- <control>
- <description>Other submenu 2</description>
- <type>button</type>
- <id>72</id>
- <posX>299</posX>
- <posY>687</posY>
- <height>25</height>
- <width>200</width>
- <align>left</align>
- <textureFocus>submenu_focus.png</textureFocus>
- <textureNoFocus>submenu.png</textureNoFocus>
- <visible>Control.HasFocus(7)|Control.HasFocus(71)|Control.HasFocus(72)|Control.HasFocus(73)</visible>
- <label>plugins</label>
- <hyperlink>34</hyperlink>
- <font>font14</font>
- <textcolor>white</textcolor>
-
- <onup>7</onup>
- <ondown>72</ondown>
- <onleft>71</onleft>
- <onright>73</onright>
- <animation effect="fade" time="500" >Visible</animation>
- <animation effect="fade" time="500" >Hidden</animation>
- <animation effect="slide" time="500" start="1000,0" end="0,0" delay="100" acceleration="-1">Visible</animation> <animation effect="slide" time="500" start="0,0" end="-1000,0" delay="100" acceleration="-1">Hidden</animation>
- <animation effect="fade" time="400" delay="500">WindowOpen</animation>
- <animation effect="fade" time="400">WindowClose</animation>
- </control>
- <control>
- <description>Other submenu 3</description>
- <type>button</type>
- <id>73</id>
- <posX>498</posX>
- <posY>687</posY>
- <height>25</height>
- <width>200</width>
- <align>left</align>
- <textureFocus>submenu_focus.png</textureFocus>
- <textureNoFocus>submenu.png</textureNoFocus>
- <visible>Control.HasFocus(7)|Control.HasFocus(71)|Control.HasFocus(72)|Control.HasFocus(73)</visible>
- <label>news</label>
- <hyperlink>2700</hyperlink>
- <font>font14</font>
- <textcolor>white</textcolor>
-
- <onup>7</onup>
- <ondown>73</ondown>
- <onleft>72</onleft>
- <onright>73</onright>
- <animation effect="fade" time="500" >Visible</animation>
- <animation effect="fade" time="500" >Hidden</animation>
- <animation effect="slide" time="500" start="1000,0" end="0,0" delay="100" acceleration="-1">Visible</animation> <animation effect="slide" time="500" start="0,0" end="-1000,0" delay="100" acceleration="-1">Hidden</animation>
- <animation effect="fade" time="400" delay="500">WindowOpen</animation>
- <animation effect="fade" time="400">WindowClose</animation>
- </control>
+
</controls>
</window>
\ No newline at end of file
Added: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/guide.png
===================================================================
(Binary files differ)
Property changes on: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/guide.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/record.png
===================================================================
(Binary files differ)
Property changes on: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/record.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <i-...@us...> - 2007-10-15 05:47:47
|
Revision: 999
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=999&view=rev
Author: i-loop
Date: 2007-10-14 22:47:44 -0700 (Sun, 14 Oct 2007)
Log Message:
-----------
synsynced with latest BlueTwo svn
Modified Paths:
--------------
trunk/skins/BlueTwoBig/Development Version/DialogVideoInfo.xml
trunk/skins/BlueTwoBig/Development Version/MyMusicPlayingNow.xml
trunk/skins/BlueTwoBig/Development Version/myvideoTitle.xml
Modified: trunk/skins/BlueTwoBig/Development Version/DialogVideoInfo.xml
===================================================================
--- trunk/skins/BlueTwoBig/Development Version/DialogVideoInfo.xml 2007-10-13 22:44:58 UTC (rev 998)
+++ trunk/skins/BlueTwoBig/Development Version/DialogVideoInfo.xml 2007-10-15 05:47:44 UTC (rev 999)
@@ -191,6 +191,7 @@
</subitems>
<orientation>horizontal</orientation>
<percentage>#rating</percentage>
+ <imagesToDraw>10</imagesToDraw>
<animation effect="fade" time="200">WindowOpen</animation>
<animation effect="fade" time="200">WindowClose</animation>
</control>
Modified: trunk/skins/BlueTwoBig/Development Version/MyMusicPlayingNow.xml
===================================================================
--- trunk/skins/BlueTwoBig/Development Version/MyMusicPlayingNow.xml 2007-10-13 22:44:58 UTC (rev 998)
+++ trunk/skins/BlueTwoBig/Development Version/MyMusicPlayingNow.xml 2007-10-15 05:47:44 UTC (rev 999)
@@ -1,509 +1,522 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<window>
- <id>510</id>
- <defaultcontrol>33</defaultcontrol>
- <allowoverlay>no</allowoverlay>
- <controls>
- <control>
- <type>image</type>
- <description>background image</description>
- <id>0</id>
- </control>
- <control>
- <type>image</type>
- <description>menu background image</description>
- <id>0</id>
- <posX>31</posX>
- <posY>425</posY>
- <width>670</width>
- <height>142</height>
- <texture>osd_bg.png</texture>
- <animation effect="fade" time="150">WindowOpen</animation>
- </control>
- <control>
- <type>image</type>
- <description>background hover image</description>
- <id>0</id>
- <posX>40</posX>
- <posY>443</posY>
- <width>90</width>
- <height>126</height>
- <texture>music.png</texture>
- <animation effect="fade" time="150">WindowOpen</animation>
- </control>
- <control>
- <type>image</type>
- <description>title image</description>
- <id>0</id>
- <posX>60</posX>
- <posY>20</posY>
- <texture flipY="true" diffuse="Thumb_Mask.png">music_logo.png</texture>
- <animation effect="fade" time="150">WindowOpen</animation>
- </control>
- <control>
- <type>image</type>
- <description>nowplaying background</description>
- <id>0</id>
- <posX>389</posX>
- <posY>58</posY>
- <width>307</width>
- <height>358</height>
- <texture>nowplaying_background.png</texture>
- <animation effect="fade" time="150">WindowOpen</animation>
- </control>
- <control>
- <type>image</type>
- <description>album art image</description>
- <id>112</id>
- <posX>415</posX>
- <posY>110</posY>
- <width>250</width>
- <height>250</height>
- <texture>-</texture>
- <centered>yes</centered>
- <zoom>yes</zoom>
- </control>
- <control>
- <type>fadelabel</type>
- <description>track label</description>
- <id>0</id>
- <posX>138</posX>
- <posY>452</posY>
- <width>320</width>
- <height>20</height>
- <label>#Play.Current.Title</label>
- <font>font18</font>
- <animation effect="fade" time="150">WindowOpen</animation>
- </control>
- <control>
- <type>fadelabel</type>
- <description>track label</description>
- <id>0</id>
- <posX>138</posX>
- <posY>484</posY>
- <width>288</width>
- <height>20</height>
- <label>#Play.Current.Artist</label>
- <font>font16</font>
- <animation effect="fade" time="150">WindowOpen</animation>
- </control>
- <control>
- <type>fadelabel</type>
- <description>track label</description>
- <id>0</id>
- <posX>138</posX>
- <posY>512</posY>
- <width>288</width>
- <height>20</height>
- <label>#Play.Current.Track</label>
- <font>font16</font>
- <animation effect="fade" time="150">WindowOpen</animation>
- </control>
- <control>
- <type>fadelabel</type>
- <description>year label</description>
- <id>0</id>
- <posX>676</posX>
- <posY>79</posY>
- <width>90</width>
- <label>#Play.Current.Year</label>
- <font>font14</font>
- <align>right</align>
- <!-- <textcolor>white</textcolor> -->
- </control>
- <control>
- <type>fadelabel</type>
- <description>album label</description>
- <id>0</id>
- <posX>404</posX>
- <posY>79</posY>
- <width>180</width>
- <label>#Play.Current.Album</label>
- <font>font14</font>
- <align>left</align>
- <!-- <textcolor>white</textcolor> -->
- <animation effect="fade" time="150">WindowOpen</animation>
- </control>
- <control>
- <type>image</type>
- <id>117</id>
- <posX>450</posX>
- <posY>373</posY>
- <width>180</width>
- <texture>osd_progress_background.png</texture>
- <animation effect="fade" time="150">WindowOpen</animation>
- </control>
- <control>
- <type>progress</type>
- <description>track progress</description>
- <id>118</id>
- <posX>438</posX>
- <posY>373</posY>
- <width>204</width>
- </control>
- <control>
- <type>label</type>
- <description>track progress label</description>
- <id>0</id>
- <posX>404</posX>
- <posY>373</posY>
- <label>#currentplaytime</label>
- <font>font14</font>
- <align>left</align>
- <textcolor>80ffffff</textcolor>
- <animation effect="fade" time="150">WindowOpen</animation>
- </control>
- <control>
- <type>label</type>
- <description>track duration label</description>
- <id>0</id>
- <posX>675</posX>
- <posY>373</posY>
- <label>#duration</label>
- <font>font14</font>
- <align>right</align>
- <textcolor>80ffffff</textcolor>
- </control>
- <control>
- <type>label</type>
- <description>up next label</description>
- <id>20</id>
- <posX>664</posX>
- <posY>457</posY>
- <label>4541</label>
- <font>font14</font>
- <align>right</align>
- <textcolor>80ffffff</textcolor>
- </control>
- <control>
- <type>fadelabel</type>
- <description>next track label</description>
- <id>121</id>
- <posX>663</posX>
- <posY>513</posY>
- <width>300</width>
- <label>#Play.Next.Title</label>
- <align>right</align>
- <textcolor>80ffffff</textcolor>
- </control>
- <control>
- <type>fadelabel</type>
- <description>next artist label</description>
- <id>123</id>
- <posX>662</posX>
- <posY>489</posY>
- <width>300</width>
- <label>#Play.Next.Artist</label>
- <align>right</align>
- <textcolor>80ffffff</textcolor>
- </control>
- <control>
- <type>listcontrol</type>
- <description>list of best album tracks</description>
- <id>166</id>
- <onright>155</onright>
- <ondown>155</ondown>
- <posX>24</posX>
- <posY>136</posY>
- <width>220</width>
- <height>135</height>
- <textXOff>4</textXOff>
- <IconXOff>1</IconXOff>
- <spinColor>-</spinColor>
- <image>-</image>
- <textureUp>-</textureUp>
- <textureDown>-</textureDown>
- <textureUpFocus>-</textureUpFocus>
- <textureDownFocus>-</textureDownFocus>
- <textureFocus>list_sub_focus_arrow_small.png</textureFocus>
- <textureNoFocus>-</textureNoFocus>
- </control>
- <control>
- <type>listcontrol</type>
- <description>list of best tag tracks</description>
- <id>155</id>
- <onup>166</onup>
- <onleft>166</onleft>
- <posX>24</posX>
- <posY>288</posY>
- <width>300</width>
- <height>135</height>
- <textXOff>4</textXOff>
- <IconXOff>1</IconXOff>
- <spinColor>-</spinColor>
- <image>-</image>
- <textureUp>-</textureUp>
- <textureNoFocus>-</textureNoFocus>
- <textureDown>-</textureDown>
- <textureUpFocus>-</textureUpFocus>
- <textureDownFocus>-</textureDownFocus>
- <textureFocus>list_sub_focus_arrow.png</textureFocus>
- <textcolor>White</textcolor>
- </control>
- <control>
- <description>unknown rating1</description>
- <type>imagelist</type>
- <id>77</id>
- <posX>245</posX>
- <posY>144</posY>
- <width>80</width>
- <height>32</height>
- <textureWidth>16</textureWidth>
- <textureHeight>16</textureHeight>
- <subitems>
- <subitem>greystar.png</subitem>
- <subitem>starbad.png</subitem>
- </subitems>
- <orientation>horizontal</orientation>
- <align>left</align>
- <percentage>#Lastfm.Rating.AlbumTrack1</percentage>
- <visible>no</visible>
- </control>
- <control>
- <description>unknown rating2</description>
- <type>imagelist</type>
- <id>78</id>
- <posX>245</posX>
- <posY>177</posY>
- <width>80</width>
- <height>32</height>
- <textureWidth>16</textureWidth>
- <textureHeight>16</textureHeight>
- <subitems>
- <subitem>greystar.png</subitem>
- <subitem>starbad.png</subitem>
- </subitems>
- <orientation>horizontal</orientation>
- <align>left</align>
- <percentage>#Lastfm.Rating.AlbumTrack2</percentage>
- <visible>no</visible>
- </control>
- <control>
- <description>unknown rating3</description>
- <type>imagelist</type>
- <id>79</id>
- <posX>245</posX>
- <posY>211</posY>
- <width>80</width>
- <height>32</height>
- <textureWidth>16</textureWidth>
- <textureHeight>16</textureHeight>
- <subitems>
- <subitem>greystar.png</subitem>
- <subitem>starbad.png</subitem>
- </subitems>
- <orientation>horizontal</orientation>
- <align>left</align>
- <percentage>#Lastfm.Rating.AlbumTrack3</percentage>
- <visible>no</visible>
- </control>
- <control>
- <description>existent rating1</description>
- <type>imagelist</type>
- <id>80</id>
- <posX>245</posX>
- <posY>144</posY>
- <width>80</width>
- <height>32</height>
- <textureWidth>16</textureWidth>
- <textureHeight>16</textureHeight>
- <subitems>
- <subitem>greystar.png</subitem>
- <subitem>stargood.png</subitem>
- </subitems>
- <orientation>horizontal</orientation>
- <align>left</align>
- <percentage>#Lastfm.Rating.AlbumTrack1</percentage>
- <visible>no</visible>
- </control>
- <control>
- <description>existent rating2</description>
- <type>imagelist</type>
- <id>81</id>
- <posX>245</posX>
- <posY>177</posY>
- <width>80</width>
- <height>32</height>
- <textureWidth>16</textureWidth>
- <textureHeight>16</textureHeight>
- <subitems>
- <subitem>greystar.png</subitem>
- <subitem>stargood.png</subitem>
- </subitems>
- <orientation>horizontal</orientation>
- <align>left</align>
- <percentage>#Lastfm.Rating.AlbumTrack2</percentage>
- <visible>no</visible>
- </control>
- <control>
- <description>existent rating3</description>
- <type>imagelist</type>
- <id>82</id>
- <posX>245</posX>
- <posY>211</posY>
- <width>80</width>
- <height>32</height>
- <textureWidth>16</textureWidth>
- <textureHeight>16</textureHeight>
- <subitems>
- <subitem>greystar.png</subitem>
- <subitem>stargood.png</subitem>
- </subitems>
- <orientation>horizontal</orientation>
- <align>left</align>
- <percentage>#Lastfm.Rating.AlbumTrack3</percentage>
- <visible>no</visible>
- </control>
- <control>
- <description>known rating1</description>
- <type>imagelist</type>
- <id>83</id>
- <posX>245</posX>
- <posY>144</posY>
- <width>80</width>
- <height>32</height>
- <textureWidth>16</textureWidth>
- <textureHeight>16</textureHeight>
- <subitems>
- <subitem>greystar.png</subitem>
- <subitem>starbetter.png</subitem>
- </subitems>
- <orientation>horizontal</orientation>
- <align>left</align>
- <percentage>#Lastfm.Rating.AlbumTrack1</percentage>
- <visible>no</visible>
- </control>
- <control>
- <description>known rating2</description>
- <type>imagelist</type>
- <id>84</id>
- <posX>245</posX>
- <posY>177</posY>
- <width>80</width>
- <height>32</height>
- <textureWidth>16</textureWidth>
- <textureHeight>16</textureHeight>
- <subitems>
- <subitem>greystar.png</subitem>
- <subitem>starbetter.png</subitem>
- </subitems>
- <orientation>horizontal</orientation>
- <align>left</align>
- <percentage>#Lastfm.Rating.AlbumTrack2</percentage>
- <visible>no</visible>
- </control>
- <control>
- <description>known rating3</description>
- <type>imagelist</type>
- <id>85</id>
- <posX>245</posX>
- <posY>211</posY>
- <width>80</width>
- <height>32</height>
- <textureWidth>16</textureWidth>
- <textureHeight>16</textureHeight>
- <subitems>
- <subitem>greystar.png</subitem>
- <subitem>starbetter.png</subitem>
- </subitems>
- <orientation>horizontal</orientation>
- <align>left</align>
- <percentage>#Lastfm.Rating.AlbumTrack3</percentage>
- <visible>no</visible>
- </control>
- <control>
- <description>famous rating1</description>
- <type>imagelist</type>
- <id>87</id>
- <posX>245</posX>
- <posY>144</posY>
- <width>80</width>
- <height>32</height>
- <textureWidth>16</textureWidth>
- <textureHeight>16</textureHeight>
- <subitems>
- <subitem>greystar.png</subitem>
- <subitem>starbest.png</subitem>
- </subitems>
- <orientation>horizontal</orientation>
- <align>left</align>
- <percentage>#Lastfm.Rating.AlbumTrack1</percentage>
- <visible>no</visible>
- </control>
- <control>
- <description>famous rating2</description>
- <type>imagelist</type>
- <id>88</id>
- <posX>245</posX>
- <posY>177</posY>
- <width>80</width>
- <height>32</height>
- <textureWidth>16</textureWidth>
- <textureHeight>16</textureHeight>
- <subitems>
- <subitem>greystar.png</subitem>
- <subitem>starbest.png</subitem>
- </subitems>
- <orientation>horizontal</orientation>
- <align>left</align>
- <percentage>#Lastfm.Rating.AlbumTrack2</percentage>
- <visible>no</visible>
- </control>
- <control>
- <description>famous rating3</description>
- <type>imagelist</type>
- <id>89</id>
- <posX>245</posX>
- <posY>211</posY>
- <width>80</width>
- <height>32</height>
- <textureWidth>16</textureWidth>
- <textureHeight>16</textureHeight>
- <subitems>
- <subitem>greystar.png</subitem>
- <subitem>starbest.png</subitem>
- </subitems>
- <orientation>horizontal</orientation>
- <align>left</align>
- <percentage>#Lastfm.Rating.AlbumTrack3</percentage>
- <visible>no</visible>
- </control>
- <control>
- <type>imagelist</type>
- <id>1337</id>
- <posX>310</posX>
- <posY>515</posY>
- <width>100</width>
- <height>30</height>
- <textureWidth>20</textureWidth>
- <textureHeight>20</textureHeight>
- <subitems>
- <subitem>greystar.png</subitem>
- <subitem>star.png</subitem>
- </subitems>
- <orientation>horizontal</orientation>
- <align>right</align>
- <percentage>#Play.Current.Rating</percentage>
- </control>
- <control>
- <type>fadelabel</type>
- <description>best album tracks label</description>
- <id>29</id>
- <posX>42</posX>
- <posY>114</posY>
- <width>280</width>
- <label>33030</label>
- <!-- <textcolor>80ffffff</textcolor> -->
- </control>
- <control>
- <type>fadelabel</type>
- <description>best tag tracks label</description>
- <id>28</id>
- <posX>42</posX>
- <posY>266</posY>
- <width>280</width>
- <label>Top tracks for tag</label>
- <!-- <textcolor>80ffffff</textcolor> -->
- </control>
- </controls>
+ <id>510</id>
+ <defaultcontrol>33</defaultcontrol>
+ <allowoverlay>no</allowoverlay>
+ <controls>
+ <control>
+ <type>image</type>
+ <description>background image</description>
+ <id>0</id>
+ </control>
+ <control>
+ <type>image</type>
+ <description>menu background image</description>
+ <id>0</id>
+ <posX>31</posX>
+ <posY>425</posY>
+ <width>670</width>
+ <height>142</height>
+ <texture>osd_bg.png</texture>
+ <animation effect="fade" time="150">WindowOpen</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <description>background hover image</description>
+ <id>0</id>
+ <posX>40</posX>
+ <posY>443</posY>
+ <width>90</width>
+ <height>126</height>
+ <texture>music.png</texture>
+ <animation effect="fade" time="150">WindowOpen</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <description>title image</description>
+ <id>0</id>
+ <posX>60</posX>
+ <posY>20</posY>
+ <texture flipY="true" diffuse="Thumb_Mask.png">music_logo.png</texture>
+ <animation effect="fade" time="150">WindowOpen</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <description>nowplaying background</description>
+ <id>0</id>
+ <posX>389</posX>
+ <posY>58</posY>
+ <width>307</width>
+ <height>358</height>
+ <texture>nowplaying_background.png</texture>
+ <animation effect="fade" time="150">WindowOpen</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <description>album art image</description>
+ <id>112</id>
+ <posX>415</posX>
+ <posY>110</posY>
+ <width>250</width>
+ <height>250</height>
+ <texture>-</texture>
+ <centered>yes</centered>
+ <zoom>yes</zoom>
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <description>track label</description>
+ <id>0</id>
+ <posX>138</posX>
+ <posY>452</posY>
+ <width>320</width>
+ <height>20</height>
+ <label>#Play.Current.Title</label>
+ <font>font18</font>
+ <animation effect="fade" time="150">WindowOpen</animation>
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <description>track label</description>
+ <id>0</id>
+ <posX>138</posX>
+ <posY>484</posY>
+ <width>288</width>
+ <height>20</height>
+ <label>#Play.Current.Artist</label>
+ <font>font16</font>
+ <animation effect="fade" time="150">WindowOpen</animation>
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <description>track label</description>
+ <id>0</id>
+ <posX>138</posX>
+ <posY>512</posY>
+ <width>288</width>
+ <height>20</height>
+ <label>#Play.Current.Track</label>
+ <font>font16</font>
+ <animation effect="fade" time="150">WindowOpen</animation>
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <description>year label</description>
+ <id>0</id>
+ <posX>676</posX>
+ <posY>79</posY>
+ <width>90</width>
+ <label>#Play.Current.Year</label>
+ <font>font14</font>
+ <align>right</align>
+ <!-- <textcolor>white</textcolor> -->
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <description>album label</description>
+ <id>0</id>
+ <posX>404</posX>
+ <posY>79</posY>
+ <width>180</width>
+ <label>#Play.Current.Album</label>
+ <font>font14</font>
+ <align>left</align>
+ <!-- <textcolor>white</textcolor> -->
+ <animation effect="fade" time="150">WindowOpen</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <id>117</id>
+ <posX>450</posX>
+ <posY>373</posY>
+ <width>180</width>
+ <texture>osd_progress_background.png</texture>
+ <animation effect="fade" time="150">WindowOpen</animation>
+ </control>
+ <control>
+ <type>progress</type>
+ <description>track progress</description>
+ <id>118</id>
+ <posX>438</posX>
+ <posY>373</posY>
+ <width>204</width>
+ </control>
+ <control>
+ <type>label</type>
+ <description>track progress label</description>
+ <id>0</id>
+ <posX>404</posX>
+ <posY>373</posY>
+ <label>#currentplaytime</label>
+ <font>font14</font>
+ <align>left</align>
+ <textcolor>80ffffff</textcolor>
+ <animation effect="fade" time="150">WindowOpen</animation>
+ </control>
+ <control>
+ <type>label</type>
+ <description>track duration label</description>
+ <id>0</id>
+ <posX>675</posX>
+ <posY>373</posY>
+ <label>#duration</label>
+ <font>font14</font>
+ <align>right</align>
+ <textcolor>80ffffff</textcolor>
+ </control>
+ <control>
+ <type>label</type>
+ <description>up next label</description>
+ <id>20</id>
+ <posX>664</posX>
+ <posY>457</posY>
+ <label>4541</label>
+ <font>font14</font>
+ <align>right</align>
+ <textcolor>80ffffff</textcolor>
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <description>next track label</description>
+ <id>121</id>
+ <posX>663</posX>
+ <posY>513</posY>
+ <width>300</width>
+ <label>#Play.Next.Title</label>
+ <align>right</align>
+ <textcolor>80ffffff</textcolor>
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <description>next artist label</description>
+ <id>123</id>
+ <posX>662</posX>
+ <posY>489</posY>
+ <width>300</width>
+ <label>#Play.Next.Artist</label>
+ <align>right</align>
+ <textcolor>80ffffff</textcolor>
+ </control>
+ <control>
+ <type>listcontrol</type>
+ <description>list of best album tracks</description>
+ <id>166</id>
+ <onright>155</onright>
+ <ondown>155</ondown>
+ <posX>24</posX>
+ <posY>136</posY>
+ <width>220</width>
+ <height>135</height>
+ <textXOff>4</textXOff>
+ <IconXOff>1</IconXOff>
+ <spinColor>-</spinColor>
+ <image>-</image>
+ <textureUp>-</textureUp>
+ <textureDown>-</textureDown>
+ <textureUpFocus>-</textureUpFocus>
+ <textureDownFocus>-</textureDownFocus>
+ <textureFocus>list_sub_focus_arrow_small.png</textureFocus>
+ <textureNoFocus>-</textureNoFocus>
+ </control>
+ <control>
+ <type>listcontrol</type>
+ <description>list of best tag tracks</description>
+ <id>155</id>
+ <onup>166</onup>
+ <onleft>166</onleft>
+ <posX>24</posX>
+ <posY>288</posY>
+ <width>300</width>
+ <height>135</height>
+ <textXOff>4</textXOff>
+ <IconXOff>1</IconXOff>
+ <spinColor>-</spinColor>
+ <image>-</image>
+ <textureUp>-</textureUp>
+ <textureNoFocus>-</textureNoFocus>
+ <textureDown>-</textureDown>
+ <textureUpFocus>-</textureUpFocus>
+ <textureDownFocus>-</textureDownFocus>
+ <textureFocus>list_sub_focus_arrow.png</textureFocus>
+ <textcolor>White</textcolor>
+ </control>
+ <control>
+ <description>unknown rating1</description>
+ <type>imagelist</type>
+ <id>77</id>
+ <posX>245</posX>
+ <posY>144</posY>
+ <width>80</width>
+ <height>32</height>
+ <textureWidth>16</textureWidth>
+ <textureHeight>16</textureHeight>
+ <subitems>
+ <subitem>greystar.png</subitem>
+ <subitem>starbad.png</subitem>
+ </subitems>
+ <orientation>horizontal</orientation>
+ <align>left</align>
+ <imagesToDraw>5</imagesToDraw>
+ <percentage>#Lastfm.Rating.AlbumTrack1</percentage>
+ <visible>no</visible>
+ </control>
+ <control>
+ <description>unknown rating2</description>
+ <type>imagelist</type>
+ <id>78</id>
+ <posX>245</posX>
+ <posY>177</posY>
+ <width>80</width>
+ <height>32</height>
+ <textureWidth>16</textureWidth>
+ <textureHeight>16</textureHeight>
+ <subitems>
+ <subitem>greystar.png</subitem>
+ <subitem>starbad.png</subitem>
+ </subitems>
+ <orientation>horizontal</orientation>
+ <align>left</align>
+ <imagesToDraw>5</imagesToDraw>
+ <percentage>#Lastfm.Rating.AlbumTrack2</percentage>
+ <visible>no</visible>
+ </control>
+ <control>
+ <description>unknown rating3</description>
+ <type>imagelist</type>
+ <id>79</id>
+ <posX>245</posX>
+ <posY>211</posY>
+ <width>80</width>
+ <height>32</height>
+ <textureWidth>16</textureWidth>
+ <textureHeight>16</textureHeight>
+ <subitems>
+ <subitem>greystar.png</subitem>
+ <subitem>starbad.png</subitem>
+ </subitems>
+ <orientation>horizontal</orientation>
+ <align>left</align>
+ <imagesToDraw>5</imagesToDraw>
+ <percentage>#Lastfm.Rating.AlbumTrack3</percentage>
+ <visible>no</visible>
+ </control>
+ <control>
+ <description>existent rating1</description>
+ <type>imagelist</type>
+ <id>80</id>
+ <posX>245</posX>
+ <posY>144</posY>
+ <width>80</width>
+ <height>32</height>
+ <textureWidth>16</textureWidth>
+ <textureHeight>16</textureHeight>
+ <subitems>
+ <subitem>greystar.png</subitem>
+ <subitem>stargood.png</subitem>
+ </subitems>
+ <orientation>horizontal</orientation>
+ <align>left</align>
+ <imagesToDraw>5</imagesToDraw>
+ <percentage>#Lastfm.Rating.AlbumTrack1</percentage>
+ <visible>no</visible>
+ </control>
+ <control>
+ <description>existent rating2</description>
+ <type>imagelist</type>
+ <id>81</id>
+ <posX>245</posX>
+ <posY>177</posY>
+ <width>80</width>
+ <height>32</height>
+ <textureWidth>16</textureWidth>
+ <textureHeight>16</textureHeight>
+ <subitems>
+ <subitem>greystar.png</subitem>
+ <subitem>stargood.png</subitem>
+ </subitems>
+ <orientation>horizontal</orientation>
+ <align>left</align>
+ <imagesToDraw>5</imagesToDraw>
+ <percentage>#Lastfm.Rating.AlbumTrack2</percentage>
+ <visible>no</visible>
+ </control>
+ <control>
+ <description>existent rating3</description>
+ <type>imagelist</type>
+ <id>82</id>
+ <posX>245</posX>
+ <posY>211</posY>
+ <width>80</width>
+ <height>32</height>
+ <textureWidth>16</textureWidth>
+ <textureHeight>16</textureHeight>
+ <subitems>
+ <subitem>greystar.png</subitem>
+ <subitem>stargood.png</subitem>
+ </subitems>
+ <orientation>horizontal</orientation>
+ <align>left</align>
+ <imagesToDraw>5</imagesToDraw>
+ <percentage>#Lastfm.Rating.AlbumTrack3</percentage>
+ <visible>no</visible>
+ </control>
+ <control>
+ <description>known rating1</description>
+ <type>imagelist</type>
+ <id>83</id>
+ <posX>245</posX>
+ <posY>144</posY>
+ <width>80</width>
+ <height>32</height>
+ <textureWidth>16</textureWidth>
+ <textureHeight>16</textureHeight>
+ <subitems>
+ <subitem>greystar.png</subitem>
+ <subitem>starbetter.png</subitem>
+ </subitems>
+ <orientation>horizontal</orientation>
+ <align>left</align>
+ <imagesToDraw>5</imagesToDraw>
+ <percentage>#Lastfm.Rating.AlbumTrack1</percentage>
+ <visible>no</visible>
+ </control>
+ <control>
+ <description>known rating2</description>
+ <type>imagelist</type>
+ <id>84</id>
+ <posX>245</posX>
+ <posY>177</posY>
+ <width>80</width>
+ <height>32</height>
+ <textureWidth>16</textureWidth>
+ <textureHeight>16</textureHeight>
+ <subitems>
+ <subitem>greystar.png</subitem>
+ <subitem>starbetter.png</subitem>
+ </subitems>
+ <orientation>horizontal</orientation>
+ <align>left</align>
+ <imagesToDraw>5</imagesToDraw>
+ <percentage>#Lastfm.Rating.AlbumTrack2</percentage>
+ <visible>no</visible>
+ </control>
+ <control>
+ <description>known rating3</description>
+ <type>imagelist</type>
+ <id>85</id>
+ <posX>245</posX>
+ <posY>211</posY>
+ <width>80</width>
+ <height>32</height>
+ <textureWidth>16</textureWidth>
+ <textureHeight>16</textureHeight>
+ <subitems>
+ <subitem>greystar.png</subitem>
+ <subitem>starbetter.png</subitem>
+ </subitems>
+ <orientation>horizontal</orientation>
+ <align>left</align>
+ <imagesToDraw>5</imagesToDraw>
+ <percentage>#Lastfm.Rating.AlbumTrack3</percentage>
+ <visible>no</visible>
+ </control>
+ <control>
+ <description>famous rating1</description>
+ <type>imagelist</type>
+ <id>87</id>
+ <posX>245</posX>
+ <posY>144</posY>
+ <width>80</width>
+ <height>32</height>
+ <textureWidth>16</textureWidth>
+ <textureHeight>16</textureHeight>
+ <subitems>
+ <subitem>greystar.png</subitem>
+ <subitem>starbest.png</subitem>
+ </subitems>
+ <orientation>horizontal</orientation>
+ <align>left</align>
+ <imagesToDraw>5</imagesToDraw>
+ <percentage>#Lastfm.Rating.AlbumTrack1</percentage>
+ <visible>no</visible>
+ </control>
+ <control>
+ <description>famous rating2</description>
+ <type>imagelist</type>
+ <id>88</id>
+ <posX>245</posX>
+ <posY>177</posY>
+ <width>80</width>
+ <height>32</height>
+ <textureWidth>16</textureWidth>
+ <textureHeight>16</textureHeight>
+ <subitems>
+ <subitem>greystar.png</subitem>
+ <subitem>starbest.png</subitem>
+ </subitems>
+ <orientation>horizontal</orientation>
+ <align>left</align>
+ <imagesToDraw>5</imagesToDraw>
+ <percentage>#Lastfm.Rating.AlbumTrack2</percentage>
+ <visible>no</visible>
+ </control>
+ <control>
+ <description>famous rating3</description>
+ <type>imagelist</type>
+ <id>89</id>
+ <posX>245</posX>
+ <posY>211</posY>
+ <width>80</width>
+ <height>32</height>
+ <textureWidth>16</textureWidth>
+ <textureHeight>16</textureHeight>
+ <subitems>
+ <subitem>greystar.png</subitem>
+ <subitem>starbest.png</subitem>
+ </subitems>
+ <orientation>horizontal</orientation>
+ <align>left</align>
+ <imagesToDraw>5</imagesToDraw>
+ <percentage>#Lastfm.Rating.AlbumTrack3</percentage>
+ <visible>no</visible>
+ </control>
+ <control>
+ <type>imagelist</type>
+ <id>1337</id>
+ <posX>310</posX>
+ <posY>515</posY>
+ <width>100</width>
+ <height>30</height>
+ <textureWidth>20</textureWidth>
+ <textureHeight>20</textureHeight>
+ <subitems>
+ <subitem>greystar.png</subitem>
+ <subitem>star.png</subitem>
+ </subitems>
+ <orientation>horizontal</orientation>
+ <align>right</align>
+ <imagesToDraw>5</imagesToDraw>
+ <percentage>#Play.Current.Rating</percentage>
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <description>best album tracks label</description>
+ <id>29</id>
+ <posX>42</posX>
+ <posY>114</posY>
+ <width>280</width>
+ <label>33030</label>
+ <!-- <textcolor>80ffffff</textcolor> -->
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <description>best tag tracks label</description>
+ <id>28</id>
+ <posX>42</posX>
+ <posY>266</posY>
+ <width>280</width>
+ <label>Top tracks for tag</label>
+ <!-- <textcolor>80ffffff</textcolor> -->
+ </control>
+ </controls>
</window>
\ No newline at end of file
Modified: trunk/skins/BlueTwoBig/Development Version/myvideoTitle.xml
===================================================================
--- trunk/skins/BlueTwoBig/Development Version/myvideoTitle.xml 2007-10-13 22:44:58 UTC (rev 998)
+++ trunk/skins/BlueTwoBig/Development Version/myvideoTitle.xml 2007-10-15 05:47:44 UTC (rev 999)
@@ -25,6 +25,7 @@
</subitems>
<orientation>horizontal</orientation>
<align>right</align>
+ <imagesToDraw>10</imagesToDraw>
<percentage>#rating</percentage>
</control>
<control>
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.
