From: <sa...@us...> - 2008-03-06 19:49:08
|
Revision: 1432 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1432&view=rev Author: saamand Date: 2008-03-06 11:41:52 -0800 (Thu, 06 Mar 2008) Log Message: ----------- Modified Paths: -------------- trunk/plugins/MyLyrics/My Lyrics/MediaPortalUtil.cs trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.resx trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.Designer.cs trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.cs trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs Modified: trunk/plugins/MyLyrics/My Lyrics/MediaPortalUtil.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MediaPortalUtil.cs 2008-03-06 14:49:18 UTC (rev 1431) +++ trunk/plugins/MyLyrics/My Lyrics/MediaPortalUtil.cs 2008-03-06 19:41:52 UTC (rev 1432) @@ -28,7 +28,13 @@ { foreach (string s in strippedPrefixStringArray) { - artist = artist.Replace(s, ""); + int index = artist.IndexOf(s); + if (index != -1) + { + string prefix = artist.Substring(index + 2); + artist = prefix + " " + artist.Replace(s, ""); + break; + } } return artist; } Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs 2008-03-06 14:49:18 UTC (rev 1431) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.Designer.cs 2008-03-06 19:41:52 UTC (rev 1432) @@ -77,7 +77,7 @@ this.lbInfo1.Name = "lbInfo1"; this.lbInfo1.Size = new System.Drawing.Size(225, 17); this.lbInfo1.TabIndex = 3; - this.lbInfo1.Text = "My Lyrics plugin, version 1.00"; + this.lbInfo1.Text = "MyLyrics plugin, version 1.00"; // // label2 // Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.resx =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.resx 2008-03-06 14:49:18 UTC (rev 1431) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/About.resx 2008-03-06 19:41:52 UTC (rev 1432) @@ -129,6 +129,6 @@ <value>This is where you can browsw your music database and manually select the songs taht you would like to search the Internet for. When a lyric is found it is added to the lyrics database. If not it is added to the marked database.</value> </data> <data name="label8.Text" xml:space="preserve"> - <value>Here you can set up the plugin as you prefer. E.g. you can choose the name to be shown for the plugin inside MediaPortal or if a found lyric should be stored in the tag of the music file. You can also tweak the settings regarding the "Find Lyrics" dialog accessable from the "Lyrics database" tab, and choose which sites you want to query in your searches.</value> + <value>Here you can set up the plugin as you prefer. E.g. you can choose the name to be shown for the plugin inside MediaPortal or if a found lyric should be stored in the tag of the music file. You can also tweak the settings regarding the "Find Lyric" dialog accessable from the "Lyrics database" tab, and choose which sites you want to query in your searches.</value> </data> </root> \ No newline at end of file Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.Designer.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.Designer.cs 2008-03-06 14:49:18 UTC (rev 1431) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.Designer.cs 2008-03-06 19:41:52 UTC (rev 1432) @@ -51,6 +51,7 @@ this.cbLyricWiki = new MediaPortal.UserInterface.Controls.MPCheckBox(); this.btClose = new System.Windows.Forms.Button(); this.btUpdate = new System.Windows.Forms.Button(); + this.cbActionext = new MediaPortal.UserInterface.Controls.MPCheckBox(); this.gbSearchInfo.SuspendLayout(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); @@ -104,7 +105,7 @@ // // btFind // - this.btFind.Location = new System.Drawing.Point(281, 67); + this.btFind.Location = new System.Drawing.Point(283, 67); this.btFind.Name = "btFind"; this.btFind.Size = new System.Drawing.Size(65, 23); this.btFind.TabIndex = 3; @@ -175,6 +176,7 @@ // // gbLyricSites // + this.gbLyricSites.Controls.Add(this.cbActionext); this.gbLyricSites.Controls.Add(this.btCancel); this.gbLyricSites.Controls.Add(this.btFind); this.gbLyricSites.Controls.Add(this.cbHotLyrics); @@ -207,7 +209,7 @@ this.cbHotLyrics.Checked = true; this.cbHotLyrics.CheckState = System.Windows.Forms.CheckState.Checked; this.cbHotLyrics.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.cbHotLyrics.Location = new System.Drawing.Point(146, 21); + this.cbHotLyrics.Location = new System.Drawing.Point(131, 21); this.cbHotLyrics.Name = "cbHotLyrics"; this.cbHotLyrics.Size = new System.Drawing.Size(71, 17); this.cbHotLyrics.TabIndex = 14; @@ -220,7 +222,7 @@ this.cbSeekLyrics.Checked = true; this.cbSeekLyrics.CheckState = System.Windows.Forms.CheckState.Checked; this.cbSeekLyrics.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.cbSeekLyrics.Location = new System.Drawing.Point(146, 43); + this.cbSeekLyrics.Location = new System.Drawing.Point(131, 66); this.cbSeekLyrics.Name = "cbSeekLyrics"; this.cbSeekLyrics.Size = new System.Drawing.Size(79, 17); this.cbSeekLyrics.TabIndex = 15; @@ -259,7 +261,7 @@ this.cbEvilLabs.Checked = true; this.cbEvilLabs.CheckState = System.Windows.Forms.CheckState.Checked; this.cbEvilLabs.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.cbEvilLabs.Location = new System.Drawing.Point(146, 66); + this.cbEvilLabs.Location = new System.Drawing.Point(222, 21); this.cbEvilLabs.Name = "cbEvilLabs"; this.cbEvilLabs.Size = new System.Drawing.Size(67, 17); this.cbEvilLabs.TabIndex = 16; @@ -281,9 +283,9 @@ // // btClose // - this.btClose.Location = new System.Drawing.Point(354, 549); + this.btClose.Location = new System.Drawing.Point(364, 549); this.btClose.Name = "btClose"; - this.btClose.Size = new System.Drawing.Size(75, 23); + this.btClose.Size = new System.Drawing.Size(65, 23); this.btClose.TabIndex = 30; this.btClose.Text = "Close"; this.btClose.UseVisualStyleBackColor = true; @@ -292,16 +294,29 @@ // btUpdate // this.btUpdate.Enabled = false; - this.btUpdate.Location = new System.Drawing.Point(273, 549); + this.btUpdate.Location = new System.Drawing.Point(295, 549); this.btUpdate.Name = "btUpdate"; - this.btUpdate.Size = new System.Drawing.Size(75, 23); + this.btUpdate.Size = new System.Drawing.Size(65, 23); this.btUpdate.TabIndex = 11; this.btUpdate.Text = "Update"; this.btUpdate.UseVisualStyleBackColor = true; this.btUpdate.Click += new System.EventHandler(this.btUpdate_Click); // - // MyLyricsSetup_SearchTitleDialog + // cbActionext // + this.cbActionext.AutoSize = true; + this.cbActionext.Checked = true; + this.cbActionext.CheckState = System.Windows.Forms.CheckState.Checked; + this.cbActionext.FlatStyle = System.Windows.Forms.FlatStyle.Popup; + this.cbActionext.Location = new System.Drawing.Point(131, 43); + this.cbActionext.Name = "cbActionext"; + this.cbActionext.Size = new System.Drawing.Size(68, 17); + this.cbActionext.TabIndex = 17; + this.cbActionext.Text = "Actionext"; + this.cbActionext.UseVisualStyleBackColor = true; + // + // FindLyric + // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(456, 584); @@ -316,7 +331,7 @@ this.MaximumSize = new System.Drawing.Size(464, 611); this.MinimizeBox = false; this.MinimumSize = new System.Drawing.Size(464, 611); - this.Name = "MyLyricsSetup_SearchTitleDialog"; + this.Name = "FindLyric"; this.ShowIcon = false; this.Text = "Fetch lyric dialog"; this.gbSearchInfo.ResumeLayout(false); @@ -355,5 +370,6 @@ private System.Windows.Forms.Button btClose; private System.Windows.Forms.Button btUpdate; private System.Windows.Forms.Button btCancel; + internal MediaPortal.UserInterface.Controls.MPCheckBox cbActionext; } } \ No newline at end of file Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.cs 2008-03-06 14:49:18 UTC (rev 1431) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/FindLyric.cs 2008-03-06 19:41:52 UTC (rev 1432) @@ -81,6 +81,7 @@ { cbLyricWiki.Checked = ((string)xmlreader.GetValueAsString("myLyrics", "useLyricWiki", "True")).ToString().Equals("True") ? true : false; cbEvilLabs.Checked = ((string)xmlreader.GetValueAsString("myLyrics", "useEvilLabs", "True")).ToString().Equals("True") ? true : false; + cbActionext.Checked = ((string)xmlreader.GetValueAsString("myLyrics", "useActionext", "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; @@ -153,6 +154,10 @@ { sitesToSearch.Add("EvilLabs"); } + if (cbActionext.Checked) + { + sitesToSearch.Add("Actionext"); + } if (cbHotLyrics.Checked) { sitesToSearch.Add("HotLyrics"); Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs 2008-03-06 14:49:18 UTC (rev 1431) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MusicDatabaseBrowse.cs 2008-03-06 19:41:52 UTC (rev 1432) @@ -244,6 +244,8 @@ sitesToSearch.Add("LyricWiki"); if (((string)xmlreader.GetValueAsString("myLyrics", "useEvilLabs", "True")).ToString().Equals("True")) sitesToSearch.Add("EvilLabs"); + if (((string)xmlreader.GetValueAsString("myLyrics", "useActionext", "True")).ToString().Equals("True")) + sitesToSearch.Add("Actionext"); if (((string)xmlreader.GetValueAsString("myLyrics", "useLyrics007", "True")).ToString().Equals("True")) sitesToSearch.Add("HotLyrics"); if (((string)xmlreader.GetValueAsString("myLyrics", "useLyricsOnDemand", "True")).ToString().Equals("True")) Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs 2008-03-06 14:49:18 UTC (rev 1431) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.Designer.cs 2008-03-06 19:41:52 UTC (rev 1432) @@ -85,6 +85,7 @@ this.lbPluginName = new MediaPortal.UserInterface.Controls.MPLabel(); this.gbLyricSites = new MediaPortal.UserInterface.Controls.MPGroupBox(); this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.cbActionext = new MediaPortal.UserInterface.Controls.MPCheckBox(); this.cbLyrics007 = new MediaPortal.UserInterface.Controls.MPCheckBox(); this.cbLyricWiki = new MediaPortal.UserInterface.Controls.MPCheckBox(); this.cbEvilLabs = new MediaPortal.UserInterface.Controls.MPCheckBox(); @@ -725,19 +726,34 @@ // // groupBox2 // + this.groupBox2.Controls.Add(this.cbActionext); this.groupBox2.Controls.Add(this.cbLyrics007); this.groupBox2.Controls.Add(this.cbLyricWiki); this.groupBox2.Controls.Add(this.cbEvilLabs); this.groupBox2.Controls.Add(this.cbLyricsOnDemand); this.groupBox2.Controls.Add(this.cbHotLyrics); this.groupBox2.Controls.Add(this.cbSeekLyrics); - this.groupBox2.Location = new System.Drawing.Point(272, 72); + this.groupBox2.Location = new System.Drawing.Point(229, 72); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(258, 100); + this.groupBox2.Size = new System.Drawing.Size(301, 100); this.groupBox2.TabIndex = 28; this.groupBox2.TabStop = false; this.groupBox2.Text = "User select mode"; // + // cbActionext + // + this.cbActionext.AutoSize = true; + this.cbActionext.Checked = true; + this.cbActionext.CheckState = System.Windows.Forms.CheckState.Checked; + this.cbActionext.FlatStyle = System.Windows.Forms.FlatStyle.Popup; + this.cbActionext.Location = new System.Drawing.Point(131, 49); + this.cbActionext.Name = "cbActionext"; + this.cbActionext.Size = new System.Drawing.Size(68, 17); + this.cbActionext.TabIndex = 8; + this.cbActionext.Text = "Actionext"; + this.cbActionext.UseVisualStyleBackColor = true; + this.cbActionext.Leave += new System.EventHandler(this.WriteMediaPortalXML); + // // cbLyrics007 // this.cbLyrics007.AutoSize = true; @@ -772,7 +788,7 @@ this.cbEvilLabs.Checked = true; this.cbEvilLabs.CheckState = System.Windows.Forms.CheckState.Checked; this.cbEvilLabs.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.cbEvilLabs.Location = new System.Drawing.Point(145, 71); + this.cbEvilLabs.Location = new System.Drawing.Point(219, 26); this.cbEvilLabs.Name = "cbEvilLabs"; this.cbEvilLabs.Size = new System.Drawing.Size(67, 17); this.cbEvilLabs.TabIndex = 3; @@ -800,7 +816,7 @@ this.cbHotLyrics.Checked = true; this.cbHotLyrics.CheckState = System.Windows.Forms.CheckState.Checked; this.cbHotLyrics.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.cbHotLyrics.Location = new System.Drawing.Point(145, 26); + this.cbHotLyrics.Location = new System.Drawing.Point(131, 26); this.cbHotLyrics.Name = "cbHotLyrics"; this.cbHotLyrics.Size = new System.Drawing.Size(71, 17); this.cbHotLyrics.TabIndex = 7; @@ -814,7 +830,7 @@ this.cbSeekLyrics.Checked = true; this.cbSeekLyrics.CheckState = System.Windows.Forms.CheckState.Checked; this.cbSeekLyrics.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.cbSeekLyrics.Location = new System.Drawing.Point(145, 48); + this.cbSeekLyrics.Location = new System.Drawing.Point(131, 71); this.cbSeekLyrics.Name = "cbSeekLyrics"; this.cbSeekLyrics.Size = new System.Drawing.Size(79, 17); this.cbSeekLyrics.TabIndex = 6; @@ -829,7 +845,7 @@ this.groupBox1.Controls.Add(this.lbSpeed); this.groupBox1.Location = new System.Drawing.Point(6, 72); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(260, 100); + this.groupBox1.Size = new System.Drawing.Size(217, 100); this.groupBox1.TabIndex = 27; this.groupBox1.TabStop = false; this.groupBox1.Text = "Default select mode"; @@ -838,7 +854,7 @@ // this.mpLabel2.AutoSize = true; this.mpLabel2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.mpLabel2.Location = new System.Drawing.Point(187, 25); + this.mpLabel2.Location = new System.Drawing.Point(151, 25); this.mpLabel2.Name = "mpLabel2"; this.mpLabel2.Size = new System.Drawing.Size(43, 13); this.mpLabel2.TabIndex = 26; @@ -851,7 +867,7 @@ this.trackBar.Location = new System.Drawing.Point(36, 42); this.trackBar.Maximum = 3; this.trackBar.Name = "trackBar"; - this.trackBar.Size = new System.Drawing.Size(185, 42); + this.trackBar.Size = new System.Drawing.Size(158, 42); this.trackBar.TabIndex = 25; this.trackBar.TickStyle = System.Windows.Forms.TickStyle.Both; this.trackBar.Value = 2; @@ -1048,5 +1064,6 @@ private System.Windows.Forms.TabPage tabPageAbout; private MediaPortal.UserInterface.Controls.MPGroupBox gbTag; internal MediaPortal.UserInterface.Controls.MPCheckBox cbMusicTag; + internal MediaPortal.UserInterface.Controls.MPCheckBox cbActionext; } } \ 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 2008-03-06 14:49:18 UTC (rev 1431) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics Configuration/MyLyricsSetup.cs 2008-03-06 19:41:52 UTC (rev 1432) @@ -175,6 +175,7 @@ cbLyricWiki.Checked = ((string)xmlreader.GetValueAsString("myLyrics", "useLyricWiki", "True")).ToString().Equals("True") ? true : false; cbEvilLabs.Checked = ((string)xmlreader.GetValueAsString("myLyrics", "useEvilLabs", "True")).ToString().Equals("True") ? true : false; + cbActionext.Checked = ((string)xmlreader.GetValueAsString("myLyrics", "useActionext", "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; @@ -432,6 +433,8 @@ sitesToSearch.Add("LyricWiki"); if (cbEvilLabs.Checked) sitesToSearch.Add("EvilLabs"); + if (cbActionext.Checked) + sitesToSearch.Add("Actionext"); if (cbLyrics007.Checked) sitesToSearch.Add("Lyrics007"); if (cbLyricsOnDemand.Checked) @@ -928,6 +931,7 @@ cbHotLyrics.Checked = false; cbSeekLyrics.Checked = false; cbEvilLabs.Checked = false; + cbActionext.Checked = false; } else if (trackBar.Value == 1) { @@ -937,6 +941,7 @@ cbHotLyrics.Checked = false; cbSeekLyrics.Checked = false; cbEvilLabs.Checked = false; + cbActionext.Checked = false; } else if (trackBar.Value == 2) { @@ -944,6 +949,7 @@ cbLyrics007.Checked = true; cbLyricWiki.Checked = true; cbHotLyrics.Checked = true; + cbActionext.Checked = true; cbSeekLyrics.Checked = false; cbEvilLabs.Checked = false; } @@ -955,6 +961,7 @@ cbHotLyrics.Checked = true; cbSeekLyrics.Checked = true; cbEvilLabs.Checked = true; + cbActionext.Checked = true; } WriteMediaPortalXML(null, null); @@ -986,6 +993,7 @@ cbHotLyrics.Enabled = false; cbSeekLyrics.Enabled = false; cbEvilLabs.Enabled = false; + cbActionext.Enabled = false; trackBar_Scroll(null, null); } else @@ -997,6 +1005,7 @@ cbHotLyrics.Enabled = true; cbSeekLyrics.Enabled = true; cbEvilLabs.Enabled = true; + cbActionext.Enabled = true; } } @@ -1010,6 +1019,7 @@ xmlwriter.SetValue("myLyrics", "pluginsName", tbPluginName.Text); xmlwriter.SetValue("myLyrics", "useLyricWiki", cbLyricWiki.Checked.ToString()); xmlwriter.SetValue("myLyrics", "useEvilLabs", cbEvilLabs.Checked.ToString()); + xmlwriter.SetValue("myLyrics", "useActionext", cbActionext.Checked.ToString()); xmlwriter.SetValue("myLyrics", "useLyrics007", cbLyrics007.Checked.ToString()); xmlwriter.SetValue("myLyrics", "useLyricsOnDemand", cbLyricsOnDemand.Checked.ToString()); xmlwriter.SetValue("myLyrics", "useSeekLyrics", cbSeekLyrics.Checked.ToString()); Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2008-03-06 14:49:18 UTC (rev 1431) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.cs 2008-03-06 19:41:52 UTC (rev 1432) @@ -336,7 +336,7 @@ resetGUI(selectedScreen); - bool useLyricWiki, useEvilLabs, useLyrics007, useLyricsOnDemand, useSeekLyrics, useHotLyrics; + bool useLyricWiki, useEvilLabs, useLyrics007, useLyricsOnDemand, useSeekLyrics, useHotLyrics, useActionext; using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MediaPortal.xml")) { @@ -347,6 +347,7 @@ useLyricsOnDemand = ((string)xmlreader.GetValueAsString("myLyrics", "useLyricsOnDemand", "True")).ToString().Equals("True") ? true : false; useSeekLyrics = ((string)xmlreader.GetValueAsString("myLyrics", "useSeekLyrics", "True")).ToString().Equals("True") ? true : false; useHotLyrics = ((string)xmlreader.GetValueAsString("myLyrics", "useHotLyrics", "True")).ToString().Equals("True") ? true : false; + useActionext = ((string)xmlreader.GetValueAsString("myLyrics", "useActionext", "True")).ToString().Equals("True") ? true : false; m_automaticWriteToMusicTag = xmlreader.GetValue("myLyrics", "automaticWriteToMusicTag").Equals("yes"); @@ -366,6 +367,10 @@ { sitesToSearch.Add("EvilLabs"); } + if (useActionext && Setup.IsMember("Actionext")) + { + sitesToSearch.Add("Actionext"); + } if (useLyrics007 && Setup.IsMember("Lyrics007")) { sitesToSearch.Add("Lyrics007"); Modified: trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2008-03-06 14:49:18 UTC (rev 1431) +++ trunk/plugins/MyLyrics/My Lyrics/MyLyrics.csproj 2008-03-06 19:41:52 UTC (rev 1432) @@ -5,13 +5,12 @@ <ProductVersion>8.0.50727</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> <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent> - <StartupObject> - </StartupObject> + <StartupObject>MyLyrics.MyLyricsSetup_test</StartupObject> <SignAssembly>false</SignAssembly> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -164,9 +163,6 @@ </EmbeddedResource> </ItemGroup> <ItemGroup> - <Content Include="Changelog.txt" /> - </ItemGroup> - <ItemGroup> <ProjectReference Include="..\LyricsEngine\LyricsEngine.csproj"> <Project>{B0760CE8-086F-4301-9091-C9BE54F261FD}</Project> <Name>LyricsEngine</Name> Modified: trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs 2008-03-06 14:49:18 UTC (rev 1431) +++ trunk/plugins/MyLyrics/My Lyrics/Properties/AssemblyInfo.cs 2008-03-06 19:41:52 UTC (rev 1432) @@ -31,5 +31,5 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("0.23")] -[assembly: AssemblyFileVersion("0.23")] +[assembly: AssemblyVersion("1.00")] +[assembly: AssemblyFileVersion("1.00")] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |