Menu
▾
▴
mp-plugins-svn
|
From: <sa...@us...> - 2008-12-22 17:06:46
|
Revision: 2458
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2458&view=rev
Author: saamand
Date: 2008-12-22 17:06:41 +0000 (Mon, 22 Dec 2008)
Log Message:
-----------
MyLyrics version 1.1 Final (really!)
Modified Paths:
--------------
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/LyricsLibrary.Designer.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/LyricsLibrary.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.resx
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/LyricsLibrary.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/LyricsLibrary.Designer.cs 2008-12-22 16:03:38 UTC (rev 2457)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/LyricsLibrary.Designer.cs 2008-12-22 17:06:41 UTC (rev 2458)
@@ -14,56 +14,64 @@
/// </summary>
private void InitializeComponent()
{
- this.btSave = new MediaPortal.UserInterface.Controls.MPButton();
this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
- this.btDelete = new System.Windows.Forms.Button();
- this.btAdd = new System.Windows.Forms.Button();
- this.gbLibrary = new MediaPortal.UserInterface.Controls.MPGroupBox();
- this.btRefresh = new System.Windows.Forms.Button();
- this.tbLyrics = new System.Windows.Forms.TextBox();
- this.gbExport = new MediaPortal.UserInterface.Controls.MPGroupBox();
- this.btExportTags = new MediaPortal.UserInterface.Controls.MPButton();
- this.btImportTags = new MediaPortal.UserInterface.Controls.MPButton();
- this.gbImport = new MediaPortal.UserInterface.Controls.MPGroupBox();
- this.btImportFiles = new MediaPortal.UserInterface.Controls.MPButton();
- this.btImportDirs = new MediaPortal.UserInterface.Controls.MPButton();
+ this.gbResetDatabase = new MediaPortal.UserInterface.Controls.MPGroupBox();
+ this.btResetMarkedLyricsDatabase = new System.Windows.Forms.Button();
+ this.btResetLyricsDatabase = new System.Windows.Forms.Button();
+ this.lbResetDatabase = new MediaPortal.UserInterface.Controls.MPLabel();
+ this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
+ this.label1 = new System.Windows.Forms.Label();
+ this.mpLabel4 = new MediaPortal.UserInterface.Controls.MPLabel();
+ this.textBox1 = new System.Windows.Forms.TextBox();
+ this.mpLabel5 = new MediaPortal.UserInterface.Controls.MPLabel();
+ this.mpGroupBox5 = new MediaPortal.UserInterface.Controls.MPGroupBox();
+ this.mpButton1 = new MediaPortal.UserInterface.Controls.MPButton();
+ this.mpButton2 = new MediaPortal.UserInterface.Controls.MPButton();
+ this.mpComboBox1 = new MediaPortal.UserInterface.Controls.MPComboBox();
+ this.treeView1 = new System.Windows.Forms.TreeView();
+ this.mpLabel6 = new MediaPortal.UserInterface.Controls.MPLabel();
+ this.mpGroupBox6 = new MediaPortal.UserInterface.Controls.MPGroupBox();
+ this.mpButton3 = new MediaPortal.UserInterface.Controls.MPButton();
+ this.mpButton4 = new MediaPortal.UserInterface.Controls.MPButton();
+ this.mpGroupBox7 = new MediaPortal.UserInterface.Controls.MPGroupBox();
+ this.mpButton5 = new MediaPortal.UserInterface.Controls.MPButton();
+ this.button3 = new System.Windows.Forms.Button();
+ this.mpLabel7 = new MediaPortal.UserInterface.Controls.MPLabel();
+ this.mpLabel8 = new MediaPortal.UserInterface.Controls.MPLabel();
+ this.mpGroupBox8 = new MediaPortal.UserInterface.Controls.MPGroupBox();
+ this.mpButton6 = new MediaPortal.UserInterface.Controls.MPButton();
+ this.mpButton7 = new MediaPortal.UserInterface.Controls.MPButton();
this.gbEditLyrics = new MediaPortal.UserInterface.Controls.MPGroupBox();
this.btSearchSingle = new MediaPortal.UserInterface.Controls.MPButton();
+ this.btSave = new MediaPortal.UserInterface.Controls.MPButton();
+ this.lbTitle = new MediaPortal.UserInterface.Controls.MPLabel();
+ this.lbArtists = new MediaPortal.UserInterface.Controls.MPLabel();
this.gbAddRemove = new MediaPortal.UserInterface.Controls.MPGroupBox();
+ this.btAdd = new System.Windows.Forms.Button();
this.btSwitch = new MediaPortal.UserInterface.Controls.MPButton();
+ this.btDelete = new System.Windows.Forms.Button();
+ this.gbImport = new MediaPortal.UserInterface.Controls.MPGroupBox();
+ this.btImportDirs = new MediaPortal.UserInterface.Controls.MPButton();
+ this.btImportFiles = new MediaPortal.UserInterface.Controls.MPButton();
+ this.lbArtists2 = new MediaPortal.UserInterface.Controls.MPLabel();
+ this.treeView = new System.Windows.Forms.TreeView();
this.comboDatabase = new MediaPortal.UserInterface.Controls.MPComboBox();
+ this.gbExport = new MediaPortal.UserInterface.Controls.MPGroupBox();
+ this.btImportTags = new MediaPortal.UserInterface.Controls.MPButton();
+ this.btExportTags = new MediaPortal.UserInterface.Controls.MPButton();
+ this.lbSongs = new MediaPortal.UserInterface.Controls.MPLabel();
+ this.tbLyrics = new System.Windows.Forms.TextBox();
+ this.lbSongs2 = new MediaPortal.UserInterface.Controls.MPLabel();
+ this.lbLRCTest = new System.Windows.Forms.Label();
+ this.btRefresh = new System.Windows.Forms.Button();
this.lbDatabase = new MediaPortal.UserInterface.Controls.MPLabel();
- this.lbLRCTest = new System.Windows.Forms.Label();
- this.lbSongs2 = new MediaPortal.UserInterface.Controls.MPLabel();
- this.lbSongs = new MediaPortal.UserInterface.Controls.MPLabel();
- this.lbArtists2 = new MediaPortal.UserInterface.Controls.MPLabel();
- this.lbTitle = new MediaPortal.UserInterface.Controls.MPLabel();
- this.lbArtists = new MediaPortal.UserInterface.Controls.MPLabel();
- this.treeView = new System.Windows.Forms.TreeView();
- this.gbResetDatabase = new MediaPortal.UserInterface.Controls.MPGroupBox();
- this.btResetMarkedLyricsDatabase = new System.Windows.Forms.Button();
- this.btResetLyricsDatabase = new System.Windows.Forms.Button();
- this.lbResetDatabase = new MediaPortal.UserInterface.Controls.MPLabel();
- this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
- this.gbLibrary.SuspendLayout();
- this.gbExport.SuspendLayout();
- this.gbImport.SuspendLayout();
+ this.gbResetDatabase.SuspendLayout();
this.gbEditLyrics.SuspendLayout();
this.gbAddRemove.SuspendLayout();
- this.gbResetDatabase.SuspendLayout();
+ this.gbImport.SuspendLayout();
+ this.gbExport.SuspendLayout();
this.SuspendLayout();
//
- // btSave
- //
- this.btSave.Enabled = false;
- this.btSave.Location = new System.Drawing.Point(4, 19);
- this.btSave.Name = "btSave";
- this.btSave.Size = new System.Drawing.Size(68, 23);
- this.btSave.TabIndex = 7;
- this.btSave.Text = "&Save";
- this.btSave.UseVisualStyleBackColor = true;
- this.btSave.Click += new System.EventHandler(this.btSave_Click);
- //
// openFileDialog1
//
this.openFileDialog1.Filter = "Text and LRC files|*-*.txt;*.lrc|Text files|*-*.txt|LRC files|*.lrc|All files|*.*" +
@@ -73,141 +81,272 @@
this.openFileDialog1.RestoreDirectory = true;
this.openFileDialog1.Title = "Select lyrics files to include";
//
- // btDelete
+ // gbResetDatabase
//
- this.btDelete.Location = new System.Drawing.Point(75, 19);
- this.btDelete.Name = "btDelete";
- this.btDelete.Size = new System.Drawing.Size(65, 23);
- this.btDelete.TabIndex = 3;
- this.btDelete.Text = "&Delete";
- this.btDelete.UseVisualStyleBackColor = true;
- this.btDelete.Click += new System.EventHandler(this.btDelete_Click);
+ this.gbResetDatabase.Controls.Add(this.btResetMarkedLyricsDatabase);
+ this.gbResetDatabase.Controls.Add(this.btResetLyricsDatabase);
+ this.gbResetDatabase.Controls.Add(this.lbResetDatabase);
+ this.gbResetDatabase.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.gbResetDatabase.Location = new System.Drawing.Point(5, 427);
+ this.gbResetDatabase.Name = "gbResetDatabase";
+ this.gbResetDatabase.Size = new System.Drawing.Size(538, 49);
+ this.gbResetDatabase.TabIndex = 11;
+ this.gbResetDatabase.TabStop = false;
+ this.gbResetDatabase.Text = "Reset database";
//
- // btAdd
+ // btResetMarkedLyricsDatabase
//
- this.btAdd.Location = new System.Drawing.Point(6, 19);
- this.btAdd.Name = "btAdd";
- this.btAdd.Size = new System.Drawing.Size(65, 23);
- this.btAdd.TabIndex = 2;
- this.btAdd.Text = "&Add";
- this.btAdd.UseVisualStyleBackColor = true;
- this.btAdd.Click += new System.EventHandler(this.btAdd_Click);
+ this.btResetMarkedLyricsDatabase.Location = new System.Drawing.Point(457, 18);
+ this.btResetMarkedLyricsDatabase.Name = "btResetMarkedLyricsDatabase";
+ this.btResetMarkedLyricsDatabase.Size = new System.Drawing.Size(75, 23);
+ this.btResetMarkedLyricsDatabase.TabIndex = 11;
+ this.btResetMarkedLyricsDatabase.Text = "MarkedDB";
+ this.btResetMarkedLyricsDatabase.UseVisualStyleBackColor = true;
+ this.btResetMarkedLyricsDatabase.Click += new System.EventHandler(this.button1_Click);
//
- // gbLibrary
+ // btResetLyricsDatabase
//
- this.gbLibrary.Controls.Add(this.btRefresh);
- this.gbLibrary.Controls.Add(this.tbLyrics);
- this.gbLibrary.Controls.Add(this.gbExport);
- this.gbLibrary.Controls.Add(this.gbImport);
- this.gbLibrary.Controls.Add(this.gbEditLyrics);
- this.gbLibrary.Controls.Add(this.gbAddRemove);
- this.gbLibrary.Controls.Add(this.comboDatabase);
- this.gbLibrary.Controls.Add(this.lbDatabase);
- this.gbLibrary.Controls.Add(this.lbLRCTest);
- this.gbLibrary.Controls.Add(this.lbSongs2);
- this.gbLibrary.Controls.Add(this.lbSongs);
- this.gbLibrary.Controls.Add(this.lbArtists2);
- this.gbLibrary.Controls.Add(this.lbTitle);
- this.gbLibrary.Controls.Add(this.lbArtists);
- this.gbLibrary.Controls.Add(this.treeView);
- this.gbLibrary.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.gbLibrary.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.gbLibrary.Location = new System.Drawing.Point(5, 5);
- this.gbLibrary.Name = "gbLibrary";
- this.gbLibrary.Size = new System.Drawing.Size(538, 416);
- this.gbLibrary.TabIndex = 8;
- this.gbLibrary.TabStop = false;
- this.gbLibrary.Text = "Editor";
+ this.btResetLyricsDatabase.Location = new System.Drawing.Point(376, 18);
+ this.btResetLyricsDatabase.Name = "btResetLyricsDatabase";
+ this.btResetLyricsDatabase.Size = new System.Drawing.Size(75, 23);
+ this.btResetLyricsDatabase.TabIndex = 10;
+ this.btResetLyricsDatabase.Text = "LyricsDB";
+ this.btResetLyricsDatabase.UseVisualStyleBackColor = true;
+ this.btResetLyricsDatabase.Click += new System.EventHandler(this.btResetDatabase_Click);
//
- // btRefresh
+ // lbResetDatabase
//
- this.btRefresh.Location = new System.Drawing.Point(242, 15);
- this.btRefresh.Name = "btRefresh";
- this.btRefresh.Size = new System.Drawing.Size(55, 21);
- this.btRefresh.TabIndex = 36;
- this.btRefresh.Text = "&Refresh";
- this.btRefresh.UseVisualStyleBackColor = true;
- this.btRefresh.Click += new System.EventHandler(this.btRefresh_Click);
+ this.lbResetDatabase.Location = new System.Drawing.Point(11, 14);
+ this.lbResetDatabase.Name = "lbResetDatabase";
+ this.lbResetDatabase.Size = new System.Drawing.Size(353, 30);
+ this.lbResetDatabase.TabIndex = 9;
+ this.lbResetDatabase.Text = "Reset the lyrics database or the database with\r\nmarked titles. All data in the da" +
+ "tabase will be permanately lost.";
//
- // tbLyrics
+ // folderBrowserDialog1
//
- this.tbLyrics.Location = new System.Drawing.Point(241, 78);
- this.tbLyrics.Multiline = true;
- this.tbLyrics.Name = "tbLyrics";
- this.tbLyrics.Size = new System.Drawing.Size(285, 213);
- this.tbLyrics.TabIndex = 35;
- this.tbLyrics.KeyUp += new System.Windows.Forms.KeyEventHandler(this.tbLyrics_KeyUp);
+ this.folderBrowserDialog1.Description = "Select a directory to search for lyrics or lrc-files. All files matching the patt" +
+ "erns [Artist]-[Title].txt and *.lrc will be included to the lyrics database.";
+ this.folderBrowserDialog1.ShowNewFolderButton = false;
//
- // gbExport
+ // label1
//
- this.gbExport.Controls.Add(this.btExportTags);
- this.gbExport.Controls.Add(this.btImportTags);
- this.gbExport.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.gbExport.Location = new System.Drawing.Point(235, 354);
- this.gbExport.Name = "gbExport";
- this.gbExport.Size = new System.Drawing.Size(291, 52);
- this.gbExport.TabIndex = 34;
- this.gbExport.TabStop = false;
- this.gbExport.Text = "Import / Export lyrics from music tags";
+ this.label1.AutoSize = true;
+ this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label1.Location = new System.Drawing.Point(463, 317);
+ this.label1.MaximumSize = new System.Drawing.Size(60, 13);
+ this.label1.MinimumSize = new System.Drawing.Size(60, 13);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(60, 13);
+ this.label1.TabIndex = 25;
+ this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
- // btExportTags
+ // mpLabel4
//
- this.btExportTags.Location = new System.Drawing.Point(77, 19);
- this.btExportTags.Name = "btExportTags";
- this.btExportTags.Size = new System.Drawing.Size(68, 23);
- this.btExportTags.TabIndex = 6;
- this.btExportTags.Text = "Export";
- this.btExportTags.UseVisualStyleBackColor = true;
- this.btExportTags.Click += new System.EventHandler(this.btExportTags_Click);
+ this.mpLabel4.Location = new System.Drawing.Point(77, 70);
+ this.mpLabel4.Name = "mpLabel4";
+ this.mpLabel4.Size = new System.Drawing.Size(65, 15);
+ this.mpLabel4.TabIndex = 23;
+ this.mpLabel4.Text = "-";
//
- // btImportTags
+ // textBox1
//
- this.btImportTags.Location = new System.Drawing.Point(4, 19);
- this.btImportTags.Name = "btImportTags";
- this.btImportTags.Size = new System.Drawing.Size(68, 23);
- this.btImportTags.TabIndex = 6;
- this.btImportTags.Text = "Import";
- this.btImportTags.UseVisualStyleBackColor = true;
- this.btImportTags.Click += new System.EventHandler(this.btImportTags_Click);
+ this.textBox1.Anchor = System.Windows.Forms.AnchorStyles.None;
+ this.textBox1.CausesValidation = false;
+ this.textBox1.Location = new System.Drawing.Point(252, 84);
+ this.textBox1.Multiline = true;
+ this.textBox1.Name = "textBox1";
+ this.textBox1.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+ this.textBox1.Size = new System.Drawing.Size(291, 213);
+ this.textBox1.TabIndex = 35;
//
- // gbImport
+ // mpLabel5
//
- this.gbImport.Controls.Add(this.btImportFiles);
- this.gbImport.Controls.Add(this.btImportDirs);
- this.gbImport.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.gbImport.Location = new System.Drawing.Point(14, 354);
- this.gbImport.Name = "gbImport";
- this.gbImport.Size = new System.Drawing.Size(215, 52);
- this.gbImport.TabIndex = 33;
- this.gbImport.TabStop = false;
- this.gbImport.Text = "Import lyrics from files";
+ this.mpLabel5.Location = new System.Drawing.Point(6, 70);
+ this.mpLabel5.Name = "mpLabel5";
+ this.mpLabel5.Size = new System.Drawing.Size(60, 15);
+ this.mpLabel5.TabIndex = 22;
+ this.mpLabel5.Text = "Songs:";
//
- // btImportFiles
+ // mpGroupBox5
//
- this.btImportFiles.Location = new System.Drawing.Point(6, 19);
- this.btImportFiles.Name = "btImportFiles";
- this.btImportFiles.Size = new System.Drawing.Size(65, 23);
- this.btImportFiles.TabIndex = 4;
- this.btImportFiles.Text = "&Import files";
- this.btImportFiles.UseVisualStyleBackColor = true;
- this.btImportFiles.Click += new System.EventHandler(this.btImportSingle_Click);
+ this.mpGroupBox5.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.mpGroupBox5.Location = new System.Drawing.Point(251, 362);
+ this.mpGroupBox5.Name = "mpGroupBox5";
+ this.mpGroupBox5.Size = new System.Drawing.Size(293, 52);
+ this.mpGroupBox5.TabIndex = 34;
+ this.mpGroupBox5.TabStop = false;
+ this.mpGroupBox5.Text = "Import / Export lyrics from music tags";
//
- // btImportDirs
+ // mpButton1
//
- this.btImportDirs.Location = new System.Drawing.Point(75, 19);
- this.btImportDirs.Name = "btImportDirs";
- this.btImportDirs.Size = new System.Drawing.Size(65, 23);
- this.btImportDirs.TabIndex = 5;
- this.btImportDirs.Text = "Import &dirs";
- this.btImportDirs.UseVisualStyleBackColor = true;
- this.btImportDirs.Click += new System.EventHandler(this.btImportDIRS_Click);
+ this.mpButton1.Location = new System.Drawing.Point(77, 19);
+ this.mpButton1.Name = "mpButton1";
+ this.mpButton1.Size = new System.Drawing.Size(68, 23);
+ this.mpButton1.TabIndex = 6;
+ this.mpButton1.Text = "Export";
+ this.mpButton1.UseVisualStyleBackColor = true;
//
+ // mpButton2
+ //
+ this.mpButton2.Location = new System.Drawing.Point(4, 19);
+ this.mpButton2.Name = "mpButton2";
+ this.mpButton2.Size = new System.Drawing.Size(68, 23);
+ this.mpButton2.TabIndex = 6;
+ this.mpButton2.Text = "Import";
+ this.mpButton2.UseVisualStyleBackColor = true;
+ //
+ // mpComboBox1
+ //
+ this.mpComboBox1.BorderColor = System.Drawing.Color.Empty;
+ this.mpComboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.mpComboBox1.FormattingEnabled = true;
+ this.mpComboBox1.Items.AddRange(new object[] {
+ "Lyrics database",
+ "Marked database",
+ "Lyrics database",
+ "Marked database",
+ "Lyrics database",
+ "Marked database",
+ "Lyrics database",
+ "Marked database",
+ "Lyrics database",
+ "Marked database",
+ "Lyrics database",
+ "Marked database",
+ "Lyrics database",
+ "Marked database",
+ "Lyrics database",
+ "Marked database"});
+ this.mpComboBox1.Location = new System.Drawing.Point(80, 23);
+ this.mpComboBox1.Name = "mpComboBox1";
+ this.mpComboBox1.Size = new System.Drawing.Size(144, 21);
+ this.mpComboBox1.TabIndex = 1;
+ //
+ // treeView1
+ //
+ this.treeView1.Location = new System.Drawing.Point(9, 84);
+ this.treeView1.Name = "treeView1";
+ this.treeView1.Size = new System.Drawing.Size(235, 213);
+ this.treeView1.TabIndex = 2;
+ //
+ // mpLabel6
+ //
+ this.mpLabel6.Location = new System.Drawing.Point(77, 55);
+ this.mpLabel6.Name = "mpLabel6";
+ this.mpLabel6.Size = new System.Drawing.Size(65, 15);
+ this.mpLabel6.TabIndex = 21;
+ this.mpLabel6.Text = "-";
+ //
+ // mpGroupBox6
+ //
+ this.mpGroupBox6.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.mpGroupBox6.Location = new System.Drawing.Point(6, 362);
+ this.mpGroupBox6.Name = "mpGroupBox6";
+ this.mpGroupBox6.Size = new System.Drawing.Size(238, 52);
+ this.mpGroupBox6.TabIndex = 33;
+ this.mpGroupBox6.TabStop = false;
+ this.mpGroupBox6.Text = "Import lyrics from files";
+ //
+ // mpButton3
+ //
+ this.mpButton3.Location = new System.Drawing.Point(6, 19);
+ this.mpButton3.Name = "mpButton3";
+ this.mpButton3.Size = new System.Drawing.Size(65, 23);
+ this.mpButton3.TabIndex = 4;
+ this.mpButton3.Text = "&Import files";
+ this.mpButton3.UseVisualStyleBackColor = true;
+ //
+ // mpButton4
+ //
+ this.mpButton4.Location = new System.Drawing.Point(77, 19);
+ this.mpButton4.Name = "mpButton4";
+ this.mpButton4.Size = new System.Drawing.Size(65, 23);
+ this.mpButton4.TabIndex = 5;
+ this.mpButton4.Text = "Import &dirs";
+ this.mpButton4.UseVisualStyleBackColor = true;
+ //
+ // mpGroupBox7
+ //
+ this.mpGroupBox7.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.mpGroupBox7.Location = new System.Drawing.Point(6, 304);
+ this.mpGroupBox7.Name = "mpGroupBox7";
+ this.mpGroupBox7.Size = new System.Drawing.Size(238, 52);
+ this.mpGroupBox7.TabIndex = 30;
+ this.mpGroupBox7.TabStop = false;
+ this.mpGroupBox7.Text = "Add / remove / move lyrics";
+ //
+ // mpButton5
+ //
+ this.mpButton5.Location = new System.Drawing.Point(148, 19);
+ this.mpButton5.Name = "mpButton5";
+ this.mpButton5.Size = new System.Drawing.Size(65, 23);
+ this.mpButton5.TabIndex = 29;
+ this.mpButton5.Text = "&Move";
+ this.mpButton5.UseVisualStyleBackColor = true;
+ //
+ // button3
+ //
+ this.button3.Location = new System.Drawing.Point(6, 19);
+ this.button3.Name = "button3";
+ this.button3.Size = new System.Drawing.Size(65, 23);
+ this.button3.TabIndex = 2;
+ this.button3.Text = "&Add";
+ this.button3.UseVisualStyleBackColor = true;
+ //
+ // mpLabel7
+ //
+ this.mpLabel7.Location = new System.Drawing.Point(6, 55);
+ this.mpLabel7.Name = "mpLabel7";
+ this.mpLabel7.Size = new System.Drawing.Size(60, 15);
+ this.mpLabel7.TabIndex = 20;
+ this.mpLabel7.Text = "Artists:";
+ //
+ // mpLabel8
+ //
+ this.mpLabel8.AutoSize = true;
+ this.mpLabel8.Location = new System.Drawing.Point(252, 55);
+ this.mpLabel8.MaximumSize = new System.Drawing.Size(290, 26);
+ this.mpLabel8.MinimumSize = new System.Drawing.Size(290, 26);
+ this.mpLabel8.Name = "mpLabel8";
+ this.mpLabel8.Size = new System.Drawing.Size(290, 26);
+ this.mpLabel8.TabIndex = 4;
+ this.mpLabel8.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
+ //
+ // mpGroupBox8
+ //
+ this.mpGroupBox8.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.mpGroupBox8.Location = new System.Drawing.Point(251, 304);
+ this.mpGroupBox8.Name = "mpGroupBox8";
+ this.mpGroupBox8.Size = new System.Drawing.Size(293, 52);
+ this.mpGroupBox8.TabIndex = 32;
+ this.mpGroupBox8.TabStop = false;
+ this.mpGroupBox8.Text = "Edit / find lyrics";
+ //
+ // mpButton6
+ //
+ this.mpButton6.Location = new System.Drawing.Point(4, 19);
+ this.mpButton6.Name = "mpButton6";
+ this.mpButton6.Size = new System.Drawing.Size(68, 23);
+ this.mpButton6.TabIndex = 7;
+ this.mpButton6.Text = "&Save";
+ this.mpButton6.UseVisualStyleBackColor = true;
+ //
+ // mpButton7
+ //
+ this.mpButton7.Location = new System.Drawing.Point(77, 19);
+ this.mpButton7.Name = "mpButton7";
+ this.mpButton7.Size = new System.Drawing.Size(68, 23);
+ this.mpButton7.TabIndex = 31;
+ this.mpButton7.Text = "&Find lyric";
+ this.mpButton7.UseVisualStyleBackColor = true;
+ //
// gbEditLyrics
//
this.gbEditLyrics.Controls.Add(this.btSave);
this.gbEditLyrics.Controls.Add(this.btSearchSingle);
this.gbEditLyrics.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.gbEditLyrics.Location = new System.Drawing.Point(235, 296);
+ this.gbEditLyrics.Location = new System.Drawing.Point(250, 290);
this.gbEditLyrics.Name = "gbEditLyrics";
this.gbEditLyrics.Size = new System.Drawing.Size(293, 52);
this.gbEditLyrics.TabIndex = 32;
@@ -225,22 +364,62 @@
this.btSearchSingle.UseVisualStyleBackColor = true;
this.btSearchSingle.Click += new System.EventHandler(this.btSearchSingle_Click);
//
+ // btSave
+ //
+ this.btSave.Enabled = false;
+ this.btSave.Location = new System.Drawing.Point(4, 19);
+ this.btSave.Name = "btSave";
+ this.btSave.Size = new System.Drawing.Size(68, 23);
+ this.btSave.TabIndex = 7;
+ this.btSave.Text = "&Save";
+ this.btSave.UseVisualStyleBackColor = true;
+ this.btSave.Click += new System.EventHandler(this.btSave_Click);
+ //
+ // lbTitle
+ //
+ this.lbTitle.AutoSize = true;
+ this.lbTitle.Location = new System.Drawing.Point(251, 40);
+ this.lbTitle.MaximumSize = new System.Drawing.Size(290, 26);
+ this.lbTitle.MinimumSize = new System.Drawing.Size(290, 26);
+ this.lbTitle.Name = "lbTitle";
+ this.lbTitle.Size = new System.Drawing.Size(290, 26);
+ this.lbTitle.TabIndex = 4;
+ this.lbTitle.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
+ //
+ // lbArtists
+ //
+ this.lbArtists.Location = new System.Drawing.Point(5, 40);
+ this.lbArtists.Name = "lbArtists";
+ this.lbArtists.Size = new System.Drawing.Size(60, 15);
+ this.lbArtists.TabIndex = 20;
+ this.lbArtists.Text = "Artists:";
+ //
// gbAddRemove
//
this.gbAddRemove.Controls.Add(this.btDelete);
this.gbAddRemove.Controls.Add(this.btSwitch);
this.gbAddRemove.Controls.Add(this.btAdd);
this.gbAddRemove.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.gbAddRemove.Location = new System.Drawing.Point(14, 296);
+ this.gbAddRemove.Location = new System.Drawing.Point(5, 290);
this.gbAddRemove.Name = "gbAddRemove";
- this.gbAddRemove.Size = new System.Drawing.Size(215, 52);
+ this.gbAddRemove.Size = new System.Drawing.Size(238, 52);
this.gbAddRemove.TabIndex = 30;
this.gbAddRemove.TabStop = false;
this.gbAddRemove.Text = "Add / remove / move lyrics";
//
+ // btAdd
+ //
+ this.btAdd.Location = new System.Drawing.Point(6, 19);
+ this.btAdd.Name = "btAdd";
+ this.btAdd.Size = new System.Drawing.Size(65, 23);
+ this.btAdd.TabIndex = 2;
+ this.btAdd.Text = "&Add";
+ this.btAdd.UseVisualStyleBackColor = true;
+ this.btAdd.Click += new System.EventHandler(this.btAdd_Click);
+ //
// btSwitch
//
- this.btSwitch.Location = new System.Drawing.Point(144, 19);
+ this.btSwitch.Location = new System.Drawing.Point(148, 19);
this.btSwitch.Name = "btSwitch";
this.btSwitch.Size = new System.Drawing.Size(65, 23);
this.btSwitch.TabIndex = 29;
@@ -248,6 +427,64 @@
this.btSwitch.UseVisualStyleBackColor = true;
this.btSwitch.Click += new System.EventHandler(this.btSwitch_Click);
//
+ // btDelete
+ //
+ this.btDelete.Location = new System.Drawing.Point(77, 19);
+ this.btDelete.Name = "btDelete";
+ this.btDelete.Size = new System.Drawing.Size(65, 23);
+ this.btDelete.TabIndex = 3;
+ this.btDelete.Text = "&Delete";
+ this.btDelete.UseVisualStyleBackColor = true;
+ this.btDelete.Click += new System.EventHandler(this.btDelete_Click);
+ //
+ // gbImport
+ //
+ this.gbImport.Controls.Add(this.btImportFiles);
+ this.gbImport.Controls.Add(this.btImportDirs);
+ this.gbImport.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.gbImport.Location = new System.Drawing.Point(5, 348);
+ this.gbImport.Name = "gbImport";
+ this.gbImport.Size = new System.Drawing.Size(238, 52);
+ this.gbImport.TabIndex = 33;
+ this.gbImport.TabStop = false;
+ this.gbImport.Text = "Import lyrics from files";
+ //
+ // btImportDirs
+ //
+ this.btImportDirs.Location = new System.Drawing.Point(77, 19);
+ this.btImportDirs.Name = "btImportDirs";
+ this.btImportDirs.Size = new System.Drawing.Size(65, 23);
+ this.btImportDirs.TabIndex = 5;
+ this.btImportDirs.Text = "Import &dirs";
+ this.btImportDirs.UseVisualStyleBackColor = true;
+ this.btImportDirs.Click += new System.EventHandler(this.btImportDIRS_Click);
+ //
+ // btImportFiles
+ //
+ this.btImportFiles.Location = new System.Drawing.Point(6, 19);
+ this.btImportFiles.Name = "btImportFiles";
+ this.btImportFiles.Size = new System.Drawing.Size(65, 23);
+ this.btImportFiles.TabIndex = 4;
+ this.btImportFiles.Text = "&Import files";
+ this.btImportFiles.UseVisualStyleBackColor = true;
+ this.btImportFiles.Click += new System.EventHandler(this.btImportSingle_Click);
+ //
+ // lbArtists2
+ //
+ this.lbArtists2.Location = new System.Drawing.Point(76, 40);
+ this.lbArtists2.Name = "lbArtists2";
+ this.lbArtists2.Size = new System.Drawing.Size(65, 15);
+ this.lbArtists2.TabIndex = 21;
+ this.lbArtists2.Text = "-";
+ //
+ // treeView
+ //
+ this.treeView.Location = new System.Drawing.Point(8, 69);
+ this.treeView.Name = "treeView";
+ this.treeView.Size = new System.Drawing.Size(235, 213);
+ this.treeView.TabIndex = 2;
+ this.treeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_AfterSelect);
+ //
// comboDatabase
//
this.comboDatabase.BorderColor = System.Drawing.Color.Empty;
@@ -256,182 +493,186 @@
this.comboDatabase.Items.AddRange(new object[] {
"Lyrics database",
"Marked database"});
- this.comboDatabase.Location = new System.Drawing.Point(85, 15);
+ this.comboDatabase.Location = new System.Drawing.Point(79, 8);
this.comboDatabase.Name = "comboDatabase";
this.comboDatabase.Size = new System.Drawing.Size(144, 21);
this.comboDatabase.TabIndex = 1;
this.comboDatabase.SelectedIndexChanged += new System.EventHandler(this.comboDatabase_SelectedIndexChanged);
//
- // lbDatabase
+ // gbExport
//
- this.lbDatabase.Location = new System.Drawing.Point(11, 18);
- this.lbDatabase.Name = "lbDatabase";
- this.lbDatabase.Size = new System.Drawing.Size(60, 26);
- this.lbDatabase.TabIndex = 26;
- this.lbDatabase.Text = "Database:";
+ this.gbExport.Controls.Add(this.btExportTags);
+ this.gbExport.Controls.Add(this.btImportTags);
+ this.gbExport.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.gbExport.Location = new System.Drawing.Point(250, 348);
+ this.gbExport.Name = "gbExport";
+ this.gbExport.Size = new System.Drawing.Size(293, 52);
+ this.gbExport.TabIndex = 34;
+ this.gbExport.TabStop = false;
+ this.gbExport.Text = "Import / Export lyrics from music tags";
//
- // lbLRCTest
+ // btImportTags
//
- this.lbLRCTest.AutoSize = true;
- this.lbLRCTest.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lbLRCTest.Location = new System.Drawing.Point(468, 309);
- this.lbLRCTest.MaximumSize = new System.Drawing.Size(60, 13);
- this.lbLRCTest.MinimumSize = new System.Drawing.Size(60, 13);
- this.lbLRCTest.Name = "lbLRCTest";
- this.lbLRCTest.Size = new System.Drawing.Size(60, 13);
- this.lbLRCTest.TabIndex = 25;
- this.lbLRCTest.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+ this.btImportTags.Location = new System.Drawing.Point(4, 19);
+ this.btImportTags.Name = "btImportTags";
+ this.btImportTags.Size = new System.Drawing.Size(68, 23);
+ this.btImportTags.TabIndex = 6;
+ this.btImportTags.Text = "Import";
+ this.btImportTags.UseVisualStyleBackColor = true;
+ this.btImportTags.Click += new System.EventHandler(this.btImportTags_Click);
//
- // lbSongs2
+ // btExportTags
//
- this.lbSongs2.Location = new System.Drawing.Point(82, 62);
- this.lbSongs2.Name = "lbSongs2";
- this.lbSongs2.Size = new System.Drawing.Size(65, 15);
- this.lbSongs2.TabIndex = 23;
- this.lbSongs2.Text = "-";
+ this.btExportTags.Location = new System.Drawing.Point(77, 19);
+ this.btExportTags.Name = "btExportTags";
+ this.btExportTags.Size = new System.Drawing.Size(68, 23);
+ this.btExportTags.TabIndex = 6;
+ this.btExportTags.Text = "Export";
+ this.btExportTags.UseVisualStyleBackColor = true;
+ this.btExportTags.Click += new System.EventHandler(this.btExportTags_Click);
//
// lbSongs
//
- this.lbSongs.Location = new System.Drawing.Point(11, 62);
+ this.lbSongs.Location = new System.Drawing.Point(5, 55);
this.lbSongs.Name = "lbSongs";
this.lbSongs.Size = new System.Drawing.Size(60, 15);
this.lbSongs.TabIndex = 22;
this.lbSongs.Text = "Songs:";
//
- // lbArtists2
+ // tbLyrics
//
- this.lbArtists2.Location = new System.Drawing.Point(82, 47);
- this.lbArtists2.Name = "lbArtists2";
- this.lbArtists2.Size = new System.Drawing.Size(65, 15);
- this.lbArtists2.TabIndex = 21;
- this.lbArtists2.Text = "-";
+ this.tbLyrics.Anchor = System.Windows.Forms.AnchorStyles.Right;
+ this.tbLyrics.CausesValidation = false;
+ this.tbLyrics.Location = new System.Drawing.Point(250, 69);
+ this.tbLyrics.Multiline = true;
+ this.tbLyrics.Name = "tbLyrics";
+ this.tbLyrics.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+ this.tbLyrics.Size = new System.Drawing.Size(293, 213);
+ this.tbLyrics.TabIndex = 35;
+ this.tbLyrics.KeyUp += new System.Windows.Forms.KeyEventHandler(this.tbLyrics_KeyUp);
//
- // lbTitle
+ // lbSongs2
//
- this.lbTitle.AutoSize = true;
- this.lbTitle.Location = new System.Drawing.Point(238, 50);
- this.lbTitle.MaximumSize = new System.Drawing.Size(290, 26);
- this.lbTitle.MinimumSize = new System.Drawing.Size(290, 26);
- this.lbTitle.Name = "lbTitle";
- this.lbTitle.Size = new System.Drawing.Size(290, 26);
- this.lbTitle.TabIndex = 4;
- this.lbTitle.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
+ this.lbSongs2.Location = new System.Drawing.Point(76, 55);
+ this.lbSongs2.Name = "lbSongs2";
+ this.lbSongs2.Size = new System.Drawing.Size(65, 15);
+ this.lbSongs2.TabIndex = 23;
+ this.lbSongs2.Text = "-";
//
- // lbArtists
+ // lbLRCTest
//
- this.lbArtists.Location = new System.Drawing.Point(11, 47);
- this.lbArtists.Name = "lbArtists";
- this.lbArtists.Size = new System.Drawing.Size(60, 15);
- this.lbArtists.TabIndex = 20;
- this.lbArtists.Text = "Artists:";
+ this.lbLRCTest.AutoSize = true;
+ this.lbLRCTest.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbLRCTest.Location = new System.Drawing.Point(479, 283);
+ this.lbLRCTest.MaximumSize = new System.Drawing.Size(60, 11);
+ this.lbLRCTest.MinimumSize = new System.Drawing.Size(60, 11);
+ this.lbLRCTest.Name = "lbLRCTest";
+ this.lbLRCTest.Size = new System.Drawing.Size(60, 11);
+ this.lbLRCTest.TabIndex = 25;
+ this.lbLRCTest.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
- // treeView
+ // btRefresh
//
- this.treeView.Location = new System.Drawing.Point(14, 78);
- this.treeView.Name = "treeView";
- this.treeView.Size = new System.Drawing.Size(215, 213);
- this.treeView.TabIndex = 2;
- this.treeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_AfterSelect);
+ this.btRefresh.Location = new System.Drawing.Point(235, 8);
+ this.btRefresh.Name = "btRefresh";
+ this.btRefresh.Size = new System.Drawing.Size(55, 21);
+ this.btRefresh.TabIndex = 36;
+ this.btRefresh.Text = "&Refresh";
+ this.btRefresh.UseVisualStyleBackColor = true;
+ this.btRefresh.Click += new System.EventHandler(this.btRefresh_Click);
//
- // gbResetDatabase
+ // lbDatabase
//
- this.gbResetDatabase.Controls.Add(this.btResetMarkedLyricsDatabase);
- this.gbResetDatabase.Controls.Add(this.btResetLyricsDatabase);
- this.gbResetDatabase.Controls.Add(this.lbResetDatabase);
- this.gbResetDatabase.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
- this.gbResetDatabase.Location = new System.Drawing.Point(5, 427);
- this.gbResetDatabase.Name = "gbResetDatabase";
- this.gbResetDatabase.Size = new System.Drawing.Size(538, 49);
- this.gbResetDatabase.TabIndex = 11;
- this.gbResetDatabase.TabStop = false;
- this.gbResetDatabase.Text = "Reset database";
+ this.lbDatabase.Location = new System.Drawing.Point(5, 11);
+ this.lbDatabase.Name = "lbDatabase";
+ this.lbDatabase.Size = new System.Drawing.Size(60, 26);
+ this.lbDatabase.TabIndex = 26;
+ this.lbDatabase.Text = "Database:";
//
- // btResetMarkedLyricsDatabase
- //
- this.btResetMarkedLyricsDatabase.Location = new System.Drawing.Point(451, 18);
- this.btResetMarkedLyricsDatabase.Name = "btResetMarkedLyricsDatabase";
- this.btResetMarkedLyricsDatabase.Size = new System.Drawing.Size(75, 23);
- this.btResetMarkedLyricsDatabase.TabIndex = 11;
- this.btResetMarkedLyricsDatabase.Text = "MarkedDB";
- this.btResetMarkedLyricsDatabase.UseVisualStyleBackColor = true;
- this.btResetMarkedLyricsDatabase.Click += new System.EventHandler(this.button1_Click);
- //
- // btResetLyricsDatabase
- //
- this.btResetLyricsDatabase.Location = new System.Drawing.Point(370, 18);
- this.btResetLyricsDatabase.Name = "btResetLyricsDatabase";
- this.btResetLyricsDatabase.Size = new System.Drawing.Size(75, 23);
- this.btResetLyricsDatabase.TabIndex = 10;
- this.btResetLyricsDatabase.Text = "LyricsDB";
- this.btResetLyricsDatabase.UseVisualStyleBackColor = true;
- this.btResetLyricsDatabase.Click += new System.EventHandler(this.btResetDatabase_Click);
- //
- // lbResetDatabase
- //
- this.lbResetDatabase.Location = new System.Drawing.Point(11, 14);
- this.lbResetDatabase.Name = "lbResetDatabase";
- this.lbResetDatabase.Size = new System.Drawing.Size(353, 30);
- this.lbResetDatabase.TabIndex = 9;
- this.lbResetDatabase.Text = "Reset the lyrics database or the database with\r\nmarked titles. All data in the da" +
- "tabase will be permanately lost.";
- //
- // folderBrowserDialog1
- //
- this.folderBrowserDialog1.Description = "Select a directory to search for lyrics or lrc-files. All files matching the patt" +
- "erns [Artist]-[Title].txt and *.lrc will be included to the lyrics database.";
- this.folderBrowserDialog1.ShowNewFolderButton = false;
- //
// LyricsLibrary
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.lbLRCTest);
+ this.Controls.Add(this.btRefresh);
this.Controls.Add(this.gbResetDatabase);
- this.Controls.Add(this.gbLibrary);
+ this.Controls.Add(this.tbLyrics);
+ this.Controls.Add(this.gbExport);
+ this.Controls.Add(this.treeView);
+ this.Controls.Add(this.gbImport);
+ this.Controls.Add(this.lbArtists);
+ this.Controls.Add(this.gbEditLyrics);
+ this.Controls.Add(this.lbTitle);
+ this.Controls.Add(this.gbAddRemove);
+ this.Controls.Add(this.lbArtists2);
+ this.Controls.Add(this.comboDatabase);
+ this.Controls.Add(this.lbSongs);
+ this.Controls.Add(this.lbDatabase);
+ this.Controls.Add(this.lbSongs2);
this.Name = "LyricsLibrary";
- this.Size = new System.Drawing.Size(545, 479);
- this.gbLibrary.ResumeLayout(false);
- this.gbLibrary.PerformLayout();
- this.gbExport.ResumeLayout(false);
- this.gbImport.ResumeLayout(false);
+ this.Size = new System.Drawing.Size(554, 479);
+ this.gbResetDatabase.ResumeLayout(false);
this.gbEditLyrics.ResumeLayout(false);
this.gbAddRemove.ResumeLayout(false);
- this.gbResetDatabase.ResumeLayout(false);
+ this.gbImport.ResumeLayout(false);
+ this.gbExport.ResumeLayout(false);
this.ResumeLayout(false);
+ this.PerformLayout();
}
#endregion
private System.Windows.Forms.OpenFileDialog openFileDialog1;
- private MediaPortal.UserInterface.Controls.MPGroupBox gbLibrary;
private MediaPortal.UserInterface.Controls.MPGroupBox gbResetDatabase;
- private MediaPortal.UserInterface.Controls.MPLabel lbSongs;
- private MediaPortal.UserInterface.Controls.MPLabel lbArtists;
- internal MediaPortal.UserInterface.Controls.MPLabel lbArtists2;
- public MediaPortal.UserInterface.Controls.MPLabel lbSongs2;
- internal MediaPortal.UserInterface.Controls.MPButton btSave;
- internal System.Windows.Forms.Button btDelete;
- internal System.Windows.Forms.Button btAdd;
- internal MediaPortal.UserInterface.Controls.MPButton btImportFiles;
- internal MediaPortal.UserInterface.Controls.MPButton btImportDirs;
- private MediaPortal.UserInterface.Controls.MPLabel lbDatabase;
internal System.Windows.Forms.Button btResetMarkedLyricsDatabase;
internal System.Windows.Forms.Button btResetLyricsDatabase;
private MediaPortal.UserInterface.Controls.MPLabel lbResetDatabase;
+ private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1;
+ private MediaPortal.UserInterface.Controls.MPLabel lbDatabase;
+ internal System.Windows.Forms.Button btRefresh;
+ private System.Windows.Forms.Label lbLRCTest;
+ public MediaPortal.UserInterface.Controls.MPLabel lbSongs2;
+ private System.Windows.Forms.TextBox tbLyrics;
+ private MediaPortal.UserInterface.Controls.MPLabel lbSongs;
+ private MediaPortal.UserInterface.Controls.MPGroupBox gbExport;
+ internal MediaPortal.UserInterface.Controls.MPButton btExportTags;
+ internal MediaPortal.UserInterface.Controls.MPButton btImportTags;
private MediaPortal.UserInterface.Controls.MPComboBox comboDatabase;
- private System.Windows.Forms.Label lbLRCTest;
- private MediaPortal.UserInterface.Controls.MPLabel lbTitle;
- private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1;
internal System.Windows.Forms.TreeView treeView;
+ internal MediaPortal.UserInterface.Controls.MPLabel lbArtists2;
+ private MediaPortal.UserInterface.Controls.MPGroupBox gbImport;
+ internal MediaPortal.UserInterface.Controls.MPButton btImportFiles;
+ internal MediaPortal.UserInterface.Controls.MPButton btImportDirs;
+ private MediaPortal.UserInterface.Controls.MPGroupBox gbAddRemove;
+ internal System.Windows.Forms.Button btDelete;
internal MediaPortal.UserInterface.Controls.MPButton btSwitch;
+ internal System.Windows.Forms.Button btAdd;
+ private MediaPortal.UserInterface.Controls.MPLabel lbArtists;
+ private MediaPortal.UserInterface.Controls.MPLabel lbTitle;
+ private MediaPortal.UserInterface.Controls.MPGroupBox gbEditLyrics;
+ internal MediaPortal.UserInterface.Controls.MPButton btSave;
internal MediaPortal.UserInterface.Controls.MPButton btSearchSingle;
- private MediaPortal.UserInterface.Controls.MPGroupBox gbAddRemove;
- private MediaPortal.UserInterface.Controls.MPGroupBox gbEditLyrics;
- private MediaPortal.UserInterface.Controls.MPGroupBox gbImport;
- internal MediaPortal.UserInterface.Controls.MPButton btExportTags;
- private MediaPortal.UserInterface.Controls.MPGroupBox gbExport;
- internal MediaPortal.UserInterface.Controls.MPButton btImportTags;
- private System.Windows.Forms.TextBox tbLyrics;
- internal System.Windows.Forms.Button btRefresh;
+ private System.Windows.Forms.Label label1;
+ private MediaPortal.UserInterface.Controls.MPLabel mpLabel4;
+ private System.Windows.Forms.TextBox textBox1;
+ private MediaPortal.UserInterface.Controls.MPLabel mpLabel5;
+ private MediaPortal.UserInterface.Controls.MPGroupBox mpGroupBox5;
+ private MediaPortal.UserInterface.Controls.MPButton mpButton1;
+ private MediaPortal.UserInterface.Controls.MPButton mpButton2;
+ private MediaPortal.UserInterface.Controls.MPComboBox mpComboBox1;
+ private System.Windows.Forms.TreeView treeView1;
+ private MediaPortal.UserInterface.Controls.MPLabel mpLabel6;
+ private MediaPortal.UserInterface.Controls.MPGroupBox mpGroupBox6;
+ private MediaPortal.UserInterface.Controls.MPButton mpButton3;
+ private MediaPortal.UserInterface.Controls.MPButton mpButton4;
+ private MediaPortal.UserInterface.Controls.MPGroupBox mpGroupBox7;
+ private MediaPortal.UserInterface.Controls.MPButton mpButton5;
+ private System.Windows.Forms.Button button3;
+ private MediaPortal.UserInterface.Controls.MPLabel mpLabel7;
+ private MediaPortal.UserInterface.Controls.MPLabel mpLabel8;
+ private MediaPortal.UserInterface.Controls.MPGroupBox mpGroupBox8;
+ private MediaPortal.UserInterface.Controls.MPButton mpButton6;
+ private MediaPortal.UserInterface.Controls.MPButton mpButton7;
}
}
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/LyricsLibrary.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/LyricsLibrary.cs 2008-12-22 16:03:38 UTC (rev 2457)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/LyricsLibrary.cs 2008-12-22 17:06:41 UTC (rev 2458)
@@ -272,7 +272,7 @@
tbLyrics.Text = m_OriginalLyric;
tbLyrics.Enabled = true;
- lbTitle.Text = "\"" + m_CurrentArtist + " - " + m_CurrentTitle + "\"" + (!item.Source.Equals("") ? " found at " + item.Source : "");
+ lbTitle.Text = "\"" + m_CurrentArtist + " - " + m_CurrentTitle + "\"" + (!item.Source.Equals("") ? " found in " + item.Source : "");
btSearchSingle.Enabled = true;
}
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs 2008-12-22 16:03:38 UTC (rev 2457)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs 2008-12-22 17:06:41 UTC (rev 2458)
@@ -672,7 +672,7 @@
if (DatabaseUtil.IsTrackInLyricsDatabase(MyLyricsSettings.LyricsDB, capArtist, capTitle).Equals(DatabaseUtil.LYRIC_NOT_FOUND))
{
- MyLyricsSettings.LyricsDB.Add(DatabaseUtil.CorrectKeyFormat(capArtist, capTitle), new LyricsItem(capArtist, capTitle, tag.Lyrics, "Tag"));
+ MyLyricsSettings.LyricsDB.Add(DatabaseUtil.CorrectKeyFormat(capArtist, capTitle), new LyricsItem(capArtist, capTitle, tag.Lyrics, "music tag"));
}
if (DatabaseUtil.IsTrackInLyricsMarkedDatabase(MyLyricsSettings.LyricsMarkedDB, capArtist, capTitle).Equals(DatabaseUtil.LYRIC_MARKED))
@@ -1071,6 +1071,8 @@
xmlwriter.SetValueAsBool("myLyrics", "automaticWriteToMusicTag", cbMusicTagWrite.Checked);
xmlwriter.SetValueAsBool("myLyrics", "automaticReadFromToMusicTag", cbMusicTagAlwaysCheck.Checked);
+ m_automaticWriteToMusicTag = cbMusicTagWrite.Checked;
+ m_automaticReadFromToMusicTag = cbMusicTagAlwaysCheck.Checked;
try
{
@@ -1088,12 +1090,14 @@
}
}
- if (find.ToString() != "")
+ if (find.ToString() != "" && replace.ToString() != "")
{
xmlwriter.SetValue("myLyrics", "find", find.ToString());
xmlwriter.SetValue("myLyrics", "replace", replace.ToString());
+
+ m_find = find.ToString();
+ m_replace = replace.ToString();
}
-
}
catch (Exception ex)
{
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.resx
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.resx 2008-12-22 16:03:38 UTC (rev 2457)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.resx 2008-12-22 17:06:41 UTC (rev 2458)
@@ -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 2008-12-22 16:03:38 UTC (rev 2457)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2008-12-22 17:06:41 UTC (rev 2458)
@@ -696,7 +696,7 @@
// If lyricText is empty, the LRC file was pulled out of the music tag and is still not in the lyrics database
if (string.IsNullOrEmpty(lyricText))
{
- LyricsItem item = new LyricsItem(m_artist, m_title, CurrentTrackTag.Lyrics, "Music tag");
+ LyricsItem item = new LyricsItem(m_artist, m_title, CurrentTrackTag.Lyrics, "music tag");
LyricsDB[DatabaseUtil.CorrectKeyFormat(m_artist, m_title)] = item;
string path = MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Database, LyricsDBName);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2009-03-29 09:03:20
|
Revision: 2747
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2747&view=rev
Author: saamand
Date: 2009-03-29 09:03:15 +0000 (Sun, 29 Mar 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.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/MyLyricsSetup.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs 2009-03-29 00:44:03 UTC (rev 2746)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs 2009-03-29 09:03:15 UTC (rev 2747)
@@ -640,7 +640,7 @@
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.Size = new System.Drawing.Size(24, 18);
this.tbLyricsLimit.TabIndex = 15;
this.tbLyricsLimit.Text = "45";
this.tbLyricsLimit.Leave += new System.EventHandler(this.WriteMediaPortalXML);
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.resx
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.resx 2009-03-29 00:44:03 UTC (rev 2746)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.resx 2009-03-29 09:03:15 UTC (rev 2747)
@@ -123,12 +123,6 @@
<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-03-29 00:44:03 UTC (rev 2746)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2009-03-29 09:03:15 UTC (rev 2747)
@@ -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.
|
|
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.
|
|
From: <sa...@us...> - 2009-05-20 12:49:45
|
Revision: 2867
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2867&view=rev
Author: saamand
Date: 2009-05-20 12:49:40 +0000 (Wed, 20 May 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
trunk/plugins/MyLyrics/My Lyrics/change log.txt
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2009-05-19 14:59:09 UTC (rev 2866)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2009-05-20 12:49:40 UTC (rev 2867)
@@ -749,7 +749,7 @@
if (m_LrcTable != null && m_LrcTable.Rows.Count > 0)
{
- m_LyricText = m_LrcTable.Rows[0][2] as string;
+ m_LyricText = m_LrcTable.Rows[0]["Lyrics"] as string;
m_SimpleLrc = new SimpleLRC(null, null, m_LyricText);
StartShowingLrc(m_LyricText, true);
@@ -806,7 +806,7 @@
string status = string.Format("LRC {0} of {1} shown", noOfRows.ToString(), m_LrcTable.Rows.Count.ToString());
GUIControl.SetControlLabel(GetID, (int)GUI_LRC_Controls.CONTROL_LRCPICK_STATUS, status);
- m_LyricText = m_LrcTable.Rows[index][3] as string;
+ m_LyricText = m_LrcTable.Rows[index]["Lyrics"] as string;
m_SimpleLrc = new SimpleLRC(null, null, m_LyricText);
StartShowingLrc(m_LyricText, true);
}
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2009-05-19 14:59:09 UTC (rev 2866)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2009-05-20 12:49:40 UTC (rev 2867)
@@ -5,7 +5,7 @@
<ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{BBB2DAE2-0D83-4B4B-85B6-D1B5A7E10039}</ProjectGuid>
- <OutputType>WinExe</OutputType>
+ <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MyLyrics</RootNamespace>
<AssemblyName>MyLyrics</AssemblyName>
Modified: trunk/plugins/MyLyrics/My Lyrics/change log.txt
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/change log.txt 2009-05-19 14:59:09 UTC (rev 2866)
+++ trunk/plugins/MyLyrics/My Lyrics/change log.txt 2009-05-20 12:49:40 UTC (rev 2867)
@@ -31,7 +31,7 @@
- LRC pick: uses BennieBoy's LrcFinder to select among different matching LRC entries.
- LRC editor: enables the creation of lrc lyric from a plain lyric.
-Compatible with MediaPortal 1.0.0.0 final.
+Compatible with MediaPortal 1.0.2.
Installation:
Simple copy the content of the zip-file into your MP library (typical C:\Program Files\Team MediaPortal\MediaPortal).
@@ -47,4 +47,5 @@
* Add: New GUI item "LRC pick status" added to skin (ID 1011).
* Fix: Blue3 skin modified.
* Fix: Deleted entries in "Find & replace" dialogue were not removed correctly.
-* Fix: Performance improvement when deleting entry in lyrics database.
\ No newline at end of file
+* Fix: Performance improvement when deleting entry in lyrics database.
+* and a lot of minor fixes!
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Sil...@us...> - 2010-03-01 22:20:05
|
Revision: 3476
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3476&view=rev
Author: SilentException
Date: 2010-03-01 22:19:49 +0000 (Mon, 01 Mar 2010)
Log Message:
-----------
* reset the manualresetevent before starting new threads so they don't end instantly
* kill background workers before starting new ones
Modified Paths:
--------------
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.cs 2010-03-01 20:06:50 UTC (rev 3475)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.cs 2010-03-01 22:19:49 UTC (rev 3476)
@@ -216,7 +216,8 @@
}
// If automaticUpdate is set then return after the first positive search
- lc = new LyricsController(this, m_EventStopThread, (string[]) sitesToSearch.ToArray(), true, automaticUpdate,
+ m_EventStopThread = new ManualResetEvent(false);
+ lc = new LyricsController(this, m_EventStopThread, (string[])sitesToSearch.ToArray(), true, automaticUpdate,
m_find, m_replace);
ThreadStart job = delegate { lc.Run(); };
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs 2010-03-01 20:06:50 UTC (rev 3475)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs 2010-03-01 22:19:49 UTC (rev 3476)
@@ -845,6 +845,7 @@
m_replace = xmlreader.GetValueAsString("myLyrics", "replace", "");
}
+ m_EventStopThread = new ManualResetEvent(false);
lc = new LyricsController(this, m_EventStopThread, sitesToSearchArray, false, false, m_find, m_replace);
lc.NoOfLyricsToSearch = lyricConfigInfosQueue.Count;
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2010-03-01 20:06:50 UTC (rev 3475)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2010-03-01 22:19:49 UTC (rev 3476)
@@ -1041,6 +1041,8 @@
if (_CurrentTrackTag != null)
{
+ if (worker.IsBusy)
+ worker.CancelAsync();
SaveLyricToTagListsData data = new SaveLyricToTagListsData(_LyricText, _artist, _title, _CurrentTrackTag.FileName);
worker.RunWorkerAsync(data);
//SaveLyricToTagLists(_CurrentTrackTag.FileName, _LyricText);
@@ -1401,7 +1403,7 @@
{
_lyricsFound = false;
- _lc = new LyricsController(this, _EventStopThread, new string[1] {"LrcFinder"}, false, false,
+ _lc = new LyricsController(this, _EventStopThread, new string[1] { "LrcFinder" }, false, false,
_Find, _Replace);
// create worker thread instance
@@ -1440,6 +1442,8 @@
private bool FindLyric()
{
+ _EventStopThread.Reset();
+
if ((_CurrentTrackTag != null && _CurrentTrackTag.Artist != "") || g_Player.IsRadio)
{
if (_enableLogging)
@@ -1688,6 +1692,8 @@
if (_CurrentTrackTag != null)
{
+ if (worker.IsBusy)
+ worker.CancelAsync();
SaveLyricToTagListsData data = new SaveLyricToTagListsData(_LyricText, artist, title, _CurrentTrackTag.FileName);
worker.RunWorkerAsync(data);
//SaveLyricToTagLists(_CurrentTrackTag.FileName, _LyricText);
@@ -1979,7 +1985,7 @@
_LyricText = MediaPortalUtil.MakePlainLyricPerfectToShow(_LyricText);
- resetGUI((int) MyLyricsSettings.Screen.LYRICS);
+ resetGUI((int)MyLyricsSettings.Screen.LYRICS);
GUIControl.SetControlLabel(GetID, CONTROL_LYRIC_SELECTED, _LyricText);
GUIControl.FocusControl(GetID, CONTROL_LYRIC_SELECTED);
}
@@ -2042,7 +2048,6 @@
// set event "Stop"
_EventStopThread.Set();
-
while (_LyricControllerThread.IsAlive)
Thread.Sleep(100);
@@ -2337,6 +2342,8 @@
if (_CurrentTrackTag != null)
{
+ if (worker.IsBusy)
+ worker.CancelAsync();
SaveLyricToTagListsData data = new SaveLyricToTagListsData(lyricText, _artist, _title, _CurrentTrackTag.FileName);
worker.RunWorkerAsync(data);
//SaveLyricToTagLists(_CurrentTrackTag.FileName, lyricText);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Sil...@us...> - 2010-03-02 00:59:19
|
Revision: 3477
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3477&view=rev
Author: SilentException
Date: 2010-03-02 00:59:12 +0000 (Tue, 02 Mar 2010)
Log Message:
-----------
* updates to track change handler
* various improvements to lrc edit
* fixed missing album covers
Modified Paths:
--------------
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyricsExternCode.cs
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2010-03-01 22:19:49 UTC (rev 3476)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2010-03-02 00:59:12 UTC (rev 3477)
@@ -320,8 +320,8 @@
}
else if ((_artist.Length==0 && _title.Length>0) || (_title.Length==0 && _artist.Length>0))
{
- _ImagePathContainer.Clear();
- GUIelement_ImgCoverArt.FreeResources();
+ //_ImagePathContainer.Clear();
+ //GUIelement_ImgCoverArt.FreeResources();
resetLrcFields();
resetGUI(_selectedScreen);
@@ -371,12 +371,26 @@
else
{
_lyricsFound = false;
- StopThread();
- if (!string.IsNullOrEmpty(_artist))
+ if (!string.IsNullOrEmpty(_artist) && !string.IsNullOrEmpty(_title))
{
- FindLyric();
+ StopThread();
+ _SearchType = (int)SEARCH_TYPES.BOTH_LRCS_AND_LYRICS;
+ resetGUI((int)MyLyricsSettings.Screen.LRC);
+ _newTrack = true;
+ //FindLyric();
}
+ else if ((_artist.Length == 0 && _title.Length > 0) || (_title.Length == 0 && _artist.Length > 0))
+ {
+ //_ImagePathContainer.Clear();
+ //GUIelement_ImgCoverArt.FreeResources();
+
+ resetLrcFields();
+ resetGUI(_selectedScreen);
+
+ _StatusText = "Not enough data for lyric search";
+ GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_LBStatus, _StatusText);
+ }
else
{
_artist = "";
@@ -413,15 +427,8 @@
private void ShowLRCtoEdit()
{
- if (_CurrentTrackTag == null)
- {
- resetGUI(_selectedScreen);
-
- _StatusText = "No music file is playing";
- GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_LBStatus, _StatusText);
- return;
- }
-
+ GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_LBStatus, "");
+
if (!string.IsNullOrEmpty(_LyricText))
{
_LyricText = _LyricText.Trim();
@@ -432,9 +439,11 @@
{
_alreadyValidLRC = true;
_lines = new string[1] {"This song already has a valid LRC lyric"};
+ _StatusText = "This song already has a valid LRC lyric";
- GUIControl.SetControlLabel(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_LINE + 0, _lines[0]);
- GUIControl.SetControlLabel(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_LINE_DONE + 0, _lines[0]);
+ //GUIControl.SetControlLabel(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_LINE + 0, _lines[0]);
+ //GUIControl.SetControlLabel(GetID, (int) GUI_LRC_Controls.CONTROL_EDIT_LINE_DONE + 0, _lines[0]);
+ GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_LBStatus, _lines[0]);
}
else
{
@@ -467,6 +476,15 @@
_StatusText = "No valid lyrics found";
GUIControl.SetControlLabel(GetID, (int) GUI_General_Controls.CONTROL_LBStatus, _StatusText);
}
+
+ if (_CurrentTrackTag == null)
+ {
+ resetGUI(_selectedScreen);
+
+ _StatusText = "No music file is playing";
+ GUIControl.SetControlLabel(GetID, (int)GUI_General_Controls.CONTROL_LBStatus, _StatusText);
+ return;
+ }
}
private void LoadSettings()
@@ -1240,7 +1258,7 @@
if (tag2.Contains("#percentage") || tag2.Contains("#currentplaytime") || tag2.Contains("#currentremaining"))
return;
- if (tag2.Equals("#Play.Current.Track") || tag2.Equals("#Play.Current.Title") || tag2.Equals("#Play.Current.File")) // track has changed
+ if (tag2.Equals("#Play.Current.Track") || tag2.Equals("#Play.Current.Title") || tag2.Equals("#Play.Current.File") || tag2.Equals("#Play.Current.Artist")) // track has changed
{
if (value.Length != 0) // additional check
{
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsExternCode.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyricsExternCode.cs 2010-03-01 22:19:49 UTC (rev 3476)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsExternCode.cs 2010-03-02 00:59:12 UTC (rev 3477)
@@ -69,9 +69,9 @@
if (GUIelement_ImgCoverArt != null)
{
- GUIelement_ImgCoverArt.FreeResources();
if (_ImagePathContainer.Count > 0)
{
+ GUIelement_ImgCoverArt.FreeResources();
if (_ImagePathContainer.Count > 1)
{
int currentImage = 0;
@@ -90,8 +90,8 @@
}
else
GUIelement_ImgCoverArt.SetFileName(_ImagePathContainer[0]);
+ GUIelement_ImgCoverArt.AllocResources();
}
- GUIelement_ImgCoverArt.AllocResources();
}
}
@@ -256,10 +256,13 @@
{
try
{
+ GUIelement_ImgCoverArt.FreeResources();
GUIelement_ImgCoverArt.SetFileName(GUIGraphicsContext.Skin + @"\media\missing_coverart.png");
+ GUIelement_ImgCoverArt.AllocResources();
}
catch (Exception ex)
{
+ GUIelement_ImgCoverArt.FreeResources();
Log.Debug("GUIMusicPlayingNow: could not set default image - {0}", ex.Message);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Sil...@us...> - 2010-03-09 20:58:01
|
Revision: 3496
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3496&view=rev
Author: SilentException
Date: 2010-03-09 20:57:54 +0000 (Tue, 09 Mar 2010)
Log Message:
-----------
* some refactoring
* inserted few functions from mediaportal guiplayingnow to try to improve artist/track detection and publishing of play properties
* setting for new option always ask for upload to lrcfinder was never saved
Modified Paths:
--------------
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyricsExternCode.cs
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs 2010-03-08 18:30:36 UTC (rev 3495)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs 2010-03-09 20:57:54 UTC (rev 3496)
@@ -1244,6 +1244,7 @@
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);
xmlwriter.SetValue("myLyrics", "LrcTaggingName", tbLrcTaggingName.Text);
xmlwriter.SetValueAsBool("myLyrics", "automaticFetch", cbAutoFetch.Checked);
xmlwriter.SetValueAsBool("myLyrics", "automaticUpdateWhenFirstFound", cbAutomaticUpdate.Checked);
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2010-03-08 18:30:36 UTC (rev 3495)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2010-03-09 20:57:54 UTC (rev 3496)
@@ -40,7 +40,6 @@
private readonly object _imageMutex;
private readonly List<String> _ImagePathContainer;
- private readonly string _NextTrackFileName = string.Empty;
private readonly PlayListPlayer _PlaylistPlayer;
internal int CONTROL_LYRIC_SELECTED = 20;
private string logFileName = "MyLyrics.log";
@@ -55,7 +54,10 @@
private int _crossfade;
private string _CurrentThumbFileName = string.Empty;
private string _CurrentTrackFileName = string.Empty;
+ private string _NextTrackFileName = string.Empty;
private MusicTag _CurrentTrackTag;
+ private MusicTag _NextTrackTag;
+ private MusicTag _PreviousTrackTag;
private bool _enableLogging;
private string _Find = string.Empty;
@@ -78,8 +80,6 @@
private List<string[]> _LyricsToWriteToTag;
private string _LyricText = "";
private bool _newTrack;
- private MusicTag _NextTrackTag;
- private MusicTag _PreviousTrackTag;
private string _Replace = string.Empty;
private int _SearchingState;
private int _selectedScreen;
@@ -180,6 +180,42 @@
}
+ private void UpdateNextTrackInfo()
+ {
+ if (_NextTrackTag != null)
+ {
+ string strNextTrack = String.Format("{0} {1}", GUILocalizeStrings.Get(435), _NextTrackTag.Track); // "Track: "
+ if (_NextTrackTag.Track <= 0)
+ {
+ strNextTrack = string.Empty;
+ }
+
+ string strYear = String.Format("{0} {1}", GUILocalizeStrings.Get(436), _NextTrackTag.Year); // "Year: "
+ if (_NextTrackTag.Year <= 1900)
+ {
+ strYear = string.Empty;
+ }
+
+ GUIPropertyManager.SetProperty("#Play.Next.Title", _NextTrackTag.Title);
+ GUIPropertyManager.SetProperty("#Play.Next.Track", strNextTrack);
+ GUIPropertyManager.SetProperty("#Play.Next.Album", _NextTrackTag.Album);
+ GUIPropertyManager.SetProperty("#Play.Next.Artist", _NextTrackTag.Artist);
+ GUIPropertyManager.SetProperty("#Play.Next.Genre", _NextTrackTag.Genre);
+ GUIPropertyManager.SetProperty("#Play.Next.Year", strYear);
+ GUIPropertyManager.SetProperty("#Play.Next.Rating", (Convert.ToDecimal(2 * _NextTrackTag.Rating + 1)).ToString());
+ }
+ else
+ {
+ GUIPropertyManager.SetProperty("#Play.Next.Title", string.Empty);
+ GUIPropertyManager.SetProperty("#Play.Next.Track", string.Empty);
+ GUIPropertyManager.SetProperty("#Play.Next.Album", string.Empty);
+ GUIPropertyManager.SetProperty("#Play.Next.Artist", string.Empty);
+ GUIPropertyManager.SetProperty("#Play.Next.Genre", string.Empty);
+ GUIPropertyManager.SetProperty("#Play.Next.Year", string.Empty);
+ GUIPropertyManager.SetProperty("#Play.Next.Rating", "0");
+ }
+ }
+
public override void Process()
{
if ((_newTrack || _SearchingState != (int)SEARCH_STATE.NOT_SEARCHING)
@@ -209,8 +245,12 @@
currentFile = _CurrentTrackTag.FileName;
currentLyrics = _CurrentTrackTag.Lyrics;
}
- _CurrentTrackTag = mDB.GetTag(g_Player.CurrentFile);
+ _CurrentTrackFileName = g_Player.CurrentFile;
+ _NextTrackFileName = PlayListPlayer.SingletonPlayer.GetNext();
+ //_CurrentTrackTag = mDB.GetTag(g_Player.CurrentFile);
+ GetTrackTags();
+
if (_CurrentTrackTag != null)
{
_artist = _CurrentTrackTag.Artist.Trim();
@@ -259,11 +299,32 @@
{
if (!g_Player.IsRadio)
{
- _CurrentTrackTag.Artist =
- LyricUtil.CapatalizeString(GUIPropertyManager.GetProperty("#Play.Current.Artist"));
- _CurrentTrackTag.Title =
- LyricUtil.CapatalizeString(GUIPropertyManager.GetProperty("#Play.Current.Title"));
+ string strTrack = String.Format("{0} {1}", GUILocalizeStrings.Get(435), _CurrentTrackTag.Track); // "Track"
+ if (_CurrentTrackTag.Track <= 0)
+ {
+ strTrack = string.Empty;
+ }
+
+ string strYear = String.Format("{0} {1}", GUILocalizeStrings.Get(436), _CurrentTrackTag.Year); // "Year: "
+ if (_CurrentTrackTag.Year <= 1900)
+ {
+ strYear = string.Empty;
+ }
+
+ GUIPropertyManager.SetProperty("#Play.Current.Title", _CurrentTrackTag.Title);
+ GUIPropertyManager.SetProperty("#Play.Current.Track", strTrack);
+ GUIPropertyManager.SetProperty("#Play.Current.Album", _CurrentTrackTag.Album);
+ GUIPropertyManager.SetProperty("#Play.Current.Artist", _CurrentTrackTag.Artist);
+ GUIPropertyManager.SetProperty("#Play.Current.Genre", _CurrentTrackTag.Genre);
+ GUIPropertyManager.SetProperty("#Play.Current.Year", strYear);
+ GUIPropertyManager.SetProperty("#Play.Current.Rating", (Convert.ToDecimal(2 * _CurrentTrackTag.Rating + 1)).ToString());
+ GUIPropertyManager.SetProperty("#duration", MediaPortal.Util.Utils.SecondsToHMSString(_CurrentTrackTag.Duration));
+
+ //_CurrentTrackTag.Artist = LyricUtil.CapatalizeString(GUIPropertyManager.GetProperty("#Play.Current.Artist"));
+ //_CurrentTrackTag.Title = LyricUtil.CapatalizeString(GUIPropertyManager.GetProperty("#Play.Current.Title"));
_CurrentTrackTag.Lyrics = LyricUtil.FixLyrics(_CurrentTrackTag.Lyrics);
+
+ UpdateNextTrackInfo();
}
if (_selectedScreen == (int)MyLyricsSettings.Screen.LYRICS
@@ -530,20 +591,17 @@
private bool useEditControlsOnLRCPick()
{
- string blacklistedControlIDs = String.Empty;
+ string useEditControlsOnLRCPick = String.Empty;
if (defines != null && defines.Contains("#MyLyrics.UseEditControlsOnLRCPick"))
- blacklistedControlIDs = (string)defines["#MyLyrics.UseEditControlsOnLRCPick"];
- foreach (string cID in blacklistedControlIDs.Split(new char[] { ',' }))
+ useEditControlsOnLRCPick = (string)defines["#MyLyrics.UseEditControlsOnLRCPick"];
+ try
{
- try
- {
- if (cID.ToUpper() == "TRUE" || cID.ToUpper() == "YES")
- return true;
- }
- catch
- {
- }
+ if (useEditControlsOnLRCPick.ToUpper() == "TRUE" || useEditControlsOnLRCPick.ToUpper() == "YES")
+ return true;
}
+ catch
+ {
+ }
return false;
}
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyricsExternCode.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyricsExternCode.cs 2010-03-08 18:30:36 UTC (rev 3495)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyricsExternCode.cs 2010-03-09 20:57:54 UTC (rev 3496)
@@ -19,6 +19,7 @@
public void GetAlbumArt()
{
_CurrentTrackFileName = g_Player.CurrentFile;
+ _NextTrackFileName = PlayListPlayer.SingletonPlayer.GetNext();
GetTrackTags();
_CurrentThumbFileName = GUIMusicFiles.GetCoverArt(false, _CurrentTrackFileName, _CurrentTrackTag);
@@ -100,22 +101,25 @@
{
bool isCurSongCdTrack = IsCdTrack(_CurrentTrackFileName);
bool isNextSongCdTrack = IsCdTrack(_NextTrackFileName);
+ bool isInternetStream = Utils.IsAVStream(_CurrentTrackFileName);
MusicDatabase dbs = MusicDatabase.Instance;
if (_CurrentTrackTag != null)
_PreviousTrackTag = _CurrentTrackTag;
- if (!isCurSongCdTrack)
+ if (!isCurSongCdTrack && !isInternetStream)
{
- _CurrentTrackTag = dbs.GetTag(_CurrentTrackFileName);
- _CurrentTrackTag.Artist =
- LyricUtil.CapatalizeString(GUIPropertyManager.GetProperty("#Play.Current.Artist"));
- _CurrentTrackTag.Title =
- LyricUtil.CapatalizeString(GUIPropertyManager.GetProperty("#Play.Current.Title"));
+ _CurrentTrackTag = GetTrackTag(dbs, _CurrentTrackFileName, true);
+ //_CurrentTrackTag = dbs.GetTag(_CurrentTrackFileName);
+ //_CurrentTrackTag.Artist = LyricUtil.CapatalizeString(GUIPropertyManager.GetProperty("#Play.Current.Artist"));
+ //_CurrentTrackTag.Title = LyricUtil.CapatalizeString(GUIPropertyManager.GetProperty("#Play.Current.Title"));
}
- if (!isNextSongCdTrack)
- _NextTrackTag = dbs.GetTag(_NextTrackFileName);
+ if (!isNextSongCdTrack && !isInternetStream)
+ {
+ _NextTrackTag = GetTrackTag(dbs, _NextTrackFileName, true);
+ //_NextTrackTag = dbs.GetTag(_NextTrackFileName);
+ }
if (isCurSongCdTrack || isNextSongCdTrack)
{
@@ -140,10 +144,10 @@
PlayListItem nextPlaylistItem = curPlaylist[nextItemIndex];
if (isCurSongCdTrack)
- _CurrentTrackTag = (MusicTag) curPlaylistItem.MusicTag;
+ _CurrentTrackTag = (MusicTag)curPlaylistItem.MusicTag;
if (isNextSongCdTrack && nextPlaylistItem != null)
- _NextTrackTag = (MusicTag) nextPlaylistItem.MusicTag;
+ _NextTrackTag = (MusicTag)nextPlaylistItem.MusicTag;
// There's no MusicTag info in the Playlist so check is we have a valid
// GUIMusicFiles.MusicCD object
@@ -156,10 +160,8 @@
{
CDTrackDetail curTrack = GUIMusicFiles.MusicCD.getTrack(curCDTrackNum);
_CurrentTrackTag = GetTrackTag(curTrack);
- _CurrentTrackTag.Artist =
- LyricUtil.CapatalizeString(GUIPropertyManager.GetProperty("#Play.Current.Artist"));
- _CurrentTrackTag.Title =
- LyricUtil.CapatalizeString(GUIPropertyManager.GetProperty("#Play.Current.Title"));
+ //_CurrentTrackTag.Artist = LyricUtil.CapatalizeString(GUIPropertyManager.GetProperty("#Play.Current.Artist"));
+ //_CurrentTrackTag.Title = LyricUtil.CapatalizeString(GUIPropertyManager.GetProperty("#Play.Current.Title"));
}
if (nextCDTrackNum < GUIMusicFiles.MusicCD.Tracks.Length)
{
@@ -168,6 +170,14 @@
}
}
}
+
+ // If we got an Internetstream and are playing via BASS Player
+ // then receive the MusicTags from the stream
+ if (isInternetStream && BassMusicPlayer.IsDefaultMusicPlayer)
+ {
+ _NextTrackTag = null;
+ _CurrentTrackTag = BassMusicPlayer.Player.GetStreamTags();
+ }
}
private bool IsCdTrack(string fileName)
@@ -223,13 +233,20 @@
if (!bFound)
{
if (useID3)
+ {
tag = TagReader.ReadTag(strFile);
+ if (tag != null && tag.Title != GUILocalizeStrings.Get(4543)) // Track information not available
+ {
+ return tag;
+ }
+ }
+ // tagreader failed or not using it
+ song.Title = Path.GetFileNameWithoutExtension(strFile);
+ song.Artist = string.Empty;
+ song.Album = string.Empty;
}
- else
- {
- tag = new MusicTag();
- tag = BuildMusicTagFromSong(song);
- }
+ tag = new MusicTag();
+ tag = song.ToMusicTag();
return tag;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2010-08-02 19:43:22
|
Revision: 3696
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3696&view=rev
Author: saamand
Date: 2010-08-02 19:43:16 +0000 (Mon, 02 Aug 2010)
Log Message:
-----------
- LRC file in music tag will always be used
- Couple of minor fixes and text edits
Modified Paths:
--------------
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
trunk/plugins/MyLyrics/My Lyrics/change log.txt
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs 2010-08-02 19:15:45 UTC (rev 3695)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs 2010-08-02 19:43:16 UTC (rev 3696)
@@ -785,7 +785,7 @@
this.cbMusicTagAlwaysCheck.Name = "cbMusicTagAlwaysCheck";
this.cbMusicTagAlwaysCheck.Size = new System.Drawing.Size(216, 17);
this.cbMusicTagAlwaysCheck.TabIndex = 7;
- this.cbMusicTagAlwaysCheck.Text = "Always use lyric in music tag (if available)";
+ this.cbMusicTagAlwaysCheck.Text = "Always use plain lyric from tag (if available)";
this.cbMusicTagAlwaysCheck.UseVisualStyleBackColor = true;
this.cbMusicTagAlwaysCheck.Leave += new System.EventHandler(this.WriteMediaPortalXML);
//
@@ -797,7 +797,7 @@
this.cbMusicTagWrite.Name = "cbMusicTagWrite";
this.cbMusicTagWrite.Size = new System.Drawing.Size(203, 17);
this.cbMusicTagWrite.TabIndex = 6;
- this.cbMusicTagWrite.Text = "Write newly found lyrics into music tag";
+ this.cbMusicTagWrite.Text = "Write newly found lyrics to music tag";
this.cbMusicTagWrite.UseVisualStyleBackColor = true;
this.cbMusicTagWrite.Leave += new System.EventHandler(this.WriteMediaPortalXML);
//
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2010-08-02 19:15:45 UTC (rev 3695)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2010-08-02 19:43:16 UTC (rev 3696)
@@ -1611,7 +1611,7 @@
#region 1) LRC in music tag
- if (_AutomaticReadFromMusicTag && g_Player.IsRadio == false
+ if (g_Player.IsRadio == false
&& _CurrentTrackTag != null && ((_CurrentTrackTag.Lyrics.Length != 0
&&
(_SimpleLrc =
@@ -1650,7 +1650,7 @@
#region 3) Search the Internet for a LRC
- if (_useLyricWiki && Setup.IsMember("LrcFinder"))
+ if (_useLrcFinder && Setup.IsMember("LrcFinder"))
{
_lyricsFound = false;
Modified: trunk/plugins/MyLyrics/My Lyrics/change log.txt
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/change log.txt 2010-08-02 19:15:45 UTC (rev 3695)
+++ trunk/plugins/MyLyrics/My Lyrics/change log.txt 2010-08-02 19:43:16 UTC (rev 3696)
@@ -1,4 +1,4 @@
-Release notes to MyLyrics 1.5.0.0
+Release notes to MyLyrics 1.5.1.0
MyLyrics displays the lyric of the currently played song inside MediaPortal.
The plugin can show LRC's and plain lyrics. It uses both musictags and online searches to find lyrics.
@@ -52,6 +52,8 @@
* Fix: hiding/showing controls order so that for example done text doesn't show over not done
* Fix: hiding image on stop playback
* Fix: improved browsing through all the screens
+
+
* Fix: long operations called from threads are now in background workers for nice cancellation
* Fix: improved reading lyrics from tag
* Fix: proper message when there is no enough data for search
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2011-05-03 18:49:20
|
Revision: 4195
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4195&view=rev
Author: saamand
Date: 2011-05-03 18:49:14 +0000 (Tue, 03 May 2011)
Log Message:
-----------
Version 1.6.0.0
Modified Paths:
--------------
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
trunk/plugins/MyLyrics/My Lyrics/change log.txt
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs 2011-05-03 18:10:29 UTC (rev 4194)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs 2011-05-03 18:49:14 UTC (rev 4195)
@@ -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.5.5.0";
+ this.lbInfo1.Text = "MyLyrics plugin, version 1.6.0.0";
//
// label2
//
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2011-05-03 18:10:29 UTC (rev 4194)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2011-05-03 18:49:14 UTC (rev 4195)
@@ -73,17 +73,20 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Core, Version=0.2.3.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Common.Utils">
+ <HintPath>..\..\..\..\Program Files (x86)\Team MediaPortal\MediaPortal\Common.Utils.dll</HintPath>
+ </Reference>
+ <Reference Include="Core, Version=1.1.0.16045, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\mp exes\Core.dll</HintPath>
+ <HintPath>..\..\..\..\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll</HintPath>
</Reference>
- <Reference Include="Databases, Version=0.2.3.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Databases, Version=1.1.0.16047, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\mp exes\Databases.dll</HintPath>
+ <HintPath>..\..\..\..\Program Files (x86)\Team MediaPortal\MediaPortal\Databases.dll</HintPath>
</Reference>
- <Reference Include="Dialogs, Version=0.2.3.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Dialogs, Version=1.1.0.16051, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\mp exes\Dialogs.dll</HintPath>
+ <HintPath>..\..\..\..\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll</HintPath>
</Reference>
<Reference Include="GoogleTranslateAPI, Version=0.3.0.100, Culture=neutral, PublicKeyToken=37a8e65b17fcdcbb, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -94,13 +97,13 @@
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
- <Reference Include="Utils, Version=2.2.2.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Utils, Version=2.2.7.16040, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\mp exes\Utils.dll</HintPath>
+ <HintPath>..\..\..\..\Program Files (x86)\Team MediaPortal\MediaPortal\Utils.dll</HintPath>
</Reference>
- <Reference Include="WindowPlugins, Version=0.2.3.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="WindowPlugins, Version=1.1.0.16062, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\mp exes\WindowPlugins.dll</HintPath>
+ <HintPath>..\..\..\..\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\WindowPlugins.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Modified: trunk/plugins/MyLyrics/My Lyrics/change log.txt
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/change log.txt 2011-05-03 18:10:29 UTC (rev 4194)
+++ trunk/plugins/MyLyrics/My Lyrics/change log.txt 2011-05-03 18:49:14 UTC (rev 4195)
@@ -1,4 +1,4 @@
-Release notes to MyLyrics 1.5.5.0
+Release notes to MyLyrics 1.6.0.0
MyLyrics displays the lyric of the currently played song inside MediaPortal.
The plugin can show LRC's and plain lyrics. It uses both musictags and online searches to find lyrics.
@@ -31,9 +31,7 @@
- LRC editor: enables the creation of lrc lyric from a plain lyric.
- Translation screen. See a translated version of the lyric.
-Compatible with MediaPortal 1.1.0 nad 1.1.1
+Compatible with MediaPortal 1.2.0 beta
-Changes and fixes since version 1.5.3.0
-- Add: Gui property #currentmodule returns user defined plugin name
-- Fix: LRC tagging offset value wasn't saved in version 1.5.2.0
-- Fix: Minor fixes in configuration
\ No newline at end of file
+Changes and fixes since version 1.5.5.0
+- Add: Now compatible with MediaPotal 1.2.0 beta
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X