Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[2458] trunk/plugins/MyLyrics/My Lyrics
|
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.
|
