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: <fer...@us...> - 2007-11-18 03:24:31
|
Revision: 1073
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1073&view=rev
Author: fergusod
Date: 2007-11-17 19:24:29 -0800 (Sat, 17 Nov 2007)
Log Message:
-----------
Added Paths:
-----------
trunk/plugins/Netflix manager/GUIConfiguration.Designer.cs
trunk/plugins/Netflix manager/GUIConfiguration.cs
trunk/plugins/Netflix manager/GUIConfiguration.resx
trunk/plugins/Netflix manager/MovieDetails.cs
trunk/plugins/Netflix manager/NetflixManager.csproj
trunk/plugins/Netflix manager/NetflixManager.csproj.user
trunk/plugins/Netflix manager/NetflixManager.sln
trunk/plugins/Netflix manager/NetflixManager.suo
trunk/plugins/Netflix manager/Netflixmanager.cs
trunk/plugins/Netflix manager/Properties/
trunk/plugins/Netflix manager/Properties/AssemblyInfo.cs
trunk/plugins/Netflix manager/StringEx.cs
trunk/plugins/Netflix manager/config.Designer.cs
trunk/plugins/Netflix manager/config.cs
trunk/plugins/Netflix manager/config.resx
Added: trunk/plugins/Netflix manager/GUIConfiguration.Designer.cs
===================================================================
--- trunk/plugins/Netflix manager/GUIConfiguration.Designer.cs (rev 0)
+++ trunk/plugins/Netflix manager/GUIConfiguration.Designer.cs 2007-11-18 03:24:29 UTC (rev 1073)
@@ -0,0 +1,243 @@
+namespace MediaPortal.GUI.Video
+{
+ partial class GUIConfiguration
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.btnOK = new System.Windows.Forms.Button();
+ this.label1 = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
+ this.shopperID = new System.Windows.Forms.TextBox();
+ this.cookieID = new System.Windows.Forms.TextBox();
+ this.btnRemoveFeed = new System.Windows.Forms.Button();
+ this.txtAddURL = new System.Windows.Forms.TextBox();
+ this.txtAddName = new System.Windows.Forms.TextBox();
+ this.btnAddFeed = new System.Windows.Forms.Button();
+ this.btnCancel = new System.Windows.Forms.Button();
+ this.listRSSFeeds = new System.Windows.Forms.ListView();
+ this.columnHeader1 = new System.Windows.Forms.ColumnHeader();
+ this.columnHeader2 = new System.Windows.Forms.ColumnHeader();
+ this.label3 = new System.Windows.Forms.Label();
+ this.linkLabel1 = new System.Windows.Forms.LinkLabel();
+ this.label5 = new System.Windows.Forms.Label();
+ this.label6 = new System.Windows.Forms.Label();
+ this.SuspendLayout();
+ //
+ // btnOK
+ //
+ this.btnOK.Location = new System.Drawing.Point(227, 324);
+ this.btnOK.Name = "btnOK";
+ this.btnOK.Size = new System.Drawing.Size(75, 23);
+ this.btnOK.TabIndex = 0;
+ this.btnOK.Text = "OK";
+ this.btnOK.UseVisualStyleBackColor = true;
+ this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(12, 19);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(61, 13);
+ this.label1.TabIndex = 1;
+ this.label1.Text = "Shopper ID";
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(329, 19);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(54, 13);
+ this.label2.TabIndex = 2;
+ this.label2.Text = "Cookie ID";
+ //
+ // shopperID
+ //
+ this.shopperID.Location = new System.Drawing.Point(15, 55);
+ this.shopperID.Name = "shopperID";
+ this.shopperID.Size = new System.Drawing.Size(256, 20);
+ this.shopperID.TabIndex = 3;
+ //
+ // cookieID
+ //
+ this.cookieID.Location = new System.Drawing.Point(332, 55);
+ this.cookieID.Name = "cookieID";
+ this.cookieID.Size = new System.Drawing.Size(256, 20);
+ this.cookieID.TabIndex = 4;
+ //
+ // btnRemoveFeed
+ //
+ this.btnRemoveFeed.Location = new System.Drawing.Point(513, 248);
+ this.btnRemoveFeed.Name = "btnRemoveFeed";
+ this.btnRemoveFeed.Size = new System.Drawing.Size(75, 23);
+ this.btnRemoveFeed.TabIndex = 19;
+ this.btnRemoveFeed.Text = "Remove";
+ this.btnRemoveFeed.UseVisualStyleBackColor = true;
+ //
+ // txtAddURL
+ //
+ this.txtAddURL.Location = new System.Drawing.Point(163, 280);
+ this.txtAddURL.Name = "txtAddURL";
+ this.txtAddURL.Size = new System.Drawing.Size(344, 20);
+ this.txtAddURL.TabIndex = 18;
+ //
+ // txtAddName
+ //
+ this.txtAddName.Location = new System.Drawing.Point(15, 280);
+ this.txtAddName.Name = "txtAddName";
+ this.txtAddName.Size = new System.Drawing.Size(142, 20);
+ this.txtAddName.TabIndex = 17;
+ //
+ // btnAddFeed
+ //
+ this.btnAddFeed.Location = new System.Drawing.Point(513, 277);
+ this.btnAddFeed.Name = "btnAddFeed";
+ this.btnAddFeed.Size = new System.Drawing.Size(75, 23);
+ this.btnAddFeed.TabIndex = 16;
+ this.btnAddFeed.Text = "Add";
+ this.btnAddFeed.UseVisualStyleBackColor = true;
+ this.btnAddFeed.Click += new System.EventHandler(this.btnAddFeed_Click);
+ //
+ // btnCancel
+ //
+ this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ this.btnCancel.Location = new System.Drawing.Point(308, 324);
+ this.btnCancel.Name = "btnCancel";
+ this.btnCancel.Size = new System.Drawing.Size(75, 23);
+ this.btnCancel.TabIndex = 15;
+ this.btnCancel.Text = "Cancel";
+ this.btnCancel.UseVisualStyleBackColor = true;
+ this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+ //
+ // listRSSFeeds
+ //
+ this.listRSSFeeds.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+ this.columnHeader1,
+ this.columnHeader2});
+ this.listRSSFeeds.Location = new System.Drawing.Point(15, 111);
+ this.listRSSFeeds.MultiSelect = false;
+ this.listRSSFeeds.Name = "listRSSFeeds";
+ this.listRSSFeeds.Size = new System.Drawing.Size(492, 160);
+ this.listRSSFeeds.TabIndex = 20;
+ this.listRSSFeeds.UseCompatibleStateImageBehavior = false;
+ this.listRSSFeeds.View = System.Windows.Forms.View.Details;
+ //
+ // columnHeader1
+ //
+ this.columnHeader1.Text = "Name";
+ this.columnHeader1.Width = 145;
+ //
+ // columnHeader2
+ //
+ this.columnHeader2.Text = "Feed URL";
+ this.columnHeader2.Width = 306;
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(12, 90);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(71, 13);
+ this.label3.TabIndex = 21;
+ this.label3.Text = "Public Feeds:";
+ //
+ // linkLabel1
+ //
+ this.linkLabel1.AutoSize = true;
+ this.linkLabel1.Location = new System.Drawing.Point(86, 89);
+ this.linkLabel1.Name = "linkLabel1";
+ this.linkLabel1.Size = new System.Drawing.Size(171, 13);
+ this.linkLabel1.TabIndex = 22;
+ this.linkLabel1.TabStop = true;
+ this.linkLabel1.Text = "http://www.netflix.com/RSSFeeds";
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.Location = new System.Drawing.Point(12, 36);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(294, 13);
+ this.label5.TabIndex = 24;
+ this.label5.Text = "(found at http://www.netflix.com/RSSFeeds when logged in)";
+ //
+ // label6
+ //
+ this.label6.AutoSize = true;
+ this.label6.Location = new System.Drawing.Point(329, 36);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(183, 13);
+ this.label6.TabIndex = 25;
+ this.label6.Text = "(found in cookie as NetflixShopperID)";
+ //
+ // GUIConfiguration
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(611, 369);
+ this.Controls.Add(this.label6);
+ this.Controls.Add(this.label5);
+ this.Controls.Add(this.linkLabel1);
+ this.Controls.Add(this.label3);
+ this.Controls.Add(this.listRSSFeeds);
+ this.Controls.Add(this.btnRemoveFeed);
+ this.Controls.Add(this.txtAddURL);
+ this.Controls.Add(this.txtAddName);
+ this.Controls.Add(this.btnAddFeed);
+ this.Controls.Add(this.btnCancel);
+ this.Controls.Add(this.cookieID);
+ this.Controls.Add(this.shopperID);
+ this.Controls.Add(this.label2);
+ this.Controls.Add(this.label1);
+ this.Controls.Add(this.btnOK);
+ this.Name = "GUIConfiguration";
+ this.Text = "GUIConfiguration";
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Button btnOK;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.TextBox shopperID;
+ private System.Windows.Forms.TextBox cookieID;
+ private System.Windows.Forms.Button btnRemoveFeed;
+ private System.Windows.Forms.TextBox txtAddURL;
+ private System.Windows.Forms.TextBox txtAddName;
+ private System.Windows.Forms.Button btnAddFeed;
+ private System.Windows.Forms.Button btnCancel;
+ private System.Windows.Forms.ListView listRSSFeeds;
+ private System.Windows.Forms.ColumnHeader columnHeader1;
+ private System.Windows.Forms.ColumnHeader columnHeader2;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.LinkLabel linkLabel1;
+ private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.Label label6;
+ }
+}
\ No newline at end of file
Added: trunk/plugins/Netflix manager/GUIConfiguration.cs
===================================================================
--- trunk/plugins/Netflix manager/GUIConfiguration.cs (rev 0)
+++ trunk/plugins/Netflix manager/GUIConfiguration.cs 2007-11-18 03:24:29 UTC (rev 1073)
@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace MediaPortal.GUI.Video
+{
+ public partial class GUIConfiguration : Form
+ {
+ public GUIConfiguration()
+ {
+ InitializeComponent();
+
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MediaPortal.xml"))
+ {
+ shopperID.Text = xmlreader.GetValueAsString("netflixManager", "shopperid", "");
+ cookieID.Text = xmlreader.GetValueAsString("netflixManager", "cookieid", "");
+
+
+ int numFeeds = xmlreader.GetValueAsInt("netflixManager", "numFeeds", 0);
+ String[] temp1 = new String[numFeeds];
+ String[] temp2 = new String[numFeeds];
+
+
+
+ for (int i = 0; i < numFeeds; i++)
+ {
+ temp1[i] = xmlreader.GetValueAsString("netflixManager", "name" + i, "");
+ temp2[i] = xmlreader.GetValueAsString("netflixManager", "feed" + i, "");
+
+ ListViewItem item = new ListViewItem(temp1[i]);
+ item.SubItems.Add(temp2[i]);
+ listRSSFeeds.Items.Add(item);
+ }
+
+
+ }
+ }
+
+ private void btnOK_Click(object sender, EventArgs e)
+ {
+ saveChanges();
+ this.Close();
+ }
+
+ private void btnCancel_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
+
+ private void btnAddFeed_Click(object sender, EventArgs e)
+ {
+ ListViewItem item = new ListViewItem(txtAddName.Text);
+ item.SubItems.Add(txtAddURL.Text);
+ listRSSFeeds.Items.Add(item);
+ txtAddName.Clear();
+ txtAddURL.Clear();
+ }
+
+ private bool saveChanges()
+ {
+
+ using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings("MediaPortal.xml"))
+ {
+ //MessageBox.Show(shopperID.Text);
+ xmlwriter.SetValue("netflixManager", "shopperid", shopperID.Text);
+ xmlwriter.SetValue("netflixManager", "cookieid", cookieID.Text);
+
+ for (int index = 0; index < listRSSFeeds.Items.Count; index++)
+ {
+ xmlwriter.SetValue("netflixManager", "name" + index, listRSSFeeds.Items[index].Text.Trim());
+ xmlwriter.SetValue("netflixManager", "feed" + index, listRSSFeeds.Items[index].SubItems[1].Text.Trim());
+ xmlwriter.SetValue("netflixManager", "numFeeds", index + 1);
+ }
+ }
+ return true;
+ }
+
+
+ }
+}
\ No newline at end of file
Added: trunk/plugins/Netflix manager/GUIConfiguration.resx
===================================================================
--- trunk/plugins/Netflix manager/GUIConfiguration.resx (rev 0)
+++ trunk/plugins/Netflix manager/GUIConfiguration.resx 2007-11-18 03:24:29 UTC (rev 1073)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
Added: trunk/plugins/Netflix manager/MovieDetails.cs
===================================================================
--- trunk/plugins/Netflix manager/MovieDetails.cs (rev 0)
+++ trunk/plugins/Netflix manager/MovieDetails.cs 2007-11-18 03:24:29 UTC (rev 1073)
@@ -0,0 +1,126 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace MediaPortal.GUI.Video
+{
+ public class MovieDetails
+ {
+ protected String m_NetflixID = String.Empty;
+ protected String m_Title = String.Empty;
+ protected String m_MPAA = String.Empty;
+ protected String m_Star = String.Empty;
+ protected String m_Description = String.Empty;
+ protected String m_Trailer = String.Empty;
+ protected bool m_inQueue = false;
+ protected bool m_PlayNow = false;
+ protected bool m_fullinfo = false;
+
+ public bool FullInfo
+ {
+ get
+ {
+ return this.m_fullinfo;
+ }
+
+ set
+ {
+ this.m_fullinfo = value;
+ }
+ }
+ public String NetflixID
+ {
+ get
+ {
+ return this.m_NetflixID;
+ }
+ set
+ {
+ this.m_NetflixID = value;
+ }
+ }
+ public String Title
+ {
+ get
+ {
+ return this.m_Title;
+ }
+ set
+ {
+ this.m_Title = value;
+ }
+ }
+ public String MPAA
+ {
+ get
+ {
+ return this.m_MPAA;
+ }
+ set
+ {
+ this.m_MPAA = value;
+ }
+ }
+ public String Star
+ {
+ get
+ {
+ return this.m_Star;
+ }
+ set
+ {
+ this.m_Star = value;
+ }
+ }
+ public String Description
+ {
+ get
+ {
+ return this.m_Description;
+ }
+ set
+ {
+ this.m_Description = value;
+ }
+ }
+ public String Trailer
+ {
+ get
+ {
+ return this.m_Trailer;
+ }
+ set
+ {
+ if (value == null)
+ this.m_Trailer = String.Empty;
+ else
+ this.m_Trailer = value;
+ }
+ }
+ public bool inQueue
+ {
+ get
+ {
+ return this.m_inQueue;
+ }
+ set
+ {
+
+ this.m_inQueue = value;
+ }
+ }
+ public bool PlayNow
+ {
+ get
+ {
+ return this.m_PlayNow;
+ }
+ set
+ {
+
+ this.m_PlayNow = value;
+ }
+ }
+
+ }
+}
Added: trunk/plugins/Netflix manager/NetflixManager.csproj
===================================================================
--- trunk/plugins/Netflix manager/NetflixManager.csproj (rev 0)
+++ trunk/plugins/Netflix manager/NetflixManager.csproj 2007-11-18 03:24:29 UTC (rev 1073)
@@ -0,0 +1,93 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>8.0.50727</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{CAE36F7F-CAE5-4A62-A5DB-075523086E08}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>ClassLibrary1</RootNamespace>
+ <AssemblyName>NetflixManager</AssemblyName>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>obj\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="Core, Version=1.0.2485.22312, Culture=neutral, processorArchitecture=x86">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\Program Files\Team MediaPortal\MediaPortal\Core.DLL</HintPath>
+ </Reference>
+ <Reference Include="Databases, Version=1.0.2485.22313, Culture=neutral, processorArchitecture=x86">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\Program Files\Team MediaPortal\MediaPortal\Databases.DLL</HintPath>
+ </Reference>
+ <Reference Include="Dialogs, Version=0.0.0.0, Culture=neutral, processorArchitecture=x86">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\Program Files\Team MediaPortal\MediaPortal\Plugins\Windows\Dialogs.DLL</HintPath>
+ </Reference>
+ <Reference Include="System">
+ <HintPath>..\..\WINDOWS\Microsoft.NET\Framework\v2.0.50727\System.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Data">
+ <HintPath>..\..\WINDOWS\Microsoft.NET\Framework\v2.0.50727\System.Data.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Drawing">
+ <HintPath>..\..\WINDOWS\Microsoft.NET\Framework\v2.0.50727\System.Drawing.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Windows.Forms">
+ <HintPath>..\..\WINDOWS\Microsoft.NET\Framework\v2.0.50727\System.Windows.Forms.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Xml">
+ <HintPath>..\..\WINDOWS\Microsoft.NET\Framework\v2.0.50727\System.XML.dll</HintPath>
+ </Reference>
+ <Reference Include="Utils, Version=0.2.2.9991, Culture=neutral, processorArchitecture=x86">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\Program Files\Team MediaPortal\MediaPortal\Utils.DLL</HintPath>
+ </Reference>
+ <Reference Include="WindowPlugins, Version=1.0.2511.1822, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\Program Files\Team MediaPortal\MediaPortal\Plugins\Windows\WindowPlugins.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="Netflixmanager.cs" />
+ <Compile Include="GUIConfiguration.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="GUIConfiguration.Designer.cs">
+ <DependentUpon>GUIConfiguration.cs</DependentUpon>
+ </Compile>
+ <Compile Include="MovieDetails.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="StringEx.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="GUIConfiguration.resx">
+ <SubType>Designer</SubType>
+ <DependentUpon>GUIConfiguration.cs</DependentUpon>
+ </EmbeddedResource>
+ </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.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
\ No newline at end of file
Added: trunk/plugins/Netflix manager/NetflixManager.csproj.user
===================================================================
--- trunk/plugins/Netflix manager/NetflixManager.csproj.user (rev 0)
+++ trunk/plugins/Netflix manager/NetflixManager.csproj.user 2007-11-18 03:24:29 UTC (rev 1073)
@@ -0,0 +1,6 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <StartAction>Project</StartAction>
+ <StartProgram>C:\Program Files\Team MediaPortal\MediaPortal\MediaPortal.exe</StartProgram>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
Added: trunk/plugins/Netflix manager/NetflixManager.sln
===================================================================
--- trunk/plugins/Netflix manager/NetflixManager.sln (rev 0)
+++ trunk/plugins/Netflix manager/NetflixManager.sln 2007-11-18 03:24:29 UTC (rev 1073)
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetflixManager", "NetflixManager.csproj", "{CAE36F7F-CAE5-4A62-A5DB-075523086E08}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {CAE36F7F-CAE5-4A62-A5DB-075523086E08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {CAE36F7F-CAE5-4A62-A5DB-075523086E08}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {CAE36F7F-CAE5-4A62-A5DB-075523086E08}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {CAE36F7F-CAE5-4A62-A5DB-075523086E08}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Added: trunk/plugins/Netflix manager/NetflixManager.suo
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/Netflix manager/NetflixManager.suo
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/Netflix manager/Netflixmanager.cs
===================================================================
--- trunk/plugins/Netflix manager/Netflixmanager.cs (rev 0)
+++ trunk/plugins/Netflix manager/Netflixmanager.cs 2007-11-18 03:24:29 UTC (rev 1073)
@@ -0,0 +1,1457 @@
+using System;
+using System.Diagnostics;
+using System.Windows.Forms;
+using MediaPortal.GUI.Library;
+using MediaPortal.Dialogs;
+using MediaPortal.Player;
+using System.Text.RegularExpressions;
+using System.Text;
+using MediaPortal.GUI.Video;
+using System.IO;
+using System.Net;
+using System.Collections.Generic;
+using System.Xml;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Threading;
+
+
+namespace NetflixManagerPlugin
+{
+
+ /// <summary>
+ /// NetflixManager plugin for MediaPortal
+ /// Originally developed by Brian Woodworth (Hobbes487) 2/2007
+ /// Updated by nerd1701 9/2007
+ /// </summary>
+
+ public class NetFlixManager : GUIWindow, ISetupForm
+ {
+ #region declarations
+
+ [DllImport("user32.dll")]
+ static extern int GetForegroundWindow();
+
+ [DllImport("user32.dll")]
+ private static extern void mouse_event(
+ UInt32 dwFlags, // motion and click options
+ UInt32 dx, // horizontal position or change
+ UInt32 dy, // vertical position or change
+ UInt32 dwData, // wheel movement
+ IntPtr dwExtraInfo // application-defined information
+ );
+
+ static Regex movie_url = new Regex("http://www.netflix.com/Movie/[^/]*/(?<movieid>[0-9]*)");
+ static Regex title_search = new Regex("<div[ ]*class=\"title\"[^>]+>(?<movietitle>[^<]*)<");
+ static Regex desc_search = new Regex("<[^<]+class=\"synopsis\"[^>]+>(?<description>[^\t]*)</div>");
+ static Regex url_search = new Regex("<[^>]*>");
+ static Regex parse_award = new Regex("href=\"http://www.netflix.com/Movie/[^/]*/(?<movieid>[0-9]+)[^>]*>(?<title>[^<]+)<");
+ static Regex playnow_search = new Regex("class=\"title\"[ ]*>[ ]*<[^\t]+?movieid=(?<movieid>[0-9]*)[^>]+>(?<title>[^<]*)<");
+
+ // <span class="pgBtn-next pgBtn"><a href="http://www.netflix.com/WatchNowGenre?genreId=307&pg=2">
+ static Regex page_search = new Regex("<span class=\"pgBtn-next pgBtn\"><a href=\"(?<nextpage>[^\"]*)\"");
+ bool playnow_fullscreen = false;
+ bool playnow_active = false;
+ System.Windows.Forms.Timer Clock;
+
+ int xres;
+ int yres;
+ int xfull;
+ int yfull_activate;
+ int yfull_deactivate;
+
+ WebBrowser PlayNowWindow;
+
+ [SkinControlAttribute(2)]
+ protected GUIButtonControl RefreshQueue = null;
+
+ [SkinControlAttribute(3)]
+ protected GUIButtonControl Recommendations = null;
+
+ [SkinControlAttribute(4)]
+ protected GUIButtonControl Browse = null;
+
+ [SkinControlAttribute(8)]
+ protected GUIButtonControl Search = null;
+
+ [SkinControlAttribute(9)]
+ protected GUIButtonControl Awards = null;
+
+ [SkinControlAttribute(10)]
+ protected GUIButtonControl PlayNowQueue = null;
+
+ [SkinControlAttribute(11)]
+ protected GUIButtonControl PlayNowStatus = null;
+
+ [SkinControlAttribute(5)]
+ protected GUIListControl mylistview = null;
+
+ [SkinControlAttribute(7)]
+ protected GUITextScrollUpControl description = null;
+
+ [SkinControlAttribute(6)]
+ protected GUIImage imgCoverArt = null;
+
+ [SkinControlAttribute(99)]
+ protected GUIVideoControl contr = null;
+
+ System.Collections.ArrayList netflixID, title, Movies;//description
+ String shopperID = "";
+ String cookieID = "";
+ int numFeeds;
+ String[] feedName;
+ String[] feedAddress;
+
+ private CookieContainer m_CC = new CookieContainer();
+
+ enum Pages
+ {
+ PAGE_QUEUE = 1,
+ PAGE_RSS = 2
+ }
+ Pages currentPage = Pages.PAGE_QUEUE;
+
+ #endregion
+
+ public NetFlixManager()
+ {
+ netflixID = System.Collections.ArrayList.Synchronized(new System.Collections.ArrayList(10));
+ title = System.Collections.ArrayList.Synchronized(new System.Collections.ArrayList());
+ //description = System.Collections.ArrayList.Synchronized(new System.Collections.ArrayList());
+ Movies = System.Collections.ArrayList.Synchronized(new System.Collections.ArrayList());
+ Movies = System.Collections.ArrayList.Synchronized(new System.Collections.ArrayList());
+ Movies = System.Collections.ArrayList.Synchronized(new System.Collections.ArrayList());
+ }
+
+ #region ISetupForm Members
+
+ // Returns the name of the plugin which is shown in the plugin menu
+ public string PluginName()
+ {
+ return "NetflixManager";
+ }
+
+ // Returns the description of the plugin is shown in the plugin menu
+ public string Description()
+ {
+ return "Manage your Netflix Queue";
+ }
+
+ // Returns the author of the plugin which is shown in the plugin menu
+ public string Author()
+ {
+ return "nerd1701 based on work by hobbes487 (Brian Woodworth)";
+ }
+
+ // show the setup dialog
+ public void ShowPlugin()
+ {
+ GUIConfiguration form = new GUIConfiguration();
+ form.Show();
+ }
+
+ // Indicates whether plugin can be enabled/disabled
+ public bool CanEnable()
+ {
+ return true;
+ }
+
+ // get ID of windowplugin belonging to this setup
+ public int GetWindowId()
+ {
+ return 5623;
+ }
+
+ // Indicates if plugin is enabled by default;
+ public bool DefaultEnabled()
+ {
+ return true;
+ }
+
+ // indicates if a plugin has its own setup screen
+ public bool HasSetup()
+ {
+ return true;
+ }
+
+ /// <GetHome>
+ /// If the plugin should have its own button on the main menu of Mediaportal then it
+ /// should return true to this method, otherwise if it should not be on home
+ /// it should return false
+ /// <param name="strButtonText">text the button should have</param>
+ /// <param name="strButtonImage">image for the button, or empty for default</param>
+ /// <param name="strButtonImageFocus">image for the button, or empty for default</param>
+ /// <param name="strPictureImage">subpicture for the button or empty for none</param>
+ /// <returns>true : plugin needs its own button on home
+ /// false : plugin does not need its own button on home
+ /// </returns>
+ public bool GetHome(out string strButtonText, out string strButtonImage, out string strButtonImageFocus, out string strPictureImage)
+ {
+ strButtonText = PluginName();
+ strButtonImage = String.Empty;
+ strButtonImageFocus = String.Empty;
+ strPictureImage = String.Empty;
+ return true;
+ }
+ #endregion
+
+ #region required functions
+ public override int GetID
+ {
+
+ get
+ {
+
+ return 5623;
+
+ }
+
+ set
+ {
+
+ }
+
+ }
+ public override bool Init()
+ {
+ Clock = new System.Windows.Forms.Timer();
+ Clock.Interval = 2000;
+ Clock.Tick += new EventHandler(Clock_Tick);
+ return Load(GUIGraphicsContext.Skin + @"\NetflixManager.xml");
+
+ }
+ void Clock_Tick(object sender, EventArgs e)
+ {
+ // routine called after delay for "exit full screen to appear"
+ Clock.Stop();
+ mouse_event(0x0002, 0, 0, 0, new System.IntPtr());
+ mouse_event(0x0004, 0, 0, 0, new System.IntPtr());
+ // Cursor.Hide();
+ }
+ protected override void OnPageLoad()
+ {
+ LoadSettings();
+ OnRefreshQueue();
+ GUIControl.FocusControl(GetID, RefreshQueue.GetID);
+ playnow_fullscreen = false;
+ playnow_active = false;
+ xres = GUIGraphicsContext.Width;
+ yres = GUIGraphicsContext.Height;
+ xfull = (int)(xres * 0.683);
+ yfull_activate = (int)(yres * 0.80);
+ yfull_deactivate = (int)(yres * 0.95);
+ }
+ protected virtual void LoadSettings()
+ {
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MediaPortal.xml"))
+ {
+
+
+ shopperID = xmlreader.GetValueAsString("netflixManager", "shopperid", "");
+ cookieID = xmlreader.GetValueAsString("netflixManager", "cookieid", "");
+ numFeeds = xmlreader.GetValueAsInt("netflixManager", "numFeeds", 0);
+ String[] temp1 = new String[numFeeds];
+ String[] temp2 = new String[numFeeds];
+
+
+ for(int i = 0; i < numFeeds; i++)
+ {
+ temp1[i] = xmlreader.GetValueAsString("netflixManager", "name" + i, "");
+ temp2[i] = xmlreader.GetValueAsString("netflixManager", "feed" + i, "");
+ }
+ feedAddress = temp2;
+ feedName = temp1;
+
+ }
+ }
+ override protected void OnPageDestroy(int newWindowId)
+ {
+ PlayNowWindow.Hide();
+ PlayNowWindow.Dispose();
+
+ }
+ protected void pause_playnow()
+ {
+ Cursor.Show();
+ Cursor.Position = new Point(700, 470);
+ mouse_event(0x0002, 0, 0, 0, new System.IntPtr());
+ mouse_event(0x0004, 0, 0, 0, new System.IntPtr());
+ Cursor.Hide();
+ }
+ public override void OnAction(Action action)
+ {
+ // MessageBox.Show(action.wID.ToString());
+ switch (action.wID)
+ {
+ case Action.ActionType.ACTION_PAUSE:
+ if (playnow_active && playnow_fullscreen)
+ {
+ pause_playnow();
+ }
+ break;
+
+ case Action.ActionType.ACTION_PLAY:
+ if (playnow_active && playnow_fullscreen)
+ {
+ pause_playnow();
+ }
+ else
+ {
+ if (mylistview.Focus && playnow_active==false)
+ {
+ MovieDetails movie = (MovieDetails)mylistview.SelectedListItem.TVTag;
+ if (movie.PlayNow == true)
+ {
+ PlayNow(movie.NetflixID);
+ }
+ }
+ }
+ break;
+
+ case Action.ActionType.ACTION_STOP:
+ if (playnow_active)
+ {
+ PlayNowWindow.Dispose();
+ playnow_fullscreen = false;
+ playnow_active = false;
+ }
+ break;
+ // Context menu will make it go full screen / exit fullscreen mode
+ case Action.ActionType.ACTION_CONTEXT_MENU:
+ if (playnow_active)
+ {
+ Cursor.Show();
+ if (playnow_fullscreen)
+ {
+ Cursor.Position = new Point(xfull, yfull_deactivate);
+ playnow_fullscreen = false;
+ Clock.Start();
+ }
+ else
+ {
+ Cursor.Position = new Point(xfull, 500);
+ playnow_fullscreen = true;
+ mouse_event(0x0002, 0, 0, 0, new System.IntPtr());
+ mouse_event(0x0004, 0, 0, 0, new System.IntPtr());
+
+ // Cursor.Hide();
+ }
+ }
+ else
+ {
+ base.OnAction(action);
+ }
+ break;
+
+ default:
+ base.OnAction(action);
+ break;
+ }
+ }
+ #endregion
+
+ #region menu controls
+ protected override void OnClicked(int controlId, GUIControl control, MediaPortal.GUI.Library.Action.ActionType actionType)
+ {
+ if (control == RefreshQueue)
+ {
+ currentPage = Pages.PAGE_QUEUE;
+ OnRefreshQueue();
+ }
+
+ if (control == Recommendations)
+ {
+ currentPage = Pages.PAGE_RSS;
+ OnRecommendations();
+ }
+
+ if (control == Browse)
+ {
+ currentPage = Pages.PAGE_RSS;
+ OnBrowse();
+ }
+
+ if (control == Search)
+ {
+ currentPage = Pages.PAGE_RSS;
+ OnSearch();
+ }
+
+ if (control == Awards)
+ {
+ currentPage = Pages.PAGE_RSS;
+ OnAwards();
+ }
+
+ if (control == PlayNowQueue)
+ {
+ currentPage = Pages.PAGE_RSS;
+ OnPlayNowQueue();
+ }
+
+ if (control == PlayNowStatus)
+ {
+ GetViewingHistory();
+ }
+
+ if (control == mylistview)
+ {
+ switch (currentPage)
+ {
+ case Pages.PAGE_QUEUE:
+ QueueMenu(((MovieDetails)mylistview.SelectedListItem.TVTag).NetflixID);
+ break;
+ case Pages.PAGE_RSS:
+ AddToQueueMenu(((MovieDetails)mylistview.SelectedListItem.TVTag).NetflixID, ((MovieDetails)mylistview.SelectedListItem.TVTag).PlayNow, ((MovieDetails)mylistview.SelectedListItem.TVTag).Trailer);
+ break;
+ }
+ }
+
+ base.OnClicked(controlId, control, actionType);
+
+ }
+
+ private void SelectListView()
+ {
+ GUIControl.FocusControl(GetID, mylistview.GetID);
+ MovieDetails movie = (MovieDetails)mylistview[0].TVTag;
+ ShowDetails(movie);
+ mylistview[0].Label = movie.Title.ToString();
+ mylistview.SelectedItem = 1;
+ }
+
+ private void OnRefreshQueue()
+ {
+ String html = GetHTMLFromURL("http://rss.netflix.com/QueueRSS?id=" + shopperID);
+ GetData(html);
+ loadList();
+ SelectListView();
+ }
+
+ private void OnRecommendations()
+ {
+ String html = GetHTMLFromURL("http://rss.netflix.com/RecommendationsRSS?id=" + shopperID);
+ GetData(html);
+ loadList();
+ SelectListView();
+ }
+
+ private void OnBrowse()
+ {
+ BrowseMenu();
+ }
+
+ private void OnSearch()
+ {
+ VirtualKeyboard keyBoard = (VirtualKeyboard)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_VIRTUAL_KEYBOARD);
+ keyBoard.Text = "";
+ keyBoard.Reset();
+ keyBoard.DoModal(GUIWindowManager.ActiveWindow); // show it...
+ // keyBoard.Text will give you the input once the user has closed the keyboard
+ System.GC.Collect(); // collect some garbage
+ string term = keyBoard.Text;
+ if (keyBoard.Text == "" || keyBoard.Text == null)
+ {
+
+ }
+ else
+ {
+ String html = GetHTMLFromURL("http://www.netflix.com/Search?v1=" + term + "&search_submit.x=0&search_submit.y=0&type=title&row=title&dtl=1");
+
+ parseSearchResults(html);
+ loadList();
+ SelectListView();
+ }
+ }
+
+ private void OnAwards()
+ {
+ AwardsMenu();
+ }
+
+ private void OnPlayNowQueue()
+ {
+ String tmphtml;
+ String html = "";
+ MatchCollection pagecheck;
+
+ String startpage = PlayNowMenu();
+ tmphtml = GetHTMLFromURL(startpage);
+
+ // Accumlate all of the pages
+ bool morepages = true;
+ while (morepages)
+ {
+ html = html + tmphtml;
+ pagecheck = page_search.Matches(tmphtml);
+ if (pagecheck.Count > 0)
+ {
+ tmphtml = GetHTMLFromURL(pagecheck[0].Groups["nextpage"].Value.ToString());
+ }
+ else
+ {
+ morepages = false;
+ }
+ }
+ parsePlayNow(html);
+ loadList();
+ SelectListView();
+ }
+
+ private String PlayNowMenu()
+ {
+ String [] startpage = new String[]{
+ "http://www.netflix.com/WatchNowFromQueue",
+ "http://www.netflix.com/WatchNowRecentAdditions",
+ "http://www.netflix.com/WatchNowTopPicks"};
+
+ MediaPortal.Dialogs.GUIDialogMenu dlgmenu = (GUIDialogMenu)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU);
+
+ dlgmenu.Reset();
+
+ dlgmenu.Add("DVD Queue");
+ dlgmenu.Add("Recent Additions");
+ dlgmenu.Add("Top 50");
+
+ dlgmenu.DoModal(GetID);
+
+ return startpage[dlgmenu.SelectedLabel];
+ }
+
+ private void OnMovieSelected(GUIListItem item, GUIControl parent)
+ {
+ MovieDetails movie = (MovieDetails)item.TVTag;
+ ShowDetails(movie);
+ item.Label = movie.Title.ToString();
+ }
+ #endregion
+
+ #region play functions
+
+ private bool PlayNow(string netflixID)
+ {
+ // Create the web browser window
+ PlayNowWindow = new WebBrowser();
+ PlayNowWindow.Url = new Uri("http://www.netflix.com/WatchNowPlayer?movieid=" + netflixID);
+ PlayNowWindow.Name = "PlayNowWindow";
+ PlayNowWindow.Size = new Size(xres, 500);
+ PlayNowWindow.Location = new Point(0, 145);
+ GUIGraphicsContext.form.Controls.Add(PlayNowWindow);
+ PlayNowWindow.Visible = true;
+
+ PlayNowWindow.DocumentCompleted += new WebBrowserDocumentCompletedEventHandler(PlayNowWindow_DocumentCompleted);
+ GUIGraphicsContext.form.Focus();
+ playnow_active = true;
+
+ //GUIGraphicsContext.IsFullScreenVideo = true;
+ //GUIWindowManager.ActivateWindow((int)GUIWindow.Window.WINDOW_FULLSCREEN_VIDEO);
+ return true;
+ }
+
+ void PlayNowWindow_DocumentCompleted(object sender, WebBrowserDocumentCompletedEventArgs e)
+ {
+
+ }
+
+ private bool PlayTrailer(string netflixID)
+ {
+ return false;
+
+
+ /* MovieDetails movieInfo;
+ movieInfo = parseMovieInfo(netflixID);
+
+ if (movieInfo.Trailer != "none")
+ {
+ g_Player.Play(movieInfo.Trailer);
+ //g_Player.Play("http://cdn.nflximg.com/us/trailers/" + movieInfo.NetflixID.Substring(0, 2) + "/" + movieInfo.NetflixID + ".flv");
+ GUIGraphicsContext.IsFullScreenVideo = true;
+ GUIWindowManager.ActivateWindow((int)GUIWindow.Window.WINDOW_FULLSCREEN_VIDEO);
+ }
+ else
+ {
+ //MessageBox.Show(movieInfo.Trailer);
+ MediaPortal.Dialogs.GUIDialogNotify dlgmenu = (GUIDialogNotify)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_NOTIFY);
+ if (dlgmenu == null)
+ return false;
+ dlgmenu.Reset();
+ dlgmenu.SetHeading("No Trailer Available");
+ //MessageBox.Show("no trailer");
+ }
+ return true;
+ */
+ }
+ #endregion
+
+ #region Awards
+ private void AwardsMenu()
+ {
+
+ String html = "";
+ MediaPortal.Dialogs.GUIDialogMenu dlgmenu = (GUIDialogMenu)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU);
+
+ dlgmenu.Reset();
+
+ dlgmenu.Add("Academy Awards");
+ dlgmenu.Add("BAFTAs");
+ dlgmenu.Add("AFI");
+ dlgmenu.Add("Sundance Film Festival");
+ dlgmenu.Add("Independent Spirit");
+ dlgmenu.Add("Time Magazine");
+ dlgmenu.Add("Razzie");
+
+ dlgmenu.DoModal(GetID);
+
+ switch (dlgmenu.SelectedLabel)
+ {
+ case 0:
+ AcademyMenu();
+ break;
+ case 1:
+ BaftasMenu();
+ break;
+ case 2:
+ AFIMenu();
+ break;
+ case 3:
+ SundanceMenu();
+ break;
+ case 4:
+ IndependentMenu();
+ break;
+ case 5:
+ html = GetHTMLFromURL("http://www.netflix.com/AwardPage?awardId=85");
+ parseAwards(html);
+ break;
+ case 6:
+ RazzieMenu();
+ break;
+ }
+
+
+ }
+
+ private void AcademyMenu()
+ {
+
+ String html = "";
+ MediaPortal.Dialogs.GUIDialogMenu dlgmenu = (GUIDialogMenu)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU);
+
+ dlgmenu.Reset();
+
+ dlgmenu.Add("Best Picture");
+ dlgmenu.Add("Best Director");
+ dlgmenu.Add("Best Actor");
+ dlgmenu.Add("Best Actress");
+ dlgmenu.Add("Best Supporting Actor");
+ dlgmenu.Add("Best Supporting Actress");
+ dlgmenu.Add("Best Foreign Film");
+ dlgmenu.Add("Best Documentary");
+
+
+ dlgmenu.DoModal(GetID);
+
+ switch (dlgmenu.SelectedLabel)
+ {
+ case 0:
+ html = GetHTMLFromURL("http://www.netflix.com/AwardPage?awardId=50");
+ parseAwards(html);
+ break;
+ case 1:
+ html = GetHTMLFromURL("http://www.netflix.com/AwardPage?awardId=43");
+ parseAwards(html);
+ break;
+ case 2:
+ html = GetHTMLFromURL("http://www.netflix.com/AwardPage?awardId=30");
+ parseAwards(html);
+ break;
+ case 3:
+ html = GetHTMLFromURL("http://www.netflix.com/AwardPage?awardId=42");
+ parseAwards(html);
+ break;
+ case 4:
+ html = GetHTMLFromURL("http://www.netflix.com/AwardPage?awardId=31");
+ parseAwards(html);
+ break;
+ case 5:
+ html = GetHTMLFromURL("http://www.netflix.com/AwardPage?awardId=33");
+ parseAwards(html);
+ break;
+ case 6:
+ html = GetHTMLFromURL("http://www.netflix.com/AwardPage?awardId=45");
+ parseAwards(html);
+ break;
+ case 7:
+ html = GetHTMLFromURL("http://www.netflix.com/AwardPage?awardId=64");
+ parseAwards(html);
+ break;
+
+ }
+ loadList();
+ SelectListView();
+ }
+
+ private void BaftasMenu()
+ {
+
+ String html = "";
+ MediaPortal.Dialogs.GUIDialogMenu dlgmenu = (GUIDialogMenu)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU);
+
+ dlgmenu.Reset();
+
+ dlgmenu.Add("Best Film");
+ dlgmenu.Add("Best British Film");
+ dlgmenu.Add("Best Direction");
+ dlgmenu.Add("Best Actor");
+ dlgmenu.Add("Best Actress");
+ dlgmenu.Add("Best Supporting Actor");
+ dlgmenu.Add("Best Supporting Actress");
+ dlgmenu.Add("Best Foreign Film");
+
+
+
+ dlgmenu.DoModal(GetID);
+
+ switch (dlgmenu.SelectedLabel)
+ {
+ case 0:
+ html = GetHTMLFromURL("http://www.netflix.com/AwardPage?awardId=1001");
+ parseAwards(html);
+ break;
+ case 1:
+ html = GetHTMLFromURL("http://www.netflix.com/AwardPage?awardId=1002");
+ parseAwards(html);
+ break;
+ case 2:
+ html = GetHTMLFromURL("http://www.netflix.com/AwardPage?awardId=1003");
+ parseAwards(html);
+ break;
+ case 3:
+ html = GetHTMLFromURL("http://www.netflix.com/AwardPage?awardId=1004");
+ parseAwards(html);
+ break;
+ case 4:
+ html = GetHTMLFromURL("http://www.netflix.com/AwardPage?awardId=1005");
+ parseAwards(html);
+ break;
+ case 5:
+ html = GetHTMLFromURL("http://www.netflix.com/AwardPage?awardId=1006");
+ parseAwards(html);
+ break;
+ case 6:
+ html = GetHTMLFromURL("http://www.netflix.com/AwardPage?awardId=1007");
+ parseAwards(html);
+ break;
+ case 7:
+ html = GetHTMLFromURL("http://www.netflix.com/AwardPage?awardId=1008");
+ parseAwards(html);
+ break;
+
+ }
+ loadList();
+ SelectListView();
+ }
+
+ private void IndependentMenu()
+ {
+
+ String html = "";
+ MediaPortal.Dialogs.GUIDialogMenu dlgmenu = (GUIDialogMenu)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU);
+
+ dlgmenu.Reset();
+
+ dlgmenu.Add("Best Feature");
+ dlgmenu.Add("Best Director");
+ dlgmenu.Add("Best Male Lead");
+ dlgmenu.Add("Best Female Lead");
+ dlgmenu.Add("Best Supporting Male");
+ dlgmenu.Add("Best Supporting Female");
+ dlgmenu.Add("Best Foreign Film");
+
+
+ dlgmenu.DoModal(GetID);
+
+ switch (dlgmenu.SelectedLabel)
+ {
+ case 0:
+ html = GetHTMLFromURL("http://www.netflix.com/AwardPage?awardId=76");
+ parseAwards(html);
+ break;
+ case 1:
+ html = GetHTMLFromURL("http://www.netflix.com/AwardPage?awardId=77");
+ parseAwards(html);
+ break;
+ case 2:
+ html = GetHTMLFromURL("http://www.netflix.com/AwardPage?awardId=78");
+ parseAwards(html);
+ break;
+ case 3:
+ html = GetHTMLFromURL("http://www.netflix.com/AwardPage?awardId=79");
+ parseAwards(html);
+ break;
+ case 4:
+ html = GetHTMLFromURL("http://www.netflix.com/AwardPage?awardId=80");
+ parseAwards(html);
+ break;
+ case 5:
+ html = GetHTMLFromURL("http://www.netflix.com/AwardPage?awardId=81");
+ parseAwards(html);
+ break;
+ case 6:
+ html = GetHTMLFromURL("http://www.netflix.com/AwardPage?awardId=82");
+ parseAwards(html);
+ break;
+
+ }
+ loadList();
+ SelectListView();
+ }
+
+ private void RazzieMen...
[truncated message content] |
|
From: <fer...@us...> - 2007-11-18 03:23:11
|
Revision: 1072
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1072&view=rev
Author: fergusod
Date: 2007-11-17 19:23:09 -0800 (Sat, 17 Nov 2007)
Log Message:
-----------
Created folder remotely
Added Paths:
-----------
trunk/plugins/Netflix manager/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2007-11-17 15:00:12
|
Revision: 1071
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1071&view=rev
Author: saamand
Date: 2007-11-17 07:00:00 -0800 (Sat, 17 Nov 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsOnDemand.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsOnDemand.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsOnDemand.cs 2007-11-17 12:31:11 UTC (rev 1070)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsOnDemand.cs 2007-11-17 15:00:00 UTC (rev 1071)
@@ -160,7 +160,7 @@
lyric = lyricTemp.ToString().Trim();
// if warning message from Evil Labs' sql-server, then lyric isn't found
- if (lyric.Contains("<td"))
+ if (lyric.Contains("<td") || lyric.Contains("<IFRAME"))
{
lyric = "Not found";
}
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2007-11-17 12:31:11 UTC (rev 1070)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2007-11-17 15:00:00 UTC (rev 1071)
@@ -59,7 +59,9 @@
private string NextTrackFileName = string.Empty;
private PlayListPlayer PlaylistPlayer = null;
+ private System.Timers.Timer m_WriteTagTimer = null;
+
// worker thread
Thread m_LyricControllerThread;
LyricsController lc;
@@ -73,7 +75,11 @@
string m_TrackText = "";
string m_StatusText = "";
string m_LyricText = "";
+ string m_LastLyricText = "";
+ string m_LastFileName = "";
+ int m_crossfade = 0;
+
string[] m_strippedPrefixStrings = null;
bool lyricsFound = false;
@@ -186,7 +192,7 @@
{
if (newTrack)
{
- alreadyValidLRC = false;
+ alreadyValidLRC = false;
MusicDatabase mDB = MusicDatabase.Instance;
CurrentTrackTag = mDB.GetTag(g_Player.CurrentFile);
@@ -248,6 +254,15 @@
getAlbumArt();
startSearch();
}
+
+ if (m_automaticWriteToMusicTag && !m_LastFileName.Equals(string.Empty))
+ {
+ m_WriteTagTimer = new System.Timers.Timer(m_crossfade);
+ m_WriteTagTimer.Elapsed += new ElapsedEventHandler(WriteLatestLyricToTag);
+ m_WriteTagTimer.Enabled = true;
+ m_WriteTagTimer.Start();
+
+ }
}
if (lyricsFound)
@@ -258,7 +273,15 @@
base.Process();
}
+ void WriteLatestLyricToTag(object sender, ElapsedEventArgs e)
+ {
+ TagReaderUtil.WriteLyrics(m_LastFileName, m_LastLyricText);
+ m_WriteTagTimer.Stop();
+ m_WriteTagTimer.Close();
+ m_WriteTagTimer.Dispose();
+ }
+
private void startSearch()
{
lyricsFound = false;
@@ -328,6 +351,8 @@
m_automaticWriteToMusicTag = xmlreader.GetValue("myLyrics", "automaticWriteToMusicTag").Equals("yes");
skin = ((string)xmlreader.GetValueAsString("skin", "name", "BlueTwo"));
+
+ m_crossfade = xmlreader.GetValueAsInt("audioplayer", "crossfade", 2000);
}
m_strippedPrefixStrings = MediaPortalUtil.GetStrippedPrefixStringArray();
@@ -408,6 +433,15 @@
{
StopThread();
resetAll();
+
+ if (m_WriteTagTimer != null)
+ {
+ m_WriteTagTimer.Stop();
+ m_WriteTagTimer.Close();
+ m_WriteTagTimer.Dispose();
+ m_WriteTagTimer = null;
+ }
+
LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Stop, 0, LyricDiagnostics.ElapsedTimeString() + "MyLyrics closes.");
break;
}
@@ -516,6 +550,12 @@
{
if (tag2.Equals("#Play.Current.Track") && !exitingMyLyrics) // track has changed
{
+ if (!m_LyricText.Equals(string.Empty))
+ {
+ m_LastLyricText = m_LyricText;
+ m_LastFileName = CurrentTrackTag.FileName;
+ }
+
if (value.Length != 0) // additional check
{
basicScreenSelected = null;
@@ -1240,11 +1280,6 @@
{
ShowLyricOnScreen(lyricText, site);
SaveLyricToDatabase(site);
-
- if (m_automaticWriteToMusicTag)
- {
- TagReaderUtil.WriteLyrics(artist, title, lyricText);
- }
}
}
}
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2007-11-17 12:31:11 UTC (rev 1070)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2007-11-17 15:00:00 UTC (rev 1071)
@@ -5,12 +5,13 @@
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{BBB2DAE2-0D83-4B4B-85B6-D1B5A7E10039}</ProjectGuid>
- <OutputType>WinExe</OutputType>
+ <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MyLyrics</RootNamespace>
<AssemblyName>MyLyrics</AssemblyName>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
- <StartupObject>MyLyrics.MyLyricsSetup_test</StartupObject>
+ <StartupObject>
+ </StartupObject>
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2007-11-17 12:31:14
|
Revision: 1070
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1070&view=rev
Author: saamand
Date: 2007-11-17 04:31:11 -0800 (Sat, 17 Nov 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MyLyrics/LyricsEngine/LyricSearch.cs
trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
Added Paths:
-----------
trunk/plugins/MyLyrics/My Lyrics/MediaPortalUtil.cs
Removed Paths:
-------------
trunk/plugins/MyLyrics/My Lyrics/Changelog.txt
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricSearch.cs
===================================================================
(Binary files differ)
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs 2007-11-16 16:09:02 UTC (rev 1069)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs 2007-11-17 12:31:11 UTC (rev 1070)
@@ -136,20 +136,20 @@
FinishThread("", "", "The search has ended.", "");
}
- public void AddNewLyricSearch(string artist, string title)
+ public void AddNewLyricSearch(string artist, string title, string strippedArtistName)
{
++m_noOfCurrentSearches;
if (lyricsSites.Length > 0)
{
// create worker thread instance
- ThreadStart easySitesThreadInstance = delegate
+ ThreadStart threadInstance = delegate
{
- LyricSearch lyricSearch_EasySites = new LyricSearch(this, artist, title, m_allowAllToComplete, m_automaticUpdate);
- lyricSearch_EasySites.Run();
+ LyricSearch lyricSearch = new LyricSearch(this, artist, title, strippedArtistName, m_allowAllToComplete, m_automaticUpdate);
+ lyricSearch.Run();
};
- Thread lyricSearchThread = new Thread(easySitesThreadInstance);
+ Thread lyricSearchThread = new Thread(threadInstance);
lyricSearchThread.Name = "BasicSearch for " + artist + " - " + title; // looks nice in Output window
lyricSearchThread.IsBackground = true;
lyricSearchThread.Start();
Deleted: trunk/plugins/MyLyrics/My Lyrics/Changelog.txt
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/Changelog.txt 2007-11-16 16:09:02 UTC (rev 1069)
+++ trunk/plugins/MyLyrics/My Lyrics/Changelog.txt 2007-11-17 12:31:11 UTC (rev 1070)
@@ -1,32 +0,0 @@
-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
-- Add: Timer on batch search in configuration mode.
-- Fix: A special formatting on SeekLyrics sites wasn't handled causing fetched of an incomplete lyrics
-- Fix: For some users the tag reader added an additional space causing the search to fail.
-- Fix: Various minor fixes on all the formatting on lyrics fetched from SeekLyrics
-- Fix: Handling of special German and Danish letters
-
-Changes from version 0.13 to 0.14:
-- Add: Added three new lyrics sites. Now there is a total of four lyrics sites to search from.
-- Del: All Google related dependencies have been removed in the plugin.
-- Fix: Even if all lyric search threads had ended the complete search wasn't terminated due to bad validation.
-- Fix: LRC-text saved in music tags wasn't formatted correctly and accordingly shown as regular lyrics.
-- Fix: Fields weren't reset before interpreting a new LRC-fields resulting in wrong timestamps and non-empty status field.
-- Fix: Catches error when accessing displosed treeview due to application shutdown
-- Fix: An improved configuration setup with various smaller bug fixes.
-- Fix: Due to lack of options with the MP scroll-control the default textcontrol is uses once again in the MyLyrics screen.
-
-Changes from version 0.12 to 0.13:
-- Add: Improved log. Logging search information in every session of MyLyric from MP starts to it closes. Saved in log\MyLyrics.log.
-- Fix: All threads are now aborted as intended when search finishes. Both in configuration and play mode.
-- Fix: Proper cleanup of trace objects and log files when configuration is closed.
-- Fix: Lyrics searches optimized in regards to both speed and hit ration.
-- Fix: Some threads ended up in deadlock when changing google license key.
-- Fix: Sometimes when a lyric was found an unsuccessful, and not the succesful lyric site, was written to the MyLyrics.log.
-- Add: MyLyric screen search now only uses lyric sites selected in the configuration.
-- Fix: Exception messages (e.g. when license key is announced invalid for the day) is no longer shown on screen.
-- Fix: Bad library handling caused the configuration in some circumstances to crash on when trying to access the MyLyricsBatch log-file.
Added: trunk/plugins/MyLyrics/My Lyrics/MediaPortalUtil.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MediaPortalUtil.cs (rev 0)
+++ trunk/plugins/MyLyrics/My Lyrics/MediaPortalUtil.cs 2007-11-17 12:31:11 UTC (rev 1070)
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace MyLyrics
+{
+ class MediaPortalUtil
+ {
+ public static string[] GetStrippedPrefixStringArray()
+ {
+ string strippedPrefixes = "";
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MediaPortal.xml"))
+ {
+ strippedPrefixes = ((string)xmlreader.GetValueAsString("musicfiles", "artistprefixes", "the,les,die")).ToString();
+ }
+ string[] strippedPrefixesArray = (string[])strippedPrefixes.Split(new string[1] { "," }, StringSplitOptions.RemoveEmptyEntries);
+
+ for (int i = 0; i < strippedPrefixesArray.Length; i++)
+ {
+ string temp = strippedPrefixesArray[i];
+ strippedPrefixesArray[i] = LyricsEngine.LyricUtil.CapatalizeString(", " + temp.Trim());
+ }
+
+ return strippedPrefixesArray;
+ }
+
+ public static string GetStrippedPrefixArtist(string artist, string[] strippedPrefixStringArray)
+ {
+ foreach (string s in strippedPrefixStringArray)
+ {
+ artist = artist.Replace(s, "");
+ }
+ return artist;
+ }
+ }
+}
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.cs 2007-11-16 16:09:02 UTC (rev 1069)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.cs 2007-11-17 12:31:11 UTC (rev 1070)
@@ -42,6 +42,8 @@
bool m_automaticWriteToMusicTag = true;
bool markedDatabase;
+ string[] m_strippedPrefixStrings = null;
+
List<string> sitesToSearch;
LyricsLibrary parent = null;
@@ -89,6 +91,8 @@
m_automaticWriteToMusicTag = xmlreader.GetValueAsBool("myLyrics", "automaticWriteToMusicTag", true);
}
+ m_strippedPrefixStrings = MediaPortalUtil.GetStrippedPrefixStringArray();
+
BeginSearchIfPossible(artist, title);
this.ShowDialog();
}
@@ -178,7 +182,7 @@
m_LyricControllerThread.Name = "lyricSearch Thread"; // looks nice in Output window
m_LyricControllerThread.Start();
- lc.AddNewLyricSearch(artist, title);
+ lc.AddNewLyricSearch(artist, title, MediaPortalUtil.GetStrippedPrefixArtist(artist, m_strippedPrefixStrings));
}
private void stopSearch()
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs 2007-11-16 16:09:02 UTC (rev 1069)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs 2007-11-17 12:31:11 UTC (rev 1070)
@@ -36,6 +36,8 @@
int m_noOfSearchesToComplete = 0;
int m_noOfSearchesCompleted = 0;
+ string[] m_strippedPrefixStrings = null;
+
bool m_lockButtons = true;
Thread m_LyricControllerThread;
@@ -252,6 +254,8 @@
sitesToSearch.Add("SeekLyrics");
}
+ m_strippedPrefixStrings = MediaPortalUtil.GetStrippedPrefixStringArray();
+
m_EventStopThread = new ManualResetEvent(false);
// If automaticUpdate is set then return after the first positive search
@@ -561,7 +565,7 @@
m_noOfCurrentlySearches += 1;
string[] lyricID = (string[])songs.Dequeue();
bw.ReportProgress(counter++);
- lc.AddNewLyricSearch(lyricID[0], lyricID[1]);
+ lc.AddNewLyricSearch(lyricID[0], lyricID[1], MediaPortalUtil.GetStrippedPrefixArtist(lyricID[0], m_strippedPrefixStrings));
}
Thread.Sleep(200);
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs 2007-11-16 16:09:02 UTC (rev 1069)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs 2007-11-17 12:31:11 UTC (rev 1070)
@@ -81,6 +81,8 @@
bool m_automaticWriteToMusicTag = true;
+ string[] m_strippedPrefixStrings;
+
const int m_NoOfCurrentSearchesAllowed = 6;
int m_Limit = 100;
@@ -183,6 +185,9 @@
MessageBox.Show("Something has gone wrong when reading Mediaportal.xml");
}
}
+
+ m_strippedPrefixStrings = MediaPortalUtil.GetStrippedPrefixStringArray();
+
#endregion
#region Serialzie/deserialize lyricsdatabases
@@ -768,7 +773,8 @@
if (lc.NoOfCurrentSearches < m_NoOfCurrentSearchesAllowed && lc.StopSearches == false)
{
string[] lyricID = (string[])lyricConfigInfosQueue.Dequeue();
- lc.AddNewLyricSearch(lyricID[0], lyricID[1]);
+
+ lc.AddNewLyricSearch(lyricID[0], lyricID[1], MediaPortalUtil.GetStrippedPrefixArtist(lyricID[0], m_strippedPrefixStrings));
}
Thread.Sleep(100);
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2007-11-16 16:09:02 UTC (rev 1069)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2007-11-17 12:31:11 UTC (rev 1070)
@@ -74,6 +74,8 @@
string m_StatusText = "";
string m_LyricText = "";
+ string[] m_strippedPrefixStrings = null;
+
bool lyricsFound = false;
bool m_automaticWriteToMusicTag = true;
@@ -328,6 +330,8 @@
skin = ((string)xmlreader.GetValueAsString("skin", "name", "BlueTwo"));
}
+ m_strippedPrefixStrings = MediaPortalUtil.GetStrippedPrefixStringArray();
+
ArrayList sitesToSearch = new ArrayList();
if (useLyricWiki && Setup.IsMember("LyricWiki"))
{
@@ -685,7 +689,7 @@
m_LyricControllerThread.Name = "lyricSearch Thread"; // looks nice in Output window
m_LyricControllerThread.Start();
- lc.AddNewLyricSearch(m_artist, m_title);
+ lc.AddNewLyricSearch(m_artist, m_title, MediaPortalUtil.GetStrippedPrefixArtist(m_artist, m_strippedPrefixStrings));
}
}
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2007-11-16 16:09:02 UTC (rev 1069)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2007-11-17 12:31:11 UTC (rev 1070)
@@ -5,13 +5,12 @@
<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>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
- <StartupObject>
- </StartupObject>
+ <StartupObject>MyLyrics.MyLyricsSetup_test</StartupObject>
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -62,6 +61,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Convert\ConvertFromXMLtoLyricsDatabase.cs" />
+ <Compile Include="MediaPortalUtil.cs" />
<Compile Include="MyLyrics Configuration\ExportTags.cs">
<SubType>Form</SubType>
</Compile>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2007-11-16 16:09:07
|
Revision: 1069
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1069&view=rev
Author: saamand
Date: 2007-11-16 08:09:02 -0800 (Fri, 16 Nov 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MyLyrics/LyricsEngine/LyricSearch.cs
trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.Designer.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
trunk/plugins/MyLyrics/My Lyrics/MyLyricsExternCode.cs
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricSearch.cs
===================================================================
(Binary files differ)
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs 2007-11-16 15:15:39 UTC (rev 1068)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs 2007-11-16 16:09:02 UTC (rev 1069)
@@ -42,10 +42,10 @@
public LyricsController(ILyricForm mainForm,
ManualResetEvent eventStopThread,
string[] lyricSites,
- bool allowAllToSearch, bool automaticUpdate)
+ bool allowAllToComplete, bool automaticUpdate)
{
this.m_Form = mainForm;
- this.m_allowAllToComplete = allowAllToSearch;
+ this.m_allowAllToComplete = allowAllToComplete;
this.m_automaticUpdate = automaticUpdate;
m_noOfLyricsToSearch = 1;
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.Designer.cs 2007-11-16 15:15:39 UTC (rev 1068)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.Designer.cs 2007-11-16 16:09:02 UTC (rev 1069)
@@ -27,6 +27,7 @@
this.columnHeaderStatus2 = new System.Windows.Forms.ColumnHeader();
this.btAdd = new System.Windows.Forms.Button();
this.gbMusicDatabase = new System.Windows.Forms.GroupBox();
+ this.lbStats = new System.Windows.Forms.Label();
this.btAddAll = new System.Windows.Forms.Button();
this.lbSelectedArtist = new System.Windows.Forms.Label();
this.lvArtists = new System.Windows.Forms.ListView();
@@ -39,7 +40,6 @@
this.btRemove = new System.Windows.Forms.Button();
this.btSearch = new System.Windows.Forms.Button();
this.bw = new System.ComponentModel.BackgroundWorker();
- this.lbStats = new System.Windows.Forms.Label();
this.gbMusicDatabase.SuspendLayout();
this.gbSelected.SuspendLayout();
this.SuspendLayout();
@@ -74,7 +74,7 @@
this.lvSongs.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
this.lvSongs.Location = new System.Drawing.Point(189, 33);
this.lvSongs.Name = "lvSongs";
- this.lvSongs.Size = new System.Drawing.Size(332, 164);
+ this.lvSongs.Size = new System.Drawing.Size(332, 162);
this.lvSongs.SmallImageList = this.imageList;
this.lvSongs.Sorting = System.Windows.Forms.SortOrder.Ascending;
this.lvSongs.TabIndex = 8;
@@ -122,7 +122,7 @@
this.lvSelectedSongs.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
this.lvSelectedSongs.Location = new System.Drawing.Point(11, 19);
this.lvSelectedSongs.Name = "lvSelectedSongs";
- this.lvSelectedSongs.Size = new System.Drawing.Size(510, 164);
+ this.lvSelectedSongs.Size = new System.Drawing.Size(510, 162);
this.lvSelectedSongs.SmallImageList = this.imageList;
this.lvSelectedSongs.Sorting = System.Windows.Forms.SortOrder.Ascending;
this.lvSelectedSongs.TabIndex = 11;
@@ -177,6 +177,16 @@
this.gbMusicDatabase.TabStop = false;
this.gbMusicDatabase.Text = "Select songs from music database";
//
+ // lbStats
+ //
+ this.lbStats.AutoSize = true;
+ this.lbStats.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbStats.Location = new System.Drawing.Point(191, 201);
+ this.lbStats.Name = "lbStats";
+ this.lbStats.Size = new System.Drawing.Size(35, 13);
+ this.lbStats.TabIndex = 17;
+ this.lbStats.Text = "[stats]";
+ //
// btAddAll
//
this.btAddAll.Location = new System.Drawing.Point(194, 219);
@@ -205,7 +215,7 @@
this.lvArtists.Location = new System.Drawing.Point(11, 33);
this.lvArtists.MultiSelect = false;
this.lvArtists.Name = "lvArtists";
- this.lvArtists.Size = new System.Drawing.Size(172, 164);
+ this.lvArtists.Size = new System.Drawing.Size(172, 162);
this.lvArtists.TabIndex = 13;
this.lvArtists.UseCompatibleStateImageBehavior = false;
this.lvArtists.View = System.Windows.Forms.View.Details;
@@ -302,16 +312,6 @@
this.bw.RunWorkerCompleted += new System.ComponentModel.RunWorkerCompletedEventHandler(this.bw_RunWorkerCompleted);
this.bw.ProgressChanged += new System.ComponentModel.ProgressChangedEventHandler(this.bw_ProgressChanged);
//
- // lbStats
- //
- this.lbStats.AutoSize = true;
- this.lbStats.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lbStats.Location = new System.Drawing.Point(191, 201);
- this.lbStats.Name = "lbStats";
- this.lbStats.Size = new System.Drawing.Size(35, 13);
- this.lbStats.TabIndex = 17;
- this.lbStats.Text = "[stats]";
- //
// MusicDatabaseBrowse
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs 2007-11-16 15:15:39 UTC (rev 1068)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs 2007-11-16 16:09:02 UTC (rev 1069)
@@ -444,6 +444,11 @@
{
if (lvi.Text.Equals(artist) && lvi.SubItems[1].Text.Equals(title))
{
+ if (lvi.SubItems[3].Text.Equals("miss"))
+ {
+ MessageBox.Show("This is an error and should not be able to happen!");
+ }
+
lvi.ImageIndex = 0;
lvi.SubItems[2].Text = "LyricsDB";
lvi.SubItems[3].Text = "OK";
@@ -555,12 +560,11 @@
{
m_noOfCurrentlySearches += 1;
string[] lyricID = (string[])songs.Dequeue();
+ bw.ReportProgress(counter++);
lc.AddNewLyricSearch(lyricID[0], lyricID[1]);
-
- bw.ReportProgress(counter++);
}
- Thread.Sleep(100);
+ Thread.Sleep(200);
}
}
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs 2007-11-16 15:15:39 UTC (rev 1068)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs 2007-11-16 16:09:02 UTC (rev 1069)
@@ -324,7 +324,7 @@
this.btCancel.Name = "btCancel";
this.btCancel.Size = new System.Drawing.Size(78, 23);
this.btCancel.TabIndex = 33;
- this.btCancel.Text = "Stop";
+ this.btCancel.Text = "Cancel";
this.btCancel.UseVisualStyleBackColor = true;
this.btCancel.Click += new System.EventHandler(this.btCancel_Click);
//
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2007-11-16 15:15:39 UTC (rev 1068)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2007-11-16 16:09:02 UTC (rev 1069)
@@ -186,7 +186,9 @@
{
alreadyValidLRC = false;
- CurrentTrackTag = new MusicTag();
+ MusicDatabase mDB = MusicDatabase.Instance;
+ CurrentTrackTag = mDB.GetTag(g_Player.CurrentFile);
+
CurrentTrackTag.Artist = LyricUtil.CapatalizeString(GUIPropertyManager.GetProperty("#Play.Current.Artist"));
CurrentTrackTag.Title = LyricUtil.CapatalizeString(GUIPropertyManager.GetProperty("#Play.Current.Title"));
@@ -437,7 +439,6 @@
case Action.ActionType.ACTION_PREVIOUS_MENU:
{
GUIWindowManager.ShowPreviousWindow();
- base.OnAction(action);
break;
}
case Action.ActionType.ACTION_KEY_PRESSED:
@@ -589,9 +590,13 @@
3) Lyric in database
4) Search the Internet */
+ string lyricText = string.Empty;
// 1) + 2) Check if LRC in music tag or Database
- string lyricText = LyricsDB[DatabaseUtil.CorrectKeyFormat(m_artist, m_title)].Lyrics;
+ if (LyricsDB.ContainsKey(DatabaseUtil.CorrectKeyFormat(m_artist, m_title)))
+ {
+ lyricText = LyricsDB[DatabaseUtil.CorrectKeyFormat(m_artist, m_title)].Lyrics;
+ }
if ((CurrentTrackTag.Lyrics.Length != 0 && (lrc = new SimpleLRC(m_artist, m_title, CurrentTrackTag.Lyrics)).IsValid)
|| (lyricText.Length != 0 && (lrc = new SimpleLRC(m_artist, m_title, lyricText)).IsValid))
@@ -946,7 +951,8 @@
private void resetGUI(int screenID)
{
- if (skin.Equals("ReVision") && (screenID == (int)MyLyricsSettings.Screen.LYRICS_WIDE || screenID == (int)MyLyricsSettings.Screen.LRC_WIDE || screenID == (int)MyLyricsSettings.Screen.LRC_EDITOR))
+ if ((skin.Equals("ReVision") || skin.Equals("Replicant")) &&
+ (screenID == (int)MyLyricsSettings.Screen.LYRICS_WIDE || screenID == (int)MyLyricsSettings.Screen.LRC_WIDE || screenID == (int)MyLyricsSettings.Screen.LRC_EDITOR))
{
GUIControl.HideControl(GetID, (int)GUI_General_Controls.CONTROL_UPNEXT);
GUIControl.HideControl(GetID, (int)GUI_General_Controls.CONTROL_ALBUM);
@@ -1033,15 +1039,18 @@
GUIControl.ShowControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_LyricWide);
GUIControl.SetControlLabel(GetID, (int)GUI_Lyrics_Controls.CONTROL_LyricWide, "");
- // album art only visible for lyrics_basic screen
- GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_CURRENTLY);
- GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_DURATION);
- GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_ALBUM);
- GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_YEAR);
- GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_NOWPLAYINGBACK);
- GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_ALBUMART);
- GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_PROGRESS);
- GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_PROGRESSIMAGE);
+ // album art only visible for lyrics_basic screen AND also for Xface skin
+ if (!skin.Equals("Xface"))
+ {
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_CURRENTLY);
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_DURATION);
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_ALBUM);
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_YEAR);
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_NOWPLAYINGBACK);
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_ALBUMART);
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_PROGRESS);
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_PROGRESSIMAGE);
+ }
// Hide LRC controls
GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_TAGBUTTON);
@@ -1110,15 +1119,18 @@
GUIControl.HideControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_Lyric);
GUIControl.HideControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_LyricWide);
- // album art only visible for basic screen
- GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_CURRENTLY);
- GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_DURATION);
- GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_ALBUM);
- GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_YEAR);
- GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_NOWPLAYINGBACK);
- GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_ALBUMART);
- GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_PROGRESS);
- GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_PROGRESSIMAGE);
+ // album art only visible for lyrics_basic screen AND also for Xface skin
+ if (!skin.Equals("Xface"))
+ {
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_CURRENTLY);
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_DURATION);
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_ALBUM);
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_YEAR);
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_NOWPLAYINGBACK);
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_ALBUMART);
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_PROGRESS);
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_PROGRESSIMAGE);
+ }
// LRC controls
GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_TAGBUTTON);
@@ -1156,15 +1168,18 @@
GUIControl.HideControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_Lyric);
GUIControl.HideControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_LyricWide);
- // album art only visible for lyrics_basic screen
- GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_CURRENTLY);
- GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_DURATION);
- GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_ALBUM);
- GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_YEAR);
- GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_NOWPLAYINGBACK);
- GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_ALBUMART);
- GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_PROGRESS);
- GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_PROGRESSIMAGE);
+ // album art only visible for lyrics_basic screen AND also for Xface skin
+ if (!skin.Equals("Xface"))
+ {
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_CURRENTLY);
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_DURATION);
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_ALBUM);
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_YEAR);
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_NOWPLAYINGBACK);
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_ALBUMART);
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_PROGRESS);
+ GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_PROGRESSIMAGE);
+ }
// LRC controls
GUIControl.ShowControl(GetID, (int)GUI_LRC_Controls.CONTROL_TAGBUTTON);
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2007-11-16 15:15:39 UTC (rev 1068)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2007-11-16 16:09:02 UTC (rev 1069)
@@ -5,7 +5,7 @@
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{BBB2DAE2-0D83-4B4B-85B6-D1B5A7E10039}</ProjectGuid>
- <OutputType>WinExe</OutputType>
+ <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MyLyrics</RootNamespace>
<AssemblyName>MyLyrics</AssemblyName>
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsExternCode.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyricsExternCode.cs 2007-11-16 15:15:39 UTC (rev 1068)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsExternCode.cs 2007-11-16 16:09:02 UTC (rev 1069)
@@ -117,10 +117,14 @@
PreviousTrackTag = CurrentTrackTag;
if (!isCurSongCdTrack)
- CurrentTrackTag = GetTrackTag(dbs, CurrentTrackFileName, UseID3);
+ {
+ CurrentTrackTag = dbs.GetTag(CurrentTrackFileName);
+ CurrentTrackTag.Artist = LyricUtil.CapatalizeString(GUIPropertyManager.GetProperty("#Play.Current.Artist"));
+ CurrentTrackTag.Title = LyricUtil.CapatalizeString(GUIPropertyManager.GetProperty("#Play.Current.Title"));
+ }
if (!isNextSongCdTrack)
- NextTrackTag = GetTrackTag(dbs, NextTrackFileName, UseID3);
+ NextTrackTag = dbs.GetTag(NextTrackFileName);
if (isCurSongCdTrack || isNextSongCdTrack)
{
@@ -161,6 +165,8 @@
{
MediaPortal.Freedb.CDTrackDetail curTrack = GUIMusicFiles.MusicCD.getTrack(curCDTrackNum);
CurrentTrackTag = GetTrackTag(curTrack);
+ CurrentTrackTag.Artist = LyricUtil.CapatalizeString(GUIPropertyManager.GetProperty("#Play.Current.Artist"));
+ CurrentTrackTag.Title = LyricUtil.CapatalizeString(GUIPropertyManager.GetProperty("#Play.Current.Title"));
}
if (nextCDTrackNum < GUIMusicFiles.MusicCD.Tracks.Length)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rs...@us...> - 2007-11-16 15:15:42
|
Revision: 1068
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1068&view=rev
Author: rsparey
Date: 2007-11-16 07:15:39 -0800 (Fri, 16 Nov 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/logo_crossfade.png
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/logo_fastforward.png
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/logo_gap.png
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/logo_gapless.png
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/logo_pause.png
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/logo_play.png
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/logo_rewind.png
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/logo_stop.png
trunk/skins/Foofaraw/Development Skin/Foofaraw/musicOverlay.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicgenres.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicplaylist.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/myvideo.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideoTitle.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/videoOSD.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/videoOverlay.xml
Added Paths:
-----------
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/progess_white_back.png
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/white_progess.png
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/logo_crossfade.png
===================================================================
(Binary files differ)
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/logo_fastforward.png
===================================================================
(Binary files differ)
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/logo_gap.png
===================================================================
(Binary files differ)
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/logo_gapless.png
===================================================================
(Binary files differ)
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/logo_pause.png
===================================================================
(Binary files differ)
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/logo_play.png
===================================================================
(Binary files differ)
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/logo_rewind.png
===================================================================
(Binary files differ)
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/logo_stop.png
===================================================================
(Binary files differ)
Added: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/progess_white_back.png
===================================================================
(Binary files differ)
Property changes on: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/progess_white_back.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/white_progess.png
===================================================================
(Binary files differ)
Property changes on: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/white_progess.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/musicOverlay.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/musicOverlay.xml 2007-11-16 14:42:17 UTC (rev 1067)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/musicOverlay.xml 2007-11-16 15:15:39 UTC (rev 1068)
@@ -3,12 +3,48 @@
<id>2004</id>
<defaultcontrol>2</defaultcontrol>
<controls>
-
+ <control>
+ <description>Gap / Normal Icon</description>
+ <type>image</type>
+ <id>10</id>
+ <posX>20</posX>
+ <posY>590</posY>
+ <width>33</width>
+ <height>33</height>
+ <texture>logo_gap.png</texture>
+ <animation effect="fade" time="500">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ </control>
+
+ <control>
+ <description>Gapless Icon</description>
+ <type>image</type>
+ <id>11</id>
+ <posX>20</posX>
+ <posY>590</posY>
+ <width>33</width>
+ <height>33</height>
+ <texture>logo_gapless.png</texture>
+ <animation effect="fade" time="500">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ </control>
<control>
+ <description>Crossfade Icon</description>
+ <type>image</type>
+ <id>12</id>
+ <posX>20</posX>
+ <posY>590</posY>
+ <width>33</width>
+ <height>33</height>
+ <texture>logo_crossfade.png</texture>
+ <animation effect="fade" time="500">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ </control>
+ <control>
<description>play time label</description>
<type>label</type>
<id>2</id>
- <posX>50</posX>
+ <posX>70</posX>
<posY>580</posY>
<label>#currentplaytime</label>
<align>left</align>
@@ -37,8 +73,8 @@
<description>play logo</description>
<type>image</type>
<id>3</id>
- <posX>0</posX>
- <posY>695</posY>
+ <posX>165</posX>
+ <posY>587</posY>
<texture>logo_play.png</texture>
<animation effect="fade" time="500">WindowClose</animation>
<animation effect="fade" time="250">WindowOpen</animation>
@@ -47,8 +83,8 @@
<description>Pause logo</description>
<type>image</type>
<id>4</id>
- <posX>0</posX>
- <posY>695</posY>
+ <posX>165</posX>
+ <posY>587</posY>
<texture>logo_pause.png</texture>
<animation effect="fade" time="500">WindowClose</animation>
<animation effect="fade" time="250">WindowOpen</animation>
@@ -57,8 +93,8 @@
<description>FF logo</description>
<type>image</type>
<id>7</id>
- <posX>0</posX>
- <posY>695</posY>
+ <posX>165</posX>
+ <posY>587</posY>
<texture>logo_fastforward.png</texture>
<animation effect="fade" time="500">WindowClose</animation>
<animation effect="fade" time="250">WindowOpen</animation>
@@ -67,19 +103,24 @@
<description>RW logo</description>
<type>image</type>
<id>8</id>
- <posX>0</posX>
- <posY>695</posY>
+ <posX>165</posX>
+ <posY>587</posY>
<texture>logo_rewind.png</texture>
<animation effect="fade" time="500">WindowClose</animation>
<animation effect="fade" time="250">WindowOpen</animation>
</control>
+
+
+
+
<control>
<description>album/artist/genre etc info label</description>
<type>fadelabel</type>
+
<width>180</width>
<height>40</height>
- <posX>25</posX>
- <posY>725</posY>
+ <posX>200</posX>
+ <posY>592</posY>
<font>font13</font>
<label>#Play.Current.Title\r#Play.Current.Artist\r#Play.Current.Album\r#Play.Current.Duration</label>
<textcolor>FFFFFFFF</textcolor>
@@ -90,11 +131,11 @@
<control>
<description>video preview window</description>
<type>videowindow</type>
- <id>1</id>
+ <id>9</id>
<posX>20</posX>
- <posY>628</posY>
- <width>180</width>
- <height>101</height>
+ <posY>626</posY>
+ <width>223</width>
+ <height>125</height>
<action>18</action>
<textureFocus>tv_green_border.png</textureFocus>
<animation effect="fade" time="500">WindowClose</animation>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicgenres.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicgenres.xml 2007-11-16 14:42:17 UTC (rev 1067)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicgenres.xml 2007-11-16 15:15:39 UTC (rev 1068)
@@ -375,7 +375,7 @@
<id>1</id>
<animation effect="fade" time="400">WindowClose</animation>
<animation effect="fade" time="400">WindowOpen</animation>
- <posX>240</posX>
+ <posX>250</posX>
<posY>650</posY>
<width>700</width>
<label>#selecteditem</label>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicplaylist.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicplaylist.xml 2007-11-16 14:42:17 UTC (rev 1067)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicplaylist.xml 2007-11-16 15:15:39 UTC (rev 1068)
@@ -195,7 +195,7 @@
<id>1</id>
<animation effect="fade" time="400">WindowClose</animation>
<animation effect="fade" time="400">WindowOpen</animation>
- <posX>240</posX>
+ <posX>250</posX>
<posY>650</posY>
<width>700</width>
<label>#selecteditem</label>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicsongs.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicsongs.xml 2007-11-16 14:42:17 UTC (rev 1067)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicsongs.xml 2007-11-16 15:15:39 UTC (rev 1068)
@@ -368,7 +368,7 @@
<id>1</id>
<animation effect="fade" time="400">WindowClose</animation>
<animation effect="fade" time="400">WindowOpen</animation>
- <posX>240</posX>
+ <posX>250</posX>
<posY>650</posY>
<width>700</width>
<label>#selecteditem</label>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/myradio.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/myradio.xml 2007-11-16 14:42:17 UTC (rev 1067)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/myradio.xml 2007-11-16 15:15:39 UTC (rev 1068)
@@ -195,7 +195,7 @@
<id>1</id>
<animation effect="fade" time="400">WindowClose</animation>
<animation effect="fade" time="400">WindowOpen</animation>
- <posX>240</posX>
+ <posX>250</posX>
<posY>650</posY>
<width>700</width>
<label>#selecteditem</label>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvguide.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvguide.xml 2007-11-16 14:42:17 UTC (rev 1067)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvguide.xml 2007-11-16 15:15:39 UTC (rev 1068)
@@ -176,9 +176,9 @@
<type>image</type>
<id>33</id>
<posX>200</posX>
- <posY>100</posY>
- <width>35</width>
- <height>38</height>
+ <posY>102</posY>
+ <width>32</width>
+ <height>32</height>
<keepaspectratio>yes</keepaspectratio>
<zoom>yes</zoom>
<texture>defaultVideoBig.png</texture>
@@ -226,10 +226,12 @@
<description>Channel image template</description>
<type>image</type>
<id>7</id>
- <width>40</width>
- <height>40</height>
+ <posX>4</posX>
+ <posY>4</posY>
+ <width>32</width>
+ <height>32</height>
<zoom>no</zoom>
- <texture>defaultVideoBig.png</texture>
+ <texture>TV.png</texture>
<animation effect="fade" time="250">WindowOpen</animation>
<animation effect="fade" time="500">WindowClose</animation>
</control>
@@ -252,7 +254,7 @@
<id>13</id>
<posX>400</posX>
<posY>587</posY>
- <width>600</width>
+ <width>400</width>
<label>#TV.Guide.Title</label>
<font>font16</font>
<textcolor>FFFFFFFF</textcolor>
@@ -263,7 +265,7 @@
<description>Current program time</description>
<type>label</type>
<id>14</id>
- <posX>230</posX>
+ <posX>850</posX>
<posY>593</posY>
<label>#TV.Guide.Time</label>
<align>left</align>
@@ -289,9 +291,9 @@
<description>Description1</description>
<type>textboxscrollup</type>
<id>15</id>
- <posX>230</posX>
+ <posX>260</posX>
<posY>620</posY>
- <width>700</width>
+ <width>670</width>
<height>93</height>
<seperator>----------------------------------------------------------------------------------------------</seperator>
<label>#TV.Guide.Description</label>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideo.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideo.xml 2007-11-16 14:42:17 UTC (rev 1067)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideo.xml 2007-11-16 15:15:39 UTC (rev 1068)
@@ -71,9 +71,9 @@
<id>1</id>
<animation effect="fade" time="400">WindowClose</animation>
<animation effect="fade" time="400">WindowOpen</animation>
- <posX>240</posX>
+ <posX>250</posX>
<posY>650</posY>
- <width>750</width>
+ <width>700</width>
<label>#selecteditem</label>
<font>wipeout</font>
<align>Left</align>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideoTitle.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideoTitle.xml 2007-11-16 14:42:17 UTC (rev 1067)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideoTitle.xml 2007-11-16 15:15:39 UTC (rev 1068)
@@ -68,7 +68,7 @@
<id>1</id>
<animation effect="fade" time="400">WindowClose</animation>
<animation effect="fade" time="400">WindowOpen</animation>
- <posX>240</posX>
+ <posX>250</posX>
<posY>650</posY>
<width>750</width>
<label>#selecteditem</label>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/videoOSD.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/videoOSD.xml 2007-11-16 14:42:17 UTC (rev 1067)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/videoOSD.xml 2007-11-16 15:15:39 UTC (rev 1068)
@@ -4,41 +4,39 @@
<defaultcontrol>213</defaultcontrol>
<allowoverlay>no</allowoverlay>
<controls>
- <import>common.progressbar.xml</import>
- <control>
- <description>Current Time Info</description>
- <type>label</type>
- <id>110</id>
- <posX>1221</posX>
- <posY>63</posY>
- <label>#time</label>
- <align>center</align>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>background</description>
+ <import>common.time.xml</import>
+
+
+
+
+
+
+
+
+ <control>
<type>image</type>
- <id>0</id>
- <posX>60</posX>
- <posY>478</posY>
- <width>400</width>
- <height>230</height>
- <texture>osd_bg_video.png</texture>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
+ <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>TV Logo</description>
+ <description>Video Logo</description>
<type>image</type>
<id>102</id>
- <posX>80</posX>
- <posY>498</posY>
- <width>50</width>
- <height>68</height>
- <texture>#Play.Current.Thumb</texture>
+ <posX>60</posX>
+ <posY>630</posY>
+ <width>60</width>
+ <height>78</height>
+ <texture flipY="true" diffuse="Thumb_Mask.png">#Play.Current.Thumb</texture>
<keepaspectratio>yes</keepaspectratio>
<centered>yes</centered>
<animation effect="fade" time="250">visiblechange</animation>
@@ -51,7 +49,7 @@
<width>290</width>
<height>30</height>
<posX>150</posX>
- <posY>496</posY>
+ <posY>590</posY>
<font>font13</font>
<label>#Play.Current.Title</label>
<textcolor>FFB2D4F5</textcolor>
@@ -63,656 +61,53 @@
<type>textboxscrollup</type>
<id>1</id>
<posX>154</posX>
- <posY>530</posY>
- <width>290</width>
- <height>150</height>
+ <posY>630</posY>
+ <width>750</width>
+ <height>120</height>
<label>#Play.Current.Plot</label>
<font>font10</font>
<textcolor>FFFFFFFF</textcolor>
<animation effect="fade" time="250">visiblechange</animation>
<animation effect="fade" time="250">windowopen</animation>
</control>
- <control>
- <description>Play</description>
- <type>togglebutton</type>
- <id>213</id>
- <posX>80</posX>
- <posY>588</posY>
- <width>50</width>
- <height>50</height>
- <AltTextureFocus>osd_pause_focus.png</AltTextureFocus>
- <AltTextureNoFocus>osd_pause_nofocus.png</AltTextureNoFocus>
- <textureFocus>osd_play_focus.png</textureFocus>
- <textureNoFocus>osd_play_nofocus.png</textureNoFocus>
- <label>-</label>
- <font>-</font>
- <onleft>213</onleft>
- <onright>213</onright>
- <onup>213</onup>
- <ondown>218</ondown>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>Subtitles Menu</description>
- <type>togglebutton</type>
- <id>218</id>
- <posX>90</posX>
- <posY>643</posY>
- <width>30</width>
- <height>30</height>
- <AltTextureFocus>osd_subtitles_focus.png</AltTextureFocus>
- <AltTextureNoFocus>osd_subtitles_nofocus.png</AltTextureNoFocus>
- <textureFocus>osd_subtitles_focus.png</textureFocus>
- <textureNoFocus>osd_subtitles_nofocus.png</textureNoFocus>
- <label>-</label>
- <font>-</font>
- <onleft>218</onleft>
- <onright>218</onright>
- <onup>213</onup>
- <ondown>218</ondown>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>Sub Menu Background (subtitles)</description>
+
+
+ <control>
+ <description>Progress background</description>
<type>image</type>
- <id>302</id>
- <posX>480</posX>
- <posY>478</posY>
- <width>310</width>
- <height>230</height>
- <texture>osd_bg_settings.png</texture>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
+ <id>1</id>
+ <posX>50</posX>
+ <posY>700</posY>
+ <width>546</width>
+ <texture>osd_progress_background.png</texture>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
- <description>SubTitle Delay label</description>
- <type>label</type>
- <id>850</id>
- <posX>510</posX>
- <posY>548</posY>
- <label>303</label>
- <font>font13</font>
- <textcolor>FFFFFFFF</textcolor>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
+ <description>progress bar</description>
+ <type>progress</type>
+ <id>20</id>
+ <posX>43</posX>
+ <posY>705</posY>
+ <width>544</width>
+ <label>#percentag</label>
+ <visible>yes</visible>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
- <control>
- <description>SubTitle Delay Slider</description>
- <type>slider</type>
- <id>800</id>
- <posX>510</posX>
- <posY>578</posY>
- <spintype>float</spintype>
- <textureSliderBar>osd_slider_bg.png</textureSliderBar>
- <textureSliderNib>osd_slider_nibNF.png</textureSliderNib>
- <textureSliderNibFocus>osd_slider_nibFO.png</textureSliderNibFocus>
- <onup>801</onup>
- <ondown>802</ondown>
- <onleft>800</onleft>
- <onright>800</onright>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>SubTitles On/Off Checkbox</description>
- <type>checkmark</type>
- <id>801</id>
- <posX>510</posX>
- <posY>508</posY>
- <label>305</label>
- <onup>801</onup>
- <ondown>800</ondown>
- <onleft>801</onleft>
- <onright>801</onright>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>Sub Titles List Control</description>
- <type>listcontrol</type> <dimColor>0x10ffffff</dimColor>
- <id>802</id>
- <posX>510</posX>
- <posY>603</posY>
- <width>250</width>
- <height>100</height>
- <onleft>802</onleft>
- <onright>802</onright>
- <onup>800</onup>
- <ondown>802</ondown>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>Skip Bwd</description>
- <type>togglebutton</type>
- <id>210</id>
- <posX>107</posX>
- <posY>514</posY>
- <width>35</width>
- <height>35</height>
- <AltTextureFocus>osd_back_focus.png</AltTextureFocus>
- <AltTextureNoFocus>osd_back_nofocus.png</AltTextureNoFocus>
- <textureFocus>osd_back_focus.png</textureFocus>
- <textureNoFocus>osd_back_focus.png</textureNoFocus>
- <label>-</label>
- <font>-</font>
- <onleft>212</onleft>
- <onright>216</onright>
- <onup>213</onup>
- <ondown>215</ondown>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>Rewind</description>
- <type>togglebutton</type>
- <id>211</id>
+ <control>
+ <description>progress bar shine</description>
+
+ <type>image</type>
+ <id>1</id>
<posX>55</posX>
- <posY>463</posY>
- <width>35</width>
- <height>35</height>
- <AltTextureFocus>osd_rewind_focus.png</AltTextureFocus>
- <AltTextureNoFocus>osd_rewind_nofocus.png</AltTextureNoFocus>
- <textureFocus>osd_rewind_focus.png</textureFocus>
- <textureNoFocus>osd_rewind_focus.png</textureNoFocus>
- <label>-</label>
- <font>-</font>
- <onleft>214</onleft>
- <onright>213</onright>
- <onup>218</onup>
- <ondown>212</ondown>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
+ <posY>705</posY>
+ <width>538</width>
+ <height>25</height>
+ <texture>osd_progress_shine.png</texture>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
- <control>
- <description>Stop</description>
- <type>button</type>
- <id>212</id>
- <posX>72</posX>
- <posY>498</posY>
- <width>35</width>
- <height>35</height>
- <textureFocus>osd_stop_focus.png</textureFocus>
- <textureNoFocus>osd_stop_nofocus.png</textureNoFocus>
- <label>-</label>
- <font>-</font>
- <onleft>216</onleft>
- <onright>213</onright>
- <onup>211</onup>
- <ondown>210</ondown>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>Fast Forward</description>
- <type>togglebutton</type>
- <id>214</id>
- <posX>160</posX>
- <posY>463</posY>
- <width>35</width>
- <height>35</height>
- <AltTextureFocus>osd_fastforward_focus.png</AltTextureFocus>
- <AltTextureNoFocus>osd_fastforward_nofocus.png</AltTextureNoFocus>
- <textureFocus>osd_fastforward_focus.png</textureFocus>
- <textureNoFocus>osd_fastforward_focus.png</textureNoFocus>
- <label>-</label>
- <font>-</font>
- <onleft>213</onleft>
- <onright>211</onright>
- <onup>219</onup>
- <ondown>216</ondown>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>Skip Fwd</description>
- <type>togglebutton</type>
- <id>215</id>
- <posX>107</posX>
- <posY>411</posY>
- <width>35</width>
- <height>35</height>
- <AltTextureFocus>osd_next_focus.png</AltTextureFocus>
- <AltTextureNoFocus>osd_next_nofocus.png</AltTextureNoFocus>
- <textureFocus>osd_next_focus.png</textureFocus>
- <textureNoFocus>osd_next_focus.png</textureNoFocus>
- <label>-</label>
- <font>-</font>
- <onleft>218</onleft>
- <onright>219</onright>
- <onup>210</onup>
- <ondown>213</ondown>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>Mute</description>
- <type>togglebutton</type>
- <id>216</id>
- <posX>143</posX>
- <posY>498</posY>
- <width>35</width>
- <height>35</height>
- <AltTextureFocus>osd_mute_focus.png</AltTextureFocus>
- <AltTextureNoFocus>osd_mute_nofocus.png</AltTextureNoFocus>
- <textureFocus>osd_mute_focus.png</textureFocus>
- <textureNoFocus>osd_mute_focus.png</textureNoFocus>
- <label>-</label>
- <font>-</font>
- <onleft>213</onleft>
- <onright>212</onright>
- <onup>214</onup>
- <ondown>210</ondown>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>Bookmarks Menu</description>
- <type>togglebutton</type>
- <id>219</id>
- <posX>144</posX>
- <posY>430</posY>
- <width>35</width>
- <height>35</height>
- <AltTextureFocus>osd_settings_bookmark_focus.png</AltTextureFocus>
- <AltTextureNoFocus>osd_settings_bookmark_nofocus.png</AltTextureNoFocus>
- <textureFocus>-</textureFocus>
- <textureNoFocus>osd_settings_bookmark_focus.png</textureNoFocus>
- <label>-</label>
- <font>-</font>
- <onleft>213</onleft>
- <onright>218</onright>
- <onup>215</onup>
- <ondown>214</ondown>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>Sub Menu Background (volume)</description>
- <type>image</type>
- <id>300</id>
- <posX>145</posX>
- <posY>315</posY>
- <texture>osd_dialog.png</texture>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>Sub Menu Background (subtitles)</description>
- <type>image</type>
- <id>302</id>
- <posX>145</posX>
- <posY>315</posY>
- <texture>osd_dialog.png</texture>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>Sub Menu Background (bookmarks)</description>
- <type>image</type>
- <id>303</id>
- <posX>145</posX>
- <posY>315</posY>
- <texture>osd_dialog.png</texture>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>Sub Menu Background (video)</description>
- <type>image</type>
- <id>304</id>
- <posX>145</posX>
- <posY>290</posY>
- <texture>osd_dialog_big.png</texture>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>Sub Menu Background (audio)</description>
- <type>image</type>
- <id>305</id>
- <posX>145</posX>
- <posY>315</posY>
- <texture>osd_dialog.png</texture>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>Sub Menu Nib</description>
- <type>image</type>
- <id>350</id>
- <texture>-</texture>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>Volume Slider</description>
- <type>slider</type>
- <id>400</id>
- <posX>185</posX>
- <posY>370</posY>
- <textureSliderBar>osd_slider_bg.png</textureSliderBar>
- <textureSliderNib>osd_slider_nibNF.png</textureSliderNib>
- <textureSliderNibFocus>osd_slider_nibFO.png</textureSliderNibFocus>
- <onup>216</onup>
- <ondown>216</ondown>
- <onleft>400</onleft>
- <onright>400</onright>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>A/v Delay label</description>
- <type>label</type>
- <id>550</id>
- <posX>185</posX>
- <posY>370</posY>
- <label>297</label>
- <font>font13</font>
- <textcolor>FFFFFFFF</textcolor>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>A/V Delay Slider</description>
- <type>slider</type>
- <id>500</id>
- <posX>300</posX>
- <posY>370</posY>
- <spintype>float</spintype>
- <textureSliderBar>osd_slider_bg.png</textureSliderBar>
- <textureSliderNib>osd_slider_nibNF.png</textureSliderNib>
- <textureSliderNibFocus>osd_slider_nibFO.png</textureSliderNibFocus>
- <onup>500</onup>
- <ondown>501</ondown>
- <onleft>501</onleft>
- <onright>501</onright>
- <visible>no</visible>
- <animation effect="fade" time="250">windowopen</animation>
- <animation effect="fade" time="250">visiblechange</animation>
- </control>
- <control>
- <description>Audio Stream List Control</description>
- <type>listcontrol</type> <dimColor>0x10ffffff</dimColor>
- <id>501</id>
- <posX>185</posX>
- <posY>400</posY>
- <width>355</width>
- <height>150</height>
- <onleft>500</onleft>
- <onright>500</onright>
- <onup>501</onup>
- <ondown>501</ondown>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>Video Position label</description>
- <type>label</type>
- <id>750</id>
- <posX>185</posX>
- <posY>340</posY>
- <label>298</label>
- <font>font13</font>
- <textcolor>FFFFFFFF</textcolor>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>Video Position Slider</description>
- <type>slider</type>
- <id>700</id>
- <posX>300</posX>
- <posY>340</posY>
- <spintype>int</spintype>
- <textureSliderBar>osd_slider_bg.png</textureSliderBar>
- <textureSliderNib>osd_slider_nibNF.png</textureSliderNib>
- <textureSliderNibFocus>osd_slider_nibFO.png</textureSliderNibFocus>
- <onup>700</onup>
- <ondown>701</ondown>
- <onleft>700</onleft>
- <onright>702</onright>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>Non-Interleaved Checkbox</description>
- <type>checkmark</type>
- <id>701</id>
- <posX>185</posX>
- <posY>370</posY>
- <label>306</label>
- <onup>700</onup>
- <ondown>703</ondown>
- <onleft>701</onleft>
- <onright>701</onright>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>No Cache Checkbox</description>
- <type>checkmark</type>
- <id>702</id>
- <posX>359</posX>
- <posY>370</posY>
- <label>431</label>
- <onup>700</onup>
- <ondown>703</ondown>
- <onleft>701</onleft>
- <onright>702</onright>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>Adjust Framerate Checkbox</description>
- <type>checkmark</type>
- <id>703</id>
- <posX>185</posX>
- <posY>395</posY>
- <label>343</label>
- <onup>701</onup>
- <ondown>704</ondown>
- <onleft>703</onleft>
- <onright>702</onright>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>brightness label</description>
- <type>label</type>
- <id>752</id>
- <posX>185</posX>
- <posY>425</posY>
- <label>464</label>
- <font>font13</font>
- <textcolor>FFFFFFFF</textcolor>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>brightness</description>
- <type>slider</type>
- <id>704</id>
- <posX>300</posX>
- <posY>425</posY>
- <spintype>int</spintype>
- <textureSliderBar>osd_slider_bg.png</textureSliderBar>
- <textureSliderNib>osd_slider_nibNF.png</textureSliderNib>
- <textureSliderNibFocus>osd_slider_nibFO.png</textureSliderNibFocus>
- <onup>703</onup>
- <ondown>705</ondown>
- <onleft>704</onleft>
- <onright>704</onright>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>contrast label</description>
- <type>label</type>
- <id>753</id>
- <posX>185</posX>
- <posY>455</posY>
- <label>465</label>
- <font>font13</font>
- <textcolor>FFFFFFFF</textcolor>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>contrast</description>
- <type>slider</type>
- <id>705</id>
- <posX>300</posX>
- <posY>455</posY>
- <spintype>int</spintype>
- <textureSliderBar>osd_slider_bg.png</textureSliderBar>
- <textureSliderNib>osd_slider_nibNF.png</textureSliderNib>
- <textureSliderNibFocus>osd_slider_nibFO.png</textureSliderNibFocus>
- <onup>704</onup>
- <ondown>706</ondown>
- <onleft>705</onleft>
- <onright>705</onright>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>gamma label</description>
- <type>label</type>
- <id>754</id>
- <posX>185</posX>
- <posY>485</posY>
- <label>466</label>
- <font>font13</font>
- <textcolor>FFFFFFFF</textcolor>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>gamma</description>
- <type>slider</type>
- <id>706</id>
- <posX>300</posX>
- <posY>485</posY>
- <spintype>int</spintype>
- <textureSliderBar>osd_slider_bg.png</textureSliderBar>
- <textureSliderNib>osd_slider_nibNF.png</textureSliderNib>
- <textureSliderNibFocus>osd_slider_nibFO.png</textureSliderNibFocus>
- <onup>705</onup>
- <ondown>706</ondown>
- <onleft>706</onleft>
- <onright>706</onright>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>Create Bookmark</description>
- <type>button</type>
- <id>600</id>
- <posX>185</posX>
- <posY>370</posY>
- <width>165</width>
- <height>32</height>
- <textureFocus>button_green_focus_165x32.png</textureFocus>
- <textureNoFocus>button_green_nofocus_165x32.png</textureNoFocus>
- <label>294</label>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- <colordiffuse>ffffffff</colordiffuse>
- <onleft>600</onleft>
- <onright>602</onright>
- <onup>600</onup>
- <ondown>601</ondown>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>Clear Bookmarks</description>
- <type>button</type>
- <id>602</id>
- <posX>375</posX>
- <posY>370</posY>
- <width>165</width>
- <height>32</height>
- <textureFocus>button_green_focus_165x32.png</textureFocus>
- <textureNoFocus>button_green_nofocus_165x32.png</textureNoFocus>
- <label>296</label>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- <colordiffuse>ffffffff</colordiffuse>
- <onleft>600</onleft>
- <onright>601</onright>
- <onup>600</onup>
- <ondown>601</ondown>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>Bookmarks List Control</description>
- <type>listcontrol</type> <dimColor>0x10ffffff</dimColor>
- <id>601</id>
- <posX>185</posX>
- <posY>410</posY>
- <width>355</width>
- <height>120</height>
- <onleft>602</onleft>
- <onright>600</onright>
- <onup>600</onup>
- <ondown>601</ondown>
- <spinPosX>465</spinPosX>
- <spinPosY>480</spinPosY>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
- <control>
- <description>Progress Bar Shine</description>
- <type>image</type>
- <id>103</id>
- <posX>79</posX>
- <posY>29</posY>
- <width>1191</width>
- <height>36</height>
- <texture>osd_progress_shine_bg.png</texture>
- <visible>no</visible>
- <animation effect="fade" time="250">visiblechange</animation>
- <animation effect="fade" time="250">windowopen</animation>
- </control>
-
+
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/videoOverlay.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/videoOverlay.xml 2007-11-16 14:42:17 UTC (rev 1067)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/videoOverlay.xml 2007-11-16 15:15:39 UTC (rev 1068)
@@ -4,28 +4,17 @@
<defaultcontrol>2</defaultcontrol>
<controls>
- <control>
- <description>VIDEO BACKGROUND</description>
- <type>image</type>
- <id>0</id>
- <posX>10</posX>
- <posY>575</posY>
- <width>211</width>
- <height>182</height>
- <texture>tv_background.png</texture>
- <animation effect="fade" time="500">WindowClose</animation>
- <animation effect="fade" time="250">WindowOpen</animation>
- </control>
+
<control>
<description>play time label</description>
<type>label</type>
<id>2</id>
- <posX>50</posX>
- <posY>705</posY>
+ <posX>20</posX>
+ <posY>592</posY>
<label>#currentplaytime</label>
<align>left</align>
- <font>wipeout</font>
- <textcolor>20ffffff</textcolor>
+ <font>font13</font>
+ <textcolor>ffffffff</textcolor>
<animation effect="fade" time="500">WindowClose</animation>
<animation effect="fade" time="250">WindowOpen</animation>
</control>
@@ -72,10 +61,10 @@
<control>
<description>scrolling info label</description>
<type>fadelabel</type>
- <width>180</width>
+ <width>100</width>
<height>40</height>
- <posX>25</posX>
- <posY>725</posY>
+ <posX>100</posX>
+ <posY>592</posY>
<font>font13</font>
<label>#Play.Current.Title\r#Play.Current.Genre\r#Play.Current.Year\r#Play.Current.Director</label>
<animation effect="fade" time="500">WindowClose</animation>
@@ -88,14 +77,47 @@
<type>videowindow</type>
<id>1</id>
<posX>20</posX>
- <posY>600</posY>
- <width>180</width>
- <height>101</height>
+ <posY>630</posY>
+ <width>178</width>
+ <height>100</height>
<action>18</action>
<textureFocus>tv_green_border.png</textureFocus>
<animation effect="fade" time="500">WindowClose</animation>
<animation effect="fade" time="250">WindowOpen</animation>
</control>
+ <control>
+ <description>Progress Background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>19</posX>
+ <posY>734</posY>
+ <width>179</width>
+ <height>19</height>
+ <texture>progess_white_back.png</texture>
+ <animation effect="fade" time="500">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ </control>
+
+ <control>
+ <description>progress bar</description>
+ <type>progress</type>
+ <id>1</id>
+ <posX>10</posX>
+ <posY>727</posY>
+ <width>544</width>
+ <label>#video.percentag</label>
+ <visible>yes</visible>
+
+
+ <texturebg>-</texturebg>
+ <lefttexture>white_progess.png</lefttexture>
+ <midtexture>white_progess.png</midtexture>
+ <righttexture>white_progess.png</righttexture>
+
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
+ </control>
+
</controls>
</window>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rs...@us...> - 2007-11-16 14:42:26
|
Revision: 1067
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1067&view=rev
Author: rsparey
Date: 2007-11-16 06:42:17 -0800 (Fri, 16 Nov 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/skins/Foofaraw/Foofaraw Support Files/Skin Layout/Backup_of_Skin Layout.cdr
trunk/skins/Foofaraw/Foofaraw Support Files/Skin Layout/Skin Layout.cdr
trunk/skins/Foofaraw/Foofaraw Support Files/Skin Layout/Waiting Animation Layout.cdr
Added Paths:
-----------
trunk/skins/Foofaraw/Foofaraw Support Files/Skin Icons/Hover Icons/Backup_of_guide.cdr
trunk/skins/Foofaraw/Foofaraw Support Files/Skin Icons/Hover Icons/Backup_of_record.cdr
trunk/skins/Foofaraw/Foofaraw Support Files/Skin Icons/Hover Icons/Backup_of_search.cdr
trunk/skins/Foofaraw/Foofaraw Support Files/Skin Icons/Hover Icons/guide.cdr
trunk/skins/Foofaraw/Foofaraw Support Files/Skin Icons/Hover Icons/record.cdr
trunk/skins/Foofaraw/Foofaraw Support Files/Skin Icons/Hover Icons/search.cdr
trunk/skins/Foofaraw/Foofaraw Support Files/Skin Layout/Backup_of_Waiting Animation Layout.cdr
trunk/skins/Foofaraw/Foofaraw Support Files/Skin Layout/obsoulete/Backup_of_Foofaraw Layout1.cdr
Added: trunk/skins/Foofaraw/Foofaraw Support Files/Skin Icons/Hover Icons/Backup_of_guide.cdr
===================================================================
(Binary files differ)
Property changes on: trunk/skins/Foofaraw/Foofaraw Support Files/Skin Icons/Hover Icons/Backup_of_guide.cdr
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skins/Foofaraw/Foofaraw Support Files/Skin Icons/Hover Icons/Backup_of_record.cdr
===================================================================
(Binary files differ)
Property changes on: trunk/skins/Foofaraw/Foofaraw Support Files/Skin Icons/Hover Icons/Backup_of_record.cdr
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skins/Foofaraw/Foofaraw Support Files/Skin Icons/Hover Icons/Backup_of_search.cdr
===================================================================
(Binary files differ)
Property changes on: trunk/skins/Foofaraw/Foofaraw Support Files/Skin Icons/Hover Icons/Backup_of_search.cdr
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skins/Foofaraw/Foofaraw Support Files/Skin Icons/Hover Icons/guide.cdr
===================================================================
(Binary files differ)
Property changes on: trunk/skins/Foofaraw/Foofaraw Support Files/Skin Icons/Hover Icons/guide.cdr
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skins/Foofaraw/Foofaraw Support Files/Skin Icons/Hover Icons/record.cdr
===================================================================
(Binary files differ)
Property changes on: trunk/skins/Foofaraw/Foofaraw Support Files/Skin Icons/Hover Icons/record.cdr
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skins/Foofaraw/Foofaraw Support Files/Skin Icons/Hover Icons/search.cdr
===================================================================
(Binary files differ)
Property changes on: trunk/skins/Foofaraw/Foofaraw Support Files/Skin Icons/Hover Icons/search.cdr
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/skins/Foofaraw/Foofaraw Support Files/Skin Layout/Backup_of_Skin Layout.cdr
===================================================================
(Binary files differ)
Added: trunk/skins/Foofaraw/Foofaraw Support Files/Skin Layout/Backup_of_Waiting Animation Layout.cdr
===================================================================
(Binary files differ)
Property changes on: trunk/skins/Foofaraw/Foofaraw Support Files/Skin Layout/Backup_of_Waiting Animation Layout.cdr
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/skins/Foofaraw/Foofaraw Support Files/Skin Layout/Skin Layout.cdr
===================================================================
(Binary files differ)
Modified: trunk/skins/Foofaraw/Foofaraw Support Files/Skin Layout/Waiting Animation Layout.cdr
===================================================================
(Binary files differ)
Added: trunk/skins/Foofaraw/Foofaraw Support Files/Skin Layout/obsoulete/Backup_of_Foofaraw Layout1.cdr
===================================================================
(Binary files differ)
Property changes on: trunk/skins/Foofaraw/Foofaraw Support Files/Skin Layout/obsoulete/Backup_of_Foofaraw Layout1.cdr
___________________________________________________________________
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: <sa...@us...> - 2007-11-15 18:58:51
|
Revision: 1066
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1066&view=rev
Author: saamand
Date: 2007-11-15 10:58:45 -0800 (Thu, 15 Nov 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs
trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/EvilLabs.cs
trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Wiki.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs 2007-11-15 16:24:06 UTC (rev 1065)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs 2007-11-15 18:58:45 UTC (rev 1066)
@@ -17,11 +17,13 @@
private ILyricForm m_Form;
// status
- private int noOfLyricsToSearch;
- private int noOfLyricsSearched;
- private int noOfLyricsFound;
- private int noOfLyricsNotFound;
+ private int m_noOfLyricsToSearch;
+ private int m_noOfLyricsSearched;
+ private int m_noOfLyricsFound;
+ private int m_noOfLyricsNotFound;
+ private int m_noOfCurrentSearches;
+
private bool m_StopSearches;
private bool m_allowAllToComplete;
@@ -46,12 +48,12 @@
this.m_allowAllToComplete = allowAllToSearch;
this.m_automaticUpdate = automaticUpdate;
- noOfLyricsToSearch = 1;
- noOfLyricsSearched = 0;
- noOfLyricsFound = 0;
- noOfLyricsNotFound = 0;
+ m_noOfLyricsToSearch = 1;
+ m_noOfLyricsSearched = 0;
+ m_noOfLyricsFound = 0;
+ m_noOfLyricsNotFound = 0;
+ m_noOfCurrentSearches = 0;
-
ArrayList easySitesArrayList = new ArrayList();
// If search all, then include all
@@ -136,6 +138,8 @@
public void AddNewLyricSearch(string artist, string title)
{
+ ++m_noOfCurrentSearches;
+
if (lyricsSites.Length > 0)
{
// create worker thread instance
@@ -164,15 +168,15 @@
{
//LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Information, 0, LyricDiagnostics.elapsedTimeString() + artist + " - " + title + " - " + site + " - " +lyricFound.ToString() );
if (lyricFound)
- ++noOfLyricsFound;
+ ++m_noOfLyricsFound;
else
- ++noOfLyricsNotFound;
+ ++m_noOfLyricsNotFound;
- ++noOfLyricsSearched;
+ ++m_noOfLyricsSearched;
- m_Form.UpdateStatus = new Object[] { noOfLyricsToSearch, noOfLyricsSearched, noOfLyricsFound, noOfLyricsNotFound };
+ m_Form.UpdateStatus = new Object[] { m_noOfLyricsToSearch, m_noOfLyricsSearched, m_noOfLyricsFound, m_noOfLyricsNotFound };
- if ((noOfLyricsSearched >= noOfLyricsToSearch))
+ if ((m_noOfLyricsSearched >= m_noOfLyricsToSearch))
{
FinishThread(artist, title, "All songs have been searched!", site);
}
@@ -181,6 +185,8 @@
internal void LyricFound(String lyricStrings, String artist, String title, String site)
{
+ --m_noOfCurrentSearches;
+
if (m_allowAllToComplete || m_StopSearches == false)
{
m_Form.LyricFound = new Object[] { lyricStrings, artist, title, site };
@@ -190,6 +196,8 @@
internal void LyricNotFound(String artist, String title, String message, String site)
{
+ --m_noOfCurrentSearches;
+
if (m_allowAllToComplete || m_StopSearches == false)
{
m_Form.LyricNotFound = new Object[] { artist, title, message, site };
@@ -234,7 +242,12 @@
public int NoOfLyricsToSearch
{
- set { noOfLyricsToSearch = value; }
+ set { m_noOfLyricsToSearch = value; }
}
+
+ public int NoOfCurrentSearches
+ {
+ get { return m_noOfCurrentSearches; }
+ }
}
}
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/EvilLabs.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/EvilLabs.cs 2007-11-15 16:24:06 UTC (rev 1065)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/EvilLabs.cs 2007-11-15 18:58:45 UTC (rev 1066)
@@ -96,7 +96,7 @@
lyric = line.Replace("<br>", "\r\n").Trim();
// if warning message from Evil Labs' sql-server, then lyric isn't found
- if (lyric.Contains("<b>Warning</b>"))
+ if (lyric.Contains("<b>Warning</b>") || lyric.Contains("type="))
{
lyric = "Not found";
}
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Wiki.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Wiki.cs 2007-11-15 16:24:06 UTC (rev 1065)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Wiki.cs 2007-11-15 18:58:45 UTC (rev 1066)
@@ -17,7 +17,7 @@
public static bool Abort;
LyricSearch lyricSearch ;
- private string[] commonReplacementsLyricWiki = new string[16] { "<br>", "", "<BR>", "", "?d", "'d", "?s", "'s", "?t", "'t", "?v", "'v", "?e", "'e", "?r", "'r" };
+ private string[] commonReplacementsLyricWiki = new string[18] { "<br>", "", "<br/>", "", "<BR>", "", "?d", "'d", "?s", "'s", "?t", "'t", "?v", "'v", "?e", "'e", "?r", "'r" };
private string[] commonRemoveFromLyricWiki = new string[2] { "[[category", "[[Category" };
public Wiki(LyricSearch lyricSearch)
@@ -34,7 +34,7 @@
IAsyncResult ar = del.BeginInvoke(this.artist, this.title, null, null);
- while (noOfTries < 10)
+ while (noOfTries < 9)
{
// If the user has aborted stop the search and return (false)
if (Abort || lyricSearch.SearchHasEnded)
@@ -121,7 +121,8 @@
}
}
- if (lyric.Contains("API request randomly") || lyric.Contains("Upgrading right") || lyric.Contains("LyricWiki.org"))
+ if (lyric.Contains("API request randomly") || lyric.Contains("Upgrading right") || lyric.Contains("LyricWiki.org")
+ || lyric.Contains("<!-- PUT LYRICS HERE"))
{
lyric = string.Empty;
}
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs 2007-11-15 16:24:06 UTC (rev 1065)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs 2007-11-15 18:58:45 UTC (rev 1066)
@@ -70,7 +70,6 @@
int m_SongsToSearch = 0;
int m_LyricsFound = 0;
int m_LyricsNotFound = 0;
- int m_noOfCurrentlySearches = 0;
// Search criteries
bool m_DisregardKnownLyric = true;
@@ -82,7 +81,7 @@
bool m_automaticWriteToMusicTag = true;
- const int m_NoOfCurrentSearchesAllowed = 5;
+ const int m_NoOfCurrentSearchesAllowed = 6;
int m_Limit = 100;
// Collections and arrays
@@ -366,7 +365,6 @@
m_EventStopThread = new ManualResetEvent(false);
m_noOfMessages = 0;
- m_noOfCurrentlySearches = 0;
btStartBatchSearch.Enabled = false;
@@ -486,7 +484,6 @@
writerLog.Write(log);
writerLog.Close();
- m_noOfCurrentlySearches -= 1;
progressBar.PerformStep();
this.Update();
}
@@ -520,7 +517,6 @@
writerLog.Write(log);
writerLog.Close();
- m_noOfCurrentlySearches -= 1;
progressBar.PerformStep();
this.Update();
}
@@ -769,9 +765,8 @@
else if (lc == null)
return;
- if (m_noOfCurrentlySearches < m_NoOfCurrentSearchesAllowed && lc.StopSearches == false)
+ if (lc.NoOfCurrentSearches < m_NoOfCurrentSearchesAllowed && lc.StopSearches == false)
{
- m_noOfCurrentlySearches += 1;
string[] lyricID = (string[])lyricConfigInfosQueue.Dequeue();
lc.AddNewLyricSearch(lyricID[0], lyricID[1]);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2007-11-15 16:24:15
|
Revision: 1065
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1065&view=rev
Author: saamand
Date: 2007-11-15 08:24:06 -0800 (Thu, 15 Nov 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs
trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/EvilLabs.cs
trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/HotLyrics.cs
trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Lyrics007.cs
trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsOnDemand.cs
trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/SeekLyrics.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/ExportTags.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/ImportTags.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/LyricsLibrary.Designer.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.Designer.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.resx
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
Added Paths:
-----------
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.resx
trunk/plugins/MyLyrics/My Lyrics/TagReaderUtil.cs
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs 2007-11-15 15:33:55 UTC (rev 1064)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsController.cs 2007-11-15 16:24:06 UTC (rev 1065)
@@ -110,9 +110,6 @@
public void Dispose()
{
- //m_EventStop_LyricController.Close();
- //m_EventStopped_LyricController.Close();
-
// clean-up operations may be placed here
for (int i = 0; i < threadList.Count; i++)
{
@@ -124,10 +121,15 @@
{
for (int i = 0; i < threadList.Count; i++)
{
- stillThreadsAlive = false; ;
+ stillThreadsAlive = false;
if (((Thread)threadList[i]).IsAlive)
stillThreadsAlive = true;
}
+
+ if (threadList.Count == 0)
+ {
+ stillThreadsAlive = false;
+ }
}
FinishThread("", "", "The search has ended.", "");
}
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/EvilLabs.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/EvilLabs.cs 2007-11-15 15:33:55 UTC (rev 1064)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/EvilLabs.cs 2007-11-15 16:24:06 UTC (rev 1065)
@@ -123,6 +123,10 @@
void timer_Elapsed(object sender, ElapsedEventArgs e)
{
+ timer.Stop();
+ timer.Close();
+ timer.Dispose();
+
lyric = "Not found";
complete = true;
Thread.CurrentThread.Abort();
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/HotLyrics.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/HotLyrics.cs 2007-11-15 15:33:55 UTC (rev 1064)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/HotLyrics.cs 2007-11-15 16:24:06 UTC (rev 1065)
@@ -220,6 +220,10 @@
void timer_Elapsed(object sender, ElapsedEventArgs e)
{
+ timer.Stop();
+ timer.Close();
+ timer.Dispose();
+
lyric = "Not found";
complete = true;
Thread.CurrentThread.Abort();
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Lyrics007.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Lyrics007.cs 2007-11-15 15:33:55 UTC (rev 1064)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/Lyrics007.cs 2007-11-15 16:24:06 UTC (rev 1065)
@@ -139,7 +139,7 @@
}
}
}
- catch (System.Reflection.TargetInvocationException)
+ catch (Exception)
{
lyric = "Not found";
}
@@ -160,6 +160,10 @@
void timer_Elapsed(object sender, ElapsedEventArgs e)
{
+ timer.Stop();
+ timer.Close();
+ timer.Dispose();
+
lyric = "Not found";
complete = true;
Thread.CurrentThread.Abort();
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsOnDemand.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsOnDemand.cs 2007-11-15 15:33:55 UTC (rev 1064)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsOnDemand.cs 2007-11-15 16:24:06 UTC (rev 1065)
@@ -187,6 +187,10 @@
void timer_Elapsed(object sender, ElapsedEventArgs e)
{
+ timer.Stop();
+ timer.Close();
+ timer.Dispose();
+
lyric = "Not found";
complete = true;
Thread.CurrentThread.Abort();
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/SeekLyrics.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/SeekLyrics.cs 2007-11-15 15:33:55 UTC (rev 1064)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/SeekLyrics.cs 2007-11-15 16:24:06 UTC (rev 1065)
@@ -199,6 +199,10 @@
void timer_Elapsed(object sender, ElapsedEventArgs e)
{
+ timer.Stop();
+ timer.Close();
+ timer.Dispose();
+
lyric = "Not found";
complete = true;
Thread.CurrentThread.Abort();
Added: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs (rev 0)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs 2007-11-15 16:24:06 UTC (rev 1065)
@@ -0,0 +1,230 @@
+namespace MyLyrics
+{
+ partial class Information
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Component Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Information));
+ this.lbIntro = new System.Windows.Forms.Label();
+ this.lbInfo2 = new System.Windows.Forms.Label();
+ this.lbInfo1 = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
+ this.label4 = new System.Windows.Forms.Label();
+ this.label5 = new System.Windows.Forms.Label();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.label3 = new System.Windows.Forms.Label();
+ this.label1 = new System.Windows.Forms.Label();
+ this.label6 = new System.Windows.Forms.Label();
+ this.label7 = new System.Windows.Forms.Label();
+ this.label8 = new System.Windows.Forms.Label();
+ this.linkLabelForum = new System.Windows.Forms.LinkLabel();
+ this.panel1.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // lbIntro
+ //
+ this.lbIntro.AutoSize = true;
+ this.lbIntro.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+ this.lbIntro.Location = new System.Drawing.Point(29, 57);
+ this.lbIntro.MaximumSize = new System.Drawing.Size(480, 0);
+ this.lbIntro.MinimumSize = new System.Drawing.Size(480, 67);
+ this.lbIntro.Name = "lbIntro";
+ this.lbIntro.Size = new System.Drawing.Size(480, 80);
+ this.lbIntro.TabIndex = 0;
+ this.lbIntro.Text = resources.GetString("lbIntro.Text");
+ //
+ // lbInfo2
+ //
+ this.lbInfo2.AutoSize = true;
+ this.lbInfo2.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbInfo2.ForeColor = System.Drawing.Color.Navy;
+ this.lbInfo2.Location = new System.Drawing.Point(26, 153);
+ this.lbInfo2.Name = "lbInfo2";
+ this.lbInfo2.Size = new System.Drawing.Size(326, 17);
+ this.lbInfo2.TabIndex = 2;
+ this.lbInfo2.Text = "The four tabs of the MyLyrics configuration:";
+ //
+ // lbInfo1
+ //
+ this.lbInfo1.AutoSize = true;
+ this.lbInfo1.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbInfo1.ForeColor = System.Drawing.Color.Navy;
+ this.lbInfo1.Location = new System.Drawing.Point(26, 30);
+ this.lbInfo1.Name = "lbInfo1";
+ this.lbInfo1.Size = new System.Drawing.Size(225, 17);
+ this.lbInfo1.TabIndex = 3;
+ this.lbInfo1.Text = "My Lyrics plugin, version 1.00";
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(12, 17);
+ this.label2.MaximumSize = new System.Drawing.Size(460, 0);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(445, 39);
+ this.label2.TabIndex = 4;
+ this.label2.Text = resources.GetString("label2.Text");
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label4.ForeColor = System.Drawing.Color.Navy;
+ this.label4.Location = new System.Drawing.Point(3, 4);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(100, 13);
+ this.label4.TabIndex = 6;
+ this.label4.Text = "Lyrics database:";
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.Location = new System.Drawing.Point(12, 140);
+ this.label5.MaximumSize = new System.Drawing.Size(460, 0);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(458, 26);
+ this.label5.TabIndex = 7;
+ this.label5.Text = "You can perform a search on your whole music database in a single batch search. Y" +
+ "ou can also choose to select all songs contained in the marked database.";
+ //
+ // panel1
+ //
+ this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+ this.panel1.Controls.Add(this.label8);
+ this.panel1.Controls.Add(this.label7);
+ this.panel1.Controls.Add(this.label6);
+ this.panel1.Controls.Add(this.label5);
+ this.panel1.Controls.Add(this.label1);
+ this.panel1.Controls.Add(this.label3);
+ this.panel1.Controls.Add(this.label4);
+ this.panel1.Controls.Add(this.label2);
+ this.panel1.Location = new System.Drawing.Point(29, 173);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(480, 251);
+ this.panel1.TabIndex = 8;
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(12, 79);
+ this.label3.MaximumSize = new System.Drawing.Size(460, 0);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(447, 39);
+ this.label3.TabIndex = 7;
+ this.label3.Text = resources.GetString("label3.Text");
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label1.ForeColor = System.Drawing.Color.Navy;
+ this.label1.Location = new System.Drawing.Point(3, 66);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(144, 13);
+ this.label1.TabIndex = 8;
+ this.label1.Text = "Music database browse:";
+ //
+ // label6
+ //
+ this.label6.AutoSize = true;
+ this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label6.ForeColor = System.Drawing.Color.Navy;
+ this.label6.Location = new System.Drawing.Point(3, 127);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(136, 13);
+ this.label6.TabIndex = 9;
+ this.label6.Text = "Music database batch:";
+ //
+ // label7
+ //
+ this.label7.AutoSize = true;
+ this.label7.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label7.ForeColor = System.Drawing.Color.Navy;
+ this.label7.Location = new System.Drawing.Point(3, 176);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(53, 13);
+ this.label7.TabIndex = 10;
+ this.label7.Text = "Settings";
+ //
+ // label8
+ //
+ this.label8.AutoSize = true;
+ this.label8.Location = new System.Drawing.Point(12, 189);
+ this.label8.MaximumSize = new System.Drawing.Size(460, 0);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(454, 52);
+ this.label8.TabIndex = 11;
+ this.label8.Text = resources.GetString("label8.Text");
+ //
+ // linkLabelForum
+ //
+ this.linkLabelForum.AutoSize = true;
+ this.linkLabelForum.LinkColor = System.Drawing.Color.Navy;
+ this.linkLabelForum.Location = new System.Drawing.Point(364, 436);
+ this.linkLabelForum.Name = "linkLabelForum";
+ this.linkLabelForum.Size = new System.Drawing.Size(145, 13);
+ this.linkLabelForum.TabIndex = 9;
+ this.linkLabelForum.TabStop = true;
+ this.linkLabelForum.Tag = "http://forum.team-mediaportal.com/my_lyrics_plugin-f163.html";
+ this.linkLabelForum.Text = "MyLyrics plugin forum section";
+ this.linkLabelForum.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabelForum_LinkClicked);
+ //
+ // Information
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.linkLabelForum);
+ this.Controls.Add(this.panel1);
+ this.Controls.Add(this.lbInfo1);
+ this.Controls.Add(this.lbInfo2);
+ this.Controls.Add(this.lbIntro);
+ this.Name = "Information";
+ this.Size = new System.Drawing.Size(539, 494);
+ this.panel1.ResumeLayout(false);
+ this.panel1.PerformLayout();
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Label lbIntro;
+ private System.Windows.Forms.Label lbInfo2;
+ private System.Windows.Forms.Label lbInfo1;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.Panel panel1;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.Label label6;
+ private System.Windows.Forms.Label label8;
+ private System.Windows.Forms.Label label7;
+ private System.Windows.Forms.LinkLabel linkLabelForum;
+ }
+}
Added: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.cs (rev 0)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.cs 2007-11-15 16:24:06 UTC (rev 1065)
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
+
+namespace MyLyrics
+{
+ public partial class Information : UserControl
+ {
+ Form parent;
+
+ public Information(Form parent)
+ {
+ this.parent = parent;
+ InitializeComponent();
+ }
+
+ private void linkLabelForum_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+ {
+ System.Diagnostics.Process proc = new System.Diagnostics.Process();
+ proc.StartInfo.FileName = "iexplore";
+ proc.StartInfo.Arguments = "http://forum.team-mediaportal.com/my_lyrics_plugin-f163.html";
+ proc.Start();
+ }
+ }
+}
Added: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.resx
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.resx (rev 0)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.resx 2007-11-15 16:24:06 UTC (rev 1065)
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <data name="lbIntro.Text" xml:space="preserve">
+ <value>The MyLyrics plugin makes it possible for you to see the lyric for the currently played song in MediaPortal. When playing a song in MediaPortal simple go into MyLyrics and the lyric for the song will be displayed.
+
+Also when run in configuration mode, you will be able to work on your lyrics database, import and export lyrics from music tags, and perform various types of searches.</value>
+ </data>
+ <data name="label2.Text" xml:space="preserve">
+ <value>Here you can see your lyrics (containing the songs with a matching lyric) and your marked database (containing the songs that have been searched without any matching lyrics found). You can modify, import, and find an alternative title for a known song amont other things.</value>
+ </data>
+ <data name="label3.Text" xml:space="preserve">
+ <value>This is where you can browsw your music database and manually select the songs taht you would like to search the Internet for. When a lyric is found it is added to the lyrics database. If not it is added to the marked database.</value>
+ </data>
+ <data name="label8.Text" xml:space="preserve">
+ <value>Here you can set up the plugin as you prefer. E.g. you can choose the name to be shown for the plugin inside MediaPortal or if a found lyric should be stored in the tag of the music file. You can also tweak the settings regarding the "Find Lyrics" dialog accessable from the "Lyrics database" tab, and choose which sites you want to query in your searches.</value>
+ </data>
+</root>
\ No newline at end of file
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/ExportTags.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/ExportTags.cs 2007-11-15 15:33:55 UTC (rev 1064)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/ExportTags.cs 2007-11-15 16:24:06 UTC (rev 1065)
@@ -38,7 +38,10 @@
MusicDatabase mDB = MusicDatabase.Instance;
artists = new ArrayList();
songs = new List<Song>();
- mDB.GetArtists(0, "", ref artists);
+ mDB.GetAllArtists(ref artists);
+ //mDB.GetArtists(0, "", ref artists);
+ //mDB.Get
+
artists.Sort();
progressBar.ResetText();
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/ImportTags.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/ImportTags.cs 2007-11-15 15:33:55 UTC (rev 1064)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/ImportTags.cs 2007-11-15 16:24:06 UTC (rev 1065)
@@ -38,7 +38,8 @@
tags = new List<MusicTag>();
artists = new ArrayList();
songs = new List<Song>();
- mDB.GetArtists(0, "", ref artists);
+ //mDB.GetArtists(0, "", ref artists);
+ mDB.GetAllArtists(ref artists);
artists.Sort();
progressBar.ResetText();
@@ -72,7 +73,7 @@
foreach (Song song in songs)
{
MusicTag tag = TagReader.ReadTag(song.FileName);
- if (tag.Lyrics != string.Empty)
+ if (tag != null && tag.Lyrics != string.Empty)
{
tags.Add(tag);
++counter;
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/LyricsLibrary.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/LyricsLibrary.Designer.cs 2007-11-15 15:33:55 UTC (rev 1064)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/LyricsLibrary.Designer.cs 2007-11-15 16:24:06 UTC (rev 1065)
@@ -340,21 +340,21 @@
//
// btResetMarkedLyricsDatabase
//
- this.btResetMarkedLyricsDatabase.Location = new System.Drawing.Point(426, 18);
+ this.btResetMarkedLyricsDatabase.Location = new System.Drawing.Point(451, 18);
this.btResetMarkedLyricsDatabase.Name = "btResetMarkedLyricsDatabase";
- this.btResetMarkedLyricsDatabase.Size = new System.Drawing.Size(100, 23);
+ this.btResetMarkedLyricsDatabase.Size = new System.Drawing.Size(75, 23);
this.btResetMarkedLyricsDatabase.TabIndex = 11;
- this.btResetMarkedLyricsDatabase.Text = "Marked database";
+ this.btResetMarkedLyricsDatabase.Text = "MarkedDB";
this.btResetMarkedLyricsDatabase.UseVisualStyleBackColor = true;
this.btResetMarkedLyricsDatabase.Click += new System.EventHandler(this.button1_Click);
//
// btResetLyricsDatabase
//
- this.btResetLyricsDatabase.Location = new System.Drawing.Point(320, 17);
+ this.btResetLyricsDatabase.Location = new System.Drawing.Point(370, 18);
this.btResetLyricsDatabase.Name = "btResetLyricsDatabase";
- this.btResetLyricsDatabase.Size = new System.Drawing.Size(100, 23);
+ this.btResetLyricsDatabase.Size = new System.Drawing.Size(75, 23);
this.btResetLyricsDatabase.TabIndex = 10;
- this.btResetLyricsDatabase.Text = "Lyrics database";
+ this.btResetLyricsDatabase.Text = "LyricsDB";
this.btResetLyricsDatabase.UseVisualStyleBackColor = true;
this.btResetLyricsDatabase.Click += new System.EventHandler(this.btResetDatabase_Click);
//
@@ -362,7 +362,7 @@
//
this.lbResetDatabase.Location = new System.Drawing.Point(11, 14);
this.lbResetDatabase.Name = "lbResetDatabase";
- this.lbResetDatabase.Size = new System.Drawing.Size(303, 30);
+ this.lbResetDatabase.Size = new System.Drawing.Size(353, 30);
this.lbResetDatabase.TabIndex = 9;
this.lbResetDatabase.Text = "Reset the lyrics database or the database with\r\nmarked titles. All data in the da" +
"tabase will be permanately lost.";
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.Designer.cs 2007-11-15 15:33:55 UTC (rev 1064)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.Designer.cs 2007-11-15 16:24:06 UTC (rev 1065)
@@ -14,37 +14,39 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MusicDatabaseBrowse));
this.btDeselectAll = new System.Windows.Forms.Button();
this.btSelectAll = new System.Windows.Forms.Button();
- this.listViewSongs = new System.Windows.Forms.ListView();
+ this.lvSongs = new System.Windows.Forms.ListView();
this.columnHeaderSong = new System.Windows.Forms.ColumnHeader();
this.columnHeaderDB = new System.Windows.Forms.ColumnHeader();
this.columnHeaderStatus = new System.Windows.Forms.ColumnHeader();
+ this.imageList = new System.Windows.Forms.ImageList(this.components);
this.lbArtistNumber = new System.Windows.Forms.Label();
- this.listViewSelectedSongs = new System.Windows.Forms.ListView();
+ this.lvSelectedSongs = new System.Windows.Forms.ListView();
this.columnHeaderArtist2 = new System.Windows.Forms.ColumnHeader();
this.columnHeaderSong2 = new System.Windows.Forms.ColumnHeader();
this.columnHeaderDatabase2 = new System.Windows.Forms.ColumnHeader();
this.columnHeaderStatus2 = new System.Windows.Forms.ColumnHeader();
this.btAdd = new System.Windows.Forms.Button();
this.gbMusicDatabase = new System.Windows.Forms.GroupBox();
+ this.btAddAll = new System.Windows.Forms.Button();
this.lbSelectedArtist = new System.Windows.Forms.Label();
- this.listViewArtists = new System.Windows.Forms.ListView();
+ this.lvArtists = new System.Windows.Forms.ListView();
this.columnHeaderArtist = new System.Windows.Forms.ColumnHeader();
this.gbSelected = new System.Windows.Forms.GroupBox();
+ this.btCancel = new System.Windows.Forms.Button();
+ this.btRemoveAll = new System.Windows.Forms.Button();
this.btDeselectAll2 = new System.Windows.Forms.Button();
this.btSelectAll2 = new System.Windows.Forms.Button();
this.btRemove = new System.Windows.Forms.Button();
this.btSearch = new System.Windows.Forms.Button();
this.bw = new System.ComponentModel.BackgroundWorker();
- this.imageList = new System.Windows.Forms.ImageList(this.components);
- this.btAddAll = new System.Windows.Forms.Button();
- this.btRemoveAll = new System.Windows.Forms.Button();
+ this.lbStats = new System.Windows.Forms.Label();
this.gbMusicDatabase.SuspendLayout();
this.gbSelected.SuspendLayout();
this.SuspendLayout();
//
// btDeselectAll
//
- this.btDeselectAll.Location = new System.Drawing.Point(437, 208);
+ this.btDeselectAll.Location = new System.Drawing.Point(437, 219);
this.btDeselectAll.Name = "btDeselectAll";
this.btDeselectAll.Size = new System.Drawing.Size(75, 23);
this.btDeselectAll.TabIndex = 10;
@@ -54,7 +56,7 @@
//
// btSelectAll
//
- this.btSelectAll.Location = new System.Drawing.Point(356, 208);
+ this.btSelectAll.Location = new System.Drawing.Point(356, 219);
this.btSelectAll.Name = "btSelectAll";
this.btSelectAll.Size = new System.Drawing.Size(75, 23);
this.btSelectAll.TabIndex = 9;
@@ -62,22 +64,22 @@
this.btSelectAll.UseVisualStyleBackColor = true;
this.btSelectAll.Click += new System.EventHandler(this.btSelectAll_Click);
//
- // listViewSongs
+ // lvSongs
//
- this.listViewSongs.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+ this.lvSongs.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.columnHeaderSong,
this.columnHeaderDB,
this.columnHeaderStatus});
- this.listViewSongs.FullRowSelect = true;
- this.listViewSongs.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
- this.listViewSongs.Location = new System.Drawing.Point(189, 38);
- this.listViewSongs.Name = "listViewSongs";
- this.listViewSongs.Size = new System.Drawing.Size(332, 164);
- this.listViewSongs.SmallImageList = this.imageList;
- this.listViewSongs.Sorting = System.Windows.Forms.SortOrder.Ascending;
- this.listViewSongs.TabIndex = 8;
- this.listViewSongs.UseCompatibleStateImageBehavior = false;
- this.listViewSongs.View = System.Windows.Forms.View.Details;
+ this.lvSongs.FullRowSelect = true;
+ this.lvSongs.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
+ this.lvSongs.Location = new System.Drawing.Point(189, 33);
+ this.lvSongs.Name = "lvSongs";
+ this.lvSongs.Size = new System.Drawing.Size(332, 164);
+ this.lvSongs.SmallImageList = this.imageList;
+ this.lvSongs.Sorting = System.Windows.Forms.SortOrder.Ascending;
+ this.lvSongs.TabIndex = 8;
+ this.lvSongs.UseCompatibleStateImageBehavior = false;
+ this.lvSongs.View = System.Windows.Forms.View.Details;
//
// columnHeaderSong
//
@@ -94,32 +96,38 @@
this.columnHeaderStatus.Text = "Status";
this.columnHeaderStatus.Width = 44;
//
+ // imageList
+ //
+ this.imageList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList.ImageStream")));
+ this.imageList.TransparentColor = System.Drawing.Color.Transparent;
+ this.imageList.Images.SetKeyName(0, "yes.gif");
+ //
// lbArtistNumber
//
this.lbArtistNumber.AutoSize = true;
- this.lbArtistNumber.Location = new System.Drawing.Point(11, 21);
+ this.lbArtistNumber.Location = new System.Drawing.Point(11, 16);
this.lbArtistNumber.Name = "lbArtistNumber";
this.lbArtistNumber.Size = new System.Drawing.Size(67, 13);
this.lbArtistNumber.TabIndex = 7;
this.lbArtistNumber.Text = "[no of artists]";
//
- // listViewSelectedSongs
+ // lvSelectedSongs
//
- this.listViewSelectedSongs.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+ this.lvSelectedSongs.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.columnHeaderArtist2,
this.columnHeaderSong2,
this.columnHeaderDatabase2,
this.columnHeaderStatus2});
- this.listViewSelectedSongs.FullRowSelect = true;
- this.listViewSelectedSongs.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
- this.listViewSelectedSongs.Location = new System.Drawing.Point(11, 19);
- this.listViewSelectedSongs.Name = "listViewSelectedSongs";
- this.listViewSelectedSongs.Size = new System.Drawing.Size(510, 164);
- this.listViewSelectedSongs.SmallImageList = this.imageList;
- this.listViewSelectedSongs.Sorting = System.Windows.Forms.SortOrder.Ascending;
- this.listViewSelectedSongs.TabIndex = 11;
- this.listViewSelectedSongs.UseCompatibleStateImageBehavior = false;
- this.listViewSelectedSongs.View = System.Windows.Forms.View.Details;
+ this.lvSelectedSongs.FullRowSelect = true;
+ this.lvSelectedSongs.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
+ this.lvSelectedSongs.Location = new System.Drawing.Point(11, 19);
+ this.lvSelectedSongs.Name = "lvSelectedSongs";
+ this.lvSelectedSongs.Size = new System.Drawing.Size(510, 164);
+ this.lvSelectedSongs.SmallImageList = this.imageList;
+ this.lvSelectedSongs.Sorting = System.Windows.Forms.SortOrder.Ascending;
+ this.lvSelectedSongs.TabIndex = 11;
+ this.lvSelectedSongs.UseCompatibleStateImageBehavior = false;
+ this.lvSelectedSongs.View = System.Windows.Forms.View.Details;
//
// columnHeaderArtist2
//
@@ -143,7 +151,7 @@
//
// btAdd
//
- this.btAdd.Location = new System.Drawing.Point(275, 208);
+ this.btAdd.Location = new System.Drawing.Point(275, 219);
this.btAdd.Name = "btAdd";
this.btAdd.Size = new System.Drawing.Size(75, 23);
this.btAdd.TabIndex = 12;
@@ -153,44 +161,55 @@
//
// gbMusicDatabase
//
+ this.gbMusicDatabase.Controls.Add(this.lbStats);
this.gbMusicDatabase.Controls.Add(this.btAddAll);
this.gbMusicDatabase.Controls.Add(this.lbSelectedArtist);
- this.gbMusicDatabase.Controls.Add(this.listViewArtists);
+ this.gbMusicDatabase.Controls.Add(this.lvArtists);
this.gbMusicDatabase.Controls.Add(this.btAdd);
this.gbMusicDatabase.Controls.Add(this.btDeselectAll);
this.gbMusicDatabase.Controls.Add(this.lbArtistNumber);
this.gbMusicDatabase.Controls.Add(this.btSelectAll);
- this.gbMusicDatabase.Controls.Add(this.listViewSongs);
+ this.gbMusicDatabase.Controls.Add(this.lvSongs);
this.gbMusicDatabase.Location = new System.Drawing.Point(5, 5);
this.gbMusicDatabase.Name = "gbMusicDatabase";
- this.gbMusicDatabase.Size = new System.Drawing.Size(538, 237);
+ this.gbMusicDatabase.Size = new System.Drawing.Size(538, 249);
this.gbMusicDatabase.TabIndex = 13;
this.gbMusicDatabase.TabStop = false;
this.gbMusicDatabase.Text = "Select songs from music database";
//
+ // btAddAll
+ //
+ this.btAddAll.Location = new System.Drawing.Point(194, 219);
+ this.btAddAll.Name = "btAddAll";
+ this.btAddAll.Size = new System.Drawing.Size(75, 23);
+ this.btAddAll.TabIndex = 15;
+ this.btAddAll.Text = "Add all";
+ this.btAddAll.UseVisualStyleBackColor = true;
+ this.btAddAll.Click += new System.EventHandler(this.btAddAll_Click);
+ //
// lbSelectedArtist
//
this.lbSelectedArtist.AutoSize = true;
- this.lbSelectedArtist.Location = new System.Drawing.Point(191, 21);
+ this.lbSelectedArtist.Location = new System.Drawing.Point(191, 16);
this.lbSelectedArtist.Name = "lbSelectedArtist";
this.lbSelectedArtist.Size = new System.Drawing.Size(78, 13);
this.lbSelectedArtist.TabIndex = 14;
this.lbSelectedArtist.Text = "[selected artist]";
//
- // listViewArtists
+ // lvArtists
//
- this.listViewArtists.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+ this.lvArtists.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.columnHeaderArtist});
- this.listViewArtists.FullRowSelect = true;
- this.listViewArtists.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
- this.listViewArtists.Location = new System.Drawing.Point(11, 38);
- this.listViewArtists.MultiSelect = false;
- this.listViewArtists.Name = "listViewArtists";
- this.listViewArtists.Size = new System.Drawing.Size(172, 164);
- this.listViewArtists.TabIndex = 13;
- this.listViewArtists.UseCompatibleStateImageBehavior = false;
- this.listViewArtists.View = System.Windows.Forms.View.Details;
- this.listViewArtists.SelectedIndexChanged += new System.EventHandler(this.listViewArtists_SelectedIndexChanged);
+ this.lvArtists.FullRowSelect = true;
+ this.lvArtists.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
+ this.lvArtists.Location = new System.Drawing.Point(11, 33);
+ this.lvArtists.MultiSelect = false;
+ this.lvArtists.Name = "lvArtists";
+ this.lvArtists.Size = new System.Drawing.Size(172, 164);
+ this.lvArtists.TabIndex = 13;
+ this.lvArtists.UseCompatibleStateImageBehavior = false;
+ this.lvArtists.View = System.Windows.Forms.View.Details;
+ this.lvArtists.SelectedIndexChanged += new System.EventHandler(this.listViewArtists_SelectedIndexChanged);
//
// columnHeaderArtist
//
@@ -199,22 +218,44 @@
//
// gbSelected
//
+ this.gbSelected.Controls.Add(this.btCancel);
this.gbSelected.Controls.Add(this.btRemoveAll);
this.gbSelected.Controls.Add(this.btDeselectAll2);
this.gbSelected.Controls.Add(this.btSelectAll2);
this.gbSelected.Controls.Add(this.btRemove);
this.gbSelected.Controls.Add(this.btSearch);
- this.gbSelected.Controls.Add(this.listViewSelectedSongs);
- this.gbSelected.Location = new System.Drawing.Point(5, 248);
+ this.gbSelected.Controls.Add(this.lvSelectedSongs);
+ this.gbSelected.Location = new System.Drawing.Point(5, 257);
this.gbSelected.Name = "gbSelected";
this.gbSelected.Size = new System.Drawing.Size(538, 220);
this.gbSelected.TabIndex = 14;
this.gbSelected.TabStop = false;
this.gbSelected.Text = "Selected songs from music database";
//
+ // btCancel
+ //
+ this.btCancel.Enabled = false;
+ this.btCancel.Location = new System.Drawing.Point(95, 189);
+ this.btCancel.Name = "btCancel";
+ this.btCancel.Size = new System.Drawing.Size(75, 23);
+ this.btCancel.TabIndex = 17;
+ this.btCancel.Text = "Cancel";
+ this.btCancel.UseVisualStyleBackColor = true;
+ this.btCancel.Click += new System.EventHandler(this.btCancel_Click);
+ //
+ // btRemoveAll
+ //
+ this.btRemoveAll.Location = new System.Drawing.Point(194, 191);
+ this.btRemoveAll.Name = "btRemoveAll";
+ this.btRemoveAll.Size = new System.Drawing.Size(75, 23);
+ this.btRemoveAll.TabIndex = 16;
+ this.btRemoveAll.Text = "Remove all";
+ this.btRemoveAll.UseVisualStyleBackColor = true;
+ this.btRemoveAll.Click += new System.EventHandler(this.btRemoveAll_Click);
+ //
// btDeselectAll2
//
- this.btDeselectAll2.Location = new System.Drawing.Point(351, 189);
+ this.btDeselectAll2.Location = new System.Drawing.Point(437, 191);
this.btDeselectAll2.Name = "btDeselectAll2";
this.btDeselectAll2.Size = new System.Drawing.Size(75, 23);
this.btDeselectAll2.TabIndex = 15;
@@ -224,7 +265,7 @@
//
// btSelectAll2
//
- this.btSelectAll2.Location = new System.Drawing.Point(270, 189);
+ this.btSelectAll2.Location = new System.Drawing.Point(356, 191);
this.btSelectAll2.Name = "btSelectAll2";
this.btSelectAll2.Size = new System.Drawing.Size(75, 23);
this.btSelectAll2.TabIndex = 15;
@@ -234,7 +275,7 @@
//
// btRemove
//
- this.btRemove.Location = new System.Drawing.Point(189, 189);
+ this.btRemove.Location = new System.Drawing.Point(275, 191);
this.btRemove.Name = "btRemove";
this.btRemove.Size = new System.Drawing.Size(75, 23);
this.btRemove.TabIndex = 15;
@@ -256,36 +297,21 @@
// bw
//
this.bw.WorkerReportsProgress = true;
+ this.bw.WorkerSupportsCancellation = true;
this.bw.DoWork += new System.ComponentModel.DoWorkEventHandler(this.bw_DoWork);
this.bw.RunWorkerCompleted += new System.ComponentModel.RunWorkerCompletedEventHandler(this.bw_RunWorkerCompleted);
this.bw.ProgressChanged += new System.ComponentModel.ProgressChangedEventHandler(this.bw_ProgressChanged);
//
- // imageList
+ // lbStats
//
- this.imageList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList.ImageStream")));
- this.imageList.TransparentColor = System.Drawing.Color.Transparent;
- this.imageList.Images.SetKeyName(0, "yes.gif");
+ this.lbStats.AutoSize = true;
+ this.lbStats.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbStats.Location = new System.Drawing.Point(191, 201);
+ this.lbStats.Name = "lbStats";
+ this.lbStats.Size = new System.Drawing.Size(35, 13);
+ this.lbStats.TabIndex = 17;
+ this.lbStats.Text = "[stats]";
//
- // btAddAll
- //
- this.btAddAll.Location = new System.Drawing.Point(194, 208);
- this.btAddAll.Name = "btAddAll";
- this.btAddAll.Size = new System.Drawing.Size(75, 23);
- this.btAddAll.TabIndex = 15;
- this.btAddAll.Text = "Add all";
- this.btAddAll.UseVisualStyleBackColor = true;
- this.btAddAll.Click += new System.EventHandler(this.btAddAll_Click);
- //
- // btRemoveAll
- //
- this.btRemoveAll.Location = new System.Drawing.Point(108, 189);
- this.btRemoveAll.Name = "btRemoveAll";
- this.btRemoveAll.Size = new System.Drawing.Size(75, 23);
- this.btRemoveAll.TabIndex = 16;
- this.btRemoveAll.Text = "Remove all";
- this.btRemoveAll.UseVisualStyleBackColor = true;
- this.btRemoveAll.Click += new System.EventHandler(this.btRemoveAll_Click);
- //
// MusicDatabaseBrowse
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -306,19 +332,19 @@
private System.Windows.Forms.Button btDeselectAll;
private System.Windows.Forms.Button btSelectAll;
- private System.Windows.Forms.ListView listViewSongs;
+ private System.Windows.Forms.ListView lvSongs;
private System.Windows.Forms.ColumnHeader columnHeaderSong;
private System.Windows.Forms.ColumnHeader columnHeaderDB;
private System.Windows.Forms.ColumnHeader columnHeaderStatus;
private System.Windows.Forms.Label lbArtistNumber;
- private System.Windows.Forms.ListView listViewSelectedSongs;
+ private System.Windows.Forms.ListView lvSelectedSongs;
private System.Windows.Forms.ColumnHeader columnHeaderSong2;
private System.Windows.Forms.ColumnHeader columnHeaderDatabase2;
private System.Windows.Forms.ColumnHeader columnHeaderStatus2;
private System.Windows.Forms.Button btAdd;
private System.Windows.Forms.GroupBox gbMusicDatabase;
private System.Windows.Forms.GroupBox gbSelected;
- private System.Windows.Forms.ListView listViewArtists;
+ private System.Windows.Forms.ListView lvArtists;
private System.Windows.Forms.ColumnHeader columnHeaderArtist;
private System.Windows.Forms.Label lbSelectedArtist;
private System.Windows.Forms.ColumnHeader columnHeaderArtist2;
@@ -331,5 +357,7 @@
private System.ComponentModel.IContainer components;
private System.Windows.Forms.Button btAddAll;
private System.Windows.Forms.Button btRemoveAll;
+ private System.Windows.Forms.Button btCancel;
+ private System.Windows.Forms.Label lbStats;
}
}
\ No newline at end of file
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs 2007-11-15 15:33:55 UTC (rev 1064)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs 2007-11-15 16:24:06 UTC (rev 1065)
@@ -36,6 +36,11 @@
int m_noOfSearchesToComplete = 0;
int m_noOfSearchesCompleted = 0;
+ bool m_lockButtons = true;
+
+ Thread m_LyricControllerThread;
+ ManualResetEvent m_EventStopThread;
+
Queue<string[]> songs;
LyricsController lc;
@@ -47,11 +52,12 @@
private void ListboxArtistsUpdate(object sender, EventArgs e)
{
- MusicDatabase mdb = MusicDatabase.Instance;
+ MusicDatabase mDB = MusicDatabase.Instance;
ArrayList artists = new ArrayList();
- mdb.GetArtists(0, String.Empty, ref artists);
+ //mdb.GetArtists(0, String.Empty, ref artists);
+ mDB.GetAllArtists(ref artists);
- listViewArtists.Items.Clear();
+ lvArtists.Items.Clear();
lbSelectedArtist.Text = String.Empty;
m_DelegateStringUpdate = new DelegateStringUpdate(this.updateStringMethod);
@@ -64,35 +70,35 @@
foreach (object artist in artists)
{
ListViewItem lvi = new ListViewItem((string)artist);
- listViewArtists.Items.Add(lvi);
+ lvArtists.Items.Add(lvi);
}
- listViewArtists.Sorting = SortOrder.Ascending;
- listViewSongs.Items.Clear();
- lbArtistNumber.Text = String.Format("{0} artists found", listViewArtists.Items.Count);
+ lvArtists.Sorting = SortOrder.Ascending;
+ lvSongs.Items.Clear();
+ lbArtistNumber.Text = String.Format("{0} artists found", lvArtists.Items.Count);
}
private void btSelectAll_Click(object sender, EventArgs e)
{
- foreach (ListViewItem lvi in listViewSongs.Items)
+ foreach (ListViewItem lvi in lvSongs.Items)
{
lvi.Selected = true;
}
- listViewSongs.Select();
+ lvSongs.Select();
}
private void btDeselectAll_Click(object sender, EventArgs e)
{
- foreach (ListViewItem lvi in listViewSongs.Items)
+ foreach (ListViewItem lvi in lvSongs.Items)
{
lvi.Selected = false;
}
- listViewSongs.Select();
+ lvSongs.Select();
}
private void btAdd_Click(object sender, EventArgs e)
{
- foreach (ListViewItem lvi in listViewSongs.SelectedItems)
+ foreach (ListViewItem lvi in lvSongs.SelectedItems)
{
if (lvi.ImageIndex == -1)
{
@@ -105,15 +111,15 @@
newLvi.ImageIndex = lvi.ImageIndex;
- listViewSelectedSongs.Items.Add(newLvi);
+ lvSelectedSongs.Items.Add(newLvi);
}
}
- if (listViewSelectedSongs.Items.Count > 0)
+ if (lvSelectedSongs.Items.Count > 0)
{
btSearch.Enabled = true;
btRemove.Enabled = true;
- listViewSelectedSongs.Sort();
+ lvSelectedSongs.Sort();
}
}
@@ -126,7 +132,7 @@
mdb.GetSongsByArtist(selectedArtist, ref songs);
lbSelectedArtist.Text = String.Format("Artist: {0}", selectedArtist);
- listViewSongs.Items.Clear();
+ lvSongs.Items.Clear();
foreach (Song song in songs)
{
@@ -168,7 +174,7 @@
bool alreadyInCollection = false;
- foreach (ListViewItem lviColl in listViewSongs.Items)
+ foreach (ListViewItem lviColl in lvSongs.Items)
{
if (lvi.Tag.Equals(lviColl.Tag))
{
@@ -179,20 +185,20 @@
if (!alreadyInCollection)
{
- listViewSongs.Items.Add(lvi);
+ lvSongs.Items.Add(lvi);
}
}
-
+ RefreshArtistStats();
}
private void btRemove_Click(object sender, EventArgs e)
{
- foreach (ListViewItem lvi in listViewSelectedSongs.SelectedItems)
+ foreach (ListViewItem lvi in lvSelectedSongs.SelectedItems)
{
- listViewSelectedSongs.Items.Remove(lvi);
+ lvSelectedSongs.Items.Remove(lvi);
}
- if (listViewSelectedSongs.Items.Count == 0)
+ if (lvSelectedSongs.Items.Count == 0)
{
btSearch.Enabled = false;
btRemove.Enabled = false;
@@ -201,17 +207,21 @@
private void btSearch_Click(object sender, EventArgs e)
{
+ m_lockButtons = false;
+
if (bw.IsBusy)
{
Thread.Sleep(2000);
}
- ((MyLyricsSetup)parent).btClose.Enabled = false;
+ MyLyricsSetup.UpdateLibraryUI = true;
+ ChangeButtonsEnableState();
+
songs = new Queue<string[]>();
List<ListViewItem> items = new List<ListViewItem>();
- foreach (ListViewItem lvi in listViewSelectedSongs.Items)
+ foreach (ListViewItem lvi in lvSelectedSongs.Items)
{
ListViewItem lviClone = (ListViewItem)lvi.Clone();
if (lvi.ImageIndex == -1)
@@ -221,8 +231,8 @@
items.Add(lviClone);
}
}
- listViewSelectedSongs.Items.Clear();
- listViewSelectedSongs.Items.AddRange(items.ToArray());
+ lvSelectedSongs.Items.Clear();
+ lvSelectedSongs.Items.AddRange(items.ToArray());
List<string> sitesToSearch = new List<string>();
@@ -242,8 +252,7 @@
sitesToSearch.Add("SeekLyrics");
}
- Thread m_LyricControllerThread;
- ManualResetEvent m_EventStopThread = new ManualResetEvent(false);
+ m_EventStopThread = new ManualResetEvent(false);
// If automaticUpdate is set then return after the first positive search
lc = new LyricsController(this, m_EventStopThread, (string[])sitesToSearch.ToArray(), false, false);
@@ -270,22 +279,73 @@
private void btSelectAll2_Click(object sender, EventArgs e)
{
- foreach (ListViewItem lvi in listViewSelectedSongs.Items)
+ foreach (ListViewItem lvi in lvSelectedSongs.Items)
{
lvi.Selected = true;
}
- listViewSelectedSongs.Select();
+ lvSelectedSongs.Select();
}
private void btDeselectAll2_Click(object sender, EventArgs e)
{
- foreach (ListViewItem lvi in listViewSelectedSongs.Items)
+ foreach (ListViewItem lvi in lvSelectedSongs.Items)
{
lvi.Selected = false;
}
- listViewSelectedSongs.Select();
+ lvSelectedSongs.Select();
}
+ public void RefreshSongsListView()
+ {
+ if (lvArtists.SelectedIndices.Count > 0)
+ {
+ int index = lvArtists.SelectedIndices[0];
+ lvArtists.Items[index].Selected = false;
+ lvArtists.Items[index].Selected = true;
+ }
+ }
+
+ public void RefreshArtistStats()
+ {
+ int lyricsInLyricDB = 0;
+ int lyricsInMarkedDB = 0;
+
+ foreach (ListViewItem lvi in lvSongs.Items)
+ {
+ if (lvi.SubItems[1].Text.Equals("LyricsDB"))
+ {
+ ++lyricsInLyricDB;
+ }
+ else if (lvi.SubItems[1].Text.Equals("MarkedDB"))
+ {
+ ++lyricsInMarkedDB;
+ }
+ }
+ lbStats.Text = string.Format("Lyrics: {0} - Lyrics in LyricsDB: {1} - Lyrics in MarkedDB: {2}", lvSongs.Items.Count, lyricsInLyricDB, lyricsInMarkedDB);
+ }
+
+ private void ChangeSearchingSubI...
[truncated message content] |
|
From: <an...@us...> - 2007-11-15 15:34:03
|
Revision: 1064
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1064&view=rev
Author: and-81
Date: 2007-11-15 07:33:55 -0800 (Thu, 15 Nov 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/Debug Client/Debug Client.csproj
trunk/plugins/IR Server Suite/Applications/IR Blast/IR Blast.csproj
trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs
trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj
trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs
trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs
trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj
trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs
trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs
trunk/plugins/IR Server Suite/Applications/SageSetup/FormMain.Designer.cs
trunk/plugins/IR Server Suite/Applications/SageSetup/FormMain.cs
trunk/plugins/IR Server Suite/Applications/SageSetup/Sage Setup.csproj
trunk/plugins/IR Server Suite/Applications/Translator/EventSchedule.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/MenuForm.Designer.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/MenuForm.cs
trunk/plugins/IR Server Suite/Applications/Translator/Program.cs
trunk/plugins/IR Server Suite/Applications/Tray Launcher/Program.cs
trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray Launcher.csproj
trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote/Virtual Remote.csproj
trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Program.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Virtual Remote Skin Editor.csproj
trunk/plugins/IR Server Suite/Common/IrssComms/IrssComms.csproj
trunk/plugins/IR Server Suite/Common/IrssUtils/Audio.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/IrssLog.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
trunk/plugins/IR Server Suite/Common/IrssUtils/Keyboard.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/SystemRegistry.cs
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/RawInput.cs
trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTrans Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IgorPlug Receiver.csproj
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/MicrosoftMceTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Pronto.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Serial IR Blaster/Serial IR Blaster.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/USB-UIRT Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/Windows Message Receiver/Windows Message Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/X10 Transceiver/X10 Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite.sln
trunk/plugins/IR Server Suite/Input Service/Input Service/Input Service.csproj
trunk/plugins/IR Server Suite/Input Service/Input Service/InputService.cs
trunk/plugins/IR Server Suite/Input Service/Input Service/InputServiceInstaller.cs
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Configuration.csproj
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Program.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 Control Plugin/Forms/MacroEditor.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/InputMapper/InputMappingForm.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MP Control Plugin.csproj
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/ExternalChannels.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/StbSetup.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/ExternalChannels.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/MacroEditor.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
trunk/plugins/MCEReplacement/Forms/MacroEditor.cs
trunk/plugins/MCEReplacement/Forms/SetupForm.cs
trunk/plugins/MCEReplacement/Forms/StbSetup.cs
trunk/plugins/MCEReplacement/MCEReplacement.cs
trunk/plugins/MCEReplacement/MCEReplacement.csproj
Added Paths:
-----------
trunk/plugins/RC102 Plugin/
trunk/plugins/RC102 Plugin/AssemblyInfo.cs
trunk/plugins/RC102 Plugin/RC102 Plugin.csproj
trunk/plugins/RC102 Plugin/RC102.xml
trunk/plugins/RC102 Plugin/RC102Plugin.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-11-15 15:06:30 UTC (rev 1063)
+++ trunk/plugins/IR Server Suite/Applications/Debug Client/Debug Client.csproj 2007-11-15 15:33:55 UTC (rev 1064)
@@ -18,10 +18,11 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+ <DocumentationFile>bin\Debug\DebugClient.XML</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast/IR Blast.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast/IR Blast.csproj 2007-11-15 15:06:30 UTC (rev 1063)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast/IR Blast.csproj 2007-11-15 15:33:55 UTC (rev 1064)
@@ -19,10 +19,11 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+ <DocumentationFile>bin\Debug\IRBlast.XML</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs 2007-11-15 15:06:30 UTC (rev 1063)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs 2007-11-15 15:33:55 UTC (rev 1064)
@@ -40,8 +40,11 @@
[STAThread]
static void Main(string[] args)
{
- // TODO: Change log level to info for release.
+#if DEBUG
IrssLog.LogLevel = IrssLog.Level.Debug;
+#else
+ IrssLog.LogLevel = IrssLog.Level.Info;
+#endif
IrssLog.Append(Common.FolderIrssLogs + "IR Blast.log");
ShowHeader();
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj 2007-11-15 15:06:30 UTC (rev 1063)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj 2007-11-15 15:33:55 UTC (rev 1064)
@@ -19,10 +19,11 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+ <DocumentationFile>bin\Debug\IRBlast-NoWindow.XML</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs 2007-11-15 15:06:30 UTC (rev 1063)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs 2007-11-15 15:33:55 UTC (rev 1064)
@@ -41,8 +41,11 @@
[STAThread]
static void Main(string[] args)
{
- // TODO: Change log level to info for release.
+#if DEBUG
IrssLog.LogLevel = IrssLog.Level.Debug;
+#else
+ IrssLog.LogLevel = IrssLog.Level.Info;
+#endif
IrssLog.Append(Common.FolderIrssLogs + "IR Blast (No Window).log");
try
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs 2007-11-15 15:06:30 UTC (rev 1063)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs 2007-11-15 15:33:55 UTC (rev 1064)
@@ -134,6 +134,8 @@
catch (Exception ex)
{
IrssLog.Error(ex.ToString());
+
+ checkBoxRunAtBoot.Checked = false;
}
}
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj 2007-11-15 15:06:30 UTC (rev 1063)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj 2007-11-15 15:33:55 UTC (rev 1064)
@@ -34,13 +34,12 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<UseVSHostingProcess>true</UseVSHostingProcess>
- <DocumentationFile>
- </DocumentationFile>
+ <DocumentationFile>bin\Debug\IRServer.XML</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2007-11-15 15:06:30 UTC (rev 1063)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2007-11-15 15:33:55 UTC (rev 1064)
@@ -43,6 +43,9 @@
#endregion Enumerations
+ /// <summary>
+ /// IR Server.
+ /// </summary>
public class IRServer : IDisposable
{
@@ -79,6 +82,9 @@
#region Constructor / Destructor
+ /// <summary>
+ /// Initializes a new instance of the <see cref="IRServer"/> class.
+ /// </summary>
public IRServer()
{
// Setup taskbar icon
@@ -104,12 +110,19 @@
#region IDisposable
+ /// <summary>
+ /// Releases unmanaged and - optionally - managed resources
+ /// </summary>
public void Dispose()
{
Dispose(true);
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>
protected virtual void Dispose(bool disposing)
{
if (disposing)
@@ -132,7 +145,7 @@
#region Implementation
/// <summary>
- /// Start the server
+ /// Start the server.
/// </summary>
/// <returns>success.</returns>
internal bool Start()
@@ -295,7 +308,7 @@
}
/// <summary>
- /// Stop the server
+ /// Stop the server.
/// </summary>
internal void Stop()
{
@@ -954,7 +967,7 @@
{
try
{
- IrssLog.Debug("Blast IR");
+ IrssLog.Info("Blast IR");
if (_pluginTransmit == null || !(_pluginTransmit is ITransmitIR))
return false;
@@ -978,18 +991,18 @@
}
LearnStatus LearnIR(out byte[] data)
{
- IrssLog.Debug("Learn IR");
+ IrssLog.Info("Learn IR");
data = null;
if (_pluginTransmit == null)
{
- IrssLog.Debug("No transmit plugin loaded, can't learn");
+ IrssLog.Warn("No transmit plugin loaded, can't learn");
return LearnStatus.Failure;
}
else if (!(_pluginTransmit is ILearnIR))
{
- IrssLog.Debug("Active transmit plugin doesn't support learn");
+ IrssLog.Warn("Active transmit plugin doesn't support learn");
return LearnStatus.Failure;
}
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs 2007-11-15 15:06:30 UTC (rev 1063)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs 2007-11-15 15:33:55 UTC (rev 1064)
@@ -40,8 +40,11 @@
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
- // TODO: Change log level to info for release.
+#if DEBUG
IrssLog.LogLevel = IrssLog.Level.Debug;
+#else
+ IrssLog.LogLevel = IrssLog.Level.Info;
+#endif
IrssLog.Open(Common.FolderIrssLogs + "IR Server.log");
Application.ThreadException += new ThreadExceptionEventHandler(Application_ThreadException);
Modified: trunk/plugins/IR Server Suite/Applications/SageSetup/FormMain.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/SageSetup/FormMain.Designer.cs 2007-11-15 15:06:30 UTC (rev 1063)
+++ trunk/plugins/IR Server Suite/Applications/SageSetup/FormMain.Designer.cs 2007-11-15 15:33:55 UTC (rev 1064)
@@ -1,5 +1,6 @@
namespace SageSetup
{
+
partial class FormMain
{
/// <summary>
@@ -242,5 +243,6 @@
private System.Windows.Forms.ToolTip toolTips;
private System.Windows.Forms.NumericUpDown numericUpDownPad;
}
+
}
Modified: trunk/plugins/IR Server Suite/Applications/SageSetup/FormMain.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/SageSetup/FormMain.cs 2007-11-15 15:06:30 UTC (rev 1063)
+++ trunk/plugins/IR Server Suite/Applications/SageSetup/FormMain.cs 2007-11-15 15:33:55 UTC (rev 1064)
@@ -13,10 +13,17 @@
namespace SageSetup
{
+ /// <summary>
+ /// Main Sage Setup form.
+ /// </summary>
public partial class FormMain : Form
{
+
string _irBlastLocation = null;
-
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="FormMain"/> class.
+ /// </summary>
public FormMain()
{
InitializeComponent();
Modified: trunk/plugins/IR Server Suite/Applications/SageSetup/Sage Setup.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/SageSetup/Sage Setup.csproj 2007-11-15 15:06:30 UTC (rev 1063)
+++ trunk/plugins/IR Server Suite/Applications/SageSetup/Sage Setup.csproj 2007-11-15 15:33:55 UTC (rev 1064)
@@ -36,6 +36,8 @@
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <DocumentationFile>bin\Debug\SageSetup.XML</DocumentationFile>
+ <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
Modified: trunk/plugins/IR Server Suite/Applications/Translator/EventSchedule.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/EventSchedule.cs 2007-11-15 15:06:30 UTC (rev 1063)
+++ trunk/plugins/IR Server Suite/Applications/Translator/EventSchedule.cs 2007-11-15 15:33:55 UTC (rev 1064)
@@ -4,9 +4,9 @@
namespace Translator
{
+/*
+ #region Enumerations
- #region Enumerations
- /*
public enum ScheduleRepeat
{
Never,
@@ -48,17 +48,17 @@
November,
December,
}
- */
+
#endregion Enumerations
class EventSchedule
{
- //DateTime _start;
+ DateTime _start;
- //ScheduleRepeat _repeat = ScheduleRepeat.Never;
- //ScheduleDays _days = ScheduleDays.None;
- //ScheduleMonths _months = ScheduleMonths.None;
+ ScheduleRepeat _repeat = ScheduleRepeat.Never;
+ ScheduleDays _days = ScheduleDays.None;
+ ScheduleMonths _months = ScheduleMonths.None;
}
-
+*/
}
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs 2007-11-15 15:06:30 UTC (rev 1063)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs 2007-11-15 15:33:55 UTC (rev 1064)
@@ -249,10 +249,10 @@
case Common.MouseScrollUp: checkBoxMouseScrollUp.Checked = true; break;
default:
- if (suffix.StartsWith(Common.MouseMoveDown)) checkBoxMouseMoveDown.Checked = true;
- else if (suffix.StartsWith(Common.MouseMoveLeft)) checkBoxMouseMoveLeft.Checked = true;
- else if (suffix.StartsWith(Common.MouseMoveRight)) checkBoxMouseMoveRight.Checked = true;
- else if (suffix.StartsWith(Common.MouseMoveUp)) checkBoxMouseMoveUp.Checked = true;
+ if (suffix.StartsWith(Common.MouseMoveDown, StringComparison.OrdinalIgnoreCase)) checkBoxMouseMoveDown.Checked = true;
+ else if (suffix.StartsWith(Common.MouseMoveLeft, StringComparison.OrdinalIgnoreCase)) checkBoxMouseMoveLeft.Checked = true;
+ else if (suffix.StartsWith(Common.MouseMoveRight, StringComparison.OrdinalIgnoreCase)) checkBoxMouseMoveRight.Checked = true;
+ else if (suffix.StartsWith(Common.MouseMoveUp, StringComparison.OrdinalIgnoreCase)) checkBoxMouseMoveUp.Checked = true;
numericUpDownMouseMove.Value = Decimal.Parse(suffix.Substring(suffix.IndexOf(' ')));
break;
@@ -288,7 +288,6 @@
default:
if (prefix.Equals(Common.CmdPrefixEject, StringComparison.OrdinalIgnoreCase))
comboBoxMiscCommand.SelectedItem = Common.UITextEject;
- //else
break;
}
break;
@@ -474,8 +473,10 @@
private void buttonTest_Click(object sender, EventArgs e)
{
- if (_command.StartsWith(Common.CmdPrefixKeys))
+ if (_command.StartsWith(Common.CmdPrefixKeys, StringComparison.OrdinalIgnoreCase))
+ {
MessageBox.Show(this, "Keystroke commands cannot be tested here", "Cannot test Keystroke command", MessageBoxButtons.OK, MessageBoxIcon.Stop);
+ }
else
{
try
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs 2007-11-15 15:06:30 UTC (rev 1063)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs 2007-11-15 15:33:55 UTC (rev 1064)
@@ -98,72 +98,72 @@
{
writer.WriteStartElement("action");
- if (item.StartsWith(Common.CmdPrefixMacro))
+ if (item.StartsWith(Common.CmdPrefixMacro, StringComparison.OrdinalIgnoreCase))
{
writer.WriteAttributeString("command", Common.XmlTagMacro);
writer.WriteAttributeString("cmdproperty", item.Substring(Common.CmdPrefixMacro.Length));
}
- else if (item.StartsWith(Common.CmdPrefixBlast))
+ else if (item.StartsWith(Common.CmdPrefixBlast, StringComparison.OrdinalIgnoreCase))
{
writer.WriteAttributeString("command", Common.XmlTagBlast);
writer.WriteAttributeString("cmdproperty", item.Substring(Common.CmdPrefixBlast.Length));
}
- else if (item.StartsWith(Common.CmdPrefixPause))
+ else if (item.StartsWith(Common.CmdPrefixPause, StringComparison.OrdinalIgnoreCase))
{
writer.WriteAttributeString("command", Common.XmlTagPause);
writer.WriteAttributeString("cmdproperty", item.Substring(Common.CmdPrefixPause.Length));
}
- else if (item.StartsWith(Common.CmdPrefixRun))
+ else if (item.StartsWith(Common.CmdPrefixRun, StringComparison.OrdinalIgnoreCase))
{
writer.WriteAttributeString("command", Common.XmlTagRun);
writer.WriteAttributeString("cmdproperty", item.Substring(Common.CmdPrefixRun.Length));
}
- else if (item.StartsWith(Common.CmdPrefixSerial))
+ else if (item.StartsWith(Common.CmdPrefixSerial, StringComparison.OrdinalIgnoreCase))
{
writer.WriteAttributeString("command", Common.XmlTagSerial);
writer.WriteAttributeString("cmdproperty", item.Substring(Common.CmdPrefixSerial.Length));
}
- else if (item.StartsWith(Common.CmdPrefixWindowMsg))
+ else if (item.StartsWith(Common.CmdPrefixWindowMsg, StringComparison.OrdinalIgnoreCase))
{
writer.WriteAttributeString("command", Common.XmlTagWindowMsg);
writer.WriteAttributeString("cmdproperty", item.Substring(Common.CmdPrefixWindowMsg.Length));
}
- else if (item.StartsWith(Common.CmdPrefixTcpMsg))
+ else if (item.StartsWith(Common.CmdPrefixTcpMsg, StringComparison.OrdinalIgnoreCase))
{
writer.WriteAttributeString("command", Common.XmlTagTcpMsg);
writer.WriteAttributeString("cmdproperty", item.Substring(Common.CmdPrefixTcpMsg.Length));
}
- else if (item.StartsWith(Common.CmdPrefixKeys))
+ else if (item.StartsWith(Common.CmdPrefixKeys, StringComparison.OrdinalIgnoreCase))
{
writer.WriteAttributeString("command", Common.XmlTagKeys);
writer.WriteAttributeString("cmdproperty", item.Substring(Common.CmdPrefixKeys.Length));
}
- else if (item.StartsWith(Common.CmdPrefixMouse))
+ else if (item.StartsWith(Common.CmdPrefixMouse, StringComparison.OrdinalIgnoreCase))
{
writer.WriteAttributeString("command", Common.XmlTagMouse);
writer.WriteAttributeString("cmdproperty", item.Substring(Common.CmdPrefixMouse.Length));
}
- else if (item.StartsWith(Common.CmdPrefixEject))
+ else if (item.StartsWith(Common.CmdPrefixEject, StringComparison.OrdinalIgnoreCase))
{
writer.WriteAttributeString("command", Common.XmlTagEject);
writer.WriteAttributeString("cmdproperty", item.Substring(Common.CmdPrefixEject.Length));
}
- else if (item.StartsWith(Common.CmdPrefixStandby))
+ else if (item.StartsWith(Common.CmdPrefixStandby, StringComparison.OrdinalIgnoreCase))
{
writer.WriteAttributeString("command", Common.XmlTagStandby);
writer.WriteAttributeString("cmdproperty", String.Empty);
}
- else if (item.StartsWith(Common.CmdPrefixHibernate))
+ else if (item.StartsWith(Common.CmdPrefixHibernate, StringComparison.OrdinalIgnoreCase))
{
writer.WriteAttributeString("command", Common.XmlTagHibernate);
writer.WriteAttributeString("cmdproperty", String.Empty);
}
- else if (item.StartsWith(Common.CmdPrefixReboot))
+ else if (item.StartsWith(Common.CmdPrefixReboot, StringComparison.OrdinalIgnoreCase))
{
writer.WriteAttributeString("command", Common.XmlTagReboot);
writer.WriteAttributeString("cmdproperty", String.Empty);
}
- else if (item.StartsWith(Common.CmdPrefixShutdown))
+ else if (item.StartsWith(Common.CmdPrefixShutdown, StringComparison.OrdinalIgnoreCase))
{
writer.WriteAttributeString("command", Common.XmlTagShutdown);
writer.WriteAttributeString("cmdproperty", String.Empty);
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2007-11-15 15:06:30 UTC (rev 1063)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2007-11-15 15:33:55 UTC (rev 1064)
@@ -123,7 +123,12 @@
{
checkBoxAutoRun.Checked = SystemRegistry.GetAutoRun("Translator");
}
- catch { }
+ catch (Exception ex)
+ {
+ IrssLog.Error(ex.ToString());
+
+ checkBoxAutoRun.Checked = false;
+ }
}
#endregion Constructor
@@ -175,8 +180,11 @@
int imageIndex = 2;
foreach (ProgramSettings progSettings in Program.Config.Programs)
{
- Icon icon = Win32.GetIconFor(progSettings.FileName);
+ Icon icon = null;
+ if (!String.IsNullOrEmpty(progSettings.FileName))
+ icon = Win32.GetIconFor(progSettings.FileName);
+
if (icon != null)
{
imageListPrograms.Images.Add(icon);
@@ -1266,7 +1274,11 @@
if (programSettings.Name.Equals(selectedItem))
continue;
+ if (String.IsNullOrEmpty(programSettings.FileName))
+ continue;
+
Icon icon = Win32.GetIconFor(programSettings.FileName);
+
Image image = null;
if (icon != null)
image = icon.ToBitmap();
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MenuForm.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MenuForm.Designer.cs 2007-11-15 15:06:30 UTC (rev 1063)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MenuForm.Designer.cs 2007-11-15 15:33:55 UTC (rev 1064)
@@ -30,9 +30,9 @@
{
this.components = new System.ComponentModel.Container();
this.listViewMenu = new System.Windows.Forms.ListView();
+ this.columnHeader = new System.Windows.Forms.ColumnHeader();
this.toolTips = new System.Windows.Forms.ToolTip(this.components);
this.labelHeader = new System.Windows.Forms.Label();
- this.columnHeader = new System.Windows.Forms.ColumnHeader();
this.SuspendLayout();
//
// listViewMenu
@@ -46,22 +46,24 @@
this.listViewMenu.FullRowSelect = true;
this.listViewMenu.GridLines = true;
this.listViewMenu.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
- this.listViewMenu.HideSelection = false;
this.listViewMenu.HotTracking = true;
this.listViewMenu.HoverSelection = true;
this.listViewMenu.Location = new System.Drawing.Point(0, 20);
this.listViewMenu.MultiSelect = false;
this.listViewMenu.Name = "listViewMenu";
- this.listViewMenu.Scrollable = false;
this.listViewMenu.ShowGroups = false;
this.listViewMenu.ShowItemToolTips = true;
this.listViewMenu.Size = new System.Drawing.Size(256, 108);
- this.listViewMenu.TabIndex = 1;
+ this.listViewMenu.TabIndex = 0;
this.listViewMenu.TileSize = new System.Drawing.Size(128, 96);
this.listViewMenu.UseCompatibleStateImageBehavior = false;
this.listViewMenu.ItemActivate += new System.EventHandler(this.listViewMenu_ItemActivate);
this.listViewMenu.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.listViewMenu_KeyPress);
//
+ // columnHeader
+ //
+ this.columnHeader.Width = 232;
+ //
// labelHeader
//
this.labelHeader.BackColor = System.Drawing.SystemColors.GradientActiveCaption;
@@ -70,14 +72,10 @@
this.labelHeader.Location = new System.Drawing.Point(0, 0);
this.labelHeader.Name = "labelHeader";
this.labelHeader.Size = new System.Drawing.Size(256, 20);
- this.labelHeader.TabIndex = 0;
+ this.labelHeader.TabIndex = 1;
this.labelHeader.Text = "Translator OSD";
this.labelHeader.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
- // columnHeader
- //
- this.columnHeader.Width = 232;
- //
// MenuForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -89,7 +87,7 @@
this.DoubleBuffered = true;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.MaximizeBox = false;
- this.MaximumSize = new System.Drawing.Size(512, 256);
+ this.MaximumSize = new System.Drawing.Size(512, 512);
this.MinimizeBox = false;
this.MinimumSize = new System.Drawing.Size(256, 128);
this.Name = "MenuForm";
@@ -100,7 +98,9 @@
this.Text = "MenuForm";
this.TopMost = true;
this.Deactivate += new System.EventHandler(this.MenuForm_Deactivate);
+ this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.MenuForm_FormClosed);
this.Shown += new System.EventHandler(this.MenuForm_Shown);
+ this.Load += new System.EventHandler(this.MenuForm_Load);
this.ResumeLayout(false);
}
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MenuForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MenuForm.cs 2007-11-15 15:06:30 UTC (rev 1063)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MenuForm.cs 2007-11-15 15:33:55 UTC (rev 1064)
@@ -19,21 +19,34 @@
public partial class MenuForm : Form
{
+ #region Enumerations
+
+ enum Menus
+ {
+ Main,
+
+ Launch,
+ Tasks,
+ Macros,
+ System,
+ Windows,
+ Power,
+ Audio,
+ Eject,
+
+ WindowActivate,
+ WindowClose,
+ WindowMinimize,
+ WindowMaximize,
+
+ }
+
+ #endregion Enumerations
+
#region Constants
const string WindowTitle = "Translator OSD";
- // Menus
- const string MenuMain = "Main";
- const string MenuLaunch = "Launch";
- const string MenuTasks = "Tasks";
- const string MenuMacros = "Macros";
- const string MenuSystem = "System";
- const string MenuWindows = "Windows";
- const string MenuPower = "Power";
- const string MenuAudio = "Audio";
- const string MenuEject = "Eject";
-
// Menu UI Text
const string UITextMain = "Main Menu";
const string UITextLaunch = "Launch App";
@@ -90,10 +103,8 @@
ListViewItem _macro;
ListViewItem _system;
- List<string> _menuStack;
+ List<Menus> _menuStack;
- string _startMenu = "Main";
-
#endregion Variables
/// <summary>
@@ -107,40 +118,43 @@
_launch = new ListViewItem(UITextLaunch, 0);
_launch.ToolTipText = DescLaunch;
- _launch.Tag = TagMenu + MenuLaunch;
+ _launch.Tag = Menus.Launch;
_taskSwitch = new ListViewItem(UITextTasks, 1);
_taskSwitch.ToolTipText = DescTasks;
- _taskSwitch.Tag = TagMenu + MenuTasks;
+ _taskSwitch.Tag = Menus.Tasks;
_macro = new ListViewItem(UITextMacros, 2);
_macro.ToolTipText = DescMacros;
- _macro.Tag = TagMenu + MenuMacros;
+ _macro.Tag = Menus.Macros;
_system = new ListViewItem(UITextSystem, 3);
_system.ToolTipText = DescSystem;
- _system.Tag = TagMenu + MenuSystem;
+ _system.Tag = Menus.System;
+ }
- _menuStack = new List<string>();
+ private void MenuForm_Load(object sender, EventArgs e)
+ {
+ _menuStack = new List<Menus>();
+
+ SwitchMenu(Menus.Main);
}
-
private void MenuForm_Shown(object sender, EventArgs e)
{
- SwitchMenu(_startMenu);
- _startMenu = MenuMain;
-
Win32.SetForegroundWindow(this.Handle, true);
-
- //listViewMenu.Select();
}
-
private void MenuForm_Deactivate(object sender, EventArgs e)
{
this.Close();
}
+ private void MenuForm_FormClosed(object sender, FormClosedEventArgs e)
+ {
+ listViewMenu.SelectedItems.Clear();
+ listViewMenu.Items.Clear();
+ _menuStack = null;
+ }
-
void CreateMainImageList()
{
_listMain = new ImageList();
@@ -169,17 +183,13 @@
{
listViewMenu.View = View.LargeIcon;
listViewMenu.Alignment = ListViewAlignment.Left;
- listViewMenu.Scrollable = true;
-
}
void SetToListStyle()
{
listViewMenu.View = View.Details;
listViewMenu.Alignment = ListViewAlignment.Top;
- listViewMenu.Scrollable = true;
+ }
- }
-
void SetWindowTitle(string subMenuName)
{
if (String.IsNullOrEmpty(subMenuName))
@@ -195,54 +205,18 @@
listViewMenu.LargeImageList = _listMain;
- //listViewMenu.SelectedItems.Clear();
- listViewMenu.Items.Clear();
-
SetToIconStyle();
+ listViewMenu.Items.Add(_taskSwitch);
listViewMenu.Items.Add(_launch);
- listViewMenu.Items.Add(_taskSwitch);
listViewMenu.Items.Add(_macro);
listViewMenu.Items.Add(_system);
-
- _launch.Selected = true;
}
- void LoadMenuLaunch()
- {
- SetWindowTitle(UITextLaunch);
-
- //listViewMenu.SelectedItems.Clear();
- listViewMenu.Items.Clear();
-
- ImageList newList = new ImageList();
- newList.ColorDepth = ColorDepth.Depth32Bit;
- newList.ImageSize = new Size(32, 32);
-
- listViewMenu.LargeImageList = newList;
-
- SetToIconStyle();
-
- int index = 0;
- foreach (ProgramSettings program in Program.Config.Programs)
- {
- newList.Images.Add(Win32.GetIconFor(program.FileName));
- ListViewItem item = new ListViewItem(program.Name, index++);
- item.ToolTipText = program.FileName;
- item.Tag = TagLaunch + program.FileName;
-
- listViewMenu.Items.Add(item);
- }
-
- listViewMenu.Items[0].Selected = true;
- }
void LoadMenuTasks()
{
SetWindowTitle(UITextTasks);
- //listViewMenu.SelectedItems.Clear();
- listViewMenu.Items.Clear();
-
ImageList newList = new ImageList();
newList.ColorDepth = ColorDepth.Depth32Bit;
newList.ImageSize = new Size(32, 32);
@@ -263,20 +237,44 @@
ListViewItem desktop = new ListViewItem("Desktop", 0);
desktop.ToolTipText = "Show the Desktop";
desktop.Tag = IntPtr.Zero;
- desktop.Selected = true;
listViewMenu.Items.Add(desktop);
PopulateTaskList();
}
+ void LoadMenuLaunch()
+ {
+ SetWindowTitle(UITextLaunch);
+
+ ImageList newList = new ImageList();
+ newList.ColorDepth = ColorDepth.Depth32Bit;
+ newList.ImageSize = new Size(32, 32);
+
+ listViewMenu.LargeImageList = newList;
+
+ SetToIconStyle();
+
+ int index = 0;
+ foreach (ProgramSettings program in Program.Config.Programs)
+ {
+ if (String.IsNullOrEmpty(program.FileName))
+ continue;
+
+ Icon icon = Win32.GetIconFor(program.FileName);
+ newList.Images.Add(icon);
+
+ ListViewItem item = new ListViewItem(program.Name, index++);
+ item.ToolTipText = program.FileName;
+ item.Tag = TagLaunch + program.FileName;
+
+ listViewMenu.Items.Add(item);
+ }
+ }
void LoadMenuMacros()
{
SetWindowTitle(UITextMacros);
listViewMenu.LargeImageList = null;
- //listViewMenu.SelectedItems.Clear();
- listViewMenu.Items.Clear();
-
SetToListStyle();
string[] macros = Program.GetMacroList(false);
@@ -290,16 +288,11 @@
listViewMenu.Items.Add(item);
}
-
- listViewMenu.Items[0].Selected = true;
}
void LoadMenuSystem()
{
SetWindowTitle(UITextSystem);
- listViewMenu.SelectedItems.Clear();
- listViewMenu.Items.Clear();
-
SetToIconStyle();
ImageList newList = new ImageList();
@@ -330,34 +323,29 @@
item = new ListViewItem(UITextWindows, 0);
item.ToolTipText = DescWindows;
- item.Tag = TagMenu + MenuWindows;
+ item.Tag = Menus.Windows;
listViewMenu.Items.Add(item);
item = new ListViewItem(UITextPower, 1);
item.ToolTipText = DescPower;
- item.Tag = TagMenu + MenuPower;
+ item.Tag = Menus.Power;
listViewMenu.Items.Add(item);
- item = new ListViewItem(UITextAudio, 2);
- item.ToolTipText = DescAudio;
- item.Tag = TagMenu + MenuAudio;
- listViewMenu.Items.Add(item);
+ //item = new ListViewItem(UITextAudio, 2);
+ //item.ToolTipText = DescAudio;
+ //item.Tag = Menus.Audio;
+ //listViewMenu.Items.Add(item);
item = new ListViewItem(UITextEject, 3);
item.ToolTipText = DescEject;
- item.Tag = TagMenu + MenuEject;
+ item.Tag = Menus.Eject;
listViewMenu.Items.Add(item);
-
- listViewMenu.Items[0].Selected = true;
}
void LoadMenuWindows()
{
SetWindowTitle(UITextWindows);
- //listViewMenu.SelectedItems.Clear();
- listViewMenu.Items.Clear();
-
SetToIconStyle();
ImageList newList = new ImageList();
@@ -372,26 +360,53 @@
string folder = Environment.GetFolderPath(Environment.SpecialFolder.System);
string file = folder + "\\shell32.dll";
+ Win32.ExtractIcons(file, IconTasks, out large, out small);
+ newList.Images.Add(large);
+
+ Win32.ExtractIcons(file, 131, out large, out small);
+ newList.Images.Add(large);
+
Win32.ExtractIcons(file, IconDesktop, out large, out small);
newList.Images.Add(large);
+ Win32.ExtractIcons(file, IconDesktop, out large, out small);
+ newList.Images.Add(large);
+
+ Win32.ExtractIcons(file, IconDesktop, out large, out small);
+ newList.Images.Add(large);
+
ListViewItem item;
- item = new ListViewItem("Minimize all", 0);
+ item = new ListViewItem("Activate", 0);
+ item.ToolTipText = "Activate a window";
+ item.Tag = Menus.WindowActivate;
+ listViewMenu.Items.Add(item);
+
+ item = new ListViewItem("Close", 1);
+ item.ToolTipText = "Close a window";
+ item.Tag = Menus.WindowClose;
+ listViewMenu.Items.Add(item);
+
+ item = new ListViewItem("Maximize", 2);
+ item.ToolTipText = "Maximize a window";
+ item.Tag = Menus.WindowMaximize;
+ listViewMenu.Items.Add(item);
+
+ item = new ListViewItem("Minimize", 3);
+ item.ToolTipText = "Minimize a window";
+ item.Tag = Menus.WindowMinimize;
+ listViewMenu.Items.Add(item);
+
+ item = new ListViewItem("Minimize all", 4);
item.ToolTipText = "Minimize all open windows";
item.Tag = IntPtr.Zero;
listViewMenu.Items.Add(item);
- item.Selected = true;
-
}
void LoadMenuPower()
{
- SetWindowTitle("Power");
+ SetWindowTitle(UITextPower);
- listViewMenu.SelectedItems.Clear();
- listViewMenu.Items.Clear();
-
SetToIconStyle();
ImageList newList = new ImageList();
@@ -415,8 +430,6 @@
item.ToolTipText = "Shutdown windows";
item.Tag = TagCommand + CommandShutdown;
listViewMenu.Items.Add(item);
-
- item.Selected = true;
item = new ListViewItem("Reboot", 0);
item.ToolTipText = "Reboot windows";
@@ -442,9 +455,6 @@
{
SetWindowTitle(UITextAudio);
- //listViewMenu.SelectedItems.Clear();
- listViewMenu.Items.Clear();
-
SetToIconStyle();
ImageList newList = new ImageList();
@@ -469,8 +479,6 @@
item.Tag = TagCommand + "Volume Up";
listViewMenu.Items.Add(item);
- item.Selected = true;
-
item = new ListViewItem("Volume Down", 0);
item.ToolTipText = "Decreases the audio volume";
item.Tag = TagCommand + "Volume Down";
@@ -484,11 +492,8 @@
}
void LoadMenuEject()
{
- SetWindowTitle(UITextAudio);
+ SetWindowTitle(UITextEject);
- //listViewMenu.SelectedItems.Clear();
- listViewMenu.Items.Clear();
-
SetToIconStyle();
ImageList newList = new ImageList();
@@ -519,77 +524,149 @@
listViewMenu.Items.Add(item);
}
}
+ }
- if (drives.Length > 0)
- listViewMenu.Items[0].Selected = true;
+ void LoadMenuWindowActivate()
+ {
+ SetWindowTitle("Activate Window");
+
+ ImageList newList = new ImageList();
+ newList.ColorDepth = ColorDepth.Depth32Bit;
+ newList.ImageSize = new Size(32, 32);
+
+ listViewMenu.LargeImageList = newList;
+
+ SetToIconStyle();
+
+ PopulateTaskList();
}
+ void LoadMenuWindowClose()
+ {
+ SetWindowTitle("Close Window");
- void SwitchMenu(string menuName)
+ ImageList newList = new ImageList();
+ newList.ColorDepth = ColorDepth.Depth32Bit;
+ newList.ImageSize = new Size(32, 32);
+
+ listViewMenu.LargeImageList = newList;
+
+ SetToIconStyle();
+
+ PopulateTaskList();
+ }
+ void LoadMenuWindowMaximize()
{
- _menuStack.Add(menuName);
+ SetWindowTitle("Maximize Window");
- switch (menuName)
+ ImageList newList = new ImageList();
+ newList.ColorDepth = ColorDepth.Depth32Bit;
+ newList.ImageSize = new Size(32, 32);
+
+ listViewMenu.LargeImageList = newList;
+
+ SetToIconStyle();
+
+ PopulateTaskList();
+ }
+ void LoadMenuWindowMinimize()
+ {
+ SetWindowTitle("Minimize Window");
+
+ ImageList newList = new ImageList();
+ newList.ColorDepth = ColorDepth.Depth32Bit;
+ newList.ImageSize = new Size(32, 32);
+
+ listViewMenu.LargeImageList = newList;
+
+ SetToIconStyle();
+
+ PopulateTaskList();
+ }
+
+
+
+ void SwitchMenu(Menus menu)
+ {
+ _menuStack.Add(menu);
+
+ listViewMenu.SelectedItems.Clear();
+ listViewMenu.Items.Clear();
+
+ switch (menu)
{
- case MenuMain: LoadMenuMain(); break;
+ case Menus.Tasks: LoadMenuTasks(); break;
+ case Menus.Launch: LoadMenuLaunch(); break;
+ case Menus.Macros: LoadMenuMacros(); break;
+ case Menus.System: LoadMenuSystem(); break;
- case MenuLaunch: LoadMenuLaunch(); break;
- case MenuTasks: LoadMenuTasks(); break;
- case MenuMacros: LoadMenuMacros(); break;
- case MenuSystem: LoadMenuSystem(); break;
+ case Menus.Windows: LoadMenuWindows(); break;
+ case Menus.Power: LoadMenuPower(); break;
+ case Menus.Audio: LoadMenuAudio(); break;
+ case Menus.Eject: LoadMenuEject(); break;
- case MenuWindows: LoadMenuWindows(); break;
- case MenuPower: LoadMenuPower(); break;
- case MenuAudio: LoadMenuAudio(); break;
- case MenuEject: LoadMenuEject(); break;
+ case Menus.WindowActivate: LoadMenuWindowActivate(); break;
+ case Menus.WindowClose: LoadMenuWindowClose(); break;
+ case Menus.WindowMaximize: LoadMenuWindowMaximize(); break;
+ case Menus.WindowMinimize: LoadMenuWindowMinimize(); break;
+
+ default: LoadMenuMain(); break;
}
ResizeWindow();
- //listViewMenu.Focus();
+ if (listViewMenu.Items.Count > 0)
+ {
+ listViewMenu.Items[0].Selected = true;
+ listViewMenu.Items[0].Focused = true;
+ }
}
void ResizeWindow()
{
+ int newWidth = 0;
+ int newHeight = 0;
+
if (listViewMenu.View == View.Details)
{
- this.Size = this.MinimumSize;
+ newWidth = this.MinimumSize.Width;
+ foreach (ListViewItem item in listViewMenu.Items)
+ newHeight += item.Bounds.Height + 2;
+
+ //newHeight += 1;
}
else
{
- int requiredWidth = 0;
- int requiredHeight = 0;
-
foreach (ListViewItem item in listViewMenu.Items)
{
- requiredWidth += item.Bounds.Width + 4;
+ newWidth += item.Bounds.Width + 4;
- if (requiredHeight < item.Bounds.Height)
- requiredHeight = item.Bounds.Height;
+ if (newHeight < item.Bounds.Height)
+ newHeight = item.Bounds.Height;
}
- int finalWidth = requiredWidth;
- int finalHeight = requiredHeight + 16;
+ newHeight += 16;
+ newWidth += 8;
+ }
- if (finalWidth > this.MaximumSize.Width)
- finalWidth = this.MaximumSize.Width;
- else if (finalWidth < this.MinimumSize.Width)
- finalWidth = this.MinimumSize.Width;
+ if (newWidth > this.MaximumSize.Width)
+ newWidth = this.MaximumSize.Width;
+ else if (newWidth < this.MinimumSize.Width)
+ newWidth = this.MinimumSize.Width;
- if (finalHeight > this.MaximumSize.Height)
- finalHeight = this.MaximumSize.Height;
- else if (finalHeight < this.MinimumSize.Height)
- finalHeight = this.MinimumSize.Height;
+ if (newHeight > this.MaximumSize.Height)
+ newHeight = this.MaximumSize.Height;
+ else if (newHeight < this.MinimumSize.Height)
+ newHeight = this.MinimumSize.Height;
- this.Size = new Size(finalWidth, finalHeight);
- }
+ this.Size = new Size(newWidth, newHeight);
Screen thisScreen = Screen.FromPoint(this.Location);
Rectangle workingArea = thisScreen.Bounds;
this.Location =
new Point(
- workingArea.X + (workingArea.Width / 2) - (this.Size.Width / 2),
- workingArea.Y + (workingArea.Height / 2) - (this.Size.Height / 2));
+ workingArea.X + (workingArea.Width / 2) - (newWidth / 2),
+ workingArea.Y + (workingArea.Height / 2) - (newHeight / 2));
}
void Launch(string programFile)
@@ -612,7 +689,7 @@
{
this.Close();
- Program.ProcessMacro(Program.FolderMacros + macroName);
+ Program.ProcessMacro(Program.FolderMacros + macroName + Common.FileExtensionMacro);
}
void TaskSwap(IntPtr window)
{
@@ -629,11 +706,11 @@
switch (command)
{
- case CommandShutdown: Shutdown(); break;
- case CommandReboot: Reboot(); break;
- case CommandLogOff: LogOff(); break;
- case CommandStandby: Standby(); break;
- case CommandHibernate: Hibernate(); break;
+ case CommandShutdown: Shutdown(); break;
+ case CommandReboot: Reboot(); break;
+ case CommandLogOff: LogOff(); break;
+ case CommandStandby: Standby(); break;
+ case CommandHibernate: Hibernate(); break;
}
@@ -645,18 +722,43 @@
CDRom.Open(drive);
}
+ void Close(IntPtr window)
+ {
+ this.Close();
+ if (window == IntPtr.Zero)
+ return;
+
+ Win32.SendWindowsMessage(window, (int)Win32.WindowsMessage.WM_SYSCOMMAND, (int)Win32.SysCommand.SC_CLOSE, 0);
+ }
+ void Minimize(IntPtr window)
+ {
+ this.Close();
+
+ if (window == IntPtr.Zero)
+ return;
+
+ Win32.SendWindowsMessage(window, (int)Win32.WindowsMessage.WM_SYSCOMMAND, (int)Win32.SysCommand.SC_MINIMIZE, 0);
+ }
+ void Maximize(IntPtr window)
+ {
+ this.Close();
+
+ if (window == IntPtr.Zero)
+ return;
+
+ Win32.SendWindowsMessage(window, (int)Win32.WindowsMessage.WM_SYSCOMMAND, (int)Win32.SysCommand.SC_MAXIMIZE, 0);
+ }
+
static void Hibernate()
{
IrssLog.Info("Hibernate");
-
if (!Application.SetSuspendState(PowerState.Hibernate, false, false))
IrssLog.Warn("Hibernate request was rejected by another application.");
}
static void Standby()
{
IrssLog.Info("Standby");
-
if (!Application.SetSuspendState(PowerState.Suspend, false, false))
IrssLog.Warn("Standby request was rejected by another application.");
}
@@ -676,74 +778,107 @@
Win32.WindowsExit(Win32.ExitWindows.ShutDown, Win32.ShutdownReasons.FlagUserDefined);
}
- private void listViewMenu_ItemActivate(object sender, EventArgs e)
+ void ActivateItem(int index)
{
- ListViewItem selectedItem = listViewMenu.SelectedItems[0];
+ if (index >= listViewMenu.Items.Count)
+ return;
- if (selectedItem.Tag is string)
+ ListViewItem selectedItem = listViewMenu.Items[index];
+
+ if (selectedItem.Tag == null)
{
- string tag = selectedItem.Tag as string;
+ return;
+ }
+ else if (selectedItem.Tag is Menus)
+ {
+ SwitchMenu((Menus)selectedItem.Tag);
+ }
+ else if (selectedItem.Tag is IntPtr)
+ {
+ IntPtr handle = (IntPtr)selectedItem.Tag;
- if (tag.StartsWith(TagMenu))
+ switch (GetCurrentMenu())
{
- string menu = tag.Substring(TagMenu.Length);
- SwitchMenu(menu);
+ case Menus.Tasks: TaskSwap(handle); break;
+ case Menus.Windows: TaskSwap(handle); break;
+ case Menus.WindowActivate: TaskSwap(handle); break;
+ case Menus.WindowClose: Close(handle); break;
+ case Menus.WindowMaximize: Maximize(handle); break;
+ case Menus.WindowMinimize: Minimize(handle); break;
}
- else if (tag.StartsWith(TagLaunch))
- {
- string program = tag.Substring(TagLaunch.Length);
- Launch(program);
- }
- else if (tag.StartsWith(TagMacro))
- {
- string macro = tag.Substring(TagMacro.Length);
- Macro(macro);
- }
- else if (tag.StartsWith(TagCommand))
- {
- string command = tag.Substring(TagCommand.Length);
- Command(command);
- }
- else if (tag.StartsWith(TagEject))
- {
- string drive = tag.Substring(TagEject.Length);
- Eject(drive);
- }
}
- else if (selectedItem.Tag is IntPtr)
+ else if (selectedItem.Tag is string)
{
- TaskSwap((IntPtr)selectedItem.Tag);
+ string tag = (string)selectedItem.Tag;
+
+ if (tag.StartsWith(TagLaunch, StringComparison.OrdinalIgnoreCase))
+ Launch(tag.Substring(TagLaunch.Length));
+ else if (tag.StartsWith(TagMacro, StringComparison.OrdinalIgnoreCase))
+ Macro(tag.Substring(TagMacro.Length));
+ else if (tag.StartsWith(TagCommand, StringComparison.OrdinalIgnoreCase))
+ Command(tag.Substring(TagCommand.Length));
+ else if (tag.StartsWith(TagEject, StringComparison.OrdinalIgnoreCase))
+ Eject(tag.Substring(TagEject.Length));
+
}
}
+
+ private void listViewMenu_ItemActivate(object sender, EventArgs e)
+ {
+ ActivateItem(listViewMenu.SelectedItems[0].Index);
+ }
+
private void listViewMenu_KeyPress(object sender, KeyPressEventArgs e)
{
- if (e.KeyChar == 27)
+ e.Handled = true;
+
+ switch (e.KeyChar)
{
- if (_menuStack.Count == 1)
- {
- this.Close();
- }
- else
- {
- // Remove current
- _menuStack.RemoveAt(_menuStack.Count - 1);
-
- // Get previous
- string previous = _menuStack[_menuStack.Count - 1];
-
- // Remove previous
- _menuStack.RemoveAt(_menuStack.Count - 1);
+ case (char)27: // ESC
+ if (_menuStack.Count == 1)
+ {
+ this.Close();
+ }
+ else
+ {
+ // Remove current
+ _menuStack.RemoveAt(_menuStack.Count - 1);
- // Switch to previous
- SwitchMenu(previous);
- }
-
- e.Handled = true;
+ // Get previous
+ Menus previous = _menuStack[_menuStack.Count - 1];
+
+ // Remove previous
+ _menuStack.RemoveAt(_menuStack.Count - 1);
+
+ // Switch to previous
+ SwitchMenu(previous);
+ }
+ break;
+
+ case '1': ActivateItem(0); break;
+ case '2': ActivateItem(1); break;
+ case '3': ActivateItem(2); break;
+ case '4': ActivateItem(3); break;
+ case '5': ActivateItem(4); break;
+ case '6': ActivateItem(5); break;
+ case '7': ActivateItem(6); break;
+ case '8': ActivateItem(7); break;
+ case '9': ActivateItem(8); break;
+
+ default:
+ e.Handled = false;
+ break;
}
+
}
+ Menus GetCurrentMenu()
+ {
+ return _menuStack[_menuStack.Count - 1];
+ }
+
void PopulateTaskList()
{
Win32.EnumWindowsProc ewp = new Win32.EnumWindowsProc(AddTask);
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2007-11-15 15:06:30 UTC (rev 1063)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2007-11-15 15:33:55 UTC (rev 1064)
@@ -115,8 +115,11 @@
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
- // TODO: Change log level to info for release.
+#if DEBUG
IrssLog.LogLevel = IrssLog.Level.Debug;
+#else
+ IrssLog.LogLevel = IrssLog.Level.Info;
+#endif
IrssLog.Open(Common.FolderIrssLogs + "Translator.log");
Application.ThreadException += new ThreadExceptionEventHandler(Application_ThreadException);
@@ -272,6 +275,28 @@
CopyDataWM.SendCopyDataMessage(Common.CmdPrefixTranslator);
continue;
+ case "-CHANNEL":
+ {
+ if (args.Length > index + 3)
+ {
+ string channel = args[++index];
+ int padding = int.Parse(args[++index]);
+ string port = args[++index];
+
+ while (channel.Length < padding)
+ channel = '0' + channel;
+
+ foreach (char digit in channel)
+ CopyDataWM.SendCopyDataMessage(Common.CmdPrefixBlast + digit + '|' + port);
+ }
+ else
+ {
+ Console.WriteLine("Channel command requires three parameters.");
+ }
+
+ continue;
+ }
+
//TODO: Add more command line options.
}
}
@@ -281,20 +306,26 @@
{
IrssLog.Info("Show OSD");
- Thread thread = new Thread(new ThreadStart(MenuThread));
- thread.Start();
+ if (_menuForm.Visible)
+ {
+ IrssLog.Info("OSD already visible");
+ }
+ else
+ {
+ Thread thread = new Thread(new ThreadStart(MenuThread));
+ thread.Start();
+ }
}
-
static void MenuThread()
{
- if (_menuForm.Visible)
+ try
{
- IrssLog.Info("OSD already visible");
-
- return;
+ _menuForm.ShowDialog();
}
-
- _menuForm.ShowDialog();
+ catch (Exception ex)
+ {
+ IrssLog.Error(ex.ToString());
+ }
}
static void SystemEvents_PowerModeChanged(object sender, PowerModeChangedEventArgs e)
@@ -693,7 +724,7 @@
case MessageType.BlastIR:
if ((received.Flags & MessageFlags.Success) == MessageFlags.Success)
- IrssLog.Debug("Blast successful");
+ IrssLog.Info("Blast successful");
else if ((received.Flags & MessageFlags.Failure) == MessageFlags.Failure)
IrssLog.Error("Failed to blast IR command");
break;
@@ -767,7 +798,7 @@
int pid = Win32.GetForegroundWindowPID();
if (pid == -1)
{
- IrssLog.Debug("Error retreiving foreground window process ID");
+ IrssLog.Debug("Failed to retreive foreground window process ID");
return null;
}
Modified: trunk/plugins/IR Server Suite/Applications/Tray Launcher/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Tray Launcher/Program.cs 2007-11-15 15:06:30 UTC (rev 1063)
+++ trunk/plugins/IR Server Suite/Applications/Tray Launcher/Program.cs 2007-11-15 15:33:55 UTC (rev 1064)
@@ -24,8 +24,11 @@
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
- // TODO: Change log level to info for release.
+#if DEBUG
IrssLog.LogLevel = IrssLog.Level.Debug;
+#else
+ IrssLog.LogLevel = IrssLog.Level.Info;
+#endif
IrssLog.Open(Common.FolderIrssLogs + "Tray Launcher.log");
Application.ThreadException += new ThreadExceptionEventHandler(Application_ThreadException);
Modified: trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray Launcher.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray Launcher.csproj 2007-11-15 15:06:30 UTC (rev 1063)
+++ trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray Launcher.csproj 2007-11-15 15:33:55 UTC (rev 1064)
@@ -18,11 +18,12 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<UseVSHostingProcess>false</UseVSHostingProcess>
+ <DocumentationFile>bin\Debug\TrayLauncher.XML</DocumentationFile>
</PropertyGroup>
<PropertyGr...
[truncated message content] |
|
From: <ts...@us...> - 2007-11-15 15:06:32
|
Revision: 1063
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1063&view=rev
Author: tsmotw
Date: 2007-11-15 07:06:30 -0800 (Thu, 15 Nov 2007)
Log Message:
-----------
All buttons updated including playlistbuttons.
Modified Paths:
--------------
trunk/skins/Xephyr/references.xml
Modified: trunk/skins/Xephyr/references.xml
===================================================================
--- trunk/skins/Xephyr/references.xml 2007-11-15 13:58:20 UTC (rev 1062)
+++ trunk/skins/Xephyr/references.xml 2007-11-15 15:06:30 UTC (rev 1063)
@@ -47,6 +47,8 @@
<colordiffuse>white</colordiffuse>
<disabledcolor>60ffffff</disabledcolor>
<!-- <selectedColor>white</selectedColor> -->
+ <animation effect="zoom" start="100,100" end="110,110" time="100">focus</animation>
+ <animation effect="zoom" start="110,110" end="100,100" time="300">unfocus</animation>
</control>
<control>
<description>default updownbutton</description>
@@ -58,8 +60,8 @@
<height>42</height>
<textXOff>18</textXOff>
<textYOff>6</textYOff>
- <textureFocus>menu_list_focus.png</textureFocus>
- <textureNoFocus>menu_list_nofocus.png</textureNoFocus>
+ <textureFocus>1listhighlightstub.png</textureFocus>
+ <textureNoFocus>1listhighlightstub_nofocus.png</textureNoFocus>
<font>font13</font>
<textcolor>white</textcolor>
<colordiffuse>white</colordiffuse>
@@ -134,12 +136,12 @@
<height>42</height>
<textXOff>18</textXOff>
<textYOff>6</textYOff>
- <textureFocus>menu_list_focus.png</textureFocus>
- <textureNoFocus>menu_list_nofocus.png</textureNoFocus>
- <textureAscending>arrow_round_up_nofocus.png</textureAscending>
- <textureAscendingFocused>arrow_round_up_focus.png</textureAscendingFocused>
- <textureDescending>arrow_round_down_nofocus.png</textureDescending>
- <textureDescendingFocused>arrow_round_down_focus.png</textureDescendingFocused>
+ <textureFocus>1listhighlightstub.png</textureFocus>
+ <textureNoFocus>1listhighlightstub_nofocus.png</textureNoFocus>
+ <textureAscending>1scroll-up.png</textureAscending>
+ <textureAscendingFocused>1scroll-up-focus.png</textureAscendingFocused>
+ <textureDescending>1scroll-down.png</textureDescending>
+ <textureDescendingFocused>1scroll-down-focus.png</textureDescendingFocused>
<offsetSortButtonX>250</offsetSortButtonX>
<offsetSortButtonY>8</offsetSortButtonY>
<font>font13</font>
@@ -204,12 +206,12 @@
<spinPosY>706</spinPosY>
<spinAlign>Right</spinAlign>
<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>
- <textureFocus>list_sub_focus.png</textureFocus>
- <textureNoFocus>list_sub_nofocus.png</textureNoFocus>
+ <textureUp>1scroll-up.png</textureUp>
+ <textureDown>1scroll-down.png</textureDown>
+ <textureUpFocus>1scroll-up-focus.png</textureUpFocus>
+ <textureDownFocus>1scroll-down-focus.png</textureDownFocus>
+ <textureFocus>1listhighlightstub.png</textureFocus>
+ <textureNoFocus>1listhighlightstub_nofocus.png</textureNoFocus>
<textureHeight>42</textureHeight>
<image>folder_focus.png</image>
<font>font13</font>
@@ -279,19 +281,19 @@
<type>playlistcontrol</type>
<id>10</id>
<posX>463</posX>
- <posY>153</posY>
- <width>750</width>
+ <posY>123</posY>
+ <width>793</width>
<height>480</height>
- <spinWidth>34</spinWidth>
- <spinHeight>36</spinHeight>
- <spinPosX>1202</spinPosX>
- <spinPosY>706</spinPosY>
- <spinAlign>Right</spinAlign>
- <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>
+ <spinWidth>20</spinWidth>
+ <spinHeight>20</spinHeight>
+ <spinPosX>1200</spinPosX>
+ <spinPosY>590</spinPosY>
+ <spinAlign>Right</spinAlign>
+ <spinColor>ffffffff</spinColor>
+ <textureUp>1scroll-up.png</textureUp>
+ <textureDown>1scroll-down.png</textureDown>
+ <textureUpFocus>1scroll-up-focus.png</textureUpFocus>
+ <textureDownFocus>1scroll-down-focus.png</textureDownFocus>
<textureFocus>list_sub_focus.png</textureFocus>
<textureNoFocus>list_sub_nofocus.png</textureNoFocus>
<textureHeight>42</textureHeight>
@@ -307,20 +309,20 @@
<downloadColor>ff80ff80</downloadColor>
<textXOff>32</textXOff>
<textYOff>4</textYOff>
- <textXOff2>650</textXOff2>
+ <textXOff2>600</textXOff2>
<textYOff2>4</textYOff2>
<IconXOff>24</IconXOff>
<IconYOff>14</IconYOff>
<suffix>|</suffix>
- <upBtnWidth>39</upBtnWidth>
- <downBtnWidth>39</downBtnWidth>
- <deleteBtnWidth>46</deleteBtnWidth>
+ <upBtnWidth>30</upBtnWidth>
+ <downBtnWidth>30</downBtnWidth>
+ <deleteBtnWidth>30</deleteBtnWidth>
<upBtnHeight>42</upBtnHeight>
<downBtnHeight>42</downBtnHeight>
<deleteBtnHeight>42</deleteBtnHeight>
- <upBtnXOffset>641</upBtnXOffset>
- <downBtnXOffset>680</downBtnXOffset>
- <deleteBtnXOffset>719</deleteBtnXOffset>
+ <upBtnXOffset>640</upBtnXOffset>
+ <downBtnXOffset>670</downBtnXOffset>
+ <deleteBtnXOffset>700</deleteBtnXOffset>
<upBtnYOffset>0</upBtnYOffset>
<downBtnYOffset>0</downBtnYOffset>
<deleteBtnYOffset>0</deleteBtnYOffset>
@@ -465,10 +467,10 @@
<spinPosX>1157</spinPosX>
<spinPosY>706</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>
+ <textureUp>1scroll-up.png</textureUp>
+ <textureDown>1scroll-down.png</textureDown>
+ <textureUpFocus>1scroll-up-focus.png</textureUpFocus>
+ <textureDownFocus>1scroll-down-focus.png</textureDownFocus>
<image>icon-folder.png</image>
<font>font13</font>
<textcolor>white</textcolor>
@@ -517,10 +519,10 @@
<posY>168</posY>
<width>21</width>
<height>21</height>
- <textureUp>page_up_nofocus.png</textureUp>
- <textureDown>page_down_nofocus.png</textureDown>
- <textureUpFocus>page_up_focus.png</textureUpFocus>
- <textureDownFocus>page_down_focus.png</textureDownFocus>
+ <textureUp>1scroll-up.png</textureUp>
+ <textureDown>1scroll-down.png</textureDown>
+ <textureUpFocus>1scroll-up-focus.png</textureUpFocus>
+ <textureDownFocus>1scroll-down-focus.png</textureDownFocus>
<align>left</align>
<font>font13</font>
<reverse>yes</reverse>
@@ -560,13 +562,13 @@
<textYOff>6</textYOff>
<textXOff2>18</textXOff2>
<textYOff2>6</textYOff2>
- <textureFocus>menu_list_focus.png</textureFocus>
- <textureNoFocus>menu_list_nofocus.png</textureNoFocus>
- <texturebg>menu_list_nofocus.png</texturebg>
- <textureLeft>arrow_round_left_nofocus.png</textureLeft>
- <textureLeftFocus>arrow_round_left_focus.png</textureLeftFocus>
- <textureRight>arrow_round_right_nofocus.png</textureRight>
- <textureRightFocus>arrow_round_right_focus.png</textureRightFocus>
+ <textureFocus>1listhighlightstub.png</textureFocus>
+ <textureNoFocus>1listhighlightstub_nofocus.png</textureNoFocus>
+ <texturebg>1listhighlightstub.png</texturebg>
+ <textureLeft>1scroll-left.png</textureLeft>
+ <textureLeftFocus>1scroll-left-focus.png</textureLeftFocus>
+ <textureRight>1scroll-right.png</textureRight>
+ <textureRightFocus>1scroll-right-focus.png</textureRightFocus>
<font>font13</font>
<textcolor>white</textcolor>
<colordiffuse>white</colordiffuse>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2007-11-15 13:58:23
|
Revision: 1062
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1062&view=rev
Author: tsmotw
Date: 2007-11-15 05:58:20 -0800 (Thu, 15 Nov 2007)
Log Message:
-----------
Added playlist buttons
Modified Paths:
--------------
trunk/skins/Xephyr/Media/playlist_item_delete_focus.png
trunk/skins/Xephyr/Media/playlist_item_delete_nofocus.png
trunk/skins/Xephyr/Media/playlist_item_down_focus.png
trunk/skins/Xephyr/Media/playlist_item_down_nofocus.png
trunk/skins/Xephyr/Media/playlist_item_up_focus.png
trunk/skins/Xephyr/Media/playlist_item_up_nofocus.png
trunk/skins/Xephyr/Media/playlist_sub_focus.png
trunk/skins/Xephyr/Media/playlist_sub_nofocus.png
Modified: trunk/skins/Xephyr/Media/playlist_item_delete_focus.png
===================================================================
(Binary files differ)
Modified: trunk/skins/Xephyr/Media/playlist_item_delete_nofocus.png
===================================================================
(Binary files differ)
Modified: trunk/skins/Xephyr/Media/playlist_item_down_focus.png
===================================================================
(Binary files differ)
Modified: trunk/skins/Xephyr/Media/playlist_item_down_nofocus.png
===================================================================
(Binary files differ)
Modified: trunk/skins/Xephyr/Media/playlist_item_up_focus.png
===================================================================
(Binary files differ)
Modified: trunk/skins/Xephyr/Media/playlist_item_up_nofocus.png
===================================================================
(Binary files differ)
Modified: trunk/skins/Xephyr/Media/playlist_sub_focus.png
===================================================================
(Binary files differ)
Modified: trunk/skins/Xephyr/Media/playlist_sub_nofocus.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2007-11-15 13:08:48
|
Revision: 1061
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1061&view=rev
Author: tsmotw
Date: 2007-11-15 05:08:41 -0800 (Thu, 15 Nov 2007)
Log Message:
-----------
Edited buttons and fixed shadow in my videos
Modified Paths:
--------------
trunk/skins/Xephyr/Media/1listhighlightstub.png
trunk/skins/Xephyr/Media/1listhighlightstub_nofocus.png
trunk/skins/Xephyr/Media/1togglebutton-off-focus.png
trunk/skins/Xephyr/Media/1togglebutton-off-nofocus.png
trunk/skins/Xephyr/Media/1togglebutton-on-focus.png
trunk/skins/Xephyr/Media/1togglebutton-on-nofocus.png
trunk/skins/Xephyr/myvideoTitle.xml
Added Paths:
-----------
trunk/skins/Xephyr/Media/1scroll-left-focus.png
trunk/skins/Xephyr/Media/1scroll-left.png
trunk/skins/Xephyr/Media/1scroll-right-focus.png
trunk/skins/Xephyr/Media/1scroll-right.png
trunk/skins/Xephyr/Media/Thumb_Mask_Video.png
Modified: trunk/skins/Xephyr/Media/1listhighlightstub.png
===================================================================
(Binary files differ)
Modified: trunk/skins/Xephyr/Media/1listhighlightstub_nofocus.png
===================================================================
(Binary files differ)
Added: trunk/skins/Xephyr/Media/1scroll-left-focus.png
===================================================================
(Binary files differ)
Property changes on: trunk/skins/Xephyr/Media/1scroll-left-focus.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skins/Xephyr/Media/1scroll-left.png
===================================================================
(Binary files differ)
Property changes on: trunk/skins/Xephyr/Media/1scroll-left.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skins/Xephyr/Media/1scroll-right-focus.png
===================================================================
(Binary files differ)
Property changes on: trunk/skins/Xephyr/Media/1scroll-right-focus.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skins/Xephyr/Media/1scroll-right.png
===================================================================
(Binary files differ)
Property changes on: trunk/skins/Xephyr/Media/1scroll-right.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/skins/Xephyr/Media/1togglebutton-off-focus.png
===================================================================
(Binary files differ)
Modified: trunk/skins/Xephyr/Media/1togglebutton-off-nofocus.png
===================================================================
(Binary files differ)
Modified: trunk/skins/Xephyr/Media/1togglebutton-on-focus.png
===================================================================
(Binary files differ)
Modified: trunk/skins/Xephyr/Media/1togglebutton-on-nofocus.png
===================================================================
(Binary files differ)
Added: trunk/skins/Xephyr/Media/Thumb_Mask_Video.png
===================================================================
(Binary files differ)
Property changes on: trunk/skins/Xephyr/Media/Thumb_Mask_Video.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/skins/Xephyr/myvideoTitle.xml
===================================================================
--- trunk/skins/Xephyr/myvideoTitle.xml 2007-11-15 11:08:54 UTC (rev 1060)
+++ trunk/skins/Xephyr/myvideoTitle.xml 2007-11-15 13:08:41 UTC (rev 1061)
@@ -429,31 +429,19 @@
<textcolor>FFFFFFFF</textcolor>
<visible>facadeview.list + control.hasfocus(50)|facadeview.smallicons + control.hasfocus(50)|facadeview.largeicons + control.hasfocus(50)</visible>
</control>
+
<control>
<type>image</type>
<animation effect="fade" time="400">WindowClose</animation>
<animation effect="fade" time="400">WindowOpen</animation>
<animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
<animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <posX>1020</posX>
- <posY>180</posY>
- <width>238</width>
- <height>330</height>
- <texture flipY="true" diffuse="Thumb_Mask.png">dvdcover_background.png</texture>
- <visible>facadeview.list + control.hasfocus(50)|facadeview.smallicons + control.hasfocus(50)|facadeview.largeicons + control.hasfocus(50)</visible>
- </control>
- <control>
- <type>image</type>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
<id>435</id>
<posX>1045</posX>
<posY>205</posY>
<width>190</width>
<height>280</height>
- <texture flipY="true" diffuse="Thumb_Mask.png">#thumb</texture>
+ <texture flipY="true" diffuse="Thumb_Mask_Video.png">#thumb</texture>
<visible>facadeview.list|facadeview.smallicons|facadeview.largeicons</visible>
</control>
</controls>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <i-...@us...> - 2007-11-15 11:08:58
|
Revision: 1060
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1060&view=rev
Author: i-loop
Date: 2007-11-15 03:08:54 -0800 (Thu, 15 Nov 2007)
Log Message:
-----------
synced with latest BlueTwo svn
Modified Paths:
--------------
trunk/skins/BlueTwoBig/Development Version/BasicHome.xml
trunk/skins/BlueTwoBig/Development Version/DialogAlbumInfo.xml
trunk/skins/BlueTwoBig/Development Version/DialogArtistInfo.xml
trunk/skins/BlueTwoBig/Development Version/DialogDateTime.xml
trunk/skins/BlueTwoBig/Development Version/DialogFile.xml
trunk/skins/BlueTwoBig/Development Version/DialogFileInfo.xml
trunk/skins/BlueTwoBig/Development Version/DialogMenu.xml
trunk/skins/BlueTwoBig/Development Version/DialogMenuBottomRight.xml
trunk/skins/BlueTwoBig/Development Version/DialogNotify.xml
trunk/skins/BlueTwoBig/Development Version/DialogPictureInfo.xml
trunk/skins/BlueTwoBig/Development Version/DialogSelect.xml
trunk/skins/BlueTwoBig/Development Version/DialogSelect2.xml
trunk/skins/BlueTwoBig/Development Version/DialogTVConflict.xml
trunk/skins/BlueTwoBig/Development Version/DialogText.xml
trunk/skins/BlueTwoBig/Development Version/DialogVideoArtistInfo.xml
trunk/skins/BlueTwoBig/Development Version/DialogVideoInfo.xml
trunk/skins/BlueTwoBig/Development Version/MusicMenu.xml
trunk/skins/BlueTwoBig/Development Version/MyMusicPlayingNow.xml
trunk/skins/BlueTwoBig/Development Version/MyRadioLastFM.xml
trunk/skins/BlueTwoBig/Development Version/SettingsGUI.xml
trunk/skins/BlueTwoBig/Development Version/SettingsMyMusic.xml
trunk/skins/BlueTwoBig/Development Version/SettingsSlideShow.xml
trunk/skins/BlueTwoBig/Development Version/TvServerSetup.xml
trunk/skins/BlueTwoBig/Development Version/VideoEditorCompressSettings.xml
trunk/skins/BlueTwoBig/Development Version/common.dialog.xml
trunk/skins/BlueTwoBig/Development Version/common.facade.music.xml
trunk/skins/BlueTwoBig/Development Version/common.facade.pictures.xml
trunk/skins/BlueTwoBig/Development Version/common.facade.video.xml
trunk/skins/BlueTwoBig/Development Version/common.facade.xml
trunk/skins/BlueTwoBig/Development Version/common.settings.xml
trunk/skins/BlueTwoBig/Development Version/common.time.xml
trunk/skins/BlueTwoBig/Development Version/common.window.default.xml
trunk/skins/BlueTwoBig/Development Version/common.window.xml
trunk/skins/BlueTwoBig/Development Version/dialogFileStacking.xml
trunk/skins/BlueTwoBig/Development Version/dialogOK.xml
trunk/skins/BlueTwoBig/Development Version/dialogProgress.xml
trunk/skins/BlueTwoBig/Development Version/dialogRating.xml
trunk/skins/BlueTwoBig/Development Version/dialogTvGuide.xml
trunk/skins/BlueTwoBig/Development Version/dialogYesNo.xml
trunk/skins/BlueTwoBig/Development Version/musicOverlay.xml
trunk/skins/BlueTwoBig/Development Version/myHome.xml
trunk/skins/BlueTwoBig/Development Version/myHomePlugIns.xml
trunk/skins/BlueTwoBig/Development Version/myalarm.xml
trunk/skins/BlueTwoBig/Development Version/mymusicgenres.xml
trunk/skins/BlueTwoBig/Development Version/mymusicplaylist.xml
trunk/skins/BlueTwoBig/Development Version/mymusicsongs.xml
trunk/skins/BlueTwoBig/Development Version/mymusicvideoplaylist.xml
trunk/skins/BlueTwoBig/Development Version/mymusicvideos.xml
trunk/skins/BlueTwoBig/Development Version/mynumberplace.xml
trunk/skins/BlueTwoBig/Development Version/mypics.xml
trunk/skins/BlueTwoBig/Development Version/myplugins.xml
trunk/skins/BlueTwoBig/Development Version/myprograms.xml
trunk/skins/BlueTwoBig/Development Version/myradio.xml
trunk/skins/BlueTwoBig/Development Version/myradioguide.xml
trunk/skins/BlueTwoBig/Development Version/myteletext.xml
trunk/skins/BlueTwoBig/Development Version/mytetris.xml
trunk/skins/BlueTwoBig/Development Version/mytvRecordedInfo.xml
trunk/skins/BlueTwoBig/Development Version/mytvcompress.xml
trunk/skins/BlueTwoBig/Development Version/mytvcompressauto.xml
trunk/skins/BlueTwoBig/Development Version/mytvcompressmain.xml
trunk/skins/BlueTwoBig/Development Version/mytvcompresssettings.xml
trunk/skins/BlueTwoBig/Development Version/mytvcompressstatus.xml
trunk/skins/BlueTwoBig/Development Version/mytvconflicts.xml
trunk/skins/BlueTwoBig/Development Version/mytvguide.xml
trunk/skins/BlueTwoBig/Development Version/mytvhome.xml
trunk/skins/BlueTwoBig/Development Version/mytvhomeServer.xml
trunk/skins/BlueTwoBig/Development Version/mytvpriorities.xml
trunk/skins/BlueTwoBig/Development Version/mytvprogram.xml
trunk/skins/BlueTwoBig/Development Version/mytvrecordedtv.xml
trunk/skins/BlueTwoBig/Development Version/mytvrecordedtvchannel.xml
trunk/skins/BlueTwoBig/Development Version/mytvrecordedtvgenre.xml
trunk/skins/BlueTwoBig/Development Version/mytvscheduler.xml
trunk/skins/BlueTwoBig/Development Version/mytvschedulerServer.xml
trunk/skins/BlueTwoBig/Development Version/mytvschedulerserverSearchType.xml
trunk/skins/BlueTwoBig/Development Version/mytvsearch.xml
trunk/skins/BlueTwoBig/Development Version/mytvtuningdetails.xml
trunk/skins/BlueTwoBig/Development Version/myvideo.xml
trunk/skins/BlueTwoBig/Development Version/myvideoTitle.xml
trunk/skins/BlueTwoBig/Development Version/myvideoplaylist.xml
trunk/skins/BlueTwoBig/Development Version/myweather.xml
trunk/skins/BlueTwoBig/Development Version/settings.xml
trunk/skins/BlueTwoBig/Development Version/settingsScreen.xml
trunk/skins/BlueTwoBig/Development Version/settingsSkipSteps.xml
trunk/skins/BlueTwoBig/Development Version/settingsUICalibration.xml
trunk/skins/BlueTwoBig/Development Version/settings_dvd.xml
trunk/skins/BlueTwoBig/Development Version/settings_general.xml
trunk/skins/BlueTwoBig/Development Version/settings_movies.xml
trunk/skins/BlueTwoBig/Development Version/settings_tv.xml
trunk/skins/BlueTwoBig/Development Version/tvOverlay.xml
trunk/skins/BlueTwoBig/Development Version/videoOverlay.xml
trunk/skins/BlueTwoBig/Development Version/wikipedia.xml
Modified: trunk/skins/BlueTwoBig/Development Version/BasicHome.xml
===================================================================
--- trunk/skins/BlueTwoBig/Development Version/BasicHome.xml 2007-11-14 12:45:54 UTC (rev 1059)
+++ trunk/skins/BlueTwoBig/Development Version/BasicHome.xml 2007-11-15 11:08:54 UTC (rev 1060)
@@ -25,7 +25,7 @@
<font>dingbats</font>
<textcolor>40ffffff</textcolor>
<animation effect="fade" time="250">WindowOpen</animation>
- <animation effect="fade" time="500">WindowClose</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>home BM Video</description>
@@ -104,7 +104,7 @@
<ondown>66</ondown>
<visible>Control.HasFocus(6)</visible>
<animation effect="slide" start="0,0" end="-213,81" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
- <animation effect="zoom" start="100,100" end="140,140" center="0,0" time="500" reversible="false">visiblechange</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="0,0" time="250" reversible="false">visiblechange</animation>
</control>
<control>
<description>home BM Video</description>
@@ -292,7 +292,7 @@
<ondown>66</ondown>
<visible>Control.HasFocus(5)</visible>
<animation effect="slide" start="213,74" end="0,155" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
- <animation effect="zoom" start="100,100" end="140,140" center="0,0" time="500" reversible="false">visiblechange</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="0,0" time="250" reversible="false">visiblechange</animation>
</control>
<control>
<description>home BM FFS</description>
@@ -482,7 +482,7 @@
<ondown>66</ondown>
<visible>Control.HasFocus(4)</visible>
<animation effect="slide" start="426,0" end="213,81" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
- <animation effect="zoom" start="100,100" end="140,140" center="0,0" time="500" reversible="false">visiblechange</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="0,0" time="250" reversible="false">visiblechange</animation>
</control>
<control>
<description>home BM Music</description>
@@ -670,7 +670,7 @@
<ondown>66</ondown>
<visible>Control.HasFocus(3)</visible>
<animation effect="slide" start="213,-81" end="0,0" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
- <animation effect="zoom" start="100,100" end="140,140" center="0,0" time="500" reversible="false">visiblechange</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="0,0" time="250" reversible="false">visiblechange</animation>
</control>
!....................................................
@@ -753,7 +753,7 @@
<ondown>66</ondown>
<visible>Control.HasFocus(44)</visible>
<animation effect="slide" start="-426,0" end="-213,81" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
- <animation effect="zoom" start="100,100" end="140,140" center="0,0" time="500" reversible="false">visiblechange</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="0,0" time="250" reversible="false">visiblechange</animation>
</control>
<control>
@@ -835,7 +835,7 @@
<ondown>66</ondown>
<visible>Control.HasFocus(33)</visible>
<animation effect="slide" start="-213,74" end="0,155" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
- <animation effect="zoom" start="100,100" end="140,140" center="0,0" time="500" reversible="false">visiblechange</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="0,0" time="250" reversible="false">visiblechange</animation>
</control>
<control>
<description>home BM FFS</description>
@@ -917,7 +917,7 @@
<ondown>66</ondown>
<visible>Control.HasFocus(66)</visible>
<animation effect="slide" start="0,0" end="213,81" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
- <animation effect="zoom" start="100,100" end="140,140" center="0,0" time="500" reversible="false">visiblechange</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="0,0" time="250" reversible="false">visiblechange</animation>
</control>
<control>
<description>home BM Music</description>
@@ -1106,7 +1106,7 @@
<ondown>66</ondown>
<visible>Control.HasFocus(55)</visible>
<animation effect="slide" start="-213,-81" end="0,0" time="400" acceleration="-0.4" reversible="false">visiblechange</animation>
- <animation effect="zoom" start="100,100" end="140,140" center="0,0" time="500" reversible="false">visiblechange</animation>
+ <animation effect="zoom" start="100,100" end="140,140" center="0,0" time="250" reversible="false">visiblechange</animation>
</control>
<control>
<type>image</type>
@@ -1115,9 +1115,9 @@
<posY>190</posY>
<texture>Backspin.png</texture>
<visible>![Control.HasFocus(6)|Control.HasFocus(5)|Control.HasFocus(4)|Control.HasFocus(3)|Control.HasFocus(33)|Control.HasFocus(44)|Control.HasFocus(55)|Control.HasFocus(66)]</visible>
- <animation effect="zoom" start="100,100" end="99,99" center="0,0" time="500" reversible="false">visiblechange</animation>
+ <animation effect="zoom" start="100,100" end="99,99" center="0,0" time="250" reversible="false">visiblechange</animation>
<animation effect="fade" time="250">WindowOpen</animation>
- <animation effect="fade" time="500">WindowClose</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<!--
<control>
@@ -1130,7 +1130,7 @@
<height>133</height>
<texture>playback_background.png</texture>
<visible>Player.HasMedia</visible>
- <animation effect="fade" time="500">WindowClose</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
<animation effect="fade" time="250">WindowOpen</animation>
</control>
<control>
@@ -1144,7 +1144,7 @@
<keepaspectratio>yes</keepaspectratio>
<centered>yes</centered>
<texture>#Play.Current.Thumb</texture>
- <animation effect="fade" time="500">WindowClose</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
<animation effect="fade" time="250">WindowOpen</animation>
</control>
<control>
@@ -1157,7 +1157,7 @@
<font>font12</font>
<label>#Play.Current.Title\r#Play.Current.Artist\r#Play.Current.Album\r#Play.Current.Duration</label>
<textcolor>EFFFFFFF</textcolor>
- <animation effect="fade" time="500">WindowClose</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
<animation effect="fade" time="250">WindowOpen</animation>
<id>5</id>
</control>
@@ -1173,7 +1173,7 @@
<font>font13</font>
<textcolor>ffa9d0f7</textcolor>
<animation effect="fade" time="250">WindowOpen</animation>
- <animation effect="fade" time="500">WindowClose</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Time</description>
@@ -1186,7 +1186,7 @@
<font>font13</font>
<textcolor>ffffffff</textcolor>
<animation effect="fade" time="250">WindowOpen</animation>
- <animation effect="fade" time="500">WindowClose</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<type>image</type>
@@ -1195,7 +1195,7 @@
<posY>20</posY>
<texture flipY="true" diffuse="Thumb_Mask.png">basichome_logo.png</texture>
<animation effect="fade" time="250">WindowOpen</animation>
- <animation effect="fade" time="500">WindowClose</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/BlueTwoBig/Development Version/DialogAlbumInfo.xml
===================================================================
--- trunk/skins/BlueTwoBig/Development Version/DialogAlbumInfo.xml 2007-11-14 12:45:54 UTC (rev 1059)
+++ trunk/skins/BlueTwoBig/Development Version/DialogAlbumInfo.xml 2007-11-15 11:08:54 UTC (rev 1060)
@@ -17,8 +17,8 @@
<posX>60</posX>
<posY>20</posY>
<texture>info_logo.png</texture>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Album value</description>
@@ -30,8 +30,8 @@
<font>font16</font>
<align>left</align>
<textcolor>FFFFFFFF</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Artist</description>
@@ -42,8 +42,8 @@
<label>171</label>
<font>font13</font>
<textcolor>FFB2D4F5</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Date of Release</description>
@@ -54,8 +54,8 @@
<label>201</label>
<font>font13</font>
<textcolor>FFB2D4F5</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Rating</description>
@@ -66,8 +66,8 @@
<label>173</label>
<font>font13</font>
<textcolor>FFB2D4F5</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Genre</description>
@@ -78,8 +78,8 @@
<label>174</label>
<font>font13</font>
<textcolor>FFB2D4F5</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Tones</description>
@@ -90,8 +90,8 @@
<label>175</label>
<font>font13</font>
<textcolor>FFB2D4F5</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Styles</description>
@@ -102,8 +102,8 @@
<label>176</label>
<font>font13</font>
<textcolor>FFB2D4F5</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Artist value</description>
@@ -114,8 +114,8 @@
<label>-</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Date of Release value</description>
@@ -126,8 +126,8 @@
<label>-</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Rating value</description>
@@ -138,8 +138,8 @@
<label>-</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Genre value</description>
@@ -150,8 +150,8 @@
<label>-</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Tones value</description>
@@ -163,8 +163,8 @@
<label>-</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Styles value</description>
@@ -176,8 +176,8 @@
<label>-</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Album Art</description>
@@ -191,8 +191,8 @@
<colorkey>FFFF00FF</colorkey>
<colordiffuse>FFFFFFFF</colordiffuse>
<keepaspectratio>yes</keepaspectratio>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>textarea</description>
@@ -203,8 +203,8 @@
<onright>5</onright>
<onup>5</onup>
<ondown>5</ondown>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Tracks/Review</description>
@@ -218,8 +218,8 @@
<onright>4</onright>
<onup>6</onup>
<ondown>6</ondown>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Refresh</description>
@@ -234,8 +234,8 @@
<onright>4</onright>
<onup>5</onup>
<ondown>5</ondown>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/BlueTwoBig/Development Version/DialogArtistInfo.xml
===================================================================
--- trunk/skins/BlueTwoBig/Development Version/DialogArtistInfo.xml 2007-11-14 12:45:54 UTC (rev 1059)
+++ trunk/skins/BlueTwoBig/Development Version/DialogArtistInfo.xml 2007-11-15 11:08:54 UTC (rev 1060)
@@ -17,8 +17,8 @@
<posX>60</posX>
<posY>20</posY>
<texture>info_logo.png</texture>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Artist</description>
@@ -29,8 +29,8 @@
<label>493</label>
<font>font13</font>
<textcolor>FFB2D4F5</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Artist value</description>
@@ -42,8 +42,8 @@
<font>font16</font>
<align>left</align>
<textcolor>FFFFFFFF</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Born</description>
@@ -54,8 +54,8 @@
<label>686</label>
<font>font13</font>
<textcolor>FFB2D4F5</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Years Active</description>
@@ -66,8 +66,8 @@
<label>687</label>
<font>font13</font>
<textcolor>FFB2D4F5</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Genres</description>
@@ -78,8 +78,8 @@
<label>135</label>
<font>font13</font>
<textcolor>FFB2D4F5</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Tones</description>
@@ -90,8 +90,8 @@
<label>175</label>
<font>font13</font>
<textcolor>FFB2D4F5</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Styles</description>
@@ -102,8 +102,8 @@
<label>176</label>
<font>font13</font>
<textcolor>FFB2D4F5</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Instruments</description>
@@ -114,8 +114,8 @@
<label>688</label>
<font>font13</font>
<textcolor>FFB2D4F5</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Artist value</description>
@@ -126,8 +126,8 @@
<label>-</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Born value</description>
@@ -138,8 +138,8 @@
<label>-</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Years Active value</description>
@@ -150,8 +150,8 @@
<label>-</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Genres value</description>
@@ -162,8 +162,8 @@
<label>-</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Tones value</description>
@@ -175,8 +175,8 @@
<label>-</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Styles value</description>
@@ -188,8 +188,8 @@
<label>-</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Instruments value</description>
@@ -200,8 +200,8 @@
<label>-</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>artist image</description>
@@ -215,8 +215,8 @@
<colorkey>FFFF00FF</colorkey>
<colordiffuse>FFFFFFFF</colordiffuse>
<keepaspectratio>yes</keepaspectratio>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>textarea</description>
@@ -227,8 +227,8 @@
<onright>5</onright>
<onup>5</onup>
<ondown>5</ondown>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Bio/Albums</description>
@@ -242,8 +242,8 @@
<onright>4</onright>
<onup>6</onup>
<ondown>6</ondown>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Refresh</description>
@@ -258,8 +258,8 @@
<onright>4</onright>
<onup>5</onup>
<ondown>5</ondown>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/BlueTwoBig/Development Version/DialogDateTime.xml
===================================================================
--- trunk/skins/BlueTwoBig/Development Version/DialogDateTime.xml 2007-11-14 12:45:54 UTC (rev 1059)
+++ trunk/skins/BlueTwoBig/Development Version/DialogDateTime.xml 2007-11-15 11:08:54 UTC (rev 1060)
@@ -21,8 +21,8 @@
<height>276</height>
<posY>155</posY>
<texture>dialog_schedule_rec.png</texture>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Channel</description>
@@ -33,8 +33,8 @@
<label>602</label>
<font>font13</font>
<textcolor>FFB2D4F5</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Channel Select</description>
@@ -49,8 +49,8 @@
<onleft>1</onleft>
<onright>1</onright>
<textcolor>FFFFFFFF</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Start Date/Time</description>
@@ -62,8 +62,8 @@
<font>font13</font>
<textcolor>FFB2D4F5</textcolor>
</control>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
<control>
<description>Time</description>
<type>label</type>
@@ -73,8 +73,8 @@
<label>635</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>time hours</description>
@@ -95,8 +95,8 @@
<textureDown>arrow_round_down_nofocus.png</textureDown>
<textureUpFocus>arrow_round_up_focus.png</textureUpFocus>
<textureDownFocus>arrow_round_down_focus.png</textureDownFocus>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>time minutes</description>
@@ -117,8 +117,8 @@
<textureDown>arrow_round_down_nofocus.png</textureDown>
<textureUpFocus>arrow_round_up_focus.png</textureUpFocus>
<textureDownFocus>arrow_round_down_focus.png</textureDownFocus>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Date</description>
@@ -129,8 +129,8 @@
<label>636</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>DD</description>
@@ -150,8 +150,8 @@
<textureDown>arrow_round_down_nofocus.png</textureDown>
<textureUpFocus>arrow_round_up_focus.png</textureUpFocus>
<textureDownFocus>arrow_round_down_focus.png</textureDownFocus>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>MM</description>
@@ -171,8 +171,8 @@
<textureDown>arrow_round_down_nofocus.png</textureDown>
<textureUpFocus>arrow_round_up_focus.png</textureUpFocus>
<textureDownFocus>arrow_round_down_focus.png</textureDownFocus>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>YYYY</description>
@@ -193,8 +193,8 @@
<textureDown>arrow_round_down_nofocus.png</textureDown>
<textureUpFocus>arrow_round_up_focus.png</textureUpFocus>
<textureDownFocus>arrow_round_down_focus.png</textureDownFocus>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>End Date/Time</description>
@@ -205,8 +205,8 @@
<label>634</label>
<font>font13</font>
<textcolor>FFB2D4F5</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Time</description>
@@ -217,8 +217,8 @@
<label>635</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>time hours</description>
@@ -239,8 +239,8 @@
<textureDown>arrow_round_down_nofocus.png</textureDown>
<textureUpFocus>arrow_round_up_focus.png</textureUpFocus>
<textureDownFocus>arrow_round_down_focus.png</textureDownFocus>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>time minutes</description>
@@ -261,8 +261,8 @@
<textureDown>arrow_round_down_nofocus.png</textureDown>
<textureUpFocus>arrow_round_up_focus.png</textureUpFocus>
<textureDownFocus>arrow_round_down_focus.png</textureDownFocus>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Date</description>
@@ -273,8 +273,8 @@
<label>636</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>DD</description>
@@ -294,8 +294,8 @@
<textureDown>arrow_round_down_nofocus.png</textureDown>
<textureUpFocus>arrow_round_up_focus.png</textureUpFocus>
<textureDownFocus>arrow_round_down_focus.png</textureDownFocus>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>MM</description>
@@ -315,8 +315,8 @@
<textureDown>arrow_round_down_nofocus.png</textureDown>
<textureUpFocus>arrow_round_up_focus.png</textureUpFocus>
<textureDownFocus>arrow_round_down_focus.png</textureDownFocus>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>YYYY</description>
@@ -337,8 +337,8 @@
<textureDown>arrow_round_down_nofocus.png</textureDown>
<textureUpFocus>arrow_round_up_focus.png</textureUpFocus>
<textureDownFocus>arrow_round_down_focus.png</textureDownFocus>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>OK button</description>
@@ -355,8 +355,8 @@
<onright>10</onright>
<onup>11</onup>
<ondown>1</ondown>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>dialog Heading</description>
@@ -367,8 +367,8 @@
<label>0</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/BlueTwoBig/Development Version/DialogFile.xml
===================================================================
--- trunk/skins/BlueTwoBig/Development Version/DialogFile.xml 2007-11-14 12:45:54 UTC (rev 1059)
+++ trunk/skins/BlueTwoBig/Development Version/DialogFile.xml 2007-11-15 11:08:54 UTC (rev 1060)
@@ -14,8 +14,8 @@
<width>404</width>
<height>242</height>
<texture>dialog_background.png</texture>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<type>image</type>
@@ -32,8 +32,8 @@
<posX>195</posX>
<posY>295</posY>
<width>300</width>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Yes button</description>
@@ -50,8 +50,8 @@
<onright>10</onright>
<onup>12</onup>
<ondown>12</ondown>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>No button</description>
@@ -68,8 +68,8 @@
<onright>14</onright>
<onup>13</onup>
<ondown>13</ondown>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Always</description>
@@ -86,8 +86,8 @@
<onright>13</onright>
<onup>11</onup>
<ondown>11</ondown>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Never</description>
@@ -104,8 +104,8 @@
<onright>12</onright>
<onup>10</onup>
<ondown>10</ondown>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Cancel button</description>
@@ -122,8 +122,8 @@
<onright>11</onright>
<onup>14</onup>
<ondown>14</ondown>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/BlueTwoBig/Development Version/DialogFileInfo.xml
===================================================================
--- trunk/skins/BlueTwoBig/Development Version/DialogFileInfo.xml 2007-11-14 12:45:54 UTC (rev 1059)
+++ trunk/skins/BlueTwoBig/Development Version/DialogFileInfo.xml 2007-11-15 11:08:54 UTC (rev 1060)
@@ -17,8 +17,8 @@
<posX>60</posX>
<posY>20</posY>
<texture>info_logo.png</texture>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>File Title</description>
@@ -30,8 +30,8 @@
<font>font16</font>
<align>left</align>
<textcolor>FFFFFFFF</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>System</description>
@@ -42,8 +42,8 @@
<label>13000</label>
<font>font13</font>
<textcolor>FFB2D4F5</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Manufacturer</description>
@@ -54,8 +54,8 @@
<label>13001</label>
<font>font13</font>
<textcolor>FFB2D4F5</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Rating</description>
@@ -66,8 +66,8 @@
<label>173</label>
<font>font13</font>
<textcolor>FFB2D4F5</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Genre</description>
@@ -78,8 +78,8 @@
<label>174</label>
<font>font13</font>
<textcolor>FFB2D4F5</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>System value</description>
@@ -91,8 +91,8 @@
<label>-</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Manufacturer value</description>
@@ -104,8 +104,8 @@
<label>-</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Rating value</description>
@@ -117,8 +117,8 @@
<label>-</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Genre value</description>
@@ -130,8 +130,8 @@
<label>-</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Screenshot</description>
@@ -145,8 +145,8 @@
<colorkey>FFFF00FF</colorkey>
<colordiffuse>FFFFFFFF</colordiffuse>
<keepaspectratio>yes</keepaspectratio>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Screenshot big</description>
@@ -160,8 +160,8 @@
<colorkey>FFFF00FF</colorkey>
<colordiffuse>FFFFFFFF</colordiffuse>
<keepaspectratio>yes</keepaspectratio>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Overview</description>
@@ -176,8 +176,8 @@
<onright>8</onright>
<onup>8</onup>
<ondown>8</ondown>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Refresh</description>
@@ -192,8 +192,8 @@
<ondown>11</ondown>
<onleft>4</onleft>
<onright>4</onright>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Overview / Screenshot Toggle</description>
@@ -208,8 +208,8 @@
<ondown>7</ondown>
<onleft>4</onleft>
<onright>4</onright>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Prev</description>
@@ -224,8 +224,8 @@
<ondown>9</ondown>
<onleft>4</onleft>
<onright>4</onright>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Next</description>
@@ -240,8 +240,8 @@
<ondown>8</ondown>
<onleft>4</onleft>
<onright>4</onright>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Launch</description>
@@ -256,8 +256,8 @@
<ondown>12</ondown>
<onleft>4</onleft>
<onright>4</onright>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/BlueTwoBig/Development Version/DialogMenu.xml
===================================================================
--- trunk/skins/BlueTwoBig/Development Version/DialogMenu.xml 2007-11-14 12:45:54 UTC (rev 1059)
+++ trunk/skins/BlueTwoBig/Development Version/DialogMenu.xml 2007-11-15 11:08:54 UTC (rev 1060)
@@ -20,8 +20,8 @@
<width>546</width>
<height>366</height>
<texture>context_background.png</texture>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>GFX-Heading "menu" text label</description>
@@ -33,8 +33,8 @@
<label>924</label>
<font>font14</font>
<textcolor>Black</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Heading text label</description>
@@ -45,8 +45,8 @@
<label>181</label>
<font>font14</font>
<textcolor>FFFFFFFF</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Exit button</description>
@@ -63,8 +63,8 @@
<onright>3</onright>
<onup>3</onup>
<ondown>3</ondown>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>options listcontrol</description>
@@ -81,8 +81,8 @@
<textXOff>50</textXOff>
<PinIconXOff>45</PinIconXOff>
<PinIconYOff>7</PinIconYOff>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/BlueTwoBig/Development Version/DialogMenuBottomRight.xml
===================================================================
--- trunk/skins/BlueTwoBig/Development Version/DialogMenuBottomRight.xml 2007-11-14 12:45:54 UTC (rev 1059)
+++ trunk/skins/BlueTwoBig/Development Version/DialogMenuBottomRight.xml 2007-11-15 11:08:54 UTC (rev 1060)
@@ -15,8 +15,8 @@
<control>
<type>group</type>
<description>group element</description>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
<control>
<type>image</type>
<id>0</id>
Modified: trunk/skins/BlueTwoBig/Development Version/DialogNotify.xml
===================================================================
--- trunk/skins/BlueTwoBig/Development Version/DialogNotify.xml 2007-11-14 12:45:54 UTC (rev 1059)
+++ trunk/skins/BlueTwoBig/Development Version/DialogNotify.xml 2007-11-15 11:08:54 UTC (rev 1060)
@@ -15,8 +15,8 @@
<control>
<type>group</type>
<description>group element</description>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
<control>
<type>image</type>
<id>0</id>
Modified: trunk/skins/BlueTwoBig/Development Version/DialogPictureInfo.xml
===================================================================
--- trunk/skins/BlueTwoBig/Development Version/DialogPictureInfo.xml 2007-11-14 12:45:54 UTC (rev 1059)
+++ trunk/skins/BlueTwoBig/Development Version/DialogPictureInfo.xml 2007-11-15 11:08:54 UTC (rev 1060)
@@ -17,8 +17,8 @@
<posX>60</posX>
<posY>20</posY>
<texture>info_logo.png</texture>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Image Title value</description>
@@ -30,8 +30,8 @@
<font>font16</font>
<align>right</align>
<textcolor>FFFFFFFF</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
</control>
<control>
<description>Dimensions txt</description>
@@ -42,8 +42,8 @@
<label>9000</label>
<font>font13</font>
<textcolor>FFB2D4F5</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">W...
[truncated message content] |
|
From: <ts...@us...> - 2007-11-14 12:45:56
|
Revision: 1059
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1059&view=rev
Author: tsmotw
Date: 2007-11-14 04:45:54 -0800 (Wed, 14 Nov 2007)
Log Message:
-----------
Settings done, need to edit some default buttons in references.xml (selectbutton)
Modified Paths:
--------------
trunk/skins/Xephyr/SettingsGUI.xml
trunk/skins/Xephyr/SettingsOSD.xml
trunk/skins/Xephyr/settingsScreenCalibration.xml
trunk/skins/Xephyr/settingsSkipSteps.xml
trunk/skins/Xephyr/settingsUICalibration.xml
trunk/skins/Xephyr/settings_recording.xml
trunk/skins/Xephyr/settings_tvEpg.xml
trunk/skins/Xephyr/settings_tvSort.xml
trunk/skins/Xephyr/settings_tvepg_select.xml
Modified: trunk/skins/Xephyr/SettingsGUI.xml
===================================================================
--- trunk/skins/Xephyr/SettingsGUI.xml 2007-11-14 11:49:25 UTC (rev 1058)
+++ trunk/skins/Xephyr/SettingsGUI.xml 2007-11-14 12:45:54 UTC (rev 1059)
@@ -2,33 +2,88 @@
<window>
<id>31</id>
<defaultcontrol>2</defaultcontrol>
- <allowoverlay>no</allowoverlay>
+ <allowoverlay>yes</allowoverlay>
+ <define>#header.label:6023</define>
+ <define>#header.hover:hover_settings.png</define>
<controls>
- <control>
- <description>background image</description>
+ <import>common.window.settings.xml</import>
+ <import>common.time.xml</import>
+ <control>
+ <description>Menu Background</description>
<type>image</type>
- <id>1</id>
- <width>1366</width>
- <height>768</height>
- </control>
- <control>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>63</posY>
+ <width>1280</width>
+ <height>123</height>
+ <texture>mymenu_bg.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu Sub Menu</description>
<type>image</type>
- <id>1</id>
- <posX>113</posX>
- <posY>26</posY>
- <texture>settings_logo.png</texture>
- </control>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>138</posY>
+ <width>1280</width>
+ <height>48</height>
+ <texture>mymenu_submenu.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu Shadow settings</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>55</posY>
+ <width>1280</width>
+ <height>20</height>
+ <texture>mymenu_settings_shadow.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>187</posY>
+ <width>1280</width>
+ <height>470</height>
+ <texture>mymenu_settings_background.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>NEED TO CHANGE THIS TO SETTINGS</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>63</posY>
+ <width>1280</width>
+ <height>75</height>
+ <texture>mymenu_full_nofocus.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
<control>
- <description>Settings text label</description>
+ <description>label selection</description>
<type>label</type>
<id>1</id>
- <posX>474</posX>
- <posY>93</posY>
- <label>5</label>
- <font>font16</font>
- <align>right</align>
- <textcolor>ffffffff</textcolor>
+ <posY>148</posY>
+ <posX>368</posX>
+ <label>6023</label>
+ <font>font14</font>
+ <textcolor>FF808080</textcolor>
+ <width>150</width>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
</control>
+
+
+
<control>
<description>Scroll Speed label horizontal</description>
<type>label</type>
@@ -38,6 +93,8 @@
<label>1442</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Speedselect Horizontal</description>
@@ -50,6 +107,8 @@
<onleft>2</onleft>
<onright>2</onright>
<textcolor>FFFFFFFF</textcolor>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Scroll Speed label vertical</description>
@@ -60,6 +119,8 @@
<label>1443</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Speedselect Vertical</description>
@@ -72,6 +133,8 @@
<onleft>4</onleft>
<onright>4</onright>
<textcolor>FFFFFFFF</textcolor>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>FPS label</description>
@@ -82,6 +145,8 @@
<label>973</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>FPS select</description>
@@ -94,6 +159,8 @@
<onleft>2</onleft>
<onright>2</onright>
<textcolor>FFFFFFFF</textcolor>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>currentFPS count</description>
@@ -104,6 +171,8 @@
<label>#fps</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Example value</description>
@@ -115,6 +184,8 @@
<label>675</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>TagLine value</description>
@@ -126,6 +197,8 @@
<label>-</label>
<font>font13</font>
<textcolor>FFB2D4F5</textcolor>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Description1</description>
@@ -138,6 +211,8 @@
<label>-</label>
<font>font13</font>
<textcolor>FFB2D4F5</textcolor>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Xephyr/SettingsOSD.xml
===================================================================
--- trunk/skins/Xephyr/SettingsOSD.xml 2007-11-14 11:49:25 UTC (rev 1058)
+++ trunk/skins/Xephyr/SettingsOSD.xml 2007-11-14 12:45:54 UTC (rev 1059)
@@ -2,28 +2,80 @@
<window>
<id>18</id>
<defaultcontrol>2</defaultcontrol>
- <allowoverlay>no</allowoverlay>
+ <allowoverlay>yes</allowoverlay>
+ <define>#header.image:settings_logo.png</define>
+ <define>#header.hover:hover_settings.png</define>
<controls>
- <control>
- <description>background image</description>
+ <import>common.window.settings.xml</import>
+ <import>common.time.xml</import>
+ <control>
+ <description>Menu Background</description>
<type>image</type>
- <id>1</id>
- <width>1366</width>
- <height>768</height>
- </control>
- <control>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>63</posY>
+ <width>1280</width>
+ <height>123</height>
+ <texture>mymenu_bg.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu Sub Menu</description>
<type>image</type>
- <id>1</id>
- <posX>113</posX>
- <posY>26</posY>
- <texture>settings_logo.png</texture>
- </control>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>138</posY>
+ <width>1280</width>
+ <height>48</height>
+ <texture>mymenu_submenu.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu Shadow settings</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>55</posY>
+ <width>1280</width>
+ <height>20</height>
+ <texture>mymenu_settings_shadow.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>187</posY>
+ <width>1280</width>
+ <height>470</height>
+ <texture>mymenu_settings_background.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>NEED TO CHANGE THIS TO SETTINGS</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>63</posY>
+ <width>1280</width>
+ <height>75</height>
+ <texture>mymenu_full_nofocus.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+
+
<control>
<description>Settings text label</description>
<type>label</type>
<id>1</id>
<posX>474</posX>
- <posY>93</posY>
+ <posY>153</posY>
<label>5</label>
<font>font16</font>
<align>right</align>
@@ -34,7 +86,7 @@
<type>label</type>
<id>100</id>
<posX>546</posX>
- <posY>200</posY>
+ <posY>260</posY>
<label>472</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
@@ -44,7 +96,7 @@
<type>spincontrol</type>
<id>2</id>
<posX>986</posX>
- <posY>205</posY>
+ <posY>265</posY>
<textcolor>FFFFFFFF</textcolor>
<onup>17</onup>
<ondown>2</ondown>
Modified: trunk/skins/Xephyr/settingsScreenCalibration.xml
===================================================================
--- trunk/skins/Xephyr/settingsScreenCalibration.xml 2007-11-14 11:49:25 UTC (rev 1058)
+++ trunk/skins/Xephyr/settingsScreenCalibration.xml 2007-11-14 12:45:54 UTC (rev 1059)
@@ -10,8 +10,8 @@
<id>20</id>
<posX>0</posX>
<posY>0</posY>
- <width>1366</width>
- <height>768</height>
+ <width>1280</width>
+ <height>720</height>
</control>
<control>
<description>OSD Y Offset logo</description>
@@ -23,15 +23,8 @@
<colorkey>FFFF00FF</colorkey>
<colordiffuse>FFFFFFFF</colordiffuse>
</control>
+
<control>
- <description>rectangle image</description>
- <type>image</type>
- <id>1</id>
- <posX>34</posX>
- <posY>186</posY>
- <texture>calibration_bar.png</texture>
- </control>
- <control>
<description>coordinates label</description>
<type>label</type>
<id>2</id>
Modified: trunk/skins/Xephyr/settingsSkipSteps.xml
===================================================================
--- trunk/skins/Xephyr/settingsSkipSteps.xml 2007-11-14 11:49:25 UTC (rev 1058)
+++ trunk/skins/Xephyr/settingsSkipSteps.xml 2007-11-14 12:45:54 UTC (rev 1059)
@@ -3,47 +3,105 @@
<id>708</id>
<defaultcontrol>19</defaultcontrol>
<allowoverlay>yes</allowoverlay>
+ <define>#header.label:128</define>
+ <define>#header.image:settings_logo.png</define>
+ <define>#header.hover:hover_settings.png</define>
<controls>
- <control>
- <description>background image</description>
+ <import>common.window.settings.xml</import>
+ <import>common.time.xml</import>
+ <control>
+ <description>Menu Background</description>
<type>image</type>
- <id>1</id>
- <width>1366</width>
- <height>768</height>
- </control>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>63</posY>
+ <width>1280</width>
+ <height>123</height>
+ <texture>mymenu_bg.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu Sub Menu</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>138</posY>
+ <width>1280</width>
+ <height>48</height>
+ <texture>mymenu_submenu.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu Shadow settings</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>55</posY>
+ <width>1280</width>
+ <height>20</height>
+ <texture>mymenu_settings_shadow.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>187</posY>
+ <width>1280</width>
+ <height>470</height>
+ <texture>mymenu_settings_background.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>NEED TO CHANGE THIS TO SETTINGS</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>63</posY>
+ <width>1280</width>
+ <height>75</height>
+ <texture>mymenu_full_nofocus.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
<control>
- <type>image</type>
- <description>MP Logo</description>
+ <description>General</description>
+ <type>label</type>
<id>1</id>
- <posX>60</posX>
- <posY>32</posY>
- <texture>mplogo.png</texture>
+ <posY>148</posY>
+ <posX>218</posX>
+ <label>128</label>
+ <font>font14</font>
+ <textcolor>FF808080</textcolor>
+ <width>150</width>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
</control>
+
+
<control>
<type>label</type>
<description>Setup skip steps</description>
<id>1</id>
<posX>60</posX>
- <posY>128</posY>
+ <posY>208</posY>
<label>6025</label>
<font>font18</font>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
- <type>image</type>
- <id>1</id>
- <posX>155</posX>
- <posY>522</posY>
- <width>217</width>
- <height>213</height>
- <texture>hover_settings.png</texture>
- </control>
- <control>
<description>add button</description>
<type>button</type>
<id>19</id>
<label>200039</label>
<posX>113</posX>
- <posY>194</posY>
+ <posY>274</posY>
<align>center</align>
<textureFocus>button_small_settings_focus.png</textureFocus>
<textureNoFocus>button_small_settings_nofocus.png</textureNoFocus>
@@ -51,6 +109,8 @@
<ondown>20</ondown>
<onleft>2</onleft>
<onright>2</onright>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>remove button</description>
@@ -58,7 +118,7 @@
<id>20</id>
<label>200040</label>
<posX>113</posX>
- <posY>234</posY>
+ <posY>314</posY>
<align>center</align>
<textureFocus>button_small_settings_focus.png</textureFocus>
<textureNoFocus>button_small_settings_nofocus.png</textureNoFocus>
@@ -66,6 +126,8 @@
<ondown>18</ondown>
<onleft>2</onleft>
<onright>2</onright>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>reset button</description>
@@ -73,7 +135,7 @@
<id>18</id>
<label>886</label>
<posX>113</posX>
- <posY>274</posY>
+ <posY>354</posY>
<align>center</align>
<textureFocus>button_small_settings_focus.png</textureFocus>
<textureNoFocus>button_small_settings_nofocus.png</textureNoFocus>
@@ -81,15 +143,19 @@
<ondown>2</ondown>
<onleft>2</onleft>
<onright>2</onright>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<type>label</type>
<description>skip steps seconds</description>
<id>1</id>
<posX>546</posX>
- <posY>266</posY>
+ <posY>206</posY>
<label>9997</label>
<font>font13</font>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Step 1</description>
@@ -97,12 +163,14 @@
<id>2</id>
<label> 5</label>
<posX>546</posX>
- <posY>300</posY>
+ <posY>240</posY>
<textcolor>FFFFFFFF</textcolor>
<onleft>18</onleft>
<onright>6</onright>
<onup>18</onup>
<align>right</align>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Step 2</description>
@@ -110,11 +178,13 @@
<id>3</id>
<label> 15</label>
<posX>546</posX>
- <posY>333</posY>
+ <posY>273</posY>
<textcolor>FFFFFFFF</textcolor>
<onleft>18</onleft>
<onright>6</onright>
<align>right</align>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Step 3</description>
@@ -122,11 +192,13 @@
<id>4</id>
<label> 30</label>
<posX>546</posX>
- <posY>366</posY>
+ <posY>306</posY>
<textcolor>FFFFFFFF</textcolor>
<onleft>18</onleft>
<onright>6</onright>
<align>right</align>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Step 4</description>
@@ -134,21 +206,25 @@
<id>5</id>
<label> 45</label>
<posX>546</posX>
- <posY>400</posY>
+ <posY>340</posY>
<textcolor>FFFFFFFF</textcolor>
<onleft>18</onleft>
<onright>6</onright>
<ondown>2</ondown>
<align>right</align>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<type>label</type>
<description>skip steps minutes</description>
<id>1</id>
<posX>819</posX>
- <posY>266</posY>
+ <posY>206</posY>
<label>9998</label>
<font>font13</font>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Step 5</description>
@@ -156,12 +232,14 @@
<id>6</id>
<label> 1</label>
<posX>819</posX>
- <posY>300</posY>
+ <posY>240</posY>
<textcolor>FFFFFFFF</textcolor>
<onleft>2</onleft>
<onright>14</onright>
<onup>18</onup>
<align>right</align>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Step 6</description>
@@ -169,11 +247,13 @@
<id>7</id>
<label> 3</label>
<posX>819</posX>
- <posY>333</posY>
+ <posY>273</posY>
<textcolor>FFFFFFFF</textcolor>
<onleft>2</onleft>
<onright>14</onright>
<align>right</align>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Step 7</description>
@@ -181,11 +261,13 @@
<id>8</id>
<label> 5</label>
<posX>819</posX>
- <posY>366</posY>
+ <posY>306</posY>
<textcolor>FFFFFFFF</textcolor>
<onleft>2</onleft>
<onright>14</onright>
<align>right</align>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Step 8</description>
@@ -193,11 +275,13 @@
<id>9</id>
<label> 7</label>
<posX>819</posX>
- <posY>400</posY>
+ <posY>340</posY>
<textcolor>FFFFFFFF</textcolor>
<onleft>2</onleft>
<onright>14</onright>
<align>right</align>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Step 9</description>
@@ -205,11 +289,13 @@
<id>10</id>
<label> 10</label>
<posX>819</posX>
- <posY>433</posY>
+ <posY>373</posY>
<textcolor>FFFFFFFF</textcolor>
<onleft>2</onleft>
<onright>14</onright>
<align>right</align>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Step 10</description>
@@ -217,11 +303,13 @@
<id>11</id>
<label> 15</label>
<posX>819</posX>
- <posY>466</posY>
+ <posY>406</posY>
<textcolor>FFFFFFFF</textcolor>
<onleft>2</onleft>
<onright>14</onright>
<align>right</align>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Step 11</description>
@@ -229,11 +317,13 @@
<id>12</id>
<label> 30</label>
<posX>819</posX>
- <posY>500</posY>
+ <posY>440</posY>
<textcolor>FFFFFFFF</textcolor>
<onleft>2</onleft>
<onright>14</onright>
<align>right</align>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Step 12</description>
@@ -241,21 +331,25 @@
<id>13</id>
<label> 45</label>
<posX>819</posX>
- <posY>533</posY>
+ <posY>473</posY>
<textcolor>FFFFFFFF</textcolor>
<onleft>2</onleft>
<onright>14</onright>
<ondown>6</ondown>
<align>right</align>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<type>label</type>
<description>skip steps hours</description>
<id>1</id>
<posX>1092</posX>
- <posY>266</posY>
+ <posY>206</posY>
<label>9999</label>
<font>font13</font>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Step 13</description>
@@ -263,12 +357,14 @@
<id>14</id>
<label> 1</label>
<posX>1092</posX>
- <posY>300</posY>
+ <posY>240</posY>
<textcolor>FFFFFFFF</textcolor>
<onleft>6</onleft>
<onright>2</onright>
<onup>18</onup>
<align>right</align>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Step 14</description>
@@ -276,11 +372,13 @@
<id>15</id>
<label> 1.5</label>
<posX>1092</posX>
- <posY>333</posY>
+ <posY>273</posY>
<textcolor>FFFFFFFF</textcolor>
<onleft>6</onleft>
<onright>2</onright>
<align>right</align>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Step 15</description>
@@ -288,11 +386,13 @@
<id>16</id>
<label> 2</label>
<posX>1092</posX>
- <posY>366</posY>
+ <posY>306</posY>
<textcolor>FFFFFFFF</textcolor>
<onleft>6</onleft>
<onright>2</onright>
<align>right</align>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Step 16</description>
@@ -300,30 +400,36 @@
<id>17</id>
<label> 3</label>
<posX>1092</posX>
- <posY>400</posY>
+ <posY>340</posY>
<textcolor>FFFFFFFF</textcolor>
<onleft>6</onleft>
<onright>2</onright>
<ondown>14</ondown>
<align>right</align>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<type>label</type>
<description>Current config static</description>
<id>1</id>
<posX>546</posX>
- <posY>563</posY>
+ <posY>503</posY>
<label>143</label>
<font>font18</font>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<type>label</type>
<description>Current config dynamic</description>
<id>21</id>
<posX>546</posX>
- <posY>603</posY>
+ <posY>543</posY>
<label>15,30,60,300</label>
<font>font12</font>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Xephyr/settingsUICalibration.xml
===================================================================
--- trunk/skins/Xephyr/settingsUICalibration.xml 2007-11-14 11:49:25 UTC (rev 1058)
+++ trunk/skins/Xephyr/settingsUICalibration.xml 2007-11-14 12:45:54 UTC (rev 1059)
@@ -8,15 +8,16 @@
<description>background image</description>
<type>image</type>
<id>1</id>
- <width>1366</width>
- <height>768</height>
+ <width>1280</width>
+ <height>720</height>
+ <texture>hover_settings.png</texture>
</control>
<control>
<description>calibration image</description>
<type>image</type>
<id>1</id>
- <width>1366</width>
- <height>768</height>
+ <width>1280</width>
+ <height>720</height>
<texture>settingsUICalibration.png</texture>
</control>
<control>
@@ -38,19 +39,11 @@
<textcolor>ffffffff</textcolor>
</control>
<control>
- <description>rectangle image</description>
- <type>image</type>
- <id>1</id>
- <posX>34</posX>
- <posY>360</posY>
- <texture>calibration_bar.png</texture>
- </control>
- <control>
<description>coordinates label</description>
<type>label</type>
<id>2</id>
- <posX>683</posX>
- <posY>393</posY>
+ <posX>630</posX>
+ <posY>350</posY>
<label>5</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
Modified: trunk/skins/Xephyr/settings_recording.xml
===================================================================
--- trunk/skins/Xephyr/settings_recording.xml 2007-11-14 11:49:25 UTC (rev 1058)
+++ trunk/skins/Xephyr/settings_recording.xml 2007-11-14 12:45:54 UTC (rev 1059)
@@ -3,104 +3,181 @@
<id>701</id>
<defaultcontrol>4</defaultcontrol>
<allowoverlay>yes</allowoverlay>
+ <define>#header.label:6014</define>
+ <define>#header.hover:hover_my tv.png</define>
<controls>
- <control>
+ <import>common.window.settings.xml</import>
+ <import>common.time.xml</import>
+ <control>
+ <description>Menu Background</description>
<type>image</type>
- <description>BG</description>
- <id>1</id>
- </control>
- <control>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>63</posY>
+ <width>1280</width>
+ <height>123</height>
+ <texture>mymenu_bg.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu Sub Menu</description>
<type>image</type>
- <id>1</id>
- <posX>91</posX>
- <posY>520</posY>
- <texture>hover_my tv.png</texture>
- </control>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>138</posY>
+ <width>1280</width>
+ <height>48</height>
+ <texture>mymenu_submenu.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu Shadow settings</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>55</posY>
+ <width>1280</width>
+ <height>20</height>
+ <texture>mymenu_settings_shadow.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>187</posY>
+ <width>1280</width>
+ <height>470</height>
+ <texture>mymenu_settings_background.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>NEED TO CHANGE THIS TO SETTINGS</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>63</posY>
+ <width>1280</width>
+ <height>75</height>
+ <texture>mymenu_full_nofocus.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
<control>
- <type>image</type>
- <description>MP Logo</description>
+ <description>label selection</description>
+ <type>label</type>
<id>1</id>
- <posX>60</posX>
- <posY>32</posY>
- <texture>mplogo.png</texture>
+ <posY>148</posY>
+ <posX>558</posX>
+ <label>605</label>
+ <font>font14</font>
+ <textcolor>FF808080</textcolor>
+ <width>150</width>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
</control>
+
+
<control>
<type>label</type>
<description>Setup Recordings</description>
<id>1</id>
<posX>60</posX>
- <posY>128</posY>
+ <posY>198</posY>
<label>6007</label>
<font>font18</font>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<type>checkmark</type>
<id>4</id>
<posX>136</posX>
- <posY>192</posY>
+ <posY>262</posY>
<label>6016</label>
<align>right</align>
<onup>4</onup>
<ondown>5</ondown>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<type>checkmark</type>
<id>5</id>
<posX>136</posX>
- <posY>234</posY>
+ <posY>304</posY>
<label>6017</label>
<align>right</align>
<onup>4</onup>
<ondown>26</ondown>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<type>label</type>
<id>26</id>
- <posX>132</posX>
- <posY>282</posY>
+ <posX>136</posX>
+ <posY>352</posY>
<label>1444</label>
<onup>5</onup>
<ondown>27</ondown>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<type>spincontrol</type>
<id>27</id>
<posX>426</posX>
- <posY>288</posY>
+ <posY>358</posY>
<spintype>int</spintype>
<showrange>no</showrange>
<onup>26</onup>
<ondown>30</ondown>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<type>label</type>
<id>28</id>
<posX>533</posX>
- <posY>282</posY>
+ <posY>352</posY>
<label>6018</label>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<type>label</type>
<id>29</id>
<posX>136</posX>
- <posY>330</posY>
+ <posY>390</posY>
<label>1445</label>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<type>spincontrol</type>
<id>30</id>
<posX>426</posX>
- <posY>337</posY>
+ <posY>397</posY>
<spintype>int</spintype>
<showrange>no</showrange>
<onup>27</onup>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<type>label</type>
<id>31</id>
<posX>533</posX>
- <posY>330</posY>
+ <posY>390</posY>
<label>6019</label>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Xephyr/settings_tvEpg.xml
===================================================================
--- trunk/skins/Xephyr/settings_tvEpg.xml 2007-11-14 11:49:25 UTC (rev 1058)
+++ trunk/skins/Xephyr/settings_tvEpg.xml 2007-11-14 12:45:54 UTC (rev 1059)
@@ -3,51 +3,113 @@
<id>706</id>
<defaultcontrol>10</defaultcontrol>
<allowoverlay>yes</allowoverlay>
+ <define>#header.label:6014</define>
+ <define>#header.hover:hover_my tv.png</define>
<controls>
+ <import>common.window.settings.xml</import>
<import>common.time.xml</import>
- <control>
+ <control>
+ <description>Menu Background</description>
<type>image</type>
- <description>BG</description>
- <id>1</id>
- </control>
- <control>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>63</posY>
+ <width>1280</width>
+ <height>123</height>
+ <texture>mymenu_bg.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu Sub Menu</description>
<type>image</type>
- <id>1</id>
- <posX>91</posX>
- <posY>520</posY>
- <texture>hover_my tv.png</texture>
- </control>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>138</posY>
+ <width>1280</width>
+ <height>48</height>
+ <texture>mymenu_submenu.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu Shadow settings</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>55</posY>
+ <width>1280</width>
+ <height>20</height>
+ <texture>mymenu_settings_shadow.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>187</posY>
+ <width>1280</width>
+ <height>470</height>
+ <texture>mymenu_settings_background.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>NEED TO CHANGE THIS TO SETTINGS</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>63</posY>
+ <width>1280</width>
+ <height>75</height>
+ <texture>mymenu_full_nofocus.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
<control>
- <type>image</type>
- <description>MP Logo</description>
+ <description>label selection</description>
+ <type>label</type>
<id>1</id>
- <posX>60</posX>
- <posY>32</posY>
- <texture>mplogo.png</texture>
+ <posY>148</posY>
+ <posX>558</posX>
+ <label>605</label>
+ <font>font14</font>
+ <textcolor>FF808080</textcolor>
+ <width>150</width>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
</control>
<control>
<type>label</type>
<description>Setup TV</description>
<id>1</id>
<posX>60</posX>
- <posY>128</posY>
+ <posY>198</posY>
<label>6011</label>
<font>font18</font>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<type>label</type>
<description>Grab EPG from DVB transmission for the following channels</description>
<id>1</id>
<posX>493</posX>
- <posY>128</posY>
+ <posY>198</posY>
<label>6012</label>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<type>group</type>
<layout>StackLayout</layout>
<description>group element</description>
<posX>113</posX>
- <posY>160</posY>
+ <posY>270</posY>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
<control>
<description>Select all</description>
<type>button</type>
@@ -72,7 +134,7 @@
<type>checklistcontrol</type>
<id>10</id>
<posX>493</posX>
- <posY>186</posY>
+ <posY>256</posY>
<width>566</width>
<height>533</height>
<textXOff>94</textXOff>
@@ -99,6 +161,8 @@
<onright>10</onright>
<onup>10</onup>
<ondown>10</ondown>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Xephyr/settings_tvSort.xml
===================================================================
--- trunk/skins/Xephyr/settings_tvSort.xml 2007-11-14 11:49:25 UTC (rev 1058)
+++ trunk/skins/Xephyr/settings_tvSort.xml 2007-11-14 12:45:54 UTC (rev 1059)
@@ -6,8 +6,82 @@
<define>#header.label:6008</define>
<define>#header.hover:hover_my tv.png</define>
<controls>
- <import>common.settings.xml</import>
+ <import>common.window.settings.xml</import>
+ <import>common.time.xml</import>
+ <control>
+ <description>Menu Background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>63</posY>
+ <width>1280</width>
+ <height>123</height>
+ <texture>mymenu_bg.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu Sub Menu</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>138</posY>
+ <width>1280</width>
+ <height>48</height>
+ <texture>mymenu_submenu.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu Shadow settings</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>55</posY>
+ <width>1280</width>
+ <height>20</height>
+ <texture>mymenu_settings_shadow.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>187</posY>
+ <width>1280</width>
+ <height>470</height>
+ <texture>mymenu_settings_background.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>NEED TO CHANGE THIS TO SETTINGS</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>63</posY>
+ <width>1280</width>
+ <height>75</height>
+ <texture>mymenu_full_nofocus.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
<control>
+ <description>label selection</description>
+ <type>label</type>
+ <id>1</id>
+ <posY>148</posY>
+ <posX>558</posX>
+ <label>605</label>
+ <font>font14</font>
+ <textcolor>FF808080</textcolor>
+ <width>150</width>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
<type>button</type>
<id>24</id>
<posX>106</posX>
@@ -17,6 +91,8 @@
<onup>24</onup>
<onleft>10</onleft>
<onright>10</onright>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>tvchannels listcontrol</description>
@@ -60,6 +136,8 @@
<onright>24</onright>
<onup>2</onup>
<ondown>2</ondown>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Xephyr/settings_tvepg_select.xml
===================================================================
--- trunk/skins/Xephyr/settings_tvepg_select.xml 2007-11-14 11:49:25 UTC (rev 1058)
+++ trunk/skins/Xephyr/settings_tvepg_select.xml 2007-11-14 12:45:54 UTC (rev 1059)
@@ -3,73 +3,140 @@
<id>707</id>
<defaultcontrol>24</defaultcontrol>
<allowoverlay>yes</allowoverlay>
+ <define>#header.label:6014</define>
+ <define>#header.hover:hover_my tv.png</define>
<controls>
+ <import>common.window.settings.xml</import>
+ <import>common.time.xml</import>
+ <control>
+ <description>Menu Background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>63</posY>
+ <width>1280</width>
+ <height>123</height>
+ <texture>mymenu_bg.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu Sub Menu</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>138</posY>
+ <width>1280</width>
+ <height>48</height>
+ <texture>mymenu_submenu.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu Shadow settings</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>55</posY>
+ <width>1280</width>
+ <height>20</height>
+ <texture>mymenu_settings_shadow.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>187</posY>
+ <width>1280</width>
+ <height>470</height>
+ <texture>mymenu_settings_background.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>NEED TO CHANGE THIS TO SETTINGS</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>63</posY>
+ <width>1280</width>
+ <height>75</height>
+ <texture>mymenu_full_nofocus.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
<control>
- <type>image</type>
- <description>BG</description>
+ <description>label selection</description>
+ <type>label</type>
<id>1</id>
+ <posY>148</posY>
+ <posX>558</posX>
+ <label>605</label>
+ <font>font14</font>
+ <textcolor>FF808080</textcolor>
+ <width>150</width>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
</control>
+
+
<control>
<type>button</type>
<description>Manual</description>
<id>27</id>
<posX>793</posX>
- <posY>672</posY>
+ <posY>572</posY>
<onleft>24</onleft>
<onright>24</onright>
<onup>24</onup>
<ondown>24</ondown>
<label>6013</label>
<width>168</width>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<type>label</type>
<description>Please select your EPG grabber. Note if your country is</description>
<id>2</id>
<posX>60</posX>
- <posY>202</posY>
+ <posY>242</posY>
<label>200000</label>
<font>font12</font>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<type>label</type>
<description>not listed then you will need to supply the EPG manually</description>
<id>3</id>
<posX>60</posX>
- <posY>234</posY>
+ <posY>274</posY>
<label>200001</label>
<font>font12</font>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
- <type>image</type>
- <id>1</id>
- <posX>91</posX>
- <posY>520</posY>
- <texture>hover_my tv.png</texture>
- </control>
- <control>
- <type>image</type>
- <description>MP Logo</description>
- <id>1</id>
- <posX>60</posX>
- <posY>32</posY>
- <texture>mplogo.png</texture>
- </control>
- <control>
<type>label</type>
<description>TV Setup - EPG</description>
<id>1</id>
<posX>60</posX>
- <posY>160</posY>
+ <posY>190</posY>
<label>200021</label>
<font>font18</font>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<type>listcontrol</type>
<description>countryList</description>
<id>24</id>
<posX>60</posX>
- <posY>309</posY>
+ <posY>339</posY>
<width>789</width>
<height>293</height>
<onleft>27</onleft>
@@ -86,6 +153,8 @@
<textXOff2>0</textXOff2>
<IconYOff>10</IconYOff>
<IconXOff>15</IconXOff>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
</controls>
</window>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2007-11-14 11:49:29
|
Revision: 1058
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1058&view=rev
Author: tsmotw
Date: 2007-11-14 03:49:25 -0800 (Wed, 14 Nov 2007)
Log Message:
-----------
wizard background edited
Modified Paths:
--------------
trunk/skins/Xephyr/wizard_epg_select.xml
trunk/skins/Xephyr/wizard_finished.xml
trunk/skins/Xephyr/wizard_general.xml
trunk/skins/Xephyr/wizard_remote_control.xml
trunk/skins/Xephyr/wizard_tvcard_ATSC_scan.xml
trunk/skins/Xephyr/wizard_tvcard_analog_city.xml
trunk/skins/Xephyr/wizard_tvcard_analog_country.xml
trunk/skins/Xephyr/wizard_tvcard_analog_country2.xml
trunk/skins/Xephyr/wizard_tvcard_analog_imported.xml
trunk/skins/Xephyr/wizard_tvcard_analog_rename.xml
trunk/skins/Xephyr/wizard_tvcard_analog_renameradio.xml
trunk/skins/Xephyr/wizard_tvcard_analog_scan.xml
trunk/skins/Xephyr/wizard_tvcard_analog_scanradio.xml
trunk/skins/Xephyr/wizard_tvcard_dvbc_country.xml
trunk/skins/Xephyr/wizard_tvcard_dvbc_scan.xml
trunk/skins/Xephyr/wizard_tvcard_dvbs_LNB1.xml
trunk/skins/Xephyr/wizard_tvcard_dvbs_LNB2.xml
trunk/skins/Xephyr/wizard_tvcard_dvbs_LNB3.xml
trunk/skins/Xephyr/wizard_tvcard_dvbs_scan.xml
trunk/skins/Xephyr/wizard_tvcard_dvbt_country.xml
trunk/skins/Xephyr/wizard_tvcard_dvbt_scan.xml
trunk/skins/Xephyr/wizard_tvcards_detected.xml
Modified: trunk/skins/Xephyr/wizard_epg_select.xml
===================================================================
--- trunk/skins/Xephyr/wizard_epg_select.xml 2007-11-14 11:24:07 UTC (rev 1057)
+++ trunk/skins/Xephyr/wizard_epg_select.xml 2007-11-14 11:49:25 UTC (rev 1058)
@@ -6,15 +6,27 @@
<controls>
<control>
<type>image</type>
- <description>BG</description>
<id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <texture>hover_settings.png</texture>
</control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1280</width>
+ <height>735</height>
+ <texture>mymenu_settings_background.png</texture>
+ </control>
<control>
<type>button</type>
<description>Back</description>
<id>25</id>
<posX>584</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>23</onleft>
<onright>5</onright>
<onup>24</onup>
@@ -27,7 +39,7 @@
<description>Manual</description>
<id>27</id>
<posX>793</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>23</onleft>
<onright>5</onright>
<onup>24</onup>
@@ -40,7 +52,7 @@
<description>Next</description>
<id>5</id>
<posX>1062</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>25</onleft>
<onright>5</onright>
<onup>24</onup>
@@ -68,13 +80,6 @@
</control>
<control>
<type>image</type>
- <id>1</id>
- <posX>91</posX>
- <posY>520</posY>
- <texture>hover_my tv.png</texture>
- </control>
- <control>
- <type>image</type>
<description>MP Logo</description>
<id>1</id>
<posX>60</posX>
Modified: trunk/skins/Xephyr/wizard_finished.xml
===================================================================
--- trunk/skins/Xephyr/wizard_finished.xml 2007-11-14 11:24:07 UTC (rev 1057)
+++ trunk/skins/Xephyr/wizard_finished.xml 2007-11-14 11:49:25 UTC (rev 1058)
@@ -6,9 +6,21 @@
<controls>
<control>
<type>image</type>
- <description>BG</description>
<id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <texture>hover_settings.png</texture>
</control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1280</width>
+ <height>735</height>
+ <texture>mymenu_settings_background.png</texture>
+ </control>
<control>
<type>label</type>
<description>Congratulations. Mediaportal is now setup and ready to use</description>
@@ -29,13 +41,6 @@
</control>
<control>
<type>image</type>
- <id>1</id>
- <posX>91</posX>
- <posY>520</posY>
- <texture>hover_settings.png</texture>
- </control>
- <control>
- <type>image</type>
<description>MP Logo</description>
<id>1</id>
<posX>60</posX>
@@ -56,7 +61,7 @@
<description>Finish</description>
<id>5</id>
<posX>1062</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>5</onleft>
<onright>5</onright>
<onup>5</onup>
Modified: trunk/skins/Xephyr/wizard_general.xml
===================================================================
--- trunk/skins/Xephyr/wizard_general.xml 2007-11-14 11:24:07 UTC (rev 1057)
+++ trunk/skins/Xephyr/wizard_general.xml 2007-11-14 11:49:25 UTC (rev 1058)
@@ -6,9 +6,21 @@
<controls>
<control>
<type>image</type>
- <description>BG</description>
<id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <texture>hover_settings.png</texture>
</control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1280</width>
+ <height>735</height>
+ <texture>mymenu_settings_background.png</texture>
+ </control>
<control>
<type>image</type>
<id>1</id>
@@ -106,7 +118,7 @@
<description>Back</description>
<id>25</id>
<posX>849</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>25</onleft>
<onright>26</onright>
<onup>7</onup>
@@ -116,13 +128,6 @@
</control>
<control>
<type>image</type>
- <id>1</id>
- <posX>91</posX>
- <posY>520</posY>
- <texture>hover_settings.png</texture>
- </control>
- <control>
- <type>image</type>
<description>MP Logo</description>
<id>1</id>
<posX>60</posX>
@@ -143,7 +148,7 @@
<description>Next</description>
<id>26</id>
<posX>1062</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>25</onleft>
<onright>26</onright>
<onup>7</onup>
Modified: trunk/skins/Xephyr/wizard_remote_control.xml
===================================================================
--- trunk/skins/Xephyr/wizard_remote_control.xml 2007-11-14 11:24:07 UTC (rev 1057)
+++ trunk/skins/Xephyr/wizard_remote_control.xml 2007-11-14 11:49:25 UTC (rev 1058)
@@ -6,9 +6,21 @@
<controls>
<control>
<type>image</type>
- <description>BG</description>
<id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <texture>hover_settings.png</texture>
</control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1280</width>
+ <height>735</height>
+ <texture>mymenu_settings_background.png</texture>
+ </control>
<control>
<type>checkmark</type>
<id>4</id>
@@ -94,7 +106,7 @@
<description>Back</description>
<id>25</id>
<posX>849</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>25</onleft>
<onright>26</onright>
<onup>4</onup>
@@ -113,13 +125,6 @@
</control>
<control>
<type>image</type>
- <id>1</id>
- <posX>91</posX>
- <posY>520</posY>
- <texture>hover_remote.png</texture>
- </control>
- <control>
- <type>image</type>
<description>MP Logo</description>
<id>1</id>
<posX>60</posX>
@@ -150,7 +155,7 @@
<description>Next</description>
<id>26</id>
<posX>1062</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>25</onleft>
<onright>26</onright>
<onup>4</onup>
Modified: trunk/skins/Xephyr/wizard_tvcard_ATSC_scan.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcard_ATSC_scan.xml 2007-11-14 11:24:07 UTC (rev 1057)
+++ trunk/skins/Xephyr/wizard_tvcard_ATSC_scan.xml 2007-11-14 11:49:25 UTC (rev 1058)
@@ -6,15 +6,27 @@
<controls>
<control>
<type>image</type>
- <description>BG</description>
<id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <texture>hover_settings.png</texture>
</control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1280</width>
+ <height>735</height>
+ <texture>mymenu_settings_background.png</texture>
+ </control>
<control>
<type>button</type>
<description>Back</description>
<id>25</id>
<posX>849</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>25</onleft>
<onright>25</onright>
<onup>25</onup>
@@ -34,13 +46,6 @@
</control>
<control>
<type>image</type>
- <id>1</id>
- <posX>91</posX>
- <posY>520</posY>
- <texture>hover_my tv.png</texture>
- </control>
- <control>
- <type>image</type>
<description>MP Logo</description>
<id>1</id>
<posX>60</posX>
@@ -61,7 +66,7 @@
<description>Next</description>
<id>5</id>
<posX>1062</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>25</onleft>
<onright>5</onright>
<onup>5</onup>
Modified: trunk/skins/Xephyr/wizard_tvcard_analog_city.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcard_analog_city.xml 2007-11-14 11:24:07 UTC (rev 1057)
+++ trunk/skins/Xephyr/wizard_tvcard_analog_city.xml 2007-11-14 11:49:25 UTC (rev 1058)
@@ -6,9 +6,21 @@
<controls>
<control>
<type>image</type>
- <description>BG</description>
<id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <texture>hover_settings.png</texture>
</control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1280</width>
+ <height>735</height>
+ <texture>mymenu_settings_background.png</texture>
+ </control>
<control>
<type>label</type>
<description>Setup Analog</description>
@@ -51,7 +63,7 @@
<description>Back</description>
<id>25</id>
<posX>584</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>25</onleft>
<onright>23</onright>
<onup>24</onup>
@@ -64,7 +76,7 @@
<description>manual tune</description>
<id>23</id>
<posX>793</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>25</onleft>
<onright>27</onright>
<onup>24</onup>
@@ -77,7 +89,7 @@
<description>Skip</description>
<id>27</id>
<posX>1062</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>23</onleft>
<onright>27</onright>
<onup>24</onup>
@@ -87,13 +99,6 @@
</control>
<control>
<type>image</type>
- <id>1</id>
- <posX>91</posX>
- <posY>520</posY>
- <texture>hover_my tv.png</texture>
- </control>
- <control>
- <type>image</type>
<description>MP Logo</description>
<id>1</id>
<posX>60</posX>
Modified: trunk/skins/Xephyr/wizard_tvcard_analog_country.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcard_analog_country.xml 2007-11-14 11:24:07 UTC (rev 1057)
+++ trunk/skins/Xephyr/wizard_tvcard_analog_country.xml 2007-11-14 11:49:25 UTC (rev 1058)
@@ -6,15 +6,27 @@
<controls>
<control>
<type>image</type>
- <description>BG</description>
<id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <texture>hover_settings.png</texture>
</control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1280</width>
+ <height>735</height>
+ <texture>mymenu_settings_background.png</texture>
+ </control>
<control>
<type>button</type>
<description>manual tune</description>
<id>23</id>
<posX>793</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>25</onleft>
<onright>25</onright>
<onup>24</onup>
@@ -27,7 +39,7 @@
<description>Back</description>
<id>25</id>
<posX>1062</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>23</onleft>
<onright>25</onright>
<onup>24</onup>
@@ -56,13 +68,6 @@
</control>
<control>
<type>image</type>
- <id>1</id>
- <posX>91</posX>
- <posY>520</posY>
- <texture>hover_my tv.png</texture>
- </control>
- <control>
- <type>image</type>
<description>MP Logo</description>
<id>1</id>
<posX>60</posX>
Modified: trunk/skins/Xephyr/wizard_tvcard_analog_country2.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcard_analog_country2.xml 2007-11-14 11:24:07 UTC (rev 1057)
+++ trunk/skins/Xephyr/wizard_tvcard_analog_country2.xml 2007-11-14 11:49:25 UTC (rev 1058)
@@ -6,15 +6,27 @@
<controls>
<control>
<type>image</type>
- <description>BG</description>
<id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <texture>hover_settings.png</texture>
</control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1280</width>
+ <height>735</height>
+ <texture>mymenu_settings_background.png</texture>
+ </control>
<control>
<type>button</type>
<description>Back</description>
<id>25</id>
<posX>1062</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>23</onleft>
<onright>25</onright>
<onup>24</onup>
@@ -34,13 +46,6 @@
</control>
<control>
<type>image</type>
- <id>1</id>
- <posX>91</posX>
- <posY>520</posY>
- <texture>hover_my tv.png</texture>
- </control>
- <control>
- <type>image</type>
<description>MP Logo</description>
<id>1</id>
<posX>60</posX>
Modified: trunk/skins/Xephyr/wizard_tvcard_analog_imported.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcard_analog_imported.xml 2007-11-14 11:24:07 UTC (rev 1057)
+++ trunk/skins/Xephyr/wizard_tvcard_analog_imported.xml 2007-11-14 11:49:25 UTC (rev 1058)
@@ -6,15 +6,27 @@
<controls>
<control>
<type>image</type>
- <description>BG</description>
<id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <texture>hover_settings.png</texture>
</control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1280</width>
+ <height>735</height>
+ <texture>mymenu_settings_background.png</texture>
+ </control>
<control>
<type>button</type>
<description>Back</description>
<id>25</id>
<posX>849</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>25</onleft>
<onright>25</onright>
<onup>25</onup>
@@ -34,13 +46,6 @@
</control>
<control>
<type>image</type>
- <id>1</id>
- <posX>91</posX>
- <posY>520</posY>
- <texture>hover_my tv.png</texture>
- </control>
- <control>
- <type>image</type>
<description>MP Logo</description>
<id>1</id>
<posX>60</posX>
@@ -61,7 +66,7 @@
<description>Next</description>
<id>5</id>
<posX>1062</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>25</onleft>
<onright>5</onright>
<onup>5</onup>
Modified: trunk/skins/Xephyr/wizard_tvcard_analog_rename.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcard_analog_rename.xml 2007-11-14 11:24:07 UTC (rev 1057)
+++ trunk/skins/Xephyr/wizard_tvcard_analog_rename.xml 2007-11-14 11:49:25 UTC (rev 1058)
@@ -6,15 +6,27 @@
<controls>
<control>
<type>image</type>
- <description>BG</description>
<id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <texture>hover_settings.png</texture>
</control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1280</width>
+ <height>735</height>
+ <texture>mymenu_settings_background.png</texture>
+ </control>
<control>
<type>button</type>
<description>Back</description>
<id>25</id>
<posX>849</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>23</onleft>
<onright>5</onright>
<onup>24</onup>
@@ -28,7 +40,7 @@
<description>Next</description>
<id>5</id>
<posX>1062</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>25</onleft>
<onright>5</onright>
<onup>5</onup>
@@ -47,13 +59,6 @@
</control>
<control>
<type>image</type>
- <id>1</id>
- <posX>91</posX>
- <posY>520</posY>
- <texture>hover_my tv.png</texture>
- </control>
- <control>
- <type>image</type>
<description>MP Logo</description>
<id>1</id>
<posX>60</posX>
Modified: trunk/skins/Xephyr/wizard_tvcard_analog_renameradio.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcard_analog_renameradio.xml 2007-11-14 11:24:07 UTC (rev 1057)
+++ trunk/skins/Xephyr/wizard_tvcard_analog_renameradio.xml 2007-11-14 11:49:25 UTC (rev 1058)
@@ -6,15 +6,27 @@
<controls>
<control>
<type>image</type>
- <description>BG</description>
<id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <texture>hover_settings.png</texture>
</control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1280</width>
+ <height>735</height>
+ <texture>mymenu_settings_background.png</texture>
+ </control>
<control>
<type>button</type>
<description>Back</description>
<id>25</id>
<posX>849</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>23</onleft>
<onright>5</onright>
<onup>24</onup>
@@ -28,7 +40,7 @@
<description>Next</description>
<id>5</id>
<posX>1062</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>25</onleft>
<onright>5</onright>
<onup>5</onup>
@@ -47,13 +59,6 @@
</control>
<control>
<type>image</type>
- <id>1</id>
- <posX>91</posX>
- <posY>520</posY>
- <texture>hover_my tv.png</texture>
- </control>
- <control>
- <type>image</type>
<description>MP Logo</description>
<id>1</id>
<posX>60</posX>
Modified: trunk/skins/Xephyr/wizard_tvcard_analog_scan.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcard_analog_scan.xml 2007-11-14 11:24:07 UTC (rev 1057)
+++ trunk/skins/Xephyr/wizard_tvcard_analog_scan.xml 2007-11-14 11:49:25 UTC (rev 1058)
@@ -6,15 +6,27 @@
<controls>
<control>
<type>image</type>
- <description>BG</description>
<id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <texture>hover_settings.png</texture>
</control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1280</width>
+ <height>735</height>
+ <texture>mymenu_settings_background.png</texture>
+ </control>
<control>
<type>button</type>
<description>Back</description>
<id>25</id>
<posX>849</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>25</onleft>
<onright>25</onright>
<onup>25</onup>
@@ -34,13 +46,6 @@
</control>
<control>
<type>image</type>
- <id>1</id>
- <posX>91</posX>
- <posY>520</posY>
- <texture>hover_my tv.png</texture>
- </control>
- <control>
- <type>image</type>
<description>MP Logo</description>
<id>1</id>
<posX>60</posX>
@@ -61,7 +66,7 @@
<description>Next</description>
<id>5</id>
<posX>1062</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>25</onleft>
<onright>5</onright>
<onup>5</onup>
Modified: trunk/skins/Xephyr/wizard_tvcard_analog_scanradio.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcard_analog_scanradio.xml 2007-11-14 11:24:07 UTC (rev 1057)
+++ trunk/skins/Xephyr/wizard_tvcard_analog_scanradio.xml 2007-11-14 11:49:25 UTC (rev 1058)
@@ -6,15 +6,27 @@
<controls>
<control>
<type>image</type>
- <description>BG</description>
<id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <texture>hover_settings.png</texture>
</control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1280</width>
+ <height>735</height>
+ <texture>mymenu_settings_background.png</texture>
+ </control>
<control>
<type>button</type>
<description>Back</description>
<id>25</id>
<posX>849</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>25</onleft>
<onright>25</onright>
<onup>25</onup>
@@ -34,13 +46,6 @@
</control>
<control>
<type>image</type>
- <id>1</id>
- <posX>91</posX>
- <posY>520</posY>
- <texture>hover_my tv.png</texture>
- </control>
- <control>
- <type>image</type>
<description>MP Logo</description>
<id>1</id>
<posX>60</posX>
@@ -61,7 +66,7 @@
<description>Next</description>
<id>5</id>
<posX>1062</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>25</onleft>
<onright>5</onright>
<onup>5</onup>
Modified: trunk/skins/Xephyr/wizard_tvcard_dvbc_country.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcard_dvbc_country.xml 2007-11-14 11:24:07 UTC (rev 1057)
+++ trunk/skins/Xephyr/wizard_tvcard_dvbc_country.xml 2007-11-14 11:49:25 UTC (rev 1058)
@@ -6,9 +6,21 @@
<controls>
<control>
<type>image</type>
- <description>BG</description>
<id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <texture>hover_settings.png</texture>
</control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1280</width>
+ <height>735</height>
+ <texture>mymenu_settings_background.png</texture>
+ </control>
<control>
<type>label</type>
<description>Welcome to MediaPortal. </description>
@@ -23,7 +35,7 @@
<description>Back</description>
<id>25</id>
<posX>849</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>25</onleft>
<onright>25</onright>
<onup>25</onup>
@@ -52,13 +64,6 @@
</control>
<control>
<type>image</type>
- <id>1</id>
- <posX>91</posX>
- <posY>520</posY>
- <texture>hover_my tv.png</texture>
- </control>
- <control>
- <type>image</type>
<description>MP Logo</description>
<id>1</id>
<posX>60</posX>
Modified: trunk/skins/Xephyr/wizard_tvcard_dvbc_scan.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcard_dvbc_scan.xml 2007-11-14 11:24:07 UTC (rev 1057)
+++ trunk/skins/Xephyr/wizard_tvcard_dvbc_scan.xml 2007-11-14 11:49:25 UTC (rev 1058)
@@ -6,15 +6,27 @@
<controls>
<control>
<type>image</type>
- <description>BG</description>
<id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <texture>hover_settings.png</texture>
</control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1280</width>
+ <height>735</height>
+ <texture>mymenu_settings_background.png</texture>
+ </control>
<control>
<type>button</type>
<description>Back</description>
<id>25</id>
<posX>849</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>25</onleft>
<onright>25</onright>
<onup>25</onup>
@@ -34,13 +46,6 @@
</control>
<control>
<type>image</type>
- <id>1</id>
- <posX>91</posX>
- <posY>520</posY>
- <texture>hover_my tv.png</texture>
- </control>
- <control>
- <type>image</type>
<description>MP Logo</description>
<id>1</id>
<posX>60</posX>
@@ -61,7 +66,7 @@
<description>Next</description>
<id>5</id>
<posX>1062</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>25</onleft>
<onright>5</onright>
<onup>5</onup>
Modified: trunk/skins/Xephyr/wizard_tvcard_dvbs_LNB1.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcard_dvbs_LNB1.xml 2007-11-14 11:24:07 UTC (rev 1057)
+++ trunk/skins/Xephyr/wizard_tvcard_dvbs_LNB1.xml 2007-11-14 11:49:25 UTC (rev 1058)
@@ -6,9 +6,21 @@
<controls>
<control>
<type>image</type>
- <description>BG</description>
<id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <texture>hover_settings.png</texture>
</control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1280</width>
+ <height>735</height>
+ <texture>mymenu_settings_background.png</texture>
+ </control>
<control>
<type>checkmark</type>
<id>4</id>
@@ -70,7 +82,7 @@
<description>Back</description>
<id>25</id>
<posX>849</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>25</onleft>
<onright>26</onright>
<onup>4</onup>
@@ -90,13 +102,6 @@
</control>
<control>
<type>image</type>
- <id>1</id>
- <posX>91</posX>
- <posY>520</posY>
- <texture>hover_my tv.png</texture>
- </control>
- <control>
- <type>image</type>
<description>MP Logo</description>
<id>1</id>
<posX>60</posX>
@@ -117,7 +122,7 @@
<description>Next</description>
<id>26</id>
<posX>1062</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>25</onleft>
<onright>26</onright>
<onup>4</onup>
Modified: trunk/skins/Xephyr/wizard_tvcard_dvbs_LNB2.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcard_dvbs_LNB2.xml 2007-11-14 11:24:07 UTC (rev 1057)
+++ trunk/skins/Xephyr/wizard_tvcard_dvbs_LNB2.xml 2007-11-14 11:49:25 UTC (rev 1058)
@@ -6,9 +6,21 @@
<controls>
<control>
<type>image</type>
- <description>BG</description>
<id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <texture>hover_settings.png</texture>
</control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1280</width>
+ <height>735</height>
+ <texture>mymenu_settings_background.png</texture>
+ </control>
<control>
<type>label</type>
<description>press next</description>
@@ -22,7 +34,7 @@
<description>Back</description>
<id>25</id>
<posX>849</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>25</onleft>
<onright>5</onright>
<onup>40</onup>
@@ -41,13 +53,6 @@
</control>
<control>
<type>image</type>
- <id>1</id>
- <posX>91</posX>
- <posY>520</posY>
- <texture>hover_my tv.png</texture>
- </control>
- <control>
- <type>image</type>
<description>MP Logo</description>
<id>1</id>
<posX>60</posX>
@@ -68,7 +73,7 @@
<description>Next</description>
<id>5</id>
<posX>1062</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>25</onleft>
<onright>5</onright>
<onup>40</onup>
Modified: trunk/skins/Xephyr/wizard_tvcard_dvbs_LNB3.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcard_dvbs_LNB3.xml 2007-11-14 11:24:07 UTC (rev 1057)
+++ trunk/skins/Xephyr/wizard_tvcard_dvbs_LNB3.xml 2007-11-14 11:49:25 UTC (rev 1058)
@@ -6,9 +6,21 @@
<controls>
<control>
<type>image</type>
- <description>BG</description>
<id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <texture>hover_settings.png</texture>
</control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1280</width>
+ <height>735</height>
+ <texture>mymenu_settings_background.png</texture>
+ </control>
<control>
<type>label</type>
<id>10</id>
@@ -104,13 +116,6 @@
</control>
<control>
<type>image</type>
- <id>1</id>
- <posX>91</posX>
- <posY>520</posY>
- <texture>hover_my tv.png</texture>
- </control>
- <control>
- <type>image</type>
<description>MP Logo</description>
<id>1</id>
<posX>60</posX>
@@ -131,7 +136,7 @@
<description>Back</description>
<id>25</id>
<posX>849</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>25</onleft>
<onright>26</onright>
<onup>53</onup>
@@ -145,7 +150,7 @@
<description>Next</description>
<id>26</id>
<posX>1062</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>25</onleft>
<onright>26</onright>
<onup>53</onup>
Modified: trunk/skins/Xephyr/wizard_tvcard_dvbs_scan.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcard_dvbs_scan.xml 2007-11-14 11:24:07 UTC (rev 1057)
+++ trunk/skins/Xephyr/wizard_tvcard_dvbs_scan.xml 2007-11-14 11:49:25 UTC (rev 1058)
@@ -6,15 +6,27 @@
<controls>
<control>
<type>image</type>
- <description>BG</description>
<id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <texture>hover_settings.png</texture>
</control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1280</width>
+ <height>735</height>
+ <texture>mymenu_settings_background.png</texture>
+ </control>
<control>
<type>button</type>
<description>Back</description>
<id>25</id>
<posX>849</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>25</onleft>
<onright>25</onright>
<onup>25</onup>
@@ -34,13 +46,6 @@
</control>
<control>
<type>image</type>
- <id>1</id>
- <posX>91</posX>
- <posY>520</posY>
- <texture>hover_my tv.png</texture>
- </control>
- <control>
- <type>image</type>
<description>MP Logo</description>
<id>1</id>
<posX>60</posX>
@@ -61,7 +66,7 @@
<description>Next</description>
<id>5</id>
<posX>1062</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>25</onleft>
<onright>5</onright>
<onup>5</onup>
Modified: trunk/skins/Xephyr/wizard_tvcard_dvbt_country.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcard_dvbt_country.xml 2007-11-14 11:24:07 UTC (rev 1057)
+++ trunk/skins/Xephyr/wizard_tvcard_dvbt_country.xml 2007-11-14 11:49:25 UTC (rev 1058)
@@ -6,9 +6,21 @@
<controls>
<control>
<type>image</type>
- <description>BG</description>
<id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <texture>hover_settings.png</texture>
</control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1280</width>
+ <height>735</height>
+ <texture>mymenu_settings_background.png</texture>
+ </control>
<control>
<type>label</type>
<description>Welcome to MediaPortal. </description>
@@ -23,7 +35,7 @@
<description>Back</description>
<id>25</id>
<posX>849</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>25</onleft>
<onright>25</onright>
<onup>25</onup>
@@ -52,13 +64,6 @@
</control>
<control>
<type>image</type>
- <id>1</id>
- <posX>91</posX>
- <posY>520</posY>
- <texture>hover_my tv.png</texture>
- </control>
- <control>
- <type>image</type>
<description>MP Logo</description>
<id>1</id>
<posX>60</posX>
Modified: trunk/skins/Xephyr/wizard_tvcard_dvbt_scan.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcard_dvbt_scan.xml 2007-11-14 11:24:07 UTC (rev 1057)
+++ trunk/skins/Xephyr/wizard_tvcard_dvbt_scan.xml 2007-11-14 11:49:25 UTC (rev 1058)
@@ -6,15 +6,27 @@
<controls>
<control>
<type>image</type>
- <description>BG</description>
<id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <texture>hover_settings.png</texture>
</control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1280</width>
+ <height>735</height>
+ <texture>mymenu_settings_background.png</texture>
+ </control>
<control>
<type>button</type>
<description>Back</description>
<id>25</id>
<posX>849</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>25</onleft>
<onright>5</onright>
<onup>25</onup>
@@ -34,13 +46,6 @@
</control>
<control>
<type>image</type>
- <id>1</id>
- <posX>91</posX>
- <posY>520</posY>
- <texture>hover_my tv.png</texture>
- </control>
- <control>
- <type>image</type>
<description>MP Logo</description>
<id>1</id>
<posX>60</posX>
@@ -61,7 +66,7 @@
<description>Next</description>
<id>5</id>
<posX>1062</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>25</onleft>
<onright>5</onright>
<onup>5</onup>
Modified: trunk/skins/Xephyr/wizard_tvcards_detected.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcards_detected.xml 2007-11-14 11:24:07 UTC (rev 1057)
+++ trunk/skins/Xephyr/wizard_tvcards_detected.xml 2007-11-14 11:49:25 UTC (rev 1058)
@@ -6,15 +6,27 @@
<controls>
<control>
<type>image</type>
- <description>BG</description>
<id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <texture>hover_settings.png</texture>
</control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1280</width>
+ <height>735</height>
+ <texture>mymenu_settings_background.png</texture>
+ </control>
<control>
<type>button</type>
<description>Back</description>
<id>25</id>
<posX>849</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>25</onleft>
<onright>5</onright>
<onup>25</onup>
@@ -42,13 +54,6 @@
</control>
<control>
<type>image</type>
- <id>1</id>
- <posX>91</posX>
- <posY>520</posY>
- <texture>hover_my tv.png</texture>
- </control>
- <control>
- <type>image</type>
<description>MP Logo</description>
<id>1</id>
<posX>60</posX>
@@ -69,7 +74,7 @@
<description>Next</description>
<id>5</id>
<posX>1062</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>25</onleft>
<onright>5</onright>
<onup>5</onup>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2007-11-14 11:24:17
|
Revision: 1057
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1057&view=rev
Author: tsmotw
Date: 2007-11-14 03:24:07 -0800 (Wed, 14 Nov 2007)
Log Message:
-----------
Added time to wizard
Modified Paths:
--------------
trunk/skins/Xephyr/wizard_epg_select.xml
trunk/skins/Xephyr/wizard_finished.xml
trunk/skins/Xephyr/wizard_general.xml
trunk/skins/Xephyr/wizard_remote_control.xml
trunk/skins/Xephyr/wizard_tvcard_ATSC_scan.xml
trunk/skins/Xephyr/wizard_tvcard_analog_city.xml
trunk/skins/Xephyr/wizard_tvcard_analog_country.xml
trunk/skins/Xephyr/wizard_tvcard_analog_country2.xml
trunk/skins/Xephyr/wizard_tvcard_analog_imported.xml
trunk/skins/Xephyr/wizard_tvcard_analog_rename.xml
trunk/skins/Xephyr/wizard_tvcard_analog_renameradio.xml
trunk/skins/Xephyr/wizard_tvcard_analog_scan.xml
trunk/skins/Xephyr/wizard_tvcard_analog_scanradio.xml
trunk/skins/Xephyr/wizard_tvcard_dvbc_country.xml
trunk/skins/Xephyr/wizard_tvcard_dvbc_scan.xml
trunk/skins/Xephyr/wizard_tvcard_dvbs_LNB1.xml
trunk/skins/Xephyr/wizard_tvcard_dvbs_LNB2.xml
trunk/skins/Xephyr/wizard_tvcard_dvbs_LNB3.xml
trunk/skins/Xephyr/wizard_tvcard_dvbs_scan.xml
trunk/skins/Xephyr/wizard_tvcard_dvbt_country.xml
trunk/skins/Xephyr/wizard_tvcard_dvbt_scan.xml
trunk/skins/Xephyr/wizard_tvcards_detected.xml
trunk/skins/Xephyr/wizard_welcome.xml
Modified: trunk/skins/Xephyr/wizard_epg_select.xml
===================================================================
--- trunk/skins/Xephyr/wizard_epg_select.xml 2007-11-14 11:19:30 UTC (rev 1056)
+++ trunk/skins/Xephyr/wizard_epg_select.xml 2007-11-14 11:24:07 UTC (rev 1057)
@@ -113,5 +113,6 @@
<IconYOff>10</IconYOff>
<IconXOff>15</IconXOff>
</control>
+ <import>common.time.xml</import>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Xephyr/wizard_finished.xml
===================================================================
--- trunk/skins/Xephyr/wizard_finished.xml 2007-11-14 11:19:30 UTC (rev 1056)
+++ trunk/skins/Xephyr/wizard_finished.xml 2007-11-14 11:24:07 UTC (rev 1057)
@@ -65,5 +65,6 @@
<label>200020</label>
<width>128</width>
</control>
+ <import>common.time.xml</import>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Xephyr/wizard_general.xml
===================================================================
--- trunk/skins/Xephyr/wizard_general.xml 2007-11-14 11:19:30 UTC (rev 1056)
+++ trunk/skins/Xephyr/wizard_general.xml 2007-11-14 11:24:07 UTC (rev 1057)
@@ -151,5 +151,6 @@
<label>200009</label>
<width>128</width>
</control>
+ <import>common.time.xml</import>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Xephyr/wizard_remote_control.xml
===================================================================
--- trunk/skins/Xephyr/wizard_remote_control.xml 2007-11-14 11:19:30 UTC (rev 1056)
+++ trunk/skins/Xephyr/wizard_remote_control.xml 2007-11-14 11:24:07 UTC (rev 1057)
@@ -158,5 +158,6 @@
<label>200009</label>
<width>128</width>
</control>
+ <import>common.time.xml</import>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Xephyr/wizard_tvcard_ATSC_scan.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcard_ATSC_scan.xml 2007-11-14 11:19:30 UTC (rev 1056)
+++ trunk/skins/Xephyr/wizard_tvcard_ATSC_scan.xml 2007-11-14 11:24:07 UTC (rev 1057)
@@ -116,5 +116,6 @@
<posY>517</posY>
<label>-</label>
</control>
+ <import>common.time.xml</import>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Xephyr/wizard_tvcard_analog_city.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcard_analog_city.xml 2007-11-14 11:19:30 UTC (rev 1056)
+++ trunk/skins/Xephyr/wizard_tvcard_analog_city.xml 2007-11-14 11:24:07 UTC (rev 1057)
@@ -123,5 +123,6 @@
<IconYOff>10</IconYOff>
<IconXOff>15</IconXOff>
</control>
+ <import>common.time.xml</import>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Xephyr/wizard_tvcard_analog_country.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcard_analog_country.xml 2007-11-14 11:19:30 UTC (rev 1056)
+++ trunk/skins/Xephyr/wizard_tvcard_analog_country.xml 2007-11-14 11:24:07 UTC (rev 1057)
@@ -101,5 +101,6 @@
<IconYOff>10</IconYOff>
<IconXOff>15</IconXOff>
</control>
+ <import>common.time.xml</import>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Xephyr/wizard_tvcard_analog_country2.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcard_analog_country2.xml 2007-11-14 11:19:30 UTC (rev 1056)
+++ trunk/skins/Xephyr/wizard_tvcard_analog_country2.xml 2007-11-14 11:24:07 UTC (rev 1057)
@@ -79,5 +79,6 @@
<IconYOff>10</IconYOff>
<IconXOff>15</IconXOff>
</control>
+ <import>common.time.xml</import>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Xephyr/wizard_tvcard_analog_imported.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcard_analog_imported.xml 2007-11-14 11:19:30 UTC (rev 1056)
+++ trunk/skins/Xephyr/wizard_tvcard_analog_imported.xml 2007-11-14 11:24:07 UTC (rev 1057)
@@ -108,5 +108,6 @@
<posY>517</posY>
<label>-</label>
</control>
+ <import>common.time.xml</import>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Xephyr/wizard_tvcard_analog_rename.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcard_analog_rename.xml 2007-11-14 11:19:30 UTC (rev 1056)
+++ trunk/skins/Xephyr/wizard_tvcard_analog_rename.xml 2007-11-14 11:24:07 UTC (rev 1057)
@@ -113,5 +113,6 @@
<action>18</action>
<textureFocus>tv_green_border.png</textureFocus>
</control>
+ <import>common.time.xml</import>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Xephyr/wizard_tvcard_analog_renameradio.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcard_analog_renameradio.xml 2007-11-14 11:19:30 UTC (rev 1056)
+++ trunk/skins/Xephyr/wizard_tvcard_analog_renameradio.xml 2007-11-14 11:24:07 UTC (rev 1057)
@@ -113,5 +113,6 @@
<action>18</action>
<textureFocus>tv_green_border.png</textureFocus>
</control>
+ <import>common.time.xml</import>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Xephyr/wizard_tvcard_analog_scan.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcard_analog_scan.xml 2007-11-14 11:19:30 UTC (rev 1056)
+++ trunk/skins/Xephyr/wizard_tvcard_analog_scan.xml 2007-11-14 11:24:07 UTC (rev 1057)
@@ -137,5 +137,6 @@
<action>18</action>
<textureFocus>tv_green_border.png</textureFocus>
</control>
+ <import>common.time.xml</import>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Xephyr/wizard_tvcard_analog_scanradio.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcard_analog_scanradio.xml 2007-11-14 11:19:30 UTC (rev 1056)
+++ trunk/skins/Xephyr/wizard_tvcard_analog_scanradio.xml 2007-11-14 11:24:07 UTC (rev 1057)
@@ -137,5 +137,6 @@
<action>18</action>
<textureFocus>tv_green_border.png</textureFocus>
</control>
+ <import>common.time.xml</import>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Xephyr/wizard_tvcard_dvbc_country.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcard_dvbc_country.xml 2007-11-14 11:19:30 UTC (rev 1056)
+++ trunk/skins/Xephyr/wizard_tvcard_dvbc_country.xml 2007-11-14 11:24:07 UTC (rev 1057)
@@ -97,5 +97,6 @@
<IconYOff>10</IconYOff>
<IconXOff>15</IconXOff>
</control>
+ <import>common.time.xml</import>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Xephyr/wizard_tvcard_dvbc_scan.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcard_dvbc_scan.xml 2007-11-14 11:19:30 UTC (rev 1056)
+++ trunk/skins/Xephyr/wizard_tvcard_dvbc_scan.xml 2007-11-14 11:24:07 UTC (rev 1057)
@@ -116,5 +116,6 @@
<posY>517</posY>
<label>-</label>
</control>
+ <import>common.time.xml</import>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Xephyr/wizard_tvcard_dvbs_LNB1.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcard_dvbs_LNB1.xml 2007-11-14 11:19:30 UTC (rev 1056)
+++ trunk/skins/Xephyr/wizard_tvcard_dvbs_LNB1.xml 2007-11-14 11:24:07 UTC (rev 1057)
@@ -125,5 +125,6 @@
<label>Next></label>
<width>128</width>
</control>
+ <import>common.time.xml</import>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Xephyr/wizard_tvcard_dvbs_LNB2.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcard_dvbs_LNB2.xml 2007-11-14 11:19:30 UTC (rev 1056)
+++ trunk/skins/Xephyr/wizard_tvcard_dvbs_LNB2.xml 2007-11-14 11:24:07 UTC (rev 1057)
@@ -210,5 +210,6 @@
<onup>61</onup>
<ondown>5</ondown>
</control>
+ <import>common.time.xml</import>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Xephyr/wizard_tvcard_dvbs_LNB3.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcard_dvbs_LNB3.xml 2007-11-14 11:19:30 UTC (rev 1056)
+++ trunk/skins/Xephyr/wizard_tvcard_dvbs_LNB3.xml 2007-11-14 11:24:07 UTC (rev 1057)
@@ -153,5 +153,6 @@
<label>Next></label>
<width>128</width>
</control>
+ <import>common.time.xml</import>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Xephyr/wizard_tvcard_dvbs_scan.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcard_dvbs_scan.xml 2007-11-14 11:19:30 UTC (rev 1056)
+++ trunk/skins/Xephyr/wizard_tvcard_dvbs_scan.xml 2007-11-14 11:24:07 UTC (rev 1057)
@@ -116,5 +116,6 @@
<posY>517</posY>
<label>-</label>
</control>
+ <import>common.time.xml</import>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Xephyr/wizard_tvcard_dvbt_country.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcard_dvbt_country.xml 2007-11-14 11:19:30 UTC (rev 1056)
+++ trunk/skins/Xephyr/wizard_tvcard_dvbt_country.xml 2007-11-14 11:24:07 UTC (rev 1057)
@@ -97,5 +97,6 @@
<IconYOff>10</IconYOff>
<IconXOff>15</IconXOff>
</control>
+ <import>common.time.xml</import>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Xephyr/wizard_tvcard_dvbt_scan.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcard_dvbt_scan.xml 2007-11-14 11:19:30 UTC (rev 1056)
+++ trunk/skins/Xephyr/wizard_tvcard_dvbt_scan.xml 2007-11-14 11:24:07 UTC (rev 1057)
@@ -116,5 +116,6 @@
<posY>517</posY>
<label>-</label>
</control>
+ <import>common.time.xml</import>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Xephyr/wizard_tvcards_detected.xml
===================================================================
--- trunk/skins/Xephyr/wizard_tvcards_detected.xml 2007-11-14 11:19:30 UTC (rev 1056)
+++ trunk/skins/Xephyr/wizard_tvcards_detected.xml 2007-11-14 11:24:07 UTC (rev 1057)
@@ -89,5 +89,6 @@
<SpinPosY>282</SpinPosY>
<SpinAlign>right</SpinAlign>
</control>
+ <import>common.time.xml</import>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Xephyr/wizard_welcome.xml
===================================================================
--- trunk/skins/Xephyr/wizard_welcome.xml 2007-11-14 11:19:30 UTC (rev 1056)
+++ trunk/skins/Xephyr/wizard_welcome.xml 2007-11-14 11:24:07 UTC (rev 1057)
@@ -178,7 +178,6 @@
<label>200009</label>
<width>128</width>
</control>
-
<import>common.time.xml</import>
</controls>
</window>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2007-11-14 11:19:33
|
Revision: 1056
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1056&view=rev
Author: tsmotw
Date: 2007-11-14 03:19:30 -0800 (Wed, 14 Nov 2007)
Log Message:
-----------
finetuned main settings.
started working on the wizard
Modified Paths:
--------------
trunk/skins/Xephyr/settingsScreen.xml
trunk/skins/Xephyr/settings_dvd.xml
trunk/skins/Xephyr/settings_movies.xml
trunk/skins/Xephyr/settings_tv.xml
trunk/skins/Xephyr/wizard_welcome.xml
Modified: trunk/skins/Xephyr/settingsScreen.xml
===================================================================
--- trunk/skins/Xephyr/settingsScreen.xml 2007-11-14 07:27:05 UTC (rev 1055)
+++ trunk/skins/Xephyr/settingsScreen.xml 2007-11-14 11:19:30 UTC (rev 1056)
@@ -90,7 +90,7 @@
<type>button</type>
<id>2</id>
<posX>531</posX>
- <posY>220</posY>
+ <posY>270</posY>
<width>262</width>
<font>font13</font>
<label>213</label>
@@ -107,7 +107,7 @@
<type>button</type>
<id>3</id>
<posX>531</posX>
- <posY>265</posY>
+ <posY>315</posY>
<width>262</width>
<font>font13</font>
<label>214</label>
@@ -124,7 +124,7 @@
<type>button</type>
<id>4</id>
<posX>531</posX>
- <posY>310</posY>
+ <posY>360</posY>
<width>262</width>
<font>font13</font>
<label>673</label>
Modified: trunk/skins/Xephyr/settings_dvd.xml
===================================================================
--- trunk/skins/Xephyr/settings_dvd.xml 2007-11-14 07:27:05 UTC (rev 1055)
+++ trunk/skins/Xephyr/settings_dvd.xml 2007-11-14 11:19:30 UTC (rev 1056)
@@ -87,8 +87,8 @@
<control>
<type>group</type>
<layout>GridLayout(0, 6, 52, 8, 1)</layout>
- <posX>106</posX>
- <posY>201</posY>
+ <posX>531</posX>
+ <posY>251</posY>
<animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
<animation effect="fade" time="500">WindowClose</animation>
<control>
Modified: trunk/skins/Xephyr/settings_movies.xml
===================================================================
--- trunk/skins/Xephyr/settings_movies.xml 2007-11-14 07:27:05 UTC (rev 1055)
+++ trunk/skins/Xephyr/settings_movies.xml 2007-11-14 11:19:30 UTC (rev 1056)
@@ -86,8 +86,8 @@
<control>
<type>group</type>
<layout>GridLayout(0, 6, 52, 8, 1)</layout>
- <posX>106</posX>
- <posY>201</posY>
+ <posX>531</posX>
+ <posY>251</posY>
<animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
<animation effect="fade" time="500">WindowClose</animation>
<control>
Modified: trunk/skins/Xephyr/settings_tv.xml
===================================================================
--- trunk/skins/Xephyr/settings_tv.xml 2007-11-14 07:27:05 UTC (rev 1055)
+++ trunk/skins/Xephyr/settings_tv.xml 2007-11-14 11:19:30 UTC (rev 1056)
@@ -87,8 +87,8 @@
<control>
<type>group</type>
<layout>GridLayout(3, 6, 50, 8, 1)</layout>
- <posX>106</posX>
- <posY>201</posY>
+ <posX>156</posX>
+ <posY>251</posY>
<control>
<description>MPEG-2 Video Codecs</description>
<type>button</type>
Modified: trunk/skins/Xephyr/wizard_welcome.xml
===================================================================
--- trunk/skins/Xephyr/wizard_welcome.xml 2007-11-14 07:27:05 UTC (rev 1055)
+++ trunk/skins/Xephyr/wizard_welcome.xml 2007-11-14 11:19:30 UTC (rev 1056)
@@ -6,9 +6,21 @@
<controls>
<control>
<type>image</type>
- <description>BG</description>
<id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <texture>hover_settings.png</texture>
</control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1280</width>
+ <height>735</height>
+ <texture>mymenu_settings_background.png</texture>
+ </control>
<control>
<type>label</type>
<description>MediaPortal turns your PC in a very advanced Multi-Media Center / HTPC.</description>
@@ -54,15 +66,9 @@
<label>200014</label>
<font>font12</font>
</control>
+
<control>
<type>image</type>
- <id>1</id>
- <posX>91</posX>
- <posY>520</posY>
- <texture>hover_settings.png</texture>
- </control>
- <control>
- <type>image</type>
<description>MP Logo</description>
<id>1</id>
<posX>60</posX>
@@ -164,7 +170,7 @@
<description>Next</description>
<id>5</id>
<posX>1062</posX>
- <posY>672</posY>
+ <posY>622</posY>
<onleft>7</onleft>
<onright>5</onright>
<onup>7</onup>
@@ -172,5 +178,7 @@
<label>200009</label>
<width>128</width>
</control>
+
+ <import>common.time.xml</import>
</controls>
</window>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <i-...@us...> - 2007-11-14 07:27:08
|
Revision: 1055
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1055&view=rev
Author: i-loop
Date: 2007-11-13 23:27:05 -0800 (Tue, 13 Nov 2007)
Log Message:
-----------
synced with latest BlueTwo svn
Modified Paths:
--------------
trunk/skins/BlueTwoBig/Development Version/mymusicgenres.xml
Modified: trunk/skins/BlueTwoBig/Development Version/mymusicgenres.xml
===================================================================
--- trunk/skins/BlueTwoBig/Development Version/mymusicgenres.xml 2007-11-13 22:51:33 UTC (rev 1054)
+++ trunk/skins/BlueTwoBig/Development Version/mymusicgenres.xml 2007-11-14 07:27:05 UTC (rev 1055)
@@ -48,14 +48,14 @@
<label>137</label>
<onright>50</onright>
</control>
- <control>
+<!-- <control>
<description>Rotating Menu</description>
<type>button</type>
<id>1337</id>
<label>Music Menu</label>
<hyperlink>8888</hyperlink>
<onright>50</onright>
- </control>
+ </control> -->
<control>
<description>Play CD</description>
<type>button</type>
@@ -71,7 +71,6 @@
<action>100</action>
<onright>50</onright>
</control>
- <!--
<control>
<type>image</type>
<description>Divider image</description>
@@ -79,7 +78,6 @@
<texture>hbar1.png</texture>
<keepaspectratio>yes</keepaspectratio>
</control>
- -->
<control>
<description>Now playing</description>
<type>button</type>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2007-11-13 22:51:38
|
Revision: 1054
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1054&view=rev
Author: tsmotw
Date: 2007-11-13 14:51:33 -0800 (Tue, 13 Nov 2007)
Log Message:
-----------
little tweak to shadows in settings.xml
Modified Paths:
--------------
trunk/skins/Xephyr/settings.xml
Modified: trunk/skins/Xephyr/settings.xml
===================================================================
--- trunk/skins/Xephyr/settings.xml 2007-11-13 22:47:28 UTC (rev 1053)
+++ trunk/skins/Xephyr/settings.xml 2007-11-13 22:51:33 UTC (rev 1054)
@@ -36,7 +36,7 @@
<posX>0</posX>
<posY>305</posY>
<width>1280</width>
- <height>137</height>
+ <height>20</height>
<texture>mymenu_settings_shadow.png</texture>
</control>
<control>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2007-11-13 22:47:30
|
Revision: 1053
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1053&view=rev
Author: tsmotw
Date: 2007-11-13 14:47:28 -0800 (Tue, 13 Nov 2007)
Log Message:
-----------
Edited in settings: screen setup, my tv, my pictures, my videos, my dvd, my music.
There is a problem with fading labels of checkmarks
Modified Paths:
--------------
trunk/skins/Xephyr/SettingsMyMusic.xml
trunk/skins/Xephyr/SettingsSlideShow.xml
trunk/skins/Xephyr/references.xml
trunk/skins/Xephyr/settings.xml
trunk/skins/Xephyr/settingsScreen.xml
trunk/skins/Xephyr/settings_dvd.xml
trunk/skins/Xephyr/settings_movies.xml
trunk/skins/Xephyr/settings_tv.xml
Modified: trunk/skins/Xephyr/SettingsMyMusic.xml
===================================================================
--- trunk/skins/Xephyr/SettingsMyMusic.xml 2007-11-13 21:34:14 UTC (rev 1052)
+++ trunk/skins/Xephyr/SettingsMyMusic.xml 2007-11-13 22:47:28 UTC (rev 1053)
@@ -6,8 +6,86 @@
<define>#header.label:2</define>
<define>#header.hover:hover_my music.png</define>
<controls>
- <import>common.settings.xml</import>
+ <import>common.window.settings.xml</import>
+ <import>common.time.xml</import>
+ <control>
+ <description>Menu Background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>63</posY>
+ <width>1280</width>
+ <height>123</height>
+ <texture>mymenu_bg.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu Sub Menu</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>138</posY>
+ <width>1280</width>
+ <height>48</height>
+ <texture>mymenu_submenu.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu Shadow settings</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>55</posY>
+ <width>1280</width>
+ <height>20</height>
+ <texture>mymenu_settings_shadow.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>187</posY>
+ <width>1280</width>
+ <height>470</height>
+ <texture>mymenu_settings_background.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>NEED TO CHANGE THIS TO SETTINGS</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>63</posY>
+ <width>1280</width>
+ <height>75</height>
+ <texture>mymenu_full_nofocus.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
<control>
+ <description>label selection</description>
+ <type>label</type>
+ <id>1</id>
+ <posY>148</posY>
+ <posX>1138</posX>
+ <label>2</label>
+ <font>font14</font>
+ <textcolor>FF808080</textcolor>
+ <width>150</width>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+
+
+
+
+ <control>
<description>Shuffle Playlist on load</description>
<type>checkmark</type>
<id>2</id>
@@ -19,6 +97,8 @@
<onright>2</onright>
<onup>21</onup>
<ondown>6</ondown>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Enable ID3 other tagformats</description>
@@ -32,6 +112,8 @@
<onright>6</onright>
<onup>2</onup>
<ondown>8</ondown>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Reorganize My Music Database label</description>
@@ -42,6 +124,8 @@
<label>334</label>
<textcolor>FFFFFFFF</textcolor>
<font>font13</font>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Reorganize My Music Database button</description>
@@ -60,6 +144,8 @@
<onright>8</onright>
<onup>6</onup>
<ondown>13</ondown>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>delete album label</description>
@@ -70,6 +156,8 @@
<label>485</label>
<textcolor>FFFFFFFF</textcolor>
<font>font13</font>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>delete album button</description>
@@ -88,6 +176,8 @@
<ondown>10</ondown>
<onleft>13</onleft>
<onright>13</onright>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Delete Album Info</description>
@@ -98,6 +188,8 @@
<label>422</label>
<textcolor>FFFFFFFF</textcolor>
<font>font13</font>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Delete Album Info</description>
@@ -116,6 +208,8 @@
<onright>10</onright>
<onup>13</onup>
<ondown>2</ondown>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Xephyr/SettingsSlideShow.xml
===================================================================
--- trunk/skins/Xephyr/SettingsSlideShow.xml 2007-11-13 21:34:14 UTC (rev 1052)
+++ trunk/skins/Xephyr/SettingsSlideShow.xml 2007-11-13 22:47:28 UTC (rev 1053)
@@ -7,8 +7,85 @@
<define>#header.image:mplogo.png</define>
<define>#header.hover:hover_my pictures.png</define>
<controls>
- <import>common.settings.xml</import>
+ <import>common.window.settings.xml</import>
+ <import>common.time.xml</import>
+ <control>
+ <description>Menu Background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>63</posY>
+ <width>1280</width>
+ <height>123</height>
+ <texture>mymenu_bg.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu Sub Menu</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>138</posY>
+ <width>1280</width>
+ <height>48</height>
+ <texture>mymenu_submenu.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu Shadow settings</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>55</posY>
+ <width>1280</width>
+ <height>20</height>
+ <texture>mymenu_settings_shadow.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>187</posY>
+ <width>1280</width>
+ <height>470</height>
+ <texture>mymenu_settings_background.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>NEED TO CHANGE THIS TO SETTINGS</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>63</posY>
+ <width>1280</width>
+ <height>75</height>
+ <texture>mymenu_full_nofocus.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
<control>
+ <description>label selection</description>
+ <type>label</type>
+ <id>1</id>
+ <posY>148</posY>
+ <posX>688</posX>
+ <label>1</label>
+ <font>font14</font>
+ <textcolor>FF808080</textcolor>
+ <width>150</width>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+
+
+
+ <control>
<description>Speed label</description>
<type>label</type>
<id>100</id>
@@ -17,6 +94,8 @@
<label>224</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Speedselect</description>
@@ -31,6 +110,8 @@
<align>right</align>
<textcolor>FFFFFFFF</textcolor>
<buddycontrolid>100</buddycontrolid>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Transition time label</description>
@@ -41,6 +122,8 @@
<label>225</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>transition select </description>
@@ -55,6 +138,8 @@
<align>right</align>
<textcolor>FFFFFFFF</textcolor>
<buddycontrolid>101</buddycontrolid>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>ken burns speed label</description>
@@ -65,6 +150,8 @@
<label>13011</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>ken burns speed select </description>
@@ -79,6 +166,8 @@
<align>right</align>
<textcolor>FFFFFFFF</textcolor>
<buddycontrolid>102</buddycontrolid>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>X-fade transitions</description>
@@ -93,6 +182,8 @@
<onup>4</onup>
<ondown>6</ondown>
<align>right</align>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Ken Buns transitions</description>
@@ -107,6 +198,8 @@
<onup>5</onup>
<ondown>7</ondown>
<align>right</align>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Random transitions</description>
@@ -121,6 +214,8 @@
<onup>6</onup>
<ondown>8</ondown>
<align>right</align>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Repeat/loop slideshows</description>
@@ -135,6 +230,8 @@
<onup>7</onup>
<ondown>9</ondown>
<align>right</align>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Auto shuffle slideshow</description>
@@ -149,6 +246,8 @@
<onup>8</onup>
<ondown>9</ondown>
<align>right</align>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Xephyr/references.xml
===================================================================
--- trunk/skins/Xephyr/references.xml 2007-11-13 21:34:14 UTC (rev 1052)
+++ trunk/skins/Xephyr/references.xml 2007-11-13 22:47:28 UTC (rev 1053)
@@ -546,8 +546,6 @@
<MarkHeight>21</MarkHeight>
<align>left</align>
<shadow>no</shadow>
- <animation effect="zoom" start="100,100" end="110,110" time="100">focus</animation>
- <animation effect="zoom" start="110,110" end="100,100" time="300">unfocus</animation>
</control>
<control>
<description>default select button</description>
Modified: trunk/skins/Xephyr/settings.xml
===================================================================
--- trunk/skins/Xephyr/settings.xml 2007-11-13 21:34:14 UTC (rev 1052)
+++ trunk/skins/Xephyr/settings.xml 2007-11-13 22:47:28 UTC (rev 1053)
@@ -37,9 +37,19 @@
<posY>305</posY>
<width>1280</width>
<height>137</height>
- <texture>mymenu_shadow.png</texture>
+ <texture>mymenu_settings_shadow.png</texture>
</control>
<control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>436</posY>
+ <width>1280</width>
+ <height>470</height>
+ <texture>mymenu_settings_background.png</texture>
+ </control>
+ <control>
<description>NEED TO CHANGE THIS TO SETTINGS</description>
<type>image</type>
<id>1</id>
Modified: trunk/skins/Xephyr/settingsScreen.xml
===================================================================
--- trunk/skins/Xephyr/settingsScreen.xml 2007-11-13 21:34:14 UTC (rev 1052)
+++ trunk/skins/Xephyr/settingsScreen.xml 2007-11-13 22:47:28 UTC (rev 1053)
@@ -6,8 +6,83 @@
<define>#header.label:6023</define>
<define>#header.hover:hover_settings.png</define>
<controls>
- <import>common.settings.xml</import>
+ <import>common.window.settings.xml</import>
+ <import>common.time.xml</import>
+ <control>
+ <description>Menu Background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>63</posY>
+ <width>1280</width>
+ <height>123</height>
+ <texture>mymenu_bg.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu Sub Menu</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>138</posY>
+ <width>1280</width>
+ <height>48</height>
+ <texture>mymenu_submenu.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu Shadow settings</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>55</posY>
+ <width>1280</width>
+ <height>20</height>
+ <texture>mymenu_settings_shadow.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>187</posY>
+ <width>1280</width>
+ <height>470</height>
+ <texture>mymenu_settings_background.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>NEED TO CHANGE THIS TO SETTINGS</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>63</posY>
+ <width>1280</width>
+ <height>75</height>
+ <texture>mymenu_full_nofocus.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
<control>
+ <description>label selection</description>
+ <type>label</type>
+ <id>1</id>
+ <posY>148</posY>
+ <posX>368</posX>
+ <label>6023</label>
+ <font>font14</font>
+ <textcolor>FF808080</textcolor>
+ <width>150</width>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+
+ <control>
<type>group</type>
<description>group element</description>
<control>
@@ -24,6 +99,8 @@
<onright>2</onright>
<onup>4</onup>
<ondown>3</ondown>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Screen Calibration button</description>
@@ -39,6 +116,8 @@
<onright>3</onright>
<onup>2</onup>
<ondown>4</ondown>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Scroll speed button</description>
@@ -54,6 +133,8 @@
<onright>4</onright>
<onup>3</onup>
<ondown>2</ondown>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
</control>
</controls>
Modified: trunk/skins/Xephyr/settings_dvd.xml
===================================================================
--- trunk/skins/Xephyr/settings_dvd.xml 2007-11-13 21:34:14 UTC (rev 1052)
+++ trunk/skins/Xephyr/settings_dvd.xml 2007-11-13 22:47:28 UTC (rev 1053)
@@ -6,12 +6,91 @@
<define>#header.label:6015</define>
<define>#header.hover:hover_my videos.png</define>
<controls>
- <import>common.settings.xml</import>
+ <import>common.window.settings.xml</import>
+ <import>common.time.xml</import>
+ <control>
+ <description>Menu Background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>63</posY>
+ <width>1280</width>
+ <height>123</height>
+ <texture>mymenu_bg.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu Sub Menu</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>138</posY>
+ <width>1280</width>
+ <height>48</height>
+ <texture>mymenu_submenu.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu Shadow settings</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>55</posY>
+ <width>1280</width>
+ <height>20</height>
+ <texture>mymenu_settings_shadow.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>187</posY>
+ <width>1280</width>
+ <height>470</height>
+ <texture>mymenu_settings_background.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>NEED TO CHANGE THIS TO SETTINGS</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>63</posY>
+ <width>1280</width>
+ <height>75</height>
+ <texture>mymenu_full_nofocus.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
<control>
+ <description>label selection</description>
+ <type>label</type>
+ <id>1</id>
+ <posY>148</posY>
+ <posX>988</posX>
+ <label>1027</label>
+ <font>font14</font>
+ <textcolor>FF808080</textcolor>
+ <width>150</width>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+
+
+
+ <control>
<type>group</type>
<layout>GridLayout(0, 6, 52, 8, 1)</layout>
<posX>106</posX>
<posY>201</posY>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
<control>
<type>button</type>
<id>24</id>
Modified: trunk/skins/Xephyr/settings_movies.xml
===================================================================
--- trunk/skins/Xephyr/settings_movies.xml 2007-11-13 21:34:14 UTC (rev 1052)
+++ trunk/skins/Xephyr/settings_movies.xml 2007-11-13 22:47:28 UTC (rev 1053)
@@ -6,12 +6,90 @@
<define>#header.label:6022</define>
<define>#header.hover:hover_my videos.png</define>
<controls>
- <import>common.settings.xml</import>
+ <import>common.window.settings.xml</import>
+ <import>common.time.xml</import>
+ <control>
+ <description>Menu Background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>63</posY>
+ <width>1280</width>
+ <height>123</height>
+ <texture>mymenu_bg.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu Sub Menu</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>138</posY>
+ <width>1280</width>
+ <height>48</height>
+ <texture>mymenu_submenu.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu Shadow settings</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>55</posY>
+ <width>1280</width>
+ <height>20</height>
+ <texture>mymenu_settings_shadow.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>187</posY>
+ <width>1280</width>
+ <height>470</height>
+ <texture>mymenu_settings_background.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>NEED TO CHANGE THIS TO SETTINGS</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>63</posY>
+ <width>1280</width>
+ <height>75</height>
+ <texture>mymenu_full_nofocus.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
<control>
+ <description>label selection</description>
+ <type>label</type>
+ <id>1</id>
+ <posY>148</posY>
+ <posX>838</posX>
+ <label>3</label>
+ <font>font14</font>
+ <textcolor>FF808080</textcolor>
+ <width>150</width>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+
+
+ <control>
<type>group</type>
<layout>GridLayout(0, 6, 52, 8, 1)</layout>
<posX>106</posX>
<posY>201</posY>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
<control>
<type>button</type>
<description>MPEG-2 Video Codecs</description>
Modified: trunk/skins/Xephyr/settings_tv.xml
===================================================================
--- trunk/skins/Xephyr/settings_tv.xml 2007-11-13 21:34:14 UTC (rev 1052)
+++ trunk/skins/Xephyr/settings_tv.xml 2007-11-13 22:47:28 UTC (rev 1053)
@@ -6,8 +6,85 @@
<define>#header.label:6014</define>
<define>#header.hover:hover_my tv.png</define>
<controls>
- <import>common.settings.xml</import>
+ <import>common.window.settings.xml</import>
+ <import>common.time.xml</import>
+ <control>
+ <description>Menu Background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>63</posY>
+ <width>1280</width>
+ <height>123</height>
+ <texture>mymenu_bg.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu Sub Menu</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>138</posY>
+ <width>1280</width>
+ <height>48</height>
+ <texture>mymenu_submenu.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu Shadow settings</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>55</posY>
+ <width>1280</width>
+ <height>20</height>
+ <texture>mymenu_settings_shadow.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>187</posY>
+ <width>1280</width>
+ <height>470</height>
+ <texture>mymenu_settings_background.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
+ <description>NEED TO CHANGE THIS TO SETTINGS</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>63</posY>
+ <width>1280</width>
+ <height>75</height>
+ <texture>mymenu_full_nofocus.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
<control>
+ <description>label selection</description>
+ <type>label</type>
+ <id>1</id>
+ <posY>148</posY>
+ <posX>558</posX>
+ <label>605</label>
+ <font>font14</font>
+ <textcolor>FF808080</textcolor>
+ <width>150</width>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+
+
+
+ <control>
<type>group</type>
<layout>GridLayout(3, 6, 50, 8, 1)</layout>
<posX>106</posX>
@@ -19,30 +96,40 @@
<label>6000</label>
<onup>17</onup>
<onleft>36</onleft>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>H.264 Video Codecs</description>
<type>button</type>
<id>35</id>
<label>6036</label>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<type>button</type>
<description>Audio Codecs</description>
<id>25</id>
<label>6001</label>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Audio Renderer</description>
<type>button</type>
<id>33</id>
<label>6002</label>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>De-interlacing</description>
<type>button</type>
<id>27</id>
<label>6003</label>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Apect Ratio</description>
@@ -50,6 +137,8 @@
<id>28</id>
<label>6004</label>
<ondown>31</ondown>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Rendering Options</description>
@@ -58,24 +147,32 @@
<label>6007</label>
<hyperlink>701</hyperlink>
<onup>17</onup>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Automatically turn TV on</description>
<type>button</type>
<id>30</id>
<label>6006</label>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Timeshift usage mode</description>
<type>button</type>
<id>26</id>
<label>777</label>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<description>Timeshift Buffer</description>
<control>
<type>button</type>
<id>29</id>
<label>6005</label>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>Channelsorting</description>
@@ -83,6 +180,8 @@
<id>32</id>
<label>6008</label>
<hyperlink>702</hyperlink>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>DVB Guide</description>
@@ -91,6 +190,8 @@
<label>6009</label>
<ondown>36</ondown>
<hyperlink>706</hyperlink>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
<control>
<description>XMLTV EPG Grabber</description>
@@ -101,6 +202,8 @@
<onup>17</onup>
<ondown>24</ondown>
<onright>24</onright>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
</control>
</controls>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2007-11-13 21:34:16
|
Revision: 1052
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1052&view=rev
Author: tsmotw
Date: 2007-11-13 13:34:14 -0800 (Tue, 13 Nov 2007)
Log Message:
-----------
Removed animations in common.time.xml
Modified Paths:
--------------
trunk/skins/Xephyr/common.time.xml
Modified: trunk/skins/Xephyr/common.time.xml
===================================================================
--- trunk/skins/Xephyr/common.time.xml 2007-11-13 21:28:19 UTC (rev 1051)
+++ trunk/skins/Xephyr/common.time.xml 2007-11-13 21:34:14 UTC (rev 1052)
@@ -8,10 +8,6 @@
<posX>875</posX>
<posY>0</posY>
<texture>1timepanel.png</texture>
- <animation effect="fade" time="500">WindowOpen</animation>
- <animation effect="slide" time="500" start="400,0" acceleration="-1" >WindowOpen</animation>
- <animation effect="fade" time="500">WindowClose</animation>
- <animation effect="slide" time="500" end="400,0" acceleration="-1" >WindowClose</animation>
</control>
<control>
<description>background image</description>
@@ -20,10 +16,6 @@
<posX>1150</posX>
<posY>0</posY>
<texture>1divider.png</texture>
- <animation effect="fade" time="500">WindowOpen</animation>
- <animation effect="slide" time="500" start="400,0" acceleration="-1" >WindowOpen</animation>
- <animation effect="fade" time="500">WindowClose</animation>
- <animation effect="slide" time="500" end="400,0" acceleration="-1" >WindowClose</animation>
</control>
<control>
<description>Date</description>
@@ -35,10 +27,6 @@
<align>right</align>
<font>font14</font>
<textcolor>ffffffff</textcolor>
- <animation effect="fade" time="500">WindowOpen</animation>
- <animation effect="slide" time="500" start="400,0" acceleration="-1" >WindowOpen</animation>
- <animation effect="fade" time="500">WindowClose</animation>
- <animation effect="slide" time="500" end="400,0" acceleration="-1" >WindowClose</animation>
</control>
<control>
<description>Time</description>
@@ -50,10 +38,6 @@
<align>left</align>
<font>font14</font>
<textcolor>ffffffff</textcolor>
- <animation effect="fade" time="500">WindowOpen</animation>
- <animation effect="slide" time="500" start="400,0" acceleration="-1" >WindowOpen</animation>
- <animation effect="fade" time="500">WindowClose</animation>
- <animation effect="slide" time="500" end="400,0" acceleration="-1" >WindowClose</animation>
</control>
</controls>
</window>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2007-11-13 21:28:29
|
Revision: 1051
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1051&view=rev
Author: tsmotw
Date: 2007-11-13 13:28:19 -0800 (Tue, 13 Nov 2007)
Log Message:
-----------
Changed settings in previous revisions.
I've changed the general menu.
Modified Paths:
--------------
trunk/skins/Xephyr/settings.xml
trunk/skins/Xephyr/settings_general.xml
Added Paths:
-----------
trunk/skins/Xephyr/Media/mymenu_settings_background.png
trunk/skins/Xephyr/Media/mymenu_settings_shadow.png
Added: trunk/skins/Xephyr/Media/mymenu_settings_background.png
===================================================================
(Binary files differ)
Property changes on: trunk/skins/Xephyr/Media/mymenu_settings_background.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skins/Xephyr/Media/mymenu_settings_shadow.png
===================================================================
(Binary files differ)
Property changes on: trunk/skins/Xephyr/Media/mymenu_settings_shadow.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/skins/Xephyr/settings.xml
===================================================================
--- trunk/skins/Xephyr/settings.xml 2007-11-13 05:04:36 UTC (rev 1050)
+++ trunk/skins/Xephyr/settings.xml 2007-11-13 21:28:19 UTC (rev 1051)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<window>
<id>4</id>
- <defaultcontrol>3</defaultcontrol>
+ <defaultcontrol>4</defaultcontrol>
<allowoverlay>yes</allowoverlay>
<define>#header.label:5</define>
<define>#header.image:settings_logo.png</define>
Modified: trunk/skins/Xephyr/settings_general.xml
===================================================================
--- trunk/skins/Xephyr/settings_general.xml 2007-11-13 05:04:36 UTC (rev 1050)
+++ trunk/skins/Xephyr/settings_general.xml 2007-11-13 21:28:19 UTC (rev 1051)
@@ -9,8 +9,6 @@
<controls>
<import>common.window.settings.xml</import>
<import>common.time.xml</import>
-
-
<control>
<description>Menu Background</description>
<type>image</type>
@@ -20,6 +18,8 @@
<width>1280</width>
<height>123</height>
<texture>mymenu_bg.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
</control>
<control>
<description>Menu Sub Menu</description>
@@ -30,18 +30,34 @@
<width>1280</width>
<height>48</height>
<texture>mymenu_submenu.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
</control>
<control>
- <description>Menu Shadow</description>
+ <description>Menu Shadow settings</description>
<type>image</type>
<id>1</id>
<posX>0</posX>
<posY>55</posY>
<width>1280</width>
- <height>137</height>
- <texture>mymenu_shadow.png</texture>
+ <height>20</height>
+ <texture>mymenu_settings_shadow.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
</control>
<control>
+ <description>Menu background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>187</posY>
+ <width>1280</width>
+ <height>470</height>
+ <texture>mymenu_settings_background.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
+ </control>
+ <control>
<description>NEED TO CHANGE THIS TO SETTINGS</description>
<type>image</type>
<id>1</id>
@@ -50,170 +66,30 @@
<width>1280</width>
<height>75</height>
<texture>mymenu_full_nofocus.png</texture>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
</control>
<control>
- <description>Set-up wizard</description>
- <type>button</type>
- <id>3</id>
- <hyperlink>615</hyperlink>
- <posY>142</posY>
- <posX>10</posX>
- <label>1200</label>
- <font>font14</font>
- <textcolor>FF808080</textcolor>
- <disabledcolor>FF808080</disabledcolor>
- <width>190</width>
- <onleft>6</onleft>
- <onright>4</onright>
- <onup>50</onup>
- <ondown>10</ondown>
- <textureFocus>-</textureFocus>
- <textureNoFocus>-</textureNoFocus>
- </control>
- <control>
<description>General</description>
- <type>button</type>
- <id>4</id>
- <hyperlink>705</hyperlink>
- <posY>142</posY>
- <posX>200</posX>
+ <type>label</type>
+ <id>1</id>
+ <posY>148</posY>
+ <posX>218</posX>
<label>128</label>
<font>font14</font>
<textcolor>FF808080</textcolor>
- <disabledcolor>FF808080</disabledcolor>
<width>150</width>
- <onleft>3</onleft>
- <onright>5</onright>
- <onup>50</onup>
- <ondown>10</ondown>
- <textureFocus>-</textureFocus>
- <textureNoFocus>-</textureNoFocus>
+ <animation effect="slide" time="1000" start="0,250">WindowOpen</animation>
+ <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation>
</control>
- <control>
- <description>Screen set-up</description>
- <type>button</type>
- <id>5</id>
- <hyperlink>9</hyperlink>
- <posY>142</posY>
- <posX>350</posX>
- <label>6023</label>
- <font>font14</font>
- <textcolor>FF808080</textcolor>
- <disabledcolor>FF808080</disabledcolor>
- <width>190</width>
- <onleft>4</onleft>
- <onright>14</onright>
- <onup>50</onup>
- <ondown>10</ondown>
- <textureFocus>-</textureFocus>
- <textureNoFocus>-</textureNoFocus>
- </control>
- <control>
- <description>My TV</description>
- <type>button</type>
- <id>14</id>
- <hyperlink>700</hyperlink>
- <posY>142</posY>
- <posX>540</posX>
- <label>605</label>
- <font>font14</font>
- <textcolor>FF808080</textcolor>
- <disabledcolor>FF808080</disabledcolor>
- <width>150</width>
- <onleft>5</onleft>
- <onright>7</onright>
- <onup>50</onup>
- <ondown>10</ondown>
- <textureFocus>-</textureFocus>
- <textureNoFocus>-</textureNoFocus>
- </control>
- <control>
- <description>My Pictures</description>
- <type>button</type>
- <id>7</id>
- <hyperlink>12</hyperlink>
- <posY>142</posY>
- <posX>670</posX>
- <label>1</label>
- <font>font14</font>
- <textcolor>FF808080</textcolor>
- <disabledcolor>FF808080</disabledcolor>
- <width>150</width>
- <onleft>14</onleft>
- <onright>8</onright>
- <onup>50</onup>
- <ondown>10</ondown>
- <textureFocus>-</textureFocus>
- <textureNoFocus>-</textureNoFocus>
- </control>
- <control>
- <description>My Videos</description>
- <type>button</type>
- <id>8</id>
- <hyperlink>703</hyperlink>
- <posY>142</posY>
- <posX>820</posX>
- <label>3</label>
- <font>font14</font>
- <textcolor>FF808080</textcolor>
- <disabledcolor>FF808080</disabledcolor>
- <width>150</width>
- <onleft>7</onleft>
- <onright>9</onright>
- <onup>50</onup>
- <ondown>10</ondown>
- <textureFocus>-</textureFocus>
- <textureNoFocus>-</textureNoFocus>
- </control>
- <control>
- <description>My DVD</description>
- <type>button</type>
- <id>9</id>
- <hyperlink>704</hyperlink>
- <posY>142</posY>
- <posX>970</posX>
- <label>1027</label>
- <font>font14</font>
- <textcolor>FF808080</textcolor>
- <disabledcolor>FF808080</disabledcolor>
- <width>150</width>
- <onleft>8</onleft>
- <onright>6</onright>
- <onup>50</onup>
- <ondown>10</ondown>
- <textureFocus>-</textureFocus>
- <textureNoFocus>-</textureNoFocus>
- </control>
- <control>
- <description>My Music</description>
- <type>button</type>
- <id>6</id>
- <hyperlink>14</hyperlink>
- <posY>142</posY>
- <posX>1120</posX>
- <label>2</label>
- <font>font14</font>
- <textcolor>FF808080</textcolor>
- <disabledcolor>FF808080</disabledcolor>
- <width>150</width>
- <onleft>9</onleft>
- <onright>3</onright>
- <onup>50</onup>
- <ondown>10</ondown>
- <textureFocus>-</textureFocus>
- <textureNoFocus>-</textureNoFocus>
- </control>
-
<control>
<description>group element</description>
<type>group</type>
- <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
<animation effect="fade" time="500">WindowClose</animation>
- <animation effect="slide" time="250" start="-300,0">WindowOpen</animation>
- <animation effect="slide" time="500" end="800,0">WindowClose</animation>
- <posX>113</posX>
- <posY>345</posY>
+ <posX>90</posX>
+ <posY>300</posY>
<layout>StackLayout</layout>
<!-- topmost item needs an onup with a value of 17 for topbar to work -->
<control>
@@ -263,22 +139,17 @@
<ondown>99</ondown>
</control>
</control>
-
<control>
<description>Skin Preview</description>
<type>image</type>
<id>20</id>
- <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" delay="1000" time="2000">WindowOpen</animation>
<animation effect="fade" time="500">WindowClose</animation>
- <animation effect="slide" time="250" start="-300,0">WindowOpen</animation>
- <animation effect="slide" time="500" end="800,0">WindowClose</animation>
- <posX>543</posX>
- <posY>200</posY>
- <width>533</width>
+ <posX>440</posX>
+ <posY>210</posY>
+ <width>711</width>
<height>400</height>
<texture />
</control>
-
-
</controls>
</window>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2007-11-13 05:04:44
|
Revision: 1050
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1050&view=rev
Author: and-81
Date: 2007-11-12 21:04:36 -0800 (Mon, 12 Nov 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs
trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs
trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs
trunk/plugins/IR Server Suite/Applications/IR Server/Advanced.cs
trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs
trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs
trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs
trunk/plugins/IR Server Suite/Applications/SageSetup/FormMain.cs
trunk/plugins/IR Server Suite/Applications/Translator/Configuration.cs
trunk/plugins/IR Server Suite/Applications/Translator/CopyDataWM.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/EditProgramForm.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs
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/ProgramSettings.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/Setup.cs
trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/MessageCommand.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/ServerAddress.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/WindowList.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/IrssLog.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/IrssUtils.csproj
trunk/plugins/IR Server Suite/Common/IrssUtils/Keyboard.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Win32.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/XML.cs
trunk/plugins/IR Server Suite/Common/MPUtils/Forms/GoToScreen.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.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/RawInput.cs
trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTransTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IgorPlug Receiver/IrDecoder.cs
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/IrDecoder.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Microsoft MCE Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/UirtTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLircServer.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/X10Transceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.cs
trunk/plugins/IR Server Suite/IR Server Suite.sln
trunk/plugins/IR Server Suite/Input Service/Input Service/InputService.cs
trunk/plugins/IR Server Suite/Input Service/Input Service/Program.cs
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Advanced.cs
trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Config.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.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Menu.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/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/StbSetup.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/StbSetup.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs
Added Paths:
-----------
trunk/plugins/IR Server Suite/Applications/IR File Tool/FormMain.resx
trunk/plugins/IR Server Suite/Applications/Translator/Forms/MenuForm.Designer.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/MenuForm.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/MenuForm.resx
trunk/plugins/IR Server Suite/Common/IrssUtils/Audio.cs
trunk/plugins/IR Server Suite/Common/IrssUtils/Graphics/DoubleClickLeft.png
trunk/plugins/IR Server Suite/Common/IrssUtils/Graphics/DoubleClickMiddle.png
trunk/plugins/IR Server Suite/Common/IrssUtils/Graphics/DoubleClickRight.png
trunk/plugins/IR Server Suite/Common/IrssUtils/Network.cs
Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs 2007-11-12 20:48:32 UTC (rev 1049)
+++ trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs 2007-11-13 05:04:36 UTC (rev 1050)
@@ -108,7 +108,7 @@
Client _client;
string _serverHost = "localhost";
- string _learnIRFilename = null;
+ string _learnIRFilename;
bool _registered;
@@ -117,7 +117,7 @@
#endregion Variables
delegate void DelegateAddStatusLine(string status);
- DelegateAddStatusLine _addStatusLine = null;
+ DelegateAddStatusLine _addStatusLine;
void AddStatusLine(string status)
{
@@ -145,9 +145,9 @@
comboBoxComputer.Items.Clear();
comboBoxComputer.Items.Add("localhost");
- string[] networkPCs = IrssUtils.Win32.GetNetworkComputers(false);
+ List<string> networkPCs = Network.GetComputers(false);
if (networkPCs != null)
- comboBoxComputer.Items.AddRange(networkPCs);
+ comboBoxComputer.Items.AddRange(networkPCs.ToArray());
comboBoxComputer.Text = _serverHost;
}
@@ -476,7 +476,7 @@
private void comboBoxRemoteButtons_SelectedIndexChanged(object sender, EventArgs e)
{
- if (comboBoxRemoteButtons.SelectedItem.ToString() == "Custom")
+ if (comboBoxRemoteButtons.SelectedItem.ToString().Equals("Custom", StringComparison.OrdinalIgnoreCase))
numericUpDownButton.Enabled = true;
else
numericUpDownButton.Enabled = false;
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs 2007-11-12 20:48:32 UTC (rev 1049)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs 2007-11-13 05:04:36 UTC (rev 1050)
@@ -55,21 +55,21 @@
for (int index = 0; index < args.Length; index++)
{
- switch (args[index].ToLowerInvariant())
+ switch (args[index].ToUpperInvariant())
{
- case "-host":
+ case "-HOST":
_serverHost = args[++index];
continue;
- case "-port":
+ case "-PORT":
_blastPort = args[++index];
continue;
- case "-channel":
+ case "-CHANNEL":
_treatAsChannelNumber = true;
continue;
- case "-pad":
+ case "-PAD":
int.TryParse(args[++index], out _padChannelNumber);
continue;
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs 2007-11-12 20:48:32 UTC (rev 1049)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs 2007-11-13 05:04:36 UTC (rev 1050)
@@ -54,21 +54,21 @@
for (int index = 0; index < args.Length; index++)
{
- switch (args[index].ToLowerInvariant())
+ switch (args[index].ToUpperInvariant())
{
- case "-host":
+ case "-HOST":
_serverHost = args[++index];
continue;
- case "-port":
+ case "-PORT":
_blastPort = args[++index];
continue;
- case "-channel":
+ case "-CHANNEL":
_treatAsChannelNumber = true;
continue;
- case "-pad":
+ case "-PAD":
int.TryParse(args[++index], out _padChannelNumber);
continue;
Added: trunk/plugins/IR Server Suite/Applications/IR File Tool/FormMain.resx
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR File Tool/FormMain.resx (rev 0)
+++ trunk/plugins/IR Server Suite/Applications/IR File Tool/FormMain.resx 2007-11-13 05:04:36 UTC (rev 1050)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Advanced.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/Advanced.cs 2007-11-12 20:48:32 UTC (rev 1049)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/Advanced.cs 2007-11-13 05:04:36 UTC (rev 1050)
@@ -7,6 +7,8 @@
using System.Text;
using System.Windows.Forms;
+using IrssUtils;
+
namespace IRServer
{
@@ -58,9 +60,9 @@
{
InitializeComponent();
- string[] networkPCs = IrssUtils.Win32.GetNetworkComputers(false);
+ List<string> networkPCs = Network.GetComputers(false);
if (networkPCs != null)
- comboBoxComputer.Items.AddRange(networkPCs);
+ comboBoxComputer.Items.AddRange(networkPCs.ToArray());
}
#endregion Constructor
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs 2007-11-12 20:48:32 UTC (rev 1049)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs 2007-11-13 05:04:36 UTC (rev 1050)
@@ -100,7 +100,7 @@
if (checkBox == null)
continue;
- if (gridPlugins[row, 0].DisplayText.Equals(value, StringComparison.InvariantCultureIgnoreCase))
+ if (gridPlugins[row, 0].DisplayText.Equals(value, StringComparison.OrdinalIgnoreCase))
checkBox.Checked = true;
else
checkBox.Checked = false;
@@ -263,7 +263,7 @@
string plugin = gridPlugins[cell.Row.Index, 0].DisplayText;
foreach (IRServerPluginBase transceiver in _transceivers)
- if (transceiver.Name == plugin)
+ if (transceiver.Name.Equals(plugin, StringComparison.OrdinalIgnoreCase))
(transceiver as IConfigure).Configure();
}
/*
@@ -280,7 +280,7 @@
for (int row = 1; row < gridPlugins.RowsCount; row++)
{
SourceGrid.Cells.CheckBox checkBox = gridPlugins[row, 1] as SourceGrid.Cells.CheckBox;
- if (checkBox != null && checkBox.Checked && !gridPlugins[row, 0].DisplayText.Equals(plugin, StringComparison.InvariantCultureIgnoreCase))
+ if (checkBox != null && checkBox.Checked && !gridPlugins[row, 0].DisplayText.Equals(plugin, StringComparison.OrdinalIgnoreCase))
checkBox.Checked = false;
}
}
@@ -298,7 +298,7 @@
for (int row = 1; row < gridPlugins.RowsCount; row++)
{
SourceGrid.Cells.CheckBox checkBox = gridPlugins[row, 2] as SourceGrid.Cells.CheckBox;
- if (checkBox != null && checkBox.Checked && !gridPlugins[row, 0].DisplayText.Equals(plugin, StringComparison.InvariantCultureIgnoreCase))
+ if (checkBox != null && checkBox.Checked && !gridPlugins[row, 0].DisplayText.Equals(plugin, StringComparison.OrdinalIgnoreCase))
checkBox.Checked = false;
}
}
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2007-11-12 20:48:32 UTC (rev 1049)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2007-11-13 05:04:36 UTC (rev 1050)
@@ -73,7 +73,7 @@
string _pluginNameTransmit;
IRServerPluginBase _pluginTransmit;
- bool _inConfiguration = false;
+ bool _inConfiguration;
#endregion Variables
@@ -1115,8 +1115,7 @@
}
else
{
- byte[] bytes = null;
-
+ byte[] bytes;
LearnStatus status = LearnIR(out bytes);
switch (status)
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs 2007-11-12 20:48:32 UTC (rev 1049)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs 2007-11-13 05:04:36 UTC (rev 1050)
@@ -145,7 +145,7 @@
throw new FileNotFoundException("No available plugins found");
foreach (IRServerPluginBase plugin in serverPlugins)
- if (plugin.Name.Equals(pluginName, StringComparison.InvariantCultureIgnoreCase))
+ if (plugin.Name.Equals(pluginName, StringComparison.OrdinalIgnoreCase))
return plugin;
return null;
Modified: trunk/plugins/IR Server Suite/Applications/SageSetup/FormMain.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/SageSetup/FormMain.cs 2007-11-12 20:48:32 UTC (rev 1049)
+++ trunk/plugins/IR Server Suite/Applications/SageSetup/FormMain.cs 2007-11-13 05:04:36 UTC (rev 1050)
@@ -24,7 +24,7 @@
private void FormMain_Load(object sender, EventArgs e)
{
- string[] networkPCs = Win32.GetNetworkComputers(false);
+ List<string> networkPCs = Network.GetComputers(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);
+ comboBoxComputer.Items.AddRange(networkPCs.ToArray());
}
_irBlastLocation = SystemRegistry.GetInstallFolder();
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Configuration.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Configuration.cs 2007-11-12 20:48:32 UTC (rev 1049)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Configuration.cs 2007-11-13 05:04:36 UTC (rev 1050)
@@ -46,7 +46,6 @@
public List<ButtonMapping> SystemWideMappings
{
get { return _systemWideMappings; }
- set { _systemWideMappings = value; }
}
/// <summary>
@@ -56,7 +55,6 @@
public List<ProgramSettings> Programs
{
get { return _programSettings; }
- set { _programSettings = value; }
}
/// <summary>
@@ -66,7 +64,6 @@
public List<MappedEvent> Events
{
get { return _mappedEvents; }
- set { _mappedEvents = value; }
}
#endregion Properties
Modified: trunk/plugins/IR Server Suite/Applications/Translator/CopyDataWM.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/CopyDataWM.cs 2007-11-12 20:48:32 UTC (rev 1049)
+++ trunk/plugins/IR Server Suite/Applications/Translator/CopyDataWM.cs 2007-11-13 05:04:36 UTC (rev 1050)
@@ -30,9 +30,7 @@
/// <summary>
/// Initializes a new instance of the <see cref="CopyDataWM"/> class.
/// </summary>
- public CopyDataWM()
- {
- }
+ public CopyDataWM() { }
/// <summary>
/// Releases unmanaged resources and performs other cleanup operations before the
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs 2007-11-12 20:48:32 UTC (rev 1049)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs 2007-11-13 05:04:36 UTC (rev 1050)
@@ -215,24 +215,16 @@
string[] commands = Common.SplitWindowMessageCommand(suffix);
tabControl.SelectTab(tabPageMessage);
- switch (commands[0].ToLowerInvariant())
+ switch (commands[0].ToUpperInvariant())
{
- case "active":
- radioButtonActiveWindow.Checked = true;
- break;
- case "application":
- radioButtonApplication.Checked = true;
- break;
- case "class":
- radioButtonClass.Checked = true;
- break;
- case "window":
- radioButtonWindowTitle.Checked = true;
- break;
+ case Common.WMTargetActive: radioButtonActiveWindow.Checked = true; break;
+ case Common.WMTargetApplication: radioButtonApplication.Checked = true; break;
+ case Common.WMTargetClass: radioButtonClass.Checked = true; break;
+ case Common.WMTargetWindow: radioButtonWindowTitle.Checked = true; break;
}
- textBoxMsgTarget.Text = commands[1];
- numericUpDownMsg.Value = decimal.Parse(commands[2]);
+ textBoxMsgTarget.Text = commands[1];
+ numericUpDownMsg.Value = decimal.Parse(commands[2]);
numericUpDownWParam.Value = decimal.Parse(commands[3]);
numericUpDownLParam.Value = decimal.Parse(commands[4]);
break;
@@ -262,7 +254,7 @@
else if (suffix.StartsWith(Common.MouseMoveRight)) checkBoxMouseMoveRight.Checked = true;
else if (suffix.StartsWith(Common.MouseMoveUp)) checkBoxMouseMoveUp.Checked = true;
- numericUpDownMouseMove.Value = Decimal.Parse(suffix.Substring(suffix.IndexOf(" ")));
+ numericUpDownMouseMove.Value = Decimal.Parse(suffix.Substring(suffix.IndexOf(' ')));
break;
}
break;
@@ -294,7 +286,7 @@
break;
default:
- if (prefix.Equals(Common.CmdPrefixEject, StringComparison.InvariantCultureIgnoreCase))
+ if (prefix.Equals(Common.CmdPrefixEject, StringComparison.OrdinalIgnoreCase))
comboBoxMiscCommand.SelectedItem = Common.UITextEject;
//else
break;
@@ -382,24 +374,24 @@
case "tabPageMessage":
{
- string target = "error";
+ string target = "ERROR";
if (radioButtonActiveWindow.Checked)
{
- target = "active";
+ target = Common.WMTargetActive;
textBoxMsgTarget.Text = "*";
}
else if (radioButtonApplication.Checked)
{
- target = "application";
+ target = Common.WMTargetApplication;
}
else if (radioButtonClass.Checked)
{
- target = "class";
+ target = Common.WMTargetClass;
}
else if (radioButtonWindowTitle.Checked)
{
- target = "window";
+ target = Common.WMTargetWindow;
}
textBoxCommand.Text = _command =
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/EditProgramForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/EditProgramForm.cs 2007-11-12 20:48:32 UTC (rev 1049)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/EditProgramForm.cs 2007-11-13 05:04:36 UTC (rev 1050)
@@ -73,7 +73,7 @@
if (progSettings != null)
{
DisplayName = progSettings.Name;
- Filename = progSettings.Filename;
+ Filename = progSettings.FileName;
StartupFolder = progSettings.Folder;
Parameters = progSettings.Arguments;
StartState = progSettings.WindowState;
@@ -100,7 +100,7 @@
if (String.IsNullOrEmpty(textBoxAppStartFolder.Text))
textBoxAppStartFolder.Text = Path.GetDirectoryName(find.FileName);
- if (String.IsNullOrEmpty(textBoxDisplayName.Text) || textBoxDisplayName.Text == "New Program")
+ if (String.IsNullOrEmpty(textBoxDisplayName.Text) || textBoxDisplayName.Text.Equals("New Program", StringComparison.Ordinal))
textBoxDisplayName.Text = Path.GetFileNameWithoutExtension(find.FileName);
}
}
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs 2007-11-12 20:48:32 UTC (rev 1049)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs 2007-11-13 05:04:36 UTC (rev 1050)
@@ -284,73 +284,71 @@
string selected = comboBoxCommands.SelectedItem as string;
- if (selected == Common.UITextRun)
+ if (selected.Equals(Common.UITextRun, StringComparison.OrdinalIgnoreCase))
{
ExternalProgram externalProgram = new ExternalProgram(false);
if (externalProgram.ShowDialog(this) == DialogResult.OK)
listBoxMacro.Items.Add(Common.CmdPrefixRun + externalProgram.CommandString);
}
- else if (selected == Common.UITextPause)
+ else if (selected.Equals(Common.UITextPause, StringComparison.OrdinalIgnoreCase))
{
PauseTime pauseTime = new PauseTime();
if (pauseTime.ShowDialog(this) == DialogResult.OK)
listBoxMacro.Items.Add(Common.CmdPrefixPause + pauseTime.Time.ToString());
}
- else if (selected == Common.UITextSerial)
+ else if (selected.Equals(Common.UITextSerial, StringComparison.OrdinalIgnoreCase))
{
SerialCommand serialCommand = new SerialCommand();
if (serialCommand.ShowDialog(this) == DialogResult.OK)
listBoxMacro.Items.Add(Common.CmdPrefixSerial + serialCommand.CommandString);
}
- else if (selected == Common.UITextWindowMsg)
+ else if (selected.Equals(Common.UITextWindowMsg, StringComparison.OrdinalIgnoreCase))
{
MessageCommand messageCommand = new MessageCommand();
if (messageCommand.ShowDialog(this) == DialogResult.OK)
listBoxMacro.Items.Add(Common.CmdPrefixWindowMsg + messageCommand.CommandString);
}
- else if (selected == Common.UITextTcpMsg)
+ else if (selected.Equals(Common.UITextTcpMsg, StringComparison.OrdinalIgnoreCase))
{
TcpMessageCommand tcpMessageCommand = new TcpMessageCommand();
- if (tcpMessageCommand.ShowDialog(this) == DialogResult.Cancel)
- return;
-
- listBoxMacro.Items.Add(Common.CmdPrefixTcpMsg + tcpMessageCommand.CommandString);
+ if (tcpMessageCommand.ShowDialog(this) == DialogResult.OK)
+ listBoxMacro.Items.Add(Common.CmdPrefixTcpMsg + tcpMessageCommand.CommandString);
}
- else if (selected == Common.UITextKeys)
+ else if (selected.Equals(Common.UITextKeys, StringComparison.OrdinalIgnoreCase))
{
KeysCommand keysCommand = new KeysCommand();
if (keysCommand.ShowDialog(this) == DialogResult.OK)
listBoxMacro.Items.Add(Common.CmdPrefixKeys + keysCommand.CommandString);
}
- else if (selected == Common.UITextMouse)
+ else if (selected.Equals(Common.UITextMouse, StringComparison.OrdinalIgnoreCase))
{
MouseCommand mouseCommand = new MouseCommand();
if (mouseCommand.ShowDialog(this) == DialogResult.OK)
listBoxMacro.Items.Add(Common.CmdPrefixMouse + mouseCommand.CommandString);
}
- else if (selected == Common.UITextEject)
+ else if (selected.Equals(Common.UITextEject, StringComparison.OrdinalIgnoreCase))
{
EjectCommand ejectCommand = new EjectCommand();
if (ejectCommand.ShowDialog(this) == DialogResult.OK)
listBoxMacro.Items.Add(Common.CmdPrefixEject + ejectCommand.CommandString);
}
- else if (selected == Common.UITextStandby)
+ else if (selected.Equals(Common.UITextStandby, StringComparison.OrdinalIgnoreCase))
{
listBoxMacro.Items.Add(Common.CmdPrefixStandby);
}
- else if (selected == Common.UITextHibernate)
+ else if (selected.Equals(Common.UITextHibernate, StringComparison.OrdinalIgnoreCase))
{
listBoxMacro.Items.Add(Common.CmdPrefixHibernate);
}
- else if (selected == Common.UITextReboot)
+ else if (selected.Equals(Common.UITextReboot, StringComparison.OrdinalIgnoreCase))
{
listBoxMacro.Items.Add(Common.CmdPrefixReboot);
}
- else if (selected == Common.UITextShutdown)
+ else if (selected.Equals(Common.UITextShutdown, StringComparison.OrdinalIgnoreCase))
{
listBoxMacro.Items.Add(Common.CmdPrefixShutdown);
}
- else if (selected.StartsWith(Common.CmdPrefixBlast))
+ else if (selected.StartsWith(Common.CmdPrefixBlast, StringComparison.OrdinalIgnoreCase))
{
BlastCommand blastCommand = new BlastCommand(
new BlastIrDelegate(Program.BlastIR),
@@ -361,7 +359,7 @@
if (blastCommand.ShowDialog(this) == DialogResult.OK)
listBoxMacro.Items.Add(Common.CmdPrefixBlast + blastCommand.CommandString);
}
- else if (selected.StartsWith(Common.CmdPrefixMacro))
+ else if (selected.StartsWith(Common.CmdPrefixMacro, StringComparison.OrdinalIgnoreCase))
{
listBoxMacro.Items.Add(selected);
}
@@ -471,7 +469,7 @@
string selected = listBoxMacro.SelectedItem as string;
- if (selected.StartsWith(Common.CmdPrefixPause))
+ if (selected.StartsWith(Common.CmdPrefixPause, StringComparison.OrdinalIgnoreCase))
{
PauseTime pauseTime = new PauseTime(int.Parse(selected.Substring(Common.CmdPrefixPause.Length)));
if (pauseTime.ShowDialog(this) == DialogResult.Cancel)
@@ -482,7 +480,7 @@
listBoxMacro.Items.Insert(index, Common.CmdPrefixPause + pauseTime.Time.ToString());
listBoxMacro.SelectedIndex = index;
}
- else if (selected.StartsWith(Common.CmdPrefixRun))
+ else if (selected.StartsWith(Common.CmdPrefixRun, StringComparison.OrdinalIgnoreCase))
{
string[] commands = Common.SplitRunCommand(selected.Substring(Common.CmdPrefixRun.Length));
@@ -495,7 +493,7 @@
listBoxMacro.Items.Insert(index, Common.CmdPrefixRun + executeProgram.CommandString);
listBoxMacro.SelectedIndex = index;
}
- else if (selected.StartsWith(Common.CmdPrefixSerial))
+ else if (selected.StartsWith(Common.CmdPrefixSerial, StringComparison.OrdinalIgnoreCase))
{
string[] commands = Common.SplitSerialCommand(selected.Substring(Common.CmdPrefixSerial.Length));
@@ -508,7 +506,7 @@
listBoxMacro.Items.Insert(index, Common.CmdPrefixSerial + serialCommand.CommandString);
listBoxMacro.SelectedIndex = index;
}
- else if (selected.StartsWith(Common.CmdPrefixWindowMsg))
+ else if (selected.StartsWith(Common.CmdPrefixWindowMsg, StringComparison.OrdinalIgnoreCase))
{
string[] commands = Common.SplitWindowMessageCommand(selected.Substring(Common.CmdPrefixWindowMsg.Length));
@@ -521,7 +519,7 @@
listBoxMacro.Items.Insert(index, Common.CmdPrefixWindowMsg + messageCommand.CommandString);
listBoxMacro.SelectedIndex = index;
}
- else if (selected.StartsWith(Common.CmdPrefixTcpMsg))
+ else if (selected.StartsWith(Common.CmdPrefixTcpMsg, StringComparison.OrdinalIgnoreCase))
{
string[] commands = Common.SplitTcpMessageCommand(selected.Substring(Common.CmdPrefixTcpMsg.Length));
TcpMessageCommand tcpMessageCommand = new TcpMessageCommand(commands);
@@ -533,7 +531,7 @@
listBoxMacro.Items.Insert(index, Common.CmdPrefixTcpMsg + tcpMessageCommand.CommandString);
listBoxMacro.SelectedIndex = index;
}
- else if (selected.StartsWith(Common.CmdPrefixKeys))
+ else if (selected.StartsWith(Common.CmdPrefixKeys, StringComparison.OrdinalIgnoreCase))
{
KeysCommand keysCommand = new KeysCommand(selected.Substring(Common.CmdPrefixKeys.Length));
if (keysCommand.ShowDialog(this) == DialogResult.Cancel)
@@ -544,7 +542,7 @@
listBoxMacro.Items.Insert(index, Common.CmdPrefixKeys + keysCommand.CommandString);
listBoxMacro.SelectedIndex = index;
}
- else if (selected.StartsWith(Common.CmdPrefixMouse))
+ else if (selected.StartsWith(Common.CmdPrefixMouse, StringComparison.OrdinalIgnoreCase))
{
MouseCommand mouseCommand = new MouseCommand(selected.Substring(Common.CmdPrefixMouse.Length));
if (mouseCommand.ShowDialog(this) == DialogResult.Cancel)
@@ -555,7 +553,7 @@
listBoxMacro.Items.Insert(index, Common.CmdPrefixMouse + mouseCommand.CommandString);
listBoxMacro.SelectedIndex = index;
}
- else if (selected.StartsWith(Common.CmdPrefixEject))
+ else if (selected.StartsWith(Common.CmdPrefixEject, StringComparison.OrdinalIgnoreCase))
{
EjectCommand ejectCommand = new EjectCommand(selected.Substring(Common.CmdPrefixEject.Length));
if (ejectCommand.ShowDialog(this) == DialogResult.Cancel)
@@ -566,7 +564,7 @@
listBoxMacro.Items.Insert(index, Common.CmdPrefixEject + ejectCommand.CommandString);
listBoxMacro.SelectedIndex = index;
}
- else if (selected.StartsWith(Common.CmdPrefixBlast))
+ else if (selected.StartsWith(Common.CmdPrefixBlast, StringComparison.OrdinalIgnoreCase))
{
string[] commands = Common.SplitBlastCommand(selected.Substring(Common.CmdPrefixBlast.Length));
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2007-11-12 20:48:32 UTC (rev 1049)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs 2007-11-13 05:04:36 UTC (rev 1050)
@@ -147,8 +147,18 @@
{
imageListPrograms.Images.Clear();
imageListPrograms.Images.Add(Properties.Resources.WinLogo);
- imageListPrograms.Images.Add(Properties.Resources.NoIcon);
+ Icon large;
+ Icon small;
+
+ string folder = Environment.GetFolderPath(Environment.SpecialFolder.System);
+ string file = folder + "\\user32.dll";
+ Win32.ExtractIcons(file, 1, out large, out small);
+ imageListPrograms.Images.Add(large);
+
+
+ //imageListPrograms.Images.Add(Properties.Resources.NoIcon);
+
string wasSelected = string.Empty;
if (listViewPrograms.Items.Count > 0)
wasSelected = listViewPrograms.Items[_selectedProgram].Text;
@@ -165,13 +175,13 @@
int imageIndex = 2;
foreach (ProgramSettings progSettings in Program.Config.Programs)
{
- Icon icon = Win32.GetIconFor(progSettings.Filename);
+ Icon icon = Win32.GetIconFor(progSettings.FileName);
if (icon != null)
{
imageListPrograms.Images.Add(icon);
newItem = new ListViewItem(progSettings.Name, imageIndex++);
- newItem.ToolTipText = progSettings.Filename;
+ newItem.ToolTipText = progSettings.FileName;
}
else
{
@@ -222,7 +232,7 @@
comboBoxEvents.Items.Clear();
foreach (string eventName in Enum.GetNames(typeof(MappingEvent)))
- if (eventName != "None")
+ if (!eventName.Equals("None", StringComparison.OrdinalIgnoreCase))
comboBoxEvents.Items.Add(eventName);
comboBoxEvents.SelectedIndex = 0;
@@ -372,7 +382,7 @@
if (editProg.ShowDialog(this) == DialogResult.OK)
{
progSettings.Name = editProg.DisplayName;
- progSettings.Filename = editProg.Filename;
+ progSettings.FileName = editProg.Filename;
progSettings.Folder = editProg.StartupFolder;
progSettings.Arguments = editProg.Parameters;
progSettings.WindowState = editProg.StartState;
@@ -473,7 +483,7 @@
foreach (ButtonMapping test in currentMappings)
{
- if (keyCode == test.KeyCode)
+ if (keyCode.Equals(test.KeyCode, StringComparison.Ordinal))
{
existing = test;
map = new ButtonMappingForm(test.KeyCode, test.Description, test.Command);
@@ -512,7 +522,7 @@
{
for (int index = 0; index < listViewButtons.Items.Count; index++)
{
- if (listViewButtons.Items[index].SubItems[0].Text == map.KeyCode)
+ if (listViewButtons.Items[index].SubItems[0].Text.Equals(map.KeyCode, StringComparison.Ordinal))
{
listViewButtons.Items[index].SubItems[1].Text = map.Description;
listViewButtons.Items[index].SubItems[2].Text = map.Command;
@@ -540,7 +550,7 @@
ButtonMapping toRemove = null;
foreach (ButtonMapping test in currentMappings)
{
- if (test.KeyCode == item.SubItems[0].Text)
+ if (test.KeyCode.Equals(item.SubItems[0].Text, StringComparison.Ordinal))
{
toRemove = test;
break;
@@ -563,7 +573,7 @@
foreach (ButtonMapping test in currentMappings)
{
- if (item.SubItems[0].Text == test.KeyCode)
+ if (item.SubItems[0].Text.Equals(test.KeyCode, StringComparison.Ordinal))
{
ButtonMappingForm map = new ButtonMappingForm(test.KeyCode, test.Description, test.Command);
@@ -613,7 +623,7 @@
foreach (ProgramSettings programSettings in Program.Config.Programs)
{
- if (programSettings.Name == programName)
+ if (programSettings.Name.Equals(programName, StringComparison.OrdinalIgnoreCase))
{
ImportButtons(programSettings.ButtonMappings);
return;
@@ -633,7 +643,7 @@
foreach (ButtonMapping existingMapping in currentMappings)
{
- if (existingMapping.KeyCode == newMapping.KeyCode)
+ if (existingMapping.KeyCode.Equals(newMapping.KeyCode, StringComparison.Ordinal))
{
// Change the existing mapping to the new one
existingMapping.Description = newMapping.Description;
@@ -952,7 +962,7 @@
string selected = comboBoxCommands.SelectedItem as string;
string command = String.Empty;
- if (selected == Common.UITextRun)
+ if (selected.Equals(Common.UITextRun, StringComparison.OrdinalIgnoreCase))
{
ExternalProgram externalProgram = new ExternalProgram(false);
@@ -961,7 +971,7 @@
command = Common.CmdPrefixRun + externalProgram.CommandString;
}
- else if (selected == Common.UITextSerial)
+ else if (selected.Equals(Common.UITextSerial, StringComparison.OrdinalIgnoreCase))
{
SerialCommand serialCommand = new SerialCommand();
if (serialCommand.ShowDialog(this) == DialogResult.Cancel)
@@ -969,7 +979,7 @@
command = Common.CmdPrefixSerial + serialCommand.CommandString;
}
- else if (selected == Common.UITextWindowMsg)
+ else if (selected.Equals(Common.UITextWindowMsg, StringComparison.OrdinalIgnoreCase))
{
MessageCommand messageCommand = new MessageCommand();
if (messageCommand.ShowDialog(this) == DialogResult.Cancel)
@@ -977,7 +987,7 @@
command = Common.CmdPrefixWindowMsg + messageCommand.CommandString;
}
- else if (selected == Common.UITextKeys)
+ else if (selected.Equals(Common.UITextKeys, StringComparison.OrdinalIgnoreCase))
{
KeysCommand keysCommand = new KeysCommand();
if (keysCommand.ShowDialog(this) == DialogResult.Cancel)
@@ -985,7 +995,7 @@
command = Common.CmdPrefixKeys + keysCommand.CommandString;
}
- else if (selected.StartsWith(Common.CmdPrefixBlast))
+ else if (selected.StartsWith(Common.CmdPrefixBlast, StringComparison.OrdinalIgnoreCase))
{
BlastCommand blastCommand = new BlastCommand(
new BlastIrDelegate(Program.BlastIR),
@@ -998,7 +1008,7 @@
command = Common.CmdPrefixBlast + blastCommand.CommandString;
}
- else if (selected.StartsWith(Common.CmdPrefixMacro))
+ else if (selected.StartsWith(Common.CmdPrefixMacro, StringComparison.OrdinalIgnoreCase))
{
command = selected;
}
@@ -1025,7 +1035,7 @@
string command = listViewEventMap.SelectedItems[0].SubItems[1].Text;
- if (command.StartsWith(Common.CmdPrefixRun))
+ if (command.StartsWith(Common.CmdPrefixRun, StringComparison.OrdinalIgnoreCase))
{
string[] commands = Common.SplitRunCommand(command.Substring(Common.CmdPrefixRun.Length));
ExternalProgram externalProgram = new ExternalProgram(commands, false);
@@ -1034,7 +1044,7 @@
command = Common.CmdPrefixRun + externalProgram.CommandString;
}
- else if (command.StartsWith(Common.CmdPrefixSerial))
+ else if (command.StartsWith(Common.CmdPrefixSerial, StringComparison.OrdinalIgnoreCase))
{
string[] commands = Common.SplitSerialCommand(command.Substring(Common.CmdPrefixSerial.Length));
SerialCommand serialCommand = new SerialCommand(commands);
@@ -1043,7 +1053,7 @@
command = Common.CmdPrefixSerial + serialCommand.CommandString;
}
- else if (command.StartsWith(Common.CmdPrefixWindowMsg))
+ else if (command.StartsWith(Common.CmdPrefixWindowMsg, StringComparison.OrdinalIgnoreCase))
{
string[] commands = Common.SplitWindowMessageCommand(command.Substring(Common.CmdPrefixWindowMsg.Length));
MessageCommand messageCommand = new MessageCommand(commands);
@@ -1052,7 +1062,7 @@
command = Common.CmdPrefixWindowMsg + messageCommand.CommandString;
}
- else if (command.StartsWith(Common.CmdPrefixKeys))
+ else if (command.StartsWith(Common.CmdPrefixKeys, StringComparison.OrdinalIgnoreCase))
{
KeysCommand keysCommand = new KeysCommand(command.Substring(Common.CmdPrefixKeys.Length));
if (keysCommand.ShowDialog(this) == DialogResult.Cancel)
@@ -1060,7 +1070,7 @@
command = Common.CmdPrefixKeys + keysCommand.CommandString;
}
- else if (command.StartsWith(Common.CmdPrefixBlast))
+ else if (command.StartsWith(Common.CmdPrefixBlast, StringComparison.OrdinalIgnoreCase))
{
string[] commands = Common.SplitBlastCommand(command.Substring(Common.CmdPrefixBlast.Length));
@@ -1256,7 +1266,7 @@
if (programSettings.Name.Equals(selectedItem))
continue;
- Icon icon = Win32.GetIconFor(programSettings.Filename);
+ Icon icon = Win32.GetIconFor(programSettings.FileName);
Image image = null;
if (icon != null)
image = icon.ToBitmap();
Added: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MenuForm.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MenuForm.Designer.cs (rev 0)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MenuForm.Designer.cs 2007-11-13 05:04:36 UTC (rev 1050)
@@ -0,0 +1,115 @@
+namespace Translator
+{
+ partial class MenuForm
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ this.listViewMenu = new System.Windows.Forms.ListView();
+ this.toolTips = new System.Windows.Forms.ToolTip(this.components);
+ this.labelHeader = new System.Windows.Forms.Label();
+ this.columnHeader = new System.Windows.Forms.ColumnHeader();
+ this.SuspendLayout();
+ //
+ // listViewMenu
+ //
+ this.listViewMenu.Activation = System.Windows.Forms.ItemActivation.OneClick;
+ this.listViewMenu.Alignment = System.Windows.Forms.ListViewAlignment.Left;
+ this.listViewMenu.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.listViewMenu.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+ this.columnHeader});
+ this.listViewMenu.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.listViewMenu.FullRowSelect = true;
+ this.listViewMenu.GridLines = true;
+ this.listViewMenu.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
+ this.listViewMenu.HideSelection = false;
+ this.listViewMenu.HotTracking = true;
+ this.listViewMenu.HoverSelection = true;
+ this.listViewMenu.Location = new System.Drawing.Point(0, 20);
+ this.listViewMenu.MultiSelect = false;
+ this.listViewMenu.Name = "listViewMenu";
+ this.listViewMenu.Scrollable = false;
+ this.listViewMenu.ShowGroups = false;
+ this.listViewMenu.ShowItemToolTips = true;
+ this.listViewMenu.Size = new System.Drawing.Size(256, 108);
+ this.listViewMenu.TabIndex = 1;
+ this.listViewMenu.TileSize = new System.Drawing.Size(128, 96);
+ this.listViewMenu.UseCompatibleStateImageBehavior = false;
+ this.listViewMenu.ItemActivate += new System.EventHandler(this.listViewMenu_ItemActivate);
+ this.listViewMenu.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.listViewMenu_KeyPress);
+ //
+ // labelHeader
+ //
+ this.labelHeader.BackColor = System.Drawing.SystemColors.GradientActiveCaption;
+ this.labelHeader.Dock = System.Windows.Forms.DockStyle.Top;
+ this.labelHeader.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.labelHeader.Location = new System.Drawing.Point(0, 0);
+ this.labelHeader.Name = "labelHeader";
+ this.labelHeader.Size = new System.Drawing.Size(256, 20);
+ this.labelHeader.TabIndex = 0;
+ this.labelHeader.Text = "Translator OSD";
+ this.labelHeader.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // columnHeader
+ //
+ this.columnHeader.Width = 232;
+ //
+ // MenuForm
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(256, 128);
+ this.ControlBox = false;
+ this.Controls.Add(this.listViewMenu);
+ this.Controls.Add(this.labelHeader);
+ this.DoubleBuffered = true;
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+ this.MaximizeBox = false;
+ this.MaximumSize = new System.Drawing.Size(512, 256);
+ this.MinimizeBox = false;
+ this.MinimumSize = new System.Drawing.Size(256, 128);
+ this.Name = "MenuForm";
+ this.ShowIcon = false;
+ this.ShowInTaskbar = false;
+ this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+ this.Text = "MenuForm";
+ this.TopMost = true;
+ this.Deactivate += new System.EventHandler(this.MenuForm_Deactivate);
+ this.Shown += new System.EventHandler(this.MenuForm_Shown);
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.ListView listViewMenu;
+ private System.Windows.Forms.ToolTip toolTips;
+ private System.Windows.Forms.Label labelHeader;
+ private System.Windows.Forms.ColumnHeader columnHeader;
+ }
+}
\ No newline at end of file
Added: trunk/plugins/IR Server Suite/Applications/Translator/Forms/MenuForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Forms/MenuForm.cs (rev 0)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Forms/MenuForm.cs 2007-11-13 05:04:36 UTC (rev 1050)
@@ -0,0 +1,786 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Diagnostics;
+using System.Drawing;
+using System.IO;
+using System.Text;
+using System.Windows.Forms;
+
+using IrssUtils;
+
+namespace Translator
+{
+
+ /// <summary>
+ /// Translator Menu.
+ /// </summary>
+ public partial class MenuForm : Form
+ {
+
+ #region Constants
+
+ const string WindowTitle = "Translator OSD";
+
+ // Menus
+ const string MenuMain = "Main";
+ const string MenuLaunch = "Launch";
+ const string MenuTasks = "Tasks";
+ const string MenuMacros = "Macros";
+ const string MenuSystem = "System";
+ const string MenuWindows = "Windows";
+ const string MenuPower = "Power";
+ const string MenuAudio = "Audio";
+ const string MenuEject = "Eject";
+
+ // Menu UI Text
+ const string UITextMain = "Main Menu";
+ const string UITextLaunch = "Launch App";
+ const string UITextTasks = "Task Swap";
+ const string UITextMacros = "Macros";
+ const string UITextSystem = "System Commands";
+ const string UITextWindows = "Window Management";
+ const string UITextPower = "Power";
+ const string UITextAudio = "Audio";
+ const string UITextEject = "Eject";
+
+ // Menu descriptions
+ const string DescLaunch = "Launch an application";
+ const string DescTasks = "Switch between running programs";
+ const string DescMacros = "Run a macro";
+ const string DescSystem = "Perform a system command";
+ const string DescWindows = "Manage open windows";
+ const string DescPower = "Modify the computer's power state";
+ const string DescAudio = "Adjust the system volume";
+ const string DescEject = "Eject a disc";
+
+ // Tags
+ const string TagMenu = "Menu: ";
+ const string TagMacro = "Macro: ";
+ const string TagLaunch = "Launch: ";
+ const string TagCommand = "Command: ";
+ const string TagEject = "Eject: ";
+
+ // Commands
+ const string CommandShutdown = "Shutdown";
+ const string CommandReboot = "Reboot";
+ const string CommandLogOff = "LogOff";
+ const string CommandStandby = "Standby";
+ const string CommandHibernate = "Hibernate";
+
+ // Icon indexes
+ const int IconLaunch = 24;
+ const int IconTasks = 98;
+ const int IconMacros = 70;
+ const int IconDesktop = 34;
+ const int IconWindows = 15;
+ const int IconPower = 27;
+ const int IconAudio = 168;
+ const int IconEject = 188;
+
+ #endregion Constants
+
+ #region Variables
+
+ ImageList _listMain;
+
+ ListViewItem _launch;
+ ListViewItem _taskSwitch;
+ ListViewItem _macro;
+ ListViewItem _system;
+
+ List<string> _menuStack;
+
+ string _startMenu = "Main";
+
+ #endregion Variables
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="MenuForm"/> class.
+ /// </summary>
+ public MenuForm()
+ {
+ InitializeComponent();
+
+ CreateMainImageList();
+
+ _launch = new ListViewItem(UITextLaunch, 0);
+ _launch.ToolTipText = DescLaunch;
+ _launch.Tag = TagMenu + MenuLaunch;
+
+ _taskSwitch = new ListViewItem(UITextTasks, 1);
+ _taskSwitch.ToolTipText = DescTasks;
+ _taskSwitch.Tag = TagMenu + MenuTasks;
+
+ _macro = new ListViewItem(UITextMacros, 2);
+ _macro.ToolTipText = DescMacros;
+ _macro.Tag = TagMenu + MenuMacros;
+
+ _system = new ListViewItem(UITextSystem, 3);
+ _system.ToolTipText = DescSystem;
+ _system.Tag = TagMenu + MenuSystem;
+
+ _menuStack = new List<string>();
+ }
+
+ private void MenuForm_Shown(object sender, EventArgs e)
+ {
+ SwitchMenu(_startMenu);
+ _startMenu = MenuMain;
+
+ Win32.SetForegroundWindow(this.Handle, true);
+
+ //listViewMenu.Select();
+ }
+
+ private void MenuForm_Deactivate(object sender, EventArgs e)
+ {
+ this.Close();
+ }
+
+
+
+ void CreateMainImageList()
+ {
+ _listMain = new ImageList();
+ _listMain.ColorDepth = ColorDepth.Depth32Bit;
+ _listMain.ImageSize = new Size(32, 32);
+
+ Icon large;
+ Icon small;
+
+ string folder = Environment.GetFolderPath(Environment.SpecialFolder.System);
+ string file = folder + "\\shell32.dll";
+
+ Win32.ExtractIcons(file, IconLaunch, out large, out small);
+ _listMain.Images.Add(large);
+
+ Win32.ExtractIcons(file, IconTasks, out large, out small);
+ _listMain.Images.Add(large);
+
+ Win32.ExtractIcons(file, IconMacros, out large, out small);
+ _listMain.Images.Add(large);
+
+ _listMain.Images.Add(Properties.Resources.WinLogo);
+ }
+
+ void SetToIconStyle()
+ {
+ listViewMenu.View = View.LargeIcon;
+ listViewMenu.Alignment = ListViewAlignment.Left;
+ listViewMenu.Scrollable = true;
+
+ }
+ void SetToListStyle()
+ {
+ listViewMenu.View = View.Details;
+ listViewMenu.Alignment = ListViewAlignment.Top;
+ listViewMenu.Scrollable = true;
+
+ }
+
+ void SetWindowTitle(string subMenuName)
+ {
+ if (String.IsNullOrEmpty(subMenuName))
+ labelHeader.Text = WindowTitle;
+ else
+ labelHeader.Text = WindowTitle + " - " + subMenuName;
+ }
+
+
+ void LoadMenuMain()
+ {
+ SetWindowTitle(UITextMain);
+
+ listViewMenu.LargeImageList = _listMain;
+
+ //listViewMenu.SelectedItems.Clear();
+ listViewMenu.Items.Clear();
+
+ SetToIconStyle();
+
+ listViewMenu.Items.Add(_launch);
+ listViewMenu.Items.Add(_taskSwitch);
+ listViewMenu.Items.Add(_macro);
+ listViewMenu.Items.Add(_system);
+
+ _launch.Selected = true;
+ }
+
+ void LoadMenuLaunch()
+ {
+ SetWindowTitle(UITextLaunch);
+
+ //listViewMenu.SelectedItems.Clear();
+ listViewMenu.Items.Clear();
+
+ ImageList newList = new ImageList();
+ newList.ColorDepth = ColorDepth.Depth32Bit;
+ newList.ImageSize = new Size(32, 32);
+
+ listViewMenu.LargeImageList = newList;
+
+ SetToIconStyle();
+
+ int index = 0;
+ foreach (ProgramSettings program in Program.Config.Programs)
+ {
+ newList.Images.Add(Win32.GetIconFor(program.FileName));
+ ListViewItem item = new ListViewItem(program.Name, index++);
+ item.ToolTipText = program.FileName;
+ item.Tag = TagLaunch + program.FileName;
+
+ listViewMenu.Items.Add(item);
+ }
+
+ listViewMenu.Items[0].Selected = true;
+ }
+ void LoadMenuTasks()
+ {
+ SetWindowTitle(UITextTasks);
+
+ //listViewMenu.SelectedItems.Clear();
+ listViewMenu.Items.Clear();
+
+ ImageList newList = new ImageList();
+ newList.ColorDepth = ColorDepth.Depth32Bit;
+ newList.ImageSize = new Size(32, 32);
+
+ listViewMenu.LargeImageList = newList;
+
+ SetToIconStyle();
+
+ Icon large;
+ Icon small;
+
+ string folder = Environment.GetFolderPath(Environment.SpecialFolder.System);
+ string file = folder + "\\shell32.dll";
+
+ Win32.ExtractIcons(file, IconDesktop, out large, out small);
+ newList.Images.Add(large);
+
+ ListViewItem desktop = new ListViewItem("Desktop", 0);
+ desktop.ToolTipText = "Show the Desktop";
+ desktop.Tag = IntPtr.Zero;
+ d...
[truncated message content] |
|
From: <ts...@us...> - 2007-11-12 20:48:35
|
Revision: 1049
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1049&view=rev
Author: tsmotw
Date: 2007-11-12 12:48:32 -0800 (Mon, 12 Nov 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/skins/Xephyr/DialogAlbumInfo.xml
trunk/skins/Xephyr/dialogProgress.xml
trunk/skins/Xephyr/mymusicvideos.xml
Modified: trunk/skins/Xephyr/DialogAlbumInfo.xml
===================================================================
--- trunk/skins/Xephyr/DialogAlbumInfo.xml 2007-11-12 20:34:55 UTC (rev 1048)
+++ trunk/skins/Xephyr/DialogAlbumInfo.xml 2007-11-12 20:48:32 UTC (rev 1049)
@@ -3,20 +3,29 @@
<id>2001</id>
<defaultcontrol>5</defaultcontrol>
<allowoverlay>no</allowoverlay>
+ <define>#header.hover:hover_my music.png</define>
+ <define>#header.label:Music Info</define>
<controls>
+ <import>common.window.xml</import>
+ <import>common.time.xml</import>
<control>
<description>background image</description>
<type>image</type>
<id>1</id>
- <width>1366</width>
- <height>768</height>
- </control>
+ <posX>0</posX>
+ <posY>90</posY>
+ <texture>1glassback3.png</texture>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
+ </control>
<control>
<type>image</type>
<id>1</id>
- <posX>113</posX>
- <posY>26</posY>
- <texture>info_logo.png</texture>
+ <posX>1225</posX>
+ <posY>15</posY>
+ <width>40</width>
+ <height>40</height>
+ <texture>hover_album_info.png</texture>
<animation effect="fade" time="200">WindowOpen</animation>
<animation effect="fade" time="200">WindowClose</animation>
</control>
@@ -24,38 +33,26 @@
<description>Album value</description>
<type>label</type>
<id>20</id>
- <posX>417</posX>
- <posY>66</posY>
+ <posX>324</posX>
+ <posY>220</posY>
+ <width>270</width>
<label>-</label>
- <font>font16</font>
+ <font>font14</font>
<align>left</align>
- <textcolor>FFFFFFFF</textcolor>
+ <textcolor>white</textcolor>
<animation effect="fade" time="200">WindowOpen</animation>
<animation effect="fade" time="200">WindowClose</animation>
</control>
<control>
- <description>Artist</description>
- <type>label</type>
- <id>1</id>
- <posX>319</posX>
- <posY>133</posY>
- <label>171</label>
- <font>font13</font>
- <align>right</align>
- <textcolor>FFB2D4F5</textcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
- </control>
- <control>
<description>Date of Release</description>
<type>label</type>
<id>1</id>
- <posX>319</posX>
- <posY>160</posY>
+ <posX>324</posX>
+ <posY>250</posY>
<label>201</label>
<font>font13</font>
- <align>right</align>
- <textcolor>FFB2D4F5</textcolor>
+ <align>left</align>
+ <textcolor>black</textcolor>
<animation effect="fade" time="200">WindowOpen</animation>
<animation effect="fade" time="200">WindowClose</animation>
</control>
@@ -63,12 +60,12 @@
<description>Rating</description>
<type>label</type>
<id>1</id>
- <posX>319</posX>
- <posY>186</posY>
+ <posX>324</posX>
+ <posY>280</posY>
<label>173</label>
<font>font13</font>
- <align>right</align>
- <textcolor>FFB2D4F5</textcolor>
+ <align>left</align>
+ <textcolor>black</textcolor>
<animation effect="fade" time="200">WindowOpen</animation>
<animation effect="fade" time="200">WindowClose</animation>
</control>
@@ -76,12 +73,12 @@
<description>Genre</description>
<type>label</type>
<id>1</id>
- <posX>319</posX>
- <posY>213</posY>
+ <posX>324</posX>
+ <posY>310</posY>
<label>174</label>
<font>font13</font>
- <align>right</align>
- <textcolor>FFB2D4F5</textcolor>
+ <align>left</align>
+ <textcolor>black</textcolor>
<animation effect="fade" time="200">WindowOpen</animation>
<animation effect="fade" time="200">WindowClose</animation>
</control>
@@ -89,12 +86,12 @@
<description>Tones</description>
<type>label</type>
<id>1</id>
- <posX>319</posX>
- <posY>240</posY>
+ <posX>324</posX>
+ <posY>340</posY>
<label>175</label>
<font>font13</font>
- <align>right</align>
- <textcolor>FFB2D4F5</textcolor>
+ <align>left</align>
+ <textcolor>black</textcolor>
<animation effect="fade" time="200">WindowOpen</animation>
<animation effect="fade" time="200">WindowClose</animation>
</control>
@@ -102,12 +99,12 @@
<description>Styles</description>
<type>label</type>
<id>1</id>
- <posX>319</posX>
- <posY>266</posY>
+ <posX>324</posX>
+ <posY>370</posY>
<label>176</label>
<font>font13</font>
- <align>right</align>
- <textcolor>FFB2D4F5</textcolor>
+ <align>left</align>
+ <textcolor>black</textcolor>
<animation effect="fade" time="200">WindowOpen</animation>
<animation effect="fade" time="200">WindowClose</animation>
</control>
@@ -115,11 +112,12 @@
<description>Artist value</description>
<type>label</type>
<id>21</id>
- <posX>417</posX>
- <posY>133</posY>
+ <posX>324</posX>
+ <posY>190</posY>
+ <width>270</width>
<label>-</label>
- <font>font13</font>
- <textcolor>FFFFFFFF</textcolor>
+ <font>font14</font>
+ <textcolor>white</textcolor>
<animation effect="fade" time="200">WindowOpen</animation>
<animation effect="fade" time="200">WindowClose</animation>
</control>
@@ -127,8 +125,8 @@
<description>Date of Release value</description>
<type>label</type>
<id>22</id>
- <posX>417</posX>
- <posY>160</posY>
+ <posX>430</posX>
+ <posY>250</posY>
<label>-</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
@@ -139,8 +137,8 @@
<description>Rating value</description>
<type>label</type>
<id>23</id>
- <posX>417</posX>
- <posY>186</posY>
+ <posX>430</posX>
+ <posY>280</posY>
<label>-</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
@@ -151,8 +149,8 @@
<description>Genre value</description>
<type>label</type>
<id>24</id>
- <posX>417</posX>
- <posY>213</posY>
+ <posX>430</posX>
+ <posY>310</posY>
<label>-</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
@@ -163,9 +161,9 @@
<description>Tones value</description>
<type>fadelabel</type>
<id>25</id>
- <posX>417</posX>
- <posY>240</posY>
- <width>733</width>
+ <posX>430</posX>
+ <posY>340</posY>
+ <width>250</width>
<label>-</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
@@ -176,9 +174,9 @@
<description>Styles value</description>
<type>fadelabel</type>
<id>26</id>
- <posX>417</posX>
- <posY>266</posY>
- <width>733</width>
+ <posX>430</posX>
+ <posY>370</posY>
+ <width>250</width>
<label>-</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
@@ -189,60 +187,83 @@
<description>Album Art</description>
<type>image</type>
<id>3</id>
- <posX>189</posX>
- <posY>333</posY>
- <width>133</width>
- <height>133</height>
+ <posX>50</posX>
+ <posY>189</posY>
+ <width>250</width>
+ <height>250</height>
<texture>-</texture>
- <colorkey>FFFF00FF</colorkey>
- <colordiffuse>FFFFFFFF</colordiffuse>
<keepaspectratio>yes</keepaspectratio>
+ <centered>yes</centered>
<animation effect="fade" time="200">WindowOpen</animation>
<animation effect="fade" time="200">WindowClose</animation>
</control>
+ <control>
+ <type>image</type>
+ <description>cd case image</description>
+ <id>1</id>
+ <posX>26</posX>
+ <posY>186</posY>
+ <width>277</width>
+ <height>253</height>
+ <texture>1cdcase.png</texture>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
<control>
<description>textarea</description>
<type>textbox</type>
<id>4</id>
- <posY>316</posY>
- <width>796</width>
+ <posX>760</posX>
+ <posY>150</posY>
+ <width>480</width>
+ <height>428</height>
<onleft>5</onleft>
<onright>5</onright>
<onup>5</onup>
<ondown>5</ondown>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <textcolor>black</textcolor>
+ <animation effect="fade" time="100">WindowOpen</animation>
+ <animation effect="fade" time="100">WindowClose</animation>
</control>
- <control>
- <description>Tracks/Review</description>
- <type>button</type>
- <id>5</id>
- <posX>189</posX>
- <posY>506</posY>
- <width>132</width>
- <label>182</label>
- <onleft>4</onleft>
- <onright>4</onright>
- <onup>6</onup>
- <ondown>6</ondown>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
- </control>
- <control>
- <description>Refresh</description>
- <type>button</type>
- <id>6</id>
- <posX>189</posX>
- <posY>554</posY>
- <width>132</width>
- <label>184</label>
- <font>font13</font>
- <onleft>4</onleft>
- <onright>4</onright>
- <onup>5</onup>
- <ondown>5</ondown>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
- </control>
+ <control>
+ <description>Tracks/Review</description>
+ <type>button</type>
+ <id>5</id>
+ <label>182</label>
+ <animation effect="fade" time="250">WindowClose</animation>
+ <animation effect="fade" time="500">WindowOpen</animation>
+ <posY>120</posY>
+ <posX>10</posX>
+ <font>font14</font>
+ <textcolor>FF808080</textcolor>
+ <disabledcolor>FF808080</disabledcolor>
+ <width>190</width>
+ <onleft>6</onleft>
+ <onright>6</onright>
+ <onup>21</onup>
+ <ondown>4</ondown>
+ <textureFocus>-</textureFocus>
+ <textureNoFocus>-</textureNoFocus>
+ </control>
+ <control>
+ <description>Refresh</description>
+ <type>button</type>
+ <id>6</id>
+ <label>184</label>
+ <animation effect="fade" time="250">WindowClose</animation>
+ <animation effect="fade" time="500">WindowOpen</animation>
+ <posY>120</posY>
+ <posX>172</posX>
+ <font>font14</font>
+ <textcolor>ff808080</textcolor>
+ <disabledcolor>ff808080</disabledcolor>
+ <width>120</width>
+ <onleft>5</onleft>
+ <onright>5</onright>
+ <onup>21</onup>
+ <ondown>4</ondown>
+ <textureFocus>-</textureFocus>
+ <textureNoFocus>-</textureNoFocus>
+ </control>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Xephyr/dialogProgress.xml
===================================================================
--- trunk/skins/Xephyr/dialogProgress.xml 2007-11-12 20:34:55 UTC (rev 1048)
+++ trunk/skins/Xephyr/dialogProgress.xml 2007-11-12 20:48:32 UTC (rev 1049)
@@ -4,42 +4,40 @@
<defaultcontrol>10</defaultcontrol>
<allowoverlay>yes</allowoverlay>
<controls>
- <import>common.dialog.xml</import>
<control>
- <type>image</type>
- <id>100</id>
- <posX>428</posX>
- <posY>437</posY>
- <width>488</width>
- <texture>osd_progress_background.png</texture>
+ <description>dialog Heading</description>
+ <type>label</type>
+ <id>1</id>
+ <posX>70</posX>
+ <posY>690</posY>
+ <width>300</width>
+ <align>left</align>
+ <font>font10</font>
+ <label>-</label>
<animation effect="fade" time="200">WindowOpen</animation>
<animation effect="fade" time="200">WindowClose</animation>
</control>
<control>
- <description>progress control</description>
- <type>progress</type>
- <id>20</id>
- <posX>418</posX>
- <posY>436</posY>
- <width>509</width>
+ <description>dialog line 1</description>
+ <type>fadelabel</type>
+ <id>2</id>
+ <posX>1200</posX>
+ <posY>690</posY>
+ <align>right</align>
+ <font>font10</font>
+ <label>-</label>
+ <width>400</width>
<animation effect="fade" time="200">WindowOpen</animation>
<animation effect="fade" time="200">WindowClose</animation>
</control>
<control>
- <description>Cancel button</description>
- <type>button</type>
- <id>10</id>
- <posX>888</posX>
- <posY>296</posY>
- <width>46</width>
- <height>46</height>
- <textureFocus>1media-quit-focus.pn</textureFocus>
- <textureNoFocus>1media-quit-focus.png</textureNoFocus>
- <label>-</label>
- <onleft>10</onleft>
- <onright>10</onright>
- <onup>10</onup>
- <ondown>10</ondown>
+ <type>image</type>
+ <id>100</id>
+ <posX>15</posX>
+ <posY>672</posY>
+ <width>1244</width>
+ <height>49</height>
+ <texture flipY="true" diffuse="Thumb_Mask.png">popup.png</texture>
<animation effect="fade" time="200">WindowOpen</animation>
<animation effect="fade" time="200">WindowClose</animation>
</control>
Modified: trunk/skins/Xephyr/mymusicvideos.xml
===================================================================
--- trunk/skins/Xephyr/mymusicvideos.xml 2007-11-12 20:34:55 UTC (rev 1048)
+++ trunk/skins/Xephyr/mymusicvideos.xml 2007-11-12 20:48:32 UTC (rev 1049)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<window>
<id>4734</id>
<defaultcontrol>2</defaultcontrol>
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.
