Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [330] trunk/plugins/MyLyrics
|
From: <sa...@us...> - 2007-04-15 14:09:45
|
Revision: 330
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=330&view=rev
Author: saamand
Date: 2007-04-15 07:09:40 -0700 (Sun, 15 Apr 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/HotLyrics.cs
trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.Designer.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.Designer.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.cs
trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs
trunk/plugins/MyLyrics/MyLyric Windows Application/MyLyric Windows Application/Properties/AssemblyInfo.cs
trunk/plugins/MyLyrics/MyLyrics.suo
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/HotLyrics.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/HotLyrics.cs 2007-04-15 13:28:10 UTC (rev 329)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/HotLyrics.cs 2007-04-15 14:09:40 UTC (rev 330)
@@ -121,7 +121,6 @@
sr = new StreamReader(reply);
string line = "";
- int noOfLinesCount = 0;
while (line.IndexOf("GOOGLE END") == -1)
{
Modified: trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs 2007-04-15 13:28:10 UTC (rev 329)
+++ trunk/plugins/MyLyrics/LyricsEngine/Properties/AssemblyInfo.cs 2007-04-15 14:09:40 UTC (rev 330)
@@ -26,7 +26,7 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("0.18")]
+[assembly: AssemblyVersion("0.19")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2007-04-15 13:28:10 UTC (rev 329)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2007-04-15 14:09:40 UTC (rev 330)
@@ -38,6 +38,7 @@
public static int WINDOW_MYLYRICS = 90478;
private int selectedScreen = 0;
+ private Nullable<bool> basicScreenSelected = null;
string lyricsScreenXML = "MyLyrics.xml";
bool exitingMyLyrics = false;
@@ -88,12 +89,14 @@
enum GUI_General_Controls
{
CONTROL_BACKGROUND = 1,
+ CONTROL_TITLE = 2,
CONTROL_LBStatus = 11
}
enum GUI_Lyrics_Controls
{
- CONTROL_Lyric = 20
+ CONTROL_Lyric = 20,
+ CONTROL_LyricWide = 21
}
enum GUI_LRC_Controls : int
@@ -126,7 +129,7 @@
#region Fields related to LRC mode
- internal const int BASIC_WIDE_LIMIT = 40;
+ internal const int BASIC_WIDE_LIMIT = 45;
LRC.SimpleLRC lrc;
IEnumerator enumerator;
System.Windows.Forms.Timer timer;
@@ -148,7 +151,6 @@
internal int msec = 0;
string[] lines;
- ArrayList times;
#endregion
@@ -166,33 +168,8 @@
public override bool Init()
{
- int lyricsScreen = 0;
- using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MediaPortal.xml"))
- {
- lyricsScreen = (int)xmlreader.GetValueAsInt("myLyrics", "myLyricsScreen", (int)MyLyricsSettings.Screen.LYRICS_BASIC);
- }
-
- switch (lyricsScreen)
- {
- case (int)MyLyricsSettings.Screen.LYRICS_BASIC:
- selectedScreen = (int)MyLyricsSettings.Screen.LYRICS_BASIC;
- break;
- case (int)MyLyricsSettings.Screen.LYRICS_WIDE:
- selectedScreen = (int)MyLyricsSettings.Screen.LYRICS_WIDE;
- break;
- case (int)MyLyricsSettings.Screen.LRC_BASIC:
- selectedScreen = (int)MyLyricsSettings.Screen.LRC_BASIC;
- break;
- case (int)MyLyricsSettings.Screen.LRC_EDITOR:
- selectedScreen = (int)MyLyricsSettings.Screen.LRC_EDITOR;
- break;
- default:
- selectedScreen = (int)MyLyricsSettings.Screen.LYRICS_BASIC;
- break;
- }
-
timer = new System.Windows.Forms.Timer();
-
+ selectedScreen = (int)MyLyricsSettings.Screen.LYRICS_BASIC;
return Load(GUIGraphicsContext.Skin + @"\" + lyricsScreenXML);
}
@@ -226,10 +203,11 @@
m_artist = "";
m_title = "";
m_TrackText = "";
+ m_LyricText = "";
m_StatusText = "No music file playing";
+
+ resetGUI(selectedScreen);
GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_LBStatus, m_StatusText);
- m_LyricText = "";
- GUIControl.SetControlLabel(GetID, (int)GUI_Lyrics_Controls.CONTROL_Lyric, m_LyricText);
}
getAlbumArt();
@@ -313,10 +291,11 @@
m_artist = "";
m_title = "";
m_TrackText = "";
+ m_LyricText = "";
m_StatusText = "No music file playing";
+
+ resetGUI(selectedScreen);
GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_LBStatus, m_StatusText);
- m_LyricText = "";
- GUIControl.SetControlLabel(GetID, (int)GUI_Lyrics_Controls.CONTROL_Lyric, m_LyricText);
}
}
@@ -422,14 +401,14 @@
LoadSettings();
LyricDiagnostics.OpenLog(MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Log, logName));
- LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Start, 0, LyricDiagnostics.elapsedTimeString() + "MyLyrics opens, screen: " + lyricsScreenXML);
+ LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Start, 0, LyricDiagnostics.elapsedTimeString() + "MyLyrics opens.");
return true;
}
case GUIMessage.MessageType.GUI_MSG_WINDOW_DEINIT:
{
StopThread();
resetAll();
- LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Stop, 0, LyricDiagnostics.elapsedTimeString() + "MyLyrics closes, screen: " + lyricsScreenXML);
+ LyricDiagnostics.TraceSource.TraceEvent(TraceEventType.Stop, 0, LyricDiagnostics.elapsedTimeString() + "MyLyrics closes.");
break;
}
}
@@ -511,7 +490,7 @@
{
tagLine();
}
- if (action.m_key.KeyChar.Equals(40))
+ else if (action.m_key.KeyChar.Equals(40) || action.m_key.KeyChar.Equals(101))
{
lyricsFound = false;
if (selectedScreen != (int)MyLyricsSettings.Screen.LRC_EDITOR)
@@ -528,6 +507,31 @@
newTrack = true;
Process();
}
+ else if (action.m_key.KeyChar.Equals(35) || action.m_key.KeyChar.Equals(119))
+ {
+ if (selectedScreen == (int)MyLyricsSettings.Screen.LYRICS_BASIC)
+ {
+ basicScreenSelected = false;
+ resetGUI((int)MyLyricsSettings.Screen.LYRICS_WIDE);
+ GUIControl.SetControlLabel(GetID, (int)GUI_Lyrics_Controls.CONTROL_LyricWide, m_LyricText);
+ }
+ 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);
+ }
+ else if (selectedScreen == (int)MyLyricsSettings.Screen.LRC_BASIC)
+ {
+ basicScreenSelected = false;
+ findLyric();
+ }
+ else if (selectedScreen == (int)MyLyricsSettings.Screen.LRC_WIDE)
+ {
+ basicScreenSelected = true;
+ findLyric();
+ }
+ }
break;
}
}
@@ -541,6 +545,7 @@
{
if (!value.Equals("")) // additional check
{
+ basicScreenSelected = null;
resetGUI(selectedScreen);
StopThread();
resetAll();
@@ -552,10 +557,11 @@
m_artist = "";
m_title = "";
m_TrackText = "";
+ m_LyricText = "";
m_StatusText = "No music file playing";
+
+ resetGUI(selectedScreen);
GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_LBStatus, m_StatusText);
- m_LyricText = "";
- GUIControl.SetControlLabel(GetID, (int)GUI_Lyrics_Controls.CONTROL_Lyric, m_LyricText);
}
}
else if (selectedScreen == (int)MyLyricsSettings.Screen.LYRICS_BASIC || selectedScreen == (int)MyLyricsSettings.Screen.LRC_BASIC)
@@ -817,6 +823,8 @@
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, "");
if (CurrentTrackTag != null && CurrentTrackTag.Artist != "")
{
@@ -857,13 +865,27 @@
}
}
- if (aLongLinePresent)
+ if (basicScreenSelected.HasValue)
{
- resetGUI((int)MyLyricsSettings.Screen.LRC_WIDE);
+ if (basicScreenSelected.Value)
+ {
+ resetGUI((int)MyLyricsSettings.Screen.LRC_BASIC);
+ }
+ else
+ {
+ resetGUI((int)MyLyricsSettings.Screen.LRC_WIDE);
+ }
}
else
{
- resetGUI((int)MyLyricsSettings.Screen.LRC_BASIC);
+ if (aLongLinePresent)
+ {
+ resetGUI((int)MyLyricsSettings.Screen.LRC_WIDE);
+ }
+ else
+ {
+ resetGUI((int)MyLyricsSettings.Screen.LRC_BASIC);
+ }
}
m_StatusText = "";
@@ -1067,7 +1089,6 @@
while (currentLine.Time == 0)
{
m_LyricText += (currentLine.Line);
- GUIControl.SetControlLabel(GetID, (int)GUI_Lyrics_Controls.CONTROL_Lyric, m_LyricText);
++currentLRCLine;
enumerator.MoveNext();
@@ -1119,8 +1140,18 @@
}
else
{
- resetGUI((int)MyLyricsSettings.Screen.LYRICS_BASIC);
- GUIControl.SetControlLabel(GetID, (int)GUI_Lyrics_Controls.CONTROL_Lyric, m_LyricText);
+ if (basicScreenSelected.HasValue == false || basicScreenSelected.Value)
+ {
+ resetGUI((int)MyLyricsSettings.Screen.LYRICS_BASIC);
+ GUIControl.SetControlLabel(GetID, (int)GUI_Lyrics_Controls.CONTROL_Lyric, m_LyricText);
+ }
+ else
+ {
+ resetGUI((int)MyLyricsSettings.Screen.LYRICS_WIDE);
+ GUIControl.SetControlLabel(GetID, (int)GUI_Lyrics_Controls.CONTROL_LyricWide, m_LyricText);
+ }
+
+
}
}
@@ -1208,7 +1239,6 @@
sec = 0;
msec = 0;
lines = null;
- times = null;
}
private void resetGUI(int screenID)
@@ -1223,12 +1253,16 @@
if (selectedScreen == (int)MyLyricsSettings.Screen.LYRICS_BASIC)
{
GUIPropertyManager.OnPropertyChanged += new GUIPropertyManager.OnPropertyChangedHandler(trackChangeHandler);
- times = new ArrayList();
+
+ GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_TITLE, "Lyrics basic");
+
// 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, "");
// album art only visible for basic screen
GUIControl.ShowControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_CURRENTLY);
@@ -1257,13 +1291,16 @@
else if (selectedScreen == (int)MyLyricsSettings.Screen.LYRICS_WIDE)
{
GUIPropertyManager.OnPropertyChanged += new GUIPropertyManager.OnPropertyChangedHandler(trackChangeHandler);
- times = new ArrayList();
+ GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_TITLE, "Lyrics wide");
+
// Reset general and lyrics controls
GUIControl.ShowControl(GetID, (int)GUI_General_Controls.CONTROL_LBStatus);
//GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_LBStatus, "");
- GUIControl.ShowControl(GetID, (int)GUI_Lyrics_Controls.CONTROL_Lyric);
+ 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, "");
// album art only visible for lyrics_basic screen
GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_CURRENTLY);
@@ -1291,17 +1328,17 @@
else if (selectedScreen == (int)MyLyricsSettings.Screen.LRC_BASIC)
{
- if (alreadyValidLRC == false)
- {
- GUIPropertyManager.OnPropertyChanged += new GUIPropertyManager.OnPropertyChangedHandler(trackChangeHandler);
- GUIPropertyManager.OnPropertyChanged += new GUIPropertyManager.OnPropertyChangedHandler(timeHandler);
- timer.Tick += new System.EventHandler(OnTimerEvent);
- }
+ GUIPropertyManager.OnPropertyChanged += new GUIPropertyManager.OnPropertyChangedHandler(trackChangeHandler);
+ GUIPropertyManager.OnPropertyChanged += new GUIPropertyManager.OnPropertyChangedHandler(timeHandler);
+ timer.Tick += new System.EventHandler(OnTimerEvent);
+ GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_TITLE, "LRC basic");
+
// 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);
// album art only visible for basic screen
GUIControl.ShowControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_CURRENTLY);
@@ -1331,17 +1368,17 @@
else if (selectedScreen == (int)MyLyricsSettings.Screen.LRC_WIDE)
{
- if (alreadyValidLRC == false)
- {
- GUIPropertyManager.OnPropertyChanged += new GUIPropertyManager.OnPropertyChangedHandler(trackChangeHandler);
- GUIPropertyManager.OnPropertyChanged += new GUIPropertyManager.OnPropertyChangedHandler(timeHandler);
- timer.Tick += new System.EventHandler(OnTimerEvent);
- }
+ GUIPropertyManager.OnPropertyChanged += new GUIPropertyManager.OnPropertyChangedHandler(trackChangeHandler);
+ GUIPropertyManager.OnPropertyChanged += new GUIPropertyManager.OnPropertyChangedHandler(timeHandler);
+ timer.Tick += new System.EventHandler(OnTimerEvent);
+ GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_TITLE, "LRC wide");
+
// 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);
// album art only visible for basic screen
GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_CURRENTLY);
@@ -1352,7 +1389,7 @@
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);
@@ -1374,10 +1411,13 @@
GUIPropertyManager.OnPropertyChanged += new GUIPropertyManager.OnPropertyChangedHandler(trackChangeHandler);
GUIPropertyManager.OnPropertyChanged += new GUIPropertyManager.OnPropertyChangedHandler(timeHandler);
+ GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_TITLE, "LRC editor");
+
// 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);
// album art only visible for lyrics_basic screen
GUIControl.HideControl(GetID, (int)GUI_LRC_Controls.CONTROL_ART_CURRENTLY);
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.Designer.cs 2007-04-15 13:28:10 UTC (rev 329)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.Designer.cs 2007-04-15 14:09:40 UTC (rev 330)
@@ -78,8 +78,6 @@
this.cbMoveSongFrom = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.cbAutoFetch = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.mpGroupBox2 = new MediaPortal.UserInterface.Controls.MPGroupBox();
- this.comboLyricsPage = new MediaPortal.UserInterface.Controls.MPComboBox();
- this.lbLyricsPage = new MediaPortal.UserInterface.Controls.MPLabel();
this.tbPluginName = new MediaPortal.UserInterface.Controls.MPTextBox();
this.lbPluginName = new MediaPortal.UserInterface.Controls.MPLabel();
this.gbLyricSites = new MediaPortal.UserInterface.Controls.MPGroupBox();
@@ -119,8 +117,8 @@
// tabControl
//
this.tabControl.Controls.Add(this.tabPageLyricsDatabase);
- this.tabControl.Controls.Add(this.tabPageDatabase);
this.tabControl.Controls.Add(this.tabPageSetup);
+ this.tabControl.Controls.Add(this.tabPageDatabase);
this.tabControl.Location = new System.Drawing.Point(7, 12);
this.tabControl.Name = "tabControl";
this.tabControl.SelectedIndex = 0;
@@ -587,7 +585,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, 109);
+ this.mpGroupBox3.Location = new System.Drawing.Point(5, 70);
this.mpGroupBox3.Name = "mpGroupBox3";
this.mpGroupBox3.Size = new System.Drawing.Size(538, 92);
this.mpGroupBox3.TabIndex = 30;
@@ -633,41 +631,16 @@
//
// mpGroupBox2
//
- this.mpGroupBox2.AutoSize = true;
- this.mpGroupBox2.Controls.Add(this.comboLyricsPage);
- this.mpGroupBox2.Controls.Add(this.lbLyricsPage);
this.mpGroupBox2.Controls.Add(this.tbPluginName);
this.mpGroupBox2.Controls.Add(this.lbPluginName);
this.mpGroupBox2.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.mpGroupBox2.Location = new System.Drawing.Point(5, 5);
this.mpGroupBox2.Name = "mpGroupBox2";
- this.mpGroupBox2.Size = new System.Drawing.Size(538, 98);
+ this.mpGroupBox2.Size = new System.Drawing.Size(538, 59);
this.mpGroupBox2.TabIndex = 29;
this.mpGroupBox2.TabStop = false;
this.mpGroupBox2.Text = "Basic settings";
//
- // comboLyricsPage
- //
- this.comboLyricsPage.BorderColor = System.Drawing.Color.Empty;
- this.comboLyricsPage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.comboLyricsPage.FormattingEnabled = true;
- this.comboLyricsPage.Items.AddRange(new object[] {
- "Lyrics screen (view)",
- "Lyrics screen (editor)"});
- this.comboLyricsPage.Location = new System.Drawing.Point(96, 58);
- this.comboLyricsPage.Name = "comboLyricsPage";
- this.comboLyricsPage.Size = new System.Drawing.Size(144, 21);
- this.comboLyricsPage.TabIndex = 16;
- //
- // lbLyricsPage
- //
- this.lbLyricsPage.AutoSize = true;
- this.lbLyricsPage.Location = new System.Drawing.Point(13, 61);
- this.lbLyricsPage.Name = "lbLyricsPage";
- this.lbLyricsPage.Size = new System.Drawing.Size(72, 13);
- this.lbLyricsPage.TabIndex = 15;
- this.lbLyricsPage.Text = "Lyrics screen:";
- //
// tbPluginName
//
this.tbPluginName.BorderColor = System.Drawing.Color.Empty;
@@ -695,7 +668,7 @@
this.gbLyricSites.Controls.Add(this.rbUserDefined);
this.gbLyricSites.Controls.Add(this.tbNote);
this.gbLyricSites.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.gbLyricSites.Location = new System.Drawing.Point(5, 207);
+ this.gbLyricSites.Location = new System.Drawing.Point(5, 168);
this.gbLyricSites.Name = "gbLyricSites";
this.gbLyricSites.Size = new System.Drawing.Size(538, 202);
this.gbLyricSites.TabIndex = 28;
@@ -927,7 +900,6 @@
this.gbProgress.ResumeLayout(false);
this.gbMusicDBSearchStats.ResumeLayout(false);
this.tabPageSetup.ResumeLayout(false);
- this.tabPageSetup.PerformLayout();
this.mpGroupBox3.ResumeLayout(false);
this.mpGroupBox3.PerformLayout();
this.mpGroupBox2.ResumeLayout(false);
@@ -1011,8 +983,6 @@
private MediaPortal.UserInterface.Controls.MPCheckBox cbDisregardSongsWithNoLyric;
private MediaPortal.UserInterface.Controls.MPCheckBox cbMarkSongsWithNoLyrics;
private MediaPortal.UserInterface.Controls.MPCheckBox cbDisconsiderTitlesWithLyrics;
- private MediaPortal.UserInterface.Controls.MPLabel lbLyricsPage;
- private MediaPortal.UserInterface.Controls.MPComboBox comboLyricsPage;
private MediaPortal.UserInterface.Controls.MPGroupBox mpGroupBox3;
internal MediaPortal.UserInterface.Controls.MPCheckBox cbAutoFetch;
internal MediaPortal.UserInterface.Controls.MPCheckBox cbMoveSongFrom;
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs 2007-04-15 13:28:10 UTC (rev 329)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup.cs 2007-04-15 14:09:40 UTC (rev 330)
@@ -137,9 +137,6 @@
cbAutomaticUpdate.Checked = xmlreader.GetValueAsBool("myLyrics", "automaticUpdateWhenFirstFound", false);
cbMoveSongFrom.Checked = xmlreader.GetValueAsBool("myLyrics", "moveLyricFromMarkedDatabase", true);
- int xmlScreen = xmlreader.GetValueAsInt("myLyrics", "myLyricsScreen", (int)MyLyricsSettings.Screen.LYRICS_BASIC);
- comboLyricsPage.SelectedIndex = xmlScreen;
-
lbSongsLimitNote.Text = ("(You have currently " + m_TotalTitles.ToString() + " titles in your music database)");
rdDefault.Checked = ((string)xmlreader.GetValueAsString("myLyrics", "useDefaultSitesMode", "True")).ToString().Equals("True") ? true : false;
@@ -157,31 +154,6 @@
cbLyricsOnDemand.Checked = ((string)xmlreader.GetValueAsString("myLyrics", "useLyricsOnDemand", "True")).ToString().Equals("True") ? true : false;
cbSeekLyrics.Checked = ((string)xmlreader.GetValueAsString("myLyrics", "useSeekLyrics", "True")).ToString().Equals("True") ? true : false;
cbHotLyrics.Checked = ((string)xmlreader.GetValueAsString("myLyrics", "useHotLyrics", "True")).ToString().Equals("True") ? true : false;
-
- //if (Setup.IsMember("LyricWiki") == false)
- //{
- // cbLyricWiki.Visible = false;
- //}
- //if (Setup.IsMember("EvilLabs") == false)
- //{
- // cbEvilLabs.Visible = false;
- //}
- //if (Setup.IsMember("Lyrics007") == false)
- //{
- // cbLyrics007.Visible = false;
- //}
- //if (Setup.IsMember("LyricsOnDemand") == false)
- //{
- // cbLyricsOnDemand.Visible = false;
- //}
- //if (Setup.IsMember("SeekLyrics") == false)
- //{
- // cbSeekLyrics.Visible = false;
- //}
- //if (Setup.IsMember("HotLyrics") == false)
- //{
- // cbHotLyrics.Visible = false;
- //}
}
}
catch {
@@ -326,9 +298,6 @@
xmlwriter.SetValueAsBool("myLyrics", "automaticFetch", cbAutoFetch.Checked);
xmlwriter.SetValueAsBool("myLyrics", "automaticUpdateWhenFirstFound", cbAutomaticUpdate.Checked);
xmlwriter.SetValueAsBool("myLyrics", "moveLyricFromMarkedDatabase", cbMoveSongFrom.Checked);
-
- int xmlScreen = comboLyricsPage.SelectedIndex;
- xmlwriter.SetValue("myLyrics", "myLyricsScreen", xmlScreen);
}
}
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.Designer.cs 2007-04-15 13:28:10 UTC (rev 329)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.Designer.cs 2007-04-15 14:09:40 UTC (rev 330)
@@ -345,7 +345,6 @@
private System.Windows.Forms.Label lbLRCTest;
private MediaPortal.UserInterface.Controls.MPLabel lbTitle;
private MediaPortal.UserInterface.Controls.MPLabel lbSource;
- private System.ComponentModel.IContainer components;
private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1;
internal System.Windows.Forms.TreeView treeView;
internal MediaPortal.UserInterface.Controls.MPButton btSearchSingle;
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.cs 2007-04-15 13:28:10 UTC (rev 329)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsSetup_LyricsLibrary.cs 2007-04-15 14:09:40 UTC (rev 330)
@@ -42,8 +42,6 @@
private int currentDBIndex = 0;
enum TYPEOFLYRICS : int {NONE, NORMAL, LRC};
- static string lastChosenArtist = "";
- static string lastChosenTitle = "";
public MyLyricsSetup_LyricsLibrary(Form form)
{
Modified: trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs 2007-04-15 13:28:10 UTC (rev 329)
+++ trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs 2007-04-15 14:09:40 UTC (rev 330)
@@ -31,5 +31,5 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("0.18")]
-[assembly: AssemblyFileVersion("0.18")]
+[assembly: AssemblyVersion("0.19")]
+[assembly: AssemblyFileVersion("0.19")]
Modified: trunk/plugins/MyLyrics/MyLyric Windows Application/MyLyric Windows Application/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/MyLyrics/MyLyric Windows Application/MyLyric Windows Application/Properties/AssemblyInfo.cs 2007-04-15 13:28:10 UTC (rev 329)
+++ trunk/plugins/MyLyrics/MyLyric Windows Application/MyLyric Windows Application/Properties/AssemblyInfo.cs 2007-04-15 14:09:40 UTC (rev 330)
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("0.18")]
-[assembly: AssemblyFileVersion("0.18")]
+[assembly: AssemblyVersion("0.19")]
+[assembly: AssemblyFileVersion("0.19")]
Modified: trunk/plugins/MyLyrics/MyLyrics.suo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
