Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[2868] trunk/plugins/MyLyrics
|
From: <sa...@us...> - 2009-05-22 21:00:19
|
Revision: 2868
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2868&view=rev
Author: saamand
Date: 2009-05-22 21:00:13 +0000 (Fri, 22 May 2009)
Log Message:
-----------
MyLyrics 1.30
Modified Paths:
--------------
trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LrcFinder.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs
trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.resx
trunk/plugins/MyLyrics/My Lyrics/change log.txt
Modified: trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LrcFinder.cs
===================================================================
--- trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LrcFinder.cs 2009-05-20 12:49:40 UTC (rev 2867)
+++ trunk/plugins/MyLyrics/LyricsEngine/LyricsSites/LrcFinder.cs 2009-05-22 21:00:13 UTC (rev 2868)
@@ -132,7 +132,7 @@
private string GetUrl()
{
- Domain = "http://testLRCFinder.profiler.nl";
+ //Domain = "http://testLRCFinder.profiler.nl";
if (string.IsNullOrEmpty(Domain))
{
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs 2009-05-20 12:49:40 UTC (rev 2867)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs 2009-05-22 21:00:13 UTC (rev 2868)
@@ -38,7 +38,7 @@
string[] m_strippedPrefixStrings = null;
- bool m_lockButtons = true;
+ private bool m_Searching = false;
Thread m_LyricControllerThread;
ManualResetEvent m_EventStopThread;
@@ -259,7 +259,7 @@
private void Search_Init()
{
- m_lockButtons = false;
+ m_Searching = true;
MyLyricsSetup.UpdateLibraryUI = true;
ChangeButtonsEnableState();
@@ -595,6 +595,8 @@
// Called from worker thread using delegate and Control.Invoke
private void ThreadFinishedMethod(string artist, string title, string message, string site)
{
+ m_Searching = false;
+
ChangeButtonsEnableState();
RefreshSongsListView();
ChangeStatusOnSubItems(false);
@@ -611,20 +613,38 @@
private void ChangeButtonsEnableState()
{
- if (m_lockButtons == false)
+ if (m_Searching == true)
{
- ((MyLyricsSetup)m_Parent).btClose.Enabled = !((MyLyricsSetup)m_Parent).btClose.Enabled;
- btSearch.Enabled = !btSearch.Enabled;
- btCancel.Enabled = !btCancel.Enabled;
- btAdd.Enabled = !btAdd.Enabled;
- btAddAll.Enabled = !btAddAll.Enabled;
- btDeselectAll.Enabled = !btDeselectAll.Enabled;
- btDeselectAll2.Enabled = !btDeselectAll2.Enabled;
- btRemove.Enabled = !btRemove.Enabled;
- btRemoveAll.Enabled = !btRemoveAll.Enabled;
- btSelectAll.Enabled = !btSelectAll.Enabled;
- btSelectAll2.Enabled = !btSelectAll2.Enabled;
+ m_Parent.tabControl.SelectedIndexChanged -= new System.EventHandler(m_Parent.tabControl_SelectedIndexChanged);
+
+ ((MyLyricsSetup)m_Parent).btClose.Enabled = false;
+ btSearch.Enabled = false;
+ btCancel.Enabled = true;
+ btAdd.Enabled = false;
+ btAddAll.Enabled = false;
+ btDeselectAll.Enabled = false;
+ btDeselectAll2.Enabled = false;
+ btRemove.Enabled = false;
+ btRemoveAll.Enabled = false;
+ btSelectAll.Enabled = false;
+ btSelectAll2.Enabled = false;
}
+ else
+ {
+ m_Parent.tabControl.SelectedIndexChanged += new System.EventHandler(m_Parent.tabControl_SelectedIndexChanged);
+
+ ((MyLyricsSetup)m_Parent).btClose.Enabled = true;
+ btSearch.Enabled = true;
+ btCancel.Enabled = false;
+ btAdd.Enabled = true;
+ btAddAll.Enabled = true;
+ btDeselectAll.Enabled = true;
+ btDeselectAll2.Enabled = true;
+ btRemove.Enabled = true;
+ btRemoveAll.Enabled = true;
+ btSelectAll.Enabled = true;
+ btSelectAll2.Enabled = true;
+ }
}
private void bw_DoWork(object sender, DoWorkEventArgs e)
@@ -721,7 +741,7 @@
bwMusicTagSearch.CancelAsync();
bwOnlineSearch.CancelAsync();
ChangeButtonsEnableState();
- m_lockButtons = true;
+ m_Searching = false;
Thread.Sleep(500);
RefreshSongsListView();
RefreshArtistStats();
@@ -776,6 +796,7 @@
private void btSearch_Click(object sender, EventArgs e)
{
+
using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MediaPortal.xml"))
{
if (xmlreader.GetValueAsBool("myLyrics", "automaticReadFromMusicTag", true))
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs 2009-05-20 12:49:40 UTC (rev 2867)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs 2009-05-22 21:00:13 UTC (rev 2868)
@@ -1245,7 +1245,6 @@
#endregion
- private MediaPortal.UserInterface.Controls.MPTabControl tabControl;
private MediaPortal.UserInterface.Controls.MPTabPage tabPageSetup;
private MediaPortal.UserInterface.Controls.MPTabPage tabPageLyricsDatabase;
private MediaPortal.UserInterface.Controls.MPGroupBox gbMusicDBSearchStats;
@@ -1338,5 +1337,6 @@
private MediaPortal.UserInterface.Controls.MPLabel lbLrcTaggingOffset;
private MediaPortal.UserInterface.Controls.MPTextBox tbLrcTaggingName;
private MediaPortal.UserInterface.Controls.MPLabel lbLrcTaggingName;
+ public MediaPortal.UserInterface.Controls.MPTabControl tabControl;
}
}
\ No newline at end of file
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs 2009-05-20 12:49:40 UTC (rev 2867)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs 2009-05-22 21:00:13 UTC (rev 2868)
@@ -1018,7 +1018,7 @@
}
}
- private void tabControl_SelectedIndexChanged(object sender, EventArgs e)
+ public void tabControl_SelectedIndexChanged(object sender, EventArgs e)
{
if (tabControl.SelectedIndex == 0)
{
Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.resx
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.resx 2009-05-20 12:49:40 UTC (rev 2867)
+++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.resx 2009-05-22 21:00:13 UTC (rev 2868)
@@ -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/change log.txt
===================================================================
--- trunk/plugins/MyLyrics/My Lyrics/change log.txt 2009-05-20 12:49:40 UTC (rev 2867)
+++ trunk/plugins/MyLyrics/My Lyrics/change log.txt 2009-05-22 21:00:13 UTC (rev 2868)
@@ -1,17 +1,17 @@
Release notes to MyLyrics 1.30
-MyLyrics is a windows plugin for MediaPortal which enables the display of lyrics for the currently played music file inside MediaPortal.
+MyLyrics enables the display of lyrics for the currently played music file inside MediaPortal.
The plugin is able show LRC and plain lyrics, and uses both musictags and online searches to find lyrics.
Basic features:
-* Dynamic search for the lyrics to currently playing music file.
-* Browse your music database and select the songs for which you want to find lyrics.
+* Dynamic search for the lyrics (both LRC's and plain lyrics) to the currently played music file.
+* Browse your music database and select the songs to which you want to find lyrics.
* Batch search for lyrics matching songs in music database.
* Search single title and select amoung lyrics from various lyrics sites.
* Add/delete/edit lyrics and save changes in lyrics databases.
* Import/export lyrics to/from music tags.
* Include lyrics from the Internet, musictags, text- and lrc-files.
-* Create a LRC from a basic lyric on the fly.
+* Create a LRC from a basic lyric on the fly and share it with the community.
Keys:
- W key (or '#' button on remote): Toggle between basic and wide screen.
@@ -28,7 +28,7 @@
(Two sub modes for both Lyrics basic and Lyrics wide: static mode (default) or scroll mode)
- LRC basic: shows lrc file and coverart on the right (default lrc screen).
- LRC wide: shows wider lrc area and no coverart (the plugin autoselects this if the lrc contains one or more long lines).
-- LRC pick: uses BennieBoy's LrcFinder to select among different matching LRC entries.
+- 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.2.
@@ -37,9 +37,9 @@
Simple copy the content of the zip-file into your MP library (typical C:\Program Files\Team MediaPortal\MediaPortal).
Noteworthy changes since version 1.23:
+* Add: Support for LRCFinder webservice (a big, BIG thank you to BennieBoy!).
* Add: New screen "LRC pick" added (enter and leave by pressing 'P').
-* Add: Support for LrcFinder webservice (a big, BIG thank you to BennieBoy!).
-* Add: Option to upload manual created LRC file to LrcFinder and share it with the community (default disabled).
+* Add: Option to upload manual created LRC file to LRCFinder and share it with the community (default disabled).
* Add: Toggle between LRC and lyric mode with hotkey 'F'.
* Add: LRC mode added to the configuration (search only for LRC-files).
* Add: In LRC editor mode 'backslash' can be used to erase the latest tagged line.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
