Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[2730] trunk/plugins/MyLyrics
|
From: <sa...@us...> - 2009-03-19 19:06:59
|
Revision: 2730
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2730&view=rev
Author: saamand
Date: 2009-03-19 19:06:55 +0000 (Thu, 19 Mar 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs
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 Configuration/MyLyricsSetup.resx
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyricsSettings.cs
trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs
Added Paths:
-----------
trunk/plugins/MyLyrics/UpgradeLog.XML
trunk/plugins/MyLyrics/_UpgradeReport_Files/
trunk/plugins/MyLyrics/temp/
Modified: trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs 2009-03-18 21:09:21 UTC (rev 2729)
+++ trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs 2009-03-19 19:06:55 UTC (rev 2730)
@@ -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.20")]
+[assembly: AssemblyVersion("1.22")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs 2009-03-18 21:09:21 UTC (rev 2729)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs 2009-03-19 19:06:55 UTC (rev 2730)
@@ -80,7 +80,7 @@
this.lbInfo1.Name = "lbInfo1";
this.lbInfo1.Size = new System.Drawing.Size(197, 18);
this.lbInfo1.TabIndex = 3;
- this.lbInfo1.Text = "MyLyrics plugin, version 1.20";
+ this.lbInfo1.Text = "MyLyrics plugin, version 1.22";
//
// label2
//
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs 2009-03-18 21:09:21 UTC (rev 2729)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs 2009-03-19 19:06:55 UTC (rev 2730)
@@ -74,6 +74,11 @@
this.lbLyricsFound2 = new MediaPortal.UserInterface.Controls.MPLabel();
this.lbLyricsFound = new MediaPortal.UserInterface.Controls.MPLabel();
this.tabPageSetup = new MediaPortal.UserInterface.Controls.MPTabPage();
+ this.gbGUI = new MediaPortal.UserInterface.Controls.MPGroupBox();
+ this.tbLyricsLimit = new MediaPortal.UserInterface.Controls.MPTextBox();
+ this.cbAutoChangeToLineLimit = new MediaPortal.UserInterface.Controls.MPCheckBox();
+ this.lblyricLengthLimit = new MediaPortal.UserInterface.Controls.MPLabel();
+ this.cbUseAutoScrollAsDefault = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.gbTag = new MediaPortal.UserInterface.Controls.MPGroupBox();
this.cbMusicTagAlwaysCheck = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.cbMusicTagWrite = new MediaPortal.UserInterface.Controls.MPCheckBox();
@@ -116,6 +121,7 @@
this.gbProgress.SuspendLayout();
this.gbMusicDBSearchStats.SuspendLayout();
this.tabPageSetup.SuspendLayout();
+ this.gbGUI.SuspendLayout();
this.gbTag.SuspendLayout();
this.mpGroupBox3.SuspendLayout();
this.mpGroupBox2.SuspendLayout();
@@ -597,6 +603,7 @@
//
// tabPageSetup
//
+ this.tabPageSetup.Controls.Add(this.gbGUI);
this.tabPageSetup.Controls.Add(this.gbTag);
this.tabPageSetup.Controls.Add(this.mpGroupBox3);
this.tabPageSetup.Controls.Add(this.mpGroupBox2);
@@ -609,14 +616,79 @@
this.tabPageSetup.Text = "Settings";
this.tabPageSetup.UseVisualStyleBackColor = true;
//
+ // gbGUI
+ //
+ this.gbGUI.Controls.Add(this.tbLyricsLimit);
+ this.gbGUI.Controls.Add(this.cbAutoChangeToLineLimit);
+ this.gbGUI.Controls.Add(this.lblyricLengthLimit);
+ this.gbGUI.Controls.Add(this.cbUseAutoScrollAsDefault);
+ this.gbGUI.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.gbGUI.Location = new System.Drawing.Point(5, 235);
+ this.gbGUI.Name = "gbGUI";
+ this.gbGUI.Size = new System.Drawing.Size(538, 83);
+ this.gbGUI.TabIndex = 33;
+ this.gbGUI.TabStop = false;
+ this.gbGUI.Text = "Gui settings";
+ //
+ // tbLyricsLimit
+ //
+ this.tbLyricsLimit.BorderColor = System.Drawing.Color.Empty;
+ this.tbLyricsLimit.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbLyricsLimit.Location = new System.Drawing.Point(141, 61);
+ this.tbLyricsLimit.MaximumSize = new System.Drawing.Size(24, 14);
+ this.tbLyricsLimit.MaxLength = 30;
+ this.tbLyricsLimit.MinimumSize = new System.Drawing.Size(24, 14);
+ this.tbLyricsLimit.Name = "tbLyricsLimit";
+ this.tbLyricsLimit.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
+ this.tbLyricsLimit.Size = new System.Drawing.Size(24, 14);
+ this.tbLyricsLimit.TabIndex = 15;
+ this.tbLyricsLimit.Text = "45";
+ this.tbLyricsLimit.Leave += new System.EventHandler(this.WriteMediaPortalXML);
+ //
+ // cbAutoChangeToLineLimit
+ //
+ this.cbAutoChangeToLineLimit.AutoSize = true;
+ this.cbAutoChangeToLineLimit.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.cbAutoChangeToLineLimit.Location = new System.Drawing.Point(16, 42);
+ this.cbAutoChangeToLineLimit.Name = "cbAutoChangeToLineLimit";
+ this.cbAutoChangeToLineLimit.Size = new System.Drawing.Size(443, 17);
+ this.cbAutoChangeToLineLimit.TabIndex = 7;
+ this.cbAutoChangeToLineLimit.Text = "Automatic change from LRC basic to LRC wide mode when lyric line length limit is " +
+ "passed";
+ this.cbAutoChangeToLineLimit.UseVisualStyleBackColor = true;
+ this.cbAutoChangeToLineLimit.Leave += new System.EventHandler(this.WriteMediaPortalXML);
+ this.cbAutoChangeToLineLimit.CheckedChanged += new System.EventHandler(this.cbGuiLayout_CheckedChanged);
+ //
+ // lblyricLengthLimit
+ //
+ this.lblyricLengthLimit.AutoSize = true;
+ this.lblyricLengthLimit.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lblyricLengthLimit.Location = new System.Drawing.Point(38, 62);
+ this.lblyricLengthLimit.Name = "lblyricLengthLimit";
+ this.lblyricLengthLimit.Size = new System.Drawing.Size(103, 13);
+ this.lblyricLengthLimit.TabIndex = 16;
+ this.lblyricLengthLimit.Text = "Lyric line length limit:";
+ //
+ // cbUseAutoScrollAsDefault
+ //
+ this.cbUseAutoScrollAsDefault.AutoSize = true;
+ this.cbUseAutoScrollAsDefault.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.cbUseAutoScrollAsDefault.Location = new System.Drawing.Point(16, 19);
+ this.cbUseAutoScrollAsDefault.Name = "cbUseAutoScrollAsDefault";
+ this.cbUseAutoScrollAsDefault.Size = new System.Drawing.Size(169, 17);
+ this.cbUseAutoScrollAsDefault.TabIndex = 6;
+ this.cbUseAutoScrollAsDefault.Text = "Use autoscroll mode as default";
+ this.cbUseAutoScrollAsDefault.UseVisualStyleBackColor = true;
+ this.cbUseAutoScrollAsDefault.Leave += new System.EventHandler(this.WriteMediaPortalXML);
+ //
// gbTag
//
this.gbTag.Controls.Add(this.cbMusicTagAlwaysCheck);
this.gbTag.Controls.Add(this.cbMusicTagWrite);
this.gbTag.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.gbTag.Location = new System.Drawing.Point(4, 265);
+ this.gbTag.Location = new System.Drawing.Point(5, 324);
this.gbTag.Name = "gbTag";
- this.gbTag.Size = new System.Drawing.Size(538, 66);
+ this.gbTag.Size = new System.Drawing.Size(538, 52);
this.gbTag.TabIndex = 31;
this.gbTag.TabStop = false;
this.gbTag.Text = "Music tags";
@@ -627,9 +699,9 @@
this.cbMusicTagAlwaysCheck.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.cbMusicTagAlwaysCheck.Location = new System.Drawing.Point(17, 20);
this.cbMusicTagAlwaysCheck.Name = "cbMusicTagAlwaysCheck";
- this.cbMusicTagAlwaysCheck.Size = new System.Drawing.Size(278, 17);
+ this.cbMusicTagAlwaysCheck.Size = new System.Drawing.Size(216, 17);
this.cbMusicTagAlwaysCheck.TabIndex = 7;
- this.cbMusicTagAlwaysCheck.Text = "Always check music tag for lyrics before online search";
+ this.cbMusicTagAlwaysCheck.Text = "Always use lyric in music tag (if available)";
this.cbMusicTagAlwaysCheck.UseVisualStyleBackColor = true;
this.cbMusicTagAlwaysCheck.Leave += new System.EventHandler(this.WriteMediaPortalXML);
//
@@ -637,7 +709,7 @@
//
this.cbMusicTagWrite.AutoSize = true;
this.cbMusicTagWrite.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbMusicTagWrite.Location = new System.Drawing.Point(17, 43);
+ this.cbMusicTagWrite.Location = new System.Drawing.Point(274, 20);
this.cbMusicTagWrite.Name = "cbMusicTagWrite";
this.cbMusicTagWrite.Size = new System.Drawing.Size(203, 17);
this.cbMusicTagWrite.TabIndex = 6;
@@ -651,7 +723,7 @@
this.mpGroupBox3.Controls.Add(this.cbMoveSongFrom);
this.mpGroupBox3.Controls.Add(this.cbAutoFetch);
this.mpGroupBox3.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.mpGroupBox3.Location = new System.Drawing.Point(5, 337);
+ this.mpGroupBox3.Location = new System.Drawing.Point(5, 382);
this.mpGroupBox3.Name = "mpGroupBox3";
this.mpGroupBox3.Size = new System.Drawing.Size(538, 92);
this.mpGroupBox3.TabIndex = 30;
@@ -739,7 +811,7 @@
this.gbLyricSites.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.gbLyricSites.Location = new System.Drawing.Point(5, 70);
this.gbLyricSites.Name = "gbLyricSites";
- this.gbLyricSites.Size = new System.Drawing.Size(538, 189);
+ this.gbLyricSites.Size = new System.Drawing.Size(538, 159);
this.gbLyricSites.TabIndex = 28;
this.gbLyricSites.TabStop = false;
this.gbLyricSites.Text = "Lyrics sites settings";
@@ -753,7 +825,7 @@
this.groupBox2.Controls.Add(this.cbLyricsOnDemand);
this.groupBox2.Controls.Add(this.cbHotLyrics);
this.groupBox2.Controls.Add(this.cbSeekLyrics);
- this.groupBox2.Location = new System.Drawing.Point(229, 72);
+ this.groupBox2.Location = new System.Drawing.Point(229, 48);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(301, 100);
this.groupBox2.TabIndex = 28;
@@ -863,7 +935,7 @@
this.groupBox1.Controls.Add(this.mpLabel2);
this.groupBox1.Controls.Add(this.trackBar);
this.groupBox1.Controls.Add(this.lbSpeed);
- this.groupBox1.Location = new System.Drawing.Point(6, 72);
+ this.groupBox1.Location = new System.Drawing.Point(6, 48);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(217, 100);
this.groupBox1.TabIndex = 27;
@@ -919,7 +991,7 @@
// rbUserDefined
//
this.rbUserDefined.AutoSize = true;
- this.rbUserDefined.Location = new System.Drawing.Point(16, 46);
+ this.rbUserDefined.Location = new System.Drawing.Point(150, 23);
this.rbUserDefined.Name = "rbUserDefined";
this.rbUserDefined.Size = new System.Drawing.Size(107, 17);
this.rbUserDefined.TabIndex = 22;
@@ -1036,6 +1108,8 @@
this.gbProgress.ResumeLayout(false);
this.gbMusicDBSearchStats.ResumeLayout(false);
this.tabPageSetup.ResumeLayout(false);
+ this.gbGUI.ResumeLayout(false);
+ this.gbGUI.PerformLayout();
this.gbTag.ResumeLayout(false);
this.gbTag.PerformLayout();
this.mpGroupBox3.ResumeLayout(false);
@@ -1139,5 +1213,10 @@
internal MediaPortal.UserInterface.Controls.MPCheckBox cbMusicTagAlwaysCheck;
private MediaPortal.UserInterface.Controls.MPCheckBox cbDisregardSongWithLyricInTag;
internal MediaPortal.UserInterface.Controls.MPCheckBox cbLyrDB;
+ private MediaPortal.UserInterface.Controls.MPGroupBox gbGUI;
+ private MediaPortal.UserInterface.Controls.MPTextBox tbLyricsLimit;
+ internal MediaPortal.UserInterface.Controls.MPCheckBox cbAutoChangeToLineLimit;
+ private MediaPortal.UserInterface.Controls.MPLabel lblyricLengthLimit;
+ internal MediaPortal.UserInterface.Controls.MPCheckBox cbUseAutoScrollAsDefault;
}
}
\ No newline at end of file
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs 2009-03-18 21:09:21 UTC (rev 2729)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs 2009-03-19 19:06:55 UTC (rev 2730)
@@ -258,6 +258,10 @@
m_automaticReadFromToMusicTag = xmlreader.GetValue("myLyrics", "automaticReadFromMusicTag").Equals("yes");
cbMusicTagAlwaysCheck.Checked = m_automaticReadFromToMusicTag;
+ cbUseAutoScrollAsDefault.Checked = xmlreader.GetValue("myLyrics", "useAutoscroll").Equals("yes");
+ cbAutoChangeToLineLimit.Checked = xmlreader.GetValue("myLyrics", "useAutoOnLyricLength").Equals("yes");
+ tbLyricsLimit.Text = xmlreader.GetValueAsString("myLyrics", "AutoLyricLength", "45");
+
lbSongsLimitNote.Text = ("(You have currently " + m_TotalTitles.ToString() + " titles in your music database)");
trackBar.Value = ((int)xmlreader.GetValueAsInt("myLyrics", "defaultSitesModeValue", 2));
@@ -266,6 +270,8 @@
m_find = xmlreader.GetValueAsString("myLyrics", "find", "");
m_replace = xmlreader.GetValueAsString("myLyrics", "replace", "");
+ tbLyricsLimit.Enabled = cbAutoChangeToLineLimit.Checked;
+
if (m_find != "")
{
@@ -1110,6 +1116,9 @@
xmlwriter.SetValue("myLyrics", "useLyricsOnDemand", cbLyricsOnDemand.Checked.ToString());
xmlwriter.SetValue("myLyrics", "useSeekLyrics", cbSeekLyrics.Checked.ToString());
xmlwriter.SetValue("myLyrics", "useHotLyrics", cbHotLyrics.Checked.ToString());
+ xmlwriter.SetValueAsBool("myLyrics", "useAutoscroll", cbUseAutoScrollAsDefault.Checked);
+ xmlwriter.SetValueAsBool("myLyrics", "useAutoOnLyricLength", cbAutoChangeToLineLimit.Checked);
+ xmlwriter.SetValue("myLyrics", "AutoLyricLength", tbLyricsLimit.Text);
xmlwriter.SetValueAsBool("myLyrics", "automaticFetch", cbAutoFetch.Checked);
xmlwriter.SetValueAsBool("myLyrics", "automaticUpdateWhenFirstFound", cbAutomaticUpdate.Checked);
xmlwriter.SetValueAsBool("myLyrics", "moveLyricFromMarkedDatabase", cbMoveSongFrom.Checked);
@@ -1152,5 +1161,18 @@
}
}
+
+
+ private void cbGuiLayout_CheckedChanged(object sender, EventArgs e)
+ {
+ if (cbAutoChangeToLineLimit.Checked)
+ {
+ tbLyricsLimit.Enabled = true;
+ }
+ else
+ {
+ tbLyricsLimit.Enabled = false;
+ }
+ }
}
}
\ No newline at end of file
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.resx
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.resx 2009-03-18 21:09:21 UTC (rev 2729)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.resx 2009-03-19 19:06:55 UTC (rev 2730)
@@ -123,6 +123,12 @@
<metadata name="Replace.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
+ <metadata name="Find.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="Replace.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
<metadata name="bgWorkerSearch.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>6, 4</value>
</metadata>
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2009-03-18 21:09:21 UTC (rev 2729)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2009-03-19 19:06:55 UTC (rev 2730)
@@ -41,6 +41,8 @@
private Nullable<bool> basicScreenSelected = null;
string lyricsScreenXML = "MyLyrics.xml";
+ int startingScrollSpeedVertical;
+
string skin = "";
bool exitingMyLyrics = false;
@@ -101,6 +103,10 @@
internal const string LyricsDBName = "LyricsDatabaseV2.db";
internal const string LyricsMarkedDBName = "LyricsMarkedDatabaseV2.db";
internal string logName = "MyLyrics.log";
+
+ internal int CONTROL_LYRIC_SELECTED = 20;
+ internal int CONTROL_LYRICWIDE_SELECTED = 21;
+
#endregion
#region GUI enums
@@ -122,7 +128,9 @@
enum GUI_Lyrics_Controls
{
CONTROL_Lyric = 20,
- CONTROL_LyricWide = 21
+ CONTROL_LyricWide = 21,
+ CONTROL_Lyric_Scroll = 1020,
+ CONTROL_LyricWide_Scroll = 1021
}
enum GUI_LRC_Controls : int
@@ -155,7 +163,10 @@
#region Fields related to LRC mode
- internal const int BASIC_WIDE_LIMIT = 45;
+ internal bool m_useAutoScrollAsDefault = false;
+ internal bool m_useAutoOnLyricLength = false;
+ internal int m_basicWideLimit = 45;
+
SimpleLRC lrc;
SimpleLRCTimeAndLineCollection lrcTimeCollection;
Stopwatch stopwatch;
@@ -190,6 +201,10 @@
public override bool Init()
{
selectedScreen = (int)MyLyricsSettings.Screen.LYRICS_BASIC;
+
+ startingScrollSpeedVertical = GUIGraphicsContext.ScrollSpeedVertical;
+ GUIGraphicsContext.ScrollSpeedVertical = 0;
+
return Load(GUIGraphicsContext.Skin + @"\" + lyricsScreenXML);
}
@@ -315,7 +330,7 @@
}
else
{
- lines = m_LyricText.Split(new string[1] { "\r\n" }, StringSplitOptions.None);
+ lines = m_LyricText.Split(new string[2] { "\r\n", "\n" }, StringSplitOptions.None);
try
{
@@ -351,6 +366,10 @@
m_AutomaticWriteToMusicTag = xmlreader.GetValue("myLyrics", "automaticWriteToMusicTag").Equals("yes");
m_AutomaticReadFromMusicTag = xmlreader.GetValue("myLyrics", "automaticReadFromMusicTag").Equals("yes");
+ m_useAutoScrollAsDefault = ((string)xmlreader.GetValueAsString("myLyrics", "useAutoscroll", "True")).ToString().Equals("yes") ? true : false;
+ m_useAutoOnLyricLength = ((string)xmlreader.GetValueAsString("myLyrics", "useAutoOnLyricLength", "False")).ToString().Equals("yes") ? true : false;
+ m_basicWideLimit = xmlreader.GetValueAsInt("myLyrics", "AutoLyricLength", 45);
+
skin = ((string)xmlreader.GetValueAsString("skin", "name", "Blue3"));
m_crossfade = xmlreader.GetValueAsInt("audioplayer", "crossfade", 2000);
@@ -359,6 +378,24 @@
m_Replace = xmlreader.GetValueAsString("myLyrics", "replace", "");
}
+ if (m_useAutoScrollAsDefault)
+ {
+ CONTROL_LYRIC_SELECTED = (int)GUI_Lyrics_Controls.CONTROL_Lyric_Scroll;
+ CONTROL_LYRICWIDE_SELECTED = (int)GUI_Lyrics_Controls.CONTROL_LyricWide_Scroll;
+
+ GUIControl.HideControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_Lyric);
+ GUIControl.HideControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_LyricWide);
+ }
+ else
+ {
+ CONTROL_LYRIC_SELECTED = (int)GUI_Lyrics_Controls.CONTROL_Lyric;
+ CONTROL_LYRICWIDE_SELECTED = (int)GUI_Lyrics_Controls.CONTROL_LyricWide;
+
+ GUIControl.HideControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_Lyric_Scroll);
+ GUIControl.HideControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_LyricWide_Scroll);
+ }
+
+
m_strippedPrefixStrings = MediaPortalUtil.GetStrippedPrefixStringArray();
ArrayList sitesToSearch = new ArrayList();
@@ -446,6 +483,8 @@
StopThread();
resetAll();
+ GUIGraphicsContext.ScrollSpeedVertical = startingScrollSpeedVertical;
+
if (m_WriteTagTimer != null)
{
m_WriteTagTimer.Stop();
@@ -507,15 +546,15 @@
{
basicScreenSelected = false;
resetGUI((int)MyLyricsSettings.Screen.LYRICS_WIDE);
- GUIControl.SetControlLabel(GetID, (int)GUI_Lyrics_Controls.CONTROL_LyricWide, m_LyricText);
- GUIControl.FocusControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_LyricWide);
+ GUIControl.SetControlLabel(GetID, CONTROL_LYRICWIDE_SELECTED, m_LyricText);
+ GUIControl.FocusControl(GetID, CONTROL_LYRICWIDE_SELECTED);
}
else if (selectedScreen == (int)MyLyricsSettings.Screen.LYRICS_WIDE)
{
basicScreenSelected = true;
resetGUI((int)MyLyricsSettings.Screen.LYRICS_BASIC);
- GUIControl.SetControlLabel(GetID, (int)GUI_Lyrics_Controls.CONTROL_Lyric, m_LyricText);
- GUIControl.FocusControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_Lyric);
+ GUIControl.SetControlLabel(GetID, CONTROL_LYRIC_SELECTED, m_LyricText);
+ GUIControl.FocusControl(GetID, CONTROL_LYRIC_SELECTED);
}
else if (selectedScreen == (int)MyLyricsSettings.Screen.LRC_BASIC)
{
@@ -528,6 +567,21 @@
findLyric();
}
}
+ else if (action.m_key.KeyChar.Equals(115))
+ {
+ if (GUIGraphicsContext.ScrollSpeedVertical >= 10
+ || GUIGraphicsContext.ScrollSpeedVertical == 1
+ || GUIGraphicsContext.ScrollSpeedVertical == 3
+ || GUIGraphicsContext.ScrollSpeedVertical == 5)
+ {
+ GUIGraphicsContext.ScrollSpeedVertical = 0;
+ }
+ else
+ {
+ ++GUIGraphicsContext.ScrollSpeedVertical;
+ ++GUIGraphicsContext.ScrollSpeedVertical;
+ }
+ }
break;
}
case Action.ActionType.ACTION_REWIND:
@@ -624,10 +678,10 @@
{
m_EventStopThread.Reset();
- GUIControl.ClearControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_Lyric);
- GUIControl.SetControlLabel(GetID, (int)GUI_Lyrics_Controls.CONTROL_Lyric, "");
- GUIControl.ClearControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_LyricWide);
- GUIControl.SetControlLabel(GetID, (int)GUI_Lyrics_Controls.CONTROL_LyricWide, "");
+ GUIControl.ClearControl(GetID, CONTROL_LYRIC_SELECTED);
+ GUIControl.SetControlLabel(GetID, CONTROL_LYRIC_SELECTED, "");
+ GUIControl.ClearControl(GetID, CONTROL_LYRICWIDE_SELECTED);
+ GUIControl.SetControlLabel(GetID, CONTROL_LYRICWIDE_SELECTED, "");
if (CurrentTrackTag != null && CurrentTrackTag.Artist != "")
{
@@ -666,12 +720,15 @@
//Let's see if the basic or wide version of the LRC-screen should be shown
bool aLongLinePresent = false;
- for (int i = 0; i < lines.Length; i++)
+ if (m_useAutoOnLyricLength)
{
- if (lines[i].Length > BASIC_WIDE_LIMIT)
+ for (int i = 0; i < lines.Length; i++)
{
- aLongLinePresent = true;
- break;
+ if (lines[i].Length > m_basicWideLimit)
+ {
+ aLongLinePresent = true;
+ break;
+ }
}
}
@@ -945,14 +1002,14 @@
if (basicScreenSelected.HasValue == false || basicScreenSelected.Value)
{
resetGUI((int)MyLyricsSettings.Screen.LYRICS_BASIC);
- GUIControl.SetControlLabel(GetID, (int)GUI_Lyrics_Controls.CONTROL_Lyric, m_LyricText);
- GUIControl.FocusControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_Lyric);
+ GUIControl.SetControlLabel(GetID, CONTROL_LYRIC_SELECTED, m_LyricText);
+ GUIControl.FocusControl(GetID, CONTROL_LYRIC_SELECTED);
}
else
{
resetGUI((int)MyLyricsSettings.Screen.LYRICS_WIDE);
- GUIControl.SetControlLabel(GetID, (int)GUI_Lyrics_Controls.CONTROL_LyricWide, m_LyricText);
- GUIControl.FocusControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_LyricWide);
+ GUIControl.SetControlLabel(GetID, CONTROL_LYRICWIDE_SELECTED, m_LyricText);
+ GUIControl.FocusControl(GetID, CONTROL_LYRICWIDE_SELECTED);
}
@@ -1039,29 +1096,28 @@
private void resetGUI(int screenID)
{
- 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);
- GUIControl.HideControl(GetID, (int)GUI_General_Controls.CONTROL_YEAR);
- GUIControl.HideControl(GetID, (int)GUI_General_Controls.CONTROL_TRACKTITLE);
- GUIControl.HideControl(GetID, (int)GUI_General_Controls.CONTROL_TRACKARTIST);
- GUIControl.HideControl(GetID, (int)GUI_General_Controls.CONTROL_NUMBERDURATION);
- GUIControl.HideControl(GetID, (int)GUI_General_Controls.CONTROL_NEXTTRACK);
- GUIControl.HideControl(GetID, (int)GUI_General_Controls.CONTROL_NEXTARTIST);
- }
- else
- {
- GUIControl.ShowControl(GetID, (int)GUI_General_Controls.CONTROL_UPNEXT);
- GUIControl.ShowControl(GetID, (int)GUI_General_Controls.CONTROL_ALBUM);
- GUIControl.ShowControl(GetID, (int)GUI_General_Controls.CONTROL_YEAR);
- GUIControl.ShowControl(GetID, (int)GUI_General_Controls.CONTROL_TRACKTITLE);
- GUIControl.ShowControl(GetID, (int)GUI_General_Controls.CONTROL_TRACKARTIST);
- GUIControl.ShowControl(GetID, (int)GUI_General_Controls.CONTROL_NUMBERDURATION);
- GUIControl.ShowControl(GetID, (int)GUI_General_Controls.CONTROL_NEXTTRACK);
- GUIControl.ShowControl(GetID, (int)GUI_General_Controls.CONTROL_NEXTARTIST);
- }
+ //if ((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);
+ // GUIControl.HideControl(GetID, (int)GUI_General_Controls.CONTROL_YEAR);
+ // GUIControl.HideControl(GetID, (int)GUI_General_Controls.CONTROL_TRACKTITLE);
+ // GUIControl.HideControl(GetID, (int)GUI_General_Controls.CONTROL_TRACKARTIST);
+ // GUIControl.HideControl(GetID, (int)GUI_General_Controls.CONTROL_NUMBERDURATION);
+ // GUIControl.HideControl(GetID, (int)GUI_General_Controls.CONTROL_NEXTTRACK);
+ // GUIControl.HideControl(GetID, (int)GUI_General_Controls.CONTROL_NEXTARTIST);
+ //}
+ //else
+ //{
+ // GUIControl.ShowControl(GetID, (int)GUI_General_Controls.CONTROL_UPNEXT);
+ // GUIControl.ShowControl(GetID, (int)GUI_General_Controls.CONTROL_ALBUM);
+ // GUIControl.ShowControl(GetID, (int)GUI_General_Controls.CONTROL_YEAR);
+ // GUIControl.ShowControl(GetID, (int)GUI_General_Controls.CONTROL_TRACKTITLE);
+ // GUIControl.ShowControl(GetID, (int)GUI_General_Controls.CONTROL_TRACKARTIST);
+ // GUIControl.ShowControl(GetID, (int)GUI_General_Controls.CONTROL_NUMBERDURATION);
+ // GUIControl.ShowControl(GetID, (int)GUI_General_Controls.CONTROL_NEXTTRACK);
+ // GUIControl.ShowControl(GetID, (int)GUI_General_Controls.CONTROL_NEXTARTIST);
+ //}
int prevSelectedScreen = selectedScreen;
selectedScreen = screenID;
@@ -1076,15 +1132,15 @@
GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_TITLE, "Lyrics basic");
- GUIControl.ClearControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_Lyric);
- GUIControl.FocusControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_Lyric);
+ GUIControl.ClearControl(GetID, CONTROL_LYRIC_SELECTED);
+ GUIControl.FocusControl(GetID, CONTROL_LYRIC_SELECTED);
// Reset general and lyrics controls
GUIControl.ShowControl(GetID, (int)GUI_General_Controls.CONTROL_LBStatus);
- GUIControl.ShowControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_Lyric);
- GUIControl.SetControlLabel(GetID, (int)GUI_Lyrics_Controls.CONTROL_Lyric, "");
- GUIControl.HideControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_LyricWide);
- GUIControl.SetControlLabel(GetID, (int)GUI_Lyrics_Controls.CONTROL_LyricWide, "");
+ GUIControl.ShowControl(GetID, CONTROL_LYRIC_SELECTED);
+ GUIControl.SetControlLabel(GetID, CONTROL_LYRIC_SELECTED, "");
+ GUIControl.HideControl(GetID, CONTROL_LYRICWIDE_SELECTED);
+ GUIControl.SetControlLabel(GetID, CONTROL_LYRICWIDE_SELECTED, "");
// album art only visible for basic screen
GUIControl.ShowControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_CURRENTLY);
@@ -1116,30 +1172,28 @@
GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_TITLE, "Lyrics wide");
- GUIControl.ClearControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_LyricWide);
- GUIControl.FocusControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_LyricWide);
+ GUIControl.ClearControl(GetID, CONTROL_LYRICWIDE_SELECTED);
+ GUIControl.FocusControl(GetID, CONTROL_LYRICWIDE_SELECTED);
// Reset general and lyrics controls
GUIControl.ShowControl(GetID, (int)GUI_General_Controls.CONTROL_LBStatus);
//GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_LBStatus, "");
- GUIControl.HideControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_Lyric);
- GUIControl.SetControlLabel(GetID, (int)GUI_Lyrics_Controls.CONTROL_Lyric, "");
- GUIControl.ShowControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_LyricWide);
- GUIControl.SetControlLabel(GetID, (int)GUI_Lyrics_Controls.CONTROL_LyricWide, "");
+ GUIControl.HideControl(GetID, CONTROL_LYRIC_SELECTED);
+ GUIControl.SetControlLabel(GetID, CONTROL_LYRIC_SELECTED, "");
+ GUIControl.ShowControl(GetID, CONTROL_LYRICWIDE_SELECTED);
+ GUIControl.SetControlLabel(GetID, CONTROL_LYRICWIDE_SELECTED, "");
- // 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);
- }
+ // 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);
+
// Hide LRC controls
GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_TAGBUTTON);
@@ -1163,8 +1217,8 @@
// Lyrics controls
GUIControl.ShowControl(GetID, (int)GUI_General_Controls.CONTROL_LBStatus);
GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_LBStatus, "");
- GUIControl.HideControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_Lyric);
- GUIControl.HideControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_LyricWide);
+ GUIControl.HideControl(GetID, CONTROL_LYRIC_SELECTED);
+ GUIControl.HideControl(GetID, CONTROL_LYRICWIDE_SELECTED);
// album art only visible for basic screen
GUIControl.ShowControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_CURRENTLY);
@@ -1204,21 +1258,18 @@
// Lyrics controls
GUIControl.ShowControl(GetID, (int)GUI_General_Controls.CONTROL_LBStatus);
GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_LBStatus, "");
- GUIControl.HideControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_Lyric);
- GUIControl.HideControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_LyricWide);
+ GUIControl.HideControl(GetID, CONTROL_LYRIC_SELECTED);
+ GUIControl.HideControl(GetID, CONTROL_LYRICWIDE_SELECTED);
- // 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);
- }
+ // album art only visible for lyrics_basic screen AND
+ 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);
@@ -1253,21 +1304,18 @@
// Lyrics controls
GUIControl.ShowControl(GetID, (int)GUI_General_Controls.CONTROL_LBStatus);
GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_LBStatus, "");
- GUIControl.HideControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_Lyric);
- GUIControl.HideControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_LyricWide);
+ GUIControl.HideControl(GetID, CONTROL_LYRIC_SELECTED);
+ GUIControl.HideControl(GetID, CONTROL_LYRICWIDE_SELECTED);
- // 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);
- }
+ // 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);
// LRC controls
GUIControl.ShowControl(GetID, (int)GUI_LRC_Controls.CONTROL_TAGBUTTON);
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSettings.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSettings.cs 2009-03-18 21:09:21 UTC (rev 2729)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSettings.cs 2009-03-19 19:06:55 UTC (rev 2730)
@@ -9,11 +9,12 @@
internal enum Screen : int
{
- LYRICS_BASIC = 0,
- LYRICS_WIDE = 1,
- LRC_BASIC = 2,
- LRC_WIDE = 3,
- LRC_EDITOR = 4
+ LYRICS_AUTO = 0,
+ LYRICS_BASIC = 1,
+ LYRICS_WIDE = 2,
+ LRC_BASIC = 3,
+ LRC_WIDE = 4,
+ LRC_EDITOR = 5
}
// Database settings
Modified: trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs 2009-03-18 21:09:21 UTC (rev 2729)
+++ trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs 2009-03-19 19:06:55 UTC (rev 2730)
@@ -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.20")]
-[assembly: AssemblyFileVersion("1.20")]
+[assembly: AssemblyVersion("1.22")]
+[assembly: AssemblyFileVersion("1.22")]
Added: trunk/plugins/MyLyrics/UpgradeLog.XML
===================================================================
--- trunk/plugins/MyLyrics/UpgradeLog.XML (rev 0)
+++ trunk/plugins/MyLyrics/UpgradeLog.XML 2009-03-19 19:06:55 UTC (rev 2730)
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet type='text/xsl' href='_UpgradeReport_Files/UpgradeReport.xslt'?><UpgradeLog>
+<Properties><Property Name="Solution" Value="MyLyrics">
+</Property><Property Name="Solution File" Value="C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\MyLyrics.sln">
+</Property><Property Name="User Options File" Value="C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\MyLyrics.suo">
+</Property><Property Name="Date" Value="21. oktober 2008">
+</Property><Property Name="Time" Value="18:15">
+</Property></Properties><Event ErrorLevel="0" Project="" Source="MyLyrics.sln" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\MyLyrics.sln">
+</Event><Event ErrorLevel="0" Project="" Source="MyLyrics.suo" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\MyLyrics.suo">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\LyricsEngine.csproj" Description="Project file successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\LyricsEngine\LyricsEngine.csproj">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\LyricsEngine.csproj.user" Description="Project user file successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\LyricsEngine\LyricsEngine.csproj.user">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\LRC\SimpleLRC.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\LyricsEngine\LRC\SimpleLRC.cs">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\LRC\SimpleLRCFormat.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\LyricsEngine\LRC\SimpleLRCFormat.cs">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\LRC\SimpleLRCTimeAndLine.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\LyricsEngine\LRC\SimpleLRCTimeAndLine.cs">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\LRC\SimpleLRCTimeAndLineCollection.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\LyricsEngine\LRC\SimpleLRCTimeAndLineCollection.cs">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\LyricsDatabase\LyricsDatabase.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\LyricsEngine\LyricsDatabase\LyricsDatabase.cs">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\LyricsDatabase\LyricsItem.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\LyricsEngine\LyricsDatabase\LyricsItem.cs">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\LyricSearch.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\LyricsEngine\LyricSearch.cs">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\LyricDiagnostics.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\LyricsEngine\LyricDiagnostics.cs">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\LyricsSites\Actionext.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\LyricsEngine\LyricsSites\Actionext.cs">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\LyricsSites\HotLyrics.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\LyricsEngine\LyricsSites\HotLyrics.cs">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\LyricsSites\EvilLabs.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\LyricsEngine\LyricsSites\EvilLabs.cs">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\LyricsSites\Lyrics007.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\LyricsEngine\LyricsSites\Lyrics007.cs">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\LyricsSites\LyricsOnDemand.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\LyricsEngine\LyricsSites\LyricsOnDemand.cs">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\LyricsSites\SeekLyrics.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\LyricsEngine\LyricsSites\SeekLyrics.cs">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\Properties\AssemblyInfo.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\LyricsEngine\Properties\AssemblyInfo.cs">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\ICommand.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\LyricsEngine\ICommand.cs">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\ILyricForm.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\LyricsEngine\ILyricForm.cs">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\LyricsController.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\LyricsEngine\LyricsController.cs">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\LyricUtil.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\LyricsEngine\LyricUtil.cs">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\Properties\Resources.Designer.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\LyricsEngine\Properties\Resources.Designer.cs">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\Properties\Settings.Designer.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\LyricsEngine\Properties\Settings.Designer.cs">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\Setup.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\LyricsEngine\Setup.cs">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\Web References\org.lyricwiki\Reference.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\LyricsEngine\Web References\org.lyricwiki\Reference.cs">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\LyricsSites\Wiki.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\LyricsEngine\LyricsSites\Wiki.cs">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\app.config" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\LyricsEngine\app.config">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\Properties\Settings.settings" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\LyricsEngine\Properties\Settings.settings">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\Web References\org.lyricwiki\LyricsResult.datasource" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\LyricsEngine\Web References\org.lyricwiki\LyricsResult.datasource">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\Web References\org.lyricwiki\Reference.map" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\LyricsEngine\Web References\org.lyricwiki\Reference.map">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\Web References\org.lyricwiki\server.wsdl" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\LyricsEngine\Web References\org.lyricwiki\server.wsdl">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\Web References\org.lyricwiki\SongResult.datasource" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\LyricsEngine\Web References\org.lyricwiki\SongResult.datasource">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\Web References\org.lyricwiki\SOTDResult.datasource" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\LyricsEngine\Web References\org.lyricwiki\SOTDResult.datasource">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\Properties\Resources.resx" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\LyricsEngine\Properties\Resources.resx">
+</Event><Event ErrorLevel="0" Project="LyricsEngine" Source="LyricsEngine\LyricsEngine.csproj" Description="Project converted successfully">
+</Event><Event ErrorLevel="3" Project="LyricsEngine" Source="LyricsEngine\LyricsEngine.csproj" Description="Converted">
+</Event><Event ErrorLevel="0" Project="MyLyrics" Source="My Lyrics\MyLyrics.csproj" Description="Project file successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\My Lyrics\MyLyrics.csproj">
+</Event><Event ErrorLevel="0" Project="MyLyrics" Source="My Lyrics\MyLyrics.csproj.user" Description="Project user file successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\My Lyrics\MyLyrics.csproj.user">
+</Event><Event ErrorLevel="0" Project="MyLyrics" Source="My Lyrics\Convert\ConvertFromXMLtoLyricsDatabase.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\My Lyrics\Convert\ConvertFromXMLtoLyricsDatabase.cs">
+</Event><Event ErrorLevel="0" Project="MyLyrics" Source="My Lyrics\MediaPortalUtil.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\My Lyrics\MediaPortalUtil.cs">
+</Event><Event ErrorLevel="0" Project="MyLyrics" Source="My Lyrics\MyLyrics Configuration\ExportTags.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\My Lyrics\MyLyrics Configuration\ExportTags.cs">
+</Event><Event ErrorLevel="0" Project="MyLyrics" Source="My Lyrics\MyLyrics Configuration\ExportTags.Designer.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\My Lyrics\MyLyrics Configuration\ExportTags.Designer.cs">
+</Event><Event ErrorLevel="0" Project="MyLyrics" Source="My Lyrics\MyLyrics Configuration\ImportTags.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\My Lyrics\MyLyrics Configuration\ImportTags.cs">
+</Event><Event ErrorLevel="0" Project="MyLyrics" Source="My Lyrics\MyLyrics Configuration\ImportTags.Designer.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\My Lyrics\MyLyrics Configuration\ImportTags.Designer.cs">
+</Event><Event ErrorLevel="0" Project="MyLyrics" Source="My Lyrics\MyLyrics Configuration\About.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\My Lyrics\MyLyrics Configuration\About.cs">
+</Event><Event ErrorLevel="0" Project="MyLyrics" Source="My Lyrics\MyLyrics Configuration\About.Designer.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\My Lyrics\MyLyrics Configuration\About.Designer.cs">
+</Event><Event ErrorLevel="0" Project="MyLyrics" Source="My Lyrics\MyLyrics Configuration\MusicDatabaseBrowse.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\My Lyrics\MyLyrics Configuration\MusicDatabaseBrowse.cs">
+</Event><Event ErrorLevel="0" Project="MyLyrics" Source="My Lyrics\MyLyrics Configuration\MusicDatabaseBrowse.Designer.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\My Lyrics\MyLyrics Configuration\MusicDatabaseBrowse.Designer.cs">
+</Event><Event ErrorLevel="0" Project="MyLyrics" Source="My Lyrics\MyLyricsExternCode.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\My Lyrics\MyLyricsExternCode.cs">
+</Event><Event ErrorLevel="0" Project="MyLyrics" Source="My Lyrics\MyLyricsSettings.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\My Lyrics\MyLyricsSettings.cs">
+</Event><Event ErrorLevel="0" Project="MyLyrics" Source="My Lyrics\MyLyrics Configuration\MyLyricsSetup_test.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\My Lyrics\MyLyrics Configuration\MyLyricsSetup_test.cs">
+</Event><Event ErrorLevel="0" Project="MyLyrics" Source="My Lyrics\DatabaseUtil.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\My Lyrics\DatabaseUtil.cs">
+</Event><Event ErrorLevel="0" Project="MyLyrics" Source="My Lyrics\MyLyrics.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\My Lyrics\MyLyrics.cs">
+</Event><Event ErrorLevel="0" Project="MyLyrics" Source="My Lyrics\MyLyrics Configuration\MyLyricsSetup.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\My Lyrics\MyLyrics Configuration\MyLyricsSetup.cs">
+</Event><Event ErrorLevel="0" Project="MyLyrics" Source="My Lyrics\MyLyrics Configuration\MyLyricsSetup.Designer.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\My Lyrics\MyLyrics Configuration\MyLyricsSetup.Designer.cs">
+</Event><Event ErrorLevel="0" Project="MyLyrics" Source="My Lyrics\MyLyrics Configuration\AddNewSong.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\My Lyrics\MyLyrics Configuration\AddNewSong.cs">
+</Event><Event ErrorLevel="0" Project="MyLyrics" Source="My Lyrics\MyLyrics Configuration\AddNewSong.Designer.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\My Lyrics\MyLyrics Configuration\AddNewSong.Designer.cs">
+</Event><Event ErrorLevel="0" Project="MyLyrics" Source="My Lyrics\Properties\AssemblyInfo.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\My Lyrics\Properties\AssemblyInfo.cs">
+</Event><Event ErrorLevel="0" Project="MyLyrics" Source="My Lyrics\MyLyrics Configuration\LyricsLibrary.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\My Lyrics\MyLyrics Configuration\LyricsLibrary.cs">
+</Event><Event ErrorLevel="0" Project="MyLyrics" Source="My Lyrics\MyLyrics Configuration\LyricsLibrary.Designer.cs" Description="File successfully backed up as C:\Users\saamand\Documents\Visual Studio 2008\Projects\MyLyrics\Backup\My Lyrics\MyLyrics Configuration\LyricsLibrary.Designer.cs">
+</Ev...
[truncated message content] |
