Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[2761] trunk/plugins/MyLyrics/My Lyrics
|
From: <sa...@us...> - 2009-04-07 08:53:00
|
Revision: 2761
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2761&view=rev
Author: saamand
Date: 2009-04-07 08:52:51 +0000 (Tue, 07 Apr 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.resx
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/LyricsLibrary.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.csproj
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.resx
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.resx 2009-04-06 15:09:56 UTC (rev 2760)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.resx 2009-04-07 08:52:51 UTC (rev 2761)
@@ -124,7 +124,7 @@
</data>
<data name="label2.Text" xml:space="preserve">
<value>- See your lyrics database (containing the songs with a matching lyric).
-- See your marked database (containing the songs that was searched without a matching).
+- See your marked database (containing the songs that were searched without a match).
- You can modify, import, and find an alternative title for a known song amont other things.</value>
</data>
<data name="label8.Text" xml:space="preserve">
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/LyricsLibrary.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/LyricsLibrary.cs 2009-04-06 15:09:56 UTC (rev 2760)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/LyricsLibrary.cs 2009-04-07 08:52:51 UTC (rev 2761)
@@ -776,6 +776,8 @@
CurrentDB = MyLyricsSettings.LyricsDB;
btImportFiles.Enabled = true;
btImportDirs.Enabled = true;
+ btImportTags.Enabled = true;
+ btExportTags.Enabled = true;
updateLyricsTree(false);
}
else if (comboDatabase.SelectedIndex == 1)
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs 2009-04-06 15:09:56 UTC (rev 2760)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs 2009-04-07 08:52:51 UTC (rev 2761)
@@ -37,11 +37,11 @@
this.lbSongsLimit = new MediaPortal.UserInterface.Controls.MPLabel();
this.lbSongsLimitNote = new MediaPortal.UserInterface.Controls.MPLabel();
this.cbSearchOnlyForMarkedSongs = new MediaPortal.UserInterface.Controls.MPCheckBox();
- this.cbDisregardSongWithLyricInTag = new MediaPortal.UserInterface.Controls.MPCheckBox();
- this.cbDisregardVariousArtist = new MediaPortal.UserInterface.Controls.MPCheckBox();
+ this.cbDontSearchSongsWithLyricInTag = new MediaPortal.UserInterface.Controls.MPCheckBox();
+ this.cbDontSearchVariousArtist = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.cbDisregardSongsWithNoLyric = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.cbMarkSongsWithNoLyrics = new MediaPortal.UserInterface.Controls.MPCheckBox();
- this.cbDisconsiderTitlesWithLyrics = new MediaPortal.UserInterface.Controls.MPCheckBox();
+ this.cbDontSearchSongsInLyricDB = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.mpGroupBox1 = new MediaPortal.UserInterface.Controls.MPGroupBox();
this.btStartBatchSearch = new MediaPortal.UserInterface.Controls.MPButton();
this.btCancel = new MediaPortal.UserInterface.Controls.MPButton();
@@ -104,8 +104,8 @@
this.mpLabel2 = new MediaPortal.UserInterface.Controls.MPLabel();
this.trackBar = new System.Windows.Forms.TrackBar();
this.lbSpeed = new MediaPortal.UserInterface.Controls.MPLabel();
- this.rdDefault = new System.Windows.Forms.RadioButton();
- this.rbUserDefined = new System.Windows.Forms.RadioButton();
+ this.rdLyricsMode = new System.Windows.Forms.RadioButton();
+ this.rbUserSelectMode = new System.Windows.Forms.RadioButton();
this.tabPageReplace = new System.Windows.Forms.TabPage();
this.mpGroupBox4 = new MediaPortal.UserInterface.Controls.MPGroupBox();
this.lbArtist = new MediaPortal.UserInterface.Controls.MPLabel();
@@ -193,18 +193,18 @@
this.gbGenerel.Controls.Add(this.lbSongsLimit);
this.gbGenerel.Controls.Add(this.lbSongsLimitNote);
this.gbGenerel.Controls.Add(this.cbSearchOnlyForMarkedSongs);
- this.gbGenerel.Controls.Add(this.cbDisregardSongWithLyricInTag);
- this.gbGenerel.Controls.Add(this.cbDisregardVariousArtist);
+ this.gbGenerel.Controls.Add(this.cbDontSearchSongsWithLyricInTag);
+ this.gbGenerel.Controls.Add(this.cbDontSearchVariousArtist);
this.gbGenerel.Controls.Add(this.cbDisregardSongsWithNoLyric);
this.gbGenerel.Controls.Add(this.cbMarkSongsWithNoLyrics);
- this.gbGenerel.Controls.Add(this.cbDisconsiderTitlesWithLyrics);
+ this.gbGenerel.Controls.Add(this.cbDontSearchSongsInLyricDB);
this.gbGenerel.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
this.gbGenerel.Location = new System.Drawing.Point(5, 5);
this.gbGenerel.Name = "gbGenerel";
this.gbGenerel.Size = new System.Drawing.Size(538, 121);
this.gbGenerel.TabIndex = 35;
this.gbGenerel.TabStop = false;
- this.gbGenerel.Text = "Music database batch search setup";
+ this.gbGenerel.Text = "Music database batch setup";
//
// tbLimit
//
@@ -240,39 +240,39 @@
//
this.cbSearchOnlyForMarkedSongs.AutoSize = true;
this.cbSearchOnlyForMarkedSongs.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbSearchOnlyForMarkedSongs.Location = new System.Drawing.Point(270, 97);
+ this.cbSearchOnlyForMarkedSongs.Location = new System.Drawing.Point(283, 97);
this.cbSearchOnlyForMarkedSongs.Name = "cbSearchOnlyForMarkedSongs";
- this.cbSearchOnlyForMarkedSongs.Size = new System.Drawing.Size(232, 17);
+ this.cbSearchOnlyForMarkedSongs.Size = new System.Drawing.Size(174, 17);
this.cbSearchOnlyForMarkedSongs.TabIndex = 19;
- this.cbSearchOnlyForMarkedSongs.Text = "Search for marked songs ONLY (only batch)";
+ this.cbSearchOnlyForMarkedSongs.Text = "Search for marked songs ONLY";
this.cbSearchOnlyForMarkedSongs.UseVisualStyleBackColor = true;
this.cbSearchOnlyForMarkedSongs.CheckedChanged += new System.EventHandler(this.cbSearchOnlyForMarkedSongs_CheckedChanged);
//
- // cbDisregardSongWithLyricInTag
+ // cbDontSearchSongsWithLyricInTag
//
- this.cbDisregardSongWithLyricInTag.AutoSize = true;
- this.cbDisregardSongWithLyricInTag.Checked = true;
- this.cbDisregardSongWithLyricInTag.CheckState = System.Windows.Forms.CheckState.Checked;
- this.cbDisregardSongWithLyricInTag.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbDisregardSongWithLyricInTag.Location = new System.Drawing.Point(15, 74);
- this.cbDisregardSongWithLyricInTag.Name = "cbDisregardSongWithLyricInTag";
- this.cbDisregardSongWithLyricInTag.Size = new System.Drawing.Size(202, 17);
- this.cbDisregardSongWithLyricInTag.TabIndex = 18;
- this.cbDisregardSongWithLyricInTag.Text = "Disregard songs with lyric in music tag";
- this.cbDisregardSongWithLyricInTag.UseVisualStyleBackColor = true;
+ this.cbDontSearchSongsWithLyricInTag.AutoSize = true;
+ this.cbDontSearchSongsWithLyricInTag.Checked = true;
+ this.cbDontSearchSongsWithLyricInTag.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.cbDontSearchSongsWithLyricInTag.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.cbDontSearchSongsWithLyricInTag.Location = new System.Drawing.Point(19, 74);
+ this.cbDontSearchSongsWithLyricInTag.Name = "cbDontSearchSongsWithLyricInTag";
+ this.cbDontSearchSongsWithLyricInTag.Size = new System.Drawing.Size(217, 17);
+ this.cbDontSearchSongsWithLyricInTag.TabIndex = 18;
+ this.cbDontSearchSongsWithLyricInTag.Text = "Don\'t search songs with lyric in music tag";
+ this.cbDontSearchSongsWithLyricInTag.UseVisualStyleBackColor = true;
//
- // cbDisregardVariousArtist
+ // cbDontSearchVariousArtist
//
- this.cbDisregardVariousArtist.AutoSize = true;
- this.cbDisregardVariousArtist.Checked = true;
- this.cbDisregardVariousArtist.CheckState = System.Windows.Forms.CheckState.Checked;
- this.cbDisregardVariousArtist.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbDisregardVariousArtist.Location = new System.Drawing.Point(15, 97);
- this.cbDisregardVariousArtist.Name = "cbDisregardVariousArtist";
- this.cbDisregardVariousArtist.Size = new System.Drawing.Size(191, 17);
- this.cbDisregardVariousArtist.TabIndex = 17;
- this.cbDisregardVariousArtist.Text = "Disregard songs by \"various artists\"";
- this.cbDisregardVariousArtist.UseVisualStyleBackColor = true;
+ this.cbDontSearchVariousArtist.AutoSize = true;
+ this.cbDontSearchVariousArtist.Checked = true;
+ this.cbDontSearchVariousArtist.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.cbDontSearchVariousArtist.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.cbDontSearchVariousArtist.Location = new System.Drawing.Point(19, 97);
+ this.cbDontSearchVariousArtist.Name = "cbDontSearchVariousArtist";
+ this.cbDontSearchVariousArtist.Size = new System.Drawing.Size(206, 17);
+ this.cbDontSearchVariousArtist.TabIndex = 17;
+ this.cbDontSearchVariousArtist.Text = "Don\'t search songs by \"various artists\"";
+ this.cbDontSearchVariousArtist.UseVisualStyleBackColor = true;
//
// cbDisregardSongsWithNoLyric
//
@@ -280,11 +280,11 @@
this.cbDisregardSongsWithNoLyric.Checked = true;
this.cbDisregardSongsWithNoLyric.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbDisregardSongsWithNoLyric.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbDisregardSongsWithNoLyric.Location = new System.Drawing.Point(270, 74);
+ this.cbDisregardSongsWithNoLyric.Location = new System.Drawing.Point(283, 74);
this.cbDisregardSongsWithNoLyric.Name = "cbDisregardSongsWithNoLyric";
- this.cbDisregardSongsWithNoLyric.Size = new System.Drawing.Size(246, 17);
+ this.cbDisregardSongsWithNoLyric.Size = new System.Drawing.Size(203, 17);
this.cbDisregardSongsWithNoLyric.TabIndex = 16;
- this.cbDisregardSongsWithNoLyric.Text = "Disregard previously marked songs (only batch)";
+ this.cbDisregardSongsWithNoLyric.Text = "Don\'t search previously marked songs";
this.cbDisregardSongsWithNoLyric.UseVisualStyleBackColor = true;
//
// cbMarkSongsWithNoLyrics
@@ -293,25 +293,25 @@
this.cbMarkSongsWithNoLyrics.Checked = true;
this.cbMarkSongsWithNoLyrics.CheckState = System.Windows.Forms.CheckState.Checked;
this.cbMarkSongsWithNoLyrics.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbMarkSongsWithNoLyrics.Location = new System.Drawing.Point(270, 51);
+ this.cbMarkSongsWithNoLyrics.Location = new System.Drawing.Point(283, 51);
this.cbMarkSongsWithNoLyrics.Name = "cbMarkSongsWithNoLyrics";
- this.cbMarkSongsWithNoLyrics.Size = new System.Drawing.Size(224, 17);
+ this.cbMarkSongsWithNoLyrics.Size = new System.Drawing.Size(169, 17);
this.cbMarkSongsWithNoLyrics.TabIndex = 15;
- this.cbMarkSongsWithNoLyrics.Text = "Mark songs to which no lyric can be found";
+ this.cbMarkSongsWithNoLyrics.Text = "Mark song when no lyric found";
this.cbMarkSongsWithNoLyrics.UseVisualStyleBackColor = true;
//
- // cbDisconsiderTitlesWithLyrics
+ // cbDontSearchSongsInLyricDB
//
- this.cbDisconsiderTitlesWithLyrics.AutoSize = true;
- this.cbDisconsiderTitlesWithLyrics.Checked = true;
- this.cbDisconsiderTitlesWithLyrics.CheckState = System.Windows.Forms.CheckState.Checked;
- this.cbDisconsiderTitlesWithLyrics.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.cbDisconsiderTitlesWithLyrics.Location = new System.Drawing.Point(15, 51);
- this.cbDisconsiderTitlesWithLyrics.Name = "cbDisconsiderTitlesWithLyrics";
- this.cbDisconsiderTitlesWithLyrics.Size = new System.Drawing.Size(201, 17);
- this.cbDisconsiderTitlesWithLyrics.TabIndex = 14;
- this.cbDisconsiderTitlesWithLyrics.Text = "Disregard songs with lyric in database";
- this.cbDisconsiderTitlesWithLyrics.UseVisualStyleBackColor = true;
+ this.cbDontSearchSongsInLyricDB.AutoSize = true;
+ this.cbDontSearchSongsInLyricDB.Checked = true;
+ this.cbDontSearchSongsInLyricDB.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.cbDontSearchSongsInLyricDB.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.cbDontSearchSongsInLyricDB.Location = new System.Drawing.Point(19, 51);
+ this.cbDontSearchSongsInLyricDB.Name = "cbDontSearchSongsInLyricDB";
+ this.cbDontSearchSongsInLyricDB.Size = new System.Drawing.Size(236, 17);
+ this.cbDontSearchSongsInLyricDB.TabIndex = 14;
+ this.cbDontSearchSongsInLyricDB.Text = "Don\'t search songs already in lyrics database";
+ this.cbDontSearchSongsInLyricDB.UseVisualStyleBackColor = true;
//
// mpGroupBox1
//
@@ -355,7 +355,7 @@
this.mpLabel3.Size = new System.Drawing.Size(304, 26);
this.mpLabel3.TabIndex = 12;
this.mpLabel3.Text = "Press \'Start\' to fetch lyrics matching content of music database.\r\nPress \'Stop\' t" +
- "o stop an ongoing lyrics search.";
+ "o stop a running batch search.";
//
// gbMessages
//
@@ -809,23 +809,24 @@
this.gbLyricSites.Controls.Add(this.rbLrcMode);
this.gbLyricSites.Controls.Add(this.groupBox2);
this.gbLyricSites.Controls.Add(this.groupBox1);
- this.gbLyricSites.Controls.Add(this.rdDefault);
- this.gbLyricSites.Controls.Add(this.rbUserDefined);
+ this.gbLyricSites.Controls.Add(this.rdLyricsMode);
+ this.gbLyricSites.Controls.Add(this.rbUserSelectMode);
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, 159);
this.gbLyricSites.TabIndex = 28;
this.gbLyricSites.TabStop = false;
- this.gbLyricSites.Text = "Lyrics sites settings";
+ this.gbLyricSites.Text = "Lyrics search mode";
//
// rbLrcMode
//
this.rbLrcMode.AutoSize = true;
- this.rbLrcMode.Location = new System.Drawing.Point(254, 23);
+ this.rbLrcMode.Location = new System.Drawing.Point(110, 23);
this.rbLrcMode.Name = "rbLrcMode";
this.rbLrcMode.Size = new System.Drawing.Size(75, 17);
this.rbLrcMode.TabIndex = 29;
+ this.rbLrcMode.Tag = "LRC mode";
this.rbLrcMode.Text = "LRC mode";
this.rbLrcMode.UseVisualStyleBackColor = true;
this.rbLrcMode.Leave += new System.EventHandler(this.WriteMediaPortalXML);
@@ -846,7 +847,7 @@
this.groupBox2.Size = new System.Drawing.Size(301, 100);
this.groupBox2.TabIndex = 28;
this.groupBox2.TabStop = false;
- this.groupBox2.Text = "User select mode";
+ this.groupBox2.Text = "Selected lyric sites to search";
//
// cbLrcFinder
//
@@ -1005,29 +1006,31 @@
this.lbSpeed.TabIndex = 24;
this.lbSpeed.Text = "Speed";
//
- // rdDefault
+ // rdLyricsMode
//
- this.rdDefault.AutoSize = true;
- this.rdDefault.Location = new System.Drawing.Point(16, 23);
- this.rdDefault.Name = "rdDefault";
- this.rdDefault.Size = new System.Drawing.Size(119, 17);
- this.rdDefault.TabIndex = 23;
- this.rdDefault.Text = "Default select mode";
- this.rdDefault.UseVisualStyleBackColor = true;
- this.rdDefault.Leave += new System.EventHandler(this.WriteMediaPortalXML);
- this.rdDefault.CheckedChanged += new System.EventHandler(this.rdTrackBar_CheckedChanged);
+ this.rdLyricsMode.AutoSize = true;
+ this.rdLyricsMode.Location = new System.Drawing.Point(16, 23);
+ this.rdLyricsMode.Name = "rdLyricsMode";
+ this.rdLyricsMode.Size = new System.Drawing.Size(81, 17);
+ this.rdLyricsMode.TabIndex = 23;
+ this.rdLyricsMode.Tag = "LyricsMode";
+ this.rdLyricsMode.Text = "Lyrics mode";
+ this.rdLyricsMode.UseVisualStyleBackColor = true;
+ this.rdLyricsMode.Leave += new System.EventHandler(this.WriteMediaPortalXML);
+ this.rdLyricsMode.CheckedChanged += new System.EventHandler(this.rdTrackBar_CheckedChanged);
//
- // rbUserDefined
+ // rbUserSelectMode
//
- this.rbUserDefined.AutoSize = true;
- this.rbUserDefined.Location = new System.Drawing.Point(141, 23);
- this.rbUserDefined.Name = "rbUserDefined";
- this.rbUserDefined.Size = new System.Drawing.Size(107, 17);
- this.rbUserDefined.TabIndex = 22;
- this.rbUserDefined.Text = "User select mode";
- this.rbUserDefined.UseVisualStyleBackColor = true;
- this.rbUserDefined.Leave += new System.EventHandler(this.WriteMediaPortalXML);
- this.rbUserDefined.CheckedChanged += new System.EventHandler(this.rdTrackBar_CheckedChanged);
+ this.rbUserSelectMode.AutoSize = true;
+ this.rbUserSelectMode.Location = new System.Drawing.Point(208, 23);
+ this.rbUserSelectMode.Name = "rbUserSelectMode";
+ this.rbUserSelectMode.Size = new System.Drawing.Size(107, 17);
+ this.rbUserSelectMode.TabIndex = 22;
+ this.rbUserSelectMode.Tag = "User select mode";
+ this.rbUserSelectMode.Text = "User select mode";
+ this.rbUserSelectMode.UseVisualStyleBackColor = true;
+ this.rbUserSelectMode.Leave += new System.EventHandler(this.WriteMediaPortalXML);
+ this.rbUserSelectMode.CheckedChanged += new System.EventHandler(this.rdTrackBar_CheckedChanged);
//
// tabPageReplace
//
@@ -1208,8 +1211,8 @@
internal MediaPortal.UserInterface.Controls.MPCheckBox cbLyricsOnDemand;
internal MediaPortal.UserInterface.Controls.MPCheckBox cbLyrics007;
internal MediaPortal.UserInterface.Controls.MPCheckBox cbLyricWiki;
- private System.Windows.Forms.RadioButton rdDefault;
- private System.Windows.Forms.RadioButton rbUserDefined;
+ private System.Windows.Forms.RadioButton rdLyricsMode;
+ private System.Windows.Forms.RadioButton rbUserSelectMode;
private MediaPortal.UserInterface.Controls.MPLabel mpLabel2;
private MediaPortal.UserInterface.Controls.MPLabel lbSpeed;
private System.Windows.Forms.TrackBar trackBar;
@@ -1220,10 +1223,10 @@
private MediaPortal.UserInterface.Controls.MPLabel lbSongsLimit;
private MediaPortal.UserInterface.Controls.MPLabel lbSongsLimitNote;
private MediaPortal.UserInterface.Controls.MPCheckBox cbSearchOnlyForMarkedSongs;
- private MediaPortal.UserInterface.Controls.MPCheckBox cbDisregardVariousArtist;
+ private MediaPortal.UserInterface.Controls.MPCheckBox cbDontSearchVariousArtist;
private MediaPortal.UserInterface.Controls.MPCheckBox cbDisregardSongsWithNoLyric;
private MediaPortal.UserInterface.Controls.MPCheckBox cbMarkSongsWithNoLyrics;
- private MediaPortal.UserInterface.Controls.MPCheckBox cbDisconsiderTitlesWithLyrics;
+ private MediaPortal.UserInterface.Controls.MPCheckBox cbDontSearchSongsInLyricDB;
private MediaPortal.UserInterface.Controls.MPGroupBox mpGroupBox3;
internal MediaPortal.UserInterface.Controls.MPCheckBox cbAutoFetch;
internal MediaPortal.UserInterface.Controls.MPCheckBox cbMoveSongFrom;
@@ -1241,7 +1244,7 @@
private MediaPortal.UserInterface.Controls.MPGroupBox mpGroupBox4;
private MediaPortal.UserInterface.Controls.MPLabel lbArtist;
internal MediaPortal.UserInterface.Controls.MPCheckBox cbMusicTagAlwaysCheck;
- private MediaPortal.UserInterface.Controls.MPCheckBox cbDisregardSongWithLyricInTag;
+ private MediaPortal.UserInterface.Controls.MPCheckBox cbDontSearchSongsWithLyricInTag;
internal MediaPortal.UserInterface.Controls.MPCheckBox cbLyrDB;
private MediaPortal.UserInterface.Controls.MPGroupBox gbGUI;
private MediaPortal.UserInterface.Controls.MPTextBox tbLyricsLimit;
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs 2009-04-06 15:09:56 UTC (rev 2760)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs 2009-04-07 08:52:51 UTC (rev 2761)
@@ -245,6 +245,24 @@
{
try
{
+
+ string sitesMode = ((string)xmlreader.GetValueAsString("myLyrics", "sitesMode", rdLyricsMode.Tag as string)).ToString();
+
+ if (sitesMode.Equals(rdLyricsMode.Tag))
+ {
+ rdLyricsMode.Checked = true;
+ }
+ else if (sitesMode.Equals(rbUserSelectMode.Tag))
+ {
+ rbUserSelectMode.Checked = true;
+ }
+ else
+ {
+ rbLrcMode.Checked = true;
+ }
+
+ rdTrackBar_CheckedChanged(null, null);
+
tbLimit.Text = xmlreader.GetValueAsString("myLyrics", "limit", m_TotalTitles.ToString());
tbPluginName.Text = xmlreader.GetValueAsString("myLyrics", "pluginsName", "My Lyrics");
@@ -265,8 +283,8 @@
lbSongsLimitNote.Text = ("(You have currently " + m_TotalTitles.ToString() + " titles in your music database)");
trackBar.Value = ((int)xmlreader.GetValueAsInt("myLyrics", "defaultSitesModeValue", 2));
- rdDefault.Checked = ((string)xmlreader.GetValueAsString("myLyrics", "useDefaultSitesMode", "True")).ToString().Equals("True") ? true : false;
+
m_find = xmlreader.GetValueAsString("myLyrics", "find", "");
m_replace = xmlreader.GetValueAsString("myLyrics", "replace", "");
@@ -294,21 +312,6 @@
}
}
}
-
- if (!rdDefault.Checked)
- {
- trackBar.Enabled = false;
- rbUserDefined.Checked = true;
-
- cbLrcFinder.Checked = ((string)xmlreader.GetValueAsString("myLyrics", "useLrcFinder", "True")).ToString().Equals("True") ? true : false;
- cbLyricWiki.Checked = ((string)xmlreader.GetValueAsString("myLyrics", "useLyricWiki", "True")).ToString().Equals("True") ? true : false;
- cbActionext.Checked = ((string)xmlreader.GetValueAsString("myLyrics", "useActionext", "True")).ToString().Equals("True") ? true : false;
- cbLyrDB.Checked = ((string)xmlreader.GetValueAsString("myLyrics", "useLyrDB", "True")).ToString().Equals("True") ? true : false;
- cbLyrics007.Checked = ((string)xmlreader.GetValueAsString("myLyrics", "useLyrics007", "True")).ToString().Equals("True") ? true : false;
- 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;
- }
}
catch (Exception ex)
{
@@ -431,11 +434,11 @@
return;
}
- m_DisregardKnownLyric = cbDisconsiderTitlesWithLyrics.Enabled && cbDisconsiderTitlesWithLyrics.Checked;
+ m_DisregardKnownLyric = cbDontSearchSongsInLyricDB.Enabled && cbDontSearchSongsInLyricDB.Checked;
m_MarkSongsWhenNoLyricFound = cbMarkSongsWithNoLyrics.Enabled && cbMarkSongsWithNoLyrics.Checked;
m_DisregardMarkedLyric = cbDisregardSongsWithNoLyric.Enabled && cbDisregardSongsWithNoLyric.Checked;
- m_DisregardSongWithLyricInTag = cbDisregardSongWithLyricInTag.Enabled && cbDisregardSongWithLyricInTag.Checked;
- m_DisregardVariousArtist = cbDisregardVariousArtist.Enabled && cbDisregardVariousArtist.Checked;
+ m_DisregardSongWithLyricInTag = cbDontSearchSongsWithLyricInTag.Enabled && cbDontSearchSongsWithLyricInTag.Checked;
+ m_DisregardVariousArtist = cbDontSearchVariousArtist.Enabled && cbDontSearchVariousArtist.Checked;
m_SearchOnlyMarkedSongs = cbSearchOnlyForMarkedSongs.Enabled && cbSearchOnlyForMarkedSongs.Checked;
if (m_SearchOnlyMarkedSongs)
@@ -977,18 +980,18 @@
{
if (cbSearchOnlyForMarkedSongs.Checked)
{
- cbDisconsiderTitlesWithLyrics.Enabled = false;
+ cbDontSearchSongsInLyricDB.Enabled = false;
cbDisregardSongsWithNoLyric.Enabled = false;
- cbDisregardSongWithLyricInTag.Enabled = false;
- cbDisregardVariousArtist.Enabled = false;
+ cbDontSearchSongsWithLyricInTag.Enabled = false;
+ cbDontSearchVariousArtist.Enabled = false;
cbMarkSongsWithNoLyrics.Enabled = false;
}
else
{
- cbDisconsiderTitlesWithLyrics.Enabled = true;
+ cbDontSearchSongsInLyricDB.Enabled = true;
cbDisregardSongsWithNoLyric.Enabled = true;
- cbDisregardSongWithLyricInTag.Enabled = true;
- cbDisregardVariousArtist.Enabled = true;
+ cbDontSearchSongsWithLyricInTag.Enabled = true;
+ cbDontSearchVariousArtist.Enabled = true;
cbMarkSongsWithNoLyrics.Enabled = true;
}
}
@@ -1084,7 +1087,7 @@
private void rdTrackBar_CheckedChanged(object sender, EventArgs e)
{
- if (rdDefault.Checked)
+ if (rdLyricsMode.Checked)
{
trackBar.Enabled = true;
cbLyricsOnDemand.Enabled = false;
@@ -1096,8 +1099,15 @@
cbActionext.Enabled = false;
cbLyrDB.Enabled = false;
trackBar_Scroll(null, null);
+
+ cbMusicTagAlwaysCheck.Checked = true;
+ cbMusicTagWrite.Checked = true;
+
+ cbDontSearchSongsInLyricDB.Checked = true;
+ cbDontSearchSongsWithLyricInTag.Checked = true;
+
}
- else if (rbUserDefined.Checked)
+ else if (rbUserSelectMode.Checked)
{
trackBar.Enabled = false;
cbLyricsOnDemand.Enabled = true;
@@ -1130,6 +1140,12 @@
cbSeekLyrics.Checked = false;
cbActionext.Checked = false;
cbLyrDB.Checked = false;
+
+ cbMusicTagAlwaysCheck.Checked = false;
+ cbMusicTagWrite.Checked = true;
+
+ cbDontSearchSongsInLyricDB.Checked = false;
+ cbDontSearchSongsWithLyricInTag.Checked = false;
}
}
@@ -1137,7 +1153,21 @@
{
using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings("MediaPortal.xml"))
{
- xmlwriter.SetValue("myLyrics", "useDefaultSitesMode", rdDefault.Checked.ToString());
+ string sitesMode = string.Empty;
+ if (rdLyricsMode.Checked)
+ {
+ sitesMode = rdLyricsMode.Tag as string;
+ }
+ else if (rbUserSelectMode.Checked)
+ {
+ sitesMode = rbUserSelectMode.Tag as string;
+ }
+ else
+ {
+ sitesMode = rbLrcMode.Tag as string;
+ }
+
+ xmlwriter.SetValue("myLyrics", "sitesMode", sitesMode);
xmlwriter.SetValue("myLyrics", "defaultSitesModeValue", trackBar.Value);
xmlwriter.SetValue("myLyrics", "limit", tbLimit.Text);
xmlwriter.SetValue("myLyrics", "pluginsName", tbPluginName.Text);
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.resx
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.resx 2009-04-06 15:09:56 UTC (rev 2760)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.resx 2009-04-07 08:52:51 UTC (rev 2761)
@@ -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.csproj
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2009-04-06 15:09:56 UTC (rev 2760)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2009-04-07 08:52:51 UTC (rev 2761)
@@ -5,7 +5,7 @@
<ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{BBB2DAE2-0D83-4B4B-85B6-D1B5A7E10039}</ProjectGuid>
- <OutputType>Library</OutputType>
+ <OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MyLyrics</RootNamespace>
<AssemblyName>MyLyrics</AssemblyName>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
