Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[3701] trunk/plugins/MyLyrics
|
From: <sa...@us...> - 2010-08-04 19:24:57
|
Revision: 3701
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3701&view=rev
Author: saamand
Date: 2010-08-04 19:24:50 +0000 (Wed, 04 Aug 2010)
Log Message:
-----------
- Lyricspluginsite.com is no longer suited for parsing and invalid lyric is returned. The support for the site has been removed.
Modified Paths:
--------------
trunk/plugins/MyLyrics/LyricsEngine/LyricSearch.cs
trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsPluginSite.cs
trunk/plugins/MyLyrics/LyricsEngine/Setup.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.Designer.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.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
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricSearch.cs
===================================================================
(Binary files differ)
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsPluginSite.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsPluginSite.cs 2010-08-03 19:55:50 UTC (rev 3700)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LyricsPluginSite.cs 2010-08-04 19:24:50 UTC (rev 3701)
@@ -203,7 +203,7 @@
lyric = lyricTemp.ToString().Trim();
- if (lyric.Length == 0)
+ if (lyric.Length == 0 || lyric.Contains("www.lyricsvip.com"))
{
lyric = "Not found";
}
Modified: trunk/plugins/MyLyrics/LyricsEngine/Setup.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/Setup.cs 2010-08-03 19:55:50 UTC (rev 3700)
+++ trunk/plugins/MyLyrics/LyricsEngine/Setup.cs 2010-08-04 19:24:50 UTC (rev 3701)
@@ -5,7 +5,7 @@
{
public static class Setup
{
- public static string[] BatchSearchSites = new string[8]
+ public static string[] BatchSearchSites = new string[7]
{
"LrcFinder",
"LyricWiki",
@@ -13,8 +13,7 @@
"LyricsOnDemand",
"HotLyrics",
"Actionext",
- "LyrDB",
- "LyricsPluginSite"
+ "LyrDB"
};
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.Designer.cs 2010-08-03 19:55:50 UTC (rev 3700)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.Designer.cs 2010-08-04 19:24:50 UTC (rev 3701)
@@ -50,7 +50,6 @@
this.cbLyricsOnDemand = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.cbLyrics007 = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.cbLyricWiki = new MediaPortal.UserInterface.Controls.MPCheckBox();
- this.cbLyricsPluginSite = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.btClose = new System.Windows.Forms.Button();
this.btUpdate = new System.Windows.Forms.Button();
this.gbSearchInfo.SuspendLayout();
@@ -196,7 +195,6 @@
this.gbLyricSites.Controls.Add(this.cbLyricsOnDemand);
this.gbLyricSites.Controls.Add(this.cbLyrics007);
this.gbLyricSites.Controls.Add(this.cbLyricWiki);
- this.gbLyricSites.Controls.Add(this.cbLyricsPluginSite);
this.gbLyricSites.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.gbLyricSites.Location = new System.Drawing.Point(9, 115);
this.gbLyricSites.Name = "gbLyricSites";
@@ -211,7 +209,7 @@
this.cbLrcFinder.Checked = true;
this.cbLrcFinder.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbLrcFinder.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbLrcFinder.Location = new System.Drawing.Point(338, 21);
+ this.cbLrcFinder.Location = new System.Drawing.Point(237, 19);
this.cbLrcFinder.Name = "cbLrcFinder";
this.cbLrcFinder.Size = new System.Drawing.Size(68, 17);
this.cbLrcFinder.TabIndex = 19;
@@ -224,7 +222,7 @@
this.cbLyrDB.Checked = true;
this.cbLyrDB.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbLyrDB.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbLyrDB.Location = new System.Drawing.Point(338, 44);
+ this.cbLyrDB.Location = new System.Drawing.Point(237, 44);
this.cbLyrDB.Name = "cbLyrDB";
this.cbLyrDB.Size = new System.Drawing.Size(53, 17);
this.cbLyrDB.TabIndex = 18;
@@ -237,7 +235,7 @@
this.cbActionext.Checked = true;
this.cbActionext.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbActionext.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbActionext.Location = new System.Drawing.Point(131, 44);
+ this.cbActionext.Location = new System.Drawing.Point(18, 44);
this.cbActionext.Name = "cbActionext";
this.cbActionext.Size = new System.Drawing.Size(68, 17);
this.cbActionext.TabIndex = 17;
@@ -250,7 +248,7 @@
this.cbHotLyrics.Checked = true;
this.cbHotLyrics.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbHotLyrics.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbHotLyrics.Location = new System.Drawing.Point(237, 44);
+ this.cbHotLyrics.Location = new System.Drawing.Point(132, 44);
this.cbHotLyrics.Name = "cbHotLyrics";
this.cbHotLyrics.Size = new System.Drawing.Size(71, 17);
this.cbHotLyrics.TabIndex = 14;
@@ -276,7 +274,7 @@
this.cbLyrics007.Checked = true;
this.cbLyrics007.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbLyrics007.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbLyrics007.Location = new System.Drawing.Point(237, 21);
+ this.cbLyrics007.Location = new System.Drawing.Point(131, 19);
this.cbLyrics007.Name = "cbLyrics007";
this.cbLyrics007.Size = new System.Drawing.Size(72, 17);
this.cbLyrics007.TabIndex = 13;
@@ -289,26 +287,13 @@
this.cbLyricWiki.Checked = true;
this.cbLyricWiki.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbLyricWiki.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbLyricWiki.Location = new System.Drawing.Point(18, 44);
+ this.cbLyricWiki.Location = new System.Drawing.Point(338, 21);
this.cbLyricWiki.Name = "cbLyricWiki";
this.cbLyricWiki.Size = new System.Drawing.Size(67, 17);
this.cbLyricWiki.TabIndex = 11;
this.cbLyricWiki.Text = "LyricWiki";
this.cbLyricWiki.UseVisualStyleBackColor = true;
//
- // cbLyricsPluginSite
- //
- this.cbLyricsPluginSite.AutoSize = true;
- this.cbLyricsPluginSite.Checked = true;
- this.cbLyricsPluginSite.CheckState = System.Windows.Forms.CheckState.Checked;
- this.cbLyricsPluginSite.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbLyricsPluginSite.Location = new System.Drawing.Point(131, 21);
- this.cbLyricsPluginSite.Name = "cbLyricsPluginSite";
- this.cbLyricsPluginSite.Size = new System.Drawing.Size(80, 17);
- this.cbLyricsPluginSite.TabIndex = 15;
- this.cbLyricsPluginSite.Text = "LyricsPlugin";
- this.cbLyricsPluginSite.UseVisualStyleBackColor = true;
- //
// btClose
//
this.btClose.Location = new System.Drawing.Point(361, 546);
@@ -334,7 +319,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(448, 575);
+ this.ClientSize = new System.Drawing.Size(448, 573);
this.ControlBox = false;
this.Controls.Add(this.btUpdate);
this.Controls.Add(this.btClose);
@@ -376,7 +361,6 @@
internal MediaPortal.UserInterface.Controls.MPCheckBox cbLyricsOnDemand;
internal MediaPortal.UserInterface.Controls.MPCheckBox cbLyrics007;
internal MediaPortal.UserInterface.Controls.MPCheckBox cbLyricWiki;
- internal MediaPortal.UserInterface.Controls.MPCheckBox cbLyricsPluginSite;
private System.Windows.Forms.ListView lvSearchResults;
private System.Windows.Forms.ColumnHeader cbSite;
private System.Windows.Forms.ColumnHeader cbResult;
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.cs 2010-08-03 19:55:50 UTC (rev 3700)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.cs 2010-08-04 19:24:50 UTC (rev 3701)
@@ -110,11 +110,6 @@
"True")
? true
: false;
- cbLyricsPluginSite.Checked =
- ((string) xmlreader.GetValueAsString("myLyrics", "useLyricsPluginSite", "True")).ToString().Equals(
- "True")
- ? true
- : false;
cbHotLyrics.Checked =
((string) xmlreader.GetValueAsString("myLyrics", "useHotLyrics", "True")).ToString().Equals("True")
? true
@@ -210,10 +205,6 @@
{
sitesToSearch.Add("LyricsOnDemand");
}
- if (cbLyricsPluginSite.Checked)
- {
- sitesToSearch.Add("LyricsPluginSite");
- }
// If automaticUpdate is set then return after the first positive search
m_EventStopThread = new ManualResetEvent(false);
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs 2010-08-03 19:55:50 UTC (rev 3700)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs 2010-08-04 19:24:50 UTC (rev 3701)
@@ -534,10 +534,6 @@
sitesToSearch.Add("LyricsOnDemand");
if (((string) xmlreader.GetValueAsString("myLyrics", "useHotLyrics", "True")).ToString().Equals("True"))
sitesToSearch.Add("HotLyrics");
- if (
- ((string) xmlreader.GetValueAsString("myLyrics", "useLyricsPluginSite", "True")).ToString().Equals(
- "True"))
- sitesToSearch.Add("LyricsPluginSite");
m_find = xmlreader.GetValueAsString("myLyrics", "find", "");
m_replace = xmlreader.GetValueAsString("myLyrics", "replace", "");
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs 2010-08-03 19:55:50 UTC (rev 3700)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs 2010-08-04 19:24:50 UTC (rev 3701)
@@ -107,7 +107,6 @@
this.cbLyricsOnDemand = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.cbLyricWiki = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.cbHotLyrics = new MediaPortal.UserInterface.Controls.MPCheckBox();
- this.cbLyricsPluginSite = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.mpLabel2 = new MediaPortal.UserInterface.Controls.MPLabel();
this.trackBar = new System.Windows.Forms.TrackBar();
@@ -158,7 +157,7 @@
this.tabControl.Location = new System.Drawing.Point(0, 0);
this.tabControl.Name = "tabControl";
this.tabControl.SelectedIndex = 0;
- this.tabControl.Size = new System.Drawing.Size(558, 539);
+ this.tabControl.Size = new System.Drawing.Size(558, 536);
this.tabControl.TabIndex = 1;
this.tabControl.SelectedIndexChanged += new System.EventHandler(this.tabControl_SelectedIndexChanged);
//
@@ -167,7 +166,7 @@
this.tabPageLyricsDatabase.Location = new System.Drawing.Point(4, 22);
this.tabPageLyricsDatabase.Name = "tabPageLyricsDatabase";
this.tabPageLyricsDatabase.Padding = new System.Windows.Forms.Padding(3);
- this.tabPageLyricsDatabase.Size = new System.Drawing.Size(550, 513);
+ this.tabPageLyricsDatabase.Size = new System.Drawing.Size(550, 510);
this.tabPageLyricsDatabase.TabIndex = 1;
this.tabPageLyricsDatabase.Text = "Lyrics database";
this.tabPageLyricsDatabase.UseVisualStyleBackColor = true;
@@ -625,7 +624,7 @@
this.tabPageSetup.Location = new System.Drawing.Point(4, 22);
this.tabPageSetup.Name = "tabPageSetup";
this.tabPageSetup.Padding = new System.Windows.Forms.Padding(3);
- this.tabPageSetup.Size = new System.Drawing.Size(550, 513);
+ this.tabPageSetup.Size = new System.Drawing.Size(550, 510);
this.tabPageSetup.TabIndex = 2;
this.tabPageSetup.Text = "Settings";
this.tabPageSetup.UseVisualStyleBackColor = true;
@@ -783,7 +782,7 @@
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(216, 17);
+ this.cbMusicTagAlwaysCheck.Size = new System.Drawing.Size(223, 17);
this.cbMusicTagAlwaysCheck.TabIndex = 7;
this.cbMusicTagAlwaysCheck.Text = "Always use plain lyric from tag (if available)";
this.cbMusicTagAlwaysCheck.UseVisualStyleBackColor = true;
@@ -795,7 +794,7 @@
this.cbMusicTagWrite.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.cbMusicTagWrite.Location = new System.Drawing.Point(274, 20);
this.cbMusicTagWrite.Name = "cbMusicTagWrite";
- this.cbMusicTagWrite.Size = new System.Drawing.Size(203, 17);
+ this.cbMusicTagWrite.Size = new System.Drawing.Size(195, 17);
this.cbMusicTagWrite.TabIndex = 6;
this.cbMusicTagWrite.Text = "Write newly found lyrics to music tag";
this.cbMusicTagWrite.UseVisualStyleBackColor = true;
@@ -936,7 +935,6 @@
this.groupBox2.Controls.Add(this.cbLyricsOnDemand);
this.groupBox2.Controls.Add(this.cbLyricWiki);
this.groupBox2.Controls.Add(this.cbHotLyrics);
- this.groupBox2.Controls.Add(this.cbLyricsPluginSite);
this.groupBox2.Location = new System.Drawing.Point(229, 48);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(301, 90);
@@ -950,7 +948,7 @@
this.cbLrcFinder.Checked = true;
this.cbLrcFinder.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbLrcFinder.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbLrcFinder.Location = new System.Drawing.Point(130, 19);
+ this.cbLrcFinder.Location = new System.Drawing.Point(20, 61);
this.cbLrcFinder.Name = "cbLrcFinder";
this.cbLrcFinder.Size = new System.Drawing.Size(68, 17);
this.cbLrcFinder.TabIndex = 10;
@@ -964,7 +962,7 @@
this.cbLyrDB.Checked = true;
this.cbLyrDB.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbLyrDB.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbLyrDB.Location = new System.Drawing.Point(216, 40);
+ this.cbLyrDB.Location = new System.Drawing.Point(214, 17);
this.cbLyrDB.Name = "cbLyrDB";
this.cbLyrDB.Size = new System.Drawing.Size(53, 17);
this.cbLyrDB.TabIndex = 9;
@@ -978,7 +976,7 @@
this.cbActionext.Checked = true;
this.cbActionext.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbActionext.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbActionext.Location = new System.Drawing.Point(216, 19);
+ this.cbActionext.Location = new System.Drawing.Point(134, 61);
this.cbActionext.Name = "cbActionext";
this.cbActionext.Size = new System.Drawing.Size(68, 17);
this.cbActionext.TabIndex = 8;
@@ -992,7 +990,7 @@
this.cbLyrics007.Checked = true;
this.cbLyrics007.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbLyrics007.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbLyrics007.Location = new System.Drawing.Point(20, 61);
+ this.cbLyrics007.Location = new System.Drawing.Point(20, 40);
this.cbLyrics007.Name = "cbLyrics007";
this.cbLyrics007.Size = new System.Drawing.Size(72, 17);
this.cbLyrics007.TabIndex = 4;
@@ -1020,7 +1018,7 @@
this.cbLyricWiki.Checked = true;
this.cbLyricWiki.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbLyricWiki.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbLyricWiki.Location = new System.Drawing.Point(130, 40);
+ this.cbLyricWiki.Location = new System.Drawing.Point(134, 17);
this.cbLyricWiki.Name = "cbLyricWiki";
this.cbLyricWiki.Size = new System.Drawing.Size(67, 17);
this.cbLyricWiki.TabIndex = 2;
@@ -1034,7 +1032,7 @@
this.cbHotLyrics.Checked = true;
this.cbHotLyrics.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbHotLyrics.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbHotLyrics.Location = new System.Drawing.Point(130, 61);
+ this.cbHotLyrics.Location = new System.Drawing.Point(134, 40);
this.cbHotLyrics.Name = "cbHotLyrics";
this.cbHotLyrics.Size = new System.Drawing.Size(71, 17);
this.cbHotLyrics.TabIndex = 7;
@@ -1042,20 +1040,6 @@
this.cbHotLyrics.UseVisualStyleBackColor = true;
this.cbHotLyrics.Leave += new System.EventHandler(this.WriteMediaPortalXML);
//
- // cbLyricsPluginSite
- //
- this.cbLyricsPluginSite.AutoSize = true;
- this.cbLyricsPluginSite.Checked = true;
- this.cbLyricsPluginSite.CheckState = System.Windows.Forms.CheckState.Checked;
- this.cbLyricsPluginSite.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbLyricsPluginSite.Location = new System.Drawing.Point(20, 40);
- this.cbLyricsPluginSite.Name = "cbLyricsPluginSite";
- this.cbLyricsPluginSite.Size = new System.Drawing.Size(80, 17);
- this.cbLyricsPluginSite.TabIndex = 9;
- this.cbLyricsPluginSite.Text = "LyricsPlugin";
- this.cbLyricsPluginSite.UseVisualStyleBackColor = true;
- this.cbLyricsPluginSite.Leave += new System.EventHandler(this.WriteMediaPortalXML);
- //
// groupBox1
//
this.groupBox1.Controls.Add(this.mpLabel2);
@@ -1085,7 +1069,7 @@
this.trackBar.Location = new System.Drawing.Point(35, 37);
this.trackBar.Maximum = 3;
this.trackBar.Name = "trackBar";
- this.trackBar.Size = new System.Drawing.Size(158, 42);
+ this.trackBar.Size = new System.Drawing.Size(158, 45);
this.trackBar.TabIndex = 25;
this.trackBar.TickStyle = System.Windows.Forms.TickStyle.Both;
this.trackBar.Value = 2;
@@ -1214,7 +1198,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(558, 539);
+ this.ClientSize = new System.Drawing.Size(558, 536);
this.ControlBox = false;
this.Controls.Add(this.btClose);
this.Controls.Add(this.tabControl);
@@ -1306,7 +1290,6 @@
private MediaPortal.UserInterface.Controls.MPLabel lbPluginName;
private MediaPortal.UserInterface.Controls.MPGroupBox gbLyricSites;
internal MediaPortal.UserInterface.Controls.MPCheckBox cbHotLyrics;
- internal MediaPortal.UserInterface.Controls.MPCheckBox cbLyricsPluginSite;
internal MediaPortal.UserInterface.Controls.MPCheckBox cbLyricsOnDemand;
internal MediaPortal.UserInterface.Controls.MPCheckBox cbLyrics007;
internal MediaPortal.UserInterface.Controls.MPCheckBox cbLyricWiki;
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs 2010-08-03 19:55:50 UTC (rev 3700)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs 2010-08-04 19:24:50 UTC (rev 3701)
@@ -225,7 +225,6 @@
cbLyrics007.Checked = xmlreader.GetValue("myLyrics", "useLyrics007").Equals("True");
cbLyricsOnDemand.Checked = xmlreader.GetValue("myLyrics", "useLyricsOnDemand").Equals("True");
cbHotLyrics.Checked = xmlreader.GetValue("myLyrics", "useHotLyrics").Equals("True");
- cbLyricsPluginSite.Checked = xmlreader.GetValue("myLyrics", "useLyricsPluginSite").Equals("True");
}
else
{
@@ -500,8 +499,6 @@
sitesToSearch.Add("LyricsOnDemand");
if (cbHotLyrics.Checked)
sitesToSearch.Add("HotLyrics");
- if (cbLyricsPluginSite.Checked)
- sitesToSearch.Add("LyricsPluginSite");
if (sitesToSearch.Count == 0)
{
@@ -1085,8 +1082,7 @@
if (trackBar.Value == 0)
{
cbLyricsOnDemand.Checked = true;
- cbLyricsPluginSite.Checked = false;
- cbLyrics007.Checked = false;
+ cbLyrics007.Checked = true;
cbLrcFinder.Checked = false;
cbLyricWiki.Checked = false;
cbHotLyrics.Checked = false;
@@ -1097,8 +1093,7 @@
{
cbLyricsOnDemand.Checked = true;
cbLyrics007.Checked = true;
- cbLyricsPluginSite.Checked = true;
- cbLrcFinder.Checked = false;
+ cbLrcFinder.Checked = true;
cbLyricWiki.Checked = false;
cbHotLyrics.Checked = false;
cbActionext.Checked = false;
@@ -1107,7 +1102,6 @@
else if (trackBar.Value == 2)
{
cbLyricsOnDemand.Checked = true;
- cbLyricsPluginSite.Checked = true;
cbLyrics007.Checked = true;
cbLrcFinder.Checked = true;
cbLyricWiki.Checked = true;
@@ -1124,7 +1118,6 @@
cbHotLyrics.Checked = true;
cbLyrDB.Checked = true;
cbActionext.Checked = true;
- cbLyricsPluginSite.Checked = true;
}
if (sender != null)
@@ -1142,7 +1135,6 @@
cbLrcFinder.Checked = true;
cbLyricWiki.Checked = true;
cbHotLyrics.Checked = true;
- cbLyricsPluginSite.Checked = true;
trackBar.Value = 2;
}
@@ -1157,7 +1149,6 @@
cbLyrics007.Enabled = false;
cbLrcFinder.Enabled = false;
cbLyricWiki.Enabled = false;
- cbLyricsPluginSite.Enabled = false;
cbHotLyrics.Enabled = false;
cbActionext.Enabled = false;
cbLyrDB.Enabled = false;
@@ -1176,7 +1167,6 @@
cbLyrics007.Enabled = true;
cbLrcFinder.Enabled = true;
cbLyricWiki.Enabled = true;
- cbLyricsPluginSite.Enabled = true;
cbHotLyrics.Enabled = true;
cbActionext.Enabled = true;
cbLyrDB.Enabled = true;
@@ -1192,7 +1182,6 @@
cbHotLyrics.Enabled = false;
cbActionext.Enabled = false;
cbLyrDB.Enabled = false;
- cbLyricsPluginSite.Enabled = false;
cbLyricsOnDemand.Checked = false;
cbLyrics007.Checked = false;
@@ -1201,7 +1190,6 @@
cbHotLyrics.Checked = false;
cbActionext.Checked = false;
cbLyrDB.Checked = false;
- cbLyricsPluginSite.Checked = false;
cbMusicTagAlwaysCheck.Checked = false;
cbMusicTagWrite.Checked = true;
@@ -1241,7 +1229,6 @@
xmlwriter.SetValue("myLyrics", "useLyrics007", cbLyrics007.Checked.ToString());
xmlwriter.SetValue("myLyrics", "useLyricsOnDemand", cbLyricsOnDemand.Checked.ToString());
xmlwriter.SetValue("myLyrics", "useHotLyrics", cbHotLyrics.Checked.ToString());
- xmlwriter.SetValue("myLyrics", "useLyricsPluginSite", cbLyricsPluginSite.Checked.ToString());
xmlwriter.SetValueAsBool("myLyrics", "useAutoscroll", cbUseAutoScrollAsDefault.Checked);
xmlwriter.SetValueAsBool("myLyrics", "uploadLrcToLrcFinder", cbUploadLrcAutomatically.Checked);
xmlwriter.SetValueAsBool("myLyrics", "alwaysAskUploadLrcToLrcFinder", cbAlwaysAskForUploadToLrcFinder.Checked);
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.resx
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.resx 2010-08-03 19:55:50 UTC (rev 3700)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.resx 2010-08-04 19:24:50 UTC (rev 3701)
@@ -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 2010-08-03 19:55:50 UTC (rev 3700)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2010-08-04 19:24:50 UTC (rev 3701)
@@ -98,8 +98,7 @@
private bool _useLyrDB;
private bool _useLyrics007,
- _useLyricsOnDemand,
- _useLyricsPluginSite;
+ _useLyricsOnDemand;
private bool _useLyricWiki;
@@ -686,10 +685,6 @@
: false;
_useLyricsOnDemand =
(xmlreader.GetValueAsString("myLyrics", "useLyricsOnDemand", "True")).Equals("True") ? true : false;
- _useLyricsPluginSite =
- (xmlreader.GetValueAsString("myLyrics", "useLyricsPluginSite", "True")).Equals("True")
- ? true
- : false;
_useHotLyrics = (xmlreader.GetValueAsString("myLyrics", "useHotLyrics", "True")).Equals("True")
? true
: false;
@@ -805,10 +800,6 @@
{
sitesToSearch.Add("HotLyrics");
}
- if (_useLyricsPluginSite && Setup.IsMember("LyricsPluginSite"))
- {
- sitesToSearch.Add("LyricsPluginSite");
- }
_LyricSitesTosearch = (string[])sitesToSearch.ToArray(typeof(string));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
