Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[2475] trunk/plugins/MyLyrics
|
From: <sa...@us...> - 2008-12-28 11:55:50
|
Revision: 2475
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2475&view=rev
Author: saamand
Date: 2008-12-28 11:34:26 +0000 (Sun, 28 Dec 2008)
Log Message:
-----------
Noteworthy changes since version 1.10:
* Add: On the Lyrics database tab you can choose to see only LRCs in your Lyrics database.
* Fix: Horinzontal black lines caused by use of "\r\n" in Label controls is eliminated by using "\n" instead.
Modified Paths:
--------------
trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs
trunk/plugins/MyLyrics/My Lyrics/MediaPortalUtil.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/LyricsLibrary.Designer.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/LyricsLibrary.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs
trunk/plugins/MyLyrics/Skin/Blue3wide/myLyrics.xml
Modified: trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs 2008-12-27 17:02:43 UTC (rev 2474)
+++ trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs 2008-12-28 11:34:26 UTC (rev 2475)
@@ -26,7 +26,7 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.1")]
+[assembly: AssemblyVersion("1.20")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
Modified: trunk/plugins/MyLyrics/My Lyrics/MediaPortalUtil.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MediaPortalUtil.cs 2008-12-27 17:02:43 UTC (rev 2474)
+++ trunk/plugins/MyLyrics/My Lyrics/MediaPortalUtil.cs 2008-12-28 11:34:26 UTC (rev 2475)
@@ -38,5 +38,25 @@
}
return artist;
}
+
+ public static string MakePlainLyricPerfectToShow(string text)
+ {
+ return text.Replace("\r\n", "\n");
+ }
+
+ public static string MakeLRCLinePerfectToShow(string text)
+ {
+ //string temp = lyric.Replace("\r\n", " ");
+ //if (temp.Equals(string.Empty))
+ //{
+ // return "-";
+ //}
+ //else
+ //{
+ // return temp;
+ //}
+
+ return text.Replace("\r\n", string.Empty);
+ }
}
}
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs 2008-12-27 17:02:43 UTC (rev 2474)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs 2008-12-28 11:34:26 UTC (rev 2475)
@@ -80,7 +80,7 @@
this.lbInfo1.Name = "lbInfo1";
this.lbInfo1.Size = new System.Drawing.Size(223, 18);
this.lbInfo1.TabIndex = 3;
- this.lbInfo1.Text = "MyLyrics plugin, version 1.10";
+ this.lbInfo1.Text = "MyLyrics plugin, version 1.20";
//
// label2
//
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/LyricsLibrary.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/LyricsLibrary.Designer.cs 2008-12-27 17:02:43 UTC (rev 2474)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/LyricsLibrary.Designer.cs 2008-12-28 11:34:26 UTC (rev 2475)
@@ -42,23 +42,23 @@
this.mpButton6 = new MediaPortal.UserInterface.Controls.MPButton();
this.mpButton7 = new MediaPortal.UserInterface.Controls.MPButton();
this.gbEditLyrics = new MediaPortal.UserInterface.Controls.MPGroupBox();
+ this.btSave = new MediaPortal.UserInterface.Controls.MPButton();
this.btSearchSingle = new MediaPortal.UserInterface.Controls.MPButton();
- this.btSave = new MediaPortal.UserInterface.Controls.MPButton();
this.lbTitle = new MediaPortal.UserInterface.Controls.MPLabel();
this.lbArtists = new MediaPortal.UserInterface.Controls.MPLabel();
this.gbAddRemove = new MediaPortal.UserInterface.Controls.MPGroupBox();
+ this.btDelete = new System.Windows.Forms.Button();
+ this.btSwitch = new MediaPortal.UserInterface.Controls.MPButton();
this.btAdd = new System.Windows.Forms.Button();
- this.btSwitch = new MediaPortal.UserInterface.Controls.MPButton();
- this.btDelete = new System.Windows.Forms.Button();
this.gbImport = new MediaPortal.UserInterface.Controls.MPGroupBox();
+ this.btImportFiles = new MediaPortal.UserInterface.Controls.MPButton();
this.btImportDirs = new MediaPortal.UserInterface.Controls.MPButton();
- this.btImportFiles = new MediaPortal.UserInterface.Controls.MPButton();
this.lbArtists2 = new MediaPortal.UserInterface.Controls.MPLabel();
this.treeView = new System.Windows.Forms.TreeView();
this.comboDatabase = new MediaPortal.UserInterface.Controls.MPComboBox();
this.gbExport = new MediaPortal.UserInterface.Controls.MPGroupBox();
+ this.btExportTags = new MediaPortal.UserInterface.Controls.MPButton();
this.btImportTags = new MediaPortal.UserInterface.Controls.MPButton();
- this.btExportTags = new MediaPortal.UserInterface.Controls.MPButton();
this.lbSongs = new MediaPortal.UserInterface.Controls.MPLabel();
this.tbLyrics = new System.Windows.Forms.TextBox();
this.lbSongs2 = new MediaPortal.UserInterface.Controls.MPLabel();
@@ -89,7 +89,7 @@
this.gbResetDatabase.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.gbResetDatabase.Location = new System.Drawing.Point(5, 427);
this.gbResetDatabase.Name = "gbResetDatabase";
- this.gbResetDatabase.Size = new System.Drawing.Size(538, 49);
+ this.gbResetDatabase.Size = new System.Drawing.Size(538, 48);
this.gbResetDatabase.TabIndex = 11;
this.gbResetDatabase.TabStop = false;
this.gbResetDatabase.Text = "Reset database";
@@ -98,7 +98,7 @@
//
this.btResetMarkedLyricsDatabase.Location = new System.Drawing.Point(457, 18);
this.btResetMarkedLyricsDatabase.Name = "btResetMarkedLyricsDatabase";
- this.btResetMarkedLyricsDatabase.Size = new System.Drawing.Size(75, 23);
+ this.btResetMarkedLyricsDatabase.Size = new System.Drawing.Size(75, 21);
this.btResetMarkedLyricsDatabase.TabIndex = 11;
this.btResetMarkedLyricsDatabase.Text = "MarkedDB";
this.btResetMarkedLyricsDatabase.UseVisualStyleBackColor = true;
@@ -108,7 +108,7 @@
//
this.btResetLyricsDatabase.Location = new System.Drawing.Point(376, 18);
this.btResetLyricsDatabase.Name = "btResetLyricsDatabase";
- this.btResetLyricsDatabase.Size = new System.Drawing.Size(75, 23);
+ this.btResetLyricsDatabase.Size = new System.Drawing.Size(75, 21);
this.btResetLyricsDatabase.TabIndex = 10;
this.btResetLyricsDatabase.Text = "LyricsDB";
this.btResetLyricsDatabase.UseVisualStyleBackColor = true;
@@ -225,6 +225,7 @@
//
// treeView1
//
+ this.treeView1.LineColor = System.Drawing.Color.Empty;
this.treeView1.Location = new System.Drawing.Point(9, 84);
this.treeView1.Name = "treeView1";
this.treeView1.Size = new System.Drawing.Size(235, 213);
@@ -348,33 +349,33 @@
this.gbEditLyrics.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.gbEditLyrics.Location = new System.Drawing.Point(250, 290);
this.gbEditLyrics.Name = "gbEditLyrics";
- this.gbEditLyrics.Size = new System.Drawing.Size(293, 52);
+ this.gbEditLyrics.Size = new System.Drawing.Size(293, 48);
this.gbEditLyrics.TabIndex = 32;
this.gbEditLyrics.TabStop = false;
this.gbEditLyrics.Text = "Edit / find lyrics";
//
+ // btSave
+ //
+ this.btSave.Enabled = false;
+ this.btSave.Location = new System.Drawing.Point(4, 19);
+ this.btSave.Name = "btSave";
+ this.btSave.Size = new System.Drawing.Size(68, 21);
+ this.btSave.TabIndex = 7;
+ this.btSave.Text = "&Save";
+ this.btSave.UseVisualStyleBackColor = true;
+ this.btSave.Click += new System.EventHandler(this.btSave_Click);
+ //
// btSearchSingle
//
this.btSearchSingle.Enabled = false;
this.btSearchSingle.Location = new System.Drawing.Point(77, 19);
this.btSearchSingle.Name = "btSearchSingle";
- this.btSearchSingle.Size = new System.Drawing.Size(68, 23);
+ this.btSearchSingle.Size = new System.Drawing.Size(68, 21);
this.btSearchSingle.TabIndex = 31;
this.btSearchSingle.Text = "&Find lyric";
this.btSearchSingle.UseVisualStyleBackColor = true;
this.btSearchSingle.Click += new System.EventHandler(this.btSearchSingle_Click);
//
- // btSave
- //
- this.btSave.Enabled = false;
- this.btSave.Location = new System.Drawing.Point(4, 19);
- this.btSave.Name = "btSave";
- this.btSave.Size = new System.Drawing.Size(68, 23);
- this.btSave.TabIndex = 7;
- this.btSave.Text = "&Save";
- this.btSave.UseVisualStyleBackColor = true;
- this.btSave.Click += new System.EventHandler(this.btSave_Click);
- //
// lbTitle
//
this.lbTitle.AutoSize = true;
@@ -402,73 +403,73 @@
this.gbAddRemove.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.gbAddRemove.Location = new System.Drawing.Point(5, 290);
this.gbAddRemove.Name = "gbAddRemove";
- this.gbAddRemove.Size = new System.Drawing.Size(238, 52);
+ this.gbAddRemove.Size = new System.Drawing.Size(238, 48);
this.gbAddRemove.TabIndex = 30;
this.gbAddRemove.TabStop = false;
this.gbAddRemove.Text = "Add / remove / move lyrics";
//
- // btAdd
+ // btDelete
//
- this.btAdd.Location = new System.Drawing.Point(6, 19);
- this.btAdd.Name = "btAdd";
- this.btAdd.Size = new System.Drawing.Size(65, 23);
- this.btAdd.TabIndex = 2;
- this.btAdd.Text = "&Add";
- this.btAdd.UseVisualStyleBackColor = true;
- this.btAdd.Click += new System.EventHandler(this.btAdd_Click);
+ this.btDelete.Location = new System.Drawing.Point(77, 19);
+ this.btDelete.Name = "btDelete";
+ this.btDelete.Size = new System.Drawing.Size(65, 21);
+ this.btDelete.TabIndex = 3;
+ this.btDelete.Text = "&Delete";
+ this.btDelete.UseVisualStyleBackColor = true;
+ this.btDelete.Click += new System.EventHandler(this.btDelete_Click);
//
// btSwitch
//
this.btSwitch.Location = new System.Drawing.Point(148, 19);
this.btSwitch.Name = "btSwitch";
- this.btSwitch.Size = new System.Drawing.Size(65, 23);
+ this.btSwitch.Size = new System.Drawing.Size(65, 21);
this.btSwitch.TabIndex = 29;
this.btSwitch.Text = "&Move";
this.btSwitch.UseVisualStyleBackColor = true;
this.btSwitch.Click += new System.EventHandler(this.btSwitch_Click);
//
- // btDelete
+ // btAdd
//
- this.btDelete.Location = new System.Drawing.Point(77, 19);
- this.btDelete.Name = "btDelete";
- this.btDelete.Size = new System.Drawing.Size(65, 23);
- this.btDelete.TabIndex = 3;
- this.btDelete.Text = "&Delete";
- this.btDelete.UseVisualStyleBackColor = true;
- this.btDelete.Click += new System.EventHandler(this.btDelete_Click);
+ this.btAdd.Location = new System.Drawing.Point(6, 19);
+ this.btAdd.Name = "btAdd";
+ this.btAdd.Size = new System.Drawing.Size(65, 21);
+ this.btAdd.TabIndex = 2;
+ this.btAdd.Text = "&Add";
+ this.btAdd.UseVisualStyleBackColor = true;
+ this.btAdd.Click += new System.EventHandler(this.btAdd_Click);
//
// gbImport
//
this.gbImport.Controls.Add(this.btImportFiles);
this.gbImport.Controls.Add(this.btImportDirs);
this.gbImport.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.gbImport.Location = new System.Drawing.Point(5, 348);
+ this.gbImport.Location = new System.Drawing.Point(5, 343);
this.gbImport.Name = "gbImport";
- this.gbImport.Size = new System.Drawing.Size(238, 52);
+ this.gbImport.Size = new System.Drawing.Size(238, 48);
this.gbImport.TabIndex = 33;
this.gbImport.TabStop = false;
this.gbImport.Text = "Import lyrics from files";
//
+ // btImportFiles
+ //
+ this.btImportFiles.Location = new System.Drawing.Point(6, 19);
+ this.btImportFiles.Name = "btImportFiles";
+ this.btImportFiles.Size = new System.Drawing.Size(65, 21);
+ this.btImportFiles.TabIndex = 4;
+ this.btImportFiles.Text = "&Import files";
+ this.btImportFiles.UseVisualStyleBackColor = true;
+ this.btImportFiles.Click += new System.EventHandler(this.btImportSingle_Click);
+ //
// btImportDirs
//
this.btImportDirs.Location = new System.Drawing.Point(77, 19);
this.btImportDirs.Name = "btImportDirs";
- this.btImportDirs.Size = new System.Drawing.Size(65, 23);
+ this.btImportDirs.Size = new System.Drawing.Size(65, 21);
this.btImportDirs.TabIndex = 5;
this.btImportDirs.Text = "Import &dirs";
this.btImportDirs.UseVisualStyleBackColor = true;
this.btImportDirs.Click += new System.EventHandler(this.btImportDIRS_Click);
//
- // btImportFiles
- //
- this.btImportFiles.Location = new System.Drawing.Point(6, 19);
- this.btImportFiles.Name = "btImportFiles";
- this.btImportFiles.Size = new System.Drawing.Size(65, 23);
- this.btImportFiles.TabIndex = 4;
- this.btImportFiles.Text = "&Import files";
- this.btImportFiles.UseVisualStyleBackColor = true;
- this.btImportFiles.Click += new System.EventHandler(this.btImportSingle_Click);
- //
// lbArtists2
//
this.lbArtists2.Location = new System.Drawing.Point(76, 40);
@@ -492,10 +493,11 @@
this.comboDatabase.FormattingEnabled = true;
this.comboDatabase.Items.AddRange(new object[] {
"Lyrics database",
+ "Lyrics database (LRC only)",
"Marked database"});
this.comboDatabase.Location = new System.Drawing.Point(79, 8);
this.comboDatabase.Name = "comboDatabase";
- this.comboDatabase.Size = new System.Drawing.Size(144, 21);
+ this.comboDatabase.Size = new System.Drawing.Size(164, 21);
this.comboDatabase.TabIndex = 1;
this.comboDatabase.SelectedIndexChanged += new System.EventHandler(this.comboDatabase_SelectedIndexChanged);
//
@@ -504,33 +506,33 @@
this.gbExport.Controls.Add(this.btExportTags);
this.gbExport.Controls.Add(this.btImportTags);
this.gbExport.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.gbExport.Location = new System.Drawing.Point(250, 348);
+ this.gbExport.Location = new System.Drawing.Point(250, 343);
this.gbExport.Name = "gbExport";
- this.gbExport.Size = new System.Drawing.Size(293, 52);
+ this.gbExport.Size = new System.Drawing.Size(293, 48);
this.gbExport.TabIndex = 34;
this.gbExport.TabStop = false;
this.gbExport.Text = "Import / Export lyrics from music tags";
//
+ // btExportTags
+ //
+ this.btExportTags.Location = new System.Drawing.Point(77, 19);
+ this.btExportTags.Name = "btExportTags";
+ this.btExportTags.Size = new System.Drawing.Size(68, 21);
+ this.btExportTags.TabIndex = 6;
+ this.btExportTags.Text = "Export";
+ this.btExportTags.UseVisualStyleBackColor = true;
+ this.btExportTags.Click += new System.EventHandler(this.btExportTags_Click);
+ //
// btImportTags
//
this.btImportTags.Location = new System.Drawing.Point(4, 19);
this.btImportTags.Name = "btImportTags";
- this.btImportTags.Size = new System.Drawing.Size(68, 23);
+ this.btImportTags.Size = new System.Drawing.Size(68, 21);
this.btImportTags.TabIndex = 6;
this.btImportTags.Text = "Import";
this.btImportTags.UseVisualStyleBackColor = true;
this.btImportTags.Click += new System.EventHandler(this.btImportTags_Click);
//
- // btExportTags
- //
- this.btExportTags.Location = new System.Drawing.Point(77, 19);
- this.btExportTags.Name = "btExportTags";
- this.btExportTags.Size = new System.Drawing.Size(68, 23);
- this.btExportTags.TabIndex = 6;
- this.btExportTags.Text = "Export";
- this.btExportTags.UseVisualStyleBackColor = true;
- this.btExportTags.Click += new System.EventHandler(this.btExportTags_Click);
- //
// lbSongs
//
this.lbSongs.Location = new System.Drawing.Point(5, 55);
@@ -573,7 +575,7 @@
//
// btRefresh
//
- this.btRefresh.Location = new System.Drawing.Point(235, 8);
+ this.btRefresh.Location = new System.Drawing.Point(250, 8);
this.btRefresh.Name = "btRefresh";
this.btRefresh.Size = new System.Drawing.Size(55, 21);
this.btRefresh.TabIndex = 36;
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/LyricsLibrary.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/LyricsLibrary.cs 2008-12-27 17:02:43 UTC (rev 2474)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/LyricsLibrary.cs 2008-12-28 11:34:26 UTC (rev 2475)
@@ -42,19 +42,23 @@
const int SHIFT_WHEN_HIT = 15;
internal static LyricsDatabase CurrentDB;
private int currentDBIndex = 0;
- enum TYPEOFLYRICS : int {NONE, NORMAL, LRC};
+ enum TYPEOFLYRICS : int { NONE, NORMAL, LRC };
+ bool m_OnlyShowLRCs = false;
+
public LyricsLibrary(Form form)
{
this.parent = form as MyLyricsSetup;
InitializeComponent();
comboDatabase.SelectedIndex = 0;
- updateLyricsTree();
+ updateLyricsTree(false);
}
- internal void updateLyricsTree()
+ internal void updateLyricsTree(bool onlyShowLRCs)
{
+ m_OnlyShowLRCs = onlyShowLRCs;
+
if (CurrentDB == null)
{
return;
@@ -66,10 +70,23 @@
m_NoOfArtists = 0;
m_NoOfTitles = 0;
- foreach (KeyValuePair<string, LyricsItem> kvp in CurrentDB)
+ if (onlyShowLRCs)
{
- AddSong(kvp.Value);
+ foreach (KeyValuePair<string, LyricsItem> kvp in CurrentDB)
+ {
+ if (isSelectedLyricLRC(kvp.Value.Artist, kvp.Value.Title))
+ {
+ AddSong(kvp.Value);
+ }
+ }
}
+ else
+ {
+ foreach (KeyValuePair<string, LyricsItem> kvp in CurrentDB)
+ {
+ AddSong(kvp.Value);
+ }
+ }
}
catch {;}
finally
@@ -124,7 +141,7 @@
treeView.Nodes.Add(artist, artist);
++m_NoOfArtists;
}
-
+
// add title, if it doesn't exists
int artistIndex = treeView.Nodes.IndexOfKey(artist);
if (!treeView.Nodes[artistIndex].Nodes.ContainsKey(title))
@@ -212,31 +229,23 @@
}
}
- private bool isSelectedLyricALRC()
+ private bool isSelectedLyricLRC(string artist, string title)
{
- if (treeView.SelectedNode != null && treeView.SelectedNode.Parent != null)
+ if (artist.Length != 0 && title.Length != 0)
{
- string artist = treeView.SelectedNode.Parent.Text;
- string title = treeView.SelectedNode.Text;
+ string lyricsText = (string)CurrentDB[DatabaseUtil.CorrectKeyFormat(artist, title)].Lyrics;
- if (artist.Length != 0 && title.Length != 0)
+ SimpleLRC lrc = new SimpleLRC(artist, title, lyricsText);
+ if (lrc.IsValid)
{
- m_CurrentArtist = artist;
- m_CurrentTitle = LyricUtil.CapatalizeString(title);
-
- string lyricsText = (string)CurrentDB[DatabaseUtil.CorrectKeyFormat(artist, title)].Lyrics;
-
- SimpleLRC lrc = new SimpleLRC(artist, title, lyricsText);
- if (lrc.IsValid)
- {
- return true;
- }
- else
- {
- return false;
- }
+ return true;
}
+ else
+ {
+ return false;
+ }
}
+
return false;
}
@@ -249,7 +258,7 @@
lbLRCTest.Text = "";
tbLyrics.Enabled = false;
-
+
// Selected a title
if (treeView.SelectedNode != null && treeView.SelectedNode.Parent != null)
{
@@ -394,14 +403,22 @@
private void treeView_AfterSelect(object sender, TreeViewEventArgs e)
{
updateInfo();
- if (isSelectedLyricALRC())
+
+ if (treeView.SelectedNode != null && treeView.SelectedNode.Parent != null)
{
- lbLRCTest.Text = "(valid LRC)";
+ string title = treeView.SelectedNode.Text;
+ m_CurrentArtist = treeView.SelectedNode.Parent.Text;
+ m_CurrentTitle = LyricUtil.CapatalizeString(title);
+
+ if (isSelectedLyricLRC(m_CurrentArtist, title))
+ {
+ lbLRCTest.Text = "(valid LRC)";
+ }
+ else
+ {
+ lbLRCTest.Text = "";
+ }
}
- else
- {
- lbLRCTest.Text = "";
- }
}
private void btAdd_Click(object sender, EventArgs e)
@@ -528,7 +545,7 @@
otherDatabase[key] = item;
}
}
- updateLyricsTree();
+ updateLyricsTree(false);
DatabaseUtil.SerializeDBs();
}
else
@@ -582,7 +599,7 @@
{
MessageBox.Show("The title is already in the database");
}
-
+
}
else
{
@@ -672,7 +689,7 @@
{
if (MessageBox.Show(this, "Are you sure the lyrics database should be upgraded?", "Upgrade lyrics database", MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.Yes)
{
- updateLyricsTree();
+ updateLyricsTree(false);
}
}
@@ -748,23 +765,36 @@
private void comboDatabase_SelectedIndexChanged(object sender, EventArgs e)
{
- if (comboDatabase.SelectedIndex == 0 && currentDBIndex != 0)
+ if (comboDatabase.SelectedIndex == 0 && (currentDBIndex != 0 || m_OnlyShowLRCs))
{
resetFields();
currentDBIndex = 0;
CurrentDB = MyLyricsSettings.LyricsDB;
btImportFiles.Enabled = true;
btImportDirs.Enabled = true;
- updateLyricsTree();
+ updateLyricsTree(false);
}
- else if (comboDatabase.SelectedIndex == 1 && currentDBIndex != 1)
+ else if (comboDatabase.SelectedIndex == 1)
{
resetFields();
+ currentDBIndex = 0;
+ CurrentDB = MyLyricsSettings.LyricsDB;
+ btImportFiles.Enabled = true;
+ btImportDirs.Enabled = true;
+ btImportTags.Enabled = false;
+ btExportTags.Enabled = false;
+ updateLyricsTree(true);
+ }
+ else if (comboDatabase.SelectedIndex == 2 && currentDBIndex != 1)
+ {
+ resetFields();
currentDBIndex = 1;
CurrentDB = MyLyricsSettings.LyricsMarkedDB;
btImportFiles.Enabled = false;
btImportDirs.Enabled = false;
- updateLyricsTree();
+ btImportTags.Enabled = false;
+ btExportTags.Enabled = false;
+ updateLyricsTree(false);
}
}
@@ -781,7 +811,7 @@
CurrentDB = MyLyricsSettings.LyricsDB;
comboDatabase.SelectedIndex = 0;
- updateLyricsTree();
+ updateLyricsTree(false);
updateInfo();
}
}
@@ -799,8 +829,8 @@
fs.Close();
CurrentDB = MyLyricsSettings.LyricsMarkedDB;
- comboDatabase.SelectedIndex = 1;
- updateLyricsTree();
+ comboDatabase.SelectedIndex = 2;
+ updateLyricsTree(false);
updateInfo();
}
}
@@ -849,7 +879,7 @@
{
ImportTags importTags = new ImportTags();
importTags.ShowDialog();
- updateLyricsTree();
+ updateLyricsTree(false);
}
private void btExportTags_Click(object sender, EventArgs e)
@@ -860,7 +890,7 @@
private void btRefresh_Click(object sender, EventArgs e)
{
- updateLyricsTree();
+ updateLyricsTree(m_OnlyShowLRCs);
}
}
}
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs 2008-12-27 17:02:43 UTC (rev 2474)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs 2008-12-28 11:34:26 UTC (rev 2475)
@@ -304,7 +304,7 @@
LyricsLibrary.CurrentDB = MyLyricsSettings.LyricsDB;
#endregion
- lyricsLibraryUC.updateLyricsTree();
+ lyricsLibraryUC.updateLyricsTree(false);
}
@@ -543,7 +543,7 @@
{
lc.StopSearches = true;
DatabaseUtil.SerializeDBs();
- lyricsLibraryUC.updateLyricsTree();
+ lyricsLibraryUC.updateLyricsTree(false);
}
bgWorkerSearch.CancelAsync();
StopThread();
@@ -952,7 +952,7 @@
{
if (UpdateLibraryUI)
{
- lyricsLibraryUC.updateLyricsTree();
+ lyricsLibraryUC.updateLyricsTree(false);
UpdateLibraryUI = false;
}
lyricsLibraryUC.treeView.Select();
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2008-12-27 17:02:43 UTC (rev 2474)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2008-12-28 11:34:26 UTC (rev 2475)
@@ -306,14 +306,14 @@
if (lrc.IsValid)
{
alreadyValidLRC = true;
- lines = new string[1] { "This track already has a valid LRC!" };
+ lines = new string[1] { "This song already has a valid LRC lyric." };
GUIControl.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_LINE + 0, lines[0]);
GUIControl.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_EDIT_LINE_DONE + 0, lines[0]);
}
else
{
- lines = m_LyricText.Split(new string[1] { "\n" }, StringSplitOptions.None);
+ lines = m_LyricText.Split(new string[1] { "\r\n" }, StringSplitOptions.None);
try
{
@@ -717,8 +717,8 @@
{
for (int i = tagRoundFinished * TAG_IN_ROUND; i < (tagRoundFinished + 1) * TAG_IN_ROUND; i++)
{
- GUIControl.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_VIEW_LINE + i, lines[i]);
- GUIControl.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_VIEW_LINE_DONE + i, lines[i]);
+ ShowLrcLine((int)GUI_LRC_Controls.CONTROL_VIEW_LINE + i, lines[i]);
+ ShowLrcLine((int)GUI_LRC_Controls.CONTROL_VIEW_LINE_DONE + i, lines[i]);
}
}
catch { ;}
@@ -892,9 +892,9 @@
{
for (int i = 0; i < TAG_IN_ROUND; i++)
{
- GUIControl.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_VIEW_LINE + i, lines[tagRoundFinished * TAG_IN_ROUND + i]);
+ ShowLrcLine((int)GUI_LRC_Controls.CONTROL_VIEW_LINE + i, lines[tagRoundFinished * TAG_IN_ROUND + i]);
GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_VIEW_LINE_DONE + i);
- GUIControl.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_VIEW_LINE_DONE + i, lines[tagRoundFinished * TAG_IN_ROUND + i]);
+ ShowLrcLine((int)GUI_LRC_Controls.CONTROL_VIEW_LINE_DONE + i, lines[tagRoundFinished * TAG_IN_ROUND + i]);
}
}
catch { ;};
@@ -908,7 +908,13 @@
}
}
+ private void ShowLrcLine(int controlID, string text)
+ {
+ text = MediaPortalUtil.MakeLRCLinePerfectToShow(text);
+ GUIControl.SetControlLabel(GetID, controlID, text);
+ }
+
private void ShowLyricOnScreen(string lyricText, string source)
{
LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Information, 0, LyricDiagnostics.ElapsedTimeString() + "Lyric found: " + m_artist + " - " + m_title + ". Place: " + source);
@@ -925,6 +931,8 @@
}
else
{
+ m_LyricText = MediaPortalUtil.MakePlainLyricPerfectToShow(m_LyricText);
+
if (basicScreenSelected.HasValue == false || basicScreenSelected.Value)
{
resetGUI((int)MyLyricsSettings.Screen.LYRICS_BASIC);
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2008-12-27 17:02:43 UTC (rev 2474)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2008-12-28 11:34:26 UTC (rev 2475)
@@ -5,7 +5,7 @@
<ProductVersion>9.0.21022</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>
Modified: trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs 2008-12-27 17:02:43 UTC (rev 2474)
+++ trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs 2008-12-28 11:34:26 UTC (rev 2475)
@@ -31,5 +31,5 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.1")]
-[assembly: AssemblyFileVersion("1.1")]
+[assembly: AssemblyVersion("1.20")]
+[assembly: AssemblyFileVersion("1.20")]
Modified: trunk/plugins/MyLyrics/Skin/Blue3wide/myLyrics.xml
===================================================================
--- trunk/plugins/MyLyrics/Skin/Blue3wide/myLyrics.xml 2008-12-27 17:02:43 UTC (rev 2474)
+++ trunk/plugins/MyLyrics/Skin/Blue3wide/myLyrics.xml 2008-12-28 11:34:26 UTC (rev 2475)
@@ -3,32 +3,61 @@
<id>90478</id>
<defaultcontrol>20</defaultcontrol>
<allowoverlay>no</allowoverlay>
+ <define>#header.label:5</define>
+ <define>#header.image:music_logo.png</define>
+ <define>#header.hover:hover_music.png</define>
+ <!-- cheat a little, we don't use two of the items in the imported file to blank their labels -->
+ <define>#itemcount:-</define>
+ <define>#selecteditem:-</define>
<controls>
+ <import>common.window.xml</import>
<control>
- <type>image</type>
- <description>background image</description>
- <id>0</id>
- <texture>background.png</texture>
+ <type>label</type>
+ <description>Screen Title</description>
+ <id>2</id>
+ <posX>225</posX>
+ <posY>75</posY>
+ <label>Titel</label>
+ <font>font12</font>
+ <textcolor>ffffffff</textcolor>
</control>
<control>
<type>textbox</type>
<description>The Lyric area</description>
+ <id>20</id>
+ <posX>110</posX>
+ <posY>125</posY>
+ <width>760</width>
+ <height>490</height>
+ <onleft>2</onleft>
+ <onright>2</onright>
+ <onup>2</onup>
+ <ondown>2</ondown>
+ <image>icon-folder.png</image>
+ <seperator>----------------------------------------------------------------------------------------------</seperator>
+ <text>6</text>
+ <font>font13</font>
+ <spinPosX>775</spinPosX>
+ <spinPosY>545</spinPosY>
+ </control>
+ <control>
+ <type>textbox</type>
+ <description>The Lyric area wide</description>
<id>21</id>
<posX>110</posX>
- <posY>120</posY>
+ <posY>125</posY>
<width>1160</width>
- <height>480</height>
+ <height>490</height>
<onleft>2</onleft>
<onright>2</onright>
<onup>2</onup>
<ondown>2</ondown>
<image>icon-folder.png</image>
- <label>-</label>
<seperator>----------------------------------------------------------------------------------------------</seperator>
<text>6</text>
- <font>font14</font>
- <SpinPosX>48</SpinPosX>
- <SpinPosY>442</SpinPosY>
+ <font>font13</font>
+ <spinPosX>1150</spinPosX>
+ <spinPosY>545</spinPosY>
</control>
<control>
<type>label</type>
@@ -44,19 +73,19 @@
<type>image</type>
<description>menu background image</description>
<id>34</id>
- <posX>58</posX>
- <posY>566</posY>
- <width>1250</width>
- <height>189</height>
- <!--<texture>osd_bg.png</texture>
- <animation effect="fade" time="150">WindowOpen</animation>-->
+ <posX>30</posX>
+ <posY>570</posY>
+ <width>1225</width>
+ <height>160</height>
+ <texture>osd_bg.png</texture>
+ <animation effect="fade" time="150">WindowOpen</animation>
</control>
<control>
<type>fadelabel</type>
<description>track label</description>
<id>33</id>
- <posX>262</posX>
- <posY>682</posY>
+ <posX>170</posX>
+ <posY>670</posY>
<width>600</width>
<height>28</height>
<label>#Play.Current.Track</label>
@@ -67,8 +96,8 @@
<type>fadelabel</type>
<description>track label</description>
<id>32</id>
- <posX>262</posX>
- <posY>646</posY>
+ <posX>170</posX>
+ <posY>634</posY>
<width>600</width>
<height>26</height>
<label>#Play.Current.Artist</label>
@@ -79,35 +108,16 @@
<type>fadelabel</type>
<description>track label</description>
<id>30</id>
- <posX>262</posX>
- <posY>602</posY>
+ <posX>170</posX>
+ <posY>590</posY>
<width>600</width>
<height>26</height>
<label>#Play.Current.Title</label>
<font>font18</font>
<animation effect="fade" time="150">WindowOpen</animation>
</control>
- <control>
- <type>textbox</type>
- <description>The Lyric area</description>
- <id>20</id>
- <posX>110</posX>
- <posY>120</posY>
- <width>760</width>
- <height>480</height>
- <onleft>2</onleft>
- <onright>2</onright>
- <onup>2</onup>
- <ondown>2</ondown>
- <image>icon-folder.png</image>
- <label>-</label>
- <seperator>----------------------------------------------------------------------------------------------</seperator>
- <text>6</text>
- <font>font14</font>
- <SpinPosX>48</SpinPosX>
- <SpinPosY>442</SpinPosY>
- </control>
- <control>
+
+ <!--<control>
<type>image</type>
<description>title image</description>
<id>35</id>
@@ -115,7 +125,7 @@
<posY>26</posY>
<texture flipY="true" diffuse="Thumb_Mask.png">music_logo.png</texture>
<animation effect="fade" time="150">WindowOpen</animation>
- </control>
+ </control>-->
<control>
<type>image</type>
<description>nowplaying background</description>
@@ -149,7 +159,6 @@
<label>#Play.Current.Year</label>
<font>font13</font>
<align>right</align>
- <!-- <textcolor>white</textcolor> -->
</control>
<control>
<type>label</type>
@@ -161,7 +170,6 @@
<label>#Play.Current.Album</label>
<font>font13</font>
<align>left</align>
- <!-- <textcolor>white</textcolor> -->
<animation effect="fade" time="150">WindowOpen</animation>
</control>
<control>
@@ -208,8 +216,8 @@
<type>label</type>
<description>up next label</description>
<id>20</id>
- <posX>1239</posX>
- <posY>609</posY>
+ <posX>1189</posX>
+ <posY>597</posY>
<label>4541</label>
<font>font14</font>
<align>right</align>
@@ -219,8 +227,8 @@
<type>fadelabel</type>
<description>next track label</description>
<id>121</id>
- <posX>1237</posX>
- <posY>684</posY>
+ <posX>1187</posX>
+ <posY>674</posY>
<width>300</width>
<label>#Play.Next.Title</label>
<align>right</align>
@@ -230,8 +238,8 @@
<type>fadelabel</type>
<description>next artist label</description>
<id>123</id>
- <posX>1235</posX>
- <posY>652</posY>
+ <posX>1185</posX>
+ <posY>640</posY>
<width>300</width>
<label>#Play.Next.Artist</label>
<align>right</align>
@@ -246,7 +254,7 @@
<posY>120</posY>
<colordiffuse>80ffffff</colordiffuse>
<label>line 0</label>
- <font>font14</font>
+
<textcolor>80ffffff</textcolor>
<disabledcolor>ffffffff</disabledcolor>
</control>
@@ -258,7 +266,7 @@
<posX>112</posX>
<posY>120</posY>
<label>line 0</label>
- <font>font14</font>
+
<textcolor>ffffffff</textcolor>
<disabledcolor>ffffffff</disabledcolor>
</control>
@@ -270,7 +278,7 @@
<posX>112</posX>
<posY>152</posY>
<label>line 1</label>
- <font>font14</font>
+
<textcolor>80ffffff</textcolor>
</control>
<control>
@@ -281,7 +289,7 @@
<posX>112</posX>
<posY>152</posY>
<label>line 1</label>
- <font>font14</font>
+
<textcolor>ffffffff</textcolor>
</control>
<control>
@@ -292,7 +300,7 @@
<posX>112</posX>
<posY>184</posY>
<label>line 2</label>
- <font>font14</font>
+
<textcolor>80ffffff</textcolor>
</control>
<control>
@@ -303,7 +311,7 @@
<posX>112</posX>
<posY>184</posY>
<label>line 2</label>
- <font>font14</font>
+
<textcolor>ffffffff</textcolor>
</control>
<control>
@@ -314,7 +322,7 @@
<posX>112</posX>
<posY>216</posY>
<label>line 3</label>
- <font>font14</font>
+
<textcolor>80ffffff</textcolor>
</control>
<control>
@@ -325,7 +333,7 @@
<posX>112</posX>
<posY>216</posY>
<label>line 3</label>
- <font>font14</font>
+
<textcolor>ffffffff</textcolor>
</control>
<control>
@@ -336,7 +344,7 @@
<posX>112</posX>
<posY>248</posY>
<label>line 4</label>
- <font>font14</font>
+
<textcolor>80ffffff</textcolor>
</control>
<control>
@@ -347,7 +355,7 @@
<posX>112</posX>
<posY>248</posY>
<label>line 4</label>
- <font>font14</font>
+
<textcolor>ffffffff</textcolor>
</control>
<control>
@@ -358,7 +366,7 @@
<posX>112</posX>
<posY>280</posY>
<label>line 5</label>
- <font>font14</font>
+
<textcolor>80ffffff</textcolor>
</control>
<control>
@@ -369,7 +377,7 @@
<posX>112</posX>
<posY>280</posY>
<label>line 5</label>
- <font>font14</font>
+
<textcolor>ffffffff</textcolor>
</control>
<control>
@@ -380,7 +388,7 @@
<posX>112</posX>
<posY>312</posY>
<label>line 6</label>
- <font>font14</font>
+
<textcolor>80ffffff</textcolor>
</control>
<control>
@@ -391,7 +399,7 @@
<posX>112</posX>
<posY>312</posY>
<label>line 6</label>
- <font>font14</font>
+
<textcolor>ffffffff</textcolor>
</control>
<control>
@@ -402,7 +410,7 @@
<posX>112</posX>
<posY>344</posY>
<label>line 7</label>
- <font>font14</font>
+
<textcolor>80ffffff</textcolor>
</control>
<control>
@@ -413,7 +421,7 @@
<posX>112</posX>
<posY>344</posY>
<label>line 7</label>
- <font>font14</font>
+
<textcolor>ffffffff</textcolor>
</control>
<control>
@@ -424,7 +432,7 @@
<posX>112</posX>
<posY>376</posY>
<label>line 8</label>
- <font>font14</font>
+
<textcolor>80ffffff</textcolor>
</control>
<control>
@@ -435,7 +443,7 @@
<posX>112</posX>
<posY>376</posY>
<label>line 8</label>
- <font>font14</font>
+
<textcolor>ffffffff</textcolor>
</control>
<control>
@@ -446,7 +454,7 @@
<posX>112</posX>
<posY>408</posY>
<label>line 9</label>
- <font>font14</font>
+
<textcolor>80ffffff</textcolor>
</control>
<control>
@@ -457,7 +465,7 @@
<posX>112</posX>
<posY>408</posY>
<label>line 9</label>
- <font>font14</font>
+
<textcolor>ffffffff</textcolor>
</control>
<control>
@@ -468,7 +476,7 @@
<posX>112</posX>
<posY>440</posY>
<label>line 10</label>
- <font>font14</font>
+
<textcolor>80ffffff</textcolor>
</control>
<control>
@@ -479,7 +487,7 @@
<posX>112</posX>
<posY>440</posY>
<label>line 10</label>
- <font>font14</font>
+
<textcolor>ffffffff</textcolor>
</control>
<control>
@@ -490,7 +498,7 @@
<posX>112</posX>
<posY>472</posY>
<label>line 11</label>
- <font>font14</font>
+
<textcolor>80ffffff</textcolor>
</control>
<control>
@@ -501,7 +509,7 @@
<posX>112</posX>
<posY>472</posY>
<label>line 11</label>
- <font>font14</font>
+
<textcolor>ffffffff</textcolor>
</control>
<control>
@@ -512,7 +520,7 @@
<posX>112</posX>
<posY>504</posY>
<label>line 12</label>
- <font>font14</font>
+
<textcolor>80ffffff</textcolor>
</control>
<control>
@@ -523,7 +531,7 @@
<posX>112</posX>
<posY>504</posY>
<label>line 12</label>
- <font>font14</font>
+
<textcolor>ffffffff</textcolor>
</control>
@@ -537,7 +545,7 @@
<posY>120</posY>
<colordiffuse>80ffffff</colordiffuse>
<label>line 0</label>
- <font>font14</font>
+
<textcolor>80ffffff</textcolor>
<disabledcolor>ffffffff</disabledcolor>
</control>
@@ -549,7 +557,7 @@
<posX>112</posX>
<posY>120</posY>
<label>line 0</label>
- <font>font14</font>
+
<textcolor>ffffffff</textcolor>
<disabledcolor>ffffffff</disabledcolor>
</control>
@@ -561,7 +569,7 @@
<posX>112</posX>
<posY>152</posY>
<label>line 1</label>
- <font>font14</font>
+
<textcolor>80ffffff</textcolor>
</control>
<control>
@@ -572,7 +580,7 @@
<posX>112</posX>
<posY>152</posY>
<label>line 1</label>
- <font>font14</font>
+
<textcolor>ffffffff</textcolor>
</control>
<control>
@@ -583,7 +591,7 @@
<posX>112</posX>
<posY>184</posY>
<label>line 2</label>
- <font>font14</font>
+
<textcolor>80ffffff</textcolor>
</control>
<control>
@@ -594,7 +602,7 @@
<posX>112</posX>
<posY>184</posY>
<label>line 2</label>
- <font>font14</font>
+
<textcolor>ffffffff</textcolor>
</control>
<control>
@@ -605,7 +613,7 @@
<posX>112</posX>
<posY>216</posY>
<label>line 3</label>
- <font>font14</font>
+
<textcolor>80ffffff</textcolor>
</control>
<control>
@@ -616,7 +624,7 @@
<posX>112</posX>
<posY>216</posY>
<label>line 3</label>
- <font>font14</font>
+
<textcolor>ffffffff</textcolor>
</control>
<control>
@@ -627,7 +635,7 @@
<posX>112</posX>
<posY>248</posY>
<label>line 4</label>
- <font>font14</font>
+
<textcolor>80ffffff</textcolor>
</control>
<control>
@@ -638,7 +646,7 @@
<posX>112</posX>
<posY>248</posY>
<label>line 4</label>
- <font>font14</font>
+
<textcolor>ffffffff</textcolor>
</control>
<control>
@@ -649,7 +657,7 @@
<posX>112</posX>
<posY>280</posY>
<label>line 5</label>
- <font>font14</font>
+
<textcolor>80ffffff</textcolor>
</control>
<control>
@@ -660,7 +668,7 @@
<posX>112</posX>
<posY>280</posY>
<label>line 5</label>
- <font>font14</font>
+
<textcolor>ffffffff</textcolor>
</control>
<control>
@@ -671,7 +679,7 @@
<posX>112</posX>
<posY>312</posY>
<label>line 6</label>
- <font>font14</font>
+
<textcolor>80ffffff</textcolor>
</control>
<control>
@@ -682,7 +690,7 @@
<posX>112</posX>
<posY>312</posY>
<label>line 6</label>
- <font>font14</font>
+
<textcolor>ffffffff</textcolor>
</control>
<control>
@@ -693,7 +701,7 @@
<posX>112</posX>
<posY>344</posY>
<label>line 7</label>
- <font>font14</font>
+
<textcolor>80ffffff</textcolor>
</control>
<control>
@@ -704,7 +712,7 @@
<posX>112</posX>
<posY>344</posY>
<label>line 7</label>
- <font>font14</font>
+
<textcolor>ffffffff</textcolor>
</control>
<control>
@@ -715,7 +723,7 @@
<posX>112</posX>
<posY>376</posY>
<label>line 8</label>
- <font>font14</font>
+
<textcolor>80ffffff</textcolor>
</control>
<control>
@@ -726,7 +734,7 @@
<posX>112</posX>
<posY>376</posY>
<label>line 8</label>
- <font>font14</font>
+
<textcolor>ffffffff</textcolor>
</control>
<control>
@@ -737,7 +745,7 @@
<posX>112</posX>
<posY>408</posY>
<label>line 9</label>
- <font>font14</font>
+
<textcolor>80ffffff</textcolor>
</control>
<control>
@@ -748,7 +756,7 @@
<posX>112</posX>
<posY>408</posY>
<label>line 9</label>
- <font>font14</font>
+
<textcolor>ffffffff</textcolor>
</control>
<control>
@@ -759,7 +767,7 @@
<posX>112</posX>
<posY>440</posY>
<label>line 10</label>
- <font>font14</font>
+
<textcolor>80ffffff</textcolor>
</control>
<control>
@@ -770,7 +778,7 @@
<posX>112</posX>
<posY>440</posY>
<label>line 10</label>
- <font>font14</font>
+
<textcolor>ffffffff</textcolor>
</control>
<control>
@@ -781,7 +789,7 @@
<posX>112</posX>
<posY>472</posY>
<label>line 11</label>
- <font>font14</font>
+
<textcolor>80ffffff</textcolor>
</control>
<control>
@@ -792,7 +800,7 @@
<posX>112</posX>
<posY>472</posY>
<label>line 11</label>
- <font>font14</font>
+
<textcolor>ffffffff</textcolor>
</control>
<control>
@@ -803,7 +811,7 @@
<posX>112</posX>
<posY>504</posY>
<label>line 12</label>
- <font>font14</font>
+
<textcolor>80ffffff</textcolor>
</control>
<control>
@@ -814,7 +822,7 @@
<posX>112</posX>
<posY>504</posY>
<label>line 12</label>
- <font>font14</font>
+
<textcolor>ffffffff</textcolor>
</control>
@@ -962,5 +970,683 @@
<font>font10</font>
<textcolor>80ffffff</textcolor>
</control>
+
+
</controls>
-</window>
\ No newline at end of file
+</window>
+
+
+
+ <!--<control>
+ <type>image</type>
+ <description>Playing_back</description>
+ <id>0</id>
+ <texture>Playing_back1.png</texture>
+ </control>
+ <control>
+ <description>music logo</description>
+ <type>image</type>
+ <id>600</id>
+ <posX>948</posX>
+ <posY>110</posY>
+ <width>350</width>
+ <height>350</height>
+ <keepaspectratio>yes</keepaspectratio>
+ <centered>yes</centered>
+ <texture>#Play.Current.Thumb</texture>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <description>Playing_back</description>
+ <id>0</id>
+ <texture>Playing_front1.png</texture>
+ </control>
+ <control>
+ <type>image</type>
+ <description>menu background image</description>
+ <id>0</id>
+ <posX>55</posX>
+ <posY>531</posY>
+ <width>1191</width>
+ <height>177</height>
+ <texture>-</texture>
+ <animation effect="fade" time="150">WindowOpen</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <description>background hover image</description>
+ <id>0</id>
+ <posX>71</posX>
+ <posY>553</posY>
+ <width>160</width>
+ <height>157</height>
+ <texture>-</texture>
+ <animation effect="fade" time="150">WindowOpen</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <description>title image</description>
+ <id>0</id>
+ <posX>106</posX>
+ <posY>25</posY>
+ <texture>music_logo.png</texture>
+ <animation effect="fade" time="150">WindowOpen</animation>
+ </control>
+
+ <control>
+ <type>image</type>
+ <description>nowplaying background</description>
+ <id>0</id>
+ <posX>564</posX>
+ <posY>73</posY>
+ <width>468</width>
+ <height>407</height>
+ <texture>CDcover.png</texture>
+ <animation effect="fade" time="150">WindowOpen</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <description>album art image</description>
+ <id>112</id>
+ <posX>633</posX>
+ <posY>89</posY>
+ <width>365</width>
+ <height>367</height>
+ <texture>-</texture>
+ <keepaspectratio>yes</keepaspectratio>
+ <centered>yes</centered>
+ <zoom>yes</zoom>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <description>nowplaying shine</description>
+ <id>0</id>
+ <posX>566</posX>
+ <posY>73</posY>
+ <width>468</width>
+ <height>407</height>
+ <texture>CDcover_shine.png</texture>
+ <animation effect="fade" time="150">WindowOpen</animation>
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <description>Title label</description>
+ <id>0</id>
+ <posX>79</posX>
+ <posY>430</posY>
+ <width>468</width>
+ <height>25</height>
+ <label>#Play.Current.Title</label>
+ <font>font18</font>
+ <textcolor>80000000</textcolor>
+ <animation effect="fade" time="150">WindowOpen</animation>
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <description>Title label</description>
+ <id>0</id>
+ <posX>76</posX>
+ <posY>427</posY>
+ <width>468</width>
+ <height>25</height>
+ <label>#Play.Current.Title</label>
+ <font>font18</font>
+ <animation effect="fade" time="150">WindowOpen</animation>
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <description>Artist label</description>
+ <id>0</id>
+ <posX>79</posX>
+ <posY>358</posY>
+ <width>468</width>
+ <height>25</height>
+ <label>#Play.Current.Artist</label>
+ <font>font16</font>
+ <textcolor>80000000</textcolor>
+ <animation effect="fade" time="150">WindowOpen</animation>
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <description>Artist label</description>
+ <id>0</id>
+ <posX>76</posX>
+ <posY>355</posY>
+ <width>468</width>
+ <height>25</height>
+ <label>#Play.Current.Artist</label>
+ <font>font16</font>
+ <animation effect="fade" time="150">WindowOpen</animation>
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <description>track label</description>
+ <id>0</id>
+ <posX>79</posX>
+ <posY>394</posY>
+ <width>468</width>
+ <height>25</height>
+ <label>#Play.Current.Track</label>
+ <font>font16</font>
+ <textcolor>80000000</textcolor>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <description>track label</description>
+ <id>0</id>
+ <posX>76</posX>
+ <posY>391</posY>
+ <width>468</width>
+ <height>25</height>
+ <label>#Play.Current.Track</label>
+ <font>font16</font>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <description>year label</description>
+ <id>0</id>
+ <posX>1004</posX>
+ <posY>57</posY>
+ <width>160</width>
+ <label>#Play.Current.Year</label>
+ <font>font10</font>
+ <align>right</align>
+ <textcolor>80000000</textcolor>
+ <animation effect="fade" time="150">WindowOpen</animation>
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <description>year label</description>
+ <id>0</id>
+ <posX>1002</posX>
+ <posY>55</posY>
+ <width>160</width>
+ <label>#Play.Current.Year</label>
+ <font>font10</font>
+ <align>right</align>
+ <textcolor>white</textcolor>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <description>album label</description>
+ <id>0</id>
+ <posX>584</posX>
+ <posY>52</posY>
+ <width>320</width>
+ <label>#Play.Current.Album</label>
+ <font>font13</font>
+ <align>left</align>
+ <textcolor>80000000</textcolor>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <description>album label</description>
+ <id>0</id>
+ <posX>581</posX>
+ <posY>50</posY>
+ <width>320</width>
+ <label>#Play.Current.Album</label>
+ <font>font13</font>
+ <align>left</align>
+ <textcolor>white</textcolor>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ </control>
+ <control>
+ <description>Progress background</description>
+ <type>image</type>
+ <id>117</id>
+ <posX>636</posX>
+ <posY>486</posY>
+ <width>336</width>
+ <height>30</height>
+ <visible>player.hasmedia</visible>
+ <texture>osd_progress_background.png</texture>
+ <animation effect="fade" time="150">WindowOpen</animation>
+ </control>
+ <control>
+ <type>progress</type>
+ <description>track progress</description>
+ <id>118</id>
+ <posX>631</posX>
+ <posY>490</posY>
+ <width>350</width>
+ <visible>player.hasmedia</visible>
+ </control>
+ <control>
+ <type>label</type>
+ <description>track progress label</description>
+ <id>0</id>
+ <posX>563</posX>
+ <posY>486</posY>
+ <label>#currentplaytime</label>
+ <font>font14</font>
+ <align>left</align>
+ <textcolor>80ffffff</textcolor>
+ <visible>player.hasmedia</visible>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ </control>
+ <control>
+ <type>label</type>
+ <description>track duration label</description>
+ <id>0</id>
+ <posX>1045</posX>
+ <posY>486</posY>
+ <label>#duration</label>
+ <font>font14</font>
+ ...
[truncated message content] |
